update

controller/roleController.js

+async function createRole(req, res, next) {
+    try {
+        const body = req.body;
+        const ret = await userModule.create(body);
+        return res.sendData(ret);
+    } catch (error) {
+        next(error);
+    }
+
+}
+async function updateRole(req, res, next) {
+    try {
+
+    } catch (error) {
+        next(error);
+    }
+
+}
+async function deleteRole(req, res, next) {
+    try {
+
+    } catch (error) {
+        next(error);
+    }
+
+}
+async function listRole(req, res, next) {
+    try {
+
+    } catch (error) {
+        next(error);
+    }
+
+}
+async function getRole(req, res, next) {
+    try {
+
+    } catch (error) {
+        next(error);
+    }
+
+}
+
+
+module.exports = {
+    getRole,
+    createRole,
+    listRole,
+    updateRole,
+    deleteRole
+}
\ No newline at end of file

controller/userController.js

@@ -31,7 +31,7 @@ async function login(req, res, next) {
             req.body.password = encArr[1];
         }
         const { mobile, password } = req.body;
-        const user = await userModule.findOne({ mobile });
+        const user = await userModule.findOne({ mobile, del: 0, enable: 0 });
         console.log("----------------------", user)
         if (!user) {
             return res.sendError(errorMessage.loginError);
@@ -74,7 +74,7 @@ async function addUser(req, res, next) {
     }
 
 }
-async function getUser(req, res, next) {
+async function getUserInfo(req, res, next) {
     try {
         let query = {};
         const { id, mobile } = req.body;
@@ -107,16 +107,23 @@ async function updateUser(req, res, next) {
 
 async function listUser(req, res, next) {
     try {
-        let search = { del: 0 };
+        let search = {};
         let page = req.body.page || 1;
         let limit = req.body.pageSize || 10;
-        let offset = (page - 1) * pageSize;
-        if(req.body.name) {
-            search.where = {[Op.or]: [{name: {[Op.like]: req.body.name}, mobile: {[Op.like]: req.body.name}}]}
+        let offset = (page - 1) * limit;
+        if (req.body.name) {
+            search.where = {
+                [Op.or]: [
+                    { name: { [Op.like]: `%${req.body.name}%` } },
+                    { mobile: { [Op.like]: `%${req.body.name}%` } }
+                ],
+                del: 0,
+            }
         }
         search.limit = limit;
         search.offset = offset;
-        let ret = await userModule.findAndCountAll(condition);
+        // console.log(JSON.stringify(search), "===")
+        let ret = await userModule.findAndCountAll(search);
         return res.sendData(ret);
     } catch (error) {
         next(error);
@@ -125,52 +132,25 @@ async function listUser(req, res, next) {
 
 async function deleteUser(req, res, next) {
     try {
-
-    } catch (error) {
-        next(error);
-    }
-
-}
-async function getRole(req, res, next) {
-    try {
-
-    } catch (error) {
-        next(error);
-    }
-
-}
-async function createRole(req, res, next) {
-    try {
-
-    } catch (error) {
-        next(error);
-    }
-
-}
-async function updateRole(req, res, next) {
-    try {
-
-    } catch (error) {
-        next(error);
-    }
-
-}
-async function deleteRole(req, res, next) {
-    try {
-
+        const body = req.body;
+        const search = {};
+        if (body.id) {
+            search = { id: body.id };
+        }
+        if (body.mobile) {
+            search = { mobile: body.mobile }
+        }
+        if (_.isEmpty(search)) {
+            return res.sendError(errorMessage.resourceNotFound);
+        }
+        const ret = await userModule.updateOne(search, { del: 1 });//删除标记
+        return res.sendData(ret);
     } catch (error) {
         next(error);
     }
 
 }
-async function listRole(req, res, next) {
-    try {
-
-    } catch (error) {
-        next(error);
-    }
 
-}
 
 
 
@@ -179,16 +159,10 @@ module.exports = {
     login,
     listUser,
     addUser,
-    getUser,
+    getUserInfo,
     updateUser,
     deleteUser,
     // checkUserToken,
     // changePassword,
     // changePwd,
-
-    getRole,
-    createRole,
-    listRole,
-    updateRole,
-    deleteRole
 }
\ No newline at end of file

db/model/menu.js

@@ -55,8 +55,8 @@ const Menu = sequelize.define('Menu', {
 
 // 同步模型到数据库（创建表）
 Menu.sync({
-    // force: false, // force: true 会删除已存在表并重新创建
-    alter: true
+    force: false, // force: true 会删除已存在表并重新创建
+    // alter: true
 })
     .then(() => {
         console.log('Menu 表同步成功');

db/model/requestLog.js

@@ -60,7 +60,11 @@ const RequestLog = sequelize.define('User', {
 });
 
 // 同步模型到数据库（创建表）
-RequestLog.sync({ force: false }) // force: true 会删除已存在表并重新创建
+RequestLog.sync({ 
+    force: false, 
+//   force: true ,//会删除已存在表并重新创建
+//   alter: true
+}) 
     .then(() => {
         console.log('RequestLog 表同步成功');
     });

db/model/user.js

@@ -27,9 +27,9 @@ const User = sequelize.define('User', {
     allowNull: true
   },
   enable: {
-    type: DataTypes.BOOLEAN,
+    type: DataTypes.INTEGER,
     defaultValue: true,
-    comment: "true: 启用, false: 不启用"
+    comment: "0: 启用, 1: 不启用"
   },
   del: {
     type: DataTypes.INTEGER,
@@ -43,7 +43,8 @@ const User = sequelize.define('User', {
 
 // 同步模型到数据库（创建表）
 User.sync({
-  // force: false, // force: true 会删除已存在表并重新创建
+  // force: false, 
+  // force: true ,//会删除已存在表并重新创建
   alter: true
 })
   .then(() => {

module/userModule.js

@@ -2,6 +2,7 @@
 
 const _ = require("lodash");
 const { where } = require("sequelize");
+const errorMessage = require("../utils/errorMessage");
 
 
 
@@ -24,7 +25,6 @@ async function findOne(params) {
     if(_.isEmpty(params)) {
         return null;
     }
-    console.log(params, "====")
     return DB.User.findOne(
         {where: params, raw: true}
     );

router/userRouter.js

@@ -4,30 +4,29 @@ const router = express.Router();
 
 
 const userController = require('../controller/userController');
+const roleController = require('../controller/roleController');
 
 
 router.post('/regist', userController.regist);
 router.post('/login', userController.login);
-
 // router.post('/checkUserToken', userController.checkUserToken);
 // router.post('/changePassword', userController.changePassword);
-
-router.post('/manage/list', userController.listUser);
-router.post('/manage/create', userController.addUser);
-router.post('/manage/update', userController.updateUser); //更新 
-router.post('/manage/info', userController.getUser);
-router.post('/manage/delete', userController.deleteUser); // 删除
-// router.post('/manage/changePwd', userController.changePwd); // 删除
-
-
-// /**
-//  * 角色
-//  */
-// router.post('/role/create', userController.createRole);
-// router.post('/role/update', userController.updateRole);
-// router.post('/role/delete', userController.deleteRole);
-// router.post('/role/list', userController.listRole);
-// router.post('/role/info', userController.getRole);
+router.post('/manage/listUser', userController.listUser);
+router.post('/manage/addUser', userController.addUser);
+router.post('/manage/updateUser', userController.updateUser); //更新 enable用户
+router.post('/manage/getUserInfo', userController.getUserInfo);
+router.post('/manage/deleteUser', userController.deleteUser); // 删除
+// router.post('/manage/changePwd', userController.changePwd); 
+
+
+/**
+* 角色
+*/
+router.post('/role/createRole', roleController.createRole);
+router.post('/role/updateRole', roleController.updateRole);
+router.post('/role/deleteRole', roleController.deleteRole);
+router.post('/role/listRole', roleController.listRole);
+router.post('/role/getRole', roleController.getRole);
 
 
 

server.js

@@ -59,13 +59,13 @@ app.use(function (err, req, res, next) {
     //         ...req.query,
     //         ...req.params,
     //     }),
-    //     user: req.user,
+    //     user: JSON.stringify(req.user),
     //     status: err.status || err.code || 500,
     //     msg: err.message || 'server error'
     // });
-    if(err.code && err.message) {
-        return res.sendError(err);
-    }
+    // if(err.code && err.message) {
+    //     return res.sendError(err);
+    // }
     return res.status(err.status || 500).send({code: err.status ||500, msg: err.message || 'server error'});
 });