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 2020-08-17 10:22:58 +08:00
parent ef3c6ce7f3
commit b6e72b7ee1
9 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
composer.lock generated
View File

@ -937,12 +937,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "194317296e5d7483727d895670d96d73b5da0167" "reference": "08aff82bffe0e4b6356373c65ddf7c2d521598a5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/194317296e5d7483727d895670d96d73b5da0167", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/08aff82bffe0e4b6356373c65ddf7c2d521598a5",
"reference": "194317296e5d7483727d895670d96d73b5da0167", "reference": "08aff82bffe0e4b6356373c65ddf7c2d521598a5",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -986,20 +986,20 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://thinkadmin.top", "homepage": "http://thinkadmin.top",
"time": "2020-08-14T06:51:29+00:00" "time": "2020-08-14T09:41:49+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",
"version": "v1.2.23", "version": "v1.2.24",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git", "url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "f070dd076a4137ff4e86600b63d1ccfe2f744a92" "reference": "2e5ca0d48fca8014eea504db6daec2b97d53d768"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/f070dd076a4137ff4e86600b63d1ccfe2f744a92", "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/2e5ca0d48fca8014eea504db6daec2b97d53d768",
"reference": "f070dd076a4137ff4e86600b63d1ccfe2f744a92", "reference": "2e5ca0d48fca8014eea504db6daec2b97d53d768",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -1052,7 +1052,7 @@
"wechatpay", "wechatpay",
"wepay" "wepay"
], ],
"time": "2020-07-20T06:55:26+00:00" "time": "2020-08-16T07:01:12+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],

20
vendor/composer/installed.json vendored
View File

@ -963,12 +963,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "194317296e5d7483727d895670d96d73b5da0167" "reference": "08aff82bffe0e4b6356373c65ddf7c2d521598a5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/194317296e5d7483727d895670d96d73b5da0167", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/08aff82bffe0e4b6356373c65ddf7c2d521598a5",
"reference": "194317296e5d7483727d895670d96d73b5da0167", "reference": "08aff82bffe0e4b6356373c65ddf7c2d521598a5",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -984,7 +984,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-08-14T06:51:29+00:00", "time": "2020-08-14T09:41:49+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {
@ -1017,17 +1017,17 @@
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",
"version": "v1.2.23", "version": "v1.2.24",
"version_normalized": "1.2.23.0", "version_normalized": "1.2.24.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git", "url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "f070dd076a4137ff4e86600b63d1ccfe2f744a92" "reference": "2e5ca0d48fca8014eea504db6daec2b97d53d768"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/f070dd076a4137ff4e86600b63d1ccfe2f744a92", "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/2e5ca0d48fca8014eea504db6daec2b97d53d768",
"reference": "f070dd076a4137ff4e86600b63d1ccfe2f744a92", "reference": "2e5ca0d48fca8014eea504db6daec2b97d53d768",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -1047,7 +1047,7 @@
"ext-xml": "*", "ext-xml": "*",
"php": ">=5.4" "php": ">=5.4"
}, },
"time": "2020-07-20T06:55:26+00:00", "time": "2020-08-16T07:01:12+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-08-14 15:03:14 // This file is automatically generated at:2020-08-17 10:22:34
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

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

@ -72,7 +72,7 @@ class MenuService extends Service
elseif ($menu['url'] === '#') unset($menus[$key]); elseif ($menu['url'] === '#') unset($menus[$key]);
elseif (preg_match('|^https?://|i', $menu['url'])) continue; elseif (preg_match('|^https?://|i', $menu['url'])) continue;
else { else {
$node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3)); $node = join('/', array_slice(explode('/', $menu['url']), 0, 3));
$menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}"); $menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}");
if (!AdminService::instance()->check($node)) unset($menus[$key]); if (!AdminService::instance()->check($node)) unset($menus[$key]);
} }

4
vendor/zoujingli/wechat-developer/We.php vendored
View File

@ -86,7 +86,7 @@ class We
* 定义当前版本 * 定义当前版本
* @var string * @var string
*/ */
const VERSION = '1.2.23'; const VERSION = '1.2.24';
/** /**
* 静态配置 * 静态配置
@ -136,4 +136,4 @@ class We
throw new InvalidInstanceException("class {$name} not found"); throw new InvalidInstanceException("class {$name} not found");
} }
} }

7
vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php vendored
View File

@ -360,6 +360,11 @@ class Tools
$mycurl = new MyCurlFile((array)$value); $mycurl = new MyCurlFile((array)$value);
$data[$key] = $mycurl->get(); $data[$key] = $mycurl->get();
array_push(self::$cache_curl, $mycurl->tempname); array_push(self::$cache_curl, $mycurl->tempname);
} elseif (is_array($value) && isset($value['datatype']) && $value['datatype'] === 'MY_CURL_FILE') {
$build = false;
$mycurl = new MyCurlFile($value);
$data[$key] = $mycurl->get();
array_push(self::$cache_curl, $mycurl->tempname);
} elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) { } elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) { if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
$build = false; $build = false;
@ -458,4 +463,4 @@ class Tools
file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true); file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true);
return self::$cache_path . $name; return self::$cache_path . $name;
} }
} }

8
vendor/zoujingli/wechat-developer/WeMini/Newtmpl.php vendored
View File

@ -73,8 +73,9 @@ class Newtmpl extends BasicWeChat
public function getPubTemplateTitleList($ids) public function getPubTemplateTitleList($ids)
{ {
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=ACCESS_TOKEN'; $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=ACCESS_TOKEN';
$url .= '&' . http_build_query(['ids' => $ids, 'start' => '0', 'limit' => '30']);
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['ids' => $ids, 'start' => '0', 'limit' => '30'], true); return $this->callGetApi($url);
} }
/** /**
@ -87,8 +88,9 @@ class Newtmpl extends BasicWeChat
public function getPubTemplateKeyWordsById($tid) public function getPubTemplateKeyWordsById($tid)
{ {
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=ACCESS_TOKEN'; $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=ACCESS_TOKEN';
$url .= '&' . http_build_query(['tid' => $tid]);
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['tid' => $tid], true); return $this->callGetApi($url);
} }
/** /**
@ -117,7 +119,7 @@ class Newtmpl extends BasicWeChat
{ {
$url = 'https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=ACCESS_TOKEN'; $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, [], true); return $this->callGetApi($url);
} }
/** /**

5
vendor/zoujingli/wechat-developer/_test/alipay-app.php vendored
View File

@ -28,10 +28,9 @@ try {
$result = $pay->apply([ $result = $pay->apply([
'out_trade_no' => time(), // 商户订单号 'out_trade_no' => time(), // 商户订单号
'total_amount' => '1', // 支付金额 'total_amount' => '1', // 支付金额
'subject' => 'test subject', // 支付订单描述 'subject' => '支付宝订单标题', // 支付订单描述
]); ]);
echo '<pre>'; echo $result;
var_export($result);
} catch (\Exception $e) { } catch (\Exception $e) {
echo $e->getMessage(); echo $e->getMessage();
} }

2
vendor/zoujingli/wechat-developer/_test/alipay-bill.php vendored
View File

@ -26,7 +26,7 @@ try {
// 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query // 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query
$result = $pay->apply([ $result = $pay->apply([
'bill_date' => '2018-10-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM) 'bill_date' => '2020-07-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
'bill_type' => 'signcustomer', // 账单类型(trade指商户基于支付宝交易收单的业务账单,signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单) 'bill_type' => 'signcustomer', // 账单类型(trade指商户基于支付宝交易收单的业务账单,signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单)
]); ]);
echo '<pre>'; echo '<pre>';