diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 258c9ce2d..d54d14ff6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -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": { diff --git a/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php b/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php index 19f2ed38b..cfbc8367d 100644 --- a/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php +++ b/vendor/league/mime-type-detection/src/GeneratedExtensionToMimeTypeMap.php @@ -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', diff --git a/vendor/services.php b/vendor/services.php index 00e7455f5..1554ba17f 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php index dc26e7caf..1092e5a56 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -41,7 +41,7 @@ class Library extends Service /** * 扩展库版本号 */ - const VERSION = '6.0.9'; + const VERSION = '6.0.10'; /** * 启动服务 diff --git a/vendor/zoujingli/think-library/src/extend/HttpExtend.php b/vendor/zoujingli/think-library/src/extend/HttpExtend.php index a43ebd7c1..357a198c7 100644 --- a/vendor/zoujingli/think-library/src/extend/HttpExtend.php +++ b/vendor/zoujingli/think-library/src/extend/HttpExtend.php @@ -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']); diff --git a/vendor/zoujingli/think-library/src/service/MessageService.php b/vendor/zoujingli/think-library/src/service/MessageService.php index 00dff16ae..cfe51a0da 100644 --- a/vendor/zoujingli/think-library/src/service/MessageService.php +++ b/vendor/zoujingli/think-library/src/service/MessageService.php @@ -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])) { diff --git a/vendor/zoujingli/think-library/src/service/NodeService.php b/vendor/zoujingli/think-library/src/service/NodeService.php index 3f3ccc08f..ca674fec2 100644 --- a/vendor/zoujingli/think-library/src/service/NodeService.php +++ b/vendor/zoujingli/think-library/src/service/NodeService.php @@ -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; } diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 3f472222c..c0207e340 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -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); } /**