Эх сурвалжийг харах

fix: 修复线上指数服务不好用的问题

yanglzh 11 сар өмнө
parent
commit
02a8f8923a

+ 0 - 1
.env.open

@@ -2,7 +2,6 @@
 VITE_ISOPEN = true
 VITE_ISOPEN = true
 
 
 VITE_SERVER_ORIGIN = ''
 VITE_SERVER_ORIGIN = ''
-
 VITE_RULE_SERVER_URL = '/rule/api/v1'
 VITE_RULE_SERVER_URL = '/rule/api/v1'
 VITE_MEDIA_SERVER_URL = '/media'
 VITE_MEDIA_SERVER_URL = '/media'
 
 

+ 2 - 2
src/utils/origin.ts

@@ -28,13 +28,13 @@ export default function getOrigin(urlStr: string = '', type: string = 'http') {
 
 
 // 如果 modbus服务  ice104协议网关服务 指数管理服务
 // 如果 modbus服务  ice104协议网关服务 指数管理服务
 export function getOtherServersOrigin(urlStr: string = '') {
 export function getOtherServersOrigin(urlStr: string = '') {
-  const origin = import.meta.env.VITE_SERVER_ORIGIN
+  const origin = import.meta.env.VITE_SERVER_ORIGIN || window.location.origin
   const nginxProxy = import.meta.env.VITE_NGINX_PROXY
   const nginxProxy = import.meta.env.VITE_NGINX_PROXY
   return origin + nginxProxy + urlStr
   return origin + nginxProxy + urlStr
 }
 }
 
 
 export function getSSEOrigin(urlStr: string = '') {
 export function getSSEOrigin(urlStr: string = '') {
-  const origin = import.meta.env.VITE_SERVER_ORIGIN
+  const origin = import.meta.env.VITE_SERVER_ORIGIN || window.location.origin
   const nginxProxy = import.meta.env.VITE_NGINX_PROXY
   const nginxProxy = import.meta.env.VITE_NGINX_PROXY
   return origin + nginxProxy + urlStr
   return origin + nginxProxy + urlStr
 }
 }