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 @@ 2.0.59 1.2.27 2.11.1 - 3.5.14 - 5.8.41 - 0.12.6 + 3.5.15 + 5.8.43 + 0.13.0 5.8.0 1.4.7 @@ -41,19 +41,22 @@ 2.3.34 3.9.1 4.5.0 - 9.4.0 - 3.5.6 - 1.9.7 + 9.5.0 + 3.5.7 + + 1.9.25.1 1.6.2 - 1.13.0 + 2.14.5 build210 - 0.1.55 - 6.6.5 - 2.5.0 - 0.10.1 - 3.11.1 - 2.12.7 + + 6.9.2 + + 2.5.2 + + 0.11.2 + + 3.12.0 2.0.3.RELEASE 1.3.0 1.8.0 @@ -172,6 +175,7 @@ org.apache.commons commons-lang3 + 3.20.0 @@ -256,11 +260,11 @@ ${captcha.version} - - org.apache.commons - commons-text - ${commons-text.version} - + + + + + @@ -305,10 +309,15 @@ ganymed-ssh2 ${ganymed-ssh2.version} + + + + + - com.jcraft + com.github.mwiede jsch - ${jsch.version} + 2.27.7 @@ -341,10 +350,16 @@ quartz ${quartz.version} + + + + + - com.mchange - c3p0 - ${c3p0.version} + com.zaxxer + HikariCP + 7.0.2 + compile @@ -354,12 +369,6 @@ ${commons-net.version} - - joda-time - joda-time - ${joda-time.version} - - io.github.biezhi @@ -377,11 +386,6 @@ - - org.mozilla - rhino - ${rhino.version} - 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 @@ - + @@ -41,4 +40,4 @@ - \ No newline at end of file + 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 @@ 2.0.60 1.2.27 2.11.1 - 3.5.14 - 5.8.40 - 0.12.6 + 3.5.15 + 5.8.43 + 0.13.0 5.8.0 1.4.7 @@ -151,6 +151,7 @@ org.apache.commons commons-lang3 + 3.20.0 @@ -183,7 +184,7 @@ com.mysql mysql-connector-j - 9.3.0 + 9.5.0 runtime @@ -205,13 +206,15 @@ org.aspectj aspectjrt - 1.9.7 + + 1.9.25.1 org.aspectj aspectjweaver - 1.9.7 + + 1.9.25.1 @@ -248,11 +251,11 @@ 1.6.2 - - org.apache.commons - commons-text - 1.13.0 - + + + + + @@ -297,17 +300,23 @@ ganymed-ssh2 build210 + + + + + - com.jcraft + com.github.mwiede jsch - 0.1.55 + 2.27.7 com.github.oshi oshi-core - 6.6.5 + + 6.9.2 @@ -331,26 +340,35 @@ org.quartz-scheduler quartz - 2.5.0 + + 2.5.2 + + + + + + - com.mchange - c3p0 - 0.10.1 + com.zaxxer + HikariCP + 7.0.2 + compile commons-net commons-net - 3.11.1 + + 3.12.0 - - joda-time - joda-time - 2.12.7 - + + + + + @@ -369,11 +387,6 @@ - - org.mozilla - rhino - 1.8.0 -