From 373244688c435c149f34b29fed625926369567ea Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 12 九月 2025 14:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_script' into dev
---
multiple/assets/favicon/HHKJIco.ico | 0
multiple/config.json | 32 ++++++++++
multiple/assets/favicon/ZQHXico.ico | 0
multiple/assets/logo/XYHBLogo.png | 0
multiple/assets/favicon/TJXM.ico | 0
multiple/assets/logo/RZNYLogo.png | 0
multiple/assets/screen/XYHBView.png | 0
multiple/assets/logo/DHDCLogo.png | 0
multiple/assets/favicon/RZNY.ico | 0
multiple/assets/logo/BHMYLogo.png | 0
multiple/assets/logo/新缆（江苏）数字科技有限公司.png | 0
multiple/assets/favicon/DHDCico.ico | 0
multiple/assets/favicon/WDSYico.ico | 0
multiple/assets/favicon/favicon.ico | 0
multiple/assets/logo/logo.png | 0
src/layout/components/Sidebar/Logo.vue | 2
index.html | 4
multiple/assets/screen/RZNYView.png | 0
multiple/assets/favicon/MXSCIco.ico | 0
multiple/assets/screen/HYSNView.png | 0
multiple/assets/logo/ZQHXLogo.png | 0
multiple/assets/logo/LCLogo.png | 0
vite.config.js | 14 +++-
multiple/assets/logo/MXSCLogo.png | 0
multiple/assets/logo/南通云从工业互联网有限公司.png | 0
multiple/multiple-build.js | 86 ++++++++++++++++++++++++++++
multiple/assets/logo/HHKJLogo.png | 0
multiple/assets/logo/WDSYLogo.png | 0
src/assets/indexViews/login-background.png | 0
multiple/assets/favicon/XYHBico.ico | 0
multiple/assets/screen/ZQHXView.png | 0
multiple/assets/logo/HYSNLogo.png | 0
multiple/assets/favicon/HYSNico.ico | 0
multiple/assets/logo/JZYJLogo.png | 0
README.md | 1
multiple/assets/logo/TJXMLogo.png | 0
multiple/assets/screen/MXSCBack.png | 0
multiple/assets/screen/TJXMView.png | 0
src/views/login.vue | 2
multiple/assets/favicon/BHMY.ico | 0
src/main.js | 2
multiple/assets/logo/芯导软件（江苏）有限公司.png | 0
multiple/assets/screen/HHKJView.png | 0
multiple/assets/screen/WDSYView.png | 0
package.json | 4
multiple/assets/favicon/JZYJico.ico | 0
multiple/assets/screen/JZYJView.png | 0
multiple/assets/screen/DHDCView.png | 0
48 files changed, 136 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 2387eaf..073e101 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@
# 鏋勫缓娴嬭瘯鐜 yarn build:stage
# 鏋勫缓鐢熶骇鐜 yarn build:prod
+# 鏋勫缓鐢熶骇鐜 yarn build:prod -- --company="AAA"
# 鍓嶇璁块棶鍦板潃 http://localhost:80
```
diff --git a/index.html b/index.html
index d14eb4b..a684690 100644
--- a/index.html
+++ b/index.html
@@ -8,8 +8,8 @@
name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
/>
- <link rel="icon" href="/ZQHXico.ico" />
- <title>娴嬭瘯杩涢攢瀛樼鐞嗙郴缁�</title>
+ <link rel="icon" href="/favicon.ico" />
+ <title>%VITE_APP_TITLE%</title>
<!--[if lt IE 11
]><script>
window.location.href = "/html/ie.html";
diff --git a/multiple/assets/favicon/BHMY.ico b/multiple/assets/favicon/BHMY.ico
new file mode 100644
index 0000000..868632b
--- /dev/null
+++ b/multiple/assets/favicon/BHMY.ico
Binary files differ
diff --git a/public/DHDCico.ico b/multiple/assets/favicon/DHDCico.ico
similarity index 100%
rename from public/DHDCico.ico
rename to multiple/assets/favicon/DHDCico.ico
Binary files differ
diff --git a/public/HHKJIco.ico b/multiple/assets/favicon/HHKJIco.ico
similarity index 100%
rename from public/HHKJIco.ico
rename to multiple/assets/favicon/HHKJIco.ico
Binary files differ
diff --git a/public/HYSNico.ico b/multiple/assets/favicon/HYSNico.ico
similarity index 100%
rename from public/HYSNico.ico
rename to multiple/assets/favicon/HYSNico.ico
Binary files differ
diff --git a/public/JZYJico.ico b/multiple/assets/favicon/JZYJico.ico
similarity index 100%
rename from public/JZYJico.ico
rename to multiple/assets/favicon/JZYJico.ico
Binary files differ
diff --git a/public/MXSCIco.ico b/multiple/assets/favicon/MXSCIco.ico
similarity index 100%
rename from public/MXSCIco.ico
rename to multiple/assets/favicon/MXSCIco.ico
Binary files differ
diff --git a/public/RZNY.ico b/multiple/assets/favicon/RZNY.ico
similarity index 100%
rename from public/RZNY.ico
rename to multiple/assets/favicon/RZNY.ico
Binary files differ
diff --git a/public/TJXM.ico b/multiple/assets/favicon/TJXM.ico
similarity index 100%
rename from public/TJXM.ico
rename to multiple/assets/favicon/TJXM.ico
Binary files differ
diff --git a/public/WDSYico.ico b/multiple/assets/favicon/WDSYico.ico
similarity index 100%
rename from public/WDSYico.ico
rename to multiple/assets/favicon/WDSYico.ico
Binary files differ
diff --git a/public/XYHBico.ico b/multiple/assets/favicon/XYHBico.ico
similarity index 100%
rename from public/XYHBico.ico
rename to multiple/assets/favicon/XYHBico.ico
Binary files differ
diff --git a/public/ZQHXico.ico b/multiple/assets/favicon/ZQHXico.ico
similarity index 100%
rename from public/ZQHXico.ico
rename to multiple/assets/favicon/ZQHXico.ico
Binary files differ
diff --git a/multiple/assets/favicon/favicon.ico b/multiple/assets/favicon/favicon.ico
new file mode 100644
index 0000000..e263760
--- /dev/null
+++ b/multiple/assets/favicon/favicon.ico
Binary files differ
diff --git a/multiple/assets/logo/BHMYLogo.png b/multiple/assets/logo/BHMYLogo.png
new file mode 100644
index 0000000..f0e779c
--- /dev/null
+++ b/multiple/assets/logo/BHMYLogo.png
Binary files differ
diff --git a/src/assets/indexViews/DHDCLogo.png b/multiple/assets/logo/DHDCLogo.png
similarity index 100%
rename from src/assets/indexViews/DHDCLogo.png
rename to multiple/assets/logo/DHDCLogo.png
Binary files differ
diff --git a/src/assets/indexViews/HHKJLogo.png b/multiple/assets/logo/HHKJLogo.png
similarity index 100%
rename from src/assets/indexViews/HHKJLogo.png
rename to multiple/assets/logo/HHKJLogo.png
Binary files differ
diff --git a/public/HYSNico.ico b/multiple/assets/logo/HYSNLogo.png
similarity index 100%
copy from public/HYSNico.ico
copy to multiple/assets/logo/HYSNLogo.png
Binary files differ
diff --git a/src/assets/indexViews/JZYJLogo.png b/multiple/assets/logo/JZYJLogo.png
similarity index 100%
rename from src/assets/indexViews/JZYJLogo.png
rename to multiple/assets/logo/JZYJLogo.png
Binary files differ
diff --git a/multiple/assets/logo/LCLogo.png b/multiple/assets/logo/LCLogo.png
new file mode 100644
index 0000000..d18f9fd
--- /dev/null
+++ b/multiple/assets/logo/LCLogo.png
Binary files differ
diff --git a/src/assets/indexViews/MXSCLogo.png b/multiple/assets/logo/MXSCLogo.png
similarity index 100%
rename from src/assets/indexViews/MXSCLogo.png
rename to multiple/assets/logo/MXSCLogo.png
Binary files differ
diff --git a/src/assets/indexViews/RZNYLogo.png b/multiple/assets/logo/RZNYLogo.png
similarity index 100%
rename from src/assets/indexViews/RZNYLogo.png
rename to multiple/assets/logo/RZNYLogo.png
Binary files differ
diff --git a/src/assets/indexViews/TJXMLogo.png b/multiple/assets/logo/TJXMLogo.png
similarity index 100%
rename from src/assets/indexViews/TJXMLogo.png
rename to multiple/assets/logo/TJXMLogo.png
Binary files differ
diff --git a/src/assets/indexViews/WDSYLogo.png b/multiple/assets/logo/WDSYLogo.png
similarity index 100%
rename from src/assets/indexViews/WDSYLogo.png
rename to multiple/assets/logo/WDSYLogo.png
Binary files differ
diff --git a/src/assets/indexViews/XYHBLogo.png b/multiple/assets/logo/XYHBLogo.png
similarity index 100%
rename from src/assets/indexViews/XYHBLogo.png
rename to multiple/assets/logo/XYHBLogo.png
Binary files differ
diff --git a/src/assets/indexViews/ZQHXLogo.png b/multiple/assets/logo/ZQHXLogo.png
similarity index 100%
rename from src/assets/indexViews/ZQHXLogo.png
rename to multiple/assets/logo/ZQHXLogo.png
Binary files differ
diff --git a/multiple/assets/logo/logo.png b/multiple/assets/logo/logo.png
new file mode 100644
index 0000000..e263760
--- /dev/null
+++ b/multiple/assets/logo/logo.png
Binary files differ
diff --git "a/multiple/assets/logo/\345\215\227\351\200\232\344\272\221\344\273\216\345\267\245\344\270\232\344\272\222\350\201\224\347\275\221\346\234\211\351\231\220\345\205\254\345\217\270.png" "b/multiple/assets/logo/\345\215\227\351\200\232\344\272\221\344\273\216\345\267\245\344\270\232\344\272\222\350\201\224\347\275\221\346\234\211\351\231\220\345\205\254\345\217\270.png"
new file mode 100644
index 0000000..d7ecf59
--- /dev/null
+++ "b/multiple/assets/logo/\345\215\227\351\200\232\344\272\221\344\273\216\345\267\245\344\270\232\344\272\222\350\201\224\347\275\221\346\234\211\351\231\220\345\205\254\345\217\270.png"
Binary files differ
diff --git "a/multiple/assets/logo/\346\226\260\347\274\206\357\274\210\346\261\237\350\213\217\357\274\211\346\225\260\345\255\227\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270.png" "b/multiple/assets/logo/\346\226\260\347\274\206\357\274\210\346\261\237\350\213\217\357\274\211\346\225\260\345\255\227\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270.png"
new file mode 100644
index 0000000..4481de2
--- /dev/null
+++ "b/multiple/assets/logo/\346\226\260\347\274\206\357\274\210\346\261\237\350\213\217\357\274\211\346\225\260\345\255\227\347\247\221\346\212\200\346\234\211\351\231\220\345\205\254\345\217\270.png"
Binary files differ
diff --git "a/multiple/assets/logo/\350\212\257\345\257\274\350\275\257\344\273\266\357\274\210\346\261\237\350\213\217\357\274\211\346\234\211\351\231\220\345\205\254\345\217\270.png" "b/multiple/assets/logo/\350\212\257\345\257\274\350\275\257\344\273\266\357\274\210\346\261\237\350\213\217\357\274\211\346\234\211\351\231\220\345\205\254\345\217\270.png"
new file mode 100644
index 0000000..5b49e96
--- /dev/null
+++ "b/multiple/assets/logo/\350\212\257\345\257\274\350\275\257\344\273\266\357\274\210\346\261\237\350\213\217\357\274\211\346\234\211\351\231\220\345\205\254\345\217\270.png"
Binary files differ
diff --git a/src/assets/indexViews/DHDCView.png b/multiple/assets/screen/DHDCView.png
similarity index 100%
rename from src/assets/indexViews/DHDCView.png
rename to multiple/assets/screen/DHDCView.png
Binary files differ
diff --git a/src/assets/indexViews/HHKJView.png b/multiple/assets/screen/HHKJView.png
similarity index 100%
rename from src/assets/indexViews/HHKJView.png
rename to multiple/assets/screen/HHKJView.png
Binary files differ
diff --git a/src/assets/indexViews/HYSNView.png b/multiple/assets/screen/HYSNView.png
similarity index 100%
rename from src/assets/indexViews/HYSNView.png
rename to multiple/assets/screen/HYSNView.png
Binary files differ
diff --git a/src/assets/indexViews/JZYJView.png b/multiple/assets/screen/JZYJView.png
similarity index 100%
rename from src/assets/indexViews/JZYJView.png
rename to multiple/assets/screen/JZYJView.png
Binary files differ
diff --git a/src/assets/indexViews/MXSCBack.png b/multiple/assets/screen/MXSCBack.png
similarity index 100%
rename from src/assets/indexViews/MXSCBack.png
rename to multiple/assets/screen/MXSCBack.png
Binary files differ
diff --git a/src/assets/indexViews/RZNYView.png b/multiple/assets/screen/RZNYView.png
similarity index 100%
rename from src/assets/indexViews/RZNYView.png
rename to multiple/assets/screen/RZNYView.png
Binary files differ
diff --git a/src/assets/indexViews/TJXMView.png b/multiple/assets/screen/TJXMView.png
similarity index 100%
rename from src/assets/indexViews/TJXMView.png
rename to multiple/assets/screen/TJXMView.png
Binary files differ
diff --git a/src/assets/indexViews/WDSYView.png b/multiple/assets/screen/WDSYView.png
similarity index 100%
rename from src/assets/indexViews/WDSYView.png
rename to multiple/assets/screen/WDSYView.png
Binary files differ
diff --git a/src/assets/indexViews/XYHBView.png b/multiple/assets/screen/XYHBView.png
similarity index 100%
rename from src/assets/indexViews/XYHBView.png
rename to multiple/assets/screen/XYHBView.png
Binary files differ
diff --git a/src/assets/indexViews/ZQHXView.png b/multiple/assets/screen/ZQHXView.png
similarity index 100%
rename from src/assets/indexViews/ZQHXView.png
rename to multiple/assets/screen/ZQHXView.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
new file mode 100644
index 0000000..8fe582e
--- /dev/null
+++ b/multiple/config.json
@@ -0,0 +1,32 @@
+{
+ "default": {
+ "env": {
+ "VITE_APP_TITLE": "鑺浜戯紙绠＄悊淇℃伅绯荤粺锛�"
+ },
+ "screen": "screen/JZYJView.png",
+ "logo": "logo/HYSNLogo.png",
+ "favicon": "favicon/HYSNico.ico"
+ },
+ "TEST": {
+ "env": {
+ "VITE_APP_TITLE": "涓皬浼佷笟鏁板瓧鍖栬浆鍨嬩簩绾у椁愬寘",
+ "VITE_BASE_API": "http://114.132.189.42:9036",
+ "VITE_JAVA_API": "http://114.132.189.42:9037"
+ },
+ "screen": "screen/HYSNView.png",
+ "logo": "logo/LCLogo.png",
+ "favicon": "favicon/BHMY.ico"
+ },
+ "BBB": {
+ "env": {
+ "VITE_APP_TITLE": "闈栬竟鍘夸腑寮烘亽鍏寸幆淇濈鎶�鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://127.0.0.1:9036"
+ },
+ "screen": "screen/ZQHXView.png",
+ "logo": "logo/鏂扮紗锛堟睙鑻忥級鏁板瓧绉戞妧鏈夐檺鍏徃.png",
+ "favicon": "favicon/HYSNico.ico"
+ },
+ "screen": "/src/assets/images/login-background.png",
+ "logo": "/src/assets/logo/logo.png",
+ "favicon": "/public/favicon.ico"
+}
diff --git a/multiple/multiple-build.js b/multiple/multiple-build.js
new file mode 100644
index 0000000..8e078e1
--- /dev/null
+++ b/multiple/multiple-build.js
@@ -0,0 +1,86 @@
+import fs from 'fs/promises';
+import fsSync from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { execSync } from "child_process";
+
+// 鑾峰彇 __dirname
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// 璇诲彇 JSON 閰嶇疆
+const data = await fs.readFile(path.join(__dirname, 'config.json'), 'utf-8');
+const config = JSON.parse(data);
+
+// 椤圭洰璺緞
+const rootPath = path.resolve(__dirname, '..');
+const resourcePath = path.join(rootPath, 'multiple', 'assets');
+const replacePath = path.join(rootPath, 'replace');
+
+// 鑾峰彇鍛戒护琛屽弬鏁�
+const params = parseArgs(process.argv);
+const company = params["company"] ?? "default";
+const companyMap = config[company];
+
+const envFilePath = path.join(process.cwd(), '.env.production.local');
+
+try {
+ // 1锔忊儯 鐢熸垚 .env
+ console.log("=======鐢熸垚.env=======");
+ const envContent = Object.entries(companyMap.env)
+ .map(([key, value]) => `${key}='${value}'`)
+ .join('\n') + '\n';
+ await fs.writeFile(envFilePath, envContent, 'utf-8');
+
+ // 2锔忊儯 澶囦唤鍘熷璧勬簮骞舵浛鎹�
+ console.log("=======淇敼璧勬簮=======");
+ for (const [key, value] of Object.entries(companyMap)) {
+ if (key === 'env') continue;
+
+ const originFile = path.join(rootPath, config[key]);
+ 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);
+ }
+
+ console.log("=====寮�濮嬫墦鍖�======");
+ execSync("vite build", { stdio: "inherit" });
+ console.log("=====鎵撳寘瀹屾垚======");
+} finally {
+ console.log("=====鎭㈠璧勬簮======");
+
+ // 鍒犻櫎涓存椂 .env 鏂囦欢
+ if (fsSync.existsSync(envFilePath)) {
+ await fs.unlink(envFilePath);
+ console.log(`馃棏锔� 宸插垹闄� ${envFilePath}`);
+ }
+
+ // 鎭㈠璧勬簮鏂囦欢
+ if (fsSync.existsSync(replacePath)) {
+ for (const [key, value] of Object.entries(companyMap)) {
+ if (key === 'env') continue;
+
+ const originFile = path.join(rootPath, config[key]);
+ const backupFile = path.join(replacePath, config[key]);
+
+ await fs.copyFile(backupFile, originFile);
+ }
+ await fs.rm(replacePath, { recursive: true, force: true });
+ console.log(`馃棏锔� 宸插垹闄� ${replacePath}`);
+ }
+}
+
+// 绠�鍗曞懡浠よ鍙傛暟瑙ｆ瀽
+function parseArgs(argv) {
+ const params = {};
+ for (const arg of argv.slice(2)) {
+ if (arg.startsWith('--')) {
+ const [key, value] = arg.slice(2).split('=');
+ params[key] = value ?? true;
+ }
+ }
+ return params;
+}
diff --git a/package.json b/package.json
index 9f1dc17..b57034d 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
{
"name": "ruoyi",
"version": "3.8.9",
- "description": "娴嬭瘯杩涢攢瀛樼鐞嗙郴缁�",
+ "description": "涓皬浼佷笟鏁板瓧鍖栬浆鍨嬩簩绾у椁愬寘",
"author": "鑻ヤ緷",
"license": "MIT",
"type": "module",
"scripts": {
"dev": "vite",
- "build:prod": "vite build",
+ "build:prod": "node multiple/multiple-build.js",
"build:stage": "vite build --mode staging",
"preview": "vite preview"
},
diff --git a/src/assets/indexViews/login-background.png b/src/assets/indexViews/login-background.png
new file mode 100644
index 0000000..ace9d53
--- /dev/null
+++ b/src/assets/indexViews/login-background.png
Binary files differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index c6aa445..167306d 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -16,7 +16,7 @@
<script setup>
import { ref, computed, onMounted, watch } from 'vue'
import useUserStore from '@/store/modules/user'
-import defaultLogo from '@/assets/indexViews/ZQHXLogo.png' // 瀵煎叆榛樿logo
+import defaultLogo from '@/assets/indexViews/LCLogo.png' // 瀵煎叆榛樿logo
defineProps({
collapse: {
diff --git a/src/main.js b/src/main.js
index da4c54d..abaac2e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -76,7 +76,7 @@
app.config.globalProperties.addDateRange = addDateRange;
app.config.globalProperties.selectDictLabel = selectDictLabel;
app.config.globalProperties.selectDictLabels = selectDictLabels;
-app.config.globalProperties.javaApi = "http://114.132.189.42:9037";
+app.config.globalProperties.javaApi = __BASE_API__;
app.config.globalProperties.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
diff --git a/src/views/login.vue b/src/views/login.vue
index 960f097..5300637 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -181,7 +181,7 @@
<style lang='scss' scoped>
.login {
height: 100%;
- background-image: url("../assets/indexViews/JZYJView.png");
+ background-image: url("../assets/images/login-background.png");
background-size: cover;
position: relative;
}
diff --git a/vite.config.js b/vite.config.js
index b4b6129..540ff94 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,11 +7,17 @@
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"; // 鐢熶骇鐜鍚庣鎺ュ彛
-
+ env.VITE_APP_ENV === "development"
+ ? "http://114.132.189.42:9036"
+ : 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/銆�
--
Gitblit v1.9.3