gsb

xgg-admin/app/base/controller/impl/auth/userCtl.js

@@ -55,7 +55,6 @@ class UserCtl extends CtlBase {
       req.session.user = user;
       req.session.user = user;
 
 
       var xggadminsid = await this.setLogin(user);
       var xggadminsid = await this.setLogin(user);
-
       return system.getResultSuccess(xggadminsid);
       return system.getResultSuccess(xggadminsid);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);

xgg-admin/app/base/controller/impl/uc/roleCtl.js

@@ -65,5 +65,13 @@ class RoleCtl extends CtlBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
+  async setAuth(params, pobj2, req) {
+    params.saas_id = req.loginUser.saas_id;
+    try {
+      return await this.roleSve.setAuth(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 }
 }
 module.exports = RoleCtl;
 module.exports = RoleCtl;
\ No newline at end of file

xgg-admin/app/base/controller/impl/uc/userCtl.js

 var system = require("../../../system")
 var system = require("../../../system")
 const CtlBase = require("../../ctlms.base");
 const CtlBase = require("../../ctlms.base");
+const md5 = require("MD5");
+const uuidv4 = require('uuid/v4');
+const logCtl = system.getObject("web.common.oplogCtl");
+
+
 class UserCtl extends CtlBase {
 class UserCtl extends CtlBase {
   constructor() {
   constructor() {
     super();
     super();
     this.userSve = system.getObject("service.uc.userSve");
     this.userSve = system.getObject("service.uc.userSve");
+    this.redisClient = system.getObject("util.redisClient");
+    this.captchaSve = system.getObject("service.common.captchaSve");
+  }
+
+  async login(pobj, pobj2, req, res) {
+    var loginName = this.trim(pobj.loginName);
+    var password = this.trim(pobj.password);
+    var captchaKey = this.trim(pobj.captchaKey);
+    var captchaCode = this.trim(pobj.captchaCode);
+
+    try {
+      var vrs = await this.captchaSve.valid({
+        key: captchaKey,
+        code: captchaCode,
+      });
+      if (vrs.status !== 0) {
+        // return vrs;
+      }
+
+      var loginUser = await this.userSve.login({
+        ucname: loginName,
+        password: password,
+      });
+      if(loginUser.status != 0) {
+        return loginUser;
+      }
+
+      loginUser = loginUser.data;
+
+      var xggadminsid = await this.setLogin(loginUser);
+      return system.getResultSuccess(xggadminsid);
+    } catch (error) {
+      console.log(error);
+      return system.getResultFail(500, "接口异常：" + error.message);
+    }
+  }
+
+  async setLogin(user) {
+    var xggadminsid = uuidv4();
+    xggadminsid = "3cb49932-fa02-44f0-90db-9f06fe02e5c7";
+    await this.redisClient.setWithEx(xggadminsid, JSON.stringify(user), 60 * 60);
+    return xggadminsid;
   }
   }
 
 
   /**
   /**

xgg-admin/app/base/service/impl/uc/roleSve.js

@@ -62,6 +62,13 @@ class RoleService extends ServiceBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
+  async setAuth(params) {
+    try {
+      return await this.callms("uc", "setAuth", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 
 
 }
 }
 module.exports = RoleService;
 module.exports = RoleService;
\ No newline at end of file

xgg-admin/app/base/service/impl/uc/userSve.js

@@ -7,6 +7,14 @@ class UserService extends ServiceBase {
     this.opuserrelationDao = system.getObject("db.common.opuserrelationDao");
     this.opuserrelationDao = system.getObject("db.common.opuserrelationDao");
   }
   }
 
 
+  async login(params) {
+    try {
+      return await this.callms("uc", "login", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
   /**
   /**
    *   添加 
    *   添加 
    * @param {*} params 
    * @param {*} params 
@@ -14,10 +22,12 @@ class UserService extends ServiceBase {
   async addUser(params) {
   async addUser(params) {
     try {
     try {
 
 
-      var relation = await this.opuserrelationDao.findOne({ucname: params.ucname});
-      if(!relation) {
+      var relation = await this.opuserrelationDao.findOne({
+        ucname: params.ucname
+      });
+      if (!relation) {
         var rs = await this.platformUtils.createUserInfo(params.ucname, params.ucname, params.password);
         var rs = await this.platformUtils.createUserInfo(params.ucname, params.ucname, params.password);
-        if(!rs.data || !rs.data.account_id) {
+        if (!rs.data || !rs.data.account_id) {
           return rs;
           return rs;
         }
         }
         params.ucid = rs.data.account_id;
         params.ucid = rs.data.account_id;
@@ -98,7 +108,7 @@ class UserService extends ServiceBase {
       var user = await this.callms("uc", "userInfo", params);
       var user = await this.callms("uc", "userInfo", params);
       user = user.data;
       user = user.data;
       var rs = await this.platformUtils.modifyPassword(user.ucid, params.password);
       var rs = await this.platformUtils.modifyPassword(user.ucid, params.password);
-      if(rs.status !== 0) {
+      if (rs.status !== 0) {
         return rs;
         return rs;
       }
       }
       await this.callms("uc", "updPassword", params);
       await this.callms("uc", "updPassword", params);
@@ -107,5 +117,6 @@ class UserService extends ServiceBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
+
 }
 }
 module.exports = UserService;
 module.exports = UserService;
\ No newline at end of file

xgg-admin/app/config/routes/web.js

@@ -8,7 +8,8 @@ module.exports = function (app) {
 	app.all("/web/*", async function (req, res, next) {
 	app.all("/web/*", async function (req, res, next) {
 
 
 		var xggadminsid;
 		var xggadminsid;
-		var jsonUser = req.session.user;
+		// var jsonUser = req.session.user;
+		var jsonUser = null;
 		if(!jsonUser) {
 		if(!jsonUser) {
 			xggadminsid = req.headers["xggadminsid"] || "";
 			xggadminsid = req.headers["xggadminsid"] || "";
 			jsonUser = await redisClient.get(xggadminsid);
 			jsonUser = await redisClient.get(xggadminsid);
@@ -17,11 +18,6 @@ module.exports = function (app) {
 			}
 			}
 		}
 		}
 
 
-		// TODO 本次改版测试时候使用
-		if(jsonUser) {
-			jsonUser.saas_id = 1;
-		}
-
 		if (req.url.indexOf("auth/userCtl/login") > 0 ||
 		if (req.url.indexOf("auth/userCtl/login") > 0 ||
 			req.url.indexOf("auth/userCtl/smsCode") > 0 ||
 			req.url.indexOf("auth/userCtl/smsCode") > 0 ||
 			req.url.indexOf("common/metaCtl/getApiDoc") > 0 ||
 			req.url.indexOf("common/metaCtl/getApiDoc") > 0 ||