diff --git a/microsphere-spring-cloud-commons/pom.xml b/microsphere-spring-cloud-commons/pom.xml
index 7a57bea..bcc2a39 100644
--- a/microsphere-spring-cloud-commons/pom.xml
+++ b/microsphere-spring-cloud-commons/pom.xml
@@ -99,6 +99,25 @@
test
-
+
+
+ org.springframework.cloud
+ spring-cloud-netflix-eureka-client
+ test
+
+
+
+ com.netflix.eureka
+ eureka-client
+ test
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+ test
+
+
+
\ No newline at end of file
diff --git a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/condition/ConditionalOnFeaturesEnabled.java b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/condition/ConditionalOnFeaturesEnabled.java
index fcc0b0c..2509dd8 100644
--- a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/condition/ConditionalOnFeaturesEnabled.java
+++ b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/condition/ConditionalOnFeaturesEnabled.java
@@ -21,7 +21,6 @@
import org.springframework.cloud.client.CommonsClientAutoConfiguration;
import org.springframework.cloud.client.actuator.FeaturesEndpoint;
import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistration;
import org.springframework.core.annotation.AliasFor;
import java.lang.annotation.Documented;
diff --git a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfiguration.java b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfiguration.java
index 4a287ac..deb59f3 100644
--- a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfiguration.java
+++ b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfiguration.java
@@ -16,11 +16,11 @@
*/
package io.microsphere.spring.cloud.client.service.registry.autoconfigure;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
import io.microsphere.spring.cloud.client.service.registry.condition.ConditionalOnAutoServiceRegistrationEnabled;
import io.microsphere.spring.web.event.WebEndpointMappingsReadyEvent;
import io.microsphere.spring.web.metadata.WebEndpointMapping;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -104,8 +104,8 @@ private void excludeMappings(Set mappings) {
|| isDispatcherServletMapping(mapping, patterns)
|| isActuatorWebEndpointMapping(patterns)
) {
- if (logger.isDebugEnabled()) {
- logger.debug("The '{}' was removed", mapping);
+ if (logger.isTraceEnabled()) {
+ logger.trace("The '{}' was removed", mapping);
}
iterator.remove();
}
diff --git a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceDeregistrationEndpoint.java b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceDeregistrationEndpoint.java
index f64b5ee..f1dbdf7 100644
--- a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceDeregistrationEndpoint.java
+++ b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceDeregistrationEndpoint.java
@@ -1,7 +1,7 @@
package io.microsphere.spring.cloud.client.service.registry.endpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
@@ -24,10 +24,14 @@ public boolean stop() {
boolean isRunning = isRunning();
if (isRunning) {
serviceRegistry.deregister(registration);
- logger.info("Service[name : '{}'] is deregistered!", applicationName);
+ if(logger.isInfoEnabled()) {
+ logger.info("Service[name : '{}'] is deregistered!", applicationName);
+ }
setRunning(false);
} else {
- logger.warn("Service[name : '{}'] is not registered, deregistration can't be executed!", applicationName);
+ if (logger.isWarnEnabled()) {
+ logger.warn("Service[name : '{}'] is not registered, deregistration can't be executed!", applicationName);
+ }
}
return isRunning;
}
diff --git a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceRegistrationEndpoint.java b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceRegistrationEndpoint.java
index 52efad1..360f85b 100644
--- a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceRegistrationEndpoint.java
+++ b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/endpoint/ServiceRegistrationEndpoint.java
@@ -1,7 +1,7 @@
package io.microsphere.spring.cloud.client.service.registry.endpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
@@ -55,9 +55,13 @@ public boolean start() {
if (!isRunning) {
serviceRegistry.register(registration);
setRunning(true);
- logger.debug("Service[name : '{}'] is registered!", applicationName);
+ if(logger.isTraceEnabled()) {
+ logger.trace("Service[name : '{}'] is registered!", applicationName);
+ }
} else {
- logger.warn("Service[name : '{}'] was registered!", applicationName);
+ if(logger.isWarnEnabled()) {
+ logger.warn("Service[name : '{}'] was registered!", applicationName);
+ }
}
return isRunning;
}
diff --git a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/util/ServiceInstanceUtils.java b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/util/ServiceInstanceUtils.java
index 2f0bbb0..af21b9f 100644
--- a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/util/ServiceInstanceUtils.java
+++ b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/util/ServiceInstanceUtils.java
@@ -18,10 +18,10 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
import io.microsphere.spring.web.metadata.WebEndpointMapping;
import io.microsphere.util.BaseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.ServiceInstance;
import java.util.Collection;
diff --git a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/fault/tolerance/tomcat/event/TomcatDynamicConfigurationListener.java b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/fault/tolerance/tomcat/event/TomcatDynamicConfigurationListener.java
index d4aaa1f..712ca8b 100644
--- a/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/fault/tolerance/tomcat/event/TomcatDynamicConfigurationListener.java
+++ b/microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/fault/tolerance/tomcat/event/TomcatDynamicConfigurationListener.java
@@ -17,12 +17,12 @@
package io.microsphere.spring.cloud.fault.tolerance.tomcat.event;
+import io.microsphere.logging.Logger;
+import io.microsphere.logging.LoggerFactory;
import org.apache.catalina.connector.Connector;
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.http11.AbstractHttp11Protocol;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
@@ -85,19 +85,23 @@ private void initCurrentServerProperties() {
}
private boolean isBeanPresent(Class> beanType) {
- return context.getBeanProvider(ConfigurationPropertiesRebinder.class).getIfAvailable() != null;
+ return context.getBeanProvider(beanType).getIfAvailable() != null;
}
@Override
public void onApplicationEvent(EnvironmentChangeEvent event) {
if (!isSourceFrom(event)) {
- logger.debug("Current context[id : '{}'] receives the other changed property names : {}", context.getId(), event.getKeys());
+ if(logger.isTraceEnabled()) {
+ logger.trace("Current context[id : '{}'] receives the other changed property names : {}", context.getId(), event.getKeys());
+ }
return;
}
Set serverPropertyNames = filterServerPropertyNames(event);
if (serverPropertyNames.isEmpty()) {
- logger.debug("Current context[id : '{}'] does not receive the property change of ServerProperties, keys : {}", context.getId(), event.getKeys());
+ if(logger.isTraceEnabled()) {
+ logger.trace("Current context[id : '{}'] does not receive the property change of ServerProperties, keys : {}", context.getId(), event.getKeys());
+ }
return;
}
@@ -123,7 +127,9 @@ private boolean isServerPropertyName(String propertyName) {
private void configureTomcatIfChanged(Set serverPropertyNames) {
ServerProperties refreshableServerProperties = getRefreshableServerProperties(serverPropertyNames);
- logger.debug("The ServerProperties property is changed to: {}", getProperties(environment, serverPropertyNames));
+ if(logger.isTraceEnabled()) {
+ logger.debug("The ServerProperties property is changed to: {}", getProperties(environment, serverPropertyNames));
+ }
configureConnector(refreshableServerProperties);
// Reset current ServerProperties
initCurrentServerProperties();
diff --git a/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/MultipleServiceRegistryTest.java b/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/MultipleServiceRegistryTest.java
index 7337d18..494d9d9 100644
--- a/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/MultipleServiceRegistryTest.java
+++ b/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/MultipleServiceRegistryTest.java
@@ -10,7 +10,6 @@
import io.microsphere.spring.cloud.client.service.registry.event.RegistrationPreRegisteredEvent;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -22,7 +21,6 @@
import org.springframework.cloud.commons.util.UtilAutoConfiguration;
import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
-import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
import org.springframework.context.ApplicationListener;
import org.springframework.test.context.ContextConfiguration;
diff --git a/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfigurationTest.java b/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfigurationTest.java
index 5d20809..f0693bf 100644
--- a/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfigurationTest.java
+++ b/microsphere-spring-cloud-commons/src/test/java/io/microsphere/spring/cloud/client/service/registry/autoconfigure/WebMvcServiceRegistryAutoConfigurationTest.java
@@ -18,6 +18,7 @@
import io.microsphere.spring.webmvc.annotation.EnableWebMvcExtension;
import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -38,6 +39,7 @@
classes = {WebMvcServiceRegistryAutoConfigurationTest.class},
properties = {
"microsphere.spring.cloud.simple.enabled=true",
+ "spring.cloud.service-registry.auto-registration.enabled=true",
"spring.cloud.kubernetes.enabled=false",
"kubernetes.informer.enabled=false",
"kubernetes.manifests.enabled=false",
diff --git a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java
index e2f6158..18c9091 100644
--- a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java
+++ b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autorefresh/AutoRefreshCapability.java
@@ -8,7 +8,13 @@
import feign.codec.Decoder;
import feign.codec.Encoder;
import feign.codec.ErrorDecoder;
-import io.microsphere.spring.cloud.openfeign.components.*;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedContract;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedDecoder;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedEncoder;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedErrorDecoder;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedFeignComponent;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedQueryMapEncoder;
+import io.microsphere.spring.cloud.openfeign.components.DecoratedRetryer;
import org.springframework.beans.BeansException;
import org.springframework.cloud.openfeign.FeignClientProperties;
import org.springframework.cloud.openfeign.FeignContext;
diff --git a/microsphere-spring-cloud-parent/pom.xml b/microsphere-spring-cloud-parent/pom.xml
index aa0a1d8..1b42341 100644
--- a/microsphere-spring-cloud-parent/pom.xml
+++ b/microsphere-spring-cloud-parent/pom.xml
@@ -20,9 +20,6 @@
- 2.7.18
- 2021.0.9
- 2021.0.6.1
0.1.1
1.20.1
@@ -103,7 +100,7 @@
2.3.12.RELEASE
Hoxton.SR12
- 2.2.9.RELEASE
+ 2.2.10
@@ -111,7 +108,7 @@
spring-cloud-2020
2.4.13
- 2020.0.6
+ 2020.0.5
2021.1
@@ -121,14 +118,16 @@
true
+
+ 2.6.15
+ 2021.0.9
+ 2021.0.6.1
+
spring-cloud-netflix-eureka
-
- true
-
org.springframework.cloud