From a8d571b2c1b4881bff496f14e9d07ad1dc556f90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:12:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
index ed27552..f2bfae5 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
@@ -13,17 +13,17 @@
@Data
@Component
public class DatasourceModel {
- private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+ private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
private String username = "root";
- private String password = "root";
+ private String password = "HaiTun@2024!";
private String driverClassName = "com.mysql.cj.jdbc.Driver";
private Integer maxActive =20;
private Long maxWait = 60000L;
private Integer minIdle =5;
private Integer initialSize =2;
-// private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+// private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
// private String username = "root";
-// private String password = "HaiTunEnglish2024!";
+// private String password = "root";
// private String driverClassName = "com.mysql.cj.jdbc.Driver";
// private Integer maxActive =20;
// private Long maxWait = 60000L;
--
Gitblit v1.7.1