diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php index 9c7d5bae6..414f8d946 100644 --- a/app/admin/controller/api/Plugs.php +++ b/app/admin/controller/api/Plugs.php @@ -16,6 +16,7 @@ namespace app\admin\controller\api; use think\admin\Controller; +use think\admin\service\AdminService; use think\admin\service\SystemService; use think\exception\HttpResponseException; @@ -44,6 +45,9 @@ class Plugs extends Controller public function optimize() { try { + if (AdminService::instance()->getUserName() !== 'admin') { + $this->error('只有超级管理员才能操作！'); + } $this->app->console->call('optimize:route'); $this->app->console->call('optimize:schema'); $this->success('网站缓存加速成功！'); @@ -61,6 +65,9 @@ class Plugs extends Controller public function clear() { try { + if (AdminService::instance()->getUserName() !== 'admin') { + $this->error('只有超级管理员才能操作！'); + } $this->app->console->call('clear'); $this->success('清理网站缓存成功！'); } catch (HttpResponseException $exception) { @@ -77,6 +84,9 @@ class Plugs extends Controller public function debug() { if (input('state')) { + if (AdminService::instance()->getUserName() !== 'admin') { + $this->error('只有超级管理员才能操作！'); + } SystemService::instance()->productMode(true); $this->success('已切换为生产模式！'); } else { diff --git a/app/admin/route/demo.php b/app/admin/route/demo.php index 2ab9ca841..81c359f10 100644 --- a/app/admin/route/demo.php +++ b/app/admin/route/demo.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index 962f0e140..7408b9cb2 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -2,8 +2,19 @@ {block name="button"} +{if session('user.username') eq 'admin'} +
+ + + + + +
+ +{/if} + {if auth('system')} -修改系统配置 +修改系统参数 {/if} {/block} diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html index 1b036881e..467b6c189 100644 --- a/app/admin/view/index/index.html +++ b/app/admin/view/index/index.html @@ -48,20 +48,12 @@ {if session('user.username')}
  • - {if session('user.username') eq 'admin'} -
    - - {if $app->isDebug()} - - {else} - - {/if} -
    - {/if}
    基本资料
    安全设置
    + {if session('user.username') eq 'admin'}
    缓存加速
    清理缓存
    + {/if}
    退出登录
    {:session('user.username')} diff --git a/app/admin/view/user/form.html b/app/admin/view/user/form.html index 36cdd701b..1c882a5ad 100644 --- a/app/admin/view/user/form.html +++ b/app/admin/view/user/form.html @@ -1,60 +1,66 @@
    -
    -
    - - -
    -
    - -
    -
    - +
    + 账号信息 +
    +
    + + +
    +
    + +
    +
    + +
    -
    -
    - -
    -
    - -
    -
    - +
    + 用户资料 +
    +
    + +
    +
    + +
    +
    + +
    {notempty name='authorizes'}
    - 访问授权 + 访问权限 Authorize
    {if isset($vo.username) and $vo.username eq 'admin'} diff --git a/app/admin/view/user/index.html b/app/admin/view/user/index.html index 2e90073ec..38cacb0bb 100644 --- a/app/admin/view/user/index.html +++ b/app/admin/view/user/index.html @@ -3,19 +3,19 @@ {block name="button"} {if isset($type) and $type eq 'all'} -{if auth("add")} + -{/if} -{if auth("state")} + + 批量禁用 -{/if} + {else} -{if auth("state")} + 批量恢复 -{/if} -{if auth("remove")} + + 批量删除 -{/if} + {/if} {/block} @@ -43,7 +43,7 @@ - + @@ -81,32 +81,31 @@ {if isset($type) and $type eq 'all'} - {if auth("pass")} + 密 码 - {/if} - {if auth("edit")} - 编 辑 - {/if} - {if auth("state") and $vo.status eq 1} + + + 编 辑 + + 禁 用 - {/if} + {else} - {if auth("edit")} - 编 辑 - {/if} - {if auth("state") and $vo.status eq 0} + + 编 辑 + + 恢 复 - {/if} - {if auth("remove")} + + 删 除 - {/if} + {/if} {/foreach} - {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty}
    diff --git a/public/index.php b/public/index.php index a1aedb0dc..5960a40c4 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/public/router.php b/public/router.php index 3bc9c0397..5d5974f90 100644 --- a/public/router.php +++ b/public/router.php @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/public/static/admin.js b/public/static/admin.js index 5a8a6680c..63992386b 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -1,7 +1,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- @@ -288,7 +288,6 @@ $(function () { // 后台菜单动作初始化 this.listen = function () { /*! 初始化操作*/ - layui.form.render(); layui.form.on('switch(ThinkAdminDebug)', function (data) { jQuery.post(webRoot + '?s=admin/api.plugs/debug', {state: data.elem.checked ? 1 : 0}); }); diff --git a/public/static/login.js b/public/static/login.js index f7d2e2ab8..5fd73f217 100644 --- a/public/static/login.js +++ b/public/static/login.js @@ -1,7 +1,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/public/static/theme/css/console.layout.css b/public/static/theme/css/console.layout.css index 37fcfe244..6c166376e 100644 --- a/public/static/theme/css/console.layout.css +++ b/public/static/theme/css/console.layout.css @@ -155,16 +155,8 @@ .layui-layout.layui-layout-left-hide [data-target-menu-type] { display: none; } -/* 浏览器DEBUG */ -.version-debug { - width: 100%; - color: #fff; - height: 100px; - font-size: 20px; - text-align: center; - line-height: 100px; - margin-bottom: 40px; - background-color: #E90D24; +.think-switch-button .layui-form-switch { + margin-top: 0; } .input-right-icon { top: 0; diff --git a/public/static/theme/css/console.layout.css.map b/public/static/theme/css/console.layout.css.map index 1e2f15451..50ecf4f78 100644 --- a/public/static/theme/css/console.layout.css.map +++ b/public/static/theme/css/console.layout.css.map @@ -1 +1 @@ -{"version":3,"sources":["console.layout.less"],"names":[],"mappings":";AACA,aACE;EACE,SAAA;EACA,SAAA;EACA,cAAA;;AAJJ,aAOE;EACE,SAAA;EACA,SAAA;EACA,cAAA;;AAVJ,aAOE,cAKE;EACE,gBAAA;;AAbN,aAOE,cAKE,cAGE;EACE,kBAAA;;AAhBR,aAOE,cAKE,cAOE;EACE,YAAA;EACA,YAAA;EACA,iBAAA;EACA,0CAAA;EACA,gBAAA;;;AAOR;EACE,YAAA;EACA,mBAAA;;AAFF,aAIE;EAEE,uCAAA;EACA,2CAAA;;AAPJ,aAUE;AAVF,aAWE;EACE,UAAA;;AAZJ,aAeE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;EACA,2CAAA;EACA,4CAAA;;AAtBJ,aAeE,YASE;EACE,cAAA;EACA,gBAAA;;AA1BN,aA8BE;EACE,YAAA;EACA,iBAAA;;AAEA,aAJF,gBAIG;EACC,mBAAA;;AAnCN,aA8BE,gBAQE;EACE,WAAA;;AAvCN,aA8BE,gBAYE;EACE,SAAA;EACA,UAAA;EACA,YAAA;EACA,iBAAA;;AA9CN,aA8BE,gBAYE,iBAME;EACE,mBAAA;;AAGF,aAtBJ,gBAYE,iBAUG,WAAY;EACX,gBAAA;;AAGF,aA1BJ,gBAYE,iBAcG,WAAY,IAAI;EACf,WAAA;;AAzDR,aA8BE,gBAYE,iBAkBE,GAAG;EACD,UAAA;EACA,WAAA;EACA,kBAAA;EACA,6BAAA;;AAhER,aAqEE;AArEF,aAqEkB,gBAAe;EAC7B,aAAA;;AAtEJ,aAyEE,oBACE,KAAK;EACH,0CAAA;EACA,wCAAA;;;AAMN,aAEE,cACE;EACE,aAAA;;AAJN,aAEE,cAKE;EACE,WAAA;;AARN,aAEE,cASE;EACE,2CAAA;;AAZN,aAEE,cASE,gBAGE;EACE,YAAA;EACA,cAAA;EACA,iBAAA;EACA,WAAA;;AAEA,aAlBN,cASE,gBAGE,EAMG;EACC,iCAAA;;AArBV,aAEE,cAwBE;EACE,mBAAA;;AA3BN,aAEE,cA4BE,oBAAoB;EAClB,uBAAA;EACA,iBAAA;;AAIJ,aAAC,uBACC;EACE,UAAA;;AAFJ,aAAC,uBAKC,cACE;EACE,aAAA;;AAPN,aAAC,uBAKC,cAKE,gBACE;EACE,UAAA;;AAZR,aAAC,uBAKC,cAKE,gBAKE;EACE,aAAA;;AAhBR,aAAC,uBAKC,cAKE,gBASE;EACE,qBAAA;EACA,UAAA;;AArBR,aAAC,uBAKC,cAKE,gBAcE;EACE,UAAA;EACA,yBAAA;EACA,oCAAA;;AAIJ,aA/BH,uBAKC;AALF,aAAC,uBAKC,cA0BK;AA/BP,aAAC,uBAKC,cA0BsB;EAClB,WAAA;EACA,kBAAA;;AAjCN,aAAC,uBAqCC,wBAAwB;EACtB,qBAAA;EACA,mBAAmB,cAAnB;EACA,WAAW,cAAX;EACA,eAAe,cAAf;;AAIJ,aAAC,uBACC;EACE,OAAA;;AAFJ,aAAC,uBAKC;EACE,aAAA;;AANJ,aAAC,uBASC;EACE,aAAA;;;AAMN;EACE,WAAA;EACA,WAAA;EACA,aAAA;EACA,eAAA;EACA,kBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;;AAGF;EACE,MAAA;EACA,QAAA;EACA,WAAA;EACA,YAAA;EACA,qBAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;;;AAIF;EACE,aAAA;;AAGF;EACE,MAAA;EACA,WAAA;EACA,WAAA;EACA,WAAA;EACA,aAAA;EACA,eAAA;EACA,mBAAA;;AAGF;EACE,WAAA;EACA,YAAA;EACA,eAAA;EACA,kBAAA;EACA,qBAAA;EACA,0BAAA;EACA,gBAAgB,2CAAhB;EACA,sBAAA;;AAGF,YAAY,MAAO,KAAI;EACrB,qBAAA;;AAGF,YAAa,KAAI;EACf,aAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;EACA,iBAAA;EACA,WAAA;EACA,QAAA;EACA,kBAAA;EACA,8BAAA;;AAGF;EACE,iBAAA;;AADF,eAGE;EACE,WAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,aAAA;EACA,kBAAA;EACA,iBAAA;EACA,8BAAA;;AAGF,eAAC,MAAO;EACN,eAAA;EACA,qBAAA;;AAEA,eAJD,MAAO,EAIL;EACC,WAAA;EACA,qBAAA;;AAMN;EACE,eAAA;;AAGF;EACE,eAAA;EACA,mBAAA;;AAFF,uBAIE;EACE,QAAA;EACA,SAAA;EACA,eAAA;EACA,kBAAA;EACA,+BAAA;;AATJ,uBAYE;EACE,WAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;;AAhBJ,uBAYE,mBAME,MAAK,UAAU;EACb,eAAA;EACA,iBAAA;;;AAMN;EACE,iBAAA;;AADF,qBAGE;EACE,WAAA;EACA,cAAA;;AALJ,qBAQE;EACE,YAAA;EACA,qBAAA;EACA,SAAA;EACA,UAAA;;AAZJ,qBAQE,KAME;EACE,UAAA;EACA,qBAAA;;AAEA,qBAVJ,KAME,KAIG;EACC,UAAA;;AADF,qBAVJ,KAME,KAIG,OAGC;EACE,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,mBAAA;;AAzBV,qBAQE,KAME,KAeE;AA7BN,qBAQE,KAME,KAeO;EACH,WAAA;EACA,WAAA;EACA,YAAA;EACA,yBAAA;EACA,qBAAA;EACA,iBAAA;EACA,kBAAA;EACA,iBAAA;;AArCR,qBAQE,KAME,KA0BE;EACE,mBAAA;EACA,eAAA;;AA1CR,qBAQE,KAME,KA+BE,IAAG;EACD,mBAAA;EACA,qBAAA;;;AAOR;EACE,YAAA;EACA,aAAA;EACA,kBAAA;EACA,4DAAA;;AAJF,eAME;EACE,WAAA;EACA,WAAA;EACA,cAAA;EACA,gBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,uBAAA;EACA,iBAAA;EACA,iBAAA;EACA,oBAAA;EACA,sBAAA;EACA,yBAAA;EACA,4BAAA;;AArBJ,eAwBE;EACE,SAAA;EACA,OAAA;EACA,QAAA;EACA,SAAA;EACA,kBAAA;EACA,sBAAA;EACA,mBAAA;;AA/BJ,eAwBE,aASE;EACE,WAAA;EACA,YAAA;;AAnCN,eAuCE;EACE,OAAA;EACA,QAAA;EACA,SAAA;EACA,SAAA;EACA,kBAAA;EACA,kBAAA;EACA,sBAAA;EACA,qBAAA;EACA,4DAAA;;AAhDJ,eAuCE,eAWE;EACE,WAAA;EACA,aAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;;AAvDN,eAuCE,eAWE,GAOE;EACE,WAAA;EACA,cAAA;EACA,gBAAA;EACA,sCAAA;EACA,8BAAA;EACA,gBAAA;EACA,mBAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;EACA,uBAAA;EACA,iBAAA;;AAEA,eAhCN,eAWE,GAOE,EAcG;EACC,+BAAA;;AAGF,eApCN,eAWE,GAOE,EAkBG;EACC,yBAAA;EACA,2BAAA;;AA7EV,eAuCE,eAWE,GAOE,EAuBE,KAAI;EACF,UAAA;EACA,WAAA;EACA,SAAS,EAAT;EACA,qBAAA;;AApFV,eAuCE,eAWE,GAsCE;EACE,QAAA;EACA,UAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,eAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;;AAGF,eA7DJ,eAWE,GAkDG,MAAO;EACN,qBAAA;;AAEA,eAhEN,eAWE,GAkDG,MAAO,SAGL;EACC,WAAA;EACA,gBAAA;;AAzGV,eAuCE,eAuEE;EACE,WAAA;EACA,YAAA;EACA,8BAAA;EACA,sDAAA;;AAlHN,eAuCE,eA8EE;AArHJ,eAuCE,eA8Ea;EACT,qBAAA;EACA,sBAAA;;AAvHN,eAuCE,eAmFE;EACE,UAAA;EACA,WAAA;EACA,iBAAA;EACA,yDAAA;;AA9HN,eAuCE,eA0FE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,cAAA;EACA,kBAAA;EACA,yBAAA;EACA,yBAAA;;AAxIN,eAuCE,eA0FE,UASE;AA1IN,eAuCE,eA0FE,UASM,GAAG;EACL,WAAA;EACA,UAAA;EACA,WAAA;EACA,cAAA;EACA,WAAA;;AA/IR,eAuCE,eA0FE,UAiBE,GAAG,GACD;EACE,cAAA;EACA,sCAAA;;AAEA,eAhHR,eA0FE,UAiBE,GAAG,GACD,EAIG;EACC,mBAAA;EACA,gCAAA;;AAIJ,eAtHN,eA0FE,UAiBE,GAAG,GAWA,WAAY,EAAC;EACZ,yBAAA;;AA9JV,eAuCE,eA4HE;EACE,SAAA;EACA,kBAAA;EACA,iBAAA;;AAtKN,eAuCE,eAkIE;AAzKJ,eAuCE,eAkIa;EACT,QAAA;EACA,SAAA;EACA,WAAA;EACA,qBAAA;EACA,8BAAA;EACA,sBAAA;EACA,uBAAA;;AAhLN,eAuCE,eA4IE;EACE,UAAA;EACA,YAAA;EACA,yBAAA;;AAtLN,eAuCE,eAkJE;EACE,UAAA;EACA,YAAA;EACA,yBAAA","file":"console.layout.css"} \ No newline at end of file +{"version":3,"sources":["console.layout.less"],"names":[],"mappings":"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","file":"console.layout.css"} \ No newline at end of file diff --git a/public/static/theme/css/console.less b/public/static/theme/css/console.less index 112ae9cf2..fec32b30d 100644 --- a/public/static/theme/css/console.less +++ b/public/static/theme/css/console.less @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/public/static/theme/css/login.less b/public/static/theme/css/login.less index c8d52b1b4..423b0c848 100644 --- a/public/static/theme/css/login.less +++ b/public/static/theme/css/login.less @@ -3,7 +3,7 @@ // +---------------------------------------------------------------------- // | ThinkAdmin // +---------------------------------------------------------------------- -// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ] +// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ] // +---------------------------------------------------------------------- // | 官方网站: http://demo.thinkadmin.top // +---------------------------------------------------------------------- diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index a6e8e1bd7..4e1ac5453 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -197,7 +197,6 @@ return array( 'app\\admin\\controller\\Oplog' => $baseDir . '/app/admin/controller/Oplog.php', 'app\\admin\\controller\\Queue' => $baseDir . '/app/admin/controller/Queue.php', 'app\\admin\\controller\\User' => $baseDir . '/app/admin/controller/User.php', - 'app\\admin\\controller\\api\\Config' => $baseDir . '/app/admin/controller/api/Config.php', 'app\\admin\\controller\\api\\Plugs' => $baseDir . '/app/admin/controller/api/Plugs.php', 'app\\admin\\controller\\api\\Queue' => $baseDir . '/app/admin/controller/api/Queue.php', 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b6244f5c9..136fc87bd 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -330,7 +330,6 @@ class ComposerStaticInit4ceee63a2cdf20349907f5909444af96 'app\\admin\\controller\\Oplog' => __DIR__ . '/../..' . '/app/admin/controller/Oplog.php', 'app\\admin\\controller\\Queue' => __DIR__ . '/../..' . '/app/admin/controller/Queue.php', 'app\\admin\\controller\\User' => __DIR__ . '/../..' . '/app/admin/controller/User.php', - 'app\\admin\\controller\\api\\Config' => __DIR__ . '/../..' . '/app/admin/controller/api/Config.php', 'app\\admin\\controller\\api\\Plugs' => __DIR__ . '/../..' . '/app/admin/controller/api/Plugs.php', 'app\\admin\\controller\\api\\Queue' => __DIR__ . '/../..' . '/app/admin/controller/api/Queue.php', 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', diff --git a/vendor/services.php b/vendor/services.php index 00069f6b2..5b4048055 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service',