From 809774d87cdb9efff7489af5042d7dc00677d2de Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 15:24:41 +0800
Subject: [PATCH] update 更新xxljob配置类 增加配置注解
---
pom.xml | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73d680a..63135fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,36 +6,38 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>3.1.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.4</spring-boot.version>
+ <ruoyi-vue-plus.version>3.2.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.5</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
- <druid.version>1.2.6</druid.version>
+ <druid.version>1.2.8</druid.version>
<knife4j.version>3.0.3</knife4j.version>
<swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version>
<easyexcel.version>2.2.11</easyexcel.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.3.3</mybatis-plus.version>
+ <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.13</hutool.version>
<feign.version>3.0.3</feign.version>
<feign-okhttp.version>11.6</feign-okhttp.version>
<okhttp.version>4.9.1</okhttp.version>
- <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
- <redisson.version>3.16.2</redisson.version>
+ <spring-boot-admin.version>2.5.2</spring-boot-admin.version>
+ <redisson.version>3.16.3</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <tlog.version>1.3.2</tlog.version>
+ <xxl-job-core-version>2.3.0</xxl-job-core-version>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
<jaxb.version>3.0.1</jaxb.version>
@@ -43,7 +45,7 @@
<!-- OSS 閰嶇疆 -->
<qiniu.version>7.8.0</qiniu.version>
<aliyun.oss.version>3.13.1</aliyun.oss.version>
- <qcloud.cos.version>5.6.51</qcloud.cos.version>
+ <qcloud.cos.version>5.6.55</qcloud.cos.version>
<minio.version>8.3.0</minio.version>
<!-- docker 閰嶇疆 -->
@@ -51,8 +53,9 @@
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.2</docker.plugin.version>
+
</properties>
-
+
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
@@ -158,6 +161,7 @@
<version>${hutool.version}</version>
</dependency>
+ <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -169,7 +173,7 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- @deprecated 鐢变簬浣跨敤浜烘暟杈冨皯 鍐冲畾涓� 3.4.0 鐗堟湰绉婚櫎 -->
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
@@ -204,10 +208,59 @@
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
<version>${lock4j.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
+
+ <!-- xxl-job-core -->
+ <dependency>
+ <groupId>com.xuxueli</groupId>
+ <artifactId>xxl-job-core</artifactId>
+ <version>${xxl-job-core-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-spring-boot-configuration</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-webroot</artifactId>
+ <version>${tlog.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>org.javassist</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-feign</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-xxl-job</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 @deprecated 3.4.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-job</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -261,6 +314,7 @@
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
+ <module>ruoyi-job</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-demo</module>
@@ -360,4 +414,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.3