From c11064ef7b50312249508ee902d675b801bda11c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 24 Jun 2017 15:01:47 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BB=A3=E7=A0=81=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E4=BC=98=E5=8C=96=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php   | 11 ++++-------
 application/admin/controller/Login.php   | 14 +++++++++-----
 application/admin/controller/Menu.php    | 12 ++++++------
 application/admin/controller/Node.php    | 11 +++--------
 application/admin/controller/Plugs.php   | 16 +++++-----------
 application/wechat/controller/Config.php |  3 +--
 static/admin/app.js                      |  1 -
 7 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 65dff1480..5445a8a74 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -38,9 +38,7 @@ class Index extends BasicAdmin {
         NodeService::applyAuthNode();
         $list = Db::name('SystemMenu')->where('status', '1')->order('sort asc,id asc')->select();
         $menus = $this->_filterMenu(ToolsService::arr2tree($list));
-        $this->assign('title', '系统管理');
-        $this->assign('menus', $menus);
-        return view();
+        return view('', ['title' => '系统管理', 'menus' => $menus]);
     }
 
     /**
@@ -71,9 +69,6 @@ class Index extends BasicAdmin {
      * @return View
      */
     public function main() {
-        $_version = Db::query('select version() as ver');
-        $version = array_pop($_version);
-        $this->assign('mysql_ver', $version['ver']);
         if (session('user.username') === 'admin' && session('user.password') === '21232f297a57a5a743894a0e4a801fc3') {
             $url = url('admin/index/pass') . '?id=' . session('user.id');
             $alert = [
@@ -84,7 +79,9 @@ class Index extends BasicAdmin {
             $this->assign('alert', $alert);
             $this->assign('title', '后台首页');
         }
-        return view();
+        $_version = Db::query('select version() as ver');
+        $version = array_pop($_version);
+        return view('', ['mysql_ver' => $version['ver']]);
     }
 
     /**
diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 5c1a16a6f..94eb7d85b 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -55,17 +55,21 @@ class Login extends BasicAdmin {
      */
     public function index() {
         if ($this->request->isGet()) {
-            $this->assign('title', '用户登录');
-            return $this->fetch();
+            return $this->fetch('', ['title' => '用户登录']);
         } else {
+            // 输入数据效验
             $username = $this->request->post('username', '', 'trim');
             $password = $this->request->post('password', '', 'trim');
-            (empty($username) || strlen($username) < 4) && $this->error('登录账号长度不能少于4位有效字符!');
-            (empty($password) || strlen($password) < 4) && $this->error('登录密码长度不能少于4位有效字符!');
+            strlen($username) < 4 && $this->error('登录账号长度不能少于4位有效字符!');
+            strlen($password) < 4 && $this->error('登录密码长度不能少于4位有效字符!');
+            // 用户信息验证
             $user = Db::name('SystemUser')->where('username', $username)->find();
             empty($user) && $this->error('登录账号不存在，请重新输入!');
             ($user['password'] !== md5($password)) && $this->error('登录密码与账号不匹配，请重新输入!');
-            Db::name('SystemUser')->where('id', $user['id'])->update(['login_at' => ['exp', 'now()'], 'login_num' => ['exp', 'login_num+1']]);
+            empty($user['status']) && $this->error('账号已经被禁用，请联系管理!');
+            // 更新登录信息
+            $data = ['login_at' => ['exp', 'now()'], 'login_num' => ['exp', 'login_num+1']];
+            Db::name('SystemUser')->where('id', $user['id'])->update($data);
             session('user', $user);
             !empty($user['authorize']) && NodeService::applyAuthNode();
             LogService::write('系统管理', '用户登录系统成功');
diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 74b69e7df..e969560ad 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -109,9 +109,9 @@ class Menu extends BasicAdmin {
      */
     public function del() {
         if (DataService::update($this->table)) {
-            $this->success("菜单删除成功！", '');
+            $this->success("菜单删除成功!", '');
         }
-        $this->error("菜单删除失败，请稍候再试！");
+        $this->error("菜单删除失败, 请稍候再试!");
     }
 
     /**
@@ -119,9 +119,9 @@ class Menu extends BasicAdmin {
      */
     public function forbid() {
         if (DataService::update($this->table)) {
-            $this->success("菜单禁用成功！", '');
+            $this->success("菜单禁用成功!", '');
         }
-        $this->error("菜单禁用失败，请稍候再试！");
+        $this->error("菜单禁用失败, 请稍候再试!");
     }
 
     /**
@@ -129,9 +129,9 @@ class Menu extends BasicAdmin {
      */
     public function resume() {
         if (DataService::update($this->table)) {
-            $this->success("菜单启用成功！", '');
+            $this->success("菜单启用成功!", '');
         }
-        $this->error("菜单启用失败，请稍候再试！");
+        $this->error("菜单启用失败, 请稍候再试!");
     }
 
 }
diff --git a/application/admin/controller/Node.php b/application/admin/controller/Node.php
index 7eb633067..17fff2d1d 100644
--- a/application/admin/controller/Node.php
+++ b/application/admin/controller/Node.php
@@ -38,14 +38,9 @@ class Node extends BasicAdmin {
      * 显示节点列表
      */
     public function index() {
-        $this->assign('alert', [
-            'type'    => 'danger',
-            'title'   => '安全警告',
-            'content' => '结构为系统自动生成，状态数据请勿随意修改！'
-        ]);
-        $this->assign('title', '系统节点管理');
-        $this->assign('nodes', ToolsService::arr2table(NodeService::get(), 'node', 'pnode'));
-        return view();
+        $alert = ['type' => 'danger', 'title' => '安全警告', 'content' => '结构为系统自动生成, 状态数据请勿随意修改!'];
+        $nodes = ToolsService::arr2table(NodeService::get(), 'node', 'pnode');
+        return view('', ['title' => '系统节点管理', 'nodes' => $nodes, 'alert' => $alert]);
     }
 
     /**
diff --git a/application/admin/controller/Plugs.php b/application/admin/controller/Plugs.php
index 37b0c08b1..c1ef827a2 100644
--- a/application/admin/controller/Plugs.php
+++ b/application/admin/controller/Plugs.php
@@ -44,17 +44,14 @@ class Plugs extends BasicAdmin {
      * @return View
      */
     public function upfile() {
-        $types = $this->request->get('type', 'jpg,png');
-        $mode = $this->request->get('mode', 'one');
-        $this->assign('mode', $mode);
-        $this->assign('types', $types);
         if (!in_array(($uptype = $this->request->get('uptype')), ['local', 'qiniu'])) {
             $uptype = sysconf('storage_type');
         }
-        $this->assign('uptype', $uptype);
+        $types = $this->request->get('type', 'jpg,png');
+        $mode = $this->request->get('mode', 'one');
         $this->assign('mimes', FileService::getFileMine($types));
         $this->assign('field', $this->request->get('field', 'file'));
-        return view();
+        return view('', ['mode' => $mode, 'types' => $types, 'uptype' => $uptype]);
     }
 
     /**
@@ -66,8 +63,7 @@ class Plugs extends BasicAdmin {
             $md5s = str_split($this->request->post('md5'), 16);
             if (($info = $this->request->file('file')->move('static' . DS . 'upload' . DS . $md5s[0], $md5s[1], true))) {
                 $filename = join('/', $md5s) . '.' . $info->getExtension();
-                $site_url = FileService::getFileUrl($filename, 'local');
-                if ($site_url) {
+                if (($site_url = FileService::getFileUrl($filename, 'local'))) {
                     return json(['data' => ['site_url' => $site_url], 'code' => 'SUCCESS']);
                 }
             }
@@ -99,9 +95,7 @@ class Plugs extends BasicAdmin {
                 $time = time() + 3600;
                 $policyText = [
                     'expiration' => date('Y-m-d', $time) . 'T' . date('H:i:s', $time) . '.000Z',
-                    'conditions' => [
-                        ['content-length-range', 0, 1048576000]
-                    ]
+                    'conditions' => [['content-length-range', 0, 1048576000]]
                 ];
                 $config['policy'] = base64_encode(json_encode($policyText));
                 $config['server'] = FileService::getUploadOssUrl();
diff --git a/application/wechat/controller/Config.php b/application/wechat/controller/Config.php
index 0b6d6bdf6..1ac3ed9c7 100644
--- a/application/wechat/controller/Config.php
+++ b/application/wechat/controller/Config.php
@@ -41,8 +41,7 @@ class Config extends BasicAdmin {
      */
     public function index() {
         if ($this->request->isGet()) {
-            $this->assign('title', '微信接口配置');
-            return view();
+            return view('', ['title' => '微信接口配置']);
         }
         foreach ($this->request->post() as $key => $vo) {
             sysconf($key, $vo);
diff --git a/static/admin/app.js b/static/admin/app.js
index c6d53ba29..f5949b116 100644
--- a/static/admin/app.js
+++ b/static/admin/app.js
@@ -65,7 +65,6 @@ require.config({
 
 window.WEB_SOCKET_SWF_LOCATION = baseUrl + "../plugs/socket/WebSocketMain.swf";
 window.UEDITOR_HOME_URL = (window.ROOT_URL ? window.ROOT_URL + '/static/' : baseUrl) + 'plugs/ueditor/';
-window.LAYDATE_PATH = baseUrl + '../plugs/layui/laydate/';
 
 // UI框架初始化
 require(['pace', 'jquery', 'layui', 'bootstrap', 'jquery.cookies'], function () {