diff --git a/dynamic-threadpool-common/.gitignore b/common/.gitignore similarity index 100% rename from dynamic-threadpool-common/.gitignore rename to common/.gitignore diff --git a/dynamic-threadpool-common/pom.xml b/common/pom.xml similarity index 91% rename from dynamic-threadpool-common/pom.xml rename to common/pom.xml index c577a5b0..07d7bb71 100644 --- a/dynamic-threadpool-common/pom.xml +++ b/common/pom.xml @@ -6,10 +6,10 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} - dynamic-threadpool-common + common jar ${project.artifactId} diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java b/common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java rename to common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java b/common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java rename to common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java b/common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java rename to common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java b/common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java rename to common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java b/common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java rename to common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java b/common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java rename to common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java b/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java rename to common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java b/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java rename to common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java b/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java rename to common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java b/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java rename to common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java b/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java rename to common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/GroupKey.java b/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/GroupKey.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/GroupKey.java rename to common/src/main/java/com/github/dynamic/threadpool/common/toolkit/GroupKey.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java b/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java rename to common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java b/common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java rename to common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/base/Results.java b/common/src/main/java/com/github/dynamic/threadpool/common/web/base/Results.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/base/Results.java rename to common/src/main/java/com/github/dynamic/threadpool/common/web/base/Results.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ErrorCodeEnum.java b/common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ErrorCodeEnum.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ErrorCodeEnum.java rename to common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ErrorCodeEnum.java diff --git a/dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ServiceException.java b/common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ServiceException.java similarity index 100% rename from dynamic-threadpool-common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ServiceException.java rename to common/src/main/java/com/github/dynamic/threadpool/common/web/exception/ServiceException.java diff --git a/dynamic-threadpool-config/.gitignore b/config/.gitignore similarity index 100% rename from dynamic-threadpool-config/.gitignore rename to config/.gitignore diff --git a/dynamic-threadpool-config/pom.xml b/config/pom.xml similarity index 92% rename from dynamic-threadpool-config/pom.xml rename to config/pom.xml index 529a8ef0..2a44ae75 100644 --- a/dynamic-threadpool-config/pom.xml +++ b/config/pom.xml @@ -6,10 +6,10 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} - dynamic-threadpool-config + config jar ${project.artifactId} @@ -44,7 +44,7 @@ com.github.dynamic-threadpool - dynamic-threadpool-common + common diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/config/CommonConfig.java b/config/src/main/java/com/github/dynamic/threadpool/config/config/CommonConfig.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/config/CommonConfig.java rename to config/src/main/java/com/github/dynamic/threadpool/config/config/CommonConfig.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/config/MyMetaObjectHandler.java b/config/src/main/java/com/github/dynamic/threadpool/config/config/MyMetaObjectHandler.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/config/MyMetaObjectHandler.java rename to config/src/main/java/com/github/dynamic/threadpool/config/config/MyMetaObjectHandler.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/config/MybatisPlusConfig.java b/config/src/main/java/com/github/dynamic/threadpool/config/config/MybatisPlusConfig.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/config/MybatisPlusConfig.java rename to config/src/main/java/com/github/dynamic/threadpool/config/config/MybatisPlusConfig.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/controller/ConfigController.java b/config/src/main/java/com/github/dynamic/threadpool/config/controller/ConfigController.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/controller/ConfigController.java rename to config/src/main/java/com/github/dynamic/threadpool/config/controller/ConfigController.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java b/config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java rename to config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/ConfigDataChangeEvent.java b/config/src/main/java/com/github/dynamic/threadpool/config/event/ConfigDataChangeEvent.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/ConfigDataChangeEvent.java rename to config/src/main/java/com/github/dynamic/threadpool/config/event/ConfigDataChangeEvent.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/Event.java b/config/src/main/java/com/github/dynamic/threadpool/config/event/Event.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/Event.java rename to config/src/main/java/com/github/dynamic/threadpool/config/event/Event.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/LocalDataChangeEvent.java b/config/src/main/java/com/github/dynamic/threadpool/config/event/LocalDataChangeEvent.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/LocalDataChangeEvent.java rename to config/src/main/java/com/github/dynamic/threadpool/config/event/LocalDataChangeEvent.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/SlowEvent.java b/config/src/main/java/com/github/dynamic/threadpool/config/event/SlowEvent.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/event/SlowEvent.java rename to config/src/main/java/com/github/dynamic/threadpool/config/event/SlowEvent.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/mapper/ConfigInfoMapper.java b/config/src/main/java/com/github/dynamic/threadpool/config/mapper/ConfigInfoMapper.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/mapper/ConfigInfoMapper.java rename to config/src/main/java/com/github/dynamic/threadpool/config/mapper/ConfigInfoMapper.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/mapper/ItemInfoMapper.java b/config/src/main/java/com/github/dynamic/threadpool/config/mapper/ItemInfoMapper.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/mapper/ItemInfoMapper.java rename to config/src/main/java/com/github/dynamic/threadpool/config/mapper/ItemInfoMapper.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/mapper/TenantInfoMapper.java b/config/src/main/java/com/github/dynamic/threadpool/config/mapper/TenantInfoMapper.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/mapper/TenantInfoMapper.java rename to config/src/main/java/com/github/dynamic/threadpool/config/mapper/TenantInfoMapper.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/CacheItem.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/CacheItem.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/CacheItem.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/CacheItem.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigAllInfo.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigAllInfo.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigAllInfo.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigAllInfo.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfo.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfo.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfo.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfo.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfoBase.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfoBase.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfoBase.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/ConfigInfoBase.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ItemInfo.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/ItemInfo.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/ItemInfo.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/ItemInfo.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/TenantInfo.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/TenantInfo.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/TenantInfo.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/TenantInfo.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java rename to config/src/main/java/com/github/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultPublisher.java b/config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultPublisher.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultPublisher.java rename to config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultPublisher.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultSharePublisher.java b/config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultSharePublisher.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultSharePublisher.java rename to config/src/main/java/com/github/dynamic/threadpool/config/notify/DefaultSharePublisher.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/EventPublisher.java b/config/src/main/java/com/github/dynamic/threadpool/config/notify/EventPublisher.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/EventPublisher.java rename to config/src/main/java/com/github/dynamic/threadpool/config/notify/EventPublisher.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/NotifyCenter.java b/config/src/main/java/com/github/dynamic/threadpool/config/notify/NotifyCenter.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/NotifyCenter.java rename to config/src/main/java/com/github/dynamic/threadpool/config/notify/NotifyCenter.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/SmartSubscriber.java b/config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/SmartSubscriber.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/SmartSubscriber.java rename to config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/SmartSubscriber.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/Subscriber.java b/config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/Subscriber.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/Subscriber.java rename to config/src/main/java/com/github/dynamic/threadpool/config/notify/listener/Subscriber.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigCacheService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigCacheService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigCacheService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigCacheService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigChangePublisher.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigChangePublisher.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigChangePublisher.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigChangePublisher.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigServletInner.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigServletInner.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigServletInner.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/ConfigServletInner.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/LongPollingService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/LongPollingService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/LongPollingService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/LongPollingService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/SwitchService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/SwitchService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/SwitchService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/SwitchService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantServiceImpl.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantServiceImpl.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolService.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolService.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolService.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/BeanUtil.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/BeanUtil.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/BeanUtil.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/BeanUtil.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ClassUtil.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ClassUtil.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ClassUtil.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ClassUtil.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ConfigExecutor.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ConfigExecutor.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ConfigExecutor.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/ConfigExecutor.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/MapUtil.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/MapUtil.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/MapUtil.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/MapUtil.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/RequestUtil.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/RequestUtil.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/RequestUtil.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/RequestUtil.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java diff --git a/dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SingletonRepository.java b/config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SingletonRepository.java similarity index 100% rename from dynamic-threadpool-config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SingletonRepository.java rename to config/src/main/java/com/github/dynamic/threadpool/config/toolkit/SingletonRepository.java diff --git a/dynamic-threadpool-console/.gitignore b/console/.gitignore similarity index 100% rename from dynamic-threadpool-console/.gitignore rename to console/.gitignore diff --git a/dynamic-threadpool-console/pom.xml b/console/pom.xml similarity index 85% rename from dynamic-threadpool-console/pom.xml rename to console/pom.xml index 29126197..f66de5ce 100644 --- a/dynamic-threadpool-console/pom.xml +++ b/console/pom.xml @@ -6,10 +6,10 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} - dynamic-threadpool-console + console jar ${project.artifactId} @@ -18,7 +18,7 @@ com.github.dynamic-threadpool - dynamic-threadpool-config + config diff --git a/dynamic-threadpool-console/src/main/java/com/github/dynamic/threadpool/console/controller/ItemController.java b/console/src/main/java/com/github/dynamic/threadpool/console/controller/ItemController.java similarity index 100% rename from dynamic-threadpool-console/src/main/java/com/github/dynamic/threadpool/console/controller/ItemController.java rename to console/src/main/java/com/github/dynamic/threadpool/console/controller/ItemController.java diff --git a/dynamic-threadpool-console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java b/console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java similarity index 100% rename from dynamic-threadpool-console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java rename to console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java diff --git a/dynamic-threadpool-console/src/main/java/com/github/dynamic/threadpool/console/controller/ThreadPoolController.java b/console/src/main/java/com/github/dynamic/threadpool/console/controller/ThreadPoolController.java similarity index 100% rename from dynamic-threadpool-console/src/main/java/com/github/dynamic/threadpool/console/controller/ThreadPoolController.java rename to console/src/main/java/com/github/dynamic/threadpool/console/controller/ThreadPoolController.java diff --git a/dynamic-threadpool-example/.gitignore b/discovery/.gitignore similarity index 100% rename from dynamic-threadpool-example/.gitignore rename to discovery/.gitignore diff --git a/dynamic-threadpool-registry/pom.xml b/discovery/pom.xml similarity index 89% rename from dynamic-threadpool-registry/pom.xml rename to discovery/pom.xml index 56db9d87..c7e9778b 100644 --- a/dynamic-threadpool-registry/pom.xml +++ b/discovery/pom.xml @@ -6,10 +6,10 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} - dynamic-threadpool-registry + discovery ${project.artifactId} ${project.artifactId} @@ -27,7 +27,7 @@ com.github.dynamic-threadpool - dynamic-threadpool-common + common diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/config/RegistryConfiguration.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/config/RegistryConfiguration.java similarity index 77% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/config/RegistryConfiguration.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/config/RegistryConfiguration.java index f9bdb6b2..b63a5ec1 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/config/RegistryConfiguration.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/config/RegistryConfiguration.java @@ -1,6 +1,6 @@ -package com.github.dynamic.threadpool.registry.config; +package com.github.dynamic.threadpool.discovery.config; -import com.github.dynamic.threadpool.registry.core.BaseInstanceRegistry; +import com.github.dynamic.threadpool.discovery.core.BaseInstanceRegistry; import lombok.AllArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/controller/ApplicationController.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/controller/ApplicationController.java similarity index 89% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/controller/ApplicationController.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/controller/ApplicationController.java index f14d603f..0c769916 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/controller/ApplicationController.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/controller/ApplicationController.java @@ -1,11 +1,11 @@ -package com.github.dynamic.threadpool.registry.controller; +package com.github.dynamic.threadpool.discovery.controller; import com.github.dynamic.threadpool.common.model.InstanceInfo; import com.github.dynamic.threadpool.common.web.base.Result; import com.github.dynamic.threadpool.common.web.base.Results; import com.github.dynamic.threadpool.common.web.exception.ErrorCodeEnum; -import com.github.dynamic.threadpool.registry.core.InstanceRegistry; -import com.github.dynamic.threadpool.registry.core.Lease; +import com.github.dynamic.threadpool.discovery.core.InstanceRegistry; +import com.github.dynamic.threadpool.discovery.core.Lease; import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/BaseInstanceRegistry.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/BaseInstanceRegistry.java similarity index 99% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/BaseInstanceRegistry.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/BaseInstanceRegistry.java index 09c6cc9a..867211c6 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/BaseInstanceRegistry.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/BaseInstanceRegistry.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.registry.core; +package com.github.dynamic.threadpool.discovery.core; import com.github.dynamic.threadpool.common.model.InstanceInfo; import com.github.dynamic.threadpool.common.model.InstanceInfo.InstanceStatus; diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/InstanceRegistry.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/InstanceRegistry.java similarity index 91% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/InstanceRegistry.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/InstanceRegistry.java index f581f6a0..908f0294 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/InstanceRegistry.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/InstanceRegistry.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.registry.core; +package com.github.dynamic.threadpool.discovery.core; import com.github.dynamic.threadpool.common.model.InstanceInfo; diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/Lease.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/Lease.java similarity index 97% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/Lease.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/Lease.java index 45104057..1c9c54b3 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/Lease.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/Lease.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.registry.core; +package com.github.dynamic.threadpool.discovery.core; /** * Lease. diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/Pair.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/Pair.java similarity index 90% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/Pair.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/Pair.java index 0b485c68..56027014 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/Pair.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/Pair.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.registry.core; +package com.github.dynamic.threadpool.discovery.core; /** * Pair. diff --git a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/StatusOverrideResult.java b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/StatusOverrideResult.java similarity index 93% rename from dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/StatusOverrideResult.java rename to discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/StatusOverrideResult.java index 647c0dbb..09b7e5d1 100644 --- a/dynamic-threadpool-registry/src/main/java/com/github/dynamic/threadpool/registry/core/StatusOverrideResult.java +++ b/discovery/src/main/java/com/github/dynamic/threadpool/discovery/core/StatusOverrideResult.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.registry.core; +package com.github.dynamic.threadpool.discovery.core; import com.github.dynamic.threadpool.common.model.InstanceInfo.InstanceStatus; diff --git a/dynamic-threadpool-spring-boot-starter/pom.xml b/dynamic-threadpool-spring-boot-starter/pom.xml index fb7b323c..5c369e05 100644 --- a/dynamic-threadpool-spring-boot-starter/pom.xml +++ b/dynamic-threadpool-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} dynamic-threadpool-spring-boot-starter @@ -43,7 +43,7 @@ com.github.dynamic-threadpool - dynamic-threadpool-common + common diff --git a/dynamic-threadpool-registry/.gitignore b/example/.gitignore similarity index 100% rename from dynamic-threadpool-registry/.gitignore rename to example/.gitignore diff --git a/dynamic-threadpool-example/pom.xml b/example/pom.xml similarity index 93% rename from dynamic-threadpool-example/pom.xml rename to example/pom.xml index 0b8089cd..428d1df8 100644 --- a/dynamic-threadpool-example/pom.xml +++ b/example/pom.xml @@ -6,10 +6,10 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} - dynamic-threadpool-example + example jar ${project.artifactId} diff --git a/dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java b/example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java similarity index 100% rename from dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java rename to example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java diff --git a/dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java b/example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java similarity index 100% rename from dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java rename to example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java diff --git a/dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/inittest/AlarmSendMessageTest.java b/example/src/main/java/com/github/dynamic/threadpool/example/inittest/AlarmSendMessageTest.java similarity index 100% rename from dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/inittest/AlarmSendMessageTest.java rename to example/src/main/java/com/github/dynamic/threadpool/example/inittest/AlarmSendMessageTest.java diff --git a/dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/inittest/GlobalTestConstant.java b/example/src/main/java/com/github/dynamic/threadpool/example/inittest/GlobalTestConstant.java similarity index 100% rename from dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/inittest/GlobalTestConstant.java rename to example/src/main/java/com/github/dynamic/threadpool/example/inittest/GlobalTestConstant.java diff --git a/dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java b/example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java similarity index 100% rename from dynamic-threadpool-example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java rename to example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java diff --git a/dynamic-threadpool-example/src/main/resources/application.yaml b/example/src/main/resources/application.yaml similarity index 100% rename from dynamic-threadpool-example/src/main/resources/application.yaml rename to example/src/main/resources/application.yaml diff --git a/dynamic-threadpool-example/src/test/java/com/github/dynamic/threadpool/example/ExampleApplicationTests.java b/example/src/test/java/com/github/dynamic/threadpool/example/ExampleApplicationTests.java similarity index 100% rename from dynamic-threadpool-example/src/test/java/com/github/dynamic/threadpool/example/ExampleApplicationTests.java rename to example/src/test/java/com/github/dynamic/threadpool/example/ExampleApplicationTests.java diff --git a/pom.xml b/pom.xml index 5c917bae..3a0a3580 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} pom ${project.artifactId} @@ -13,12 +13,12 @@ 🔥 强大的动态线程池,附带监控线程池功能(没有依赖任何中间件) - dynamic-threadpool-common - dynamic-threadpool-console - dynamic-threadpool-server - dynamic-threadpool-config - dynamic-threadpool-registry - dynamic-threadpool-example + common + console + server + config + discovery + example dynamic-threadpool-spring-boot-starter @@ -37,6 +37,16 @@ 3.4.2 2.3.2.RELEASE + + UTF-8 + UTF-8 + + + 3.6.1 + 3.0.0 + 3.0.1 + 3.0.2 + 3.0 @@ -76,31 +86,25 @@ com.github.dynamic-threadpool - dynamic-threadpool-common - ${revision} - - - - com.github.dynamic-threadpool - dynamic-threadpool-config + common ${revision} com.github.dynamic-threadpool - dynamic-threadpool-console + config ${revision} com.github.dynamic-threadpool - dynamic-threadpool-registry + console ${revision} com.github.dynamic-threadpool - dynamic-threadpool-alarm + discovery ${revision} @@ -138,21 +142,93 @@ + ${project.artifactId} + + + + src/main/resources + + ** + + + rebel.xml + + true + + + - org.springframework.boot - spring-boot-maven-plugin - 2.3.0.RELEASE + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + -Xlint:unchecked + org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + true + + + + compile + + jar + + + + + + + maven-jar-plugin + ${maven.jar.plugin.version} + + + + chen.ma + + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 - 1.8 - 1.8 + true + resolveCiFriendliesOnly + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + diff --git a/dynamic-threadpool-server/.gitignore b/server/.gitignore similarity index 100% rename from dynamic-threadpool-server/.gitignore rename to server/.gitignore diff --git a/dynamic-threadpool-server/pom.xml b/server/pom.xml similarity index 79% rename from dynamic-threadpool-server/pom.xml rename to server/pom.xml index baaa46b4..d86d29d2 100644 --- a/dynamic-threadpool-server/pom.xml +++ b/server/pom.xml @@ -6,10 +6,10 @@ com.github.dynamic-threadpool parent - 1.0.0-SNAPSHOT + ${revision} - dynamic-threadpool-server + server jar ${project.artifactId} @@ -18,17 +18,17 @@ com.github.dynamic-threadpool - dynamic-threadpool-config + config com.github.dynamic-threadpool - dynamic-threadpool-console + console com.github.dynamic-threadpool - dynamic-threadpool-registry + discovery diff --git a/dynamic-threadpool-server/src/main/java/com/github/dynamic/threadpool/server/ServerApplication.java b/server/src/main/java/com/github/dynamic/threadpool/server/ServerApplication.java similarity index 100% rename from dynamic-threadpool-server/src/main/java/com/github/dynamic/threadpool/server/ServerApplication.java rename to server/src/main/java/com/github/dynamic/threadpool/server/ServerApplication.java