Authored by 毕凯

Merge branch 'feature/config' into 'release/6.6.1'

无用配置清理



See merge request !1401
@@ -104,8 +104,8 @@ passport.use(new LocalStrategy({ @@ -104,8 +104,8 @@ passport.use(new LocalStrategy({
104 104
105 // wechat 登录 105 // wechat 登录
106 passport.use('weixin', new WeixinStrategy({ 106 passport.use('weixin', new WeixinStrategy({
107 - clientID: config.thirdLogin.wechat.appID,  
108 - clientSecret: config.thirdLogin.wechat.appSecret, 107 + clientID: 'wx75e5a7c0c88e45c2',
  108 + clientSecret: 'ce21ae4a3f93852279175a167e54509b',
109 callbackURL: `${siteUrl}/passport/login/wechat/callback`, 109 callbackURL: `${siteUrl}/passport/login/wechat/callback`,
110 requireState: true, 110 requireState: true,
111 authorizationURL: 'https://open.weixin.qq.com/connect/oauth2/authorize', 111 authorizationURL: 'https://open.weixin.qq.com/connect/oauth2/authorize',
@@ -68,9 +68,6 @@ module.exports = { @@ -68,9 +68,6 @@ module.exports = {
68 index: '//m.yohobuy.com' 68 index: '//m.yohobuy.com'
69 }, 69 },
70 useCache: false, 70 useCache: false,
71 - interfaceShunt: {  
72 - open: false  
73 - },  
74 loggers: { 71 loggers: {
75 infoFile: { 72 infoFile: {
76 close: true, 73 close: true,
@@ -104,12 +101,6 @@ module.exports = { @@ -104,12 +101,6 @@ module.exports = {
104 debugStdout: true 101 debugStdout: true
105 } 102 }
106 }, 103 },
107 - thirdLogin: {  
108 - wechat: {  
109 - appID: 'wx75e5a7c0c88e45c2',  
110 - appSecret: 'ce21ae4a3f93852279175a167e54509b'  
111 - }  
112 - },  
113 zookeeperServer: '127.0.0.1:2181', 104 zookeeperServer: '127.0.0.1:2181',
114 alipayConfig: { 105 alipayConfig: {
115 payUrl: 'https://mapi.alipay.com/gateway.do', 106 payUrl: 'https://mapi.alipay.com/gateway.do',
@@ -194,10 +185,6 @@ if (isProduction) { @@ -194,10 +185,6 @@ if (isProduction) {
194 yohoNowApi: 'http://new.yohoboys.com/' 185 yohoNowApi: 'http://new.yohoboys.com/'
195 }, 186 },
196 useCache: true, 187 useCache: true,
197 - interfaceShunt: {  
198 - open: false,  
199 - url: 'http://123.206.2.55/strategy'  
200 - },  
201 zookeeperServer: 'web.zookeeper.yohoops.org:2181', 188 zookeeperServer: 'web.zookeeper.yohoops.org:2181',
202 alipayConfig: { 189 alipayConfig: {
203 payUrl: 'https://mapi.alipay.com/gateway.do', 190 payUrl: 'https://mapi.alipay.com/gateway.do',