From 9d99afd159b09ae5252f0aa8e11424246958dac4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 03 十一月 2022 16:18:43 +0800
Subject: [PATCH] update 优化 桶权限类型字段 写法与vue3版本不兼容问题
---
pom.xml | 110 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d9a17f..12b0929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,53 +6,48 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</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.2.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.6.9</spring-boot.version>
+ <ruoyi-vue-plus.version>4.3.1</ruoyi-vue-plus.version>
+ <spring-boot.version>2.7.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.2</maven-jar-plugin.version>
<spring-boot.mybatis>2.2.2</spring-boot.mybatis>
- <druid.version>1.2.11</druid.version>
- <knife4j.version>3.0.3</knife4j.version>
- <swagger-annotations.version>1.5.22</swagger-annotations.version>
- <poi.version>5.2.2</poi.version>
+ <druid.version>1.2.12</druid.version>
+ <springdoc.version>1.6.12</springdoc.version>
+ <poi.version>5.2.3</poi.version>
<easyexcel.version>3.1.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.30.0</satoken.version>
+ <satoken.version>1.32.0</satoken.version>
<mybatis-plus.version>3.5.2</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.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.4</redisson.version>
- <lock4j.version>2.2.1</lock4j.version>
- <dynamic-ds.version>3.5.1</dynamic-ds.version>
- <tlog.version>1.4.3</tlog.version>
+ <hutool.version>5.8.8</hutool.version>
+ <okhttp.version>4.10.0</okhttp.version>
+ <spring-boot-admin.version>2.7.7</spring-boot-admin.version>
+ <redisson.version>3.17.7</redisson.version>
+ <lock4j.version>2.2.2</lock4j.version>
+ <dynamic-ds.version>3.5.2</dynamic-ds.version>
+ <tlog.version>1.5.0</tlog.version>
<xxl-job.version>2.3.1</xxl-job.version>
+ <lombok.version>1.18.24</lombok.version>
<!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <guava.version>30.0-jre</guava.version>
+ <guava.version>31.1-jre</guava.version>
+ <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
+ <snakeyaml.version>1.32</snakeyaml.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.248</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.324</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.9</aliyun.sms.version>
- <tencent.sms.version>3.1.537</tencent.sms.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>
-
+ <aliyun.sms.version>2.0.22</aliyun.sms.version>
+ <tencent.sms.version>3.1.611</tencent.sms.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -86,14 +81,20 @@
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- <version>1.6.9</version>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-javadoc</artifactId>
- <version>1.6.9</version>
+ <version>${springdoc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
</dependency>
<dependency>
@@ -136,6 +137,12 @@
<groupId>cn.dev33</groupId>
<artifactId>sa-token-jwt</artifactId>
<version>${satoken.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -249,6 +256,13 @@
<version>${guava.version}</version>
</dependency>
+ <!-- 涓存椂淇 snakeyaml 婕忔礊 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟 -->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -336,14 +350,32 @@
<path>
<groupId>com.github.therapi</groupId>
<artifactId>therapi-runtime-javadoc-scribe</artifactId>
- <version>0.13.0</version>
+ <version>0.15.0</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.24</version>
+ <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>
+ <!-- 鍗曞厓娴嬭瘯浣跨敤 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ <configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
+ <groups>${profiles.active}</groups>
+ <!-- 鎺掗櫎鏍囩 -->
+ <excludedGroups>exclude</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -370,8 +402,8 @@
<repositories>
<repository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -381,8 +413,8 @@
<pluginRepositories>
<pluginRepository>
<id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public/</url>
+ <name>huawei nexus</name>
+ <url>https://mirrors.huaweicloud.com/repository/maven/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -399,8 +431,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
</profile>
<profile>
@@ -409,8 +439,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -422,10 +450,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>
+
+
--
Gitblit v1.9.3