diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index d900e97bf..aa5728894 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -48,6 +48,7 @@ class Index extends Controller $this->redirect(sysuri('admin/login/index')); } else { $this->title = '系统管理后台'; + $this->isSuper = AdminService::instance()->isSuper(); $this->fetch(); } } diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index f6c71f184..7732ea3e4 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -46,7 +46,7 @@ class Queue extends Controller */ public function index() { - if (AdminService::instance()->isSuper()) { + if ($this->isSuper = AdminService::instance()->isSuper()) { $process = ProcessService::instance(); if ($process->iswin() || empty($_SERVER['USER'])) { $this->command = $process->think('xadmin:queue start'); diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index b3c14f09e..c4e8b69f1 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -32,6 +32,21 @@ class User extends Controller */ private $table = 'SystemUser'; + /** + * 超级用户名称 + * @var string + */ + protected $superName; + + /** + * 控制器初始化 + */ + protected function initialize() + { + // 超级用户名称 + $this->superName = $this->app->config->get('app.super_user', 'admin'); + } + /** * 系统用户管理 * @auth true @@ -43,6 +58,7 @@ class User extends Controller public function index() { $this->title = '系统用户管理'; + $query = $this->_query($this->table); $query->equal('status')->dateBetween('login_at,create_at'); $query->like('username,contact_phone#phone,contact_mail#mail'); diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index 3331d3fe6..2ee3df5c4 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -1,7 +1,7 @@ {extend name="main"} {block name="button"} - + 清理无效配置 diff --git a/app/admin/view/index/index-top.html b/app/admin/view/index/index-top.html index 79b598e04..75b7c22ab 100644 --- a/app/admin/view/index/index-top.html +++ b/app/admin/view/index/index-top.html @@ -26,7 +26,7 @@
基本资料
安全设置
- {if session('user.username') eq 'admin'} + {if isset($isSuper) and $isSuper}
缓存加速
清理缓存
{/if} diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html index ec90428a1..b70b24350 100644 --- a/app/admin/view/queue/index.html +++ b/app/admin/view/queue/index.html @@ -1,7 +1,7 @@ {extend name='main'} {block name="button"} - + 优化数据库 diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html index ea0798426..cd5082e12 100644 --- a/app/admin/view/queue/index_search.html +++ b/app/admin/view/queue/index_search.html @@ -1,4 +1,4 @@ -{if session('user.username') eq 'admin'} +
服务状态
@@ -9,7 +9,7 @@
-{/if} +
条件搜索 diff --git a/app/admin/view/user/form.html b/app/admin/view/user/form.html index 20ed5837a..85e8f11e4 100644 --- a/app/admin/view/user/form.html +++ b/app/admin/view/user/form.html @@ -58,7 +58,7 @@ 访问权限 Authorize
- {if isset($vo.username) and $vo.username eq 'admin'} + {if isset($vo.username) and $vo.username eq $superName} 超级用户不需要配置权限 {elseif empty($authorizes)} 未配置权限 diff --git a/config/app.php b/config/app.php index d8083c5f7..df78d9d67 100644 --- a/config/app.php +++ b/config/app.php @@ -19,6 +19,8 @@ return [ 'app_namespace' => '', // 是否启用路由 'with_route' => true, + // 超级用户账号 + 'super_user' => 'admin', // 应用快速访问 'app_express' => true, // 默认应用 diff --git a/config/view.php b/config/view.php index 59b7478ee..54fc717c6 100644 --- a/config/view.php +++ b/config/view.php @@ -26,7 +26,7 @@ return [ // 模板文件名分隔符 'view_depr' => DIRECTORY_SEPARATOR, // 去除HTML空格换行 - 'strip_space' => true, + 'strip_space' => false, // 模板缓存配置 'tpl_cache' => !app()->isDebug(), // 模板引擎普通标签开始标记 diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 83de0f9b7..8114b0071 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -32,7 +32,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => 'ba13afacdba9747fab47a87d5b67ec177dc398fa', + 'reference' => '3cc374d1349454a0a8410869d7a9452461017e24', 'name' => 'zoujingli/thinkadmin', ), 'versions' => @@ -171,7 +171,7 @@ private static $installed = array ( array ( 0 => '9999999-dev', ), - 'reference' => '0c3fd320b8056d6a73d9b0db4ca8e97cf7bbf5e1', + 'reference' => 'cdf95212d42ba02af227e02395259dc4bee9e610', ), 'zoujingli/thinkadmin' => array ( @@ -180,7 +180,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => 'ba13afacdba9747fab47a87d5b67ec177dc398fa', + 'reference' => '3cc374d1349454a0a8410869d7a9452461017e24', ), 'zoujingli/wechat-developer' => array ( diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 05fc5761e..cbacb7bc2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -849,12 +849,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "0c3fd320b8056d6a73d9b0db4ca8e97cf7bbf5e1" + "reference": "cdf95212d42ba02af227e02395259dc4bee9e610" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0c3fd320b8056d6a73d9b0db4ca8e97cf7bbf5e1", - "reference": "0c3fd320b8056d6a73d9b0db4ca8e97cf7bbf5e1", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cdf95212d42ba02af227e02395259dc4bee9e610", + "reference": "cdf95212d42ba02af227e02395259dc4bee9e610", "shasum": "", "mirrors": [ { @@ -871,7 +871,8 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2021-05-19T04:39:49+00:00", + "time": "2021-05-27T01:59:28+00:00", + "default-branch": true, "type": "library", "extra": { "think": { @@ -901,6 +902,13 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://thinkadmin.top", + "support": { + "email": "zoujingli@qq.com", + "forum": "https://thinkadmin.top", + "issues": "https://gitee.com/zoujingli/ThinkLibrary/issues", + "source": "https://gitee.com/zoujingli/ThinkLibrary", + "wiki": "https://thinkadmin.top" + }, "install-path": "../zoujingli/think-library" }, { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 8c6df0292..05a4f0f9f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => 'ba13afacdba9747fab47a87d5b67ec177dc398fa', + 'reference' => '3cc374d1349454a0a8410869d7a9452461017e24', 'name' => 'zoujingli/thinkadmin', ), 'versions' => @@ -145,7 +145,7 @@ array ( 0 => '9999999-dev', ), - 'reference' => '0c3fd320b8056d6a73d9b0db4ca8e97cf7bbf5e1', + 'reference' => 'cdf95212d42ba02af227e02395259dc4bee9e610', ), 'zoujingli/thinkadmin' => array ( @@ -154,7 +154,7 @@ 'aliases' => array ( ), - 'reference' => 'ba13afacdba9747fab47a87d5b67ec177dc398fa', + 'reference' => '3cc374d1349454a0a8410869d7a9452461017e24', ), 'zoujingli/wechat-developer' => array ( diff --git a/vendor/services.php b/vendor/services.php index 3609fd4b1..88f0ae8cb 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 bd7588ee0..e8fc220ef 100644 --- a/vendor/zoujingli/think-library/src/Library.php +++ b/vendor/zoujingli/think-library/src/Library.php @@ -23,7 +23,6 @@ use think\admin\command\Replace; use think\admin\command\Version; use think\admin\multiple\BuildUrl; use think\admin\multiple\command\Build; -use think\admin\multiple\command\Clear; use think\admin\multiple\Multiple; use think\admin\service\AdminService; use think\admin\service\SystemService; diff --git a/vendor/zoujingli/think-library/src/Queue.php b/vendor/zoujingli/think-library/src/Queue.php index 23ed2f0f6..33321b340 100644 --- a/vendor/zoujingli/think-library/src/Queue.php +++ b/vendor/zoujingli/think-library/src/Queue.php @@ -1,5 +1,18 @@ getUserName() === 'admin'; + return $this->getUserName() === $this->app->config->get('app.super_user', 'admin'); } /**