From a29ebef20203f982041c095d9d09af8dddb27f73 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 30 三月 2021 11:38:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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 9993b98..8e98c50 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,5 +1,6 @@
package com.ruoyi.common.utils.spring;
+import cn.hutool.core.lang.Validator;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -8,7 +9,6 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.StringUtils;
/**
* spring宸ュ叿绫� 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean
@@ -141,6 +141,6 @@
public static String getActiveProfile()
{
final String[] activeProfiles = getActiveProfiles();
- return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
+ return Validator.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
}
}
--
Gitblit v1.9.3