blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-05-21 22:39:16 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-09-23 11:01:01 +08:00
parent 5692b7b55f
commit 6bad3ded9c
8 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vendor/composer/installed.json vendored
View File

@ -223,17 +223,17 @@
}, },
{ {
"name": "league/mime-type-detection", "name": "league/mime-type-detection",
"version": "1.4.0", "version": "1.5.0",
"version_normalized": "1.4.0.0", "version_normalized": "1.5.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git", "url": "https://github.com/thephpleague/mime-type-detection.git",
"reference": "fda190b62b962d96a069fcc414d781db66d65b69" "reference": "ea2fbfc988bade315acd5967e6d02274086d0f28"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69", "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ea2fbfc988bade315acd5967e6d02274086d0f28",
"reference": "fda190b62b962d96a069fcc414d781db66d65b69", "reference": "ea2fbfc988bade315acd5967e6d02274086d0f28",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -250,7 +250,7 @@
"phpstan/phpstan": "^0.12.36", "phpstan/phpstan": "^0.12.36",
"phpunit/phpunit": "^8.5.8" "phpunit/phpunit": "^8.5.8"
}, },
"time": "2020-08-09T10:34:01+00:00", "time": "2020-09-21T18:10:53+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -958,17 +958,17 @@
}, },
{ {
"name": "zoujingli/think-library", "name": "zoujingli/think-library",
"version": "v6.0.9", "version": "v6.0.10",
"version_normalized": "6.0.9.0", "version_normalized": "6.0.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "6fa904cad8bde5b2d04750d17323fe715a0c2b4d" "reference": "9f778a0eaa1ae3c7dd15cd6f9812c94a29e438ae"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6fa904cad8bde5b2d04750d17323fe715a0c2b4d", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9f778a0eaa1ae3c7dd15cd6f9812c94a29e438ae",
"reference": "6fa904cad8bde5b2d04750d17323fe715a0c2b4d", "reference": "9f778a0eaa1ae3c7dd15cd6f9812c94a29e438ae",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -985,7 +985,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-09-19T10:23:24+00:00", "time": "2020-09-23T02:52:29+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php vendored
View File

@ -181,6 +181,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap
'dart' => 'application/vnd.dart', 'dart' => 'application/vnd.dart',
'dataless' => 'application/vnd.fdsn.seed', 'dataless' => 'application/vnd.fdsn.seed',
'davmount' => 'application/davmount+xml', 'davmount' => 'application/davmount+xml',
'dbf' => 'application/vnd.dbf',
'dbk' => 'application/docbook+xml', 'dbk' => 'application/docbook+xml',
'dcr' => 'application/x-director', 'dcr' => 'application/x-director',
'dcurl' => 'text/vnd.curl.dcurl', 'dcurl' => 'text/vnd.curl.dcurl',
@ -468,6 +469,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap
'ksp' => 'application/vnd.kde.kspread', 'ksp' => 'application/vnd.kde.kspread',
'ktr' => 'application/vnd.kahootz', 'ktr' => 'application/vnd.kahootz',
'ktx' => 'image/ktx', 'ktx' => 'image/ktx',
'ktx2' => 'image/ktx2',
'ktz' => 'application/vnd.kahootz', 'ktz' => 'application/vnd.kahootz',
'kwd' => 'application/vnd.kde.kword', 'kwd' => 'application/vnd.kde.kword',
'kwt' => 'application/vnd.kde.kword', 'kwt' => 'application/vnd.kde.kword',

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-09-19 18:29:10 // This file is automatically generated at:2020-09-23 11:00:47
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/Library.php vendored
View File

@ -41,7 +41,7 @@ class Library extends Service
/** /**
* 扩展库版本号 * 扩展库版本号
*/ */
const VERSION = '6.0.9'; const VERSION = '6.0.10';
/** /**
* 启动服务 * 启动服务

8
vendor/zoujingli/think-library/src/extend/HttpExtend.php vendored
View File

@ -99,14 +99,14 @@ class HttpExtend
$curl = curl_init(); $curl = curl_init();
// Agent 代理设置 // Agent 代理设置
curl_setopt($curl, CURLOPT_USERAGENT, static::getUserAgent()); curl_setopt($curl, CURLOPT_USERAGENT, static::getUserAgent());
// CURL 头信息设置
if (!empty($options['headers'])) {
curl_setopt($curl, CURLOPT_HTTPHEADER, $options['headers']);
}
// Cookie 信息设置 // Cookie 信息设置
if (!empty($options['cookie'])) { if (!empty($options['cookie'])) {
curl_setopt($curl, CURLOPT_COOKIE, $options['cookie']); curl_setopt($curl, CURLOPT_COOKIE, $options['cookie']);
} }
// Header 头信息设置
if (!empty($options['headers'])) {
curl_setopt($curl, CURLOPT_HTTPHEADER, $options['headers']);
}
if (!empty($options['cookie_file'])) { if (!empty($options['cookie_file'])) {
curl_setopt($curl, CURLOPT_COOKIEJAR, $options['cookie_file']); curl_setopt($curl, CURLOPT_COOKIEJAR, $options['cookie_file']);
curl_setopt($curl, CURLOPT_COOKIEFILE, $options['cookie_file']); curl_setopt($curl, CURLOPT_COOKIEFILE, $options['cookie_file']);

8
vendor/zoujingli/think-library/src/service/MessageService.php vendored
View File

@ -137,7 +137,7 @@ class MessageService extends Service
public function sendChinaSms($phone, $content, $productid = '676767') public function sendChinaSms($phone, $content, $productid = '676767')
{ {
$tkey = date("YmdHis"); $tkey = date("YmdHis");
$result = HttpExtend::post('http://www.ztsms.cn/sendNSms.do', [ $result = HttpExtend::get('http://www.ztsms.cn/sendNSms.do', [
'tkey' => $tkey, 'tkey' => $tkey,
'mobile' => $phone, 'mobile' => $phone,
'content' => $content, 'content' => $content,
@ -202,7 +202,7 @@ class MessageService extends Service
public function queryChinaSmsBalance() public function queryChinaSmsBalance()
{ {
$tkey = date("YmdHis"); $tkey = date("YmdHis");
$result = HttpExtend::post('http://www.ztsms.cn/balanceN.do', [ $result = HttpExtend::get('http://www.ztsms.cn/balanceN.do', [
'username' => $this->chinaUsername, 'tkey' => $tkey, 'username' => $this->chinaUsername, 'tkey' => $tkey,
'password' => md5(md5($this->chinaPassword) . $tkey), 'password' => md5(md5($this->chinaPassword) . $tkey),
]); ]);
@ -246,7 +246,7 @@ class MessageService extends Service
public function sendGlobeSms($code, $mobile, $content) public function sendGlobeSms($code, $mobile, $content)
{ {
$tkey = date("YmdHis"); $tkey = date("YmdHis");
$result = HttpExtend::post('http://intl.zthysms.com/intSendSms.do', [ $result = HttpExtend::get('http://intl.zthysms.com/intSendSms.do', [
'tkey' => $tkey, 'code' => $code, 'mobile' => $mobile, 'tkey' => $tkey, 'code' => $code, 'mobile' => $mobile,
'content' => $content, 'username' => sysconf('sms_zt_username2'), 'content' => $content, 'username' => sysconf('sms_zt_username2'),
'password' => md5(md5(sysconf('sms_zt_password2')) . $tkey), 'password' => md5(md5(sysconf('sms_zt_password2')) . $tkey),
@ -264,7 +264,7 @@ class MessageService extends Service
public function queryGlobeSmsBalance() public function queryGlobeSmsBalance()
{ {
$tkey = date("YmdHis"); $tkey = date("YmdHis");
$result = HttpExtend::post('http://intl.zthysms.com/intBalance.do', [ $result = HttpExtend::get('http://intl.zthysms.com/intBalance.do', [
'username' => $this->globeUsername, 'tkey' => $tkey, 'password' => md5(md5($this->globePassword) . $tkey), 'username' => $this->globeUsername, 'tkey' => $tkey, 'password' => md5(md5($this->globePassword) . $tkey),
]); ]);
if (!is_numeric($result) && ($state = intval($result)) && isset($this->globeMessageMap[$state])) { if (!is_numeric($result) && ($state = intval($result)) && isset($this->globeMessageMap[$state])) {

15
vendor/zoujingli/think-library/src/service/NodeService.php vendored
View File

@ -48,7 +48,7 @@ class NodeService extends Service
$prefix = $this->app->getNamespace(); $prefix = $this->app->getNamespace();
$middle = '\\' . $this->nameTolower($this->app->request->controller()); $middle = '\\' . $this->nameTolower($this->app->request->controller());
$suffix = ($type === 'controller') ? '' : ('\\' . $this->app->request->action()); $suffix = ($type === 'controller') ? '' : ('\\' . $this->app->request->action());
return strtr(substr($prefix, stripos($prefix, '\\') + 1) . $middle . $suffix, '\\', '/'); return strtolower(strtr(substr($prefix, stripos($prefix, '\\') + 1) . $middle . $suffix, '\\', '/'));
} }
/** /**
@ -97,20 +97,21 @@ class NodeService extends Service
} else { } else {
$data = []; $data = [];
} }
/*! 排除内置方法，禁止访问内置方法 */
$ignores = get_class_methods('\think\admin\Controller'); $ignores = get_class_methods('\think\admin\Controller');
/*! 扫描所有代码控制器节点，更新节点缓存 */
foreach ($this->scanDirectory($this->app->getBasePath()) as $file) { foreach ($this->scanDirectory($this->app->getBasePath()) as $file) {
if (preg_match("|/(\w+)/(\w+)/controller/(.+)\.php$|i", $file, $matches)) { if (preg_match("|/(\w+)/(\w+)/controller/(.+)\.php$|i", $file, $matches)) {
[, $namespace, $appname, $classname] = $matches; [, $namespace, $appname, $classname] = $matches;
$prefix = strtr("{$appname}/{$this->nameTolower($classname)}", '\\', '/'); $class = new \ReflectionClass(strtr("{$namespace}/{$appname}/controller/{$classname}", '/', '\\'));
$reflection = new \ReflectionClass(strtr("{$namespace}/{$appname}/controller/{$classname}", '/', '\\')); $prefix = strtolower(strtr("{$appname}/{$this->nameTolower($classname)}", '\\', '/'));
$data[$prefix] = $this->_parseComment($reflection->getDocComment(), $classname); $data[$prefix] = $this->_parseComment($class->getDocComment(), $classname);
foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
if (in_array($metname = $method->getName(), $ignores)) continue; if (in_array($metname = $method->getName(), $ignores)) continue;
$data["{$prefix}/{$metname}"] = $this->_parseComment($method->getDocComment(), $metname); $data[strtolower("{$prefix}/{$metname}")] = $this->_parseComment($method->getDocComment(), $metname);
} }
} }
} }
$data = array_change_key_case($data, CASE_LOWER);
$this->app->cache->set('SystemAuthNode', $data); $this->app->cache->set('SystemAuthNode', $data);
return $data; return $data;
} }

3
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -183,7 +183,8 @@ class SystemService extends Service
*/ */
public function setOplog($action, $content) public function setOplog($action, $content)
{ {
return $this->app->db->name('SystemOplog')->insert($this->getOplog($action, $content)); $oplog = $this->getOplog($action, $content);
return $this->app->db->name('SystemOplog')->insert($oplog);
} }
/** /**