From 8ed2d18ee769db2c9b1553bef16e2b2f8e996a83 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 29 五月 2025 11:18:39 +0800
Subject: [PATCH] Merge branch 'master' of http://gitea.lunor.cn/java_templates/ruoyi_java into chen
---
ruoyi-admin/src/main/resources/application-druid.yml.example | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml.example
similarity index 83%
rename from ruoyi-admin/src/main/resources/application-druid.yml
rename to ruoyi-admin/src/main/resources/application-druid.yml.example
index 05cd381..4d78ad4 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml.example
@@ -2,10 +2,14 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
+# driverClassName: com.mysql.cj.jdbc.Driver # mysql椹卞姩
driverClassName: org.postgresql.Driver
druid:
# 涓诲簱鏁版嵁婧�
master:
+# 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
@@ -13,9 +17,9 @@
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