From 7a215369d822d372fdb512e18b3df6a5f613ea13 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Mon, 26 Jan 2026 20:34:12 +0800
Subject: [PATCH] =?UTF-8?q?chore(dependencies):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 升级 mybatis-plus 版本从 3.5.14 到 3.5.15
- 升级 hutool 版本从 5.8.40 到 5.8.43
- 升级 jjwt 版本从 0.12.6 到 0.13.0
- 升级 mysql-connector-j 版本从 9.3.0 到 9.5.0
- 升级 aspectjrt 和 aspectjweaver 版本从 1.9.7 到 1.9.25.1
- 移除 commons-text 依赖并注释掉相关配置
- 将 jsch 依赖替换为 github.mwiede/jsch 版本 2.27.7
- 升级 oshi-core 版本从 6.6.5 到 6.9.2
- 升级 quartz 版本从 2.5.0 到 2.5.2
- 将 c3p0 替换为 HikariCP 连接池
- 升级 commons-net 版本从 3.11.1 到 3.12.0
- 移除 joda-time 依赖
- 移除 rhino 依赖
- 修改 redis 数据库配置从 10 到 2
- 优化 quartz 配置，增加数据源和线程池设置
- 修复 logback.xml 格式问题
---
 .../src/main/resources/application-quartz.yml | 28 ++++++--
 cutejava-springboot3/pom.xml                  | 72 ++++++++++---------
 .../src/main/resources/application-dev.yml    |  2 +-
 .../src/main/resources/application-quartz.yml | 28 ++++++--
 .../src/main/resources/logback.xml            |  5 +-
 cutejava/pom.xml                              | 71 ++++++++++--------
 6 files changed, 131 insertions(+), 75 deletions(-)

diff --git a/cutejava-springboot3/cutejava-starter/src/main/resources/application-quartz.yml b/cutejava-springboot3/cutejava-starter/src/main/resources/application-quartz.yml
index dc34ad0e..ba858e94 100644
--- a/cutejava-springboot3/cutejava-starter/src/main/resources/application-quartz.yml
+++ b/cutejava-springboot3/cutejava-starter/src/main/resources/application-quartz.yml
@@ -11,15 +11,34 @@ spring:
             # 必需，指定调度器实例的名称
             instanceName: cutejava
             # 必需，指定调度器实例的 ID
-            instanceId: auto
+            instanceId: AUTO
           threadPool:
-            # 可选，线程池的线程数量，可以根据需要调整
-            threadCount: 5
+            # Scheduler使用的线程池名称，实现了ThreadPool接口，参考org.quartz.simpl.SimpleThreadPool
+            class: org.quartz.simpl.SimpleThreadPool
+            # 可选，并发个数（1～100）
+            threadCount: 10
+            # 可选，线程的优先级（1～10）
+            threadPriority: 5
+            # 可选，指定在线程池里面创建的线程是否是守护线程
+            makeThreadsDaemons: false
+            # 可选，线程上下文类加载器是否继承自初始线程的加载器
+            threadsInheritContextClassLoaderOfInitializingThread: true
+          dataSource:
+            jobStoreDataSource:
+              provider: hikaricp
+              driver: com.mysql.cj.jdbc.Driver
+              URL: jdbc:mysql://127.0.0.1:3306/cutejava?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+              user: root
+              password: kd123456
+              maxConnections: 10
+              validationQuery: select 1
           jobStore:
             # 可选，如果你不需要集群，可以去掉
             isClustered: true
             # 可选，集群检查间隔时间，可以根据需要调整
             clusterCheckinInterval: 10000
+            # 可选，分布式事务类
+            #            class: org.quartz.impl.jdbcjobstore.JobStoreTX
             # 必需，指定 JDBC 驱动代理类
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
             # 可选，是否使用属性存储，可以根据需要调整
@@ -27,4 +46,5 @@ spring:
             # 必需，指定表的前缀
             tablePrefix: qrtz_
             # 可选，指定误触发阈值，可以根据需要调整
-            misfireThreshold: 60000
\ No newline at end of file
+            misfireThreshold: 60000
+            dataSource: jobStoreDataSource
diff --git a/cutejava-springboot3/pom.xml b/cutejava-springboot3/pom.xml
index c4939535..5371e887 100644
--- a/cutejava-springboot3/pom.xml
+++ b/cutejava-springboot3/pom.xml
@@ -31,9 +31,9 @@
     <fastjson2.version>2.0.59</fastjson2.version>
     <druid.version>1.2.27</druid.version>
     <commons-pool2.version>2.11.1</commons-pool2.version>
-    <mybatis-plus.version>3.5.14</mybatis-plus.version>
-    <hutool.version>5.8.41</hutool.version>
-    <jjwt.version>0.12.6</jjwt.version>
+    <mybatis-plus.version>3.5.15</mybatis-plus.version>
+    <hutool.version>5.8.43</hutool.version>
+    <jjwt.version>0.13.0</jjwt.version>
     <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
     <jna.version>5.8.0</jna.version>
     <mail.version>1.4.7</mail.version>
@@ -41,19 +41,22 @@
     <freemarker.version>2.3.34</freemarker.version>
     <p6spy.version>3.9.1</p6spy.version>
     <knife4j.version>4.5.0</knife4j.version>
-    <mysql.version>9.4.0</mysql.version>
-    <ip2region.version>3.5.6</ip2region.version>
-    <springaop.version>1.9.7</springaop.version>
+    <mysql.version>9.5.0</mysql.version>
+    <ip2region.version>3.5.7</ip2region.version>
+<!--    <springaop.version>1.9.7</springaop.version>-->
+    <springaop.version>1.9.25.1</springaop.version>
     <captcha.version>1.6.2</captcha.version>
-    <commons-text.version>1.13.0</commons-text.version>
+<!--    <commons-text.version>1.13.0</commons-text.version>-->
     <transmittable.version>2.14.5</transmittable.version>
     <ganymed-ssh2.version>build210</ganymed-ssh2.version>
-    <jsch.version>0.1.55</jsch.version>
-    <oshi.version>6.6.5</oshi.version>
-    <quartz.version>2.5.0</quartz.version>
-    <c3p0.version>0.10.1</c3p0.version>
-    <commons-net.version>3.11.1</commons-net.version>
-    <joda-time.version>2.12.7</joda-time.version>
+<!--    <oshi.version>6.6.5</oshi.version>-->
+    <oshi.version>6.9.2</oshi.version>
+<!--    <quartz.version>2.5.0</quartz.version>-->
+    <quartz.version>2.5.2</quartz.version>
+<!--    <c3p0.version>0.10.1</c3p0.version>-->
+    <c3p0.version>0.11.2</c3p0.version>
+<!--    <commons-net.version>3.11.1</commons-net.version>-->
+    <commons-net.version>3.12.0</commons-net.version>
     <pinyin.version>2.0.3.RELEASE</pinyin.version>
     <fastexcel.version>1.3.0</fastexcel.version>
     <rhino.version>1.8.0</rhino.version>
@@ -172,6 +175,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <version>3.20.0</version>
     </dependency>
 
     <!-- 监控sql日志 -->
@@ -256,11 +260,11 @@
       <version>${captcha.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-      <version>${commons-text.version}</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.apache.commons</groupId>-->
+<!--      <artifactId>commons-text</artifactId>-->
+<!--      <version>${commons-text.version}</version>-->
+<!--    </dependency>-->
 
     <!-- 提供增强的 InheritableThreadLocal, 即使用线程池组件也可以在线程之间传输值 -->
     <dependency>
@@ -305,10 +309,15 @@
       <artifactId>ganymed-ssh2</artifactId>
       <version>${ganymed-ssh2.version}</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.jcraft</groupId>-->
+<!--      <artifactId>jsch</artifactId>-->
+<!--      <version>0.1.55</version>-->
+<!--    </dependency>-->
     <dependency>
-      <groupId>com.jcraft</groupId>
+      <groupId>com.github.mwiede</groupId>
       <artifactId>jsch</artifactId>
-      <version>${jsch.version}</version>
+      <version>2.27.7</version>
     </dependency>
 
     <!-- 获取系统信息 -->
@@ -341,10 +350,16 @@
       <artifactId>quartz</artifactId>
       <version>${quartz.version}</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.mchange</groupId>-->
+<!--      <artifactId>c3p0</artifactId>-->
+<!--      <version>${c3p0.version}</version>-->
+<!--    </dependency>-->
     <dependency>
-      <groupId>com.mchange</groupId>
-      <artifactId>c3p0</artifactId>
-      <version>${c3p0.version}</version>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
+      <version>7.0.2</version>
+      <scope>compile</scope>
     </dependency>
 
     <!-- CIDR解析 -->
@@ -354,12 +369,6 @@
       <version>${commons-net.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>${joda-time.version}</version>
-    </dependency>
-
     <!-- 拼音库 -->
     <dependency>
       <groupId>io.github.biezhi</groupId>
@@ -377,11 +386,6 @@
     </dependency>
 
     <!-- Nashorn被弃用 -->
-    <dependency>
-      <groupId>org.mozilla</groupId>
-      <artifactId>rhino</artifactId>
-      <version>${rhino.version}</version>
-    </dependency>
     <!--        Expression expression = new Expression("2 + 3 * 4");-->
     <!--        EvaluationValue result = expression.evaluate();-->
     <!--        System.out.println(result.getNumberValue()); // 输出 14-->
diff --git a/cutejava/cutejava-starter/src/main/resources/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml
index 9bccb1a4..f1c9f603 100644
--- a/cutejava/cutejava-starter/src/main/resources/application-dev.yml
+++ b/cutejava/cutejava-starter/src/main/resources/application-dev.yml
@@ -105,7 +105,7 @@ spring:
             multi-statement-allow: true
       aop-patterns: "cn.odboy.mapper.*,cn.odboy.service.*,cn.odboy.*.mapper.*,cn.odboy.*.service.*"
   redis:
-    database: ${REDIS_DB:10}
+    database: ${REDIS_DB:2}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:kd123456}
diff --git a/cutejava/cutejava-starter/src/main/resources/application-quartz.yml b/cutejava/cutejava-starter/src/main/resources/application-quartz.yml
index dc34ad0e..5533d98c 100644
--- a/cutejava/cutejava-starter/src/main/resources/application-quartz.yml
+++ b/cutejava/cutejava-starter/src/main/resources/application-quartz.yml
@@ -11,15 +11,34 @@ spring:
             # 必需，指定调度器实例的名称
             instanceName: cutejava
             # 必需，指定调度器实例的 ID
-            instanceId: auto
+            instanceId: AUTO
           threadPool:
-            # 可选，线程池的线程数量，可以根据需要调整
-            threadCount: 5
+            # Scheduler使用的线程池名称，实现了ThreadPool接口，参考org.quartz.simpl.SimpleThreadPool
+            class: org.quartz.simpl.SimpleThreadPool
+            # 可选，并发个数（1～100）
+            threadCount: 10
+            # 可选，线程的优先级（1～10）
+            threadPriority: 5
+            # 可选，指定在线程池里面创建的线程是否是守护线程
+            makeThreadsDaemons: false
+            # 可选，线程上下文类加载器是否继承自初始线程的加载器
+            threadsInheritContextClassLoaderOfInitializingThread: true
+          dataSource:
+            jobStoreDataSource:
+              provider: hikaricp
+              driver: com.mysql.cj.jdbc.Driver
+              URL: jdbc:mysql://127.0.0.1:3306/cutejava?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+              user: root
+              password: kd123456
+              maxConnections: 10
+              validationQuery: select 1
           jobStore:
             # 可选，如果你不需要集群，可以去掉
             isClustered: true
             # 可选，集群检查间隔时间，可以根据需要调整
             clusterCheckinInterval: 10000
+            # 可选，分布式事务类
+#            class: org.quartz.impl.jdbcjobstore.JobStoreTX
             # 必需，指定 JDBC 驱动代理类
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
             # 可选，是否使用属性存储，可以根据需要调整
@@ -27,4 +46,5 @@ spring:
             # 必需，指定表的前缀
             tablePrefix: qrtz_
             # 可选，指定误触发阈值，可以根据需要调整
-            misfireThreshold: 60000
\ No newline at end of file
+            misfireThreshold: 60000
+            dataSource: jobStoreDataSource
diff --git a/cutejava/cutejava-starter/src/main/resources/logback.xml b/cutejava/cutejava-starter/src/main/resources/logback.xml
index 6e9cdd7a..b43a331e 100644
--- a/cutejava/cutejava-starter/src/main/resources/logback.xml
+++ b/cutejava/cutejava-starter/src/main/resources/logback.xml
@@ -4,8 +4,7 @@
     <property name="log.name" value="cutejava"/>
     <property name="log.home" value="/var/logs"/>
     <property name="log.charset" value="utf-8"/>
-    <property name="log.pattern"
-              value="%red(%contextName) - %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) - %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n"/>
+    <property name="log.pattern" value="%red(%contextName) - %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) - %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n"/>
 
     <!-- Spring 日志级别控制 -->
     <logger name="org.springframework" level="warn"/>
@@ -41,4 +40,4 @@
         <!--普通日志输出到文件-->
         <appender-ref ref="FILE"/>
     </root>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/cutejava/pom.xml b/cutejava/pom.xml
index c1d1b1cc..c1cafa10 100644
--- a/cutejava/pom.xml
+++ b/cutejava/pom.xml
@@ -30,9 +30,9 @@
     <fastjson2.version>2.0.60</fastjson2.version>
     <druid.version>1.2.27</druid.version>
     <commons-pool2.version>2.11.1</commons-pool2.version>
-    <mybatis-plus.version>3.5.14</mybatis-plus.version>
-    <hutool.version>5.8.40</hutool.version>
-    <jjwt.version>0.12.6</jjwt.version>
+    <mybatis-plus.version>3.5.15</mybatis-plus.version>
+    <hutool.version>5.8.43</hutool.version>
+    <jjwt.version>0.13.0</jjwt.version>
     <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
     <jna.version>5.8.0</jna.version>
     <mail.version>1.4.7</mail.version>
@@ -151,6 +151,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <version>3.20.0</version>
     </dependency>
 
     <!--监控sql日志-->
@@ -183,7 +184,7 @@
     <dependency>
       <groupId>com.mysql</groupId>
       <artifactId>mysql-connector-j</artifactId>
-      <version>9.3.0</version>
+      <version>9.5.0</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -205,13 +206,15 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>1.9.7</version>
+<!--      <version>1.9.7</version>-->
+      <version>1.9.25.1</version>
     </dependency>
     <!-- jvm启动参数 javaagent 支持 -->
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.9.7</version>
+<!--      <version>1.9.7</version>-->
+      <version>1.9.25.1</version>
     </dependency>
 
     <!-- lombok插件 -->
@@ -248,11 +251,11 @@
       <version>1.6.2</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-      <version>1.13.0</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.apache.commons</groupId>-->
+<!--      <artifactId>commons-text</artifactId>-->
+<!--      <version>1.13.0</version>-->
+<!--    </dependency>-->
 
     <!-- 提供增强的 InheritableThreadLocal, 即使用线程池组件也可以在线程之间传输值 -->
     <dependency>
@@ -297,17 +300,23 @@
       <artifactId>ganymed-ssh2</artifactId>
       <version>build210</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.jcraft</groupId>-->
+<!--      <artifactId>jsch</artifactId>-->
+<!--      <version>0.1.55</version>-->
+<!--    </dependency>-->
     <dependency>
-      <groupId>com.jcraft</groupId>
+      <groupId>com.github.mwiede</groupId>
       <artifactId>jsch</artifactId>
-      <version>0.1.55</version>
+      <version>2.27.7</version>
     </dependency>
 
     <!-- 获取系统信息 -->
     <dependency>
       <groupId>com.github.oshi</groupId>
       <artifactId>oshi-core</artifactId>
-      <version>6.6.5</version>
+<!--      <version>6.6.5</version>-->
+      <version>6.9.2</version>
     </dependency>
 
     <!-- 邮件依赖 -->
@@ -331,26 +340,35 @@
     <dependency>
       <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
-      <version>2.5.0</version>
+<!--      <version>2.5.0</version>-->
+      <version>2.5.2</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.mchange</groupId>-->
+<!--      <artifactId>c3p0</artifactId>-->
+<!--&lt;!&ndash;      <version>0.10.1</version>&ndash;&gt;-->
+<!--      <version>0.11.2</version>-->
+<!--    </dependency>-->
     <dependency>
-      <groupId>com.mchange</groupId>
-      <artifactId>c3p0</artifactId>
-      <version>0.10.1</version>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
+      <version>7.0.2</version>
+      <scope>compile</scope>
     </dependency>
 
     <!-- CIDR解析 -->
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.11.1</version>
+<!--      <version>3.11.1</version>-->
+      <version>3.12.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.12.7</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>joda-time</groupId>-->
+<!--      <artifactId>joda-time</artifactId>-->
+<!--      <version>2.12.7</version>-->
+<!--    </dependency>-->
 
     <!-- 拼音库 -->
     <dependency>
@@ -369,11 +387,6 @@
     </dependency>
 
     <!-- Nashorn被弃用 -->
-    <dependency>
-      <groupId>org.mozilla</groupId>
-      <artifactId>rhino</artifactId>
-      <version>1.8.0</version>
-    </dependency>
     <!--        Expression expression = new Expression("2 + 3 * 4");-->
     <!--        EvaluationValue result = expression.evaluate();-->
     <!--        System.out.println(result.getNumberValue()); // 输出 14-->