From 71a9eef518f2f2f1a1eb2fb90f2eb8ab7b155bc8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 一月 2026 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
vite.config.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/vite.config.js b/vite.config.js
index b4b6129..fbf59c8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,12 +6,12 @@
export default defineConfig(({ mode, command }) => {
const env = loadEnv(mode, process.cwd());
const { VITE_APP_ENV } = env;
- const baseUrl =
- VITE_APP_ENV == "development"
- ? "http://114.132.189.42:9036" // 寮�鍙戠幆澧冨悗绔帴鍙�
- : "http://114.132.189.42:9036"; // 鐢熶骇鐜鍚庣鎺ュ彛
-
+ const baseUrl = env.VITE_APP_ENV === "development" ? "http://192.168.1.35:7003" : env.VITE_BASE_API;
+ const javaUrl = env.VITE_APP_ENV === "development" ? "http://114.132.189.42:9037" : env.VITE_JAVA_API;
return {
+ define: {
+ __BASE_API__: JSON.stringify(javaUrl),
+ },
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
// 榛樿鎯呭喌涓嬶紝vite 浼氬亣璁句綘鐨勫簲鐢ㄦ槸琚儴缃插湪涓�涓煙鍚嶇殑鏍硅矾寰勪笂
// 渚嬪 https://www.ruoyi.vip/銆傚鏋滃簲鐢ㄨ閮ㄧ讲鍦ㄤ竴涓瓙璺緞涓婏紝浣犲氨闇�瑕佺敤杩欎釜閫夐」鎸囧畾杩欎釜瀛愯矾寰勩�備緥濡傦紝濡傛灉浣犵殑搴旂敤琚儴缃插湪 https://www.ruoyi.vip/admin/锛屽垯璁剧疆 baseUrl 涓� /admin/銆�
@@ -53,7 +53,7 @@
"/dev-api": {
target: baseUrl,
changeOrigin: true,
- rewrite: (p) => p.replace(/^\/dev-api/, ""),
+ rewrite: p => p.replace(/^\/dev-api/, ""),
},
// springdoc proxy
"^/v3/api-docs/(.*)": {
@@ -68,7 +68,7 @@
{
postcssPlugin: "internal:charset-removal",
AtRule: {
- charset: (atRule) => {
+ charset: atRule => {
if (atRule.name === "charset") {
atRule.remove();
}
--
Gitblit v1.9.3