liuyu 4 年之前
父节点
当前提交
47afc7dfd9
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 1 4
      app/controller/weixin.js
  2. 1 1
      app/service/login.js

+ 1 - 4
app/controller/weixin.js

@@ -85,10 +85,7 @@ class WeixinController extends Controller {
         if (user) {
           const token = await this.ctx.service.login.createJwt(user);
           if (user.type === '4') {
-            const student = await this.ctx.service.student.fetch({ id: user.uid });
-            const newdata = { planid: student.planid, ...JSON.parse(JSON.stringify(user)) };
-            const token_ = await this.ctx.service.login.createJwt(newdata);
-            const to_uri = urljoin(redirect_uri, `?token=${token_}`);
+            const to_uri = urljoin(redirect_uri, `?token=${token}`);
             // TODO: 重定性页面
             console.log('to_uri000-->' + to_uri);
             this.ctx.redirect(to_uri);

+ 1 - 1
app/service/login.js

@@ -61,7 +61,7 @@ class LoginService extends CrudService {
     } else if (type === '4') {
       _userid = uid.toString();
       const result = await this.stuModel.findById(_userid);
-      res = { userid: _userid, schid: result.schid, schname: result.school_name, termid: result.termid, batchid: result.batchid, classid: result.classid, bedroomid: result.bedroomid, bedroom: result.bedroom, job: result.job, name, type, id: _id, status };
+      res = { userid: _userid, schid: result.schid, schname: result.school_name, termid: result.termid, batchid: result.batchid, classid: result.classid, bedroomid: result.bedroomid, bedroom: result.bedroom, job: result.job, name, type, id: _id, status, planid: result.planid };
     }
     const token = await jwt.sign(res, secret, { expiresIn, issuer, subject });
     return token;