From 4571ec34030aad4d2847f902932aef9323bb8e32 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 25 八月 2026 10:38:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
vite.config.ts | 3 ++-
internal/vite-config/src/utils/env.ts | 9 ++++++++-
company.config.ts | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/company.config.ts b/company.config.ts
index 3ca35b2..5ae0f44 100644
--- a/company.config.ts
+++ b/company.config.ts
@@ -30,7 +30,7 @@
apiUrl: 'http://42.63.70.90:9001/admin-api',
},
YZFX: {
- name: '瀹佸鑻辨辰闄ら攬',
+ name: '瀹佸鑻辨辰闃查攬',
logo: '/logos/YZFXLogo.png',
favicon: '/logos/YZFXLogo.ico',
apiUrl: 'http://42.63.70.231:9001/admin-api',
diff --git a/internal/vite-config/src/utils/env.ts b/internal/vite-config/src/utils/env.ts
index f342216..d14019b 100644
--- a/internal/vite-config/src/utils/env.ts
+++ b/internal/vite-config/src/utils/env.ts
@@ -38,7 +38,7 @@
match = 'VITE_GLOB_',
confFiles = getConfFiles(),
) {
- let envConfig = {};
+ let envConfig: Record<string, string> = {};
for (const confFile of confFiles) {
try {
@@ -60,6 +60,13 @@
Reflect.deleteProperty(envConfig, key);
}
});
+ // 鍚堝苟杩涚▼鐜鍙橀噺锛屼娇 vite.config.ts 鎸夊叕鍙告敞鍏ョ殑 VITE_GLOB_API_URL 鑳借繘鍏� _app-config 鏂囦欢
+ Object.keys(process.env).forEach((key) => {
+ const value = process.env[key];
+ if (reg.test(key) && value) {
+ envConfig[key] = value;
+ }
+ });
return envConfig as T;
}
diff --git a/vite.config.ts b/vite.config.ts
index 7b0c254..b9e690e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,6 +25,7 @@
__APP_NAME__: JSON.stringify(appName),
};
if (!isDev && appApiUrl) {
+ process.env.VITE_GLOB_API_URL = appApiUrl;
defineVars['import.meta.env.VITE_GLOB_API_URL'] = JSON.stringify(appApiUrl);
defineVars['import.meta.env.VITE_BASE_URL'] = JSON.stringify(new URL(appApiUrl).origin);
}
@@ -82,7 +83,7 @@
proxy: {
"/admin-api": {
changeOrigin: true,
- target: "http://192.168.0.10:48080",
+ target: "http://36.213.90.123:9500",
ws: true,
},
},
--
Gitblit v1.9.3