From 97bd3657f412f9bdad309ef8a5631153f0d1e132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 25 Oct 2024 14:23:02 +0800
Subject: [PATCH] 'commit'

---
 src/main/java/com/dsideal/base/BaseApplication.java | 5 ++---
 src/main/resources/application_dev.yaml             | 4 ++--
 src/main/resources/undertow_dev.properties          | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dsideal/base/BaseApplication.java b/src/main/java/com/dsideal/base/BaseApplication.java
index f84ded6f..85476da3 100644
--- a/src/main/java/com/dsideal/base/BaseApplication.java
+++ b/src/main/java/com/dsideal/base/BaseApplication.java
@@ -113,11 +113,10 @@ public class BaseApplication extends JFinalConfig {
     public void configPlugin(Plugins me) {
         HikariCpPlugin plugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
                 PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
-
+        me.add(plugin);
         // 配置ActiveRecord插件
-        ActiveRecordPlugin arp = new ActiveRecordPlugin("master", plugin);
+        ActiveRecordPlugin arp = new ActiveRecordPlugin(plugin);
         arp.setDialect(new MysqlDialect());
-
         //遍历sql目录下所有的sql文件
         File sqlDir;
         String basePath = PathKit.getRootClassPath();
diff --git a/src/main/resources/application_dev.yaml b/src/main/resources/application_dev.yaml
index fafd6f22..a68a6105 100644
--- a/src/main/resources/application_dev.yaml
+++ b/src/main/resources/application_dev.yaml
@@ -9,8 +9,8 @@ mysql:
   # 数据库信息
   driverClassName: com.mysql.cj.jdbc.Driver
   user: root
-  password: DsideaL147258369
-  jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+  password: Password123@mysql
+  jdbcUrl : jdbc:mysql://10.10.14.203:3306/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
 
 
 redis:
diff --git a/src/main/resources/undertow_dev.properties b/src/main/resources/undertow_dev.properties
index 94ee53c9..31cbae7a 100644
--- a/src/main/resources/undertow_dev.properties
+++ b/src/main/resources/undertow_dev.properties
@@ -1,6 +1,6 @@
 # true 值支持热加载
 undertow.devMode=true
-undertow.port=8001
+undertow.port=9000
 undertow.host=0.0.0.0
 #undertow.resourcePath =/root/dsBase/WebRoot,classpath:static
 undertow.resourcePath =D:/dsWork/YunNanDsBase/WebRoot,classpath:static