diff --git a/vue/.env.development b/vue/.env.development index 57ac6f2c..ff6ccfd7 100644 --- a/vue/.env.development +++ b/vue/.env.development @@ -9,9 +9,3 @@ VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true - -# mqtt消息服务器地址 -VUE_APP_BROKEN_URL = 'ws://localhost:8083' - -# emqx接口地址 -VUE_APP_EMQX_URL= 'http://localhost:8081' diff --git a/vue/.env.production b/vue/.env.production index 60d9fdc8..80365ff4 100644 --- a/vue/.env.production +++ b/vue/.env.production @@ -5,10 +5,4 @@ VUE_APP_TITLE = 物美智能系统 ENV = 'production' # 物美智能管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' - -# mqtt消息服务器地址 -VUE_APP_BROKEN_URL = 'ws://localhost:8083' - -# emqx接口地址 -VUE_APP_EMQX_URL= 'http://localhost:8081' \ No newline at end of file +VUE_APP_BASE_API = '/prod-api' \ No newline at end of file diff --git a/vue/.env.staging b/vue/.env.staging index ffeca7c9..cb5f4d8b 100644 --- a/vue/.env.staging +++ b/vue/.env.staging @@ -9,9 +9,3 @@ ENV = 'staging' # 物美智能系统/测试环境 VUE_APP_BASE_API = '/stage-api' -# mqtt消息服务器地址 -VUE_APP_BROKEN_URL = 'ws://localhost:8083' - -# emqx接口地址 -VUE_APP_EMQX_URL= 'http://localhost:8081' - diff --git a/vue/src/views/iot/device/mqtt-client.vue b/vue/src/views/iot/device/mqtt-client.vue index 77cd2a49..642a5e51 100644 --- a/vue/src/views/iot/device/mqtt-client.vue +++ b/vue/src/views/iot/device/mqtt-client.vue @@ -52,7 +52,11 @@ export default { clientId: 'web-' + Math.random().toString(16).substr(2), connectTimeout: 60000 } - this.client = mqtt.connect(process.env.VUE_APP_BROKEN_URL, options); + // 配置Mqtt地址 + // let ssl_url = "wss://domain.com/mqtt" + let url = "ws://" + window.location.hostname + ":8083/mqtt"; + console.log("mqtt地址:", url); + this.client = mqtt.connect(url, options); this.client.on("connect", (e) => { console.log("成功连接服务器:", e); // 订阅主题 diff --git a/vue/vue.config.js b/vue/vue.config.js index 9dfced35..faba3cb1 100644 --- a/vue/vue.config.js +++ b/vue/vue.config.js @@ -40,7 +40,7 @@ module.exports = { } }, ['/api/v4']: { - target: process.env.VUE_APP_EMQX_URL, + target: `http://localhost:8081`, changeOrigin: true, // logLevel: 'debug', },