diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php index a4b73343d..5b3061eab 100644 --- a/app/wechat/service/WechatService.php +++ b/app/wechat/service/WechatService.php @@ -15,8 +15,8 @@ namespace app\wechat\service; +use think\admin\extend\JsonRpcClient; use think\admin\Service; -use think\admin\service\JsonRpcClientService; use think\exception\HttpResponseException; /** @@ -113,7 +113,7 @@ class WechatService extends Service if (class_exists('Yar_Client')) { $client = new \Yar_Client(str_replace('_TYPE_', 'yar', $location)); } else { - $client = JsonRpcClientService::instance()->create(str_replace('_TYPE_', 'jsonrpc', $location)); + $client = new JsonRpcClient(str_replace('_TYPE_', 'jsonrpc', $location)); } try { $exception = new \think\Exception($client->getMessage(), $client->getCode()); diff --git a/composer.lock b/composer.lock index cf4e33054..7a7623501 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "be60abc6b39cbeca57a0b25f8e1a3d38e18307c0" + "reference": "1cc8c40ac3bcdfa92dfb831445635946d69a6582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/be60abc6b39cbeca57a0b25f8e1a3d38e18307c0", - "reference": "be60abc6b39cbeca57a0b25f8e1a3d38e18307c0", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1cc8c40ac3bcdfa92dfb831445635946d69a6582", + "reference": "1cc8c40ac3bcdfa92dfb831445635946d69a6582", "shasum": "", "mirrors": [ { @@ -958,20 +958,20 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-02-28T01:51:28+00:00" + "time": "2020-03-03T02:45:58+00:00" }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.16", + "version": "v1.2.17", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9" + "reference": "98f6e82311a364220a677cdfd56dc9f97851ab24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/01fa1479e8c4d7a0875de96787a2bcaeacc755e9", - "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/98f6e82311a364220a677cdfd56dc9f97851ab24", + "reference": "98f6e82311a364220a677cdfd56dc9f97851ab24", "shasum": "", "mirrors": [ { @@ -1022,7 +1022,7 @@ "wechatpay", "wepay" ], - "time": "2020-01-04T08:51:50+00:00" + "time": "2020-03-02T11:08:34+00:00" } ], "packages-dev": [], diff --git a/public/static/theme/css/console.custom.css b/public/static/theme/css/console.custom.css index ef32ad665..d31eba91c 100644 --- a/public/static/theme/css/console.custom.css +++ b/public/static/theme/css/console.custom.css @@ -70,6 +70,21 @@ .color-green { color: #090 !important; } +.sub-span-red span { + color: #ec494e !important; +} +.sub-span-blue span { + color: #2494f2 !important; +} +.sub-span-desc span { + color: #999 !important; +} +.sub-span-text span { + color: #333 !important; +} +.sub-span-green span { + color: #090 !important; +} .text-top { vertical-align: top !important; } diff --git a/public/static/theme/css/console.custom.css.map b/public/static/theme/css/console.custom.css.map index 11f5d44cb..3d7715d45 100644 --- a/public/static/theme/css/console.custom.css.map +++ b/public/static/theme/css/console.custom.css.map @@ -1 +1 @@ -{"version":3,"sources":["console.custom.less"],"names":[],"mappings":"AAAA;EACE,aAAA;EACA,cAAA;EACA,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,mBAAA;EACA,yBAAA;EACA,yBAAA;EACA,0BAAA;;AAGF;EACE,iBAAA;EACA,qBAAA;EACA,sBAAA;EACA,yBAAA;;AAGF;EACE,2BAAA;EACA,8BAAA;EACA,gCAAA;EACA,mCAAA;;AAGF;EACE,kBAAA;;AAGF;EACE,kBAAA;;AAGF;EACE,cAAA;;AAGF;EACE,eAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,WAAA;EACA,eAAA;;AAGF;EACE,qBAAA;;AAKA,MAAC;EACC,WAAA;;AAGF,MAAC;EACC,YAAA;;AAKF,MAAC;EACC,WAAA;;AAGF,MAAC;EACC,YAAA;;AAKF,OAAC;EACC,cAAA;;AAGF,OAAC;EACC,cAAA;;AAGF,OAAC;EACC,WAAA;;AAGF,OAAC;EACC,WAAA;;AAGF,OAAC;EACC,WAAA;;AAKF,MAAC;EACC,mBAAA;;AAGF,MAAC;EACC,gBAAA;;AAGF,MAAC;EACC,iBAAA;;AAGF,MAAC;EACC,kBAAA;;AAGF,MAAC;EACC,sBAAA;;AAGF,MAAC;EACC,sBAAA;;AAKF,UAAC;EACC,iBAAA;;AAGF,UAAC;EACC,YAAY,0CAAZ;;AAGF,UAAC;EACC,YAAY,0CAAZ;;AAGF,UAAC;EACC,YAAY,0CAAZ;;AAGF,UAAC;EACC,YAAY,0CAAZ;;;AAMF,SAAC;EACC,WAAA;EACA,WAAA;EACA,cAAA;EACA,sBAAA;EACA,8BAAA;;AAGF,SAAC;EACC,gBAAA;EACA,mBAAA;EACA,gCAAA;EACA,kCAAA;;;AAKJ;EACE,SAAA;;AAIA,cAAC;EACC,gBAAA;;AAGF,cAAC;EACC,oCAAA;EACA,4BAAA;;AAGF,cAAC;EACC,qCAAA;EACA,6BAAA;;AAKF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAKF,QAAC;EACC,UAAA;;AAGF,QAAC;EACC,YAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAIA,QADD,IACE;EACC,cAAA;;AAGF,QALD,IAKE;EACC,gBAAA;;AAGF,QATD,IASE;EACC,iBAAA;;AAGF,QAbD,IAaE;EACC,iBAAA;;AAGF,QAjBD,IAiBE;EACC,iBAAA;;AAGF,QArBD,IAqBE;EACC,iBAAA;;AAGF,QAzBD,IAyBE;EACC,iBAAA;;AAKF,QADD,KACE;EACC,eAAA;;AAGF,QALD,KAKE;EACC,iBAAA;;AAGF,QATD,KASE;EACC,kBAAA;;AAGF,QAbD,KAaE;EACC,kBAAA;;AAGF,QAjBD,KAiBE;EACC,kBAAA;;AAGF,QArBD,KAqBE;EACC,kBAAA;;AAGF,QAzBD,KAyBE;EACC,kBAAA;;AAKF,QADD,MACE;EACC,gBAAA;;AAGF,QALD,MAKE;EACC,kBAAA;;AAGF,QATD,MASE;EACC,mBAAA;;AAGF,QAbD,MAaE;EACC,mBAAA;;AAGF,QAjBD,MAiBE;EACC,mBAAA;;AAGF,QArBD,MAqBE;EACC,mBAAA;;AAGF,QAzBD,MAyBE;EACC,mBAAA;;AAKF,QADD,OACE;EACC,iBAAA;;AAGF,QALD,OAKE;EACC,mBAAA;;AAGF,QATD,OASE;EACC,oBAAA;;AAGF,QAbD,OAaE;EACC,oBAAA;;AAGF,QAjBD,OAiBE;EACC,oBAAA;;AAGF,QArBD,OAqBE;EACC,oBAAA;;AAGF,QAzBD,OAyBE;EACC,oBAAA;;AAOJ,OAAC;EACC,SAAA;;AAGF,OAAC;EACC,WAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAIA,OADD,IACE;EACC,aAAA;;AAGF,OALD,IAKE;EACC,eAAA;;AAGF,OATD,IASE;EACC,gBAAA;;AAGF,OAbD,IAaE;EACC,gBAAA;;AAGF,OAjBD,IAiBE;EACC,gBAAA;;AAGF,OArBD,IAqBE;EACC,gBAAA;;AAGF,OAzBD,IAyBE;EACC,gBAAA;;AAGF,OA7BD,IA6BE;EACC,2BAAA;;AAKF,OADD,KACE;EACC,cAAA;;AAGF,OALD,KAKE;EACC,gBAAA;;AAGF,OATD,KASE;EACC,iBAAA;;AAGF,OAbD,KAaE;EACC,iBAAA;;AAGF,OAjBD,KAiBE;EACC,iBAAA;;AAGF,OArBD,KAqBE;EACC,iBAAA;;AAGF,OAzBD,KAyBE;EACC,iBAAA;;AAGF,OA7BD,KA6BE;EACC,iBAAA;;AAKF,OADD,MACE;EACC,eAAA;;AAGF,OALD,MAKE;EACC,iBAAA;;AAGF,OATD,MASE;EACC,kBAAA;;AAGF,OAbD,MAaE;EACC,kBAAA;;AAGF,OAjBD,MAiBE;EACC,kBAAA;;AAGF,OArBD,MAqBE;EACC,kBAAA;;AAGF,OAzBD,MAyBE;EACC,kBAAA;;AAGF,OA7BD,MA6BE;EACC,kBAAA;;AAKF,OADD,OACE;EACC,gBAAA;;AAGF,OALD,OAKE;EACC,kBAAA;;AAGF,OATD,OASE;EACC,mBAAA;;AAGF,OAbD,OAaE;EACC,mBAAA;;AAGF,OAjBD,OAiBE;EACC,mBAAA;;AAGF,OArBD,OAqBE;EACC,mBAAA;;AAGF,OAzBD,OAyBE;EACC,mBAAA;;AAGF,OA7BD,OA6BE;EACC,mBAAA","file":"console.custom.css"} \ No newline at end of file +{"version":3,"sources":["console.custom.less"],"names":[],"mappings":"AAAA;EACE,aAAA;EACA,cAAA;EACA,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,mBAAA;EACA,yBAAA;EACA,yBAAA;EACA,0BAAA;;AAGF;EACE,iBAAA;EACA,qBAAA;EACA,sBAAA;EACA,yBAAA;;AAGF;EACE,2BAAA;EACA,8BAAA;EACA,gCAAA;EACA,mCAAA;;AAGF;EACE,kBAAA;;AAGF;EACE,kBAAA;;AAGF;EACE,cAAA;;AAGF;EACE,eAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,WAAA;EACA,eAAA;;AAGF;EACE,qBAAA;;AAKA,MAAC;EACC,WAAA;;AAGF,MAAC;EACC,YAAA;;AAKF,MAAC;EACC,WAAA;;AAGF,MAAC;EACC,YAAA;;AAKF,OAAC;EACC,cAAA;;AAGF,OAAC;EACC,cAAA;;AAGF,OAAC;EACC,WAAA;;AAGF,OAAC;EACC,WAAA;;AAGF,OAAC;EACC,WAAA;;AAKF,UAAC,GAAI;EACH,cAAA;;AAGF,UAAC,IAAK;EACJ,cAAA;;AAGF,UAAC,IAAK;EACJ,WAAA;;AAGF,UAAC,IAAK;EACJ,WAAA;;AAGF,UAAC,KAAM;EACL,WAAA;;AAKF,MAAC;EACC,mBAAA;;AAGF,MAAC;EACC,gBAAA;;AAGF,MAAC;EACC,iBAAA;;AAGF,MAAC;EACC,kBAAA;;AAGF,MAAC;EACC,sBAAA;;AAGF,MAAC;EACC,sBAAA;;AAKF,UAAC;EACC,iBAAA;;AAGF,UAAC;EACC,YAAY,0CAAZ;;AAGF,UAAC;EACC,YAAY,0CAAZ;;AAGF,UAAC;EACC,YAAY,0CAAZ;;AAGF,UAAC;EACC,YAAY,0CAAZ;;;AAMF,SAAC;EACC,WAAA;EACA,WAAA;EACA,cAAA;EACA,sBAAA;EACA,8BAAA;;AAGF,SAAC;EACC,gBAAA;EACA,mBAAA;EACA,gCAAA;EACA,kCAAA;;;AAKJ;EACE,SAAA;;AAIA,cAAC;EACC,gBAAA;;AAGF,cAAC;EACC,oCAAA;EACA,4BAAA;;AAGF,cAAC;EACC,qCAAA;EACA,6BAAA;;AAKF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,eAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAGF,MAAC;EACC,2BAAA;;AAKF,QAAC;EACC,UAAA;;AAGF,QAAC;EACC,YAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAGF,QAAC;EACC,aAAA;;AAIA,QADD,IACE;EACC,cAAA;;AAGF,QALD,IAKE;EACC,gBAAA;;AAGF,QATD,IASE;EACC,iBAAA;;AAGF,QAbD,IAaE;EACC,iBAAA;;AAGF,QAjBD,IAiBE;EACC,iBAAA;;AAGF,QArBD,IAqBE;EACC,iBAAA;;AAGF,QAzBD,IAyBE;EACC,iBAAA;;AAKF,QADD,KACE;EACC,eAAA;;AAGF,QALD,KAKE;EACC,iBAAA;;AAGF,QATD,KASE;EACC,kBAAA;;AAGF,QAbD,KAaE;EACC,kBAAA;;AAGF,QAjBD,KAiBE;EACC,kBAAA;;AAGF,QArBD,KAqBE;EACC,kBAAA;;AAGF,QAzBD,KAyBE;EACC,kBAAA;;AAKF,QADD,MACE;EACC,gBAAA;;AAGF,QALD,MAKE;EACC,kBAAA;;AAGF,QATD,MASE;EACC,mBAAA;;AAGF,QAbD,MAaE;EACC,mBAAA;;AAGF,QAjBD,MAiBE;EACC,mBAAA;;AAGF,QArBD,MAqBE;EACC,mBAAA;;AAGF,QAzBD,MAyBE;EACC,mBAAA;;AAKF,QADD,OACE;EACC,iBAAA;;AAGF,QALD,OAKE;EACC,mBAAA;;AAGF,QATD,OASE;EACC,oBAAA;;AAGF,QAbD,OAaE;EACC,oBAAA;;AAGF,QAjBD,OAiBE;EACC,oBAAA;;AAGF,QArBD,OAqBE;EACC,oBAAA;;AAGF,QAzBD,OAyBE;EACC,oBAAA;;AAOJ,OAAC;EACC,SAAA;;AAGF,OAAC;EACC,WAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAGF,OAAC;EACC,YAAA;;AAIA,OADD,IACE;EACC,aAAA;;AAGF,OALD,IAKE;EACC,eAAA;;AAGF,OATD,IASE;EACC,gBAAA;;AAGF,OAbD,IAaE;EACC,gBAAA;;AAGF,OAjBD,IAiBE;EACC,gBAAA;;AAGF,OArBD,IAqBE;EACC,gBAAA;;AAGF,OAzBD,IAyBE;EACC,gBAAA;;AAGF,OA7BD,IA6BE;EACC,2BAAA;;AAKF,OADD,KACE;EACC,cAAA;;AAGF,OALD,KAKE;EACC,gBAAA;;AAGF,OATD,KASE;EACC,iBAAA;;AAGF,OAbD,KAaE;EACC,iBAAA;;AAGF,OAjBD,KAiBE;EACC,iBAAA;;AAGF,OArBD,KAqBE;EACC,iBAAA;;AAGF,OAzBD,KAyBE;EACC,iBAAA;;AAGF,OA7BD,KA6BE;EACC,iBAAA;;AAKF,OADD,MACE;EACC,eAAA;;AAGF,OALD,MAKE;EACC,iBAAA;;AAGF,OATD,MASE;EACC,kBAAA;;AAGF,OAbD,MAaE;EACC,kBAAA;;AAGF,OAjBD,MAiBE;EACC,kBAAA;;AAGF,OArBD,MAqBE;EACC,kBAAA;;AAGF,OAzBD,MAyBE;EACC,kBAAA;;AAGF,OA7BD,MA6BE;EACC,kBAAA;;AAKF,OADD,OACE;EACC,gBAAA;;AAGF,OALD,OAKE;EACC,kBAAA;;AAGF,OATD,OASE;EACC,mBAAA;;AAGF,OAbD,OAaE;EACC,mBAAA;;AAGF,OAjBD,OAiBE;EACC,mBAAA;;AAGF,OArBD,OAqBE;EACC,mBAAA;;AAGF,OAzBD,OAyBE;EACC,mBAAA;;AAGF,OA7BD,OA6BE;EACC,mBAAA","file":"console.custom.css"} \ No newline at end of file diff --git a/public/static/theme/css/console.layout.css b/public/static/theme/css/console.layout.css index 3bcb995cf..37fcfe244 100644 --- a/public/static/theme/css/console.layout.css +++ b/public/static/theme/css/console.layout.css @@ -193,11 +193,26 @@ width: 77px; height: 77px; cursor: pointer; + position: relative; display: inline-block; border: 1px dashed #e2e2e2; background: url('../img/upimg.png') no-repeat center center; background-size: cover; } +.uploadimage:hover span.layui-icon { + display: inline-block; +} +.uploadimage span.layui-icon { + display: none; + width: 20px; + height: 20px; + text-align: center; + line-height: 22px; + color: #fff; + right: 0; + position: absolute; + background: rgba(0, 0, 0, 0.5); +} .uploadimagemtl { margin-right: 8px; } diff --git a/public/static/theme/css/console.layout.css.map b/public/static/theme/css/console.layout.css.map index ecb1d63d9..1e2f15451 100644 --- a/public/static/theme/css/console.layout.css.map +++ b/public/static/theme/css/console.layout.css.map @@ -1 +1 @@ -{"version":3,"sources":["console.layout.less"],"names":[],"mappings":"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","file":"console.layout.css"} \ No newline at end of file +{"version":3,"sources":["console.layout.less"],"names":[],"mappings":"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","file":"console.layout.css"} \ No newline at end of file diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 37981da64..72db66cf3 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -260,6 +260,8 @@ return array( 'think\\admin\\extend\\DataExtend' => $vendorDir . '/zoujingli/think-library/src/extend/DataExtend.php', 'think\\admin\\extend\\ExcelExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ExcelExtend.php', 'think\\admin\\extend\\HttpExtend' => $vendorDir . '/zoujingli/think-library/src/extend/HttpExtend.php', + 'think\\admin\\extend\\JsonRpcClient' => $vendorDir . '/zoujingli/think-library/src/extend/JsonRpcClient.php', + 'think\\admin\\extend\\JsonRpcServer' => $vendorDir . '/zoujingli/think-library/src/extend/JsonRpcServer.php', 'think\\admin\\helper\\DeleteHelper' => $vendorDir . '/zoujingli/think-library/src/helper/DeleteHelper.php', 'think\\admin\\helper\\FormHelper' => $vendorDir . '/zoujingli/think-library/src/helper/FormHelper.php', 'think\\admin\\helper\\PageHelper' => $vendorDir . '/zoujingli/think-library/src/helper/PageHelper.php', @@ -271,8 +273,6 @@ 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\\MessageService' => $vendorDir . '/zoujingli/think-library/src/service/MessageService.php', 'think\\admin\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 67b497f96..1ab3fb5d7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -393,6 +393,8 @@ class ComposerStaticInit9eebf462f38fc6a0db482795c8caf813 'think\\admin\\extend\\DataExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/DataExtend.php', 'think\\admin\\extend\\ExcelExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ExcelExtend.php', 'think\\admin\\extend\\HttpExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/HttpExtend.php', + 'think\\admin\\extend\\JsonRpcClient' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/JsonRpcClient.php', + 'think\\admin\\extend\\JsonRpcServer' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/JsonRpcServer.php', 'think\\admin\\helper\\DeleteHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/DeleteHelper.php', 'think\\admin\\helper\\FormHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/FormHelper.php', 'think\\admin\\helper\\PageHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/PageHelper.php', @@ -404,8 +406,6 @@ class ComposerStaticInit9eebf462f38fc6a0db482795c8caf813 '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\\MessageService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MessageService.php', 'think\\admin\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6a2d95005..3d375cc92 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": "be60abc6b39cbeca57a0b25f8e1a3d38e18307c0" + "reference": "1cc8c40ac3bcdfa92dfb831445635946d69a6582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/be60abc6b39cbeca57a0b25f8e1a3d38e18307c0", - "reference": "be60abc6b39cbeca57a0b25f8e1a3d38e18307c0", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1cc8c40ac3bcdfa92dfb831445635946d69a6582", + "reference": "1cc8c40ac3bcdfa92dfb831445635946d69a6582", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-02-28T01:51:28+00:00", + "time": "2020-03-03T02:45:58+00:00", "type": "library", "extra": { "think": { @@ -989,17 +989,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.16", - "version_normalized": "1.2.16.0", + "version": "v1.2.17", + "version_normalized": "1.2.17.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9" + "reference": "98f6e82311a364220a677cdfd56dc9f97851ab24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/01fa1479e8c4d7a0875de96787a2bcaeacc755e9", - "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/98f6e82311a364220a677cdfd56dc9f97851ab24", + "reference": "98f6e82311a364220a677cdfd56dc9f97851ab24", "shasum": "", "mirrors": [ { @@ -1017,7 +1017,7 @@ "ext-simplexml": "*", "php": ">=5.4" }, - "time": "2020-01-04T08:51:50+00:00", + "time": "2020-03-02T11:08:34+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/services.php b/vendor/services.php index 0d1535dcd..d356f8d5d 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php b/vendor/zoujingli/think-library/src/extend/JsonRpcClient.php similarity index 87% rename from vendor/zoujingli/think-library/src/service/JsonRpcClientService.php rename to vendor/zoujingli/think-library/src/extend/JsonRpcClient.php index 0fe60cea7..7c308dd56 100644 --- a/vendor/zoujingli/think-library/src/service/JsonRpcClientService.php +++ b/vendor/zoujingli/think-library/src/extend/JsonRpcClient.php @@ -13,17 +13,14 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace think\admin\service; - -use think\admin\extend\CodeExtend; -use think\admin\Service; +namespace think\admin\extend; /** - * JsonRpc 客户端服务 - * Class JsonRpcClientService - * @package think\admin\service + * JsonRpc 客户端 + * Class JsonRpcClient + * @package think\admin\extend */ -class JsonRpcClientService extends Service +class JsonRpcClient { /** * 请求ID @@ -38,15 +35,13 @@ class JsonRpcClientService extends Service private $proxy; /** - * 创建连接对象 - * @param string $proxy - * @return mixed + * JsonRpcClient constructor. + * @param $proxy */ - public function create($proxy) + public function __construct($proxy) { $this->id = CodeExtend::uniqidNumber(); $this->proxy = $proxy; - return $this; } /** diff --git a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php b/vendor/zoujingli/think-library/src/extend/JsonRpcServer.php similarity index 83% rename from vendor/zoujingli/think-library/src/service/JsonRpcServerService.php rename to vendor/zoujingli/think-library/src/extend/JsonRpcServer.php index 37e279994..0ad1dc75c 100644 --- a/vendor/zoujingli/think-library/src/service/JsonRpcServerService.php +++ b/vendor/zoujingli/think-library/src/extend/JsonRpcServer.php @@ -13,18 +13,44 @@ // | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary // +---------------------------------------------------------------------- -namespace think\admin\service; +namespace think\admin\extend; -use think\admin\Service; +use think\App; +use think\Container; use think\exception\HttpResponseException; /** - * JsonRpc 服务端服务 - * Class JsonRpcServerService - * @package think\admin\service + * JsonRpc 服务端 + * Class JsonRpcServer + * @package think\admin\extend */ -class JsonRpcServerService extends Service +class JsonRpcServer { + /** + * 当前App对象 + * @var App + */ + protected $app; + + /** + * JsonRpcServer constructor. + * @param App $app + */ + public function __construct(App $app) + { + $this->app = $app; + } + + /** + * 静态实例对象 + * @param array $args + * @return static + */ + public static function instance(...$args): JsonRpcServer + { + return Container::getInstance()->make(static::class, $args); + } + /** * 设置监听对象 * @param mixed $object @@ -62,5 +88,4 @@ class JsonRpcServerService extends Service throw new HttpResponseException(json($response)->contentType('text/javascript')); } } - } \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/AliPay/Transfer.php b/vendor/zoujingli/wechat-developer/AliPay/Transfer.php index bb745cf4b..607d4785a 100644 --- a/vendor/zoujingli/wechat-developer/AliPay/Transfer.php +++ b/vendor/zoujingli/wechat-developer/AliPay/Transfer.php @@ -35,7 +35,7 @@ class Transfer extends BasicAliPay } /** - * 创建数据操作 + * 旧版 向指定支付宝账户转账 * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException @@ -45,4 +45,44 @@ class Transfer extends BasicAliPay { return $this->getResult($options); } + + /** + * 新版 向指定支付宝账户转账 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function create($options = []) + { + $this->options->set('method', 'alipay.fund.trans.uni.transfer'); + return $this->getResult($options); + } + + /** + * 新版 转账业务单据查询接口 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function queryResult($options = []) + { + $this->options->set('method', 'alipay.fund.trans.common.query'); + return $this->getResult($options); + + } + + /** + * 新版 支付宝资金账户资产查询接口 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function queryAccount($options = []) + { + $this->options->set('method', 'alipay.fund.account.query'); + return $this->getResult($options); + } } \ No newline at end of file diff --git a/vendor/zoujingli/wechat-developer/We.php b/vendor/zoujingli/wechat-developer/We.php index f4bb06b36..a81ff1a25 100644 --- a/vendor/zoujingli/wechat-developer/We.php +++ b/vendor/zoujingli/wechat-developer/We.php @@ -81,7 +81,7 @@ class We * 定义当前版本 * @var string */ - const VERSION = '1.2.13'; + const VERSION = '1.2.17'; /** * 静态配置 diff --git a/vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php new file mode 100644 index 000000000..1d2b289e4 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-account.php @@ -0,0 +1,37 @@ +queryAccount([ + 'alipay_user_id' => $config['appid'], // 订单号 + 'account_scene_code' => 'SCENE_000_000_000', + ]); + echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php
new file mode 100644
index 000000000..39d0fc429
--- /dev/null
+++ b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-create.php
@@ -0,0 +1,44 @@
+create([
+        'out_biz_no'   => time(), // 订单号
+        'trans_amount' => '10', // 转账金额
+        'product_code' => 'TRANS_ACCOUNT_NO_PWD',
+        'biz_scene'    => 'DIRECT_TRANSFER',
+        'payee_info'   => [
+            'identity'      => 'zoujingli@qq.com',
+            'identity_type' => 'ALIPAY_LOGON_ID',
+            'name'          => '邹景立',
+        ],
+    ]);
+    echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php
new file mode 100644
index 000000000..7e7d99fea
--- /dev/null
+++ b/vendor/zoujingli/wechat-developer/_test/alipay-transfer-query.php
@@ -0,0 +1,38 @@
+queryResult([
+        'out_biz_no'   => '201808080001', // 订单号
+        'product_code' => 'TRANS_ACCOUNT_NO_PWD',
+        'biz_scene'    => 'DIRECT_TRANSFER',
+    ]);
+    echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+