소스 검색

fix:window.open跳转添加token;打包配置上传

luoyujia 5 달 전
부모
커밋
b554d18866
2개의 변경된 파일18개의 추가작업 그리고 7개의 파일을 삭제
  1. 15 6
      .env.production
  2. 3 1
      src/utils/index.ts

+ 15 - 6
.env.production

@@ -2,7 +2,7 @@
  # @Author: renxin renxin0828@163.com
  # @Date: 2023-03-31 13:53:57
  # @LastEditors: luoyujia 1027671187@qq.com
- # @LastEditTime: 2024-10-14 09:29:13
+ # @LastEditTime: 2024-10-22 16:55:31
  # @FilePath: \thingskit-base\.env.production
  # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 ### 
@@ -29,11 +29,15 @@ VITE_GLOB_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 # Basic interface address SPA
 # VITE_GLOB_API_URL=http://192.168.2.225/api
 #VITE_GLOB_API_URL=http://106.12.170.138:7070
-VITE_GLOB_API_URL=http://192.168.2.8:11225/api
+# VITE_GLOB_API_URL=http://192.168.2.8:11225/api
+VITE_GLOB_API_URL=http://221.182.8.141:11225/api
+
 
 # File upload address, optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=http://192.168.2.225/api/yt/oss/upload
+# VITE_GLOB_UPLOAD_URL=http://192.168.2.225/api/yt/oss/upload
+VITE_GLOB_UPLOAD_URL=http://221.182.8.141/api/yt/oss/upload
+
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=/yt
@@ -48,7 +52,7 @@ VITE_USE_PWA = false
 VITE_LEGACY = true
 
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://192.168.2.225/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://221.182.8.141/api/ws/plugins/telemetry?token=
 
 #configuration
 VITE_GLOB_CONFIGURATION = /thingskit-scada
@@ -66,5 +70,10 @@ VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME = 60000
 VITE_GLOB_ALARM_NOTIFY_DURATION = 5
 
 # VITE_GLOB_LIGONG_ADMIN=http://221.182.8.141:11031/
-VITE_GLOB_LIGONG_ADMIN=http://192.168.2.21:11042/bigscreen/#/
-VITE_GLOB_MANAGE=http://192.168.2.21:11043/#/
+VITE_GLOB_LIGONG_ADMIN=http://221.182.8.141:11032/bigscreen/#/
+VITE_GLOB_MANAGE=http://221.182.8.141:11032/manage/#/
+
+# VITE_GLOB_LIGONG_ADMIN=http://192.168.2.8:10042/bigscreen/#/
+# VITE_GLOB_MANAGE=http://192.168.2.8:10042/manage/#/
+# VITE_GLOB_LIGONG_ADMIN=http://221.182.8.141:10042/bigscreen/#/
+# VITE_GLOB_MANAGE=http://221.182.8.141:10042/manage/#/

+ 3 - 1
src/utils/index.ts

@@ -1,5 +1,6 @@
 import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router';
 import type { App, Plugin } from 'vue';
+import { getJwtToken } from '/@/utils/auth';
 
 import { unref } from 'vue';
 import { isObject } from '/@/utils/is';
@@ -49,7 +50,8 @@ export function openWindow(
 
   noopener && feature.push('noopener=yes');
   noreferrer && feature.push('noreferrer=yes');
-
+  const token = getJwtToken();
+  url = url + token;
   window.open(url, target, feature.join(','));
 }