|
@@ -49,19 +49,19 @@ class WeixinController extends Controller {
|
|
|
const { wxapi, authUrl = this.ctx.path } = this.app.config;
|
|
|
const backUrl = encodeURI(`${this.app.config.baseUrl}${this.config.authUrl}?state=${state}`);
|
|
|
const to_uri = `${wxapi.baseUrl}/api/auth?appid=${wxapi.appid}&response_type=code&redirect_uri=${backUrl}&connect_redirect=1#wechat`;
|
|
|
- console.log('url-->' + to_uri);
|
|
|
+
|
|
|
this.ctx.redirect(to_uri);
|
|
|
}
|
|
|
|
|
|
|
|
|
async authBack({ code, state }) {
|
|
|
|
|
|
- console.log(this.ctx.query);
|
|
|
+
|
|
|
this.ctx.logger.debug(`[auth-back] code - ${code}, state - ${state}`);
|
|
|
assert(code, 'code不能为空');
|
|
|
assert(state, 'state不能为空');
|
|
|
- console.log('code-->' + code);
|
|
|
-
|
|
|
+
|
|
|
+ console.log('1' + code);
|
|
|
const { weixin } = this.ctx.service;
|
|
|
let openid;
|
|
|
try {
|
|
@@ -70,12 +70,13 @@ class WeixinController extends Controller {
|
|
|
await this.ctx.render('error.njk', { title: err.message, message: err.details });
|
|
|
return;
|
|
|
}
|
|
|
+ console.log('2' + code);
|
|
|
console.log('openid--->' + openid);
|
|
|
if (openid) {
|
|
|
const key = `visit:auth:state:${state}`;
|
|
|
const val = await this.app.redis.get(key);
|
|
|
const { redirect_uri, type, uid, qrcode } = JSON.parse(val);
|
|
|
- console.log('redirect_uri-->' + redirect_uri);
|
|
|
+
|
|
|
const user = await this.ctx.service.user.findByOpenid(openid);
|
|
|
if (type === '0') {
|
|
|
|
|
@@ -83,11 +84,11 @@ class WeixinController extends Controller {
|
|
|
const token = await this.ctx.service.login.createJwt(user);
|
|
|
const to_uri = urljoin(redirect_uri, `?token=${token}`);
|
|
|
|
|
|
- console.log('to_uri000-->' + to_uri);
|
|
|
+
|
|
|
this.ctx.redirect(to_uri);
|
|
|
|
|
|
} else {
|
|
|
- console.log('rrr0000--->' + redirect_uri);
|
|
|
+
|
|
|
const touri = `${this.app.config.baseUrl}/platmobile/live/index`;
|
|
|
const to_uri = urljoin(touri, `?openid=${openid}`);
|
|
|
|
|
@@ -96,7 +97,7 @@ class WeixinController extends Controller {
|
|
|
} else if (type === '1') {
|
|
|
const to_uri = urljoin(redirect_uri, `?openid=${openid}&uid=${uid}&type=${type}&qrcode=${qrcode}`);
|
|
|
|
|
|
- console.log('1111---?' + to_uri);
|
|
|
+
|
|
|
this.ctx.redirect(to_uri);
|
|
|
}
|
|
|
}
|