From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'
---
ruoyi-admin/src/main/resources/application-dev.yml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 44530d4..66a63e7 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -25,10 +25,9 @@
master:
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://43.139.70.230:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
- username: ruoyi-ai
- password: ruoyi-ai
-
+ url: jdbc:mysql://43.139.70.230:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+ username: ry-vue
+ password: xx
hikari:
# 鏈�澶ц繛鎺ユ睜鏁伴噺
@@ -61,9 +60,6 @@
# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10S
- # 鏄惁寮�鍚痵sl
- ssl: false
-
redisson:
# redis key鍓嶇紑
keyPrefix:
@@ -97,3 +93,4 @@
signName: 娴嬭瘯
# 鑵捐涓撶敤
sdkAppId:
+
--
Gitblit v1.9.3