Răsfoiți Sursa

feat(mqtt): 添加多MQTT主机配置支持

添加VITE_MQTT_HOST_ALARM和VITE_MQTT_HOST_POINT环境变量配置
修改相关组件使用新的MQTT主机配置
优化环境变量日志输出格式
liujia 1 lună în urmă
părinte
comite
61b8581
7 a modificat fișierele cu 39 adăugiri și 8 ștergeri
  1. 4 0
      .env.development
  2. 4 0
      .env.production
  3. 4 0
      .env.test
  4. 17 3
      src/App.vue
  5. 1 1
      src/layout/index.vue
  6. 1 1
      src/views/device/detail/index.vue
  7. 8 3
      vite.config.ts

+ 4 - 0
.env.development

@@ -9,5 +9,9 @@ VITE_APP_HOST=https://api.radar-power.asia:4443
 VITE_API_BASE_URL=/portal-service-server/web 
 # mqtt配置
 VITE_MQTT_HOST=ws://8.130.28.21:8083/mqtt
+VITE_MQTT_HOST_ALARM=ws://8.130.28.21:8083/mqtt
+VITE_MQTT_HOST_POINT=ws://8.130.28.21:8083/mqtt
+# VITE_MQTT_HOST_ALARM=ws://cmd.radar-power.asia/mqtt # 告警MQTT地址
+# VITE_MQTT_HOST_POINT=ws://data.radar-power.asia/mqtt # 点位数据MQTT地址
 VITE_MQTT_USERNAME=admin
 VITE_MQTT_PASSWORD=public

+ 4 - 0
.env.production

@@ -9,5 +9,9 @@ VITE_APP_HOST=https://radar-power.cn
 VITE_API_BASE_URL=/portal-service-server/web 
 # mqtt配置
 VITE_MQTT_HOST=wss://radar-power.cn:8084/mqtt
+VITE_MQTT_HOST_ALARM=wss://radar-power.cn:8084/mqtt
+VITE_MQTT_HOST_POINT=wss://radar-power.cn:8084/mqtt
+# VITE_MQTT_HOST_ALARM=ws://cmd.radar-power.com:8084/mqtt # 告警MQTT地址
+# VITE_MQTT_HOST_POINT=ws://data.radar-power.com:8084/mqtt # 点位数据MQTT地址
 VITE_MQTT_USERNAME=admin
 VITE_MQTT_PASSWORD=public

+ 4 - 0
.env.test

@@ -9,5 +9,9 @@ VITE_APP_HOST=https://radar-power.cn
 VITE_API_BASE_URL=/portal-service-server/web 
 # mqtt配置
 VITE_MQTT_HOST=wss://radar-power.cn:8084/mqtt
+VITE_MQTT_HOST_ALARM=wss://radar-power.cn:8084/mqtt
+VITE_MQTT_HOST_POINT=wss://radar-power.cn:8084/mqtt
+# VITE_MQTT_HOST_ALARM=ws://cmd.radar-power.cn:8084/mqtt # 告警MQTT地址
+# VITE_MQTT_HOST_POINT=ws://data.radar-power.cn:8084/mqtt # 点位数据MQTT地址
 VITE_MQTT_USERNAME=admin
 VITE_MQTT_PASSWORD=public

+ 17 - 3
src/App.vue

@@ -46,10 +46,24 @@ onMounted(() => {
   router.isReady().then(() => {
     isRouterReady.value = true
 
+    const mode = import.meta.env.MODE
+    const apiHost = import.meta.env.VITE_APP_HOST
+    const mqttHostAlarm = import.meta.env.VITE_MQTT_HOST_ALARM
+    const mqttHostPoint = import.meta.env.VITE_MQTT_HOST_POINT
+
     // 环境信息
-    console.log(`🚀CurrentMode: ${import.meta.env.MODE}`)
-    console.log(`🚀HostAPI: ${import.meta.env.VITE_APP_HOST}`)
-    console.log(`🚀ProxyAPI: ${import.meta.env.VITE_APP_HOST}`)
+    // console.log(`🚀CurrentMode: ${import.meta.env.MODE}`)
+    // console.log(`🚀HostAPI: ${import.meta.env.VITE_APP_HOST}`)
+    // console.log(`🚀ProxyAPI: ${import.meta.env.VITE_APP_HOST}`)
+    // console.log(`🚀AlarmMQTT: ${import.meta.env.VITE_MQTT_HOST_ALARM}`)
+    // console.log(`🚀PointMQTT: ${import.meta.env.VITE_MQTT_HOST_POINT}`)
+
+    console.log('📘📘📘 Environment LOG 📘📘📘', {
+      mode,
+      apiHost,
+      mqttHostAlarm,
+      mqttHostPoint,
+    })
   })
 })
 

+ 1 - 1
src/layout/index.vue

@@ -126,7 +126,7 @@ const MqttData = ref()
 const initMqttManager = async () => {
   try {
     const mqttConfig = {
-      host: import.meta.env.VITE_MQTT_HOST,
+      host: import.meta.env.VITE_MQTT_HOST_ALARM,
       username: import.meta.env.VITE_MQTT_USERNAME,
       password: import.meta.env.VITE_MQTT_PASSWORD,
       clientId: `mqtt_client_${Math.random().toString(16).slice(2, 8)}`,

+ 1 - 1
src/views/device/detail/index.vue

@@ -554,7 +554,7 @@ const breathRpmList = ref<number[]>([])
 onMounted(() => {
   console.log('onMounted', mqttClient)
   const mqttConfig = {
-    host: import.meta.env.VITE_MQTT_HOST,
+    host: import.meta.env.VITE_MQTT_HOST_POINT,
     username: import.meta.env.VITE_MQTT_USERNAME,
     password: import.meta.env.VITE_MQTT_PASSWORD,
     clientId: `mqtt_client_${Math.random().toString(16).slice(2, 8)}`,

+ 8 - 3
vite.config.ts

@@ -16,10 +16,15 @@ export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), '')
   // 获取当前环境的API主机
   const apiHost = env.VITE_APP_HOST
+  const mqttHostAlarm = env.VITE_MQTT_HOST_ALARM
+  const mqttHostPoint = env.VITE_MQTT_HOST_POINT
   // 添加日志输出
-  console.log(`🚀CurrentMode: ${mode}`)
-  console.log(`🚀HostAPI: ${apiHost}`)
-  console.log(`🚀ProxyAPI: ${apiHost}`)
+  console.log('📘📘📘 Environment LOG 📘📘📘', {
+    mode,
+    apiHost,
+    mqttHostAlarm,
+    mqttHostPoint,
+  })
 
   const pkg = JSON.parse(readFileSync('./package.json', 'utf-8'))
   return {