From 30bba580b86049d25f594ad375d3f5e0accb26bb Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Nov 2019 14:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Auth.php   |  2 +-
 app/admin/controller/Config.php | 12 ++++++------
 app/admin/controller/Menu.php   |  2 +-
 app/admin/controller/Queue.php  | 34 ++++++++++++++++++++-------------
 app/admin/controller/User.php   |  2 +-
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php
index 2d8037b19..a5d675785 100644
--- a/app/admin/controller/Auth.php
+++ b/app/admin/controller/Auth.php
@@ -113,7 +113,7 @@ class Auth extends Controller
             $this->_form($this->table, 'apply');
         }
     }
-    
+
     /**
      * 删除系统权限
      * @auth true
diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php
index c3a1ebb02..27a7ab6d0 100644
--- a/app/admin/controller/Config.php
+++ b/app/admin/controller/Config.php
@@ -31,7 +31,7 @@ class Config extends Controller
     protected $table = 'SystemConfig';
 
     /**
-     * 绑定数据表
+     * 系统参数配置
      * @auth true
      * @menu true
      */
@@ -42,7 +42,7 @@ class Config extends Controller
     }
 
     /**
-     * 修改系统参数配置
+     * 修改系统参数
      * @auth true
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
@@ -52,17 +52,17 @@ class Config extends Controller
     {
         $this->_applyFormToken();
         if ($this->request->isGet()) {
-            $this->title = '修改系统参数配置';
+            $this->title = '修改系统参数';
             $this->fetch();
         }
         foreach ($this->request->post() as $key => $value) {
             sysconf($key, $value);
         }
-        $this->success('系统参数配置成功！');
+        $this->success('修改系统参数成功！');
     }
 
     /**
-     * 修改文件存储引擎
+     * 修改文件存储
      * @auth true
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
@@ -83,7 +83,7 @@ class Config extends Controller
             $post['storage']['allow_exts'] = join(',', $exts);
         }
         foreach ($post as $key => $value) sysconf($key, $value);
-        $this->success('文件存储配置成功！');
+        $this->success('修改文件存储成功！');
     }
 
 }
\ No newline at end of file
diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index b797c8339..8fc92dd4b 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -116,7 +116,7 @@ class Menu extends Controller
     }
 
     /**
-     * 修改系统菜单状态
+     * 修改菜单状态
      * @auth true
      * @throws \think\db\exception\DbException
      */
diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index d2c9f1e51..414abb2f0 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -56,6 +56,16 @@ class Queue extends Controller
         $query->like('title,preload')->equal('status')->order('id desc')->page();
     }
 
+    /**
+     * 删除系统任务
+     * @auth true
+     * @throws \think\db\exception\DbException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
     /**
      * 重启系统任务
      * @auth true
@@ -67,7 +77,16 @@ class Queue extends Controller
     }
 
     /**
-     * (WIN)创建任务监听进程
+     * 重启任务结果处理
+     * @param boolean $state
+     */
+    protected function _redo_save_result($state)
+    {
+        if ($state) $this->success('重启任务成功！');
+    }
+
+    /**
+     * WIN创建监听进程
      * @auth true
      */
     public function start()
@@ -82,7 +101,7 @@ class Queue extends Controller
     }
 
     /**
-     * (WIN)停止任务监听进程
+     * WIN停止监听进程
      * @auth true
      */
     public function stop()
@@ -96,15 +115,4 @@ class Queue extends Controller
         }
     }
 
-
-    /**
-     * 删除系统任务
-     * @auth true
-     * @throws \think\db\exception\DbException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-
 }
\ No newline at end of file
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index b5a03f109..c3c54af3e 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -126,7 +126,7 @@ class User extends Controller
     }
 
     /**
-     * 修改系统用户状态
+     * 修改用户状态
      * @auth true
      * @throws \think\db\exception\DbException
      */