1.提交遗漏代码

2.整合原有是否登录的判断

modules/users/controllers/manager_controller.js

@@ -147,8 +147,8 @@ class ManagerController extends BaseController {
 
     async create(request, response) {
         let managerModel = new ManagerModel();
-        let result = await managerModel.createManager();
-        console.log('result:' + result);
+        let result = managerModel.changePassword('admin', 'admin123', 'admin123');
+        // let result = await managerModel.createManager();
         response.end('success');
     }
 }

modules/users/models/manager_model.js

@@ -78,7 +78,6 @@ class ManagerModel extends BaseModel {
         // 查找对应用户
         let managerData = await this.findDataByCondition({username: username});
         if (managerData.length <= 0) {
-            console.log('222');
             return false;
         }
 

modules/users/routes/tool_route.js

@@ -0,0 +1,19 @@
+/**
+ * 工具路由
+ *
+ * @author CaiAoLin
+ * @date 2017/7/21
+ * @version
+ */
+import Express from "express";
+import ToolController from "../controllers/tool_controller";
+
+const router = Express.Router();
+const toolController = new ToolController();
+
+module.exports =function (app) {
+    // action定义区域
+    router.get('/', toolController.auth, toolController.init, toolController.index);
+
+    app.use("/tool", router);
+};

modules/users/routes/user_route.js

@@ -0,0 +1,19 @@
+/**
+ * 用户管理相关路由
+ *
+ * @author CaiAoLin
+ * @date 2017/6/7
+ * @version
+ */
+import Express from "express";
+import UserController from "../controllers/user_controller";
+
+const router = Express.Router();
+const userController = new UserController();
+
+module.exports =function (app) {
+    // action定义区域
+    router.get('/', userController.auth, userController.init, userController.lastRegister);
+
+    app.use("/user", router);
+};

operation.js

@@ -50,15 +50,15 @@ app.use(session({
 }));
 
 app.use(function (req, res, next) {
-    // let url = req.originalUrl, referer;
-    // if (!/^\/login/.test(req.originalUrl) && !req.session.userAccount) {
-    //     if (/\/api/.test(req.originalUrl)) {
-    //         referer = URL.parse(req.headers.referer);
-    //         return res.redirect('/login' + '?referer=' + referer.path);
-    //     } else {
-    //         return res.redirect("/login" + '?referer=' + req.originalUrl);
-    //     }
-    // }
+    let referer = '';
+    if (!/^\/login/.test(req.originalUrl) && !req.session.managerData) {
+        if (/\/api/.test(req.originalUrl)) {
+            referer = URL.parse(req.headers.referer);
+            return res.redirect('/login' + '?referer=' + referer.path);
+        } else {
+            return res.redirect("/login" + '?referer=' + req.originalUrl);
+        }
+    }
     next();
 });
 

web/users/views/login/index.html

@@ -27,13 +27,13 @@
                 <div class="form-group">
                     <div class="input-group">
                         <div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
-                        <input  class="form-control input-lg" placeholder="输入账号" name="username" id="username">
+                        <input  class="form-control input-lg" placeholder="输入账号" name="username" id="username" value="admin">
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="input-group">
                         <div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
-                        <input type="password" class="form-control input-lg"  placeholder="输入密码" id="password" name="password">
+                        <input type="password" class="form-control input-lg"  placeholder="输入密码" id="password" name="password" value="admin1234">
                     </div>
                 </div>
                 <a class="btn btn-primary btn-lg btn-block" href="javascript:void(0);" id="login">登录</a>