From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/main/resources/application-ccwlxt.yml | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/application-dhdc.yml b/src/main/resources/application-ccwlxt.yml
similarity index 90%
copy from src/main/resources/application-dhdc.yml
copy to src/main/resources/application-ccwlxt.yml
index 52fbd62..3579ebf 100644
--- a/src/main/resources/application-dhdc.yml
+++ b/src/main/resources/application-ccwlxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-浠撳偍鐗╂祦绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205971611543404544
+ appSecret: VkyDMDYwMTIwMjYxNzQxNDM2OTItrv
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -7,7 +10,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
+ profile: /center-lims/mis/file
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
@@ -17,7 +20,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9032
+ port: 7003
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -62,9 +65,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.1.8:3306/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: zttZTT123!
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -135,14 +138,14 @@
redis:
# 鍦板潃
# host: 127.0.0.1
- host: 192.168.1.8
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 1
+ database: 0
# 瀵嗙爜
-# password: root2022!
- password:
+ password: zttZTT123!
+# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -188,7 +191,7 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
@@ -215,5 +218,5 @@
allowOverwrite: false
file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
+ temp-dir: /center-lims/mis/file/temp/uploads
+ upload-dir: /center-lims/mis/file/prod/uploads
\ No newline at end of file
--
Gitblit v1.9.3