d

center-manage/app/base/controller/ctl.base.js

@@ -42,6 +42,7 @@ class CtlBase {
       companyid: custtags?custtags[0].split("_")[1]:null,
       password: custtags?custtags[1].split("_")[1]:null,
       username: req.headers["x-consumer-username"],
+      userid:req.headers["x-consumer-custom-id"],
       credid: req.headers["x-credential-identifier"],
       companykey:req.headers["xcompanykey"],//专用于自由用户注册,自由用户用于一定属于某个存在的公司
       regrole:req.headers["xregrole"],
@@ -66,6 +67,9 @@ class CtlBase {
     if(req.xctx.companyid){//在请求传递数据对象注入公司id
       pobj.company_id=req.xctx.companyid;
     }
+    if(req.xctx.userid){//在请求传递数据对象注入公司id
+      pobj.userid=req.xctx.userid;
+    }
     pobj.bizpath=req.xctx.bizpath;
   }
   async doexec(methodname, pobj, query, req) {

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

@@ -67,7 +67,6 @@ class UserCtl extends CtlBase {
   async pmregister(pobj, qobj, req) {
     //平台注册设置平台的应用ID
     pobj.app_id = settings.pmappid;
-
     //检查是否有用户名和密码
     if (!pobj.userName || !pobj.password) {
       return system.getResult(null, "请检查用户名和密码是否存在")

center-manage/app/base/controller/impl/common/appCtl.js

@@ -11,23 +11,26 @@ class AppCtl extends CtlBase {
     super("common", CtlBase.getServiceName(AppCtl));
     this.userCtl = system.getObject("service.auth.userSve");
   }
-  async findAllApps(p,q,req) {
+  async findAllApps(p, q, req) {
     var rtns = await this.service.findAllApps(p.userid);
     return system.getResult(rtns);
   }
-
-  async update(pobj, queryobj, req){
-      return super.update(pobj, queryobj, req);
+  async create(pobj, queryobj, req) {
+    pobj.creator_id = pobj.userid;//设置创建者
+    return super.create(pobj, queryobj, req)
+  }
+  async update(pobj, queryobj, req) {
+    return super.update(pobj, queryobj, req);
   }
-  
+
   async initNewInstance(pobj, queryobj, req) {
     var rtn = {};
     rtn.appkey = this.getUUID();
     rtn.secret = this.getUUID();
 
-    
 
-  
+
+
 
 
 
@@ -45,25 +48,25 @@ class AppCtl extends CtlBase {
   }
   async create(pobj, queryobj, req) {
     //设置创建者，需要同时创建app管理员、默认密码、电话
-    pobj.creator_id = req.session.user.id;
+    pobj.creator_id = pobj.userid;
     //  pobj.password=super.encryptPasswd(settings.defaultpwd);
-      //构造默认的应用相关的URL
-      pobj.authUrl=settings.protocalPrefix+pobj.domainName+"/auth";
-      pobj.docUrl=settings.protocalPrefix+pobj.domainName+"/web/common/metaCtl/getApiDoc";
-      pobj.uiconfigUrl=settings.protocalPrefix+pobj.domainName+"/api/meta/config/fetchAppConfig";
-      pobj.opCacheUrl=settings.protocalPrefix+pobj.domainName+"/api/meta/opCache/opCacheData";
-      pobj.notifyCacheCountUrl=settings.protocalPrefix+pobj.domainName+"/api/meta/opCache/recvNotificationForCacheCount";
-    var app = await super.create(pobj,queryobj, req);
+    //构造默认的应用相关的URL
+    pobj.authUrl = settings.protocalPrefix + pobj.domainName + "/auth";
+    pobj.docUrl = settings.protocalPrefix + pobj.domainName + "/web/common/metaCtl/getApiDoc";
+    pobj.uiconfigUrl = settings.protocalPrefix + pobj.domainName + "/api/meta/config/fetchAppConfig";
+    pobj.opCacheUrl = settings.protocalPrefix + pobj.domainName + "/api/meta/opCache/opCacheData";
+    pobj.notifyCacheCountUrl = settings.protocalPrefix + pobj.domainName + "/api/meta/opCache/recvNotificationForCacheCount";
+    var app = await super.create(pobj, queryobj, req);
     return system.getResult(app);
   }
-  async fetchApiCallData(pobj, queryobj, req){
-    var curappkey=pobj.curappkey;
+  async fetchApiCallData(pobj, queryobj, req) {
+    var curappkey = pobj.curappkey;
     //检索出作为访问时的app呼出调用数据
-    var rtn= await this.service.fetchApiCallData(curappkey);
+    var rtn = await this.service.fetchApiCallData(curappkey);
     return system.getResultSuccess(rtn);
   }
-   //接受缓存计数通知接口
-  async recvNotificationForCacheCount(p,q,req){
+  //接受缓存计数通知接口
+  async recvNotificationForCacheCount(p, q, req) {
     return this.service.recvNotificationForCacheCount(p);
   }
 }

center-manage/app/base/db/impl/common/appDao.js

+const system=require("../../../system");
+const Dao=require("../../dao.base");
+class AppDao extends Dao{
+  constructor(){
+    super(Dao.getModelName(AppDao));
+  }
+ 
+  extraWhere(obj,w,qc,linkAttrs){
+     if(obj.bizpath && obj.bizpath!=""){
+       if(obj.bizpath.indexOf("my_app")>0){//说明是租户查询自己创建的应用
+          w["creator_id"]=obj.userid;
+       }
+     }
+     if(linkAttrs.length>0){
+       var search=obj.search;
+       var lnkKey=linkAttrs[0];
+       var strq="$"+lnkKey.replace("~",".")+"$";
+       w[strq]= {[this.db.Op.like]:"%"+search[lnkKey]+"%"};
+     }
+     return w;
+  }
+}
+module.exports=AppDao;
+    // var u=new UserDao();
+    // var roledao=system.getObject("db.roleDao");
+    // (async ()=>{
+    //   var users=await u.model.findAll({where:{app_id:1}});
+    //   var role=await roledao.model.findOne({where:{code:"guest"}});
+    //   console.log(role);
+    //   for(var i=0;i<users.length;i++){
+    //     await users[i].setRoles([role]);
+    //     console.log(i);
+    //   }
+    //
+    // })();

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

@@ -64,7 +64,7 @@ class UserService extends ServiceBase {
         await u.setRoles(roles, { transaction: t });
       }
       //创建统一账号 to add extra fields
-      let cred = await self.cregister(u.userName, p.company_id, p.password)
+      let cred = await self.cregister(u.userName, p.company_id, p.password,u.id+"")
       console.log("......................................");
       console.log(cred.consumer.id);
       if (cred) {
@@ -195,10 +195,10 @@ class UserService extends ServiceBase {
   }
 
   //创建统一账号及jwt身份
-  async cregister(uname, cmpid, pass) {
+  async cregister(uname, cmpid, pass,uid) {
     try {
       var rtn2 = null;
-      let rtn = await system.postJsonTypeReq(UserService.newConsumerUrl(), { username: uname, tags: ["cmp_" + cmpid, "pass_" + pass] })
+      let rtn = await system.postJsonTypeReq(UserService.newConsumerUrl(), { username: uname,custom_id:uid, tags: ["cmp_" + cmpid, "pass_" + pass] })
       console.log(rtn)
       if (rtn.statusCode == 409) {
         throw new Error("已经存在相同的统一账号名称!");