Commit 06caa3fa authored by 李尚科's avatar 李尚科

fix wechat oauth

parent 7781913e
Pipeline #18863 passed with stage
in 1 minute 22 seconds
...@@ -223,7 +223,7 @@ class WechatController extends Controller { ...@@ -223,7 +223,7 @@ class WechatController extends Controller {
const url = `${WECHAT_AUTH}?appid=${appid}&secret=${appsecret}&code=${code}&grant_type=authorization_code`; const url = `${WECHAT_AUTH}?appid=${appid}&secret=${appsecret}&code=${code}&grant_type=authorization_code`;
const result = await ctx.helper.send_request(url, {}, { method: 'GET' }); const result = await ctx.helper.send_request(url, {}, { method: 'GET' });
ctx.logger.info(JSON.stringify({ wx_kefu_query: result })); ctx.logger.info(JSON.stringify({ url, wx_athena_query: result }));
if (result.status !== 200) { if (result.status !== 200) {
ctx.failed('获取openid失败1'); ctx.failed('获取openid失败1');
} }
...@@ -241,12 +241,13 @@ class WechatController extends Controller { ...@@ -241,12 +241,13 @@ class WechatController extends Controller {
ctx.cookies.set('jianbing_customer_id', null, { httpOnly: false, signed: false, path: '/', overwrite: true }); ctx.cookies.set('jianbing_customer_id', null, { httpOnly: false, signed: false, path: '/', overwrite: true });
ctx.cookies.set('auth_token', null, { httpOnly: false, signed: false, path: '/', overwrite: true }); ctx.cookies.set('auth_token', null, { httpOnly: false, signed: false, path: '/', overwrite: true });
const redirect_page = wechatApp.login_url ? wechatApp.login_url : (wechatApp.business_url ? wechatApp.business_url : REDIRECT_PAGE); // const redirect_page = wechatApp.login_url ? wechatApp.login_url : (wechatApp.business_url ? wechatApp.business_url : REDIRECT_PAGE);
const redirect_page = wechatApp.business_url ? wechatApp.business_url : REDIRECT_PAGE;
const redirect_url = redirect_page.indexOf('http') > -1 ? redirect_page : this.app.config.PULIC_BASE_URL + redirect_page; const redirect_url = redirect_page.indexOf('http') > -1 ? redirect_page : this.app.config.PULIC_BASE_URL + redirect_page;
// 判断是否已绑定手机号 // 判断是否已绑定手机号
const user_exist_url = `${this.app.config.NODE_BASE_URL}/user_api/v1/user/is_exist/${openid}`; const user_exist_url = `${this.app.config.NODE_BASE_URL}/user_api/v1/user/is_exist/${openid}`;
const bind_phone_result = await ctx.helper.send_request(user_exist_url, { type: 5 }, { method: 'GET' }); const bind_phone_result = await ctx.helper.send_request(user_exist_url, { type: 5 }, { method: 'GET' });
ctx.logger.info(JSON.stringify({ kefu_bind_phone_result: bind_phone_result })); ctx.logger.info(JSON.stringify({ athena_bind_phone_params: { openid, type: 5 }, athena_bind_phone_result: bind_phone_result }));
if (bind_phone_result.status !== 200) { if (bind_phone_result.status !== 200) {
ctx.redirect(redirect_url + `?channel_id=${channel_id}&type=noLogin`); return; ctx.redirect(redirect_url + `?channel_id=${channel_id}&type=noLogin`); return;
} }
...@@ -260,7 +261,7 @@ class WechatController extends Controller { ...@@ -260,7 +261,7 @@ class WechatController extends Controller {
ctx.redirect(redirect_url + `?channel_id=${channel_id}&type=noLogin`); return; ctx.redirect(redirect_url + `?channel_id=${channel_id}&type=noLogin`); return;
} }
ctx.redirect(redirect_url + `?channel_id=${channel_id}&type=hasLogin`); return;// 已导入公积金 ctx.redirect(redirect_url + `?channel_id=${channel_id}&type=hasLogin`); return;
} }
} }
......
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