From aa2b64bd7fd77b065b08fee39521d772c0b39fa4 Mon Sep 17 00:00:00 2001
From: chenhj <chenhj@lunor.cn>
Date: 星期日, 25 五月 2025 00:43:01 +0800
Subject: [PATCH] Merge pull request 'chen' (#8) from chen into master
---
ruoyi-admin/src/main/resources/application-druid.yml.example | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml.example b/ruoyi-admin/src/main/resources/application-druid.yml.example
index bb5cdec..4d78ad4 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml.example
+++ b/ruoyi-admin/src/main/resources/application-druid.yml.example
@@ -2,20 +2,24 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
+# driverClassName: com.mysql.cj.jdbc.Driver # mysql椹卞姩
+ driverClassName: org.postgresql.Driver
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/ry-zd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
+# mysql
+# 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://lunor.cn:5431/ruoyi-java
+ username: test
+ password: chj123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
enabled: false
- url:
- username:
- password:
+ url:
+ username:
+ password:
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -35,7 +39,7 @@
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
maxEvictableIdleTimeMillis: 900000
# 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
+ validationQuery: SELECT VERSION()
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
--
Gitblit v1.9.3