update

Author: edenleung

README.md

@@ -6,21 +6,32 @@ ThinkPHP 扩展包 网站链接提交
 composer require xiaodi/think-site-pusher:dev-master
 ```
 
+## 配置
+
+### 默认配置
+项目根目录 `config/push.php`
+
+### 临时配置
+```php
+$config = ['site' => 'xxx', 'token' => 'xxx'];
+Pusher::baidu($config)->urls($urls);
+```
+
 ## 使用
 ```php
-use xiaodi\EasyPush\Pusher;
+use EasyPush\Pusher;
 
 $urls = [
   'https://www.xiaodim.com/index.html',
   'https://www.xiaodim.com/2019/10/25/thinkphp6-rpc-tutorial/'
 ]
 
 // 推送链接
-Pusher::baidu()->urls($urls);
+Pusher::baidu()->push($urls);
 
 // 更新链接
 Pusher::baidu()->update($urls);
 
 // 删除链接
-Pusher::baidu()->del($urls);
+Pusher::baidu()->delete($urls);
 ```

composer.json

@@ -1,6 +1,7 @@
 {
     "name": "xiaodi/think-site-pusher",
     "license": "MIT",
+    "type": "think-extend",
     "authors": [
         {
             "name": "xiaodi",
@@ -14,7 +15,17 @@
     },
     "autoload": {
         "psr-4": {
-            "xiaodi\\EasyPush\\": "src/"
+            "EasyPush\\": "src/"
+        }
+    },
+    "extra": {
+        "think": {
+            "config": {
+                "push": "src/Config/push.php"
+            }
+        },
+        "think-config": {
+            "push": "src/Config/push.php"
         }
     }
 }

src/Config/push.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'baidu' => [
+        // 在搜索资源平台验证的站点
+        'site' => '',
+
+        // 在搜索资源平台申请的推送用的准入密钥
+        'token' => ''
+    ]
+];

src/Exception/ClassNotFound.php

@@ -0,0 +1,6 @@
+<?php
+
+namespace EasyPush\Exception;
+
+class ClassNotFound extends Exception
+{ }

src/Exception/InvalidArgumentException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace EasyPush\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}

src/Handles/Baidu.php

@@ -2,12 +2,15 @@
 
 namespace EasyPush\Handles;
 
+use EasyPush\Exception\InvalidArgumentException;
 use EasyPush\Interfaces\PushInterface;
 
 class Baidu implements PushInterface
 {
     const URI = 'http://data.zz.baidu.com';
 
+    private $actions = ['push' => '/urls', 'update' => 'update', 'delete' => '/del'];
+
     private $query = [];
 
     private $body = '';
@@ -22,15 +25,23 @@ public function __construct(array $config = [])
         if (!empty($config)) {
             $this->config = array_merge($this->config, $config);
         } else {
-            $this->config = array_merge($this->config, config('push'));
+            $this->config = array_merge($this->config, config('push.baidu'));
+        }
+
+        if (!$this->config['site'] || !$this->config['token']) {
+            throw new InvalidArgumentException('site token配置不能为空');
         }
 
         $this->setQuery($this->config['site'], $this->config['token']);
     }
 
     public function setParams($method, $url)
     {
-        $this->path = "/{$method}";
+        if (!array_key_exists($method, $this->actions)) {
+            throw new InvalidArgumentException(sprintf('"%s" not allow', $method));
+        }
+
+        $this->path = $this->actions[$method];
         $this->setBody($url);
     }
 

src/Pusher.php

@@ -4,6 +4,8 @@
 
 use GuzzleHttp\Client;
 use EasyPush\Exception\Exception;
+use EasyPush\Exception\ClassNotFound;
+use EasyPush\Interfaces\PushInterface;
 use ReflectionClass;
 
 class Pusher
@@ -14,21 +16,22 @@ class Pusher
 
     public function __callStatic($name, $arguments)
     {
-        $handle = "\\EasyPush\\Handles\\{$name}";
+        $className = "\\EasyPush\\Handles\\{$name}";
 
-        if (false === class_exists($handle)) {
-            throw new Exception("{$handle} Not Found!");
+        if (false === class_exists($className)) {
+            throw new ClassNotFound(
+                sprintf('Class "%s" Not Found', $className)
+            );
         }
 
-        $reflectionClass = new ReflectionClass($handle);
-        $interfaces      = $reflectionClass->getInterfaceNames();
-
-        if (empty($interfaces) || !in_array('EasyPush\\Interfaces\\PushInterface', $interfaces)) {
-            throw new Exception("{$handle} 没有继承相关接口类");
+        $reflectionClass = new ReflectionClass($className);
+        $handle = $reflectionClass->newInstanceArgs($arguments);
+        if (false === $handle instanceof PushInterface) {
+            throw new Exception("{$className} is not instanceof PushInterface");
         }
 
         $instance = new static();
-        $instance->handle = new $handle($arguments);
+        $instance->handle = $handle;
         $instance->client = new Client([
             'base_uri' => $instance->handle->getUri()
         ]);
@@ -50,12 +53,9 @@ public function __call($method, $argc)
                 'body' => $body
             ]);
         } catch (\GuzzleHttp\Exception\RequestException $e) {
-
-        } catch (\Excpetion $e) {
-            
+            return ['code' => $e->getResponse()->getStatusCode(), 'result' => null];
         }
 
-
-        return $response->getBody()->getContents();
+        return ['code' => 200, 'result' => $response->getBody()->getContents()];
     }
 }