diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php index a2098c3b8..9c1b4f502 100644 --- a/app/wechat/service/WechatService.php +++ b/app/wechat/service/WechatService.php @@ -16,6 +16,7 @@ namespace app\wechat\service; use think\admin\Service; +use think\admin\service\JsonRpcClientService; use think\exception\HttpResponseException; /** @@ -86,7 +87,6 @@ class WechatService extends Service * @param string $name * @param array $arguments * @return mixed - * @throws \SoapFault * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException @@ -109,17 +109,17 @@ class WechatService extends Service $data['sign'] = md5("{$data['class']}#{$appid}#{$appkey}#{$data['time']}#{$data['nostr']}"); $token = enbase64url(json_encode($data, JSON_UNESCAPED_UNICODE)); $location = "http://open.cuci.cc/service/api.client/_TYPE_?not_init_session=1&token={$token}"; - if (class_exists('Yar_Client')) { + if (!class_exists('Yar_Client')) { $client = new \Yar_Client(str_replace('_TYPE_', 'yar', $location)); - try { - $exception = new \think\Exception($client->getMessage(), $client->getCode()); - } catch (\Exception $exception) { - $exception = null; - } - if ($exception instanceof \Exception) throw $exception; } else { - $client = new \SoapClient(null, ['uri' => 'thinkadmin', 'location' => str_replace('_TYPE_', 'soap', $location)]); + $client = JsonRpcClientService::instance()->create(str_replace('_TYPE_', 'jsonrpc', $location)); } + try { + $exception = new \think\Exception($client->getMessage(), $client->getCode()); + } catch (\Exception $exception) { + $exception = null; + } + if ($exception instanceof \Exception) throw $exception; return $client; } } diff --git a/composer.lock b/composer.lock index 6700b6797..207ccdb8a 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "36784fab429f25fbcab86c7ebcb2de0922302b5b" + "reference": "211f7afd9d19f9165989a5ecea78a828996e9c3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/36784fab429f25fbcab86c7ebcb2de0922302b5b", - "reference": "36784fab429f25fbcab86c7ebcb2de0922302b5b", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/211f7afd9d19f9165989a5ecea78a828996e9c3f", + "reference": "211f7afd9d19f9165989a5ecea78a828996e9c3f", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-12-10T08:48:47+00:00" + "time": "2019-12-16T02:57:39+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 93d030a16..812026612 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -274,6 +274,8 @@ return array( 'think\\admin\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php', 'think\\admin\\service\\ExpressService' => $vendorDir . '/zoujingli/think-library/src/service/ExpressService.php', 'think\\admin\\service\\InstallService' => $vendorDir . '/zoujingli/think-library/src/service/InstallService.php', + 'think\\admin\\service\\JsonRpcClientService' => $vendorDir . '/zoujingli/think-library/src/service/JsonRpcClientService.php', + 'think\\admin\\service\\JsonRpcServerService' => $vendorDir . '/zoujingli/think-library/src/service/JsonRpcServerService.php', 'think\\admin\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php', 'think\\admin\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', 'think\\admin\\service\\ProcessService' => $vendorDir . '/zoujingli/think-library/src/service/ProcessService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 687b1ff9b..5b6f0f0c5 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -414,6 +414,8 @@ class ComposerStaticInitada0e677dd8f1307ba83d0cf07626e6c 'think\\admin\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php', 'think\\admin\\service\\ExpressService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ExpressService.php', 'think\\admin\\service\\InstallService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/InstallService.php', + 'think\\admin\\service\\JsonRpcClientService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/JsonRpcClientService.php', + 'think\\admin\\service\\JsonRpcServerService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/JsonRpcServerService.php', 'think\\admin\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php', 'think\\admin\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', 'think\\admin\\service\\ProcessService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ProcessService.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4d73712a1..190f64007 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "36784fab429f25fbcab86c7ebcb2de0922302b5b" + "reference": "211f7afd9d19f9165989a5ecea78a828996e9c3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/36784fab429f25fbcab86c7ebcb2de0922302b5b", - "reference": "36784fab429f25fbcab86c7ebcb2de0922302b5b", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/211f7afd9d19f9165989a5ecea78a828996e9c3f", + "reference": "211f7afd9d19f9165989a5ecea78a828996e9c3f", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-12-10T08:48:47+00:00", + "time": "2019-12-16T02:57:39+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 0a83dc207..0d1ff6d57 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Storage.php b/vendor/zoujingli/think-library/src/Storage.php index 0b470f3fc..25706b99f 100644 --- a/vendor/zoujingli/think-library/src/Storage.php +++ b/vendor/zoujingli/think-library/src/Storage.php @@ -143,7 +143,7 @@ abstract class Storage /** * 根据文件后缀获取文件MINE - * @param array $exts 文件后缀 + * @param array|string $exts 文件后缀 * @param array $mime 文件信息 * @return string */ diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php b/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php new file mode 100644 index 000000000..b3b794a70 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php @@ -0,0 +1,133 @@ +proxy = $proxy; + $this->debug = empty($debug) ? false : true; + $this->requestId = CodeExtend::uniqidNumber(); + return $this; + } + + /** + * 设置对象的通知状态（在此状态下，将执行通知而不是请求） + * @param boolean $notification + */ + public function setRpcNotification($notification) + { + $this->notification = empty($notification) ? false : true; + } + + /** + * 执行 JsonRCP 请求 + * @param string $method + * @param array $params + * @return array|boolean + * @throws \think\Exception + */ + public function __call($method, $params) + { + + // check + if (!is_scalar($method)) { + throw new \think\Exception('Method name has no scalar value'); + } + + // check + if (is_array($params)) { + // no keys + $params = array_values($params); + } else { + throw new \think\Exception('Params must be given as array'); + } + + // sets notification or request task + $currentId = $this->notification ? null : $this->requestId; + + // prepares the request + $request = json_encode(['method' => $method, 'params' => $params, 'id' => $currentId], JSON_UNESCAPED_UNICODE); + $this->debug && $this->debug .= '***** Request *****' . "\n" . $request . "\n" . '***** End Of request *****' . "\n\n"; + + // performs the HTTP POST + $options = ['http' => ['method' => 'POST', 'header' => 'Content-type: application/json', 'content' => $request]]; + if ($fp = fopen($this->proxy, 'r', false, stream_context_create($options))) { + $response = ''; + while ($row = fgets($fp)) $response .= trim($row) . "\n"; + $this->debug && $this->debug .= '***** Server response *****' . "\n" . $response . '***** End of server response *****' . "\n"; + $response = json_decode($response, true); + } else { + throw new \think\Exception("Unable to connect to {$this->proxy}"); + } + // debug output + if ($this->debug) { + echo nl2br($this->debug); + } + // final checks and return + if ($this->notification) { + return true; + } else { + // check + if ($response['id'] != $currentId) { + throw new \think\Exception("Incorrect response id (request id: {$currentId}, response id: {$response['id']}）"); + } + if (!is_null($response['error'])) { + throw new \think\Exception("Request error: {$response['error']}"); + } + return $response['result']; + } + } +} \ No newline at end of file diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php b/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php new file mode 100644 index 000000000..3a2900ab2 --- /dev/null +++ b/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php @@ -0,0 +1,62 @@ +app->request->method() !== "POST" || $this->app->request->contentType() != 'application/json') { + foreach (get_class_methods($object) as $method) echo "

method {$method}()

"; + return false; + } + + // Reads the input data + $request = json_decode(file_get_contents('php://input'), true); + if (empty($request['id'])) { + throw new \think\Exception('JsonRpc Request id cannot be empty'); + } + + // Executes the task on local object + try { + if ($result = call_user_func_array([$object, $request['method']], $request['params'])) { + $response = ['id' => $request['id'], 'result' => $result, 'error' => null]; + } else { + $response = ['id' => $request['id'], 'result' => null, 'error' => 'unknown method or incorrect parameters']; + } + } catch (\Exception $e) { + $response = ['id' => $request['id'], 'result' => null, 'error' => $e->getMessage()]; + } + // Output the response + throw new HttpResponseException(json($response)->contentType('text/javascript')); + } + +} \ No newline at end of file