Commit 0fe740a4 by 蒋勇

d

parent c64dea51
...@@ -95,7 +95,7 @@ class UserCtl extends CtlBase { ...@@ -95,7 +95,7 @@ class UserCtl extends CtlBase {
return rtn; return rtn;
} }
async pmloginByVCode(pobj, qobj, req) { async pmloginByVCode(pobj, qobj, req) {
let rtn = this.service.pmloginByVCode(pobj, qobj); let rtn = await this.service.pmloginByVCode(pobj, qobj);
return system.getResult(rtn); return system.getResult(rtn);
} }
async pmSendVCode(pobj, qobj, req) { async pmSendVCode(pobj, qobj, req) {
......
...@@ -163,10 +163,11 @@ class UserService extends ServiceBase { ...@@ -163,10 +163,11 @@ class UserService extends ServiceBase {
return rtn; return rtn;
} else { } else {
//先按照用户名查续身份信息,获取key,secret, //先按照用户名查续身份信息,获取key,secret,
let u = await this.pmregister({ userName: mobile, nickName: mobile,rolecodes:p.rolecodes,company_id:p.company_id,app_id:p.app_id}); let regrtn = await this.pmregister({ userName: mobile, nickName: mobile,rolecodes:p.rolecodes,company_id:p.company_id,app_id:p.app_id});
let token = await this.cmakejwt(u.jwtkey, u.jwtsecret, null); let token = await this.cmakejwt(regrtn.user.jwtkey, regrtn.user.jwtsecret, null);
rtn.token = token; // rtn.token = token;
rtn.user = u; // rtn.user = u;
regrtn.token=token
return rtn; return rtn;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment