From 8557765c9ba874f7b14f8770806c6f933aa77825 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 20 一月 2023 10:22:22 +0800
Subject: [PATCH] !278 【轻量级 PR】升级 java 17 简化代码写法 Merge pull request !278 from MichelleChung/5.X
---
pom.xml | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12d8791..598cebf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,15 @@
<scope>import</scope>
</dependency>
+ <!-- common 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-bom</artifactId>
+ <version>${revision}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
@@ -156,7 +165,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 -->
@@ -170,6 +179,11 @@
<artifactId>hutool-all</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-core</artifactId>
+ <version>${satoken.version}</version>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -188,6 +202,12 @@
<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-annotation</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
@@ -266,56 +286,24 @@
<version>${snakeyaml.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟 -->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-job</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- 鏍稿績妯″潡-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-framework</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${revision}</version>
</dependency>
- <!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
+ <artifactId>ruoyi-job</artifactId>
<version>${revision}</version>
</dependency>
- <!-- OSS瀵硅薄瀛樺偍妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-oss</artifactId>
+ <artifactId>ruoyi-generator</artifactId>
<version>${revision}</version>
</dependency>
- <!-- SMS鐭俊妯″潡 -->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-sms</artifactId>
- <version>${revision}</version>
- </dependency>
-
- <!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
@@ -327,15 +315,9 @@
<modules>
<module>ruoyi-admin</module>
- <module>ruoyi-framework</module>
- <module>ruoyi-system</module>
- <module>ruoyi-job</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
- <module>ruoyi-demo</module>
<module>ruoyi-extend</module>
- <module>ruoyi-oss</module>
- <module>ruoyi-sms</module>
+ <module>ruoyi-modules</module>
</modules>
<packaging>pom</packaging>
@@ -374,7 +356,11 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
+ <argLine>
+ -Dfile.encoding=UTF-8
+ --add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.lang.invoke=ALL-UNNAMED
+ </argLine>
<!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
<groups>${profiles.active}</groups>
<!-- 鎺掗櫎鏍囩 -->
--
Gitblit v1.9.3