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 | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f4afd1..b81d3ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.1.0-SNAPSHOT</revision>
- <spring-boot.version>3.0.7</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>
@@ -22,9 +22,9 @@
<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.18</hutool.version>
@@ -32,7 +32,7 @@
<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>
<powerjob.version>4.3.3</powerjob.version>
<mapstruct-plus.version>1.3.1</mapstruct-plus.version>
@@ -201,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>
@@ -272,6 +272,17 @@
<version>${lock4j.version}</version>
</dependency>
+ <!-- PowerJob -->
+ <dependency>
+ <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>
<groupId>com.alibaba</groupId>
@@ -328,18 +339,6 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${revision}</version>
- </dependency>
-
- <!-- PowerJob -->
- <dependency>
- <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>
</dependencies>
--
Gitblit v1.9.3