|
@@ -81,27 +81,19 @@ class WeixinController extends Controller {
|
|
|
// 通过openid取得用户信息
|
|
|
if (user) {
|
|
|
console.log('function in if user');
|
|
|
- const token = await this.ctx.service.login.createJwt(user);
|
|
|
+ const getToken = async user => await this.ctx.service.login.createJwt(user);
|
|
|
if (user.type === '4') {
|
|
|
console.log('function in user.type=4');
|
|
|
// 学生
|
|
|
// 检查学生是否已退出,学生表的isComming是不是2,如果是2 就跳到别的地方提示您已退出
|
|
|
- let stu;
|
|
|
- try {
|
|
|
- stu = await this.ctx.service.student.fetch({ id: user.uid });
|
|
|
- } catch (error) {
|
|
|
- console.log(`错误信息:${error}`);
|
|
|
- const to_uri = urljoin(redirect_uri, `?token=${token}`);
|
|
|
- // TODO: 重定性页面
|
|
|
- this.ctx.redirect(to_uri);
|
|
|
- }
|
|
|
+ const stu = await this.ctx.service.student.fetch({ id: user.uid });
|
|
|
if (stu) {
|
|
|
const { isComming } = stu;
|
|
|
if (isComming && isComming === '2') {
|
|
|
const refuse = `${this.app.config.baseUrl}/msgconfirm/isleave`;
|
|
|
this.ctx.redirect(refuse);
|
|
|
} else {
|
|
|
- const to_uri = urljoin(redirect_uri, `?token=${token}`);
|
|
|
+ const to_uri = urljoin(redirect_uri, `?token=${getToken(user)}`);
|
|
|
// TODO: 重定性页面
|
|
|
this.ctx.redirect(to_uri);
|
|
|
}
|
|
@@ -115,13 +107,13 @@ class WeixinController extends Controller {
|
|
|
} else if (user.type === '1') {
|
|
|
// 班主任
|
|
|
const touri = `${this.app.config.baseUrl}/mobiledirtea`;
|
|
|
- const to_uri = urljoin(touri, `?token=${token}`);
|
|
|
+ const to_uri = urljoin(touri, `?token=${getToken(user)}`);
|
|
|
// TODO: 重定性页面
|
|
|
this.ctx.redirect(to_uri);
|
|
|
} else if (user.type === '3') {
|
|
|
// 教师
|
|
|
const touri = `${this.app.config.baseUrl}/mobiledirtea`;
|
|
|
- const to_uri = urljoin(touri, `?token=${token}`);
|
|
|
+ const to_uri = urljoin(touri, `?token=${getToken(user)}`);
|
|
|
// TODO: 重定性页面
|
|
|
this.ctx.redirect(to_uri);
|
|
|
}
|
|
@@ -142,7 +134,6 @@ class WeixinController extends Controller {
|
|
|
// TODO: 重定性页面
|
|
|
this.ctx.redirect(to_uri);
|
|
|
} else if (type === '9') {
|
|
|
- // const token = await this.ctx.service.login.createJwt(user);
|
|
|
const to_uri = urljoin(redirect_uri, `?openid=${openid}&type=${type}&msgid=${msgid}&objid=${objid}`);
|
|
|
// TODO: 重定性页面
|
|
|
this.ctx.redirect(to_uri);
|