From a2077e70da78d28089c40ad65291885aad58b857 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期五, 03 四月 2026 09:48:49 +0800
Subject: [PATCH] feat: 新增数采数据源、储丝三方视图数据源；配置测试三数据源；区分开发、生产环境
---
RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-prod.yml | 41 +++++++++++++++++++++++------------------
RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml | 13 ++++++++++---
2 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml
index d63a6d8..619e6b3 100755
--- a/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@
master:
type: ${spring.datasource.type}
driverClassName: org.postgresql.Driver
- url: jdbc:postgresql://192.168.2.26:5432/postgres?currentSchema=public&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+ url: jdbc:postgresql://127.0.0.1:5433/postgres?currentSchema=public&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
username: postgres
password: 123456
# master:
@@ -64,10 +64,17 @@
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username:
# password:
- oracle:
+ oracle_zs:
+ lazy: true
type: ${spring.datasource.type}
driverClassName: oracle.jdbc.OracleDriver
- url: jdbc:oracle:thin:@192.168.2.26:1521:orcl
+ url: jdbc:oracle:thin:@127.0.0.1:1521:xe
+ username: appusr
+ password: lanbaoit
+ oracle_sc:
+ type: ${spring.datasource.type}
+ driverClassName: oracle.jdbc.OracleDriver
+ url: jdbc:oracle:thin:@127.0.0.1:1521:xe
username: gfsc
password: lbit
# postgres:
diff --git a/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-prod.yml b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-prod.yml
index d77ddf5..7866fae 100755
--- a/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-prod.yml
@@ -4,7 +4,7 @@
--- # 鐩戞帶涓績閰嶇疆
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
- enabled: true
+ enabled: false
url: http://localhost:9090/admin
instance:
service-host-type: IP
@@ -16,7 +16,7 @@
--- # snail-job 閰嶇疆
snail-job:
- enabled: true
+ enabled: false
# 闇�瑕佸湪 SnailJob 鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝ｇ‘鍒嗘淳浠诲姟
group: "ruoyi_group"
# SnailJob 鎺ュ叆楠岃瘉浠ょ墝 璇﹁ script/sql/ry_job.sql `sj_group_config`琛�
@@ -47,12 +47,10 @@
# 涓诲簱鏁版嵁婧�
master:
type: ${spring.datasource.type}
- driverClassName: com.mysql.cj.jdbc.Driver
- # jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562
- # rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
- username: root
- password: root
+ driverClassName: org.postgresql.Driver
+ url: jdbc:postgresql://10.39.186.6:5432/postgres?currentSchema=public&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+ username: postgres
+ password: 123456
# # 浠庡簱鏁版嵁婧�
# slave:
# lazy: true
@@ -61,12 +59,19 @@
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username:
# password:
-# oracle:
-# type: ${spring.datasource.type}
-# driverClassName: oracle.jdbc.OracleDriver
-# url: jdbc:oracle:thin:@//localhost:1521/XE
-# username: ROOT
-# password: root
+ oracle_zs:
+ type: ${spring.datasource.type}
+ driverClassName: oracle.jdbc.OracleDriver
+ url: jdbc:oracle:thin:@10.39.185.2:1521:orcl
+ username: aerotop
+ password: aerotop
+ oracle_sc:
+ lazy: true
+ type: ${spring.datasource.type}
+ driverClassName: oracle.jdbc.OracleDriver
+ url: jdbc:oracle:thin:@10.39.186.5:1521:orcl
+ username: gfsc
+ password: lbit
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver
@@ -99,13 +104,13 @@
spring.data:
redis:
# 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
+ host: 10.39.186.3
+ # 绔彛锛岄粯璁や负6677
+ port: 6677
# 鏁版嵁搴撶储寮�
database: 0
# redis 瀵嗙爜蹇呴』閰嶇疆
- password: ruoyi123
+ # password: ruoyi123
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
--
Gitblit v1.9.3