mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
ComposerUpate
This commit is contained in:
Anyon
parent
5b489741bb
commit
85ab26b93f
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
{"version":3,"sources":["console.layout.less"],"names":[],"mappings":"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","file":"console.layout.css"}
|
||||
{"version":3,"sources":["console.layout.less"],"names":[],"mappings":"AACA,aACE,aACE,QAAA,CACA,QAAA,CACA,cAJJ,aAOE,aACE,QAAA,CACA,QAAA,CACA,cAVJ,aAOE,YAKE,aACE,gBAbN,aAOE,YAKE,YAGE,kBACE,kBAhBR,aAOE,YAKE,YAOE,oBACE,WAAA,CACA,WAAA,CACA,gBAAA,CACA,sCAAA,CACA,gBAOR,cACE,WAAA,CACA,kBAAA,YAFF,aAIE,yBAEE,mCAAA,CACA,wCAPJ,aAUE,oBAVF,aAWE,qBACE,UAZJ,aAeE,aACE,UAAA,CACA,WAAA,CACA,WAAA,CACA,cAAA,CACA,gBAAA,CACA,uCAAA,CACA,yCAtBJ,aAeE,YASE,KACE,aAAA,CACA,gBA1BN,aA8BE,iBACE,WAAA,CACA,iBAEA,aAJF,gBAIG,YACC,mBAnCN,aA8BE,gBAQE,GACE,UAAA,YAvCN,aA8BE,gBAYE,kBACE,QAAA,CACA,SAAA,CACA,WAAA,CACA,iBA9CN,aA8BE,gBAYE,iBAME,GACE,mBAGF,aAtBJ,gBAYE,iBAUG,WAAY,GACX,gBAGF,aA1BJ,gBAYE,iBAcG,WAAY,EAAI,MACf,WAzDR,aA8BE,gBAYE,iBAkBE,GAAG,GACD,SAAA,CACA,UAAA,CACA,iBAAA,CACA,6BAhER,aAqEE,gBArEF,aAqEkB,gBAAe,OAC7B,YAAA,YAtEJ,aAyEE,oBACE,GAAK,GACH,sCAAA,CACA,qCAMN,aAEE,YACE,gBACE,YAAA,YAJN,aAEE,YAKE,oBACE,UAAA,YARN,aAEE,YASE,iBACE,wCAZN,aAEE,YASE,gBAGE,GACE,WAAA,CACA,aAAA,CACA,gBAAA,CACA,UAAA,YAEA,aAlBN,YASE,gBAGE,EAMG,OACC,6BAAA,YArBV,aAEE,YAwBE,mBACE,kBAAA,YA3BN,aAEE,YA4BE,oBAAoB,GAClB,sBAAA,CACA,gBAAA,YAIJ,aAAC,uBACC,aACE,UAFJ,aAAC,uBAKC,YACE,iBACE,YAAA,YAPN,aAAC,uBAKC,YAKE,gBACE,GACE,UAZR,aAAC,uBAKC,YAKE,gBAKE,WACE,aAhBR,aAAC,uBAKC,YAKE,gBASE,WACE,oBAAA,YACA,SAAA,YArBR,aAAC,uBAKC,YAKE,gBAcE,kBACE,SAAA,CACA,wBAAA,CACA,gCAAA,YAIJ,aA/BH,uBAKC,aALF,aAAC,uBAKC,YA0BK,iBA/BP,aAAC,uBAKC,YA0BsB,oBAClB,UAAA,CACA,kBAjCN,aAAC,uBAqCC,wBAAwB,GACtB,oBAAA,CACA,kBAAmB,cAAnB,CACA,UAAW,cAAX,CACA,cAAe,eAInB,aAAC,uBACC,aACE,MAAA,YAFJ,aAAC,uBAKC,aACE,aANJ,aAAC,uBASC,yBACE,aAMN,sBACE,iBADF,qBAGE,MACE,UAAA,CACA,cALJ,qBAQE,IACE,WAAA,CACA,oBAAA,CACA,QAAA,CACA,UAZJ,qBAQE,GAME,IACE,SAAA,CACA,qBAEA,qBAVJ,GAME,GAIG,QACC,UADF,qBAVJ,GAME,GAIG,OAGC,MACE,UAAA,CACA,iBAAA,CACA,iBAAA,CACA,kBAAA,YAzBV,qBAQE,GAME,GAeE,GA7BN,qBAQE,GAME,GAeO,MACH,UAAA,CACA,UAAA,CACA,WAAA,CACA,wBAAA,CACA,oBAAA,CACA,gBAAA,CACA,iBAAA,CACA,iBArCR,qBAQE,GAME,GA0BE,MACE,kBAAA,CACA,eA1CR,qBAQE,GAME,GA+BE,EAAG,OACD,kBAAA,CACA,qBAOR,gBACE,WAAA,CACA,YAAA,CACA,iBAAA,CACA,4DAJF,eAME,gBACE,UAAA,CACA,UAAA,CACA,aAAA,CACA,eAAA,CACA,cAAA,CACA,gBAAA,CACA,iBAAA,CACA,kBAAA,CACA,sBAAA,CACA,gBAAA,CACA,gBAAA,CACA,mBAAA,CACA,qBAAA,CACA,wBAAA,CACA,4BArBJ,eAwBE,cACE,QAAA,CACA,MAAA,CACA,OAAA,CACA,QAAA,CACA,iBAAA,CACA,qBAAA,CACA,mBA/BJ,eAwBE,aASE,QACE,UAAA,CACA,YAnCN,eAuCE,gBACE,MAAA,CACA,OAAA,CACA,QAAA,CACA,QAAA,CACA,iBAAA,CACA,iBAAA,CACA,qBAAA,CACA,oBAAA,CACA,4DAhDJ,eAuCE,eAWE,IACE,UAAA,CACA,YAAA,CACA,iBAAA,CACA,iBAAA,CACA,iBAvDN,eAuCE,eAWE,GAOE,GACE,UAAA,CACA,aAAA,CACA,eAAA,CACA,kCAAA,CACA,6BAAA,CACA,eAAA,CACA,kBAAA,CACA,aAAA,CACA,kBAAA,CACA,oBAAA,CACA,sBAAA,CACA,iBAEA,eAhCN,eAWE,GAOE,EAcG,OACC,4BAGF,eApCN,eAWE,GAOE,EAkBG,QACC,wBAAA,YACA,2BA7EV,eAuCE,eAWE,GAOE,EAuBE,KAAI,QACF,SAAA,CACA,UAAA,CACA,QAAS,EAAT,CACA,qBApFV,eAuCE,eAWE,GAsCE,QACE,OAAA,CACA,SAAA,CACA,UAAA,CACA,WAAA,CACA,YAAA,CACA,cAAA,CACA,iBAAA,CACA,iBAAA,CACA,iBAGF,eA7DJ,eAWE,GAkDG,MAAO,QACN,qBAEA,eAhEN,eAWE,GAkDG,MAAO,OAGL,OACC,UAAA,YACA,eAAA,YAzGV,eAuCE,eAuEE,WACE,UAAA,CACA,WAAA,CACA,6BAAA,CACA,sDAlHN,eAuCE,eA8EE,WArHJ,eAuCE,eA8Ea,WACT,oBAAA,CACA,sBAvHN,eAuCE,eAmFE,WACE,SAAA,CACA,UAAA,CACA,gBAAA,CACA,yDA9HN,eAuCE,eA0FE,WACE,UAAA,CACA,WAAA,CACA,WAAA,CACA,aAAA,CACA,iBAAA,CACA,wBAAA,CACA,yBAxIN,eAuCE,eA0FE,UASE,IA1IN,eAuCE,eA0FE,UASM,GAAG,IACL,UAAA,CACA,SAAA,CACA,UAAA,CACA,aAAA,CACA,WA/IR,eAuCE,eA0FE,UAiBE,GAAG,GACD,GACE,aAAA,CACA,mCAEA,eAhHR,eA0FE,UAiBE,GAAG,GACD,EAIG,eACC,kBAAA,CACA,gCAIJ,eAtHN,eA0FE,UAiBE,GAAG,GAWA,WAAY,EAAC,eACZ,yBA9JV,eAuCE,eA4HE,QACE,QAAA,CACA,iBAAA,CACA,iBAtKN,eAuCE,eAkIE,WAzKJ,eAuCE,eAkIa,YACT,OAAA,CACA,QAAA,CACA,UAAA,CACA,oBAAA,CACA,6BAAA,CACA,qBAAA,CACA,uBAhLN,eAuCE,eA4IE,WACE,SAAA,CACA,WAAA,CACA,yBAtLN,eAuCE,eAkJE,YACE,SAAA,CACA,WAAA,CACA","file":"console.layout.css"}
|
||||
24
vendor/composer/installed.json
vendored
24
vendor/composer/installed.json
vendored
@ -177,17 +177,17 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/options-resolver",
|
||||
"version": "v3.4.42",
|
||||
"version_normalized": "3.4.42.0",
|
||||
"version": "v3.4.43",
|
||||
"version_normalized": "3.4.43.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/options-resolver.git",
|
||||
"reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd"
|
||||
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/3b9fe6db7fe3694307d182dd73983584af77d5fd",
|
||||
"reference": "3b9fe6db7fe3694307d182dd73983584af77d5fd",
|
||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
|
||||
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -199,7 +199,7 @@
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8"
|
||||
},
|
||||
"time": "2020-05-21T13:02:25+00:00",
|
||||
"time": "2020-07-08T17:07:26+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
@ -460,17 +460,17 @@
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/wechat-developer",
|
||||
"version": "v1.2.22",
|
||||
"version_normalized": "1.2.22.0",
|
||||
"version": "v1.2.23",
|
||||
"version_normalized": "1.2.23.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
|
||||
"reference": "7eb7f6a2d8aa4a105208c7dff6428dcecd0c7059"
|
||||
"reference": "f070dd076a4137ff4e86600b63d1ccfe2f744a92"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/7eb7f6a2d8aa4a105208c7dff6428dcecd0c7059",
|
||||
"reference": "7eb7f6a2d8aa4a105208c7dff6428dcecd0c7059",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/f070dd076a4137ff4e86600b63d1ccfe2f744a92",
|
||||
"reference": "f070dd076a4137ff4e86600b63d1ccfe2f744a92",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -490,7 +490,7 @@
|
||||
"ext-xml": "*",
|
||||
"php": ">=5.4"
|
||||
},
|
||||
"time": "2020-07-04T07:24:41+00:00",
|
||||
"time": "2020-07-20T06:55:26+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
|
||||
@ -1080,6 +1080,6 @@ class OptionsResolver implements Options
|
||||
return null;
|
||||
}
|
||||
|
||||
return method_exists($type, 'getName') ? $type->getName() : (string) $type;
|
||||
return $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
|
||||
}
|
||||
}
|
||||
|
||||
2
vendor/zoujingli/wechat-developer/We.php
vendored
2
vendor/zoujingli/wechat-developer/We.php
vendored
@ -86,7 +86,7 @@ class We
|
||||
* 定义当前版本
|
||||
* @var string
|
||||
*/
|
||||
const VERSION = '1.2.22';
|
||||
const VERSION = '1.2.23';
|
||||
|
||||
/**
|
||||
* 静态配置
|
||||
|
||||
@ -94,7 +94,7 @@ class BasicWeChat
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取访问accessToken
|
||||
* 获取访问 AccessToken
|
||||
* @return string
|
||||
* @throws \WeChat\Exceptions\InvalidResponseException
|
||||
* @throws \WeChat\Exceptions\LocalCacheException
|
||||
@ -166,15 +166,15 @@ class BasicWeChat
|
||||
{
|
||||
try {
|
||||
return Tools::json2arr(Tools::get($url));
|
||||
} catch (InvalidResponseException $e) {
|
||||
} catch (InvalidResponseException $exception) {
|
||||
if (isset($this->currentMethod['method']) && empty($this->isTry)) {
|
||||
if (in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
|
||||
if (in_array($exception->getCode(), ['40014', '40001', '41001', '42001'])) {
|
||||
$this->delAccessToken();
|
||||
$this->isTry = true;
|
||||
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
|
||||
}
|
||||
}
|
||||
throw new InvalidResponseException($e->getMessage(), $e->getCode());
|
||||
throw new InvalidResponseException($exception->getMessage(), $exception->getCode());
|
||||
}
|
||||
}
|
||||
|
||||
@ -190,13 +190,15 @@ class BasicWeChat
|
||||
protected function httpPostForJson($url, array $data, $buildToJson = true)
|
||||
{
|
||||
try {
|
||||
return Tools::json2arr(Tools::post($url, $buildToJson ? Tools::arr2json($data) : $data));
|
||||
} catch (InvalidResponseException $e) {
|
||||
if (!$this->isTry && in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
|
||||
$options = [];
|
||||
if ($buildToJson) $options['headers'] = ['Content-Type: application/json'];
|
||||
return Tools::json2arr(Tools::post($url, $buildToJson ? Tools::arr2json($data) : $data, $options));
|
||||
} catch (InvalidResponseException $exception) {
|
||||
if (!$this->isTry && in_array($exception->getCode(), ['40014', '40001', '41001', '42001'])) {
|
||||
[$this->delAccessToken(), $this->isTry = true];
|
||||
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
|
||||
}
|
||||
throw new InvalidResponseException($e->getMessage(), $e->getCode());
|
||||
throw new InvalidResponseException($exception->getMessage(), $exception->getCode());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user