study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

change log from apache common to slf4j

Browse Source
This commit is contained in:
flystar32 2019-02-19 16:29:06 +08:00
parent 27d5e01bac
commit 49cfaff25a
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java
View File

@ -18,8 +18,8 @@ package org.springframework.cloud.alibaba.nacos;
import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.ConfigService;
import org.apache.commons.logging.Log; import org.slf4j.Logger;
import org.apache.commons.logging.LogFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
@ -30,14 +30,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY; import static com.alibaba.nacos.api.PropertyKeyConst.*;
import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME;
import static com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH;
import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT;
import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE;
import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
/** /**
* nacos properties * nacos properties
@ -49,9 +42,10 @@ import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
@ConfigurationProperties(NacosConfigProperties.PREFIX) @ConfigurationProperties(NacosConfigProperties.PREFIX)
public class NacosConfigProperties { public class NacosConfigProperties {
static final String PREFIX = "spring.cloud.nacos.config"; public static final String PREFIX = "spring.cloud.nacos.config";
private static final Log log = LogFactory.getLog(NacosConfigProperties.class); private static final Logger log = LoggerFactory
.getLogger(NacosConfigProperties.class);
/** /**
* whether to enable nacos config. * whether to enable nacos config.
@ -368,11 +362,8 @@ public class NacosConfigProperties {
return configService; return configService;
} }
catch (Exception e) { catch (Exception e) {
log.error( log.error("create config service error!properties={},e=,", this, e);
"create config service error!properties=" + this.toString() + ",e=,",
e);
return null; return null;
} }
} }
} }

2
spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java
View File

@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
/** /**
* @author xiaojing * @author xiaojing
* @author pbting
*/ */
public class NacosPropertySourceRepository { public class NacosPropertySourceRepository {
@ -45,6 +46,7 @@ public class NacosPropertySourceRepository {
} }
public static NacosPropertySource getNacosPropertySource(String dataId) { public static NacosPropertySource getNacosPropertySource(String dataId) {
return nacosPropertySourceRepository.get(dataId); return nacosPropertySourceRepository.get(dataId);
} }
} }

12
spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java
View File

@ -18,7 +18,6 @@ package org.springframework.cloud.alibaba.nacos.client;
import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
@ -27,11 +26,7 @@ import org.springframework.core.io.ByteArrayResource;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.io.StringReader; import java.io.StringReader;
import java.util.Date; import java.util.*;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
/** /**
* @author xiaojing * @author xiaojing
@ -103,11 +98,10 @@ public class NacosPropertySourceBuilder {
} }
} }
catch (NacosException e) { catch (NacosException e) {
log.error("get data from Nacos error,dataId:" + dataId + ", ", e); log.error("get data from Nacos error,dataId:{}, ", dataId, e);
} }
catch (Exception e) { catch (Exception e) {
log.error("parse data from Nacos error,dataId:" + dataId + ",data:" + data log.error("parse data from Nacos error,dataId:{},data:{},", dataId, data, e);
+ ",", e);
} }
return EMPTY_PROPERTIES; return EMPTY_PROPERTIES;
} }

1
spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java
View File

@ -17,7 +17,6 @@
package org.springframework.cloud.alibaba.nacos.client; package org.springframework.cloud.alibaba.nacos.client;
import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.ConfigService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties; import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;