From 68e57803f3386ab4f5211dd30e4d8ade9d24f0a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:08 +0800
Subject: [PATCH] update 适配 springboot-admin 改为最新 spring-security 写法
---
pom.xml | 242 +++++++++++++++++++++++++-----------------------
1 files changed, 127 insertions(+), 115 deletions(-)
diff --git a/pom.xml b/pom.xml
index 49fcea6..7b2a342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,49 +6,83 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.3.1</version>
+ <version>${revision}</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.3.1</ruoyi-vue-plus.version>
- <spring-boot.version>2.7.5</spring-boot.version>
+ <revision>5.0.0-SNAPSHOT</revision>
+ <spring-boot.version>3.0.1</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.12</druid.version>
- <springdoc.version>1.6.12</springdoc.version>
+ <java.version>17</java.version>
+ <spring-boot.mybatis>3.0.0</spring-boot.mybatis>
+ <springdoc.version>2.0.2</springdoc.version>
+ <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
- <easyexcel.version>3.1.1</easyexcel.version>
+ <easyexcel.version>3.1.5</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.31.0</satoken.version>
- <mybatis-plus.version>3.5.2</mybatis-plus.version>
+ <satoken.version>1.34.0</satoken.version>
+ <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.8</hutool.version>
+ <hutool.version>5.8.11</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>2.7.6</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>
+ <spring-boot-admin.version>3.0.0-M8</spring-boot-admin.version>
+ <redisson.version>3.19.1</redisson.version>
+ <lock4j.version>2.2.4</lock4j.version>
+ <dynamic-ds.version>3.6.1</dynamic-ds.version>
+ <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<xxl-job.version>2.3.1</xxl-job.version>
<lombok.version>1.18.24</lombok.version>
- <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <guava.version>31.1-jre</guava.version>
<!-- 涓存椂淇 snakeyaml 婕忔礊 -->
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>1.33</snakeyaml.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.324</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.373</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.22</aliyun.sms.version>
- <tencent.sms.version>3.1.611</tencent.sms.version>
+ <aliyun.sms.version>2.0.23</aliyun.sms.version>
+ <tencent.sms.version>3.1.660</tencent.sms.version>
+
+ <!-- 鎻掍欢鐗堟湰 -->
+ <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+ <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
+ <maven-compiler-plugin.verison>3.10.1</maven-compiler-plugin.verison>
+ <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+ <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>local</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>local</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ </profile>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>dev</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ <activation>
+ <!-- 榛樿鐜 -->
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <profiles.active>prod</profiles.active>
+ <logging.level>warn</logging.level>
+ </properties>
+ </profile>
+ </profiles>
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
@@ -72,23 +106,16 @@
<scope>import</scope>
</dependency>
- <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
- </dependency>
-
<dependency>
<groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-webmvc-core</artifactId>
+ <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-javadoc</artifactId>
- <version>${springdoc.version}</version>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc</artifactId>
+ <version>${therapi-javadoc.version}</version>
</dependency>
<dependency>
@@ -129,7 +156,7 @@
<!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
<groupId>cn.dev33</groupId>
- <artifactId>sa-token-spring-boot-starter</artifactId>
+ <artifactId>sa-token-spring-boot3-starter</artifactId>
<version>${satoken.version}</version>
</dependency>
<!-- Sa-Token 鏁村悎 jwt -->
@@ -153,15 +180,17 @@
</dependency>
<dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${spring-boot.mybatis}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-extension</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
+
<!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
<dependency>
<groupId>p6spy</groupId>
@@ -189,7 +218,7 @@
<dependency>
<groupId>com.tencentcloudapi</groupId>
- <artifactId>tencentcloud-sdk-java</artifactId>
+ <artifactId>tencentcloud-sdk-java-sms</artifactId>
<version>${tencent.sms.version}</version>
</dependency>
@@ -210,6 +239,7 @@
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
+
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
@@ -224,36 +254,9 @@
</dependency>
<dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-web-spring-boot-starter</artifactId>
- <version>${tlog.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
- <version>${tlog.version}</version>
- </dependency>
-
- <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${alibaba-ttl.version}</version>
</dependency>
<!-- 涓存椂淇 snakeyaml 婕忔礊 -->
@@ -267,56 +270,56 @@
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-job</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- SMS鐭俊妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-sms</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
@@ -341,7 +344,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.9.0</version>
+ <version>${maven-compiler-plugin.verison}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -350,7 +353,7 @@
<path>
<groupId>com.github.therapi</groupId>
<artifactId>therapi-runtime-javadoc-scribe</artifactId>
- <version>0.15.0</version>
+ <version>${therapi-javadoc.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
@@ -364,6 +367,45 @@
</path>
</annotationProcessorPaths>
</configuration>
+ </plugin>
+ <!-- 鍗曞厓娴嬭瘯浣跨敤 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ <configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
+ <groups>${profiles.active}</groups>
+ <!-- 鎺掗櫎鏍囩 -->
+ <excludedGroups>exclude</excludedGroups>
+ </configuration>
+ </plugin>
+ <!-- 缁熶竴鐗堟湰鍙风鐞� -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${flatten-maven-plugin.version}</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
<resources>
@@ -389,8 +431,8 @@
<repositories>
<repository>
<id>public</id>
- <name>huawei nexus</name>
- <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -400,8 +442,8 @@
<pluginRepositories>
<pluginRepository>
<id>public</id>
- <name>huawei nexus</name>
- <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+ <name>aliyun nexus</name>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -410,36 +452,6 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
- <profiles>
- <profile>
- <id>local</id>
- <properties>
- <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
- <profiles.active>local</profiles.active>
- <logging.level>debug</logging.level>
- </properties>
- </profile>
- <profile>
- <id>dev</id>
- <properties>
- <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
- <profiles.active>dev</profiles.active>
- <logging.level>debug</logging.level>
- </properties>
- <activation>
- <!-- 榛樿鐜 -->
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>prod</id>
- <properties>
- <profiles.active>prod</profiles.active>
- <logging.level>warn</logging.level>
- </properties>
- </profile>
- </profiles>
</project>
--
Gitblit v1.9.3