diff --git a/README.md b/README.md index bfac22eb..63322eb2 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ config set notify-keyspace-events "KA" ### Gradle ``` kotlin - val governVersion = "0.7.2"; + val governVersion = "0.7.3"; implementation("me.ahoo.govern:spring-cloud-starter-config:${governVersion}") implementation("me.ahoo.govern:spring-cloud-starter-discovery:${governVersion}") ``` @@ -35,19 +35,19 @@ config set notify-keyspace-events "KA" ```xml - 0.7.2 + 0.7.3 - me.ahoo.govern - spring-cloud-starter-config - ${govern.version} + me.ahoo.govern + spring-cloud-starter-config + ${govern.version} - me.ahoo.govern - spring-cloud-starter-discovery - ${govern.version} + me.ahoo.govern + spring-cloud-starter-discovery + ${govern.version} @@ -178,4 +178,5 @@ RedisServiceRegistryBenchmark.renew thrpt 67116.1 ## TODO -1. Dashboard - UI +1. Dashboard +2. Grayscale Publishing diff --git a/gradle.properties b/gradle.properties index 37398d3b..26dadc36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=me.ahoo.govern -version=0.7.2 +version=0.7.3 description=Govern Service On Redis website=https://github.com/Ahoo-Wang/govern-service diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java similarity index 91% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java index 69c3b817..e9fa3cfd 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java @@ -1,4 +1,4 @@ -package me.ahoo.govern.disvoery.spring.cloud.discovery; +package me.ahoo.govern.discovery.spring.cloud.discovery; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java similarity index 93% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java index 96ac8819..752ae058 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java @@ -1,14 +1,12 @@ -package me.ahoo.govern.disvoery.spring.cloud.discovery; +package me.ahoo.govern.discovery.spring.cloud.discovery; import io.lettuce.core.AbstractRedisClient; import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; import me.ahoo.govern.core.listener.MessageListenable; -import me.ahoo.govern.discovery.DiscoveryKeyGenerator; import me.ahoo.govern.discovery.ServiceDiscovery; import me.ahoo.govern.discovery.redis.ConsistencyRedisServiceDiscovery; import me.ahoo.govern.discovery.redis.RedisServiceDiscovery; import me.ahoo.govern.spring.cloud.GovernAutoConfiguration; -import me.ahoo.govern.spring.cloud.GovernProperties; import me.ahoo.govern.spring.cloud.support.RedisClientSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryClient.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java similarity index 96% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryClient.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java index b60e2923..5b21310d 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryClient.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java @@ -1,4 +1,4 @@ -package me.ahoo.govern.disvoery.spring.cloud.discovery; +package me.ahoo.govern.discovery.spring.cloud.discovery; import me.ahoo.govern.discovery.ServiceDiscovery; import org.springframework.cloud.client.ServiceInstance; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryProperties.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java similarity index 92% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryProperties.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java index 4b6dcee6..748655bf 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernDiscoveryProperties.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java @@ -1,4 +1,4 @@ -package me.ahoo.govern.disvoery.spring.cloud.discovery; +package me.ahoo.govern.discovery.spring.cloud.discovery; import me.ahoo.govern.spring.cloud.GovernProperties; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernServiceInstance.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java similarity index 96% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernServiceInstance.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java index f171f3c2..95b00646 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/discovery/GovernServiceInstance.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java @@ -1,4 +1,4 @@ -package me.ahoo.govern.disvoery.spring.cloud.discovery; +package me.ahoo.govern.discovery.spring.cloud.discovery; import org.springframework.cloud.client.ServiceInstance; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernAutoServiceRegistration.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java similarity index 90% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernAutoServiceRegistration.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java index ef4796f8..4ee14cad 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernAutoServiceRegistration.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java @@ -1,11 +1,9 @@ -package me.ahoo.govern.disvoery.spring.cloud.registry; +package me.ahoo.govern.discovery.spring.cloud.registry; import lombok.var; import me.ahoo.govern.discovery.InstanceIdGenerator; import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; -import org.springframework.cloud.client.serviceregistry.Registration; -import org.springframework.cloud.client.serviceregistry.ServiceRegistry; /** * @author ahoo wang diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java similarity index 94% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java index d532690e..874ee998 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java @@ -1,12 +1,12 @@ -package me.ahoo.govern.disvoery.spring.cloud.registry; +package me.ahoo.govern.discovery.spring.cloud.registry; import io.lettuce.core.AbstractRedisClient; import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; import lombok.var; import me.ahoo.govern.discovery.*; import me.ahoo.govern.discovery.redis.RedisServiceRegistry; -import me.ahoo.govern.disvoery.spring.cloud.discovery.ConditionalOnGovernDiscoveryEnabled; -import me.ahoo.govern.disvoery.spring.cloud.discovery.GovernDiscoveryAutoConfiguration; +import me.ahoo.govern.discovery.spring.cloud.discovery.ConditionalOnGovernDiscoveryEnabled; +import me.ahoo.govern.discovery.spring.cloud.discovery.GovernDiscoveryAutoConfiguration; import me.ahoo.govern.spring.cloud.support.AppSupport; import me.ahoo.govern.spring.cloud.support.RedisClientSupport; import org.apache.logging.log4j.util.Strings; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernRegistration.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java similarity index 96% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernRegistration.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java index 1b3aae5f..39cc7687 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernRegistration.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java @@ -1,4 +1,4 @@ -package me.ahoo.govern.disvoery.spring.cloud.registry; +package me.ahoo.govern.discovery.spring.cloud.registry; import me.ahoo.govern.discovery.ServiceInstance; import org.springframework.cloud.client.serviceregistry.Registration; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernRegistryProperties.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java similarity index 92% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernRegistryProperties.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java index 6f4082b4..f4425d14 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernRegistryProperties.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java @@ -1,15 +1,14 @@ -package me.ahoo.govern.disvoery.spring.cloud.registry; +package me.ahoo.govern.discovery.spring.cloud.registry; import me.ahoo.govern.discovery.RenewProperties; -import me.ahoo.govern.disvoery.spring.cloud.discovery.GovernDiscoveryProperties; -import me.ahoo.govern.disvoery.spring.cloud.support.StatusConstants; +import me.ahoo.govern.discovery.spring.cloud.discovery.GovernDiscoveryProperties; +import me.ahoo.govern.discovery.spring.cloud.support.StatusConstants; import org.apache.logging.log4j.util.Strings; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.commons.util.InetUtils; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; /** * @author ahoo wang diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernServiceRegistry.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java similarity index 95% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernServiceRegistry.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java index 9f0a4063..5966a15a 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/registry/GovernServiceRegistry.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java @@ -1,8 +1,8 @@ -package me.ahoo.govern.disvoery.spring.cloud.registry; +package me.ahoo.govern.discovery.spring.cloud.registry; import lombok.var; import me.ahoo.govern.discovery.RenewInstanceService; -import me.ahoo.govern.disvoery.spring.cloud.support.StatusConstants; +import me.ahoo.govern.discovery.spring.cloud.support.StatusConstants; import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.cloud.client.serviceregistry.endpoint.ServiceRegistryEndpoint; diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/support/StatusConstants.java b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java similarity index 93% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/support/StatusConstants.java rename to spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java index 877729b4..207f7a89 100644 --- a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/disvoery/spring/cloud/support/StatusConstants.java +++ b/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.ahoo.govern.disvoery.spring.cloud.support; +package me.ahoo.govern.discovery.spring.cloud.support; /** diff --git a/spring-cloud-starter-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-discovery/src/main/resources/META-INF/spring.factories index bdf80fcd..0375271c 100644 --- a/spring-cloud-starter-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-starter-discovery/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ # Auto Configuration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -me.ahoo.govern.disvoery.spring.cloud.discovery.GovernDiscoveryAutoConfiguration,\ -me.ahoo.govern.disvoery.spring.cloud.registry.GovernAutoServiceRegistrationAutoConfiguration +me.ahoo.govern.discovery.spring.cloud.discovery.GovernDiscoveryAutoConfiguration,\ +me.ahoo.govern.discovery.spring.cloud.registry.GovernAutoServiceRegistrationAutoConfiguration