From 2bee81442387717d425ffde1dea3d2e9c4b7a00e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 16:47:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
multiple/assets/logo/ZXZNLogo.png | 0
multiple/config.json | 18 ++++++++++++++++++
multiple/multiple-build.js | 20 ++++++++++++++++----
multiple/assets/favicon/ZXZNfavicon.ico | 0
multiple/assets/logo/BTYXLogo.png | 0
public/favicon.ico | 0
src/assets/logo/logo.png | 0
multiple/assets/favicon/BTYXfavicon.ico | 0
8 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/multiple/assets/favicon/BTYXfavicon.ico b/multiple/assets/favicon/BTYXfavicon.ico
new file mode 100644
index 0000000..8da0f2a
--- /dev/null
+++ b/multiple/assets/favicon/BTYXfavicon.ico
Binary files differ
diff --git a/multiple/assets/favicon/ZXZNfavicon.ico b/multiple/assets/favicon/ZXZNfavicon.ico
new file mode 100644
index 0000000..73bc9dd
--- /dev/null
+++ b/multiple/assets/favicon/ZXZNfavicon.ico
Binary files differ
diff --git a/multiple/assets/logo/BTYXLogo.png b/multiple/assets/logo/BTYXLogo.png
new file mode 100644
index 0000000..0890259
--- /dev/null
+++ b/multiple/assets/logo/BTYXLogo.png
Binary files differ
diff --git a/multiple/assets/logo/ZXZNLogo.png b/multiple/assets/logo/ZXZNLogo.png
new file mode 100644
index 0000000..83df55b
--- /dev/null
+++ b/multiple/assets/logo/ZXZNLogo.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
index a2586e5..e6d47ef 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -42,6 +42,24 @@
"logo": "logo/DZZBLogo.png",
"favicon": "favicon/DZZBfavicon.ico"
},
+ "BTYX": {
+ "env": {
+ "VITE_APP_TITLE": "娌冲崡甯お浼橀�夎繘鍑哄彛鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://127.0.0.1:9001",
+ "VITE_JAVA_API": "http://127.0.0.1:9000"
+ },
+ "logo": "logo/BTYXLogo.png",
+ "favicon": "favicon/BTYXfavicon.ico"
+ },
+ "ZXZN": {
+ "env": {
+ "VITE_APP_TITLE": "娌冲崡鏅鸿姱鏅鸿兘鏈哄櫒浜烘湁闄愬叕鍙�",
+ "VITE_BASE_API": "http://127.0.0.1:9001",
+ "VITE_JAVA_API": "http://127.0.0.1:9000"
+ },
+ "logo": "logo/ZXZNLogo.png",
+ "favicon": "favicon/ZXZNfavicon.ico"
+ },
"logo": "/src/assets/logo/logo.png",
"favicon": "/public/favicon.ico"
}
diff --git a/multiple/multiple-build.js b/multiple/multiple-build.js
index 8e078e1..d87b333 100644
--- a/multiple/multiple-build.js
+++ b/multiple/multiple-build.js
@@ -24,6 +24,19 @@
const envFilePath = path.join(process.cwd(), '.env.production.local');
+async function copyFileWithOverwrite(src, dest) {
+ await fs.mkdir(path.dirname(dest), { recursive: true });
+ if (fsSync.existsSync(dest)) {
+ try {
+ await fs.chmod(dest, 0o666);
+ } catch {
+ // Ignore chmod failure and try delete directly.
+ }
+ await fs.rm(dest, { force: true });
+ }
+ await fs.copyFile(src, dest);
+}
+
try {
// 1锔忊儯 鐢熸垚 .env
console.log("=======鐢熸垚.env=======");
@@ -41,9 +54,8 @@
const backupFile = path.join(replacePath, config[key]);
const replaceFile = path.join(resourcePath, companyMap[key]);
- await fs.mkdir(path.dirname(backupFile), { recursive: true });
- await fs.copyFile(originFile, backupFile);
- await fs.copyFile(replaceFile, originFile);
+ await copyFileWithOverwrite(originFile, backupFile);
+ await copyFileWithOverwrite(replaceFile, originFile);
}
console.log("=====寮�濮嬫墦鍖�======");
@@ -66,7 +78,7 @@
const originFile = path.join(rootPath, config[key]);
const backupFile = path.join(replacePath, config[key]);
- await fs.copyFile(backupFile, originFile);
+ await copyFileWithOverwrite(backupFile, originFile);
}
await fs.rm(replacePath, { recursive: true, force: true });
console.log(`馃棏锔� 宸插垹闄� ${replacePath}`);
diff --git a/public/favicon.ico b/public/favicon.ico
index e263760..2fa05d5 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 91a5896..a5831b8 100644
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
Binary files differ
--
Gitblit v1.9.3