Merge branch 'xgg-saas-admin' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-admin

xgg-saas-admin/app/base/controller/impl/uc/ssmuserCtl.js

+var system = require("../../../system")
+const settings = require("../../../../config/settings")
+const CtlBase = require("../../ctlms.base");
+const md5 = require("MD5");
+const uuidv4 = require('uuid/v4');
+const logCtl = system.getObject("web.common.oplogCtl");
+
+class SsmUserCtl extends CtlBase {
+  constructor() {
+    super();
+    this.ssmuserSve = system.getObject("service.uc.ssmuserSve");
+  }
+
+  /**
+   * fn:ssm用户登录
+   * @param pobj
+   * @param pobj2
+   * @param req
+   * @param res
+   * @returns {Promise<{msg: *, data: *, status: *}|{msg: *, data: (*|null), status: number}|*>}
+   */
+  async login(pobj, pobj2, req, res) {
+    var loginName = this.trim(pobj.loginName);
+    var password = this.trim(pobj.password);
+    try {
+      var loginUser = await this.userSve.ssmUserlogin({
+        ucname: loginName,
+        password: password,
+      });
+      if (loginUser.status != 0 && !loginUser.data) {
+        return loginUser;
+      }
+      loginUser = loginUser.data;
+      var loginsid = await this.setLogin(loginUser);
+      let rs = {
+        key: loginsid,
+        loginname: loginUser.ucname,
+        menus: await this.getMenu(loginUser)
+      };
+
+      return system.getResultSuccess(rs);
+    } catch (error) {
+      console.log(error);
+      return system.getResultFail(500, "接口异常：" + error.message);
+    }
+  }
+
+  /**
+   * fn:设置登录属性
+   * @param user
+   * @returns {Promise<string>}
+   */
+  async setLogin(user) {
+    let loginsid = "saasa_" + uuidv4();
+    // if(settings.env == 'dev') {
+    //   user.loginsid = "jfs_" + "3cb49932-fa02-44f0-90db-9f06fe02e5c7";
+    //   user.subsid = "sub_" +  "3cb49932-fa02-44f0-90db-9f06fe02e5c7";
+    // }
+    // loginsid = "saasp_" + "2cb49932-fa02-44f0-90db-9f06fe02e5c7";
+    await this.redisClient.setWithEx(loginsid, JSON.stringify(user), 60 * 60 * 5);
+    return loginsid;
+  }
+
+  /**
+   * fn:返回用户功能菜单
+   * @param loginUser
+   * @returns {*[]|({name: string, icon: string, team: [{path: string, name: string}]}|{name: string, icon: string, team: [{path: string, name: string}]}|{name: string, icon: string, team: [{path: string, name: string}]})[]}
+   */
+  getMenu(loginUser) {
+    if (!loginUser) {
+      return [];
+    }
+    return [{
+        "name": "数据概览",
+        "icon": "iconfont icon-gth-gsshujugailan",
+        "team": [{
+          "name": "业务数据汇总",
+          "path": "/home"
+        }]
+      },
+      {
+        "name": "订单中心",
+        "icon": "iconfont icon-gth-gsdingdanzhongxin",
+        "team": [{
+          "name": "订单管理",
+          "path": "/trading/ordersAll"
+        }, ]
+      },
+      {
+        "name": "个体户中心",
+        "icon": "iconfont icon-gth-gsgetihuzhongxin",
+        "team": [{
+          "name": "个体户管理",
+          "path": "/trading/userInformation"
+        }, ]
+      },
+    ];
+  }
+
+  /**
+   * fn:添加ssmUser 用户
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async addSsm(params, pobj2, req){
+    if (!params.ucname) {
+      return system.getResult(null, `用户名不能为空`);
+    }
+    if (!params.mobile) {
+      return system.getResult(null, `手机号不能为空`);
+    }
+    if (!params.realName) {
+      return system.getResult(null, `姓名不能为空`);
+    }
+    if (!params.password) {
+      return system.getResult(null, `密码不能为空`);
+    }
+    return await this.ssmuserSve.addSsm(params);
+  }
+
+  /**
+   * fn:更新ssmUser 用户
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async updSsm(params){
+    if (!params.id) {
+      return system.getResult(null, `参数错误 ID不能为空`);
+    }
+    return await this.ssmuserSve.updSsm(params);
+  }
+
+  /**
+   * fn：查询用户信息
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async querySsmUser(params){return await this.ssmuserSve.querySsmUser(params);}
+
+  /**
+   * fn:ssmuser用户列表
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async querySsmUsers(params) {
+    return await this.ssmuserSve.querySsmUsers(params);
+  }
+
+}
+
+module.exports = SsmUserCtl;
\ No newline at end of file

xgg-saas-admin/app/base/service/impl/uc/ssmuserSve.js

+const system = require("../../../system");
+const ServiceBase = require("../../svems.base")
+
+class SsmUserService extends ServiceBase {
+  constructor() {
+    super();
+  }
+
+  /**
+   * fn:ssmUser登录
+   * @param params
+   * @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}|{msg: string, data, bizmsg: *|string, status: number}|*|undefined>}
+   */
+  async ssmUserlogin(params) {
+    try {
+      return await this.callms("uc", "ssmUserlogin", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * fn:添加ssmUser 用户
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async addSsm(params, pobj2, req){
+    try {
+      return await this.callms("uc", "addSsm", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * fn:更新ssmUser 用户
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async updSsm(params){
+    try {
+      return await this.callms("uc", "updSsm", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * fn：查询用户信息
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async querySsmUser(params) {
+    try {
+      return await this.callms("uc", "querySsmUser", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  /**
+   * fn:ssmuser用户列表
+   * @param params
+   * @returns {Promise<void>}
+   */
+  async querySsmUsers(params) {
+    try {
+      return await this.callms("uc", "querySsmUsers", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+}
+
+module.exports = SsmUserService;
\ No newline at end of file

xgg-saas-admin/app/base/system.js

@@ -203,7 +203,7 @@ class System {
         invoice: dev + ":3105" + path,
         invoice: dev + ":3105" + path,
 
 
         // 用户服务
         // 用户服务
-        uc: dev + ":3106" + path,
+        uc: local + ":3106" + path,
 
 
         // 交易
         // 交易
         trade: dev + ":3107" + path,
         trade: dev + ":3107" + path,