From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001 From: liuguocan <527956374@qq.com> Date: 星期二, 28 十一月 2023 14:45:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin-web/public/static/config.js | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js index 78c156c..2595dcf 100644 --- a/admin-web/public/static/config.js +++ b/admin-web/public/static/config.js @@ -1,25 +1,12 @@ -// 璇锋眰鎺ュ彛鍦板潃 濡傛灉娌℃湁閰嶇疆鑷姩鑾峰彇褰撳墠缃戝潃璺緞 -const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`; -const VUE_APP_WS_URL = - process.env.VUE_APP_WS_URL || (location.protocol === 'https' ? 'wss' : 'ws') + ':' + location.hostname; - const SettingIplatform = { // 鏈嶅姟鍣ㄥ湴鍧� - // 鏈嶅姟鍣ㄥ湴鍧� - httpUrl: VUE_APP_API_URL, // 涓婁紶璺緞 ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙� - // ftpUrl:'https://jmy.jinmingyuan.com/progress',// 娴嬭瘯, -// 鎺ュ彛璇锋眰鍦板潃 -// apiBaseURL: 'http://116.198.39.83:8082/progress', // 姝e紡 - // apiBaseURL: 'http://172.16.60.90:8082/progress',//寮�鍙� + // 鎺ュ彛璇锋眰鍦板潃 apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//寮�鍙� // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙� -// apiBaseURL: 'https://jmy.jinmingyuan.com/progress',// 娴嬭瘯, - // socket杩炴帴 - wsSocketUrl: VUE_APP_WS_URL, - debug: true //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織 + debug: false //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織 }; export default SettingIplatform; -- Gitblit v1.9.1