diff --git a/README.md b/README.md
index 352470007568a431b230c127b45cea454d122aaf..0b29552611b978f5138c5aec650b4e4c5371a25e 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ syslog查询、syslog实时查看、登录日志、审计日志
5 我有一个唯一键(比如手机号,身份证号码,但是非其他表id字段),但是我需要给客户展示他的title/name 但是我又不想自己手动做表关联查询
6 Excel导入场景,把 用户名 admin 反向翻译为 userid1 把男 反向翻译为 gender_1 (具体看官网文档)
# 最新版本
-springboot3.x 最新easy-trans版本:3.1.4 springboot 2.x 最新easy-trans版本 2.3.4
+springboot4.x 最新easy-trans版本:4.0.0 springboot3.x 最新easy-trans版本:3.1.4 springboot 2.x 最新easy-trans版本 2.3.4
# groupid和包名变更说明
从3.1.0和2.3.0开始,包名和maven的groupid由com.fhs变更为dormara社区统一的org.dromara,以下版本不变。
diff --git a/easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java b/easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java
index 978ba5f107d8b9cc0883ad161ee0032afb49f2c0..d6658311b74ebcf5316ce8551213f1f3b7b7206d 100644
--- a/easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java
+++ b/easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java
@@ -1,7 +1,7 @@
package org.dromara.common.spring;
import org.springframework.context.expression.MethodBasedEvaluationContext;
-import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.core.StandardReflectionParameterNameDiscoverer;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -24,8 +24,8 @@ public class SpelUtil {
public static String parse(String spel, Method method, Object[] args) {
//获取被拦截方法参数名列表(使用Spring支持类库)
- LocalVariableTableParameterNameDiscoverer u =
- new LocalVariableTableParameterNameDiscoverer();
+ StandardReflectionParameterNameDiscoverer u =
+ new StandardReflectionParameterNameDiscoverer();
String[] paraNameArr = u.getParameterNames(method);
//使用SPEL进行key的解析
ExpressionParser parser = new SpelExpressionParser();
@@ -49,8 +49,8 @@ public class SpelUtil {
*/
public static String parse(Object rootObject, String spel, Method method, Object[] args) {
//获取被拦截方法参数名列表(使用Spring支持类库)
- LocalVariableTableParameterNameDiscoverer u =
- new LocalVariableTableParameterNameDiscoverer();
+ StandardReflectionParameterNameDiscoverer u =
+ new StandardReflectionParameterNameDiscoverer();
String[] paraNameArr = u.getParameterNames(method);
//使用SPEL进行key的解析
ExpressionParser parser = new SpelExpressionParser();
diff --git a/easy-trans-spring-boot-starter/pom.xml b/easy-trans-spring-boot-starter/pom.xml
index 935407c9be2dad43fe9ed0cfe40bf836d6965c24..a18dbaec5c2ce10c7d3b54f080f7e17a12e27892 100644
--- a/easy-trans-spring-boot-starter/pom.xml
+++ b/easy-trans-spring-boot-starter/pom.xml
@@ -24,6 +24,10 @@
org.springframework.boot
spring-boot-autoconfigure
+
+ org.springframework.boot
+ spring-boot-restclient
+
org.springframework.cloud
spring-cloud-commons
diff --git a/easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java b/easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java
index cd2f1fab7ac569c4097024f68f57d911664eec27..471e9aa97e1d11371fe0fe9de6831f40b8d3f378 100644
--- a/easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java
+++ b/easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.*;
import org.springframework.data.redis.connection.RedisConnectionFactory;
diff --git a/pom.xml b/pom.xml
index 730bf193b4f3fb5a1f97601377aff81d8bf58c20..5ded23be743ced8cb40a7dd9ca173a267a1c754e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,14 +29,14 @@
easy-trans-dependencies
- 3.1.4
+ 4.0.0
UTF-8
17
17
2.2.4
3.5.3.2
- 3.1.5
- 6.2.16
+ 4.0.3
+ 7.0.5
5.4.12.Final
3.5.5
2.0.42
@@ -112,6 +112,12 @@
${fhs.springboot.version}
compile
+
+ org.springframework.boot
+ spring-boot-restclient
+ ${fhs.springboot.version}
+ compile
+
org.springframework.data
spring-data-redis