From e4c691fd5f845283426aba8be0788adeadde6a0e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 29 十月 2021 17:36:13 +0800
Subject: [PATCH] !107 add 新增 Admin 监控 Bean 初始化 startup trace 监控插件 Merge pull request !107 from shenxinquan/auto-480232-dev-1635497752042
---
pom.xml | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9c3b5df..c5da827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,15 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>3.2.0</version>
+ <version>3.3.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.2.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.5</spring-boot.version>
+ <ruoyi-vue-plus.version>3.3.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.6</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>
@@ -28,7 +28,7 @@
<jwt.version>0.9.1</jwt.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>
+ <hutool.version>5.7.15</hutool.version>
<feign.version>3.0.3</feign.version>
<feign-okhttp.version>11.6</feign-okhttp.version>
<okhttp.version>4.9.1</okhttp.version>
@@ -36,7 +36,8 @@
<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>
+ <tlog.version>1.3.3</tlog.version>
+ <xxl-job.version>2.3.0</xxl-job.version>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
<jaxb.version>3.0.1</jaxb.version>
@@ -44,25 +45,14 @@
<!-- OSS 閰嶇疆 -->
<qiniu.version>7.8.0</qiniu.version>
<aliyun.oss.version>3.13.1</aliyun.oss.version>
- <qcloud.cos.version>5.6.55</qcloud.cos.version>
- <minio.version>8.3.0</minio.version>
+ <qcloud.cos.version>5.6.58</qcloud.cos.version>
+ <minio.version>8.3.3</minio.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
<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>
-
- <!-- xxl job-->
- <netty-all.version>4.1.58.Final</netty-all.version>
- <gson.version>2.8.6</gson.version>
- <groovy.version>3.0.7</groovy.version>
- <spring.version>5.3.3</spring.version>
- <slf4j-api.version>1.7.30</slf4j-api.version>
- <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
- <mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
- <mysql-connector-java.version>8.0.23</mysql-connector-java.version>
- <xxl-job-core-version>2.3.0</xxl-job-core-version>
</properties>
@@ -139,6 +129,13 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
+ </dependency>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -219,6 +216,13 @@
<version>${lock4j.version}</version>
</dependency>
+ <!-- xxl-job-core -->
+ <dependency>
+ <groupId>com.xuxueli</groupId>
+ <artifactId>xxl-job-core</artifactId>
+ <version>${xxl-job.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.yomahub</groupId>
<artifactId>tlog-spring-boot-configuration</artifactId>
@@ -247,10 +251,23 @@
<version>${tlog.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟 @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job -->
+ <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>
@@ -282,7 +299,7 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
- <!-- demo妯″潡 -->
+ <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId>
@@ -304,6 +321,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>
@@ -311,16 +329,6 @@
<module>ruoyi-oss</module>
</modules>
<packaging>pom</packaging>
-
-
- <dependencies>
- <!-- jdk11 缂哄け渚濊禆 jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- </dependencies>
<build>
<plugins>
--
Gitblit v1.9.3