diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 0ec314ff6..15d13d61e 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -25,7 +25,7 @@ export function handlerUrl(data) { if (process.env.NODE_ENV === 'development') { // const data = null; // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 @@ -33,14 +33,15 @@ export function handlerUrl(data) { // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 - // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 - BASE_API = data && data.domainName ? data.domainName : BASE_API; - VOICE_API = data && data.resourcesDomainName ? data.resourcesDomainName : 'https://joylink.club/oss/joylink'; + BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 + // BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API; + BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API; + VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink'; UPLOAD_API = 'http://joylink.club/jlfile'; BASE_SITE = 'https://test.joylink.club/cbtc'; } else if (process.env.NODE_ENV === 'test') { - BASE_API = data && data.domainName ? data.domainName : 'https://test.joylink.club/jlcloud'; - VOICE_API = data && data.resourcesDomainName ? data.resourcesDomainName : 'https://joylink.club/oss/joylink'; + BASE_API = data && data.domainName ? 'https://' + data.domainName : 'https://test.joylink.club/jlcloud'; + VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink'; UPLOAD_API = 'http://joylink.club/jlfile'; BASE_SITE = 'https://test.joylink.club/cbtc'; } else if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_PRO === 'local') { @@ -54,14 +55,10 @@ export function handlerUrl(data) { UPLOAD_API = 'http://joylink.club/jlfile'; BASE_SITE = 'https://joylink.club/cbtc'; } else if (process.env.NODE_ENV === 'production') { - BASE_API = data && data.domainName ? data.domainName : 'https://joylink.club/jlcloud'; - // store.dispatch('setBaseUrl', data && data.domainName ? data.domainName : BASE_API); - VOICE_API = data && data.resourcesDomainName ? data.resourcesDomainName : 'https://joylink.club/oss/joylink'; - // store.dispatch('setResourcesUrl', data && data.resourcesDomainName ? data.resourcesDomainName : VOICE_API); + BASE_API = data && data.domainName ? 'https://' + data.domainName : 'https://joylink.club/jlcloud'; + VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink'; UPLOAD_API = 'http://joylink.club/jlfile'; - // store.dispatch('setUploadUrl', UPLOAD_API); BASE_SITE = 'https://joylink.club/cbtc'; - // store.dispatch('setBaseSite', BASE_SITE); } return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE}; }