diff --git a/app/admin/view/config/system.html b/app/admin/view/config/system.html index e08ccc4f7..4ef9a9aa6 100644 --- a/app/admin/view/config/system.html +++ b/app/admin/view/config/system.html @@ -6,7 +6,7 @@ URL {:sysuri('@',[],false,true)} - + 名称由英文字母开头且不能存在相同名称的应用，设置之后原地址不能继续访问！ diff --git a/composer.lock b/composer.lock index 250d8c461..3ff702d59 100644 --- a/composer.lock +++ b/composer.lock @@ -74,16 +74,16 @@ }, { "name": "league/flysystem", - "version": "1.0.66", + "version": "1.0.67", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "shasum": "", "mirrors": [ { @@ -160,7 +160,7 @@ "sftp", "storage" ], - "time": "2020-03-17T18:58:12+00:00" + "time": "2020-04-16T13:21:26+00:00" }, { "name": "league/flysystem-cached-adapter", @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8" + "reference": "67b615feffa7a765d153536f646314c64a15dda0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8901d45d4435751d74cca5ffc247c9b75c64a9c8", - "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/67b615feffa7a765d153536f646314c64a15dda0", + "reference": "67b615feffa7a765d153536f646314c64a15dda0", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-16T07:34:14+00:00" + "time": "2020-04-21T03:57:20+00:00" }, { "name": "zoujingli/wechat-developer", @@ -1044,5 +1044,6 @@ "ext-openssl": "*", "ext-mbstring": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/think b/think old mode 100644 new mode 100755 diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 428e98d05..3b092ad25 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -13,6 +13,9 @@ class ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96 } } + /** + * @return \Composer\Autoload\ClassLoader + */ public static function getLoader() { if (null !== self::$loader) { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 1577e3743..e814351c2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -69,17 +69,17 @@ }, { "name": "league/flysystem", - "version": "1.0.66", - "version_normalized": "1.0.66.0", + "version": "1.0.67", + "version_normalized": "1.0.67.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "shasum": "", "mirrors": [ { @@ -115,7 +115,7 @@ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, - "time": "2020-03-17T18:58:12+00:00", + "time": "2020-04-16T13:21:26+00:00", "type": "library", "extra": { "branch-alias": { @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8" + "reference": "67b615feffa7a765d153536f646314c64a15dda0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8901d45d4435751d74cca5ffc247c9b75c64a9c8", - "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/67b615feffa7a765d153536f646314c64a15dda0", + "reference": "67b615feffa7a765d153536f646314c64a15dda0", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-16T07:34:14+00:00", + "time": "2020-04-21T03:57:20+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/league/flysystem/src/Util/MimeType.php b/vendor/league/flysystem/src/Util/MimeType.php index 3f23ea1b0..84792c5b4 100644 --- a/vendor/league/flysystem/src/Util/MimeType.php +++ b/vendor/league/flysystem/src/Util/MimeType.php @@ -102,6 +102,8 @@ class MimeType 'txt' => 'text/plain', 'text' => 'text/plain', 'log' => 'text/plain', + 'markdown' => 'text/markdown', + 'md' => 'text/markdown', 'rtx' => 'text/richtext', 'rtf' => 'text/rtf', 'xml' => 'application/xml', diff --git a/vendor/services.php b/vendor/services.php index f9db4f626..e2ea0a944 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/Controller.php b/vendor/zoujingli/think-library/src/Controller.php index 68fb7c0f7..126900d91 100644 --- a/vendor/zoujingli/think-library/src/Controller.php +++ b/vendor/zoujingli/think-library/src/Controller.php @@ -63,6 +63,12 @@ abstract class Controller extends \stdClass */ public $csrf_message; + /** + * 控制器中间键 + * @var array + */ + protected $middleware = []; + /** * Controller constructor. * @param App $app diff --git a/vendor/zoujingli/think-library/src/Library.php b/vendor/zoujingli/think-library/src/Library.php index 7ac06ffc8..aec0f9c93 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -66,7 +66,7 @@ class Library extends Service } elseif (AdminService::instance()->isLogin()) { return json(['code' => 0, 'msg' => lang('think_library_not_auth')])->header($header); } else { - return json(['code' => 0, 'msg' => lang('think_library_not_login'), 'url' => url('@admin/login')->build()])->header($header); + return json(['code' => 0, 'msg' => lang('think_library_not_login'), 'url' => sysuri('admin/login/index')->build()])->header($header); } }, 'route'); } diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 9b685ff84..aa5425ed0 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -54,7 +54,7 @@ if (!function_exists('sysuri')) { * @param boolean|string $domain 域名 * @return string */ - function sysuri($url = '', array $vars = [], $suffix = false, $domain = false) + function sysuri($url = '', array $vars = [], $suffix = true, $domain = false) { return SystemService::instance()->sysuri($url, $vars, $suffix, $domain); } diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 37c9df705..6acdec3c0 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -273,7 +273,7 @@ class SystemService extends Service * @param boolean|string $domain 域名 * @return string */ - public function sysuri($url = '', array $vars = [], $suffix = false, $domain = false) + public function sysuri($url = '', array $vars = [], $suffix = true, $domain = false) { $d1 = $this->app->config->get('app.default_app'); $d2 = $this->app->config->get('route.default_controller');