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

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-04-21 12:02:54 +08:00
parent 94059c0739
commit fdafd274de
11 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/view/config/system.html
View File

@ -6,7 +6,7 @@
<span class="color-desc margin-left-5">URL</span> <span class="color-desc margin-left-5">URL</span>
<span class="layui-input inline-block"> <span class="layui-input inline-block">
<span>{:sysuri('@',[],false,true)}</span> <span>{:sysuri('@',[],false,true)}</span>
<input autofocus required pattern="[a-zA-Z_][a-zA-Z0-9_]+" placeholder="请输入后台入口名称" class="layui-input inline-block padding-0 border-0" style="width:auto;background:none" value="{:trim(sysuri('admin/index/index'),'/')}" name="xpath"> <input autofocus required pattern="[a-zA-Z_][a-zA-Z0-9_]+" placeholder="请输入后台入口名称" class="layui-input inline-block padding-0 border-0" style="width:auto;background:none" value="{:trim(sysuri('admin/index/index',[],false),'/')}" name="xpath">
</span> </span>
<span class="help-block">名称由英文字母开头且不能存在相同名称的应用，设置之后原地址不能继续访问！</span> <span class="help-block">名称由英文字母开头且不能存在相同名称的应用，设置之后原地址不能继续访问！</span>
</label> </label>

21
composer.lock generated
View File

@ -74,16 +74,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.66", "version": "1.0.67",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
"reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -160,7 +160,7 @@
"sftp", "sftp",
"storage" "storage"
], ],
"time": "2020-03-17T18:58:12+00:00" "time": "2020-04-16T13:21:26+00:00"
}, },
{ {
"name": "league/flysystem-cached-adapter", "name": "league/flysystem-cached-adapter",
@ -909,12 +909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8" "reference": "67b615feffa7a765d153536f646314c64a15dda0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8901d45d4435751d74cca5ffc247c9b75c64a9c8", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/67b615feffa7a765d153536f646314c64a15dda0",
"reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8", "reference": "67b615feffa7a765d153536f646314c64a15dda0",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -958,7 +958,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "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", "name": "zoujingli/wechat-developer",
@ -1044,5 +1044,6 @@
"ext-openssl": "*", "ext-openssl": "*",
"ext-mbstring": "*" "ext-mbstring": "*"
}, },
"platform-dev": [] "platform-dev": [],
"plugin-api-version": "1.1.0"
} }

0
think Normal file → Executable file
View File

3
vendor/composer/autoload_real.php vendored
View File

@ -13,6 +13,9 @@ class ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96
} }
} }
/**
* @return \Composer\Autoload\ClassLoader
*/
public static function getLoader() public static function getLoader()
{ {
if (null !== self::$loader) { if (null !== self::$loader) {

20
vendor/composer/installed.json vendored
View File

@ -69,17 +69,17 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.66", "version": "1.0.67",
"version_normalized": "1.0.66.0", "version_normalized": "1.0.67.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
"reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -115,7 +115,7 @@
"spatie/flysystem-dropbox": "Allows you to use Dropbox storage", "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
"srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" "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", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -935,12 +935,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8" "reference": "67b615feffa7a765d153536f646314c64a15dda0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8901d45d4435751d74cca5ffc247c9b75c64a9c8", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/67b615feffa7a765d153536f646314c64a15dda0",
"reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8", "reference": "67b615feffa7a765d153536f646314c64a15dda0",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-04-16T07:34:14+00:00", "time": "2020-04-21T03:57:20+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/league/flysystem/src/Util/MimeType.php vendored
View File

@ -102,6 +102,8 @@ class MimeType
'txt' => 'text/plain', 'txt' => 'text/plain',
'text' => 'text/plain', 'text' => 'text/plain',
'log' => 'text/plain', 'log' => 'text/plain',
'markdown' => 'text/markdown',
'md' => 'text/markdown',
'rtx' => 'text/richtext', 'rtx' => 'text/richtext',
'rtf' => 'text/rtf', 'rtf' => 'text/rtf',
'xml' => 'application/xml', 'xml' => 'application/xml',

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-04-16 15:39:28 // This file is automatically generated at:2020-04-21 12:00:19
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

6
vendor/zoujingli/think-library/src/Controller.php vendored
View File

@ -63,6 +63,12 @@ abstract class Controller extends \stdClass
*/ */
public $csrf_message; public $csrf_message;
/**
* 控制器中间键
* @var array
*/
protected $middleware = [];
/** /**
* Controller constructor. * Controller constructor.
* @param App $app * @param App $app

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

@ -66,7 +66,7 @@ class Library extends Service
} elseif (AdminService::instance()->isLogin()) { } elseif (AdminService::instance()->isLogin()) {
return json(['code' => 0, 'msg' => lang('think_library_not_auth')])->header($header); return json(['code' => 0, 'msg' => lang('think_library_not_auth')])->header($header);
} else { } 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'); }, 'route');
} }

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

@ -54,7 +54,7 @@ if (!function_exists('sysuri')) {
* @param boolean|string $domain 域名 * @param boolean|string $domain 域名
* @return string * @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); return SystemService::instance()->sysuri($url, $vars, $suffix, $domain);
} }

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

@ -273,7 +273,7 @@ class SystemService extends Service
* @param boolean|string $domain 域名 * @param boolean|string $domain 域名
* @return string * @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'); $d1 = $this->app->config->get('app.default_app');
$d2 = $this->app->config->get('route.default_controller'); $d2 = $this->app->config->get('route.default_controller');