From ac1d7aa69f66ec02f2909dd16b7e1ce6e68611b9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 09 七月 2022 12:57:46 +0800
Subject: [PATCH] update 优化 路由与 springfox 兼容问题 启用新路由方式

---
 pom.xml |   96 ++++++++++++++++++++++++------------------------
 1 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2dff117..c5ed42b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,49 +6,47 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>4.1.0</version>
+    <version>4.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>4.1.0</ruoyi-vue-plus.version>
-        <spring-boot.version>2.6.7</spring-boot.version>
+        <ruoyi-vue-plus.version>4.2.0</ruoyi-vue-plus.version>
+        <spring-boot.version>2.6.9</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.2</maven-jar-plugin.version>
         <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
-        <druid.version>1.2.9</druid.version>
-        <knife4j.version>3.0.3</knife4j.version>
+        <druid.version>1.2.11</druid.version>
+        <springdoc.version>1.6.9</springdoc.version>
         <swagger-annotations.version>1.5.22</swagger-annotations.version>
-        <poi.version>4.1.2</poi.version>
-        <commons-compress.version>1.21</commons-compress.version>
-        <easyexcel.version>3.1.0</easyexcel.version>
+        <poi.version>5.2.2</poi.version>
+        <easyexcel.version>3.1.1</easyexcel.version>
         <velocity.version>2.3</velocity.version>
         <satoken.version>1.30.0</satoken.version>
-        <mybatis-plus.version>3.5.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <hutool.version>5.8.1</hutool.version>
+        <hutool.version>5.8.3</hutool.version>
         <okhttp.version>4.9.3</okhttp.version>
         <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
-        <redisson.version>3.17.0</redisson.version>
+        <redisson.version>3.17.4</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <dynamic-ds.version>3.5.1</dynamic-ds.version>
-        <tlog.version>1.4.0</tlog.version>
+        <tlog.version>1.4.3</tlog.version>
         <xxl-job.version>2.3.1</xxl-job.version>
+        <lombok.version>1.18.24</lombok.version>
 
-        <!-- jdk11 缂哄け渚濊禆 jaxb-->
-        <jaxb.version>3.0.1</jaxb.version>
         <!-- 缁熶竴 guava 鐗堟湰 瑙e喅闅愬紡婕忔礊闂 -->
         <guava.version>30.0-jre</guava.version>
 
         <!-- OSS 閰嶇疆 -->
-        <aws-java-sdk-s3.version>1.12.215</aws-java-sdk-s3.version>
+        <aws-java-sdk-s3.version>1.12.248</aws-java-sdk-s3.version>
         <!-- SMS 閰嶇疆 -->
         <aliyun.sms.version>2.0.9</aliyun.sms.version>
-        <tencent.sms.version>3.1.500</tencent.sms.version>
+        <tencent.sms.version>3.1.537</tencent.sms.version>
 
         <!-- docker 閰嶇疆 -->
         <docker.registry.url>localhost</docker.registry.url>
@@ -88,46 +86,38 @@
             </dependency>
 
             <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>${knife4j.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>swagger-annotations</artifactId>
-                        <groupId>io.swagger</groupId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-ui</artifactId>
+                <version>${springdoc.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger-annotations.version}</version>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-javadoc</artifactId>
+                <version>${springdoc.version}</version>
             </dependency>
 
-            <!-- excel宸ュ叿 -->
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
-
-            <!-- 淇poi婕忔礊 -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-compress</artifactId>
-                <version>${commons-compress.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>
                 <version>${easyexcel.version}</version>
                 <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.poi</groupId>
-                        <artifactId>poi</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>org.apache.poi</groupId>
                         <artifactId>poi-ooxml-schemas</artifactId>
@@ -153,13 +143,6 @@
                 <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 澶氭暟鎹簮-->
@@ -356,6 +339,23 @@
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>com.github.therapi</groupId>
+                            <artifactId>therapi-runtime-javadoc-scribe</artifactId>
+                            <version>0.13.0</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-configuration-processor</artifactId>
+                            <version>${spring-boot.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
         </plugins>

--
Gitblit v1.9.3