From e4c4020c1ad2b7e4ab1c1dd458e525616afe45b1 Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 17 Jul 2019 14:27:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Auth.php | 16 ++++++++++++++++ application/admin/controller/Index.php | 11 +++++++++++ application/admin/controller/Menu.php | 21 +++++++++++++++++++++ application/admin/controller/Oplog.php | 2 ++ application/admin/controller/Queue.php | 8 ++++---- application/admin/controller/User.php | 16 ++++++++++++++++ application/admin/controller/api/Plugs.php | 11 +---------- application/admin/controller/api/Update.php | 18 ++++++++++-------- 8 files changed, 81 insertions(+), 22 deletions(-) diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index 24b4095bc..87cedf33c 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -82,6 +82,11 @@ class Auth extends Controller /** * 添加系统权限 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function add() { @@ -92,6 +97,11 @@ class Auth extends Controller /** * 编辑系统权限 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function edit() { @@ -118,6 +128,8 @@ class Auth extends Controller /** * 禁用系统权限 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function forbid() { @@ -128,6 +140,8 @@ class Auth extends Controller /** * 启用系统权限 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function resume() { @@ -138,6 +152,8 @@ class Auth extends Controller /** * 删除系统权限 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 5d8a09984..24d6c2bfe 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -113,6 +113,11 @@ class Index extends Controller /** * 修改用户资料 * @param integer $id 会员ID + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function info($id = 0) { @@ -133,6 +138,9 @@ class Index extends Controller */ public function clearRuntime() { + if (!NodeService::islogin()) { + $this->error('需要登录才能操作哦！'); + } try { Console::call('clear'); Console::call('xclean:session'); @@ -150,6 +158,9 @@ class Index extends Controller */ public function buildOptimize() { + if (!NodeService::islogin()) { + $this->error('需要登录才能操作哦！'); + } try { Console::call('optimize:route'); Console::call('optimize:schema'); diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php index 33c12fc89..1ff8abb92 100644 --- a/application/admin/controller/Menu.php +++ b/application/admin/controller/Menu.php @@ -38,6 +38,11 @@ class Menu extends Controller * 系统菜单管理 * @auth true * @menu true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function index() { @@ -63,6 +68,11 @@ class Menu extends Controller /** * 添加系统菜单 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function add() { @@ -73,6 +83,11 @@ class Menu extends Controller /** * 编辑系统菜单 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function edit() { @@ -111,6 +126,8 @@ class Menu extends Controller /** * 启用系统菜单 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function resume() { @@ -121,6 +138,8 @@ class Menu extends Controller /** * 禁用系统菜单 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function forbid() { @@ -131,6 +150,8 @@ class Menu extends Controller /** * 删除系统菜单 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { diff --git a/application/admin/controller/Oplog.php b/application/admin/controller/Oplog.php index 6b90646f4..152f4a18d 100644 --- a/application/admin/controller/Oplog.php +++ b/application/admin/controller/Oplog.php @@ -82,6 +82,8 @@ class Oplog extends Controller /** * 删除系统日志 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { diff --git a/application/admin/controller/Queue.php b/application/admin/controller/Queue.php index 18a51b225..da10b5c52 100644 --- a/application/admin/controller/Queue.php +++ b/application/admin/controller/Queue.php @@ -20,7 +20,7 @@ use think\Console; use think\Db; /** - * 系统消息任务 + * 系统系统任务 * Class Queue * @package app\admin\controller */ @@ -33,7 +33,7 @@ class Queue extends Controller protected $table = 'SystemJobsLog'; /** - * 系统消息任务 + * 系统系统任务 * @auth true * @menu true * @throws \think\Exception @@ -44,7 +44,7 @@ class Queue extends Controller */ public function index() { - $this->title = '消息任务管理'; + $this->title = '系统任务管理'; if (session('admin_user.username') === 'admin') { $this->cmd = 'php ' . env('root_path') . 'think xtask:start'; $this->message = Console::call('xtask:state')->fetch(); @@ -75,7 +75,7 @@ class Queue extends Controller } /** - * 删除消息任务 + * 删除系统任务 * @auth true */ public function remove() diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 0c0b0e204..147e706d7 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -54,6 +54,11 @@ class User extends Controller /** * 添加系统用户 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function add() { @@ -64,6 +69,11 @@ class User extends Controller /** * 编辑系统用户 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function edit() { @@ -124,6 +134,8 @@ class User extends Controller /** * 禁用系统用户 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function forbid() { @@ -137,6 +149,8 @@ class User extends Controller /** * 启用系统用户 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function resume() { @@ -147,6 +161,8 @@ class User extends Controller /** * 删除系统用户 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { diff --git a/application/admin/controller/api/Plugs.php b/application/admin/controller/api/Plugs.php index dd2a04f08..f5501a10f 100644 --- a/application/admin/controller/api/Plugs.php +++ b/application/admin/controller/api/Plugs.php @@ -55,7 +55,7 @@ class Plugs extends Controller if ($file->checkExt('php')) { return json(['uploaded' => false, 'error' => ['message' => '可执行文件禁止上传到本地服务器']]); } - $this->safe = $this->getUploadSafe(); + $this->safe = boolval(input('safe')); $this->uptype = $this->getUploadType(); $this->extend = pathinfo($file->getInfo('name'), PATHINFO_EXTENSION); $name = File::name($file->getPathname(), $this->extend, '', 'md5_file'); @@ -82,15 +82,6 @@ class Plugs extends Controller return $this->uptype; } - /** - * 获取上传安全模式 - * @return boolean - */ - private function getUploadSafe() - { - return $this->safe = boolval(input('safe')); - } - /** * 获取本地文件对象 * @return \think\File diff --git a/application/admin/controller/api/Update.php b/application/admin/controller/api/Update.php index e1cf3df26..5c34403f9 100644 --- a/application/admin/controller/api/Update.php +++ b/application/admin/controller/api/Update.php @@ -15,7 +15,7 @@ namespace app\admin\controller\api; -use library\command\Sync as UpdateLogic; +use library\command\Sync; use library\Controller; /** @@ -29,14 +29,14 @@ class Update extends Controller * 基础URL地址 * @var string */ - protected $baseUri = 'https://framework.thinkadmin.top'; + protected $baseUri = 'https://demo.thinkadmin.top'; /** * 获取文件列表 */ public function tree() { - $this->success('获取当前文件列表成功！', UpdateLogic::build()); + $this->success('获取当前文件列表成功！', Sync::build()); } /** @@ -46,11 +46,13 @@ class Update extends Controller public function read($encode) { $file = env('root_path') . decode($encode); - if (!file_exists($file)) $this->error('获取文件内容失败！'); - $this->success('获取文件内容成功！', [ - 'format' => 'base64', - 'content' => base64_encode(file_get_contents($file)), - ]); + if (!file_exists($file)) { + $this->error('获取文件内容失败！'); + } else { + $this->success('获取文件内容成功！', [ + 'format' => 'base64', 'content' => base64_encode(file_get_contents($file)), + ]); + } } }