Merge remote-tracking branch 'origin/center-app' into center-app

center-app/app/base/db/metadata/apps/platform.js

@@ -34,7 +34,7 @@ module.exports = {
                 "pushOrderBusiness": "推送订单商机", "pushOrderRefund": "推送订单退款", "pushNeedBusiness": "推送需求商机", "pushNeedNote": "推送需求小计",
                 "pushOrderBusiness": "推送订单商机", "pushOrderRefund": "推送订单退款", "pushNeedBusiness": "推送需求商机", "pushNeedNote": "推送需求小计",
                 "pushCloseNeed": "推送关闭需求", "pushNeedSolution": "推送需求方案", "pushCloseNeedSolution": "推送关闭需求方案", "pushOpSolution": "推送操作方案",
                 "pushCloseNeed": "推送关闭需求", "pushNeedSolution": "推送需求方案", "pushCloseNeedSolution": "推送关闭需求方案", "pushOpSolution": "推送操作方案",
                 "createAliTmApply": "推送创建阿里商标申请", "closeAliTmApply": "推送主动关闭阿里商标申请", "updateAliTmApplicant": "推送更新阿里商标申请人信息", 
                 "createAliTmApply": "推送创建阿里商标申请", "closeAliTmApply": "推送主动关闭阿里商标申请", "updateAliTmApplicant": "推送更新阿里商标申请人信息", 
-                "pushRePurchaseBusiness": "复购商机推送"
+                "pushRePurchaseBusiness": "复购商机推送","pushDeliveryOrder": "推送交付系统订单","pushDeliveryStatusNotify": "推送交付系统交付状态更新"
             },
             },
             //---------
             //---------
 
 

center-app/app/base/service/impl/utilsSve/utilsappSve.js

@@ -52,7 +52,7 @@ class UtilsAppSve extends AppServiceBase {
 
 
   async getAppInfo(pobj) {
   async getAppInfo(pobj) {
     var uapp_id = pobj.uappId || "";
     var uapp_id = pobj.uappId || "";
-    var app = await this.appDao.findOne({uapp_id:uapp_id});
+    var app = await this.appDao.findOne({app_code:uapp_id});
     if(app) {
     if(app) {
         return system.getResultSuccess(app);
         return system.getResultSuccess(app);
     }
     }

center-app/app/base/utils/businessManager/opPlatformUtils.js

@@ -305,6 +305,11 @@ class OpPlatformUtils {
         var result = await cacheManager["AppUserPinByUserNameCache"].getCache(inputkey);
         var result = await cacheManager["AppUserPinByUserNameCache"].getCache(inputkey);
         if (result && result.status == 0) {
         if (result && result.status == 0) {
             if (result.data.userpin) {
             if (result.data.userpin) {
+                // 2020 0723 lin修改 登录并重新设置过期时间
+                var inputkey = this.getUserPinKey(inputkey);
+                var userpinKey = this.getUserPinKey(result.data.userpin);
+                await this.redisClient.setExpire(inputkey, system.exTime);
+                await this.redisClient.setExpire(userpinKey, system.exTime);
                 return system.getResultFail(system.reDoLoginFail, "请勿重复处理", { userpin: result.data.userpin || "" });
                 return system.getResultFail(system.reDoLoginFail, "请勿重复处理", { userpin: result.data.userpin || "" });
             } else {
             } else {
                 await this.clearLoginCache(inputkey);
                 await this.clearLoginCache(inputkey);
@@ -387,6 +392,8 @@ class OpPlatformUtils {
         if (!userInfoResult) {
         if (!userInfoResult) {
             return system.getResultFail(system.noLogin, "user no login");
             return system.getResultFail(system.noLogin, "user no login");
         }
         }
+        // 2020 0723 lin修改 获取账户信息并重新设置过期时间
+        // await this.redisClient.setExpire(userpinKey, system.exTime);
         return JSON.parse(userInfoResult);
         return JSON.parse(userInfoResult);
     }
     }
     /**
     /**

center-app/app/base/utils/redisClient.js

@@ -248,6 +248,10 @@ class RedisClient {
     console.log("publish--" + channel + ":" + consumetarget);
     console.log("publish--" + channel + ":" + consumetarget);
     return this.client.publishAsync(channel, consumetarget);
     return this.client.publishAsync(channel, consumetarget);
   }
   }
+  // 2020 0723 lin 新增 设置过期时间方法
+  async setExpire(key, t) {
+    this.client.expire(key, t);
+  }
 }
 }
 module.exports = RedisClient;
 module.exports = RedisClient;
 // var client=new RedisClient();
 // var client=new RedisClient();