冲突调整

jeeplus-common/jeeplus-common-security/src/main/java/com/jeeplus/utils/SpringContextHolder.java

@@ -20,11 +20,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Lazy(false)
-public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
+public class SecuritySpringContextHolder implements ApplicationContextAware, DisposableBean {
 
 	private static ApplicationContext applicationContext = null;
 
-	private static Logger logger = LoggerFactory.getLogger(SpringContextHolder.class);
+	private static Logger logger = LoggerFactory.getLogger(SecuritySpringContextHolder.class);
 
 	/**
 	 * 取得存储在静态变量中的ApplicationContext.
@@ -66,7 +66,7 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
 	 */
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
-		SpringContextHolder.applicationContext = applicationContext;
+		SecuritySpringContextHolder.applicationContext = applicationContext;
 	}
 
 	/**
@@ -74,7 +74,7 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
 	 */
 	@Override
 	public void destroy() throws Exception {
-		SpringContextHolder.clearHolder();
+		SecuritySpringContextHolder.clearHolder();
 	}
 
 	/**

jeeplus-common/jeeplus-common-security/src/main/java/com/jeeplus/utils/StringUtils.java

@@ -248,10 +248,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 	 * 获得i18n字符串
 	 */
 	public static String getMessage(String code, Object[] args) {
-		LocaleResolver localLocaleResolver = (LocaleResolver) SpringContextHolder.getBean(LocaleResolver.class);
+		LocaleResolver localLocaleResolver = (LocaleResolver) SecuritySpringContextHolder.getBean(LocaleResolver.class);
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 		Locale localLocale = localLocaleResolver.resolveLocale(request);
-		return SpringContextHolder.getApplicationContext().getMessage(code, args, localLocale);
+		return SecuritySpringContextHolder.getApplicationContext().getMessage(code, args, localLocale);
 	}
 
 	/**