Commit 857af75e authored by 李尚科's avatar 李尚科

Fix

parent 14e94a37
Pipeline #16155 passed with stage
in 46 seconds
...@@ -21,7 +21,7 @@ class WechatController extends Controller { ...@@ -21,7 +21,7 @@ class WechatController extends Controller {
const app_id = ['https://lan-nginx.jianbing.com', 'https://pro-nginx.jianbing.com'].includes(this.config.NODE_BASE_URL) ? WECHAT_APPID : WECHAT_APPID_TEST; const app_id = ['https://lan-nginx.jianbing.com', 'https://pro-nginx.jianbing.com'].includes(this.config.NODE_BASE_URL) ? WECHAT_APPID : WECHAT_APPID_TEST;
const appsecret = ['https://lan-nginx.jianbing.com', 'https://pro-nginx.jianbing.com'].includes(this.config.NODE_BASE_URL) ? WECHAT_SECRET : WECHAT_SECRET_TEST; const appsecret = ['https://lan-nginx.jianbing.com', 'https://pro-nginx.jianbing.com'].includes(this.config.NODE_BASE_URL) ? WECHAT_SECRET : WECHAT_SECRET_TEST;
if (!code || code.length === 0) {//this.app.config.OUT_P_NODE_URL if (!code || code.length === 0) {//this.app.config.OUT_P_NODE_URL
const target_url = WECHAT_CODE_URL + `?appid=${app_id}&redirect_uri=${encodeURIComponent(`${this.app.config.PHP_URL}/51business/api/gjj/wechat/oauth_login?&channel_id=${channel_id}`)}&response_type=code&scope=snsapi_base&state=gjjquery#wechat_redirect`; const target_url = WECHAT_CODE_URL + `?appid=${app_id}&redirect_uri=${encodeURIComponent(`${this.app.config.PULIC_BASE_URL}/51business/api/gjj/wechat/oauth_login?&channel_id=${channel_id}`)}&response_type=code&scope=snsapi_base&state=gjjquery#wechat_redirect`;
ctx.redirect(target_url); return; ctx.redirect(target_url); return;
} }
const url = `${WECHAT_AUTH}?appid=${app_id}&secret=${appsecret}&code=${code}&grant_type=authorization_code` const url = `${WECHAT_AUTH}?appid=${app_id}&secret=${appsecret}&code=${code}&grant_type=authorization_code`
...@@ -37,7 +37,7 @@ class WechatController extends Controller { ...@@ -37,7 +37,7 @@ class WechatController extends Controller {
const openid = wx_ret.openid; const openid = wx_ret.openid;
ctx.cookies.set('openid', openid, { httpOnly: false, signed: false, path: '/', overwrite: true }); ctx.cookies.set('openid', openid, { httpOnly: false, signed: false, path: '/', overwrite: true });
const redirect_url = this.app.config.PHP_URL + REDIRECT_PAGE; const redirect_url = 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' });
......
...@@ -14,7 +14,7 @@ module.exports = appInfo => { ...@@ -14,7 +14,7 @@ module.exports = appInfo => {
dir: '/jianbing/logs/51business', dir: '/jianbing/logs/51business',
}; };
// add your config here // add your config here
config.middleware = ['errorHandler', 'deviceLogin', 'deviceInit', 'responseSet']; config.middleware = [ 'errorHandler', 'deviceLogin', 'deviceInit', 'responseSet' ];
// 是否启用csrf安全 // 是否启用csrf安全
config.security = { config.security = {
...@@ -126,18 +126,19 @@ module.exports = appInfo => { ...@@ -126,18 +126,19 @@ module.exports = appInfo => {
config.USER_CENTER_API_URI = process.env.USER_CENTER_API_URI; config.USER_CENTER_API_URI = process.env.USER_CENTER_API_URI;
config.BLACKLIST_APPLY_APPKEY = process.env.BLACKLIST_APPLY_APPKEY;//黑名单对接 config.BLACKLIST_APPLY_APPKEY = process.env.BLACKLIST_APPLY_APPKEY;// 黑名单对接
config.BLACKLIST_APPLY_APPSECRET = process.env.BLACKLIST_APPLY_APPSECRET; config.BLACKLIST_APPLY_APPSECRET = process.env.BLACKLIST_APPLY_APPSECRET;
config.BLACKLIST_APPLY_URL = process.env.BLACKLIST_APPLY_URL; config.BLACKLIST_APPLY_URL = process.env.BLACKLIST_APPLY_URL;
//微信支付相关内容 // 微信支付相关内容
config.MCH_APPID = process.env.MCH_APPID;//商户关联的APPID config.MCH_APPID = process.env.MCH_APPID;// 商户关联的APPID
config.MCH_ID = process.env.MCH_ID;//商户id config.MCH_ID = process.env.MCH_ID;// 商户id
config.MCH_KEY = process.env.MCH_KEY;//商户秘钥 config.MCH_KEY = process.env.MCH_KEY;// 商户秘钥
config.OUT_P_NODE_URL = process.env.OUT_P_NODE_URL config.OUT_P_NODE_URL = process.env.OUT_P_NODE_URL;
config.PULIC_BASE_URL = process.env.PULIC_BASE_URL;
//数盒魔方 // 数盒魔方
config.SHUHEMOFANG_APP_KEY = process.env.SHUHEMOFANG_APP_KEY; config.SHUHEMOFANG_APP_KEY = process.env.SHUHEMOFANG_APP_KEY;
config.SHUHEMOFANG_APP_SECRET = process.env.SHUHEMOFANG_APP_SECRET; config.SHUHEMOFANG_APP_SECRET = process.env.SHUHEMOFANG_APP_SECRET;
config.SHUHEMOFANG_URL = process.env.SHUHEMOFANG_URL; config.SHUHEMOFANG_URL = process.env.SHUHEMOFANG_URL;
...@@ -146,14 +147,14 @@ module.exports = appInfo => { ...@@ -146,14 +147,14 @@ module.exports = appInfo => {
config.TX_LBS_KEY = process.env.TX_LBS_KEY; config.TX_LBS_KEY = process.env.TX_LBS_KEY;
config.TX_LBS_DISTANCE_URL = process.env.TX_LBS_DISTANCE_URL; // 距离计算(一对多) config.TX_LBS_DISTANCE_URL = process.env.TX_LBS_DISTANCE_URL; // 距离计算(一对多)
config.TX_LBS_ADDRESS_URL = process.env.TX_LBS_ADDRESS_URL; // 地址解析;逆地址解析 config.TX_LBS_ADDRESS_URL = process.env.TX_LBS_ADDRESS_URL; // 地址解析;逆地址解析
config.TX_LBS_URL = process.env.TX_LBS_URL; //腾讯MAP API config.TX_LBS_URL = process.env.TX_LBS_URL; // 腾讯MAP API
//我的信用-通化检测 // 我的信用-通化检测
config.YYS_APP_KEY = process.env.YYS_APP_KEY; config.YYS_APP_KEY = process.env.YYS_APP_KEY;
config.YYS_APPLY_APPSECRET = process.env.YYS_APPLY_APPSECRET; config.YYS_APPLY_APPSECRET = process.env.YYS_APPLY_APPSECRET;
//运营商报告 // 运营商报告
config.YYS_REPORT_KEY = process.env.YYS_REPORT_KEY; config.YYS_REPORT_KEY = process.env.YYS_REPORT_KEY;
config.YYS_REPORT_APPSECRET = process.env.YYS_REPORT_APPSECRET; config.YYS_REPORT_APPSECRET = process.env.YYS_REPORT_APPSECRET;
config.YYS_REPORT_URL = process.env.YYS_REPORT_URL; config.YYS_REPORT_URL = process.env.YYS_REPORT_URL;
......
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