blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-12-16 11:11:50 +08:00
parent c37ccd00c8
commit 6cb1f12827
9 changed files with 218 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/wechat/service/WechatService.php
View File

@ -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;
}
}

8
composer.lock generated
View File

@ -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",

2
vendor/composer/autoload_classmap.php vendored
View File

@ -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',

2
vendor/composer/autoload_static.php vendored
View File

@ -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',

8
vendor/composer/installed.json vendored
View File

@ -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": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2019-12-14 14:07:13
// This file is automatically generated at:2019-12-16 11:11:22
declare (strict_types = 1);
return array (
0 => 'think\\app\\Service',

2
vendor/zoujingli/think-library/src/Storage.php vendored
View File

@ -143,7 +143,7 @@ abstract class Storage
/**
* 根据文件后缀获取文件MINE
* @param array $exts 文件后缀
* @param array|string $exts 文件后缀
* @param array $mime 文件信息
* @return string
*/

133
vendor/zoujingli/think-library/src/service/JsonRpcClientService.php vendored Normal file
View File

@ -0,0 +1,133 @@
<?php
// +----------------------------------------------------------------------
// | Library for ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
use think\admin\extend\CodeExtend;
use think\admin\Service;
/**
* JsonRpc 客户端服务
* Class JsonRpcClientService
* @package think\admin\service
*/
class JsonRpcClientService extends Service
{
/**
* 调式状态
* @var boolean
*/
private $debug;
/**
* 服务端地址
* @var string
*/
private $proxy;
/**
* 请求ID
* @var integer
*/
private $requestId;
/**
* 通知状态
* @var boolean
*/
private $notification = false;
/**
* 创建连接对象
* @param string $proxy
* @param boolean $debug
* @return $this
*/
public function create($proxy, $debug = false)
{
$this->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'];
}
}
}

62
vendor/zoujingli/think-library/src/service/JsonRpcServerService.php vendored Normal file
View File

@ -0,0 +1,62 @@
<?php
// +----------------------------------------------------------------------
// | Library for ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
// +----------------------------------------------------------------------
namespace think\admin\service;
use think\admin\Service;
use think\exception\HttpResponseException;
/**
* JsonRpc 服务端服务
* Class JsonRpcServerService
* @package think\admin\service
*/
class JsonRpcServerService extends Service
{
/**
* 设置监听对象
* @param mixed $object
* @return boolean
* @throws \think\Exception
*/
public function handle($object)
{
// Checks if a JSON-RCP request has been received
if ($this->app->request->method() !== "POST" || $this->app->request->contentType() != 'application/json') {
foreach (get_class_methods($object) as $method) echo "<p>method {$method}()</p>";
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'));
}
}