d

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

@@ -13,7 +13,7 @@ class UserCtl extends CtlBase {
     return system.getResult(rtn)
     return system.getResult(rtn)
   }
   }
   async loginApp(pobj, qobj, req){
   async loginApp(pobj, qobj, req){
-    let appkey=pobj.appkey
+    let appkey=pobj.fromAppKey
     let uname=pobj.username
     let uname=pobj.username
     let rtn=await this.service.loginApp(appkey,uname)
     let rtn=await this.service.loginApp(appkey,uname)
     return system.getResult(rtn);
     return system.getResult(rtn);

center-manage/app/base/db/cache/codeCache.js

+const CacheBase = require("../cache.base");
+const system = require("../../system");
+const settings = require("../../../config/settings");
+class CodeCache extends CacheBase{
+  constructor(){
+    super();
+    this.userDao=system.getObject("db.auth.userDao");
+  }
+  isdebug(){
+    return false
+  //  return settings.env=="dev";
+ }
+  desc(){
+    return "缓存code子系统用户登录信息对象";
+ }
+ prefix(){
+    return "g_code_userlocal_"
+ }
+ async buildCacheVal(cachekey,inputkey, val, ex, ...items) {
+  if (val) {
+    return JSON.stringify(val);
+  }
+  return null;
+ }
+}
+module.exports=CodeCache;
\ No newline at end of file

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

@@ -10,18 +10,17 @@ class UserService extends ServiceBase {
     this.authS=system.getObject("service.auth.authSve");
     this.authS=system.getObject("service.auth.authSve");
   }
   }
   async pmgetUserByCode(code){
   async pmgetUserByCode(code){
-   let ux= await this.cacheManager["UserCache"].getCache(code);
+   let ux= await this.cacheManager["CodeCache"].getCache(code);
    return ux;
    return ux;
   }
   }
   async loginApp(appkey,uname){
   async loginApp(appkey,uname){
     let rtn={}
     let rtn={}
     let app= await this.cacheManager["AppCache"].cache(appkey);
     let app= await this.cacheManager["AppCache"].cache(appkey);
-    let url=app.homePage
-    let userLogined= this.cacheManager["UserCache"].cache(uname);
+    let userLogined= await this.cacheManager["UserCache"].cache(uname);
     rtn.user=userLogined
     rtn.user=userLogined
 
 
     if (userLogined) {
     if (userLogined) {
-      let token = await self.cmakejwt(userLogined.jwtkey, userLogined.jwtsecret, null);
+      let token = await this.cmakejwt(userLogined.jwtkey, userLogined.jwtsecret, null);
       rtn.token = token;
       rtn.token = token;
     }
     }
     let roleids=userLogined.Roles.map(item=>{
     let roleids=userLogined.Roles.map(item=>{
@@ -30,9 +29,9 @@ class UserService extends ServiceBase {
    let auths= await this.authS.findAuthsByRole(roleids)
    let auths= await this.authS.findAuthsByRole(roleids)
     rtn.user.access=auths
     rtn.user.access=auths
     let code=this.getUUID()
     let code=this.getUUID()
-    this.cacheManager["UserCache"].cache(code,rtn,60000);
-    let url=app.homePage+"?code="+code
-    return {url:url};
+    this.cacheManager["CodeCache"].cache(code,rtn,60000);
+  //  let url=app.homePage+"?code="+code
+    return {code,homePage:app.homePage};
   }
   }
   //登录后的租户创建属于租户的用户
   //登录后的租户创建属于租户的用户
   //需要在控制器里取出公司ID
   //需要在控制器里取出公司ID

center-manage/app/base/service/impl/common/appSve.js

@@ -125,7 +125,7 @@ class AppService extends ServiceBase {
       //如果存在functionJSON,那么就需要转换，构建编码路径
       //如果存在functionJSON,那么就需要转换，构建编码路径
       if (pobj.functionJSON != "") {
       if (pobj.functionJSON != "") {
         let funcobjs = JSON.parse(pobj.functionJSON)
         let funcobjs = JSON.parse(pobj.functionJSON)
-        await self.translateWithBizCode(funcobjs,null)
+        //await self.translateWithBizCode(funcobjs,null)
         pobj.functionJSON= JSON.stringify(funcobjs)
         pobj.functionJSON= JSON.stringify(funcobjs)
       }
       }
       await self.dao.update(pobj, t)
       await self.dao.update(pobj, t)