소스 검색

fix: 完善浏览器访问环境,mqtt的地址从浏览器得到,这样可以部署到nginx等web服务器时也能使用正确的mqtt监听地址

dengdx 1 개월 전
부모
커밋
ab3f3a7c4a
4개의 변경된 파일10개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      package.json
  2. 3 1
      src/domain/mqttService.ts
  3. 3 1
      src/domain/mqttServiceForDevice.ts
  4. 3 0
      src/utils/hostConfig.ts

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "zsis",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "description": "医学成像系统",
   "main": "main.js",

+ 3 - 1
src/domain/mqttService.ts

@@ -1,8 +1,10 @@
 import mqtt from 'mqtt';
-import { MQTT_BROKER_URL } from '../API/config';
+// import { MQTT_BROKER_URL } from '../API/config';
 import emitter from '../utils/eventEmitter';
 import { judgeImage } from '../API/exam/judgeImage';
+import { getHostConfig } from '@/utils/hostConfig';
 
+const MQTT_BROKER_URL:string= getHostConfig();
 export interface MqttMessage {
   dcm?: string;
   message: string;

+ 3 - 1
src/domain/mqttServiceForDevice.ts

@@ -1,7 +1,9 @@
 import mqtt from 'mqtt';
-import { MQTT_BROKER_URL } from '../API/config';
+// import { MQTT_BROKER_URL } from '../API/config';
+import { getHostConfig } from '@/utils/hostConfig';
 import emitter from '../utils/eventEmitter';
 
+const MQTT_BROKER_URL:string= getHostConfig();
 interface MqttMessage {
   IDX: string;
   TYPE: string;

+ 3 - 0
src/utils/hostConfig.ts

@@ -0,0 +1,3 @@
+export function getHostConfig() {
+    return `ws://${window.location.host}:8083/mqtt`
+}