From 1d2933b4209f891d7dbd431ba44577c7d5e5eef4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 11:40:18 +0800
Subject: [PATCH] yys 配置文件修改
---
ruoyi-admin/src/main/resources/application-rzny.yml | 34 +++-
.gitignore | 3
ruoyi-admin/src/main/resources/application-jlsn.yml | 34 +++-
ruoyi-admin/src/main/resources/application-jsyny.yml | 35 ++++-
ruoyi-admin/src/main/resources/application.yml | 21 --
Dockerfile | 8
ruoyi-admin/src/main/resources/application-jlmy.yml | 29 +++
ruoyi-admin/src/main/resources/application-tjxm.yml | 35 ++++-
ruoyi-admin/src/main/resources/application-cjny.yml | 34 +++-
ruoyi-admin/src/main/resources/application-jsmy.yml | 34 +++-
ruoyi-admin/src/main/resources/application-druid.yml | 27 +++
ruoyi-admin/src/main/resources/application-xyhb.yml | 35 ++++-
ruoyi-admin/src/main/resources/logback.xml | 0
ruoyi-admin/src/main/resources/application-bhmy.yml | 35 ++++-
ruoyi-admin/src/main/resources/application-hbxm.yml | 34 +++-
15 files changed, 302 insertions(+), 96 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6503723..a10a5a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,5 +47,4 @@
!*/build/*.xml
-*.yml
-ruoyi-admin/src/main/resources/*.xml
+
diff --git a/Dockerfile b/Dockerfile
index 3a57541..6ba6764 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
ARG GIT_USER
ARG GIT_PASS
ARG GIT_REPO=http://114.132.189.42:9002/r/zd-after.git
-ARG GIT_BRANCH=master
+ARG GIT_BRANCH=pim-jlmy
# 鍏嬮殕绉佹湁浠撳簱鎸囧畾鍒嗘敮
RUN git clone -b ${GIT_BRANCH} http://${GIT_USER}:${GIT_PASS}@114.132.189.42:9002/r/zd-after.git zd-after
@@ -24,8 +24,8 @@
RUN cp ruoyi-admin/src/main/resources/application.yml.example \
ruoyi-admin/src/main/resources/application.yml
-RUN cp ruoyi-admin/src/main/resources/application-docker.yml.example \
- ruoyi-admin/src/main/resources/application-docker.yml
+RUN cp ruoyi-admin/src/main/resources/application-druid.yml.example \
+ ruoyi-admin/src/main/resources/application-druid.yml
RUN cp ruoyi-admin/src/main/resources/logback.xml.example \
ruoyi-admin/src/main/resources/logback.xml
@@ -44,7 +44,7 @@
RUN chmod 644 /app/app.jar
# 鏆撮湶绔彛锛堥粯璁� 8080锛屽彲鍦� application.yml 閲岄厤缃級
-EXPOSE 7016
+EXPOSE 8097
# 鍚姩鍛戒护
ENTRYPOINT ["java", "-jar", "/app/app.jar"]
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-bhmy.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-bhmy.yml
index d2d70d4..a329afa 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-bhmy.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9072
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-bhmy
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,15 +87,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 8
# 瀵嗙爜
- # password: root2022!
- # password: 123456
password:
+ # password: 123456
+# password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -108,3 +126,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-cjny.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-cjny.yml
index d2d70d4..cf2ea26 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-cjny.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9040
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-cjny
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,14 +87,13 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 6
# 瀵嗙爜
- # password: root2022!
- # password: 123456
+# password: root2022!
password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -108,3 +125,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-druid.yml
similarity index 83%
rename from ruoyi-admin/src/main/resources/application-druid.yml.example
rename to ruoyi-admin/src/main/resources/application-druid.yml
index d2d70d4..c41da97 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 8080
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-demo
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -108,3 +126,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-hbxm.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-hbxm.yml
index d2d70d4..eee8321 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-hbxm.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9080
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-hbxm
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,14 +87,13 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 12
# 瀵嗙爜
- # password: root2022!
- # password: 123456
+# password: root2022!
password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -108,3 +125,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-jlmy.yml
similarity index 83%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-jlmy.yml
index d2d70d4..829767c 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-jlmy.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 8097
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,7 +29,7 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
+ url: jdbc:postgresql://172.17.0.1:5432/zd_production-jlmy
username: postgres
password: bYD#nM+-BiLb
# 浠庡簱鏁版嵁婧�
@@ -69,15 +87,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- # password: root2022!
+ password: root2022!
# password: 123456
- password:
+# password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -108,3 +126,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-jlsn.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-jlsn.yml
index d2d70d4..ca3c735 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-jlsn.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9084
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-jlsn
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,14 +87,13 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 13
# 瀵嗙爜
- # password: root2022!
- # password: 123456
+# password: root2022!
password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -108,3 +125,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-jsmy.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-jsmy.yml
index d2d70d4..037ec8a 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-jsmy.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9044
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-jsmy
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,14 +87,13 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 7
# 瀵嗙爜
- # password: root2022!
- # password: 123456
+# password: root2022!
password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -108,3 +125,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-jsyny.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-jsyny.yml
index d2d70d4..1e2814a 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-jsyny.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9076
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-jsyny
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,15 +87,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 9
# 瀵嗙爜
- # password: root2022!
- # password: 123456
password:
+ # password: 123456
+# password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -108,3 +126,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-rzny.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-rzny.yml
index d2d70d4..53e648e 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-rzny.yml
@@ -1,3 +1,20 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9060
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +28,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-rzny
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,15 +86,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 7
# 瀵嗙爜
- # password: root2022!
- # password: 123456
password:
+ # password: 123456
+# password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -108,3 +125,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-tjxm.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-tjxm.yml
index d2d70d4..4e54b1e 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-tjxm.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9066
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-tjxm
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,15 +87,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 7
# 瀵嗙爜
- # password: root2022!
- # password: 123456
password:
+ # password: 123456
+# password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -108,3 +126,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-xyhb.yml
similarity index 81%
copy from ruoyi-admin/src/main/resources/application-druid.yml.example
copy to ruoyi-admin/src/main/resources/application-xyhb.yml
index d2d70d4..93a3600 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-xyhb.yml
@@ -1,3 +1,21 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 9054
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -11,9 +29,9 @@
# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# pg
# url: jdbc:postgresql://localhost:5433/ruoyi-zd
- url: jdbc:postgresql://114.132.189.42:5432/zd_production-demo
- username: postgres
- password: bYD#nM+-BiLb
+ url: jdbc:postgresql://192.168.1.185:5432/zd_production-xyhb
+ username: root
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -69,15 +87,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 3
# 瀵嗙爜
- # password: root2022!
- # password: 123456
password:
+ # password: 123456
+# password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -108,3 +126,6 @@
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml.example b/ruoyi-admin/src/main/resources/application.yml
similarity index 82%
rename from ruoyi-admin/src/main/resources/application.yml.example
rename to ruoyi-admin/src/main/resources/application.yml
index 33a33b1..2eeb3bc 100644
--- a/ruoyi-admin/src/main/resources/application.yml.example
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -13,23 +13,7 @@
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
captchaType: math
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7016
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
+
# 鏃ュ織閰嶇疆
logging:
@@ -138,6 +122,3 @@
excludes: /system/notice
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-file:
- temp-dir: D:/Backup/妗岄潰/download/temp/uploads
- upload-dir: D:/Backup/妗岄潰/download/prod/uploads
diff --git a/ruoyi-admin/src/main/resources/logback.xml.example b/ruoyi-admin/src/main/resources/logback.xml
similarity index 100%
rename from ruoyi-admin/src/main/resources/logback.xml.example
rename to ruoyi-admin/src/main/resources/logback.xml
--
Gitblit v1.9.3