From b6651deaa6e474c9d9c5c83fdc17a3d3af6eb049 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 29 Nov 2019 11:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                          |  1 +
 app/admin/controller/Auth.php       |  3 ++-
 app/admin/controller/Config.php     |  7 +++++--
 app/admin/controller/Index.php      |  2 +-
 app/admin/controller/Login.php      |  3 ++-
 app/admin/controller/Menu.php       | 14 +++++++++-----
 app/admin/controller/Oplog.php      |  3 ++-
 app/admin/controller/Queue.php      |  7 +++++--
 app/admin/controller/User.php       |  6 ++++--
 app/admin/controller/api/Update.php | 11 ++++++++---
 app/admin/controller/api/Upload.php |  4 +++-
 11 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2a476b7a..488ca372d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *.log
 runtime
 public/upload
+/nbproject/private/
\ No newline at end of file
diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php
index 146eec852..5f1f2f3c7 100644
--- a/app/admin/controller/Auth.php
+++ b/app/admin/controller/Auth.php
@@ -25,6 +25,7 @@ use think\admin\service\AdminService;
  */
 class Auth extends Controller
 {
+
     /**
      * 绑定数据表
      * @var string
@@ -141,4 +142,4 @@ class Auth extends Controller
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php
index 5666b7730..2d7b69f57 100644
--- a/app/admin/controller/Config.php
+++ b/app/admin/controller/Config.php
@@ -24,6 +24,7 @@ use think\admin\Controller;
  */
 class Config extends Controller
 {
+
     /**
      * 绑定数据表
      * @var string
@@ -80,11 +81,13 @@ class Config extends Controller
         if (!empty($post['storage']['allow_exts'])) {
             $exts = array_unique(explode(',', strtolower($post['storage']['allow_exts'])));
             sort($exts);
-            if (in_array('php', $exts)) $this->error('禁止上传可执行文件到本地服务器！');
+            if (in_array('php', $exts)) {
+                $this->error('禁止上传可执行文件到本地服务器！');
+            }
             $post['storage']['allow_exts'] = join(',', $exts);
         }
         foreach ($post as $key => $value) sysconf($key, $value);
         $this->success('修改文件存储成功！');
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index cb8cbf581..1b2408298 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -144,4 +144,4 @@ class Index extends Controller
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php
index 2f47126ea..764d85dfe 100644
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -27,6 +27,7 @@ use think\admin\service\SystemService;
  */
 class Login extends Controller
 {
+
     /**
      * 后台登录入口
      * @throws \think\db\exception\DataNotFoundException
@@ -100,4 +101,4 @@ class Login extends Controller
         $this->success('退出登录成功!', url('@admin/login')->build());
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 79960838e..5beadf899 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -26,6 +26,7 @@ use think\admin\service\MenuService;
  */
 class Menu extends Controller
 {
+
     /**
      * 当前操作数据库
      * @var string
@@ -100,10 +101,12 @@ class Menu extends Controller
             // 选择自己的上级菜单
             if (empty($vo['pid']) && $this->request->get('pid', '0')) $vo['pid'] = $this->request->get('pid', '0');
             // 列出可选上级菜单
-            $menus = $this->app->db->name($this->table)->where(['status' => '1'])->order('sort desc,id asc')->column('id,pid,title');
-            $menus[] = ['title' => '顶部菜单', 'id' => '0', 'pid' => '-1'];
-            foreach ($this->menus = DataExtend::arr2table($menus) as $key => &$menu) {
-                if ($menu['spt'] >= 3) unset($this->menus[$key]);
+            $menus = $this->app->db->name($this->table)->where(['status' => '1'])->order('sort desc,id asc')->column('id,pid,url,title');
+            $this->menus = DataExtend::arr2table(array_merge($menus, [['id' => '0', 'pid' => '-1', 'url' => '#', 'title' => '顶部菜单']]));
+            if (isset($vo['id'])) foreach ($this->menus as $key => $menu) if ($menu['id'] === $vo['id']) $vo = $menu;
+            foreach ($this->menus as $key => &$menu) {
+                if ($menu['spt'] >= 3 || $menu['url'] !== '#') unset($this->menus[$key]);
+                if (isset($vo['spt']) && $vo['spt'] <= $menu['spt']) unset($this->menus[$key]);
             }
         }
     }
@@ -129,4 +132,5 @@ class Menu extends Controller
         $this->_applyFormToken();
         $this->_delete($this->table);
     }
-}
\ No newline at end of file
+
+}
diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php
index deffbd0df..66f7a09af 100644
--- a/app/admin/controller/Oplog.php
+++ b/app/admin/controller/Oplog.php
@@ -86,4 +86,5 @@ class Oplog extends Controller
         $this->_applyFormToken();
         $this->_delete($this->table);
     }
-}
\ No newline at end of file
+
+}
diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 9fe078c66..0e2d151a3 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -26,6 +26,7 @@ use think\exception\HttpResponseException;
  */
 class Queue extends Controller
 {
+
     /**
      * 绑定数据表
      * @var string
@@ -74,7 +75,9 @@ class Queue extends Controller
      */
     protected function _redo_save_result($state)
     {
-        if ($state) $this->success('重启任务成功！');
+        if ($state) {
+            $this->success('重启任务成功！');
+        }
     }
 
     /**
@@ -119,4 +122,4 @@ class Queue extends Controller
         $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 bb5d73006..14f623b34 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -111,7 +111,8 @@ class User extends Controller
             // 用户权限处理
             $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : '';
             // 用户账号重复检查
-            if (isset($data['id'])) unset($data['username']);
+            if (isset($data['id']))
+                unset($data['username']);
             elseif ($this->app->db->name($this->table)->where(['username' => $data['username'], 'is_deleted' => '0'])->count() > 0) {
                 $this->error("账号{$data['username']}已经存在，请使用其它账号！");
             }
@@ -148,4 +149,5 @@ class User extends Controller
         $this->_applyFormToken();
         $this->_delete($this->table);
     }
-}
\ No newline at end of file
+
+}
diff --git a/app/admin/controller/api/Update.php b/app/admin/controller/api/Update.php
index 11111c0ed..5bb38e938 100644
--- a/app/admin/controller/api/Update.php
+++ b/app/admin/controller/api/Update.php
@@ -25,6 +25,7 @@ use think\admin\service\InstallService;
  */
 class Update extends Controller
 {
+
     /**
      * 获取文件列表
      */
@@ -41,9 +42,13 @@ class Update extends Controller
     public function get()
     {
         $this->file = $this->app->getRootPath() . decode(input('encode', '0'));
-        file_exists($this->file) ? $this->success('读取文件成功！', [
-            'content' => base64_encode(file_get_contents($this->file)),
-        ]) : $this->error('读取文件内容失败！');
+        if (file_exists($this->file)) {
+            $this->success('读取文件成功！', [
+                'content' => base64_encode(file_get_contents($this->file)),
+            ]);
+        } else {
+            $this->error('读取文件内容失败！');
+        }
     }
 
 }
diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php
index 4217a7f0d..19c0f3496 100644
--- a/app/admin/controller/api/Upload.php
+++ b/app/admin/controller/api/Upload.php
@@ -25,6 +25,7 @@ use think\admin\Storage;
  */
 class Upload extends Controller
 {
+
     /**
      * 上传安全检查
      * @login true
@@ -122,4 +123,5 @@ class Upload extends Controller
             $this->error(lang($e->getMessage()));
         }
     }
-}
\ No newline at end of file
+
+}