diff --git a/config/dev/datasource.yml b/config/dev/datasource.yml
index 7d0989f8..638032c0 100644
--- a/config/dev/datasource.yml
+++ b/config/dev/datasource.yml
@@ -16,7 +16,7 @@ datasource:
spring:
datasource:
- type: com.alibaba.druid.pool.DruidDataSource
+ type: com.zaxxer.hikari.HikariDataSource
# 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
dynamic:
# 性能分析插件(有性能损耗 不建议生产环境使用)
@@ -25,21 +25,21 @@ spring:
seata: true
# 严格模式 匹配不到数据源则报错
strict: true
- druid:
- initial-size: 5
- min-idle: 5
- maxActive: 20
- maxWait: 60000
- timeBetweenEvictionRunsMillis: 60000
- minEvictableIdleTimeMillis: 300000
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- poolPreparedStatements: true
- maxPoolPreparedStatementPerConnectionSize: 20
- filters: stat,slf4j
- connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+ hikari:
+ # 最大连接池数量
+ maxPoolSize: 20
+ # 最小空闲线程数量
+ minIdle: 10
+ # 配置获取连接等待超时的时间
+ connectionTimeout: 10000
+ # 校验超时时间
+ validationTimeout: 5000
+ # 空闲连接存活最大时间，默认10分钟
+ idleTimeout: 60000
+ # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+ maxLifetime: 900000
+ # 连接测试query（配置检测连接是否有效）
+ connectionTestQuery: SELECT 1
# seata配置
seata:
diff --git a/config/dev/ruoyi-gen.yml b/config/dev/ruoyi-gen.yml
index f87dfbaa..fc68e409 100644
--- a/config/dev/ruoyi-gen.yml
+++ b/config/dev/ruoyi-gen.yml
@@ -6,6 +6,7 @@ spring:
datasource:
# 主库数据源
master:
+ type: ${spring.datasource.type}
driver-class-name: com.mysql.cj.jdbc.Driver
url: ${datasource.system-master.url}
username: ${datasource.system-master.username}
@@ -13,6 +14,7 @@ spring:
# 从库数据源
#slave:
# lazy: true
+ # type: ${spring.datasource.type}
# driver-class-name:
# url:
# username:
diff --git a/config/dev/ruoyi-job.yml b/config/dev/ruoyi-job.yml
index ed0bf037..cd0ad096 100644
--- a/config/dev/ruoyi-job.yml
+++ b/config/dev/ruoyi-job.yml
@@ -6,6 +6,7 @@ spring:
datasource:
# 主库数据源
master:
+ type: ${spring.datasource.type}
driver-class-name: com.mysql.cj.jdbc.Driver
url: ${datasource.job.url}
username: ${datasource.job.username}
diff --git a/config/dev/ruoyi-resource.yml b/config/dev/ruoyi-resource.yml
index c0322b2e..1b455e67 100644
--- a/config/dev/ruoyi-resource.yml
+++ b/config/dev/ruoyi-resource.yml
@@ -6,16 +6,11 @@ spring:
datasource:
# 主库数据源
master:
+ type: ${spring.datasource.type}
driver-class-name: com.mysql.cj.jdbc.Driver
url: ${datasource.system-master.url}
username: ${datasource.system-master.username}
password: ${datasource.system-master.password}
- # 从库数据源
- # slave:
- # driver-class-name:
- # url:
- # username:
- # password:
mail:
enabled: false
diff --git a/config/dev/ruoyi-system.yml b/config/dev/ruoyi-system.yml
index 6b3d4683..7df4dd94 100644
--- a/config/dev/ruoyi-system.yml
+++ b/config/dev/ruoyi-system.yml
@@ -6,12 +6,14 @@ spring:
datasource:
# 主库数据源
master:
+ type: ${spring.datasource.type}
driver-class-name: com.mysql.cj.jdbc.Driver
url: ${datasource.system-master.url}
username: ${datasource.system-master.username}
password: ${datasource.system-master.password}
# 从库数据源
# slave:
+ # type: ${spring.datasource.type}
# driver-class-name:
# url:
# username:
diff --git a/config/dev/seata-server.properties b/config/dev/seata-server.properties
index 7d89cef3..36850a0d 100644
--- a/config/dev/seata-server.properties
+++ b/config/dev/seata-server.properties
@@ -15,7 +15,7 @@ store.session.mode=db
store.publicKey=
#These configurations are required if the `store mode` is `db`. If `store.mode,store.lock.mode,store.session.mode` are not equal to `db`, you can remove the configuration block.
-store.db.datasource=druid
+store.db.datasource=hikari
store.db.dbType=mysql
store.db.driverClassName=com.mysql.cj.jdbc.Driver
store.db.url=jdbc:mysql://127.0.0.1:3306/ry-seata?useUnicode=true&rewriteBatchedStatements=true
diff --git a/pom.xml b/pom.xml
index 9b605ac8..7d910e42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
3.5.10
3.5.2
3.9.1
- 1.2.12
3.5.2
2.3
1.2.83
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index ccab60ca..841dbbc0 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -38,13 +38,6 @@
p6spy
-
-
- com.alibaba
- druid-spring-boot-starter
- ${druid.version}
-
-
com.baomidou
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/spy.properties b/ruoyi-modules/ruoyi-gen/src/main/resources/spy.properties
index bee2392d..619a645b 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/spy.properties
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/spy.properties
@@ -1,26 +1,28 @@
-# p6spy 性能分析插件配置文件
+# p6spy \u6027\u80FD\u5206\u6790\u63D2\u4EF6\u914D\u7F6E\u6587\u4EF6
modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# 自定义日志打印
+# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#日志输出到控制台
+#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0
appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# 使用日志系统记录 sql
+# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
#appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# 设置 p6spy driver 代理
+# \u8BBE\u7F6E p6spy driver \u4EE3\u7406
#deregisterdrivers=true
-# 取消JDBC URL前缀
+# \u53D6\u6D88JDBC URL\u524D\u7F00
useprefix=true
-# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset.
excludecategories=info,debug,result,commit,resultset
-# 日期格式
+# \u65E5\u671F\u683C\u5F0F
dateformat=yyyy-MM-dd HH:mm:ss
-# SQL语句打印时间格式
+# SQL\u8BED\u53E5\u6253\u5370\u65F6\u95F4\u683C\u5F0F
databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
-# 实际驱动可多个
+# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A
#driverlist=org.h2.Driver
-# 是否开启慢SQL记录
+# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55
outagedetection=true
-# 慢SQL记录标准 2 秒
+# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
outagedetectioninterval=2
-# 是否过滤 Log
+# \u662F\u5426\u8FC7\u6EE4 Log
filter=true
+# \u8FC7\u6EE4 Log \u65F6\u6240\u6392\u9664\u7684 sql \u5173\u952E\u5B57\uFF0C\u4EE5\u9017\u53F7\u5206\u9694
+exclude: SELECT 1
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/spy.properties b/ruoyi-modules/ruoyi-job/src/main/resources/spy.properties
new file mode 100644
index 00000000..619a645b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/spy.properties
@@ -0,0 +1,28 @@
+# p6spy \u6027\u80FD\u5206\u6790\u63D2\u4EF6\u914D\u7F6E\u6587\u4EF6
+modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
+# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
+logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
+#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0
+appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
+# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
+#appender=com.p6spy.engine.spy.appender.Slf4JLogger
+# \u8BBE\u7F6E p6spy driver \u4EE3\u7406
+#deregisterdrivers=true
+# \u53D6\u6D88JDBC URL\u524D\u7F00
+useprefix=true
+# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset.
+excludecategories=info,debug,result,commit,resultset
+# \u65E5\u671F\u683C\u5F0F
+dateformat=yyyy-MM-dd HH:mm:ss
+# SQL\u8BED\u53E5\u6253\u5370\u65F6\u95F4\u683C\u5F0F
+databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
+# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A
+#driverlist=org.h2.Driver
+# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55
+outagedetection=true
+# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
+outagedetectioninterval=2
+# \u662F\u5426\u8FC7\u6EE4 Log
+filter=true
+# \u8FC7\u6EE4 Log \u65F6\u6240\u6392\u9664\u7684 sql \u5173\u952E\u5B57\uFF0C\u4EE5\u9017\u53F7\u5206\u9694
+exclude: SELECT 1
diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/spy.properties b/ruoyi-modules/ruoyi-resource/src/main/resources/spy.properties
index bee2392d..619a645b 100644
--- a/ruoyi-modules/ruoyi-resource/src/main/resources/spy.properties
+++ b/ruoyi-modules/ruoyi-resource/src/main/resources/spy.properties
@@ -1,26 +1,28 @@
-# p6spy 性能分析插件配置文件
+# p6spy \u6027\u80FD\u5206\u6790\u63D2\u4EF6\u914D\u7F6E\u6587\u4EF6
modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# 自定义日志打印
+# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#日志输出到控制台
+#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0
appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# 使用日志系统记录 sql
+# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
#appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# 设置 p6spy driver 代理
+# \u8BBE\u7F6E p6spy driver \u4EE3\u7406
#deregisterdrivers=true
-# 取消JDBC URL前缀
+# \u53D6\u6D88JDBC URL\u524D\u7F00
useprefix=true
-# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset.
excludecategories=info,debug,result,commit,resultset
-# 日期格式
+# \u65E5\u671F\u683C\u5F0F
dateformat=yyyy-MM-dd HH:mm:ss
-# SQL语句打印时间格式
+# SQL\u8BED\u53E5\u6253\u5370\u65F6\u95F4\u683C\u5F0F
databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
-# 实际驱动可多个
+# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A
#driverlist=org.h2.Driver
-# 是否开启慢SQL记录
+# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55
outagedetection=true
-# 慢SQL记录标准 2 秒
+# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
outagedetectioninterval=2
-# 是否过滤 Log
+# \u662F\u5426\u8FC7\u6EE4 Log
filter=true
+# \u8FC7\u6EE4 Log \u65F6\u6240\u6392\u9664\u7684 sql \u5173\u952E\u5B57\uFF0C\u4EE5\u9017\u53F7\u5206\u9694
+exclude: SELECT 1
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/spy.properties b/ruoyi-modules/ruoyi-system/src/main/resources/spy.properties
index bee2392d..619a645b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/spy.properties
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/spy.properties
@@ -1,26 +1,28 @@
-# p6spy 性能分析插件配置文件
+# p6spy \u6027\u80FD\u5206\u6790\u63D2\u4EF6\u914D\u7F6E\u6587\u4EF6
modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# 自定义日志打印
+# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#日志输出到控制台
+#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0
appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# 使用日志系统记录 sql
+# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
#appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# 设置 p6spy driver 代理
+# \u8BBE\u7F6E p6spy driver \u4EE3\u7406
#deregisterdrivers=true
-# 取消JDBC URL前缀
+# \u53D6\u6D88JDBC URL\u524D\u7F00
useprefix=true
-# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset.
excludecategories=info,debug,result,commit,resultset
-# 日期格式
+# \u65E5\u671F\u683C\u5F0F
dateformat=yyyy-MM-dd HH:mm:ss
-# SQL语句打印时间格式
+# SQL\u8BED\u53E5\u6253\u5370\u65F6\u95F4\u683C\u5F0F
databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
-# 实际驱动可多个
+# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A
#driverlist=org.h2.Driver
-# 是否开启慢SQL记录
+# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55
outagedetection=true
-# 慢SQL记录标准 2 秒
+# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
outagedetectioninterval=2
-# 是否过滤 Log
+# \u662F\u5426\u8FC7\u6EE4 Log
filter=true
+# \u8FC7\u6EE4 Log \u65F6\u6240\u6392\u9664\u7684 sql \u5173\u952E\u5B57\uFF0C\u4EE5\u9017\u53F7\u5206\u9694
+exclude: SELECT 1
diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml
index b4d6b3a2..2bacbfd2 100644
--- a/ruoyi-visual/ruoyi-seata-server/pom.xml
+++ b/ruoyi-visual/ruoyi-seata-server/pom.xml
@@ -29,6 +29,7 @@
1.5.2
1.72
+ 1.2.12