From 6d7f1adea87fd31788893b0cdbc0c60755b969bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 20 七月 2023 22:37:51 +0800
Subject: [PATCH] !398 修改代码生成模板，调整打开对话框和接口请求顺序 Merge pull request !398 from 小驴/5.X
---
pom.xml | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07bf337..b81d3ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
<version>${revision}</version>
@@ -13,32 +13,33 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.0.0-SNAPSHOT</revision>
- <spring-boot.version>3.0.5</spring-boot.version>
+ <revision>5.1.0-BETA</revision>
+ <spring-boot.version>3.0.8</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<spring-boot.mybatis>3.0.1</spring-boot.mybatis>
- <springdoc.version>2.0.4</springdoc.version>
+ <springdoc.version>2.1.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
<poi.version>5.2.3</poi.version>
- <easyexcel.version>3.2.1</easyexcel.version>
+ <easyexcel.version>3.3.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.34.0</satoken.version>
+ <satoken.version>1.35.0.RC</satoken.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.15</hutool.version>
+ <hutool.version>5.8.18</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
- <spring-boot-admin.version>3.0.2</spring-boot-admin.version>
- <redisson.version>3.20.0</redisson.version>
+ <spring-boot-admin.version>3.0.4</spring-boot-admin.version>
+ <redisson.version>3.20.1</redisson.version>
<lock4j.version>2.2.4</lock4j.version>
- <dynamic-ds.version>3.6.1</dynamic-ds.version>
+ <dynamic-ds.version>4.1.1</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
- <xxl-job.version>2.3.1</xxl-job.version>
- <mapstruct-plus.version>1.1.9</mapstruct-plus.version>
+ <powerjob.version>4.3.3</powerjob.version>
+ <mapstruct-plus.version>1.3.1</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
<lombok.version>1.18.26</lombok.version>
<bouncycastle.version>1.72</bouncycastle.version>
+ <justauth.version>1.16.5</justauth.version>
<!-- 绂荤嚎IP鍦板潃瀹氫綅搴� -->
<ip2region.version>2.7.0</ip2region.version>
@@ -48,8 +49,7 @@
<!-- OSS 閰嶇疆 -->
<aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.23</aliyun.sms.version>
- <tencent.sms.version>3.1.687</tencent.sms.version>
+ <sms4j.version>2.2.0</sms4j.version>
<!-- 鎻掍欢鐗堟湰 -->
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@@ -111,9 +111,16 @@
<scope>import</scope>
</dependency>
+ <!-- JustAuth 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>me.zhyd.oauth</groupId>
+ <artifactId>JustAuth</artifactId>
+ <version>${justauth.version}</version>
+ </dependency>
+
<!-- common 鐨勪緷璧栭厤缃�-->
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bom</artifactId>
<version>${revision}</version>
<type>pom</type>
@@ -194,7 +201,7 @@
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>${dynamic-ds.version}</version>
</dependency>
@@ -234,17 +241,11 @@
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk-s3.version}</version>
</dependency>
-
+ <!--鐭俊sms4j-->
<dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>dysmsapi20170525</artifactId>
- <version>${aliyun.sms.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.tencentcloudapi</groupId>
- <artifactId>tencentcloud-sdk-java-sms</artifactId>
- <version>${tencent.sms.version}</version>
+ <groupId>org.dromara.sms4j</groupId>
+ <artifactId>sms4j-spring-boot-starter</artifactId>
+ <version>${sms4j.version}</version>
</dependency>
<dependency>
@@ -271,11 +272,16 @@
<version>${lock4j.version}</version>
</dependency>
- <!-- xxl-job-core -->
+ <!-- PowerJob -->
<dependency>
- <groupId>com.xuxueli</groupId>
- <artifactId>xxl-job-core</artifactId>
- <version>${xxl-job.version}</version>
+ <groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-worker-spring-boot-starter</artifactId>
+ <version>${powerjob.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-official-processors</artifactId>
+ <version>${powerjob.version}</version>
</dependency>
<dependency>
@@ -312,25 +318,25 @@
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
- <groupId>com.ruoyi</groupId>
+ <groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${revision}</version>
</dependency>
@@ -450,8 +456,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>
@@ -461,8 +467,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>
--
Gitblit v1.9.3