sync & commit in greenwich

spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java

@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import com.alibaba.nacos.client.utils.StringUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * @author zkz
@@ -118,7 +118,7 @@ public abstract class AbstractNacosDataParser {
 		Properties properties = new Properties();
 		for (Map.Entry<String, String> entry : map.entrySet()) {
 			String key = entry.getKey();
-			if (StringUtils.isBlank(key)) {
+			if (StringUtils.isEmpty(key)) {
 				continue;
 			}
 			key = key.startsWith(DOT) ? key.replaceFirst("\\.", "") : key;

spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java

@@ -22,10 +22,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
-import com.alibaba.nacos.client.utils.StringUtils;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.springframework.util.StringUtils;
+
 /**
  * @author zkz
  */

spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java

@@ -25,8 +25,7 @@ import java.util.Properties;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import com.alibaba.nacos.client.utils.StringUtils;
-
+import org.springframework.util.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;

spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java

@@ -16,12 +16,14 @@
 
 package com.alibaba.cloud.seata.web;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * @author xiaojing
  */
+@ConditionalOnWebApplication
 public class SeataHandlerInterceptorConfiguration implements WebMvcConfigurer {
 
 	@Override