diff --git a/pom.xml b/pom.xml
index 3eab98a3..fc69c112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
1.7
0.9.1
3.4.3.1
- 5.6.5
+ 5.7.1
2.2.6.RELEASE
11.0
2.3.1
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
index 7ffa94c9..c5d17d8b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import java.lang.reflect.Method;
+import java.util.List;
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
@@ -37,13 +38,13 @@ public class ReflectUtils extends ReflectUtil {
*/
public static void invokeSetter(Object obj, String propertyName, E value) {
Object object = obj;
- String[] names = StrUtil.split(propertyName, ".");
- for (int i = 0; i < names.length; i++) {
- if (i < names.length - 1) {
- String getterMethodName = GETTER_PREFIX + StrUtil.upperFirst(names[i]);
+ List names = StrUtil.split(propertyName, ".");
+ for (int i = 0; i < names.size(); i++) {
+ if (i < names.size() - 1) {
+ String getterMethodName = GETTER_PREFIX + StrUtil.upperFirst(names.get(i));
object = invoke(object, getterMethodName);
} else {
- String setterMethodName = SETTER_PREFIX + StrUtil.upperFirst(names[i]);
+ String setterMethodName = SETTER_PREFIX + StrUtil.upperFirst(names.get(i));
Method method = getMethodByName(object.getClass(), setterMethodName);
invoke(object, method, value);
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
index 8e98c504..14ff8a4d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
@@ -1,146 +1,65 @@
package com.ruoyi.common.utils.spring;
-import cn.hutool.core.lang.Validator;
+import cn.hutool.extra.spring.SpringUtil;
import org.springframework.aop.framework.AopContext;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
/**
- * spring工具类 方便在非spring管理环境中获取bean
- *
- * @author ruoyi
+ * spring工具类
+ *
+ * @author Lion Li
*/
@Component
-public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
-{
- /** Spring应用上下文环境 */
- private static ConfigurableListableBeanFactory beanFactory;
+public final class SpringUtils extends SpringUtil {
- private static ApplicationContext applicationContext;
+ /**
+ * 如果BeanFactory包含一个与所给名称匹配的bean定义,则返回true
+ *
+ * @param name
+ * @return boolean
+ */
+ public static boolean containsBean(String name) {
+ return getBeanFactory().containsBean(name);
+ }
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
- SpringUtils.beanFactory = beanFactory;
- }
+ /**
+ * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。
+ * 如果与给定名字相应的bean定义没有被找到,将会抛出一个异常(NoSuchBeanDefinitionException)
+ *
+ * @param name
+ * @return boolean
+ */
+ public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+ return getBeanFactory().isSingleton(name);
+ }
- @Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
- {
- SpringUtils.applicationContext = applicationContext;
- }
+ /**
+ * @param name
+ * @return Class 注册对象的类型
+ */
+ public static Class> getType(String name) throws NoSuchBeanDefinitionException {
+ return getBeanFactory().getType(name);
+ }
- /**
- * 获取对象
- *
- * @param name
- * @return Object 一个以所给名字注册的bean的实例
- * @throws org.springframework.beans.BeansException
- *
- */
- @SuppressWarnings("unchecked")
- public static T getBean(String name) throws BeansException
- {
- return (T) beanFactory.getBean(name);
- }
+ /**
+ * 如果给定的bean名字在bean定义中有别名,则返回这些别名
+ *
+ * @param name
+ */
+ public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
+ return getBeanFactory().getAliases(name);
+ }
- /**
- * 获取类型为requiredType的对象
- *
- * @param clz
- * @return
- * @throws org.springframework.beans.BeansException
- *
- */
- public static T getBean(Class clz) throws BeansException
- {
- T result = (T) beanFactory.getBean(clz);
- return result;
- }
+ /**
+ * 获取aop代理对象
+ *
+ * @param invoker
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public static T getAopProxy(T invoker) {
+ return (T) AopContext.currentProxy();
+ }
- /**
- * 如果BeanFactory包含一个与所给名称匹配的bean定义,则返回true
- *
- * @param name
- * @return boolean
- */
- public static boolean containsBean(String name)
- {
- return beanFactory.containsBean(name);
- }
-
- /**
- * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到,将会抛出一个异常(NoSuchBeanDefinitionException)
- *
- * @param name
- * @return boolean
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.isSingleton(name);
- }
-
- /**
- * @param name
- * @return Class 注册对象的类型
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static Class> getType(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getType(name);
- }
-
- /**
- * 如果给定的bean名字在bean定义中有别名,则返回这些别名
- *
- * @param name
- * @return
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getAliases(name);
- }
-
- /**
- * 获取aop代理对象
- *
- * @param invoker
- * @return
- */
- @SuppressWarnings("unchecked")
- public static T getAopProxy(T invoker)
- {
- return (T) AopContext.currentProxy();
- }
-
- /**
- * 获取当前的环境配置,无配置返回null
- *
- * @return 当前的环境配置
- */
- public static String[] getActiveProfiles()
- {
- return applicationContext.getEnvironment().getActiveProfiles();
- }
-
- /**
- * 获取当前的环境配置,当有多个环境配置时,只获取第一个
- *
- * @return 当前的环境配置
- */
- public static String getActiveProfile()
- {
- final String[] activeProfiles = getActiveProfiles();
- return Validator.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
- }
}