From e47596383a351f493af6af748884354f2dd5c3c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 10 一月 2022 15:05:03 +0800
Subject: [PATCH] update 删除文档无用合并
---
pom.xml | 87 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index cb876d0..457ce4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,15 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>3.3.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.3.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.6</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,27 +24,27 @@
<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.4</mybatis-plus.version>
+ <cglib.version>3.3.0</cglib.version>
+ <velocity.version>2.3</velocity.version>
+ <mybatis-plus.version>3.5.0</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.16</hutool.version>
+ <hutool.version>5.7.18</hutool.version>
<okhttp.version>4.9.2</okhttp.version>
- <spring-boot-admin.version>2.5.3</spring-boot-admin.version>
- <redisson.version>3.16.4</redisson.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>
- <tlog.version>1.3.4</tlog.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.58</qcloud.cos.version>
- <minio.version>8.3.3</minio.version>
+ <minio.version>8.3.4</minio.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
@@ -63,6 +63,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- hutool 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-bom</artifactId>
+ <version>${hutool.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -115,18 +124,17 @@
</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鐢熸垚涓庤В鏋�-->
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jwt.version}</version>
</dependency>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
@@ -158,12 +166,6 @@
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>${p6spy.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>${hutool.version}</version>
</dependency>
<dependency>
@@ -204,29 +206,13 @@
<dependency>
<groupId>com.yomahub</groupId>
- <artifactId>tlog-spring-boot-configuration</artifactId>
+ <artifactId>tlog-web-spring-boot-starter</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-xxl-job</artifactId>
+ <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
<version>${tlog.version}</version>
</dependency>
@@ -310,8 +296,17 @@
</plugins>
<resources>
<resource>
- <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
<directory>src/main/resources</directory>
+ <!-- 鍏抽棴杩囨护 -->
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- 寮曞叆鎵�鏈� 鍖归厤鏂囦欢杩涜杩囨护 -->
+ <includes>
+ <include>application*</include>
+ <include>bootstrap*</include>
+ </includes>
<!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
<filtering>true</filtering>
</resource>
--
Gitblit v1.9.3