d

af8ef0e1 · v_vjyjiang · dcd2197d · af8ef0e1 · af8ef0e1 · af8ef0e1
Commit af8ef0e1 authored Aug 20, 2020 by v_vjyjiang
Showing with 75 additions and 66 deletions

center-manage/app/base/controller/impl/auth/userCtl.js
+38 -29

center-manage/app/base/db/cache/loginTimesCache.js
+9 -8

center-manage/app/base/service/impl/auth/userSve.js
+27 -28

center-manage/app/config/settings.js
+1 -1

No files found.
--- a/center-manage/app/base/controller/impl/auth/userCtl.js
+++ b/center-manage/app/base/controller/impl/auth/userCtl.js
@@ -7,23 +7,23 @@ class UserCtl extends CtlBase {
  constructor() {
    super("auth", CtlBase.getServiceName(UserCtl));
  }
-  async logout(pobj, qobj, req) {
+  async logout (pobj, qobj, req) {
    let rtn = await this.service.logout(pobj)
    return system.getResult(rtn)
  }
-  async pmgetUserByCode(pobj, qobj, req) {
+  async pmgetUserByCode (pobj, qobj, req) {
    let code = pobj.code
    let rtn = await this.service.pmgetUserByCode(code)
    return system.getResult(rtn)
  }
-  async loginApp(pobj, qobj, req) {
+  async loginApp (pobj, qobj, req) {
    let appkey = pobj.fromAppKey
    let uname = pobj.username
    let rtn = await this.service.loginApp(appkey, uname)
    return system.getResult(rtn);
  }
-  async resetPassword(pobj, qobj, req) {
+  async resetPassword (pobj, qobj, req) {
    try {
      await this.service.resetPassword(req.xctx.username, pobj.onepassword)
      return system.getResult({});
@@ -31,15 +31,18 @@ class UserCtl extends CtlBase {
      return system.getResult(null, err.message)
    }
  }
-  async allowOrNot(pobj, qobj, req) {
+  async allowOrNot (pobj, qobj, req) {
    await this.service.updateByWhere({ isEnabled: !pobj.isEnabled }, { company_id: pobj.company_id })
    return system.getResult({});
  }
-  async allowOrNotToOne(pobj, qobj, req) {
+  async allowOrNotToOne (pobj, qobj, req) {
+    if (!pobj.isEnabled) {
+      await this.service.cacheManager["LoginTimesCache"].invalidate(pobj.userName)
+    }
    await this.service.updateByWhere({ isEnabled: !pobj.isEnabled }, { id: pobj.curid })
    return system.getResult({});
  }
-  async initNewInstance(queryobj, req) {
+  async initNewInstance (queryobj, req) {
    var rtn = {};
    rtn.roles = [];
    return system.getResultSuccess(rtn);
@@ -50,11 +53,11 @@ class UserCtl extends CtlBase {
  //   let v = await this.smsS.sendVCode(mobile);
  //   return system.getResult({ vcodestr: v });
  // }
-  async exit(pobj, qobj, req) {
+  async exit (pobj, qobj, req) {
  }
  //应用的自由用户注册,无需验证，需要前端头设置公司KEY
-  async pmregisterByFreeUser(p, q, req) {
+  async pmregisterByFreeUser (p, q, req) {
    //检查是否有用户名和密码
    if (!pobj.userName || !pobj.password) {
      return system.getResult(null, "请检查用户名和密码是否存在")
@@ -68,7 +71,7 @@ class UserCtl extends CtlBase {
    return rtn;
  }
-  async create(p, q, req) {
+  async create (p, q, req) {
    //检查是否有用户名和密码
    if (!p.userName) {
      return system.getResult(null, "请检查用户名和密码是否存在")
@@ -81,7 +84,7 @@ class UserCtl extends CtlBase {
  //和租户绑定同一家公司
  //按照用户名和密码进行注册
  //控制器端检查用户名和密码非空
-  async registerByTantent(p, q, req) {
+  async registerByTantent (p, q, req) {
    //检查是否有用户名和密码
    if (!pobj.userName) {
      return system.getResult(null, "请检查用户名和密码是否存在")
@@ -90,7 +93,7 @@ class UserCtl extends CtlBase {
    return rtn;
  }
  //租户用户名和密码的租户注册
-  async pmregister(pobj, qobj, req) {
+  async pmregister (pobj, qobj, req) {
    //平台注册设置平台的应用ID
    pobj.app_id = settings.pmappid;
    //检查是否有用户名和密码
@@ -100,33 +103,39 @@ class UserCtl extends CtlBase {
    var rtn = await this.service.pmregister(pobj);
    return system.getResult(rtn);
  }
-  async pmlogin(pobj, qobj, req) {
+  async pmlogin (pobj, qobj, req) {
    //平台注册设置平台的应用ID
    let rtn = await this.service.pmlogin(pobj, qobj, req);
-    if (!rtn){//登录错误
+    if (!rtn) {//登录错误
-      let times = this.service.cacheManager["LoginTimesCache"].incrAsync(pobj.userName);
+      let times = await this.service.cacheManager["LoginTimesCache"].incrAsync(pobj.userName);
-        if (times == 4) {
+      if (times >= 4) {
-          await this.service.updateByWhere({ isEnabled: false }, { userName: pobj.userName })
+        await this.service.updateByWhere({ isEnabled: false }, { userName: pobj.userName })
-        }
+      }
    }
    return system.getResult(rtn);
  }
-  async unlockUser(pobj, qobj, req) {
+  /**
-      try {
+   * 重置密码
-          await this.service.unlockUser(req.xctx.username)
+   * @param {*} pobj 
-          return system.getResult({});
+   * @param {*} qobj 
-      } catch (err) {
+   * @param {*} req 
-          return system.getResult(null, err.message)
+   */
-      }
+  async unlockUser (pobj, qobj, req) {
+    try {
+      await this.service.unlockUser(pobj.userName)
+      return system.getResult({});
+    } catch (err) {
+      return system.getResult(null, err.message)
+    }
  }
-  async getUserInfo(pobj, qobj, req) {
+  async getUserInfo (pobj, qobj, req) {
    let uname = req.xctx.username;
    let rtn = await this.service.getUserInfo(uname);
    return system.getResult(rtn);
  }
  //按照电话创建自由用户
-  async pmloginByVCodeForFreeUser(p, q, req) {
+  async pmloginByVCodeForFreeUser (p, q, req) {
    if (!pobj.mobile || !pobj.vcode) {
      return system.getResult(null, "请检查手机号和验证码是否存在")
    }
@@ -137,11 +146,11 @@ class UserCtl extends CtlBase {
    let rtn = await this.service.pmloginByVCodeForFreeUser(p, q);
    return rtn;
  }
-  async pmloginByVCode(pobj, qobj, req) {
+  async pmloginByVCode (pobj, qobj, req) {
    let rtn = await this.service.pmloginByVCode(pobj, qobj);
    return system.getResult(rtn);
  }
-  async pmSendVCode(pobj, qobj, req) {
+  async pmSendVCode (pobj, qobj, req) {
    let rtn = await this.service.sendVCode(pobj, qobj);
    return system.getResult(rtn);
  }

--- a/center-manage/app/base/db/cache/loginTimesCache.js
+++ b/center-manage/app/base/db/cache/loginTimesCache.js
@@ -7,31 +7,32 @@ class LoginTimesCache extends CacheBase {
        super();
    }
-    isdebug() {
+    isdebug () {
-        return settings.env == "dev";
+        return false;
    }
-    desc() {
+    desc () {
        return "缓存登录错误次数信息";
    }
-    prefix() {
+    prefix () {
        return "g_login_times:"
    }
-    async buildCacheVal(cachekey, inputkey, val, ex, ...items) {
+    async buildCacheVal (cachekey, inputkey, val, ex, ...items) {
        if (val) {
            return val;
        }
        return null;
    }
-    async incrAsync(key) {
+    async incrAsync (key) {
+        let cachekey = this.prefix + key
        let cache = await this.getCache(key);
        if (!cache) {
-            await this.cache(key, 0, 60 * 1000)
+            await this.cache(key, 0, 60)
        }
-        return this.redisClient.incr(key,)
+        return this.redisClient.incr(cachekey)
    }
 }

--- a/center-manage/app/base/service/impl/auth/userSve.js
+++ b/center-manage/app/base/service/impl/auth/userSve.js
@@ -9,11 +9,11 @@ class UserService extends ServiceBase {
    this.roleDao = system.getObject("db.auth.roleDao");
    this.authS = system.getObject("service.auth.authSve");
  }
-  async pmgetUserByCode(code) {
+  async pmgetUserByCode (code) {
    let ux = await this.cacheManager["CodeCache"].getCache(code);
    return ux;
  }
-  async loginApp(appkey, uname) {
+  async loginApp (appkey, uname) {
    let rtn = {}
    let app = await this.cacheManager["AppCache"].cache(appkey);
    let userLogined = await this.cacheManager["UserCache"].cache(uname);
@@ -38,7 +38,7 @@ class UserService extends ServiceBase {
  //和租户绑定同一家公司
  //按照用户名和密码进行注册
  //控制器端检查用户名和密码非空
-  async registerByTantent(p, q) {
+  async registerByTantent (p, q) {
    // 需要默认添加访客角色,为了控制单点从平台登录时看到的菜单和功能
    if (p.roles && p.roles.length > 0) {
      if (p.roles.indexOf(settings.pmroleid["pr"]) < 0) {
@@ -51,7 +51,7 @@ class UserService extends ServiceBase {
  }
  //应用的自由用户注册,无需验证，需要前端头设置公司KEY
-  async pmregisterByFreeUser(p, q) {
+  async pmregisterByFreeUser (p, q) {
    p.rolecodes = [settings.pmroleid["pr"]];
    let rtn = await this.pmregister(p, q)
    return rtn;
@@ -60,7 +60,7 @@ class UserService extends ServiceBase {
  //平台租户注册接口方法
  //控制器端检查用户名和密码非空
-  async pmregister(p, q) {
+  async pmregister (p, q) {
    var self = this;
    let tmppwd = p.password;
    if (!tmppwd) {
@@ -134,13 +134,12 @@ class UserService extends ServiceBase {
      }
    });
  }
-  async unlockUser(username) {
+  async unlockUser (username) {
-    let initpassword = this.getEncryptStr(settings.defaultpwd);
+    await this.resetPassword(username, settings.defaultpwd);
-    await this.resetPassword(username,initpassword);
+    return this.dao.updateByWhere({ isEnabled: true }, { userName: username })
-    return this.updateByWhere({ isEnabled: true }, { userName: username })
  }
-  async logout(pobj) {
+  async logout (pobj) {
    await this.cacheManager["UserCache"].invalidate(pobj.username);
    return {}
  }
@@ -148,7 +147,7 @@ class UserService extends ServiceBase {
  //登录接口封装kong-url
  //登录路由放行
  //p里面含有appkey,company_id,userName,password
-  async pmlogin(p, q, req) {
+  async pmlogin (p, q, req) {
    var self = this;
    //先要按照用户名，在统一账户中查找存在性
    //如果不存在
@@ -192,7 +191,7 @@ class UserService extends ServiceBase {
      }
    })
  }
-  async getUserInfo(uname) {
+  async getUserInfo (uname) {
    // let userfind = await this.dao.model.findOne({
    //   where: { userName: uname, app_id: settings.pmappid },
    //   attributes: ['userName', 'nickName',"headUrl",'isSuper','isAdmin'],
@@ -213,7 +212,7 @@ class UserService extends ServiceBase {
  //自由用户的电话登录和注册
  //需要存在公司KEY
-  async pmloginByVCodeForFreeUser(p, q) {
+  async pmloginByVCodeForFreeUser (p, q) {
    p.rolecodes = [settings.pmroleid["pr"]];
    let rtn = await this.pmloginByVCode(p, q, req)
    return system.getResult(rtn);
@@ -222,7 +221,7 @@ class UserService extends ServiceBase {
  //平台租户注册与登录
  //用户验证码登录
  //
-  async pmloginByVCode(p, q, req) {
+  async pmloginByVCode (p, q, req) {
    var rtn = {}
    //检查传递过来的手机验证码是否与缓存的一致
    let mobile = p.mobile;
@@ -267,19 +266,19 @@ class UserService extends ServiceBase {
    //不一致那么就
  }
  //发送手机验证码并缓存
-  async sendVCode(p, q, req) {
+  async sendVCode (p, q, req) {
    let mobile = p.mobile;
    let vcodeobj = await this.cacheManager["VCodeCache"].cache(mobile, null, 60);
    return vcodeobj.vcode;
  }
-  async reSendVCode(p, q, req) {
+  async reSendVCode (p, q, req) {
    let mobile = p.mobile;
    await this.cacheManager["VCodeCache"].invalidate(mobile);
    let vcodeobj = await this.cacheManager["VCodeCache"].cache(mobile, null, 60);
    return vcodeobj.vcode;
  }
  //修改中心密码
-  async cmodifypwd(uname, newpwd, cmpid) {
+  async cmodifypwd (uname, newpwd, cmpid) {
    try {
      let rtn = await system.postJsonTypeReq(UserService.consumerUrl(uname), { tags: ["cmp_" + cmpid, "pass_" + newpwd] }, "PATCH")
      console.log(rtn)
@@ -293,7 +292,7 @@ class UserService extends ServiceBase {
    }
  }
  //创建统一账号及jwt身份
-  async cregister(uname, cmpid, pass, uid) {
+  async cregister (uname, cmpid, pass, uid) {
    try {
      var rtn2 = null;
      let rtn = await system.postJsonTypeReq(UserService.newConsumerUrl(), { username: uname, custom_id: uid, tags: ["cmp_" + cmpid, "pass_" + pass] })
@@ -315,7 +314,7 @@ class UserService extends ServiceBase {
  }
  //plkey--对应消费者jwt身份的key,插件解码token后，获取iss-key,查询出身份，利用
  //身份中的secret验证签名
-  async jwtsign(plkey, secretstr, opts) {
+  async jwtsign (plkey, secretstr, opts) {
    let promise = new Promise(function (resv, rej) {
      jwt.sign({ exp: Math.floor(Date.now() / 1000) + (60 * 60), iss: plkey }, secretstr, opts, function (err, rtn) {
        if (err) {
@@ -328,13 +327,13 @@ class UserService extends ServiceBase {
    return promise;
  }
  //只要登录 生成新的访问jwttoken
-  async cmakejwt(key, secret, opts) {
+  async cmakejwt (key, secret, opts) {
    var token = await this.jwtsign(key, secret, opts);
    return token;
  }
  //删除统一账号
-  async cunregister(uname) {
+  async cunregister (uname) {
    try {
      let rtn = await system.delReq(UserService.consumerUrl(uname))
      if (rtn.statusCode == 204) {
@@ -348,15 +347,15 @@ class UserService extends ServiceBase {
  //登录统一账号
-  async clogin(uname) {
+  async clogin (uname) {
    //检查是否存在重名
  }
  //按用户名查询统一用户
-  async findCUser(uname) {
+  async findCUser (uname) {
  }
-  async resetPassword(uname, pwd) {
+  async resetPassword (uname, pwd) {
    let inpassword = this.getEncryptStr(pwd, true);
    var self = this;
    return this.db.transaction(async function (t) {
@@ -374,7 +373,7 @@ class UserService extends ServiceBase {
    });
  }
  //修改
-  async update(qobj, tm = null) {
+  async update (qobj, tm = null) {
    var self = this;
    return this.db.transaction(async function (t) {
      delete qobj['company_id']
@@ -396,7 +395,7 @@ class UserService extends ServiceBase {
   * @param {*} productCatName 产品类型名称
   * @param {*} regionName 区域
   */
-  async getBizUserForBizChance(clientMobile, spName, productCatName, regionName) {
+  async getBizUserForBizChance (clientMobile, spName, productCatName, regionName) {
    var self = this
    clientMobile = clientMobile + "_" + spName + "_" + regionName + "_" + productCatName
    //按照服务商名字查询到公司，按照公司查询出users,条件是可以接受派单任务，并且技能标签含有，产品类别名称
@@ -476,7 +475,7 @@ class UserService extends ServiceBase {
      }
    })
  }
-  async findCostBySkuCode(skucode) {
+  async findCostBySkuCode (skucode) {
    let productpricetmp = await this.db.models.productprice.findOne({
      where: { skucode: skucode, isEnabled: true },
      include: [
@@ -502,7 +501,7 @@ class UserService extends ServiceBase {
   * @param {*} skucode 最小销售货品编码，来自渠道上架的码
   * @param {*} regionName 区域
   */
-  async getBizUserForDelivery(xclientMobile, spName, productCatName, skucode, regionName) {
+  async getBizUserForDelivery (xclientMobile, spName, productCatName, skucode, regionName) {
    let clientMobile = 'fordeliver' + xclientMobile + "_" + spName + "_" + regionName + "_" + productCatName
    var self = this
    //按照服务商名字查询到公司，按照公司查询出users,条件是可以接受派单任务，并且技能标签含有，产品类别名称

--- a/center-manage/app/config/settings.js
+++ b/center-manage/app/config/settings.js
@@ -19,7 +19,7 @@ var settings = {
  encrypt_key: ENVINPUT.ENCRYPT_KEY,
  encrypt_secret: ENVINPUT.ENCRYPT_SECRET,
  salt: "%iatpD1gcxz7iF#B",
-  defaultpwd: "gsb2020",
+  defaultpwd: "Temp123456",
  basepath: path.normalize(path.join(__dirname, '../..')),
  port: process.env.NODE_PORT || 80,
  logindex: "center_manage",