From 261d9f8ebc1c297fa170d46fe75c349f961fca4e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 十二月 2021 10:38:25 +0800
Subject: [PATCH] update 合并 dev 处理差异
---
pom.xml | 138 +++++++++++++++++++++++++++++----------------
1 files changed, 89 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6fa31db..f281612 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.5.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.5.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.8</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>
@@ -24,35 +24,37 @@
<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>
+ <cglib.version>3.3.0</cglib.version>
+ <velocity.version>2.3</velocity.version>
+ <satoken.version>1.28.0</satoken.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.2</spring-boot-admin.version>
- <redisson.version>3.16.3</redisson.version>
+ <hutool.version>5.7.18</hutool.version>
+ <okhttp.version>4.9.2</okhttp.version>
+ <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
+ <redisson.version>3.16.7</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
- <dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <dynamic-ds.version>3.5.0</dynamic-ds.version>
+ <tlog.version>1.3.6</tlog.version>
+ <xxl-job.version>2.3.0</xxl-job.version>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
<jaxb.version>3.0.1</jaxb.version>
<!-- OSS 閰嶇疆 -->
- <qiniu.version>7.8.0</qiniu.version>
+ <qiniu.version>7.9.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.4</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>
+
</properties>
-
+
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
@@ -114,18 +116,37 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
- <!-- Token鐢熸垚涓庤В鏋�-->
+ <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jwt.version}</version>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot-starter</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+ <!-- Sa-Token 鏁村悎 jwt -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-jwt</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -154,26 +175,32 @@
<dependency>
<groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
+ <artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- <version>${feign.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>feign-core</artifactId>
- <groupId>io.github.openfeign</groupId>
- </exclusion>
- </exclusions>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-http</artifactId>
+ <version>${hutool.version}</version>
</dependency>
<dependency>
- <groupId>io.github.openfeign</groupId>
- <artifactId>feign-okhttp</artifactId>
- <version>${feign-okhttp.version}</version>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-captcha</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-extra</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-jwt</artifactId>
+ <version>${hutool.version}</version>
</dependency>
<dependency>
@@ -204,10 +231,30 @@
<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.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-web-spring-boot-starter</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.yomahub</groupId>
+ <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
+ <version>${tlog.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟 -->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
+ <artifactId>ruoyi-job</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -239,7 +286,7 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
- <!-- demo妯″潡 -->
+ <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId>
@@ -260,7 +307,7 @@
<module>ruoyi-admin</module>
<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>
@@ -268,16 +315,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>
@@ -334,6 +371,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
+ <knife4j.production>false</knife4j.production>
<endpoints.include>'*'</endpoints.include>
</properties>
</profile>
@@ -343,6 +381,7 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
+ <knife4j.production>false</knife4j.production>
<endpoints.include>'*'</endpoints.include>
</properties>
<activation>
@@ -355,9 +394,10 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <knife4j.production>true</knife4j.production>
<endpoints.include>health, info, logfile</endpoints.include>
</properties>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.9.3