diff --git a/README.md b/README.md index 692a640d..7d1de6cb 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ consistency between process cache and Redis. > Kotlin DSL ``` kotlin - val governVersion = "0.9.17"; - implementation("me.ahoo.govern:spring-cloud-starter-config:${governVersion}") - implementation("me.ahoo.govern:spring-cloud-starter-discovery:${governVersion}") + val governVersion = "0.9.18"; + implementation("me.ahoo.govern:spring-cloud-starter-govern-config:${governVersion}") + implementation("me.ahoo.govern:spring-cloud-starter-govern-discovery:${governVersion}") ``` ### Maven @@ -33,18 +33,18 @@ consistency between process cache and Redis. 4.0.0 demo - 0.9.17 + 0.9.18 me.ahoo.govern - spring-cloud-starter-config + spring-cloud-starter-govern-config ${govern.version} me.ahoo.govern - spring-cloud-starter-discovery + spring-cloud-starter-govern-discovery ${govern.version} @@ -77,31 +77,31 @@ logging: #### Option 1：Download the executable file -> Download [rest-api-server](https://github.com/Ahoo-Wang/govern-service/releases/download/0.9.17/rest-api-0.9.17.tar) +> Download [govern-rest-api-server](https://github.com/Ahoo-Wang/govern-service/releases/download/0.9.18/govern-rest-api-0.9.18.tar) -> tar *rest-api-0.9.17.tar* +> tar *govern-rest-api-0.9.18.tar* ```shell -cd rest-api-0.9.17 -# Working directory: rest-api-0.9.17 -bin/rest-api --server.port=8080 --govern.redis.uri=redis://localhost:6379 +cd govern-rest-api-0.9.18 +# Working directory: govern-rest-api-0.9.18 +bin/govern-rest-api --server.port=8080 --govern.redis.uri=redis://localhost:6379 ``` #### Option 2：Run On Docker ```shell -docker pull ahoowang/govern-service:0.9.17 -docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.17 +docker pull ahoowang/govern-service:0.9.18 +docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.18 ``` --- > MacBook Pro (M1) > -> Please use *ahoowang/govern-service:0.9.17-armv7* +> Please use *ahoowang/govern-service:0.9.18-armv7* ```shell -docker pull ahoowang/govern-service:0.9.17-armv7 -docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.17-armv7 +docker pull ahoowang/govern-service:0.9.18-armv7 +docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.18-armv7 ``` #### Option 3：Run On Kubernetes @@ -127,7 +127,7 @@ spec: value: standalone - name: GOVERN_REDIS_URI value: redis://redis-uri:6379 - image: ahoowang/govern-service:0.9.17 + image: ahoowang/govern-service:0.9.18 name: govern-service resources: limits: @@ -241,7 +241,7 @@ gradle config:jmh # JMH version: 1.29 # VM version: JDK 11.0.11, OpenJDK 64-Bit Server VM, 11.0.11+9-LTS # VM invoker: /Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home/bin/java -# VM options: -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/Users/ahoo/govern-service/config/build/tmp/jmh -Duser.country=CN -Duser.language=zh -Duser.variant +# VM options: -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/Users/ahoo/govern-service/govern-config/build/tmp/jmh -Duser.country=CN -Duser.language=zh -Duser.variant # Blackhole mode: full + dont-inline hint # Warmup: 1 iterations, 10 s each # Measurement: 1 iterations, 10 s each @@ -265,7 +265,7 @@ gradle discovery:jmh # JMH version: 1.29 # VM version: JDK 11.0.11, OpenJDK 64-Bit Server VM, 11.0.11+9-LTS # VM invoker: /Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home/bin/java -# VM options: -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/Users/ahoo/govern-service/discovery/build/tmp/jmh -Duser.country=CN -Duser.language=zh -Duser.variant +# VM options: -Dfile.encoding=UTF-8 -Djava.io.tmpdir=/Users/ahoo/govern-service/govern-discovery/build/tmp/jmh -Duser.country=CN -Duser.language=zh -Duser.variant # Blackhole mode: full + dont-inline hint # Warmup: 1 iterations, 10 s each # Measurement: 1 iterations, 10 s each diff --git a/README.zh-CN.md b/README.zh-CN.md index 7ca62017..d0491df8 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -11,9 +11,9 @@ > Kotlin DSL ``` kotlin - val governVersion = "0.9.17"; - implementation("me.ahoo.govern:spring-cloud-starter-config:${governVersion}") - implementation("me.ahoo.govern:spring-cloud-starter-discovery:${governVersion}") + val governVersion = "0.9.18"; + implementation("me.ahoo.govern:spring-cloud-starter-govern-config:${governVersion}") + implementation("me.ahoo.govern:spring-cloud-starter-govern-discovery:${governVersion}") ``` ### Maven @@ -28,18 +28,18 @@ 4.0.0 demo - 0.9.17 + 0.9.18 me.ahoo.govern - spring-cloud-starter-config + spring-cloud-starter-govern-config ${govern.version} me.ahoo.govern - spring-cloud-starter-discovery + spring-cloud-starter-govern-discovery ${govern.version} @@ -72,21 +72,21 @@ logging: #### 方式一：下载可执行文件 -> 下载 [rest-api-server](https://github.com/Ahoo-Wang/govern-service/releases/download/0.9.17/rest-api-0.9.17.tar) +> 下载 [rest-api-server](https://github.com/Ahoo-Wang/govern-service/releases/download/0.9.18/govern-rest-api-0.9.18.tar) -> 解压 *rest-api-0.9.17.tar* +> 解压 *govern-rest-api-0.9.18.tar* ```shell -cd rest-api-0.9.17 -# 工作目录: rest-api-0.9.17 -bin/rest-api --server.port=8080 --govern.redis.uri=redis://localhost:6379 +cd govern-rest-api-0.9.18 +# 工作目录: govern-rest-api-0.9.18 +bin/govern-rest-api --server.port=8080 --govern.redis.uri=redis://localhost:6379 ``` #### 方式二：在 Docker 中运行 ```shell -docker pull ahoowang/govern-service:0.9.17 -docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.17 +docker pull ahoowang/govern-service:0.9.18 +docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.18 ``` #### 方式三：在 Kubernetes 中运行 @@ -112,7 +112,7 @@ spec: value: standalone - name: GOVERN_REDIS_URI value: redis://redis-uri:6379 - image: ahoowang/govern-service:0.9.17 + image: ahoowang/govern-service:0.9.18 name: govern-service resources: limits: @@ -133,11 +133,11 @@ spec: --- > MacBook Pro (M1) > -> 请使用 *ahoowang/govern-service:0.9.17-armv7* +> 请使用 *ahoowang/govern-service:0.9.18-armv7* ```shell -docker pull ahoowang/govern-service:0.9.17-armv7 -docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.17-armv7 +docker pull ahoowang/govern-service:0.9.18-armv7 +docker run --name govern-service -d -p 8080:8080 --link redis -e GOVERN_REDIS_URI=redis://redis:6379 ahoowang/govern-service:0.9.18-armv7 ``` --- diff --git a/build.gradle.kts b/build.gradle.kts index c3cd781d..9e7e20f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,14 +10,14 @@ plugins { } val bomProjects = listOf( - project(":bom"), - project(":dependencies") + project(":govern-bom"), + project(":govern-dependencies") ) val coreProjects = listOf( - project(":config"), - project(":discovery") + project(":govern-config"), + project(":govern-discovery") ) -val restApiProject = project(":rest-api") +val restApiProject = project(":govern-rest-api") val publishProjects = subprojects - restApiProject val libraryProjects = publishProjects - bomProjects @@ -61,7 +61,7 @@ configure(libraryProjects) { dependencies { val depLombok = "org.projectlombok:lombok:${rootProject.ext.get("lombokVersion")}" - this.add("api", platform(project(":dependencies"))) + this.add("api", platform(project(":govern-dependencies"))) this.add("compileOnly", depLombok) this.add("annotationProcessor", depLombok) this.add("testCompileOnly", depLombok) diff --git a/bom/build.gradle.kts b/govern-bom/build.gradle.kts similarity index 100% rename from bom/build.gradle.kts rename to govern-bom/build.gradle.kts diff --git a/config/build.gradle.kts b/govern-config/build.gradle.kts similarity index 94% rename from config/build.gradle.kts rename to govern-config/build.gradle.kts index 7c7953b2..416172b2 100644 --- a/config/build.gradle.kts +++ b/govern-config/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":core")) + api(project(":govern-core")) implementation("io.netty:netty-transport-native-epoll:linux-x86_64") implementation("io.netty:netty-transport-native-kqueue:osx-x86_64") diff --git a/config/src/jmh/java/me/ahoo/govern/config/ConsistencyRedisConfigServiceBenchmark.java b/govern-config/src/jmh/java/me/ahoo/govern/config/ConsistencyRedisConfigServiceBenchmark.java similarity index 100% rename from config/src/jmh/java/me/ahoo/govern/config/ConsistencyRedisConfigServiceBenchmark.java rename to govern-config/src/jmh/java/me/ahoo/govern/config/ConsistencyRedisConfigServiceBenchmark.java diff --git a/config/src/jmh/java/me/ahoo/govern/config/RedisConfigServiceBenchmark.java b/govern-config/src/jmh/java/me/ahoo/govern/config/RedisConfigServiceBenchmark.java similarity index 100% rename from config/src/jmh/java/me/ahoo/govern/config/RedisConfigServiceBenchmark.java rename to govern-config/src/jmh/java/me/ahoo/govern/config/RedisConfigServiceBenchmark.java diff --git a/config/src/main/java/me/ahoo/govern/config/Config.java b/govern-config/src/main/java/me/ahoo/govern/config/Config.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/Config.java rename to govern-config/src/main/java/me/ahoo/govern/config/Config.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigChangedListener.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigChangedListener.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigChangedListener.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigChangedListener.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigCodec.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigCodec.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigCodec.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigCodec.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigHistory.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigHistory.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigHistory.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigHistory.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigKeyGenerator.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigKeyGenerator.java similarity index 97% rename from config/src/main/java/me/ahoo/govern/config/ConfigKeyGenerator.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigKeyGenerator.java index 19468d5f..9d4ac033 100644 --- a/config/src/main/java/me/ahoo/govern/config/ConfigKeyGenerator.java +++ b/govern-config/src/main/java/me/ahoo/govern/config/ConfigKeyGenerator.java @@ -3,8 +3,6 @@ import com.google.common.base.Strings; import lombok.var; import me.ahoo.govern.core.Consts; -import me.ahoo.govern.core.Namespaced; -import me.ahoo.govern.core.NamespacedContext; /** * @author ahoo wang diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigListenable.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigListenable.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigListenable.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigListenable.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigRollback.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigRollback.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigRollback.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigRollback.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigService.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigService.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigService.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigService.java diff --git a/config/src/main/java/me/ahoo/govern/config/ConfigVersion.java b/govern-config/src/main/java/me/ahoo/govern/config/ConfigVersion.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/ConfigVersion.java rename to govern-config/src/main/java/me/ahoo/govern/config/ConfigVersion.java diff --git a/config/src/main/java/me/ahoo/govern/config/NamespacedConfigId.java b/govern-config/src/main/java/me/ahoo/govern/config/NamespacedConfigId.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/NamespacedConfigId.java rename to govern-config/src/main/java/me/ahoo/govern/config/NamespacedConfigId.java diff --git a/config/src/main/java/me/ahoo/govern/config/redis/ConfigRedisScripts.java b/govern-config/src/main/java/me/ahoo/govern/config/redis/ConfigRedisScripts.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/redis/ConfigRedisScripts.java rename to govern-config/src/main/java/me/ahoo/govern/config/redis/ConfigRedisScripts.java diff --git a/config/src/main/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigService.java b/govern-config/src/main/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigService.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigService.java rename to govern-config/src/main/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigService.java diff --git a/config/src/main/java/me/ahoo/govern/config/redis/RedisConfigService.java b/govern-config/src/main/java/me/ahoo/govern/config/redis/RedisConfigService.java similarity index 100% rename from config/src/main/java/me/ahoo/govern/config/redis/RedisConfigService.java rename to govern-config/src/main/java/me/ahoo/govern/config/redis/RedisConfigService.java diff --git a/config/src/main/resources/config_remove.lua b/govern-config/src/main/resources/config_remove.lua similarity index 100% rename from config/src/main/resources/config_remove.lua rename to govern-config/src/main/resources/config_remove.lua diff --git a/config/src/main/resources/config_rollback.lua b/govern-config/src/main/resources/config_rollback.lua similarity index 100% rename from config/src/main/resources/config_rollback.lua rename to govern-config/src/main/resources/config_rollback.lua diff --git a/config/src/main/resources/config_set.lua b/govern-config/src/main/resources/config_set.lua similarity index 100% rename from config/src/main/resources/config_set.lua rename to govern-config/src/main/resources/config_set.lua diff --git a/config/src/test/java/me/ahoo/govern/config/redis/BaseOnRedisClientTest.java b/govern-config/src/test/java/me/ahoo/govern/config/redis/BaseOnRedisClientTest.java similarity index 100% rename from config/src/test/java/me/ahoo/govern/config/redis/BaseOnRedisClientTest.java rename to govern-config/src/test/java/me/ahoo/govern/config/redis/BaseOnRedisClientTest.java diff --git a/config/src/test/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigServiceTest.java b/govern-config/src/test/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigServiceTest.java similarity index 100% rename from config/src/test/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigServiceTest.java rename to govern-config/src/test/java/me/ahoo/govern/config/redis/ConsistencyRedisConfigServiceTest.java diff --git a/config/src/test/java/me/ahoo/govern/config/redis/RedisConfigServiceTest.java b/govern-config/src/test/java/me/ahoo/govern/config/redis/RedisConfigServiceTest.java similarity index 98% rename from config/src/test/java/me/ahoo/govern/config/redis/RedisConfigServiceTest.java rename to govern-config/src/test/java/me/ahoo/govern/config/redis/RedisConfigServiceTest.java index b655dc59..5a20cbd7 100644 --- a/config/src/test/java/me/ahoo/govern/config/redis/RedisConfigServiceTest.java +++ b/govern-config/src/test/java/me/ahoo/govern/config/redis/RedisConfigServiceTest.java @@ -1,9 +1,7 @@ package me.ahoo.govern.config.redis; import lombok.var; -import me.ahoo.govern.config.ConfigKeyGenerator; import me.ahoo.govern.config.ConfigRollback; -import me.ahoo.govern.core.Consts; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/config/src/test/resources/logback.xml b/govern-config/src/test/resources/logback.xml similarity index 100% rename from config/src/test/resources/logback.xml rename to govern-config/src/test/resources/logback.xml diff --git a/core/build.gradle.kts b/govern-core/build.gradle.kts similarity index 100% rename from core/build.gradle.kts rename to govern-core/build.gradle.kts diff --git a/core/src/main/java/me/ahoo/govern/core/Consts.java b/govern-core/src/main/java/me/ahoo/govern/core/Consts.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/Consts.java rename to govern-core/src/main/java/me/ahoo/govern/core/Consts.java diff --git a/core/src/main/java/me/ahoo/govern/core/GovernException.java b/govern-core/src/main/java/me/ahoo/govern/core/GovernException.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/GovernException.java rename to govern-core/src/main/java/me/ahoo/govern/core/GovernException.java diff --git a/core/src/main/java/me/ahoo/govern/core/NamespaceService.java b/govern-core/src/main/java/me/ahoo/govern/core/NamespaceService.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/NamespaceService.java rename to govern-core/src/main/java/me/ahoo/govern/core/NamespaceService.java diff --git a/core/src/main/java/me/ahoo/govern/core/Namespaced.java b/govern-core/src/main/java/me/ahoo/govern/core/Namespaced.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/Namespaced.java rename to govern-core/src/main/java/me/ahoo/govern/core/Namespaced.java diff --git a/core/src/main/java/me/ahoo/govern/core/NamespacedContext.java b/govern-core/src/main/java/me/ahoo/govern/core/NamespacedContext.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/NamespacedContext.java rename to govern-core/src/main/java/me/ahoo/govern/core/NamespacedContext.java diff --git a/core/src/main/java/me/ahoo/govern/core/NamespacedProperties.java b/govern-core/src/main/java/me/ahoo/govern/core/NamespacedProperties.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/NamespacedProperties.java rename to govern-core/src/main/java/me/ahoo/govern/core/NamespacedProperties.java diff --git a/core/src/main/java/me/ahoo/govern/core/RedisConfig.java b/govern-core/src/main/java/me/ahoo/govern/core/RedisConfig.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/RedisConfig.java rename to govern-core/src/main/java/me/ahoo/govern/core/RedisConfig.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/AbstractMessageListenable.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/AbstractMessageListenable.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/AbstractMessageListenable.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/AbstractMessageListenable.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/ChannelTopic.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/ChannelTopic.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/ChannelTopic.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/ChannelTopic.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/MessageListenable.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/MessageListenable.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/MessageListenable.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/MessageListenable.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/MessageListener.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/MessageListener.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/MessageListener.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/MessageListener.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/PatternTopic.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/PatternTopic.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/PatternTopic.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/PatternTopic.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/RedisClusterMessageListenable.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/RedisClusterMessageListenable.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/RedisClusterMessageListenable.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/RedisClusterMessageListenable.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/RedisMessageListenable.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/RedisMessageListenable.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/RedisMessageListenable.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/RedisMessageListenable.java diff --git a/core/src/main/java/me/ahoo/govern/core/listener/Topic.java b/govern-core/src/main/java/me/ahoo/govern/core/listener/Topic.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/listener/Topic.java rename to govern-core/src/main/java/me/ahoo/govern/core/listener/Topic.java diff --git a/core/src/main/java/me/ahoo/govern/core/redis/RedisNamespaceService.java b/govern-core/src/main/java/me/ahoo/govern/core/redis/RedisNamespaceService.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/redis/RedisNamespaceService.java rename to govern-core/src/main/java/me/ahoo/govern/core/redis/RedisNamespaceService.java diff --git a/core/src/main/java/me/ahoo/govern/core/util/Futures.java b/govern-core/src/main/java/me/ahoo/govern/core/util/Futures.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/util/Futures.java rename to govern-core/src/main/java/me/ahoo/govern/core/util/Futures.java diff --git a/core/src/main/java/me/ahoo/govern/core/util/RedisKeySpaces.java b/govern-core/src/main/java/me/ahoo/govern/core/util/RedisKeySpaces.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/util/RedisKeySpaces.java rename to govern-core/src/main/java/me/ahoo/govern/core/util/RedisKeySpaces.java diff --git a/core/src/main/java/me/ahoo/govern/core/util/RedisScripts.java b/govern-core/src/main/java/me/ahoo/govern/core/util/RedisScripts.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/util/RedisScripts.java rename to govern-core/src/main/java/me/ahoo/govern/core/util/RedisScripts.java diff --git a/core/src/main/java/me/ahoo/govern/core/util/Systems.java b/govern-core/src/main/java/me/ahoo/govern/core/util/Systems.java similarity index 100% rename from core/src/main/java/me/ahoo/govern/core/util/Systems.java rename to govern-core/src/main/java/me/ahoo/govern/core/util/Systems.java diff --git a/core/src/main/resources/warn_clear_test_data.lua b/govern-core/src/main/resources/warn_clear_test_data.lua similarity index 100% rename from core/src/main/resources/warn_clear_test_data.lua rename to govern-core/src/main/resources/warn_clear_test_data.lua diff --git a/core/src/main/resources/warn_clear_test_data_unpack.lua b/govern-core/src/main/resources/warn_clear_test_data_unpack.lua similarity index 100% rename from core/src/main/resources/warn_clear_test_data_unpack.lua rename to govern-core/src/main/resources/warn_clear_test_data_unpack.lua diff --git a/core/src/test/java/me/ahoo/govern/core/TestRedisClient.java b/govern-core/src/test/java/me/ahoo/govern/core/TestRedisClient.java similarity index 100% rename from core/src/test/java/me/ahoo/govern/core/TestRedisClient.java rename to govern-core/src/test/java/me/ahoo/govern/core/TestRedisClient.java diff --git a/core/src/test/java/me/ahoo/govern/core/listener/RedisMessageListenableTest.java b/govern-core/src/test/java/me/ahoo/govern/core/listener/RedisMessageListenableTest.java similarity index 100% rename from core/src/test/java/me/ahoo/govern/core/listener/RedisMessageListenableTest.java rename to govern-core/src/test/java/me/ahoo/govern/core/listener/RedisMessageListenableTest.java diff --git a/core/src/test/java/me/ahoo/govern/core/redis/RedisNamespaceServiceTest.java b/govern-core/src/test/java/me/ahoo/govern/core/redis/RedisNamespaceServiceTest.java similarity index 92% rename from core/src/test/java/me/ahoo/govern/core/redis/RedisNamespaceServiceTest.java rename to govern-core/src/test/java/me/ahoo/govern/core/redis/RedisNamespaceServiceTest.java index 47cf5f04..84e1d1c6 100644 --- a/core/src/test/java/me/ahoo/govern/core/redis/RedisNamespaceServiceTest.java +++ b/govern-core/src/test/java/me/ahoo/govern/core/redis/RedisNamespaceServiceTest.java @@ -5,14 +5,11 @@ import lombok.var; import me.ahoo.govern.core.NamespaceService; import me.ahoo.govern.core.TestRedisClient; -import me.ahoo.govern.core.listener.RedisMessageListenable; import org.junit.jupiter.api.*; import java.util.Objects; import java.util.UUID; -import static org.junit.jupiter.api.Assertions.*; - /** * @author ahoo wang */ diff --git a/core/src/test/java/me/ahoo/govern/core/util/ScriptTest.java b/govern-core/src/test/java/me/ahoo/govern/core/util/ScriptTest.java similarity index 100% rename from core/src/test/java/me/ahoo/govern/core/util/ScriptTest.java rename to govern-core/src/test/java/me/ahoo/govern/core/util/ScriptTest.java diff --git a/core/src/test/java/me/ahoo/govern/core/util/SystemsTest.java b/govern-core/src/test/java/me/ahoo/govern/core/util/SystemsTest.java similarity index 100% rename from core/src/test/java/me/ahoo/govern/core/util/SystemsTest.java rename to govern-core/src/test/java/me/ahoo/govern/core/util/SystemsTest.java diff --git a/core/src/test/resources/logback.xml b/govern-core/src/test/resources/logback.xml similarity index 100% rename from core/src/test/resources/logback.xml rename to govern-core/src/test/resources/logback.xml diff --git a/dashboard/.browserslistrc b/govern-dashboard/.browserslistrc similarity index 100% rename from dashboard/.browserslistrc rename to govern-dashboard/.browserslistrc diff --git a/dashboard/.editorconfig b/govern-dashboard/.editorconfig similarity index 100% rename from dashboard/.editorconfig rename to govern-dashboard/.editorconfig diff --git a/dashboard/.gitignore b/govern-dashboard/.gitignore similarity index 100% rename from dashboard/.gitignore rename to govern-dashboard/.gitignore diff --git a/dashboard/README.md b/govern-dashboard/README.md similarity index 100% rename from dashboard/README.md rename to govern-dashboard/README.md diff --git a/dashboard/angular.json b/govern-dashboard/angular.json similarity index 100% rename from dashboard/angular.json rename to govern-dashboard/angular.json diff --git a/dashboard/e2e/protractor.conf.js b/govern-dashboard/e2e/protractor.conf.js similarity index 100% rename from dashboard/e2e/protractor.conf.js rename to govern-dashboard/e2e/protractor.conf.js diff --git a/dashboard/e2e/src/app.e2e-spec.ts b/govern-dashboard/e2e/src/app.e2e-spec.ts similarity index 100% rename from dashboard/e2e/src/app.e2e-spec.ts rename to govern-dashboard/e2e/src/app.e2e-spec.ts diff --git a/dashboard/e2e/src/app.po.ts b/govern-dashboard/e2e/src/app.po.ts similarity index 100% rename from dashboard/e2e/src/app.po.ts rename to govern-dashboard/e2e/src/app.po.ts diff --git a/dashboard/e2e/tsconfig.json b/govern-dashboard/e2e/tsconfig.json similarity index 100% rename from dashboard/e2e/tsconfig.json rename to govern-dashboard/e2e/tsconfig.json diff --git a/dashboard/karma.conf.js b/govern-dashboard/karma.conf.js similarity index 100% rename from dashboard/karma.conf.js rename to govern-dashboard/karma.conf.js diff --git a/dashboard/package.json b/govern-dashboard/package.json similarity index 100% rename from dashboard/package.json rename to govern-dashboard/package.json diff --git a/dashboard/src/app/api/config/ConfigClient.ts b/govern-dashboard/src/app/api/config/ConfigClient.ts similarity index 100% rename from dashboard/src/app/api/config/ConfigClient.ts rename to govern-dashboard/src/app/api/config/ConfigClient.ts diff --git a/dashboard/src/app/api/config/ConfigDto.ts b/govern-dashboard/src/app/api/config/ConfigDto.ts similarity index 100% rename from dashboard/src/app/api/config/ConfigDto.ts rename to govern-dashboard/src/app/api/config/ConfigDto.ts diff --git a/dashboard/src/app/api/config/ConfigHistoryDto.ts b/govern-dashboard/src/app/api/config/ConfigHistoryDto.ts similarity index 100% rename from dashboard/src/app/api/config/ConfigHistoryDto.ts rename to govern-dashboard/src/app/api/config/ConfigHistoryDto.ts diff --git a/dashboard/src/app/api/config/ConfigVersionDto.ts b/govern-dashboard/src/app/api/config/ConfigVersionDto.ts similarity index 100% rename from dashboard/src/app/api/config/ConfigVersionDto.ts rename to govern-dashboard/src/app/api/config/ConfigVersionDto.ts diff --git a/dashboard/src/app/api/config/Configs.ts b/govern-dashboard/src/app/api/config/Configs.ts similarity index 100% rename from dashboard/src/app/api/config/Configs.ts rename to govern-dashboard/src/app/api/config/Configs.ts diff --git a/dashboard/src/app/api/config/ImportResponse.ts b/govern-dashboard/src/app/api/config/ImportResponse.ts similarity index 100% rename from dashboard/src/app/api/config/ImportResponse.ts rename to govern-dashboard/src/app/api/config/ImportResponse.ts diff --git a/dashboard/src/app/api/namespace/NamespaceClient.ts b/govern-dashboard/src/app/api/namespace/NamespaceClient.ts similarity index 100% rename from dashboard/src/app/api/namespace/NamespaceClient.ts rename to govern-dashboard/src/app/api/namespace/NamespaceClient.ts diff --git a/dashboard/src/app/api/service/Instances.ts b/govern-dashboard/src/app/api/service/Instances.ts similarity index 100% rename from dashboard/src/app/api/service/Instances.ts rename to govern-dashboard/src/app/api/service/Instances.ts diff --git a/dashboard/src/app/api/service/ServiceClient.ts b/govern-dashboard/src/app/api/service/ServiceClient.ts similarity index 100% rename from dashboard/src/app/api/service/ServiceClient.ts rename to govern-dashboard/src/app/api/service/ServiceClient.ts diff --git a/dashboard/src/app/api/service/ServiceInstanceDto.ts b/govern-dashboard/src/app/api/service/ServiceInstanceDto.ts similarity index 100% rename from dashboard/src/app/api/service/ServiceInstanceDto.ts rename to govern-dashboard/src/app/api/service/ServiceInstanceDto.ts diff --git a/dashboard/src/app/api/service/ServiceStatDto.ts b/govern-dashboard/src/app/api/service/ServiceStatDto.ts similarity index 100% rename from dashboard/src/app/api/service/ServiceStatDto.ts rename to govern-dashboard/src/app/api/service/ServiceStatDto.ts diff --git a/dashboard/src/app/api/stat/StatClient.ts b/govern-dashboard/src/app/api/stat/StatClient.ts similarity index 100% rename from dashboard/src/app/api/stat/StatClient.ts rename to govern-dashboard/src/app/api/stat/StatClient.ts diff --git a/dashboard/src/app/api/stat/StatDto.ts b/govern-dashboard/src/app/api/stat/StatDto.ts similarity index 100% rename from dashboard/src/app/api/stat/StatDto.ts rename to govern-dashboard/src/app/api/stat/StatDto.ts diff --git a/dashboard/src/app/api/stat/Stats.ts b/govern-dashboard/src/app/api/stat/Stats.ts similarity index 100% rename from dashboard/src/app/api/stat/Stats.ts rename to govern-dashboard/src/app/api/stat/Stats.ts diff --git a/dashboard/src/app/app-routing.module.ts b/govern-dashboard/src/app/app-routing.module.ts similarity index 100% rename from dashboard/src/app/app-routing.module.ts rename to govern-dashboard/src/app/app-routing.module.ts diff --git a/dashboard/src/app/app.component.html b/govern-dashboard/src/app/app.component.html similarity index 100% rename from dashboard/src/app/app.component.html rename to govern-dashboard/src/app/app.component.html diff --git a/dashboard/src/app/app.component.scss b/govern-dashboard/src/app/app.component.scss similarity index 100% rename from dashboard/src/app/app.component.scss rename to govern-dashboard/src/app/app.component.scss diff --git a/dashboard/src/app/app.component.spec.ts b/govern-dashboard/src/app/app.component.spec.ts similarity index 100% rename from dashboard/src/app/app.component.spec.ts rename to govern-dashboard/src/app/app.component.spec.ts diff --git a/dashboard/src/app/app.component.ts b/govern-dashboard/src/app/app.component.ts similarity index 100% rename from dashboard/src/app/app.component.ts rename to govern-dashboard/src/app/app.component.ts diff --git a/dashboard/src/app/app.module.ts b/govern-dashboard/src/app/app.module.ts similarity index 100% rename from dashboard/src/app/app.module.ts rename to govern-dashboard/src/app/app.module.ts diff --git a/dashboard/src/app/components/config/config-editor.service.spec.ts b/govern-dashboard/src/app/components/config/config-editor.service.spec.ts similarity index 100% rename from dashboard/src/app/components/config/config-editor.service.spec.ts rename to govern-dashboard/src/app/components/config/config-editor.service.spec.ts diff --git a/dashboard/src/app/components/config/config-editor.service.ts b/govern-dashboard/src/app/components/config/config-editor.service.ts similarity index 100% rename from dashboard/src/app/components/config/config-editor.service.ts rename to govern-dashboard/src/app/components/config/config-editor.service.ts diff --git a/dashboard/src/app/components/config/config-editor/config-editor.component.html b/govern-dashboard/src/app/components/config/config-editor/config-editor.component.html similarity index 100% rename from dashboard/src/app/components/config/config-editor/config-editor.component.html rename to govern-dashboard/src/app/components/config/config-editor/config-editor.component.html diff --git a/dashboard/src/app/components/config/config-editor/config-editor.component.scss b/govern-dashboard/src/app/components/config/config-editor/config-editor.component.scss similarity index 100% rename from dashboard/src/app/components/config/config-editor/config-editor.component.scss rename to govern-dashboard/src/app/components/config/config-editor/config-editor.component.scss diff --git a/dashboard/src/app/components/config/config-editor/config-editor.component.spec.ts b/govern-dashboard/src/app/components/config/config-editor/config-editor.component.spec.ts similarity index 100% rename from dashboard/src/app/components/config/config-editor/config-editor.component.spec.ts rename to govern-dashboard/src/app/components/config/config-editor/config-editor.component.spec.ts diff --git a/dashboard/src/app/components/config/config-editor/config-editor.component.ts b/govern-dashboard/src/app/components/config/config-editor/config-editor.component.ts similarity index 100% rename from dashboard/src/app/components/config/config-editor/config-editor.component.ts rename to govern-dashboard/src/app/components/config/config-editor/config-editor.component.ts diff --git a/dashboard/src/app/components/config/config-importer/config-importer.component.html b/govern-dashboard/src/app/components/config/config-importer/config-importer.component.html similarity index 100% rename from dashboard/src/app/components/config/config-importer/config-importer.component.html rename to govern-dashboard/src/app/components/config/config-importer/config-importer.component.html diff --git a/dashboard/src/app/components/config/config-importer/config-importer.component.scss b/govern-dashboard/src/app/components/config/config-importer/config-importer.component.scss similarity index 100% rename from dashboard/src/app/components/config/config-importer/config-importer.component.scss rename to govern-dashboard/src/app/components/config/config-importer/config-importer.component.scss diff --git a/dashboard/src/app/components/config/config-importer/config-importer.component.spec.ts b/govern-dashboard/src/app/components/config/config-importer/config-importer.component.spec.ts similarity index 100% rename from dashboard/src/app/components/config/config-importer/config-importer.component.spec.ts rename to govern-dashboard/src/app/components/config/config-importer/config-importer.component.spec.ts diff --git a/dashboard/src/app/components/config/config-importer/config-importer.component.ts b/govern-dashboard/src/app/components/config/config-importer/config-importer.component.ts similarity index 100% rename from dashboard/src/app/components/config/config-importer/config-importer.component.ts rename to govern-dashboard/src/app/components/config/config-importer/config-importer.component.ts diff --git a/dashboard/src/app/components/config/config-version-list/config-version-list.component.html b/govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.html similarity index 100% rename from dashboard/src/app/components/config/config-version-list/config-version-list.component.html rename to govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.html diff --git a/dashboard/src/app/components/config/config-version-list/config-version-list.component.scss b/govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.scss similarity index 100% rename from dashboard/src/app/components/config/config-version-list/config-version-list.component.scss rename to govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.scss diff --git a/dashboard/src/app/components/config/config-version-list/config-version-list.component.spec.ts b/govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.spec.ts similarity index 100% rename from dashboard/src/app/components/config/config-version-list/config-version-list.component.spec.ts rename to govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.spec.ts diff --git a/dashboard/src/app/components/config/config-version-list/config-version-list.component.ts b/govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.ts similarity index 100% rename from dashboard/src/app/components/config/config-version-list/config-version-list.component.ts rename to govern-dashboard/src/app/components/config/config-version-list/config-version-list.component.ts diff --git a/dashboard/src/app/components/config/config-version/config-version.component.html b/govern-dashboard/src/app/components/config/config-version/config-version.component.html similarity index 100% rename from dashboard/src/app/components/config/config-version/config-version.component.html rename to govern-dashboard/src/app/components/config/config-version/config-version.component.html diff --git a/dashboard/src/app/components/config/config-version/config-version.component.scss b/govern-dashboard/src/app/components/config/config-version/config-version.component.scss similarity index 100% rename from dashboard/src/app/components/config/config-version/config-version.component.scss rename to govern-dashboard/src/app/components/config/config-version/config-version.component.scss diff --git a/dashboard/src/app/components/config/config-version/config-version.component.spec.ts b/govern-dashboard/src/app/components/config/config-version/config-version.component.spec.ts similarity index 100% rename from dashboard/src/app/components/config/config-version/config-version.component.spec.ts rename to govern-dashboard/src/app/components/config/config-version/config-version.component.spec.ts diff --git a/dashboard/src/app/components/config/config-version/config-version.component.ts b/govern-dashboard/src/app/components/config/config-version/config-version.component.ts similarity index 100% rename from dashboard/src/app/components/config/config-version/config-version.component.ts rename to govern-dashboard/src/app/components/config/config-version/config-version.component.ts diff --git a/dashboard/src/app/components/config/config.component.html b/govern-dashboard/src/app/components/config/config.component.html similarity index 100% rename from dashboard/src/app/components/config/config.component.html rename to govern-dashboard/src/app/components/config/config.component.html diff --git a/dashboard/src/app/components/config/config.component.scss b/govern-dashboard/src/app/components/config/config.component.scss similarity index 100% rename from dashboard/src/app/components/config/config.component.scss rename to govern-dashboard/src/app/components/config/config.component.scss diff --git a/dashboard/src/app/components/config/config.component.spec.ts b/govern-dashboard/src/app/components/config/config.component.spec.ts similarity index 100% rename from dashboard/src/app/components/config/config.component.spec.ts rename to govern-dashboard/src/app/components/config/config.component.spec.ts diff --git a/dashboard/src/app/components/config/config.component.ts b/govern-dashboard/src/app/components/config/config.component.ts similarity index 100% rename from dashboard/src/app/components/config/config.component.ts rename to govern-dashboard/src/app/components/config/config.component.ts diff --git a/dashboard/src/app/components/dashboard/dashboard.component.html b/govern-dashboard/src/app/components/dashboard/dashboard.component.html similarity index 100% rename from dashboard/src/app/components/dashboard/dashboard.component.html rename to govern-dashboard/src/app/components/dashboard/dashboard.component.html diff --git a/dashboard/src/app/components/dashboard/dashboard.component.scss b/govern-dashboard/src/app/components/dashboard/dashboard.component.scss similarity index 100% rename from dashboard/src/app/components/dashboard/dashboard.component.scss rename to govern-dashboard/src/app/components/dashboard/dashboard.component.scss diff --git a/dashboard/src/app/components/dashboard/dashboard.component.spec.ts b/govern-dashboard/src/app/components/dashboard/dashboard.component.spec.ts similarity index 100% rename from dashboard/src/app/components/dashboard/dashboard.component.spec.ts rename to govern-dashboard/src/app/components/dashboard/dashboard.component.spec.ts diff --git a/dashboard/src/app/components/dashboard/dashboard.component.ts b/govern-dashboard/src/app/components/dashboard/dashboard.component.ts similarity index 100% rename from dashboard/src/app/components/dashboard/dashboard.component.ts rename to govern-dashboard/src/app/components/dashboard/dashboard.component.ts diff --git a/dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.css b/govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.css similarity index 100% rename from dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.css rename to govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.css diff --git a/dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.html b/govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.html similarity index 100% rename from dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.html rename to govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.html diff --git a/dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.spec.ts b/govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.spec.ts similarity index 100% rename from dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.spec.ts rename to govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.spec.ts diff --git a/dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.ts b/govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.ts similarity index 100% rename from dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.ts rename to govern-dashboard/src/app/components/namespace/namespace-selector/namespace-selector.component.ts diff --git a/dashboard/src/app/components/namespace/namespace.component.html b/govern-dashboard/src/app/components/namespace/namespace.component.html similarity index 100% rename from dashboard/src/app/components/namespace/namespace.component.html rename to govern-dashboard/src/app/components/namespace/namespace.component.html diff --git a/dashboard/src/app/components/namespace/namespace.component.scss b/govern-dashboard/src/app/components/namespace/namespace.component.scss similarity index 100% rename from dashboard/src/app/components/namespace/namespace.component.scss rename to govern-dashboard/src/app/components/namespace/namespace.component.scss diff --git a/dashboard/src/app/components/namespace/namespace.component.ts b/govern-dashboard/src/app/components/namespace/namespace.component.ts similarity index 100% rename from dashboard/src/app/components/namespace/namespace.component.ts rename to govern-dashboard/src/app/components/namespace/namespace.component.ts diff --git a/dashboard/src/app/components/service/instance-editor.service.spec.ts b/govern-dashboard/src/app/components/service/instance-editor.service.spec.ts similarity index 100% rename from dashboard/src/app/components/service/instance-editor.service.spec.ts rename to govern-dashboard/src/app/components/service/instance-editor.service.spec.ts diff --git a/dashboard/src/app/components/service/instance-editor.service.ts b/govern-dashboard/src/app/components/service/instance-editor.service.ts similarity index 100% rename from dashboard/src/app/components/service/instance-editor.service.ts rename to govern-dashboard/src/app/components/service/instance-editor.service.ts diff --git a/dashboard/src/app/components/service/instance-editor/instance-editor.component.html b/govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.html similarity index 100% rename from dashboard/src/app/components/service/instance-editor/instance-editor.component.html rename to govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.html diff --git a/dashboard/src/app/components/service/instance-editor/instance-editor.component.scss b/govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.scss similarity index 100% rename from dashboard/src/app/components/service/instance-editor/instance-editor.component.scss rename to govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.scss diff --git a/dashboard/src/app/components/service/instance-editor/instance-editor.component.spec.ts b/govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.spec.ts similarity index 100% rename from dashboard/src/app/components/service/instance-editor/instance-editor.component.spec.ts rename to govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.spec.ts diff --git a/dashboard/src/app/components/service/instance-editor/instance-editor.component.ts b/govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.ts similarity index 100% rename from dashboard/src/app/components/service/instance-editor/instance-editor.component.ts rename to govern-dashboard/src/app/components/service/instance-editor/instance-editor.component.ts diff --git a/dashboard/src/app/components/service/service-instance-list/service-instance-list.component.html b/govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.html similarity index 100% rename from dashboard/src/app/components/service/service-instance-list/service-instance-list.component.html rename to govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.html diff --git a/dashboard/src/app/components/service/service-instance-list/service-instance-list.component.scss b/govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.scss similarity index 100% rename from dashboard/src/app/components/service/service-instance-list/service-instance-list.component.scss rename to govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.scss diff --git a/dashboard/src/app/components/service/service-instance-list/service-instance-list.component.spec.ts b/govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.spec.ts similarity index 100% rename from dashboard/src/app/components/service/service-instance-list/service-instance-list.component.spec.ts rename to govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.spec.ts diff --git a/dashboard/src/app/components/service/service-instance-list/service-instance-list.component.ts b/govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.ts similarity index 100% rename from dashboard/src/app/components/service/service-instance-list/service-instance-list.component.ts rename to govern-dashboard/src/app/components/service/service-instance-list/service-instance-list.component.ts diff --git a/dashboard/src/app/components/service/service.component.html b/govern-dashboard/src/app/components/service/service.component.html similarity index 100% rename from dashboard/src/app/components/service/service.component.html rename to govern-dashboard/src/app/components/service/service.component.html diff --git a/dashboard/src/app/components/service/service.component.scss b/govern-dashboard/src/app/components/service/service.component.scss similarity index 100% rename from dashboard/src/app/components/service/service.component.scss rename to govern-dashboard/src/app/components/service/service.component.scss diff --git a/dashboard/src/app/components/service/service.component.spec.ts b/govern-dashboard/src/app/components/service/service.component.spec.ts similarity index 100% rename from dashboard/src/app/components/service/service.component.spec.ts rename to govern-dashboard/src/app/components/service/service.component.spec.ts diff --git a/dashboard/src/app/components/service/service.component.ts b/govern-dashboard/src/app/components/service/service.component.ts similarity index 100% rename from dashboard/src/app/components/service/service.component.ts rename to govern-dashboard/src/app/components/service/service.component.ts diff --git a/dashboard/src/app/core/NamespaceContext.ts b/govern-dashboard/src/app/core/NamespaceContext.ts similarity index 100% rename from dashboard/src/app/core/NamespaceContext.ts rename to govern-dashboard/src/app/core/NamespaceContext.ts diff --git a/dashboard/src/app/icons-provider.module.ts b/govern-dashboard/src/app/icons-provider.module.ts similarity index 100% rename from dashboard/src/app/icons-provider.module.ts rename to govern-dashboard/src/app/icons-provider.module.ts diff --git a/dashboard/src/app/model/KeyValuePair.ts b/govern-dashboard/src/app/model/KeyValuePair.ts similarity index 100% rename from dashboard/src/app/model/KeyValuePair.ts rename to govern-dashboard/src/app/model/KeyValuePair.ts diff --git a/dashboard/src/app/model/RowExpand.ts b/govern-dashboard/src/app/model/RowExpand.ts similarity index 100% rename from dashboard/src/app/model/RowExpand.ts rename to govern-dashboard/src/app/model/RowExpand.ts diff --git a/dashboard/src/assets/.gitkeep b/govern-dashboard/src/assets/.gitkeep similarity index 100% rename from dashboard/src/assets/.gitkeep rename to govern-dashboard/src/assets/.gitkeep diff --git a/dashboard/src/environments/environment.prod.ts b/govern-dashboard/src/environments/environment.prod.ts similarity index 100% rename from dashboard/src/environments/environment.prod.ts rename to govern-dashboard/src/environments/environment.prod.ts diff --git a/dashboard/src/environments/environment.ts b/govern-dashboard/src/environments/environment.ts similarity index 100% rename from dashboard/src/environments/environment.ts rename to govern-dashboard/src/environments/environment.ts diff --git a/dashboard/src/index.html b/govern-dashboard/src/index.html similarity index 100% rename from dashboard/src/index.html rename to govern-dashboard/src/index.html diff --git a/dashboard/src/main.ts b/govern-dashboard/src/main.ts similarity index 100% rename from dashboard/src/main.ts rename to govern-dashboard/src/main.ts diff --git a/dashboard/src/polyfills.ts b/govern-dashboard/src/polyfills.ts similarity index 100% rename from dashboard/src/polyfills.ts rename to govern-dashboard/src/polyfills.ts diff --git a/dashboard/src/styles.scss b/govern-dashboard/src/styles.scss similarity index 100% rename from dashboard/src/styles.scss rename to govern-dashboard/src/styles.scss diff --git a/dashboard/src/test.ts b/govern-dashboard/src/test.ts similarity index 100% rename from dashboard/src/test.ts rename to govern-dashboard/src/test.ts diff --git a/dashboard/tsconfig.app.json b/govern-dashboard/tsconfig.app.json similarity index 100% rename from dashboard/tsconfig.app.json rename to govern-dashboard/tsconfig.app.json diff --git a/dashboard/tsconfig.json b/govern-dashboard/tsconfig.json similarity index 100% rename from dashboard/tsconfig.json rename to govern-dashboard/tsconfig.json diff --git a/dashboard/tsconfig.spec.json b/govern-dashboard/tsconfig.spec.json similarity index 100% rename from dashboard/tsconfig.spec.json rename to govern-dashboard/tsconfig.spec.json diff --git a/dashboard/tslint.json b/govern-dashboard/tslint.json similarity index 100% rename from dashboard/tslint.json rename to govern-dashboard/tslint.json diff --git a/dependencies/build.gradle.kts b/govern-dependencies/build.gradle.kts similarity index 100% rename from dependencies/build.gradle.kts rename to govern-dependencies/build.gradle.kts diff --git a/discovery/build.gradle.kts b/govern-discovery/build.gradle.kts similarity index 95% rename from discovery/build.gradle.kts rename to govern-discovery/build.gradle.kts index ea11a705..8549da1c 100644 --- a/discovery/build.gradle.kts +++ b/govern-discovery/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":core")) + api(project(":govern-core")) api("io.lettuce:lettuce-core") implementation("io.netty:netty-transport-native-epoll:linux-x86_64") implementation("io.netty:netty-transport-native-kqueue:osx-x86_64") diff --git a/discovery/src/jmh/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryBenchmark.java b/govern-discovery/src/jmh/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryBenchmark.java similarity index 100% rename from discovery/src/jmh/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryBenchmark.java rename to govern-discovery/src/jmh/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryBenchmark.java diff --git a/discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceDiscoveryBenchmark.java b/govern-discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceDiscoveryBenchmark.java similarity index 97% rename from discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceDiscoveryBenchmark.java rename to govern-discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceDiscoveryBenchmark.java index c3b39ad0..d179a898 100644 --- a/discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceDiscoveryBenchmark.java +++ b/govern-discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceDiscoveryBenchmark.java @@ -2,8 +2,6 @@ import io.lettuce.core.RedisClient; import io.lettuce.core.api.StatefulRedisConnection; -import lombok.var; -import me.ahoo.govern.core.Consts; import me.ahoo.govern.discovery.redis.RedisServiceDiscovery; import me.ahoo.govern.discovery.redis.RedisServiceRegistry; import org.openjdk.jmh.annotations.*; diff --git a/discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceRegistryBenchmark.java b/govern-discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceRegistryBenchmark.java similarity index 98% rename from discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceRegistryBenchmark.java rename to govern-discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceRegistryBenchmark.java index 7578291a..6d637993 100644 --- a/discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceRegistryBenchmark.java +++ b/govern-discovery/src/jmh/java/me/ahoo/govern/discovery/RedisServiceRegistryBenchmark.java @@ -2,7 +2,6 @@ import io.lettuce.core.RedisClient; import io.lettuce.core.api.StatefulRedisConnection; -import me.ahoo.govern.core.Consts; import me.ahoo.govern.discovery.redis.RedisServiceRegistry; import org.openjdk.jmh.annotations.*; diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/DiscoveryKeyGenerator.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/DiscoveryKeyGenerator.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/DiscoveryKeyGenerator.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/DiscoveryKeyGenerator.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/Instance.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/Instance.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/Instance.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/Instance.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/InstanceIdGenerator.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/InstanceIdGenerator.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/InstanceIdGenerator.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/InstanceIdGenerator.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceId.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceId.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceId.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceId.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceInstance.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceInstance.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceInstance.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/NamespacedServiceInstance.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/RegistryProperties.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/RegistryProperties.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/RegistryProperties.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/RegistryProperties.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/RenewInstanceService.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/RenewInstanceService.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/RenewInstanceService.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/RenewInstanceService.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/RenewProperties.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/RenewProperties.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/RenewProperties.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/RenewProperties.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceChangedListener.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceChangedListener.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceChangedListener.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceChangedListener.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceDiscovery.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceDiscovery.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceDiscovery.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceDiscovery.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstance.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstance.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstance.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstance.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstanceCodec.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstanceCodec.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstanceCodec.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceInstanceCodec.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceListenable.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceListenable.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceListenable.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceListenable.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceRegistry.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceRegistry.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceRegistry.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceRegistry.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceStat.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceStat.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceStat.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceStat.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/ServiceStatistic.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceStatistic.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/ServiceStatistic.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/ServiceStatistic.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/AbstractLoadBalancer.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/AbstractLoadBalancer.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/AbstractLoadBalancer.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/AbstractLoadBalancer.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancer.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancer.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancer.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancer.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancer.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancer.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancer.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancer.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/LoadBalancer.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/LoadBalancer.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/LoadBalancer.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/LoadBalancer.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancer.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancer.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancer.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancer.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancer.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancer.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancer.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancer.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/redis/ConsistencyRedisServiceDiscovery.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/ConsistencyRedisServiceDiscovery.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/redis/ConsistencyRedisServiceDiscovery.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/ConsistencyRedisServiceDiscovery.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/redis/DiscoveryRedisScripts.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/DiscoveryRedisScripts.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/redis/DiscoveryRedisScripts.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/DiscoveryRedisScripts.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceDiscovery.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceDiscovery.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceDiscovery.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceDiscovery.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceRegistry.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceRegistry.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceRegistry.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceRegistry.java diff --git a/discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceStatistic.java b/govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceStatistic.java similarity index 100% rename from discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceStatistic.java rename to govern-discovery/src/main/java/me/ahoo/govern/discovery/redis/RedisServiceStatistic.java diff --git a/discovery/src/main/resources/discovery_get_instance.lua b/govern-discovery/src/main/resources/discovery_get_instance.lua similarity index 100% rename from discovery/src/main/resources/discovery_get_instance.lua rename to govern-discovery/src/main/resources/discovery_get_instance.lua diff --git a/discovery/src/main/resources/discovery_get_instance_ttl.lua b/govern-discovery/src/main/resources/discovery_get_instance_ttl.lua similarity index 100% rename from discovery/src/main/resources/discovery_get_instance_ttl.lua rename to govern-discovery/src/main/resources/discovery_get_instance_ttl.lua diff --git a/discovery/src/main/resources/discovery_get_instances.lua b/govern-discovery/src/main/resources/discovery_get_instances.lua similarity index 100% rename from discovery/src/main/resources/discovery_get_instances.lua rename to govern-discovery/src/main/resources/discovery_get_instances.lua diff --git a/discovery/src/main/resources/instance_count_stat.lua b/govern-discovery/src/main/resources/instance_count_stat.lua similarity index 100% rename from discovery/src/main/resources/instance_count_stat.lua rename to govern-discovery/src/main/resources/instance_count_stat.lua diff --git a/discovery/src/main/resources/registry_deregister.lua b/govern-discovery/src/main/resources/registry_deregister.lua similarity index 100% rename from discovery/src/main/resources/registry_deregister.lua rename to govern-discovery/src/main/resources/registry_deregister.lua diff --git a/discovery/src/main/resources/registry_register.lua b/govern-discovery/src/main/resources/registry_register.lua similarity index 100% rename from discovery/src/main/resources/registry_register.lua rename to govern-discovery/src/main/resources/registry_register.lua diff --git a/discovery/src/main/resources/registry_remove_service.lua b/govern-discovery/src/main/resources/registry_remove_service.lua similarity index 100% rename from discovery/src/main/resources/registry_remove_service.lua rename to govern-discovery/src/main/resources/registry_remove_service.lua diff --git a/discovery/src/main/resources/registry_renew.lua b/govern-discovery/src/main/resources/registry_renew.lua similarity index 100% rename from discovery/src/main/resources/registry_renew.lua rename to govern-discovery/src/main/resources/registry_renew.lua diff --git a/discovery/src/main/resources/registry_set_metadata.lua b/govern-discovery/src/main/resources/registry_set_metadata.lua similarity index 100% rename from discovery/src/main/resources/registry_set_metadata.lua rename to govern-discovery/src/main/resources/registry_set_metadata.lua diff --git a/discovery/src/main/resources/registry_set_service.lua b/govern-discovery/src/main/resources/registry_set_service.lua similarity index 100% rename from discovery/src/main/resources/registry_set_service.lua rename to govern-discovery/src/main/resources/registry_set_service.lua diff --git a/discovery/src/main/resources/service_stat.lua b/govern-discovery/src/main/resources/service_stat.lua similarity index 100% rename from discovery/src/main/resources/service_stat.lua rename to govern-discovery/src/main/resources/service_stat.lua diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/BaseOnRedisClientTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/BaseOnRedisClientTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/BaseOnRedisClientTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/BaseOnRedisClientTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/ConsistencyRedisServiceDiscoveryTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/DiscoveryKeyGeneratorTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/DiscoveryKeyGeneratorTest.java similarity index 95% rename from discovery/src/test/java/me/ahoo/govern/discovery/DiscoveryKeyGeneratorTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/DiscoveryKeyGeneratorTest.java index fc869567..c40de14b 100644 --- a/discovery/src/test/java/me/ahoo/govern/discovery/DiscoveryKeyGeneratorTest.java +++ b/govern-discovery/src/test/java/me/ahoo/govern/discovery/DiscoveryKeyGeneratorTest.java @@ -3,7 +3,6 @@ import lombok.var; import me.ahoo.govern.core.Consts; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; /** diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/InstanceIdGeneratorTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/InstanceIdGeneratorTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/InstanceIdGeneratorTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/InstanceIdGeneratorTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceDiscoveryTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceDiscoveryTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceDiscoveryTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceDiscoveryTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceRegistryTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceRegistryTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceRegistryTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceRegistryTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceStatisticTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceStatisticTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceStatisticTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/RedisServiceStatisticTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/RenewInstanceServiceTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/RenewInstanceServiceTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/RenewInstanceServiceTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/RenewInstanceServiceTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/TestServiceInstance.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/TestServiceInstance.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/TestServiceInstance.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/TestServiceInstance.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancerTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancerTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancerTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/ArrayWeightRandomLoadBalancerTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancerTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancerTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancerTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/BinaryWeightRandomLoadBalancerTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancerTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancerTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancerTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/RandomLoadBalancerTest.java diff --git a/discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancerTest.java b/govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancerTest.java similarity index 100% rename from discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancerTest.java rename to govern-discovery/src/test/java/me/ahoo/govern/discovery/loadbalancer/TreeWeightRandomLoadBalancerTest.java diff --git a/discovery/src/test/resources/logback.xml b/govern-discovery/src/test/resources/logback.xml similarity index 100% rename from discovery/src/test/resources/logback.xml rename to govern-discovery/src/test/resources/logback.xml diff --git a/rest-api/build.gradle.kts b/govern-rest-api/build.gradle.kts similarity index 78% rename from rest-api/build.gradle.kts rename to govern-rest-api/build.gradle.kts index 4ae73846..d4fd5d12 100644 --- a/rest-api/build.gradle.kts +++ b/govern-rest-api/build.gradle.kts @@ -15,7 +15,7 @@ tasks.jar.configure { distributions { main { contents { - val dashboardDistPath = "${rootDir.absolutePath}/dashboard/dist"; + val dashboardDistPath = "${rootDir.absolutePath}/govern-dashboard/dist"; from(dashboardDistPath).include("**") } } @@ -29,7 +29,7 @@ application { "-Xmx512M", "-server", "-XX:+UseG1GC", - "-Xlog:gc*:file=logs/rest-api-gc.log:time,tags:filecount=10,filesize=100M", + "-Xlog:gc*:file=logs/${applicationName}-gc.log:time,tags:filecount=10,filesize=100M", "-Dspring.cloud.bootstrap.enabled=true", "-Dspring.cloud.bootstrap.location=config/bootstrap.yaml" ) @@ -37,11 +37,11 @@ application { dependencies { - implementation(platform(project(":dependencies"))) + implementation(platform(project(":govern-dependencies"))) implementation("io.springfox:springfox-boot-starter") implementation("org.springframework.boot:spring-boot-starter-actuator") - implementation(project(":spring-cloud-starter-config")) - implementation(project(":spring-cloud-starter-discovery")) + implementation(project(":spring-cloud-starter-govern-config")) + implementation(project(":spring-cloud-starter-govern-discovery")) implementation("com.google.guava:guava") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.cloud:spring-cloud-starter-openfeign") diff --git a/rest-api/src/dist/config/application.yaml b/govern-rest-api/src/dist/config/application.yaml similarity index 100% rename from rest-api/src/dist/config/application.yaml rename to govern-rest-api/src/dist/config/application.yaml diff --git a/rest-api/src/dist/config/bootstrap.yaml b/govern-rest-api/src/dist/config/bootstrap.yaml similarity index 100% rename from rest-api/src/dist/config/bootstrap.yaml rename to govern-rest-api/src/dist/config/bootstrap.yaml diff --git a/rest-api/src/dist/logs/.gitignore b/govern-rest-api/src/dist/logs/.gitignore similarity index 100% rename from rest-api/src/dist/logs/.gitignore rename to govern-rest-api/src/dist/logs/.gitignore diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/RestApiServer.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/RestApiServer.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/RestApiServer.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/RestApiServer.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/config/AppConfig.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/config/AppConfig.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/config/AppConfig.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/config/AppConfig.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/config/DashboardConfig.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/config/DashboardConfig.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/config/DashboardConfig.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/config/DashboardConfig.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/config/GlobalRestExceptionHandler.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/config/GlobalRestExceptionHandler.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/config/GlobalRestExceptionHandler.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/config/GlobalRestExceptionHandler.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/controller/ConfigController.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/ConfigController.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/controller/ConfigController.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/ConfigController.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/controller/NamespaceController.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/NamespaceController.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/controller/NamespaceController.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/NamespaceController.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/controller/ServiceController.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/ServiceController.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/controller/ServiceController.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/ServiceController.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/controller/StatController.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/StatController.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/controller/StatController.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/controller/StatController.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/dto/ErrorResponse.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/dto/ErrorResponse.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/dto/ErrorResponse.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/dto/ErrorResponse.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/dto/GetStatResponse.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/dto/GetStatResponse.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/dto/GetStatResponse.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/dto/GetStatResponse.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/dto/ImportResponse.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/dto/ImportResponse.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/dto/ImportResponse.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/dto/ImportResponse.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/job/StatServiceJob.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/job/StatServiceJob.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/job/StatServiceJob.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/job/StatServiceJob.java diff --git a/rest-api/src/main/java/me/ahoo/govern/rest/support/RequestPathPrefix.java b/govern-rest-api/src/main/java/me/ahoo/govern/rest/support/RequestPathPrefix.java similarity index 100% rename from rest-api/src/main/java/me/ahoo/govern/rest/support/RequestPathPrefix.java rename to govern-rest-api/src/main/java/me/ahoo/govern/rest/support/RequestPathPrefix.java diff --git a/rest-api/src/main/resources/application.yaml b/govern-rest-api/src/main/resources/application.yaml similarity index 71% rename from rest-api/src/main/resources/application.yaml rename to govern-rest-api/src/main/resources/application.yaml index becd6568..932b6a90 100644 --- a/rest-api/src/main/resources/application.yaml +++ b/govern-rest-api/src/main/resources/application.yaml @@ -6,7 +6,7 @@ spring: weight: 18 web: resources: - static-locations: file:./dashboard/dist/dashboard + static-locations: file:./govern-dashboard/dist/dashboard servlet: multipart: max-file-size: 10MB diff --git a/rest-api/src/main/resources/bootstrap.yaml b/govern-rest-api/src/main/resources/bootstrap.yaml similarity index 100% rename from rest-api/src/main/resources/bootstrap.yaml rename to govern-rest-api/src/main/resources/bootstrap.yaml diff --git a/rest-api/src/test/java/me/ahoo/govern/rest/RestApiServerTest.java b/govern-rest-api/src/test/java/me/ahoo/govern/rest/RestApiServerTest.java similarity index 85% rename from rest-api/src/test/java/me/ahoo/govern/rest/RestApiServerTest.java rename to govern-rest-api/src/test/java/me/ahoo/govern/rest/RestApiServerTest.java index b109ea60..7411e890 100644 --- a/rest-api/src/test/java/me/ahoo/govern/rest/RestApiServerTest.java +++ b/govern-rest-api/src/test/java/me/ahoo/govern/rest/RestApiServerTest.java @@ -1,6 +1,5 @@ package me.ahoo.govern.rest; -import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; /** diff --git a/spring-cloud-govern-core/build.gradle.kts b/govern-spring-cloud-core/build.gradle.kts similarity index 93% rename from spring-cloud-govern-core/build.gradle.kts rename to govern-spring-cloud-core/build.gradle.kts index a0e4e297..8626fd11 100644 --- a/spring-cloud-govern-core/build.gradle.kts +++ b/govern-spring-cloud-core/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - api(project(":core")) + api(project(":govern-core")) implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.cloud:spring-cloud-commons") diff --git a/spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/ConditionalOnGovernEnabled.java b/govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/ConditionalOnGovernEnabled.java similarity index 100% rename from spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/ConditionalOnGovernEnabled.java rename to govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/ConditionalOnGovernEnabled.java diff --git a/spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/GovernAutoConfiguration.java b/govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/GovernAutoConfiguration.java similarity index 100% rename from spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/GovernAutoConfiguration.java rename to govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/GovernAutoConfiguration.java diff --git a/spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/GovernProperties.java b/govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/GovernProperties.java similarity index 100% rename from spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/GovernProperties.java rename to govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/GovernProperties.java diff --git a/spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/support/AppSupport.java b/govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/support/AppSupport.java similarity index 100% rename from spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/support/AppSupport.java rename to govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/support/AppSupport.java diff --git a/spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/support/RedisClientSupport.java b/govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/support/RedisClientSupport.java similarity index 99% rename from spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/support/RedisClientSupport.java rename to govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/support/RedisClientSupport.java index c7f864fa..7dc8187a 100644 --- a/spring-cloud-govern-core/src/main/java/me/ahoo/govern/spring/cloud/support/RedisClientSupport.java +++ b/govern-spring-cloud-core/src/main/java/me/ahoo/govern/spring/cloud/support/RedisClientSupport.java @@ -4,7 +4,6 @@ import io.lettuce.core.RedisClient; import io.lettuce.core.cluster.RedisClusterClient; import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands; - import me.ahoo.govern.core.RedisConfig; import me.ahoo.govern.core.listener.MessageListenable; import me.ahoo.govern.core.listener.RedisClusterMessageListenable; diff --git a/spring-cloud-govern-core/src/main/resources/META-INF/spring.factories b/govern-spring-cloud-core/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-govern-core/src/main/resources/META-INF/spring.factories rename to govern-spring-cloud-core/src/main/resources/META-INF/spring.factories diff --git a/gradle.properties b/gradle.properties index 2b6d07be..1abaac8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=me.ahoo.govern -version=0.9.17 +version=0.9.18 description=Govern Service On Redis website=https://github.com/Ahoo-Wang/govern-service diff --git a/k8s/docker/rest-api-local/Dockerfile b/k8s/docker/rest-api-local/Dockerfile index 2119b1f8..565fa1aa 100644 --- a/k8s/docker/rest-api-local/Dockerfile +++ b/k8s/docker/rest-api-local/Dockerfile @@ -1,8 +1,8 @@ -# docker buildx build --push --platform linux/arm/v7 --build-arg GOVERN_VERSION=0.9.17 --build-arg JDK_VERSION=armv7l-centos-jdk-11.0.11_9-slim -t ahoowang/govern-service:0.9.17-armv7 . -# docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg GOVERN_VERSION=0.9.17 --build-arg JDK_VERSION=jdk11u-centos-nightly-slim -t ahoowang/govern-service:0.9.17 . +# docker buildx build --push --platform linux/arm/v7 --build-arg GOVERN_VERSION=0.9.18 --build-arg JDK_VERSION=armv7l-centos-jdk-11.0.11_9-slim -t ahoowang/govern-service:0.9.18-armv7 . +# docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg GOVERN_VERSION=0.9.18 --build-arg JDK_VERSION=jdk11u-centos-nightly-slim -t ahoowang/govern-service:0.9.18 . -ARG JDK_VERSION=jdk11u-centos-nightly -ARG GOVERN_VERSION=0.9.17 +ARG JDK_VERSION=jdk11u-centos-nightly-slim +ARG GOVERN_VERSION=0.9.18 ARG GOVERN_SERVICE_HOME=/govern-service FROM adoptopenjdk/openjdk11:${JDK_VERSION} AS base @@ -16,7 +16,7 @@ USER root WORKDIR ${GOVERN_SERVICE_HOME} -ENV GOVERN_SERVICE_REST_API_TAR=rest-api-${GOVERN_VERSION}.tar +ENV GOVERN_SERVICE_REST_API_TAR=govern-rest-api-${GOVERN_VERSION}.tar COPY ${GOVERN_SERVICE_REST_API_TAR} . RUN tar -xvf ${GOVERN_SERVICE_REST_API_TAR};\ rm ${GOVERN_SERVICE_REST_API_TAR} @@ -28,7 +28,7 @@ ARG GOVERN_SERVICE_HOME LABEL maintainer="ahoowang@qq.com" COPY --from=build ${GOVERN_SERVICE_HOME} ${GOVERN_SERVICE_HOME} -WORKDIR ${GOVERN_SERVICE_HOME}/rest-api-${GOVERN_VERSION} +WORKDIR ${GOVERN_SERVICE_HOME}/govern-rest-api-${GOVERN_VERSION} EXPOSE 8080 -ENTRYPOINT ["bin/rest-api"] +ENTRYPOINT ["bin/govern-rest-api"] diff --git a/k8s/docker/rest-api/Dockerfile b/k8s/docker/rest-api/Dockerfile index fe86bc1c..481634e0 100644 --- a/k8s/docker/rest-api/Dockerfile +++ b/k8s/docker/rest-api/Dockerfile @@ -1,8 +1,8 @@ -# docker buildx build --push --platform linux/arm/v7 --build-arg GOVERN_VERSION=0.9.17 --build-arg JDK_VERSION=armv7l-centos-jdk-11.0.11_9-slim -t ahoowang/govern-service:0.9.17-armv7 . -# docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg GOVERN_VERSION=0.9.17 --build-arg JDK_VERSION=jdk11u-centos-nightly-slim -t ahoowang/govern-service:0.9.17 . +# docker buildx build --push --platform linux/arm/v7 --build-arg GOVERN_VERSION=0.9.18 --build-arg JDK_VERSION=armv7l-centos-jdk-11.0.11_9-slim -t ahoowang/govern-service:0.9.18-armv7 . +# docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg GOVERN_VERSION=0.9.18 --build-arg JDK_VERSION=jdk11u-centos-nightly-slim -t ahoowang/govern-service:0.9.18 . ARG JDK_VERSION=jdk11u-centos-nightly -ARG GOVERN_VERSION=0.9.17 +ARG GOVERN_VERSION=0.9.18 ARG GOVERN_SERVICE_HOME=/govern-service FROM adoptopenjdk/openjdk11:${JDK_VERSION} AS base @@ -17,7 +17,7 @@ USER root WORKDIR ${GOVERN_SERVICE_HOME} ENV DOWN_URL=https://github.com/Ahoo-Wang/govern-service/releases/download -ENV GOVERN_SERVICE_REST_API_TAR=rest-api-${GOVERN_VERSION}.tar +ENV GOVERN_SERVICE_REST_API_TAR=govern-rest-api-${GOVERN_VERSION}.tar ENV GOVERN_SERVICE_REST_API_TAR_URI=${DOWN_URL}/${GOVERN_VERSION}/${GOVERN_SERVICE_REST_API_TAR} RUN echo "Downloading : ${GOVERN_SERVICE_REST_API_TAR_URI}" @@ -32,7 +32,7 @@ ARG GOVERN_SERVICE_HOME LABEL maintainer="ahoowang@qq.com" COPY --from=build ${GOVERN_SERVICE_HOME} ${GOVERN_SERVICE_HOME} -WORKDIR ${GOVERN_SERVICE_HOME}/rest-api-${GOVERN_VERSION} +WORKDIR ${GOVERN_SERVICE_HOME}/govern-rest-api-${GOVERN_VERSION} EXPOSE 8080 -ENTRYPOINT ["bin/rest-api"] +ENTRYPOINT ["bin/govern-rest-api"] diff --git a/settings.gradle.kts b/settings.gradle.kts index ad04b49c..fe760f84 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,15 +8,17 @@ */ rootProject.name = "govern-service" -include(":discovery") -include(":config") -include(":core") -include(":bom") -include(":dependencies") -include(":spring-cloud-govern-core") -include(":spring-cloud-starter-discovery") -include(":spring-cloud-starter-config") -include(":rest-api") +include(":govern-core") +include(":govern-config") +include(":govern-discovery") + +include(":govern-bom") +include(":govern-dependencies") +include(":govern-spring-cloud-core") +include(":spring-cloud-starter-govern-discovery") +include(":spring-cloud-starter-govern-config") +include(":govern-rest-api") + buildscript { repositories { diff --git a/spring-cloud-starter-config/build.gradle.kts b/spring-cloud-starter-govern-config/build.gradle.kts similarity index 85% rename from spring-cloud-starter-config/build.gradle.kts rename to spring-cloud-starter-govern-config/build.gradle.kts index 9f79e004..69450d8b 100644 --- a/spring-cloud-starter-config/build.gradle.kts +++ b/spring-cloud-starter-govern-config/build.gradle.kts @@ -1,6 +1,6 @@ dependencies { - api(project(":config")) - api(project(":spring-cloud-govern-core")) + api(project(":govern-config")) + api(project(":govern-spring-cloud-core")) implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.cloud:spring-cloud-commons") diff --git a/spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/ConditionalOnGovernConfigEnabled.java b/spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/ConditionalOnGovernConfigEnabled.java similarity index 100% rename from spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/ConditionalOnGovernConfigEnabled.java rename to spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/ConditionalOnGovernConfigEnabled.java diff --git a/spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigAutoConfiguration.java b/spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigAutoConfiguration.java similarity index 100% rename from spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigAutoConfiguration.java rename to spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigAutoConfiguration.java diff --git a/spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigBootstrapConfiguration.java b/spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigBootstrapConfiguration.java similarity index 100% rename from spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigBootstrapConfiguration.java rename to spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigBootstrapConfiguration.java diff --git a/spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigProperties.java b/spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigProperties.java similarity index 100% rename from spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigProperties.java rename to spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernConfigProperties.java diff --git a/spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernPropertySourceLocator.java b/spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernPropertySourceLocator.java similarity index 100% rename from spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernPropertySourceLocator.java rename to spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/GovernPropertySourceLocator.java diff --git a/spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/refresh/GovernConfigRefresher.java b/spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/refresh/GovernConfigRefresher.java similarity index 100% rename from spring-cloud-starter-config/src/main/java/me/ahoo/govern/config/spring/cloud/refresh/GovernConfigRefresher.java rename to spring-cloud-starter-govern-config/src/main/java/me/ahoo/govern/config/spring/cloud/refresh/GovernConfigRefresher.java diff --git a/spring-cloud-starter-config/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-govern-config/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-starter-config/src/main/resources/META-INF/spring.factories rename to spring-cloud-starter-govern-config/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-starter-discovery/build.gradle.kts b/spring-cloud-starter-govern-discovery/build.gradle.kts similarity index 83% rename from spring-cloud-starter-discovery/build.gradle.kts rename to spring-cloud-starter-govern-discovery/build.gradle.kts index 2d8cb6f5..cc2b2414 100644 --- a/spring-cloud-starter-discovery/build.gradle.kts +++ b/spring-cloud-starter-govern-discovery/build.gradle.kts @@ -1,6 +1,6 @@ dependencies { - api(project(":discovery")) - api(project(":spring-cloud-govern-core")) + api(project(":govern-discovery")) + api(project(":govern-spring-cloud-core")) implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.cloud:spring-cloud-commons") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${rootProject.ext.get("springBootVersion")}") diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/ConditionalOnGovernDiscoveryEnabled.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryAutoConfiguration.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryClient.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernDiscoveryProperties.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/discovery/GovernServiceInstance.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistration.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationAutoConfiguration.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationOfNoneWeb.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationOfNoneWeb.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationOfNoneWeb.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernAutoServiceRegistrationOfNoneWeb.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistration.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernRegistryProperties.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/registry/GovernServiceRegistry.java diff --git a/spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java b/spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java similarity index 100% rename from spring-cloud-starter-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java rename to spring-cloud-starter-govern-discovery/src/main/java/me/ahoo/govern/discovery/spring/cloud/support/StatusConstants.java diff --git a/spring-cloud-starter-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-govern-discovery/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-starter-discovery/src/main/resources/META-INF/spring.factories rename to spring-cloud-starter-govern-discovery/src/main/resources/META-INF/spring.factories