fix: ip端口号

.env

@@ -36,7 +36,7 @@ VITE_SERVICE_LOGOUT_CODES=8888,8889
 VITE_SERVICE_MODAL_LOGOUT_CODES=7777,7778
 
 # token expired codes of backend service, when the code is received, it will refresh the token and resend the request
-VITE_SERVICE_EXPIRED_TOKEN_CODES=9999,9998
+VITE_SERVICE_EXPIRED_TOKEN_CODES=9999,9998,9996
 
 # when the route mode is static, the defined super role
 VITE_STATIC_SUPER_ROLE=R_SUPER
@@ -48,36 +48,27 @@ VITE_SOURCE_MAP=N
 VITE_STORAGE_PREFIX=SOY_
 
 
-# const VITE_VIDEO_URL = 'ws://192.168.1.221:9999';
-# const VITE_SERVICE_URL = 'http://192.168.1.120:9995';
-# const webSocketUrl = 'ws://192.168.1.120:9995';
+# VITE_VIDEO_URL: 视频流地址
+# VITE_SERVICE_URL: 所有服务接口地址
+# VITE_WEBSOCKET_URL: WebSocket 全局地址
 
 
-# 开发环境 - 视频流地址
-# VITE_VIDEO_URL=ws://192.168.1.68:9999
+# # 开发环境(黄国安)
+VITE_VIDEO_URL=ws://192.168.2.14:9999
+VITE_SERVICE_URL=http://192.168.2.14:9998
+VITE_WEBSOCKET_URL=ws://192.168.2.14:9999
 
-# # 开发环境 - 部分服务接口地址
-# VITE_SERVICE_URL=http://192.168.1.68:9996
 
-# # 开发环境 - WebSocket 全局地址
-# VITE_WEBSOCKET_URL=ws://192.168.1.68:9996
 
+# # 华远正式环境(外网)
+# VITE_VIDEO_URL=ws://220.194.146.65:9999
+# VITE_SERVICE_URL=http://220.194.146.65:9996
+# VITE_WEBSOCKET_URL=ws://220.194.146.65:9996
 
-# ============================================ old
-# VITE_VIDEO_URL=ws://192.168.1.68:9999
 
-# 开发环境 - 部分服务接口地址
-# VITE_SERVICE_URL=http://192.168.1.68:9996
+# # 华远正式环境（内网）
+# VITE_VIDEO_URL=ws://10.0.20.81:9991
+# VITE_SERVICE_URL=http://10.0.20.81:9996
+# VITE_WEBSOCKET_URL=ws://10.0.20.81:9991
 
-# 开发环境 - WebSocket 全局地址
-# VITE_WEBSOCKET_URL=ws://192.168.1.68:9996
-# ============================================ old
 
-# 开发环境 - 视频流地址
-VITE_VIDEO_URL=ws://192.168.2.18:9999
-
-# 开发环境 - 所有服务接口地址
-VITE_SERVICE_URL=http://192.168.2.16:9998
-
-# 开发环境 - WebSocket 全局地址
-VITE_WEBSOCKET_URL=ws://192.168.2.16:9998

pnpm-lock.yaml

@@ -4092,7 +4092,7 @@ packages:
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  postcss@5.2.18:
+  postcss@5.2.14:
     resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==}
     engines: {node: '>=0.12'}
 
@@ -9358,7 +9358,7 @@ snapshots:
 
   postcss-value-parser@4.2.0: {}
 
-  postcss@5.2.18:
+  postcss@5.2.14:
     dependencies:
       chalk: 1.1.3
       js-base64: 2.6.4

src/App.vue

@@ -6,14 +6,6 @@ import { useThemeStore } from './store/modules/theme';
 import { naiveDateLocales, naiveLocales } from './locales/naive';
 import { NConfigProvider, darkTheme, NButton, NImage, NSpace, NTag, useMessage, useNotification, NDropdown, NRow, NCol, NEllipsis } from 'naive-ui';
 
-// 视频地址
-// export const videdUrl = 'ws://192.168.1.221:9999';
-// 固定接口地址
-// export const apiUrl = 'http://192.168.1.120:9995';
-// WS 地址
-// export const wsUrl = 'ws://192.168.1.120:9995';
-
-
 defineOptions({
   name: 'App'
 });

src/views/home/index.vue

@@ -18,14 +18,6 @@ import JSMpeg from '@cycjimmy/jsmpeg-player';
 import fullScreen from '@/utils/full'
 // import { wx } from '@/index.vue'
 
-// 服务器IP地址
-// const serviceUrl = 'ws://192.168.1.140:9999';
-// ws://192.168.1.221:9999
-// const serviceUrl = 'ws://192.168.1.199:9999';
-
-// const serviceUrl = 'ws://192.168.1.221:9999';
-// const apiUrl = 'http://192.168.1.120:9995';
-// const webSocketUrl = 'ws://192.168.1.120:9995';
 
 const serviceUrl = import.meta.env.VITE_VIDEO_URL;
 const apiUrl = import.meta.env.VITE_SERVICE_URL;

src/views/home/modules/pie-chart-pro.vue

@@ -14,8 +14,8 @@ const getCardData = async () => {
     if (res.data.code === 200) {
       updateOptions(opts => {
         opts.series[0].data = [
-          { name: `已启动 ${res.data.data[0].count} 个`, value: res.data.data[0].count },
-          { name: `已停用 ${res.data.data[1].count} 个`, value: res.data.data[1].count },
+          { name: `已启动 ${res.data.data[1].count} 个`, value: res.data.data[1].count },
+          { name: `已停用 ${res.data.data[0].count} 个`, value: res.data.data[0].count },
         ];
         return opts;
       });

vite.config.ts

@@ -4,24 +4,6 @@ import { defineConfig, loadEnv } from 'vite';
 import { setupVitePlugins } from './build/plugins';
 import { createViteProxy, getBuildTime } from './build/config';
 
-// export const proxyTarget = 'http://192.168.2.16:9998';
-// export const proxyTarget = 'http://192.168.2.16:9998';
-export const proxyTarget = 'http://192.168.2.16:9998';
-
-// export const proxyTarget = 'http://192.168.1.119:9996';
-// export const proxyTarget = 'http://192.168.1.119:9996';
-
-
-// 视频地址
-export const videdUrl = 'ws://192.168.2.18:9999';
-
-// 固定接口地址
-export const apiUrl = 'http://192.168.2.16:9998';
-
-// WS 地址
-export const wsUrl = 'ws://192.168.2.18:9999';
-
-
 export default defineConfig(configEnv => {
 
   const viteEnv = loadEnv(configEnv.mode, process.cwd()) as unknown as Env.ImportMeta;
@@ -57,7 +39,7 @@ export default defineConfig(configEnv => {
         // '/menus': 'http://192.168.1.102:9995/menus',
         // '/menus': 'http://192.168.1.173:10000/menus'
         '/v1': {
-          target: proxyTarget,
+          target: viteEnv.VITE_SERVICE_URL,
           changeOrigin: true
         }
       },