mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-05-21 22:39:16 +08:00
ComposerUpdate
This commit is contained in:
Anyon
parent
5692b7b55f
commit
6bad3ded9c
24
vendor/composer/installed.json
vendored
24
vendor/composer/installed.json
vendored
@ -223,17 +223,17 @@
|
||||
},
|
||||
{
|
||||
"name": "league/mime-type-detection",
|
||||
"version": "1.4.0",
|
||||
"version_normalized": "1.4.0.0",
|
||||
"version": "1.5.0",
|
||||
"version_normalized": "1.5.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/mime-type-detection.git",
|
||||
"reference": "fda190b62b962d96a069fcc414d781db66d65b69"
|
||||
"reference": "ea2fbfc988bade315acd5967e6d02274086d0f28"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69",
|
||||
"reference": "fda190b62b962d96a069fcc414d781db66d65b69",
|
||||
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ea2fbfc988bade315acd5967e6d02274086d0f28",
|
||||
"reference": "ea2fbfc988bade315acd5967e6d02274086d0f28",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -250,7 +250,7 @@
|
||||
"phpstan/phpstan": "^0.12.36",
|
||||
"phpunit/phpunit": "^8.5.8"
|
||||
},
|
||||
"time": "2020-08-09T10:34:01+00:00",
|
||||
"time": "2020-09-21T18:10:53+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -958,17 +958,17 @@
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/think-library",
|
||||
"version": "v6.0.9",
|
||||
"version_normalized": "6.0.9.0",
|
||||
"version": "v6.0.10",
|
||||
"version_normalized": "6.0.10.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "6fa904cad8bde5b2d04750d17323fe715a0c2b4d"
|
||||
"reference": "9f778a0eaa1ae3c7dd15cd6f9812c94a29e438ae"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6fa904cad8bde5b2d04750d17323fe715a0c2b4d",
|
||||
"reference": "6fa904cad8bde5b2d04750d17323fe715a0c2b4d",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9f778a0eaa1ae3c7dd15cd6f9812c94a29e438ae",
|
||||
"reference": "9f778a0eaa1ae3c7dd15cd6f9812c94a29e438ae",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -985,7 +985,7 @@
|
||||
"ext-mbstring": "*",
|
||||
"topthink/framework": "^6.0"
|
||||
},
|
||||
"time": "2020-09-19T10:23:24+00:00",
|
||||
"time": "2020-09-23T02:52:29+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"think": {
|
||||
|
||||
@ -181,6 +181,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap
|
||||
'dart' => 'application/vnd.dart',
|
||||
'dataless' => 'application/vnd.fdsn.seed',
|
||||
'davmount' => 'application/davmount+xml',
|
||||
'dbf' => 'application/vnd.dbf',
|
||||
'dbk' => 'application/docbook+xml',
|
||||
'dcr' => 'application/x-director',
|
||||
'dcurl' => 'text/vnd.curl.dcurl',
|
||||
@ -468,6 +469,7 @@ class GeneratedExtensionToMimeTypeMap implements ExtensionToMimeTypeMap
|
||||
'ksp' => 'application/vnd.kde.kspread',
|
||||
'ktr' => 'application/vnd.kahootz',
|
||||
'ktx' => 'image/ktx',
|
||||
'ktx2' => 'image/ktx2',
|
||||
'ktz' => 'application/vnd.kahootz',
|
||||
'kwd' => 'application/vnd.kde.kword',
|
||||
'kwt' => 'application/vnd.kde.kword',
|
||||
|
||||
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
||||
<?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);
|
||||
return array (
|
||||
0 => 'think\\admin\\Library',
|
||||
|
||||
@ -41,7 +41,7 @@ class Library extends Service
|
||||
/**
|
||||
* 扩展库版本号
|
||||
*/
|
||||
const VERSION = '6.0.9';
|
||||
const VERSION = '6.0.10';
|
||||
|
||||
/**
|
||||
* 启动服务
|
||||
|
||||
@ -99,14 +99,14 @@ class HttpExtend
|
||||
$curl = curl_init();
|
||||
// Agent 代理设置
|
||||
curl_setopt($curl, CURLOPT_USERAGENT, static::getUserAgent());
|
||||
// CURL 头信息设置
|
||||
if (!empty($options['headers'])) {
|
||||
curl_setopt($curl, CURLOPT_HTTPHEADER, $options['headers']);
|
||||
}
|
||||
// Cookie 信息设置
|
||||
if (!empty($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'])) {
|
||||
curl_setopt($curl, CURLOPT_COOKIEJAR, $options['cookie_file']);
|
||||
curl_setopt($curl, CURLOPT_COOKIEFILE, $options['cookie_file']);
|
||||
|
||||
@ -137,7 +137,7 @@ class MessageService extends Service
|
||||
public function sendChinaSms($phone, $content, $productid = '676767')
|
||||
{
|
||||
$tkey = date("YmdHis");
|
||||
$result = HttpExtend::post('http://www.ztsms.cn/sendNSms.do', [
|
||||
$result = HttpExtend::get('http://www.ztsms.cn/sendNSms.do', [
|
||||
'tkey' => $tkey,
|
||||
'mobile' => $phone,
|
||||
'content' => $content,
|
||||
@ -202,7 +202,7 @@ class MessageService extends Service
|
||||
public function queryChinaSmsBalance()
|
||||
{
|
||||
$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,
|
||||
'password' => md5(md5($this->chinaPassword) . $tkey),
|
||||
]);
|
||||
@ -246,7 +246,7 @@ class MessageService extends Service
|
||||
public function sendGlobeSms($code, $mobile, $content)
|
||||
{
|
||||
$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,
|
||||
'content' => $content, 'username' => sysconf('sms_zt_username2'),
|
||||
'password' => md5(md5(sysconf('sms_zt_password2')) . $tkey),
|
||||
@ -264,7 +264,7 @@ class MessageService extends Service
|
||||
public function queryGlobeSmsBalance()
|
||||
{
|
||||
$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),
|
||||
]);
|
||||
if (!is_numeric($result) && ($state = intval($result)) && isset($this->globeMessageMap[$state])) {
|
||||
|
||||
@ -48,7 +48,7 @@ class NodeService extends Service
|
||||
$prefix = $this->app->getNamespace();
|
||||
$middle = '\\' . $this->nameTolower($this->app->request->controller());
|
||||
$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 {
|
||||
$data = [];
|
||||
}
|
||||
/*! 排除内置方法，禁止访问内置方法 */
|
||||
$ignores = get_class_methods('\think\admin\Controller');
|
||||
/*! 扫描所有代码控制器节点，更新节点缓存 */
|
||||
foreach ($this->scanDirectory($this->app->getBasePath()) as $file) {
|
||||
if (preg_match("|/(\w+)/(\w+)/controller/(.+)\.php$|i", $file, $matches)) {
|
||||
[, $namespace, $appname, $classname] = $matches;
|
||||
$prefix = strtr("{$appname}/{$this->nameTolower($classname)}", '\\', '/');
|
||||
$reflection = new \ReflectionClass(strtr("{$namespace}/{$appname}/controller/{$classname}", '/', '\\'));
|
||||
$data[$prefix] = $this->_parseComment($reflection->getDocComment(), $classname);
|
||||
foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
|
||||
$class = new \ReflectionClass(strtr("{$namespace}/{$appname}/controller/{$classname}", '/', '\\'));
|
||||
$prefix = strtolower(strtr("{$appname}/{$this->nameTolower($classname)}", '\\', '/'));
|
||||
$data[$prefix] = $this->_parseComment($class->getDocComment(), $classname);
|
||||
foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
|
||||
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);
|
||||
return $data;
|
||||
}
|
||||
|
||||
@ -183,7 +183,8 @@ class SystemService extends Service
|
||||
*/
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user