From 455c7520e87f827b9daf3d4ffa89663c2d92408c Mon Sep 17 00:00:00 2001
From: Chenhj <chenhj@tajansoft.com>
Date: 星期六, 24 五月 2025 19:22:13 +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 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml.example
similarity index 91%
rename from ruoyi-admin/src/main/resources/application-druid.yml
rename to ruoyi-admin/src/main/resources/application-druid.yml.example
index 05cd381..46c66f8 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml.example
@@ -6,16 +6,16 @@
         druid:
             # 涓诲簱鏁版嵁婧�
             master:
-                url: jdbc:postgresql://lunor.cn:5431/ruoyi-java
+                url: jdbc:postgresql://lunor.cn:5430/ruoyi-java
                 username: test
                 password: chj123456
             # 浠庡簱鏁版嵁婧�
             slave:
                 # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 鍒濆杩炴帴鏁�
             initialSize: 5
             # 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -35,7 +35,7 @@
             # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
             maxEvictableIdleTimeMillis: 900000
             # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
-            validationQuery: SELECT 1 FROM DUAL
+            validationQuery: SELECT VERSION()
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false

--
Gitblit v1.9.3