diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/config/pom.xml b/config/pom.xml new file mode 100644 index 00000000..24b635ab --- /dev/null +++ b/config/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + + io.dynamic-threadpool + parent + 1.0.0-SNAPSHOT + + + dynamic-threadpool-config + jar + + ${project.artifactId} + ${project.artifactId} + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + + com.baomidou + mybatis-plus-boot-starter + + + + mysql + mysql-connector-java + runtime + + + + cn.hutool + hutool-all + + + + io.dynamic-threadpool + dynamic-threadpool-common + + + + com.alibaba + fastjson + + + + com.github.dozermapper + dozer-core + + + + diff --git a/server/src/main/java/io/dynamic/threadpool/server/config/MyMetaObjectHandler.java b/config/src/main/java/io/dynamic/threadpool/config/config/MyMetaObjectHandler.java similarity index 90% rename from server/src/main/java/io/dynamic/threadpool/server/config/MyMetaObjectHandler.java rename to config/src/main/java/io/dynamic/threadpool/config/config/MyMetaObjectHandler.java index 4b46b65d..03427ca0 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/config/MyMetaObjectHandler.java +++ b/config/src/main/java/io/dynamic/threadpool/config/config/MyMetaObjectHandler.java @@ -1,7 +1,7 @@ -package io.dynamic.threadpool.server.config; +package io.dynamic.threadpool.config.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import io.dynamic.threadpool.server.enums.DelEnum; +import io.dynamic.threadpool.config.enums.DelEnum; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/io/dynamic/threadpool/server/config/MybatisPlusConfig.java b/config/src/main/java/io/dynamic/threadpool/config/config/MybatisPlusConfig.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/config/MybatisPlusConfig.java rename to config/src/main/java/io/dynamic/threadpool/config/config/MybatisPlusConfig.java index f86146e2..c4d8bcc5 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/config/MybatisPlusConfig.java +++ b/config/src/main/java/io/dynamic/threadpool/config/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.config; +package io.dynamic.threadpool.config.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/server/src/main/java/io/dynamic/threadpool/server/controller/ConfigController.java b/config/src/main/java/io/dynamic/threadpool/config/controller/ConfigController.java similarity index 86% rename from server/src/main/java/io/dynamic/threadpool/server/controller/ConfigController.java rename to config/src/main/java/io/dynamic/threadpool/config/controller/ConfigController.java index db22c023..dae48132 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/controller/ConfigController.java +++ b/config/src/main/java/io/dynamic/threadpool/config/controller/ConfigController.java @@ -1,13 +1,13 @@ -package io.dynamic.threadpool.server.controller; +package io.dynamic.threadpool.config.controller; import io.dynamic.threadpool.common.constant.Constants; import io.dynamic.threadpool.common.web.base.Result; import io.dynamic.threadpool.common.web.base.Results; -import io.dynamic.threadpool.server.model.ConfigAllInfo; -import io.dynamic.threadpool.server.model.ConfigInfoBase; -import io.dynamic.threadpool.server.service.biz.ConfigService; -import io.dynamic.threadpool.server.service.ConfigServletInner; -import io.dynamic.threadpool.server.toolkit.Md5ConfigUtil; +import io.dynamic.threadpool.config.model.ConfigAllInfo; +import io.dynamic.threadpool.config.model.ConfigInfoBase; +import io.dynamic.threadpool.config.service.biz.ConfigService; +import io.dynamic.threadpool.config.service.ConfigServletInner; +import io.dynamic.threadpool.config.toolkit.Md5ConfigUtil; import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; diff --git a/server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java b/config/src/main/java/io/dynamic/threadpool/config/controller/ItemController.java similarity index 81% rename from server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java rename to config/src/main/java/io/dynamic/threadpool/config/controller/ItemController.java index 70840cbe..e994fbd7 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java +++ b/config/src/main/java/io/dynamic/threadpool/config/controller/ItemController.java @@ -1,14 +1,14 @@ -package io.dynamic.threadpool.server.controller; +package io.dynamic.threadpool.config.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.dynamic.threadpool.common.constant.Constants; import io.dynamic.threadpool.common.web.base.Result; import io.dynamic.threadpool.common.web.base.Results; -import io.dynamic.threadpool.server.model.biz.item.ItemQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemRespDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemSaveReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemUpdateReqDTO; -import io.dynamic.threadpool.server.service.biz.ItemService; +import io.dynamic.threadpool.config.model.biz.item.ItemQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemRespDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemSaveReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemUpdateReqDTO; +import io.dynamic.threadpool.config.service.biz.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/server/src/main/java/io/dynamic/threadpool/server/controller/TenantController.java b/config/src/main/java/io/dynamic/threadpool/config/controller/TenantController.java similarity index 81% rename from server/src/main/java/io/dynamic/threadpool/server/controller/TenantController.java rename to config/src/main/java/io/dynamic/threadpool/config/controller/TenantController.java index 1adba710..720a3807 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/controller/TenantController.java +++ b/config/src/main/java/io/dynamic/threadpool/config/controller/TenantController.java @@ -1,14 +1,14 @@ -package io.dynamic.threadpool.server.controller; +package io.dynamic.threadpool.config.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.dynamic.threadpool.common.constant.Constants; import io.dynamic.threadpool.common.web.base.Result; import io.dynamic.threadpool.common.web.base.Results; -import io.dynamic.threadpool.server.model.biz.tenant.TenantQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantRespDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantSaveReqDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantUpdateReqDTO; -import io.dynamic.threadpool.server.service.biz.TenantService; +import io.dynamic.threadpool.config.model.biz.tenant.TenantQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantRespDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantSaveReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantUpdateReqDTO; +import io.dynamic.threadpool.config.service.biz.TenantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java b/config/src/main/java/io/dynamic/threadpool/config/controller/ThreadPoolController.java similarity index 81% rename from server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java rename to config/src/main/java/io/dynamic/threadpool/config/controller/ThreadPoolController.java index 7fd3abf8..12d7744d 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java +++ b/config/src/main/java/io/dynamic/threadpool/config/controller/ThreadPoolController.java @@ -1,13 +1,13 @@ -package io.dynamic.threadpool.server.controller; +package io.dynamic.threadpool.config.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.dynamic.threadpool.common.constant.Constants; import io.dynamic.threadpool.common.web.base.Result; import io.dynamic.threadpool.common.web.base.Results; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolRespDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; -import io.dynamic.threadpool.server.service.biz.ThreadPoolService; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; +import io.dynamic.threadpool.config.service.biz.ThreadPoolService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/server/src/main/java/io/dynamic/threadpool/server/enums/DelEnum.java b/config/src/main/java/io/dynamic/threadpool/config/enums/DelEnum.java similarity index 92% rename from server/src/main/java/io/dynamic/threadpool/server/enums/DelEnum.java rename to config/src/main/java/io/dynamic/threadpool/config/enums/DelEnum.java index 68724719..af61f843 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/enums/DelEnum.java +++ b/config/src/main/java/io/dynamic/threadpool/config/enums/DelEnum.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.enums; +package io.dynamic.threadpool.config.enums; /** * 状态枚举 diff --git a/server/src/main/java/io/dynamic/threadpool/server/event/ConfigDataChangeEvent.java b/config/src/main/java/io/dynamic/threadpool/config/event/ConfigDataChangeEvent.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/event/ConfigDataChangeEvent.java rename to config/src/main/java/io/dynamic/threadpool/config/event/ConfigDataChangeEvent.java index fdcd6429..c426cf61 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/event/ConfigDataChangeEvent.java +++ b/config/src/main/java/io/dynamic/threadpool/config/event/ConfigDataChangeEvent.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.event; +package io.dynamic.threadpool.config.event; import org.springframework.util.StringUtils; diff --git a/server/src/main/java/io/dynamic/threadpool/server/event/Event.java b/config/src/main/java/io/dynamic/threadpool/config/event/Event.java similarity index 92% rename from server/src/main/java/io/dynamic/threadpool/server/event/Event.java rename to config/src/main/java/io/dynamic/threadpool/config/event/Event.java index 80a9c8eb..4ac9584d 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/event/Event.java +++ b/config/src/main/java/io/dynamic/threadpool/config/event/Event.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.event; +package io.dynamic.threadpool.config.event; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLong; diff --git a/server/src/main/java/io/dynamic/threadpool/server/event/LocalDataChangeEvent.java b/config/src/main/java/io/dynamic/threadpool/config/event/LocalDataChangeEvent.java similarity index 85% rename from server/src/main/java/io/dynamic/threadpool/server/event/LocalDataChangeEvent.java rename to config/src/main/java/io/dynamic/threadpool/config/event/LocalDataChangeEvent.java index a59ef9cc..36b9bfe0 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/event/LocalDataChangeEvent.java +++ b/config/src/main/java/io/dynamic/threadpool/config/event/LocalDataChangeEvent.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.event; +package io.dynamic.threadpool.config.event; /** * Local Data Change Event. diff --git a/server/src/main/java/io/dynamic/threadpool/server/event/SlowEvent.java b/config/src/main/java/io/dynamic/threadpool/config/event/SlowEvent.java similarity index 81% rename from server/src/main/java/io/dynamic/threadpool/server/event/SlowEvent.java rename to config/src/main/java/io/dynamic/threadpool/config/event/SlowEvent.java index 8e3b3edb..5bec9985 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/event/SlowEvent.java +++ b/config/src/main/java/io/dynamic/threadpool/config/event/SlowEvent.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.event; +package io.dynamic.threadpool.config.event; /** * Slow Event. diff --git a/server/src/main/java/io/dynamic/threadpool/server/mapper/ConfigInfoMapper.java b/config/src/main/java/io/dynamic/threadpool/config/mapper/ConfigInfoMapper.java similarity index 71% rename from server/src/main/java/io/dynamic/threadpool/server/mapper/ConfigInfoMapper.java rename to config/src/main/java/io/dynamic/threadpool/config/mapper/ConfigInfoMapper.java index 2b490bde..b0eebf3f 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/mapper/ConfigInfoMapper.java +++ b/config/src/main/java/io/dynamic/threadpool/config/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ -package io.dynamic.threadpool.server.mapper; +package io.dynamic.threadpool.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.dynamic.threadpool.server.model.ConfigAllInfo; +import io.dynamic.threadpool.config.model.ConfigAllInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/src/main/java/io/dynamic/threadpool/server/mapper/ItemInfoMapper.java b/config/src/main/java/io/dynamic/threadpool/config/mapper/ItemInfoMapper.java similarity index 72% rename from server/src/main/java/io/dynamic/threadpool/server/mapper/ItemInfoMapper.java rename to config/src/main/java/io/dynamic/threadpool/config/mapper/ItemInfoMapper.java index e55c496e..d3589e8f 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/mapper/ItemInfoMapper.java +++ b/config/src/main/java/io/dynamic/threadpool/config/mapper/ItemInfoMapper.java @@ -1,7 +1,7 @@ -package io.dynamic.threadpool.server.mapper; +package io.dynamic.threadpool.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.dynamic.threadpool.server.model.ItemInfo; +import io.dynamic.threadpool.config.model.ItemInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/src/main/java/io/dynamic/threadpool/server/mapper/TenantInfoMapper.java b/config/src/main/java/io/dynamic/threadpool/config/mapper/TenantInfoMapper.java similarity index 72% rename from server/src/main/java/io/dynamic/threadpool/server/mapper/TenantInfoMapper.java rename to config/src/main/java/io/dynamic/threadpool/config/mapper/TenantInfoMapper.java index 06da1146..e107dc8c 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/mapper/TenantInfoMapper.java +++ b/config/src/main/java/io/dynamic/threadpool/config/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ -package io.dynamic.threadpool.server.mapper; +package io.dynamic.threadpool.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.dynamic.threadpool.server.model.TenantInfo; +import io.dynamic.threadpool.config.model.TenantInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/CacheItem.java b/config/src/main/java/io/dynamic/threadpool/config/model/CacheItem.java similarity index 80% rename from server/src/main/java/io/dynamic/threadpool/server/model/CacheItem.java rename to config/src/main/java/io/dynamic/threadpool/config/model/CacheItem.java index 1c5f9cfc..8ec1bf2d 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/CacheItem.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/CacheItem.java @@ -1,8 +1,8 @@ -package io.dynamic.threadpool.server.model; +package io.dynamic.threadpool.config.model; import io.dynamic.threadpool.common.constant.Constants; -import io.dynamic.threadpool.server.toolkit.SimpleReadWriteLock; -import io.dynamic.threadpool.server.toolkit.SingletonRepository; +import io.dynamic.threadpool.config.toolkit.SimpleReadWriteLock; +import io.dynamic.threadpool.config.toolkit.SingletonRepository; import lombok.Getter; import lombok.Setter; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/ConfigAllInfo.java b/config/src/main/java/io/dynamic/threadpool/config/model/ConfigAllInfo.java similarity index 96% rename from server/src/main/java/io/dynamic/threadpool/server/model/ConfigAllInfo.java rename to config/src/main/java/io/dynamic/threadpool/config/model/ConfigAllInfo.java index 0c86f92b..316ce2cf 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/ConfigAllInfo.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/ConfigAllInfo.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model; +package io.dynamic.threadpool.config.model; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/ConfigInfo.java b/config/src/main/java/io/dynamic/threadpool/config/model/ConfigInfo.java similarity index 83% rename from server/src/main/java/io/dynamic/threadpool/server/model/ConfigInfo.java rename to config/src/main/java/io/dynamic/threadpool/config/model/ConfigInfo.java index f8a80912..09a0794b 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/ConfigInfo.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/ConfigInfo.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model; +package io.dynamic.threadpool.config.model; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/ConfigInfoBase.java b/config/src/main/java/io/dynamic/threadpool/config/model/ConfigInfoBase.java similarity index 97% rename from server/src/main/java/io/dynamic/threadpool/server/model/ConfigInfoBase.java rename to config/src/main/java/io/dynamic/threadpool/config/model/ConfigInfoBase.java index d627ee8c..a657a127 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/ConfigInfoBase.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/ConfigInfoBase.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model; +package io.dynamic.threadpool.config.model; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/ItemInfo.java b/config/src/main/java/io/dynamic/threadpool/config/model/ItemInfo.java similarity index 95% rename from server/src/main/java/io/dynamic/threadpool/server/model/ItemInfo.java rename to config/src/main/java/io/dynamic/threadpool/config/model/ItemInfo.java index 32640923..8b3d6c72 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/ItemInfo.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/ItemInfo.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model; +package io.dynamic.threadpool.config.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/TenantInfo.java b/config/src/main/java/io/dynamic/threadpool/config/model/TenantInfo.java similarity index 95% rename from server/src/main/java/io/dynamic/threadpool/server/model/TenantInfo.java rename to config/src/main/java/io/dynamic/threadpool/config/model/TenantInfo.java index dfdf0940..08ba38f2 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/TenantInfo.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/TenantInfo.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model; +package io.dynamic.threadpool.config.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemQueryReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java similarity index 86% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemQueryReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java index 1a0e5207..33d88366 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemQueryReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemQueryReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.item; +package io.dynamic.threadpool.config.model.biz.item; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java similarity index 87% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java index 40dfcace..849cb24a 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemRespDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.item; +package io.dynamic.threadpool.config.model.biz.item; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemSaveReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java similarity index 84% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemSaveReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java index 8a4a341e..3d8ce91b 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemSaveReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemSaveReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.item; +package io.dynamic.threadpool.config.model.biz.item; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemUpdateReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java similarity index 84% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemUpdateReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java index c4ad87b4..1c3c28ba 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemUpdateReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/item/ItemUpdateReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.item; +package io.dynamic.threadpool.config.model.biz.item; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantQueryReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java similarity index 85% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantQueryReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java index 79596975..63268448 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantQueryReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantQueryReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.tenant; +package io.dynamic.threadpool.config.model.biz.tenant; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantRespDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java similarity index 91% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantRespDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java index 102ab155..b580a2e3 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantRespDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantRespDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.tenant; +package io.dynamic.threadpool.config.model.biz.tenant; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantSaveReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java similarity index 87% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantSaveReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java index 3995fe13..944d1b17 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantSaveReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantSaveReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.tenant; +package io.dynamic.threadpool.config.model.biz.tenant; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantUpdateReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java similarity index 88% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantUpdateReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java index 817b6c2a..17c82fc0 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/tenant/TenantUpdateReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.tenant; +package io.dynamic.threadpool.config.model.biz.tenant; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolQueryReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java similarity index 85% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolQueryReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java index b4804d91..5cfb8287 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolQueryReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.threadpool; +package io.dynamic.threadpool.config.model.biz.threadpool; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java index 3dfe8b77..c20a96d3 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolRespDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.threadpool; +package io.dynamic.threadpool.config.model.biz.threadpool; import lombok.Data; diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java b/config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java rename to config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java index e7602431..27c4f702 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java +++ b/config/src/main/java/io/dynamic/threadpool/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.model.biz.threadpool; +package io.dynamic.threadpool.config.model.biz.threadpool; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/server/src/main/java/io/dynamic/threadpool/server/notify/DefaultPublisher.java b/config/src/main/java/io/dynamic/threadpool/config/notify/DefaultPublisher.java similarity index 95% rename from server/src/main/java/io/dynamic/threadpool/server/notify/DefaultPublisher.java rename to config/src/main/java/io/dynamic/threadpool/config/notify/DefaultPublisher.java index df6d55d9..782b1d27 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/notify/DefaultPublisher.java +++ b/config/src/main/java/io/dynamic/threadpool/config/notify/DefaultPublisher.java @@ -1,8 +1,8 @@ -package io.dynamic.threadpool.server.notify; +package io.dynamic.threadpool.config.notify; import cn.hutool.core.collection.ConcurrentHashSet; -import io.dynamic.threadpool.server.event.Event; -import io.dynamic.threadpool.server.notify.listener.Subscriber; +import io.dynamic.threadpool.config.event.Event; +import io.dynamic.threadpool.config.notify.listener.Subscriber; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/server/src/main/java/io/dynamic/threadpool/server/notify/DefaultSharePublisher.java b/config/src/main/java/io/dynamic/threadpool/config/notify/DefaultSharePublisher.java similarity index 86% rename from server/src/main/java/io/dynamic/threadpool/server/notify/DefaultSharePublisher.java rename to config/src/main/java/io/dynamic/threadpool/config/notify/DefaultSharePublisher.java index f37b0e44..4ba9e1c6 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/notify/DefaultSharePublisher.java +++ b/config/src/main/java/io/dynamic/threadpool/config/notify/DefaultSharePublisher.java @@ -1,9 +1,9 @@ -package io.dynamic.threadpool.server.notify; +package io.dynamic.threadpool.config.notify; import cn.hutool.core.collection.ConcurrentHashSet; -import io.dynamic.threadpool.server.event.Event; -import io.dynamic.threadpool.server.event.SlowEvent; -import io.dynamic.threadpool.server.notify.listener.Subscriber; +import io.dynamic.threadpool.config.event.Event; +import io.dynamic.threadpool.config.event.SlowEvent; +import io.dynamic.threadpool.config.notify.listener.Subscriber; import java.util.Map; import java.util.Set; diff --git a/server/src/main/java/io/dynamic/threadpool/server/notify/EventPublisher.java b/config/src/main/java/io/dynamic/threadpool/config/notify/EventPublisher.java similarity index 67% rename from server/src/main/java/io/dynamic/threadpool/server/notify/EventPublisher.java rename to config/src/main/java/io/dynamic/threadpool/config/notify/EventPublisher.java index 8ee76e96..ece12d13 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/notify/EventPublisher.java +++ b/config/src/main/java/io/dynamic/threadpool/config/notify/EventPublisher.java @@ -1,7 +1,7 @@ -package io.dynamic.threadpool.server.notify; +package io.dynamic.threadpool.config.notify; -import io.dynamic.threadpool.server.event.Event; -import io.dynamic.threadpool.server.notify.listener.Subscriber; +import io.dynamic.threadpool.config.event.Event; +import io.dynamic.threadpool.config.notify.listener.Subscriber; /** * Event publisher. diff --git a/server/src/main/java/io/dynamic/threadpool/server/notify/NotifyCenter.java b/config/src/main/java/io/dynamic/threadpool/config/notify/NotifyCenter.java similarity index 91% rename from server/src/main/java/io/dynamic/threadpool/server/notify/NotifyCenter.java rename to config/src/main/java/io/dynamic/threadpool/config/notify/NotifyCenter.java index 5bd3bcf8..cac9f33d 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/notify/NotifyCenter.java +++ b/config/src/main/java/io/dynamic/threadpool/config/notify/NotifyCenter.java @@ -1,11 +1,11 @@ -package io.dynamic.threadpool.server.notify; - -import io.dynamic.threadpool.server.event.Event; -import io.dynamic.threadpool.server.event.SlowEvent; -import io.dynamic.threadpool.server.notify.listener.SmartSubscriber; -import io.dynamic.threadpool.server.notify.listener.Subscriber; -import io.dynamic.threadpool.server.toolkit.ClassUtil; -import io.dynamic.threadpool.server.toolkit.MapUtil; +package io.dynamic.threadpool.config.notify; + +import io.dynamic.threadpool.config.event.Event; +import io.dynamic.threadpool.config.event.SlowEvent; +import io.dynamic.threadpool.config.notify.listener.SmartSubscriber; +import io.dynamic.threadpool.config.notify.listener.Subscriber; +import io.dynamic.threadpool.config.toolkit.ClassUtil; +import io.dynamic.threadpool.config.toolkit.MapUtil; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/server/src/main/java/io/dynamic/threadpool/server/notify/listener/SmartSubscriber.java b/config/src/main/java/io/dynamic/threadpool/config/notify/listener/SmartSubscriber.java similarity index 71% rename from server/src/main/java/io/dynamic/threadpool/server/notify/listener/SmartSubscriber.java rename to config/src/main/java/io/dynamic/threadpool/config/notify/listener/SmartSubscriber.java index 22f0fc84..fdda20d8 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/notify/listener/SmartSubscriber.java +++ b/config/src/main/java/io/dynamic/threadpool/config/notify/listener/SmartSubscriber.java @@ -1,6 +1,6 @@ -package io.dynamic.threadpool.server.notify.listener; +package io.dynamic.threadpool.config.notify.listener; -import io.dynamic.threadpool.server.event.Event; +import io.dynamic.threadpool.config.event.Event; import java.util.List; diff --git a/server/src/main/java/io/dynamic/threadpool/server/notify/listener/Subscriber.java b/config/src/main/java/io/dynamic/threadpool/config/notify/listener/Subscriber.java similarity index 83% rename from server/src/main/java/io/dynamic/threadpool/server/notify/listener/Subscriber.java rename to config/src/main/java/io/dynamic/threadpool/config/notify/listener/Subscriber.java index 1c0b0325..e68ea455 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/notify/listener/Subscriber.java +++ b/config/src/main/java/io/dynamic/threadpool/config/notify/listener/Subscriber.java @@ -1,6 +1,6 @@ -package io.dynamic.threadpool.server.notify.listener; +package io.dynamic.threadpool.config.notify.listener; -import io.dynamic.threadpool.server.event.Event; +import io.dynamic.threadpool.config.event.Event; import java.util.concurrent.Executor; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/ConfigCacheService.java b/config/src/main/java/io/dynamic/threadpool/config/service/ConfigCacheService.java similarity index 90% rename from server/src/main/java/io/dynamic/threadpool/server/service/ConfigCacheService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/ConfigCacheService.java index 7e9f9d37..e88f952a 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/ConfigCacheService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/ConfigCacheService.java @@ -1,13 +1,13 @@ -package io.dynamic.threadpool.server.service; +package io.dynamic.threadpool.config.service; import io.dynamic.threadpool.common.config.ApplicationContextHolder; import io.dynamic.threadpool.common.constant.Constants; import io.dynamic.threadpool.common.toolkit.Md5Util; -import io.dynamic.threadpool.server.event.LocalDataChangeEvent; -import io.dynamic.threadpool.server.model.CacheItem; -import io.dynamic.threadpool.server.model.ConfigAllInfo; -import io.dynamic.threadpool.server.notify.NotifyCenter; -import io.dynamic.threadpool.server.service.biz.ConfigService; +import io.dynamic.threadpool.config.event.LocalDataChangeEvent; +import io.dynamic.threadpool.config.model.CacheItem; +import io.dynamic.threadpool.config.model.ConfigAllInfo; +import io.dynamic.threadpool.config.notify.NotifyCenter; +import io.dynamic.threadpool.config.service.biz.ConfigService; import org.springframework.util.StringUtils; import java.util.Objects; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/ConfigChangePublisher.java b/config/src/main/java/io/dynamic/threadpool/config/service/ConfigChangePublisher.java similarity index 65% rename from server/src/main/java/io/dynamic/threadpool/server/service/ConfigChangePublisher.java rename to config/src/main/java/io/dynamic/threadpool/config/service/ConfigChangePublisher.java index b08cef07..e216f3a3 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/ConfigChangePublisher.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/ConfigChangePublisher.java @@ -1,7 +1,7 @@ -package io.dynamic.threadpool.server.service; +package io.dynamic.threadpool.config.service; -import io.dynamic.threadpool.server.event.LocalDataChangeEvent; -import io.dynamic.threadpool.server.notify.NotifyCenter; +import io.dynamic.threadpool.config.event.LocalDataChangeEvent; +import io.dynamic.threadpool.config.notify.NotifyCenter; /** * Config Change Publisher. diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/ConfigServletInner.java b/config/src/main/java/io/dynamic/threadpool/config/service/ConfigServletInner.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/service/ConfigServletInner.java rename to config/src/main/java/io/dynamic/threadpool/config/service/ConfigServletInner.java index 6f6d9527..51e2bc56 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/ConfigServletInner.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/ConfigServletInner.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service; +package io.dynamic.threadpool.config.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/LongPollingService.java b/config/src/main/java/io/dynamic/threadpool/config/service/LongPollingService.java similarity index 95% rename from server/src/main/java/io/dynamic/threadpool/server/service/LongPollingService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/LongPollingService.java index 87f43cd9..318b18bf 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/LongPollingService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/LongPollingService.java @@ -1,15 +1,15 @@ -package io.dynamic.threadpool.server.service; +package io.dynamic.threadpool.config.service; import com.alibaba.fastjson.JSON; import io.dynamic.threadpool.common.toolkit.Md5Util; import io.dynamic.threadpool.common.web.base.Results; -import io.dynamic.threadpool.server.event.Event; -import io.dynamic.threadpool.server.event.LocalDataChangeEvent; -import io.dynamic.threadpool.server.notify.NotifyCenter; -import io.dynamic.threadpool.server.notify.listener.Subscriber; -import io.dynamic.threadpool.server.toolkit.ConfigExecutor; -import io.dynamic.threadpool.server.toolkit.Md5ConfigUtil; -import io.dynamic.threadpool.server.toolkit.RequestUtil; +import io.dynamic.threadpool.config.event.Event; +import io.dynamic.threadpool.config.event.LocalDataChangeEvent; +import io.dynamic.threadpool.config.notify.NotifyCenter; +import io.dynamic.threadpool.config.notify.listener.Subscriber; +import io.dynamic.threadpool.config.toolkit.ConfigExecutor; +import io.dynamic.threadpool.config.toolkit.Md5ConfigUtil; +import io.dynamic.threadpool.config.toolkit.RequestUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/SwitchService.java b/config/src/main/java/io/dynamic/threadpool/config/service/SwitchService.java similarity index 96% rename from server/src/main/java/io/dynamic/threadpool/server/service/SwitchService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/SwitchService.java index d7dd8811..987df0a3 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/SwitchService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/SwitchService.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service; +package io.dynamic.threadpool.config.service; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigService.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ConfigService.java similarity index 82% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/ConfigService.java index 109182b5..707c3d16 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ConfigService.java @@ -1,6 +1,6 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; -import io.dynamic.threadpool.server.model.ConfigAllInfo; +import io.dynamic.threadpool.config.model.ConfigAllInfo; /** * 服务端配置接口 diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigServiceImpl.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java similarity index 90% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigServiceImpl.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java index 81b436e0..0985450b 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigServiceImpl.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import io.dynamic.threadpool.common.toolkit.ContentUtil; import io.dynamic.threadpool.common.toolkit.Md5Util; -import io.dynamic.threadpool.server.event.LocalDataChangeEvent; -import io.dynamic.threadpool.server.mapper.ConfigInfoMapper; -import io.dynamic.threadpool.server.model.ConfigAllInfo; -import io.dynamic.threadpool.server.service.ConfigChangePublisher; +import io.dynamic.threadpool.config.event.LocalDataChangeEvent; +import io.dynamic.threadpool.config.mapper.ConfigInfoMapper; +import io.dynamic.threadpool.config.model.ConfigAllInfo; +import io.dynamic.threadpool.config.service.ConfigChangePublisher; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ItemService.java similarity index 76% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/ItemService.java index 07b551b9..bc26c69e 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ItemService.java @@ -1,10 +1,10 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dynamic.threadpool.server.model.biz.item.ItemQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemRespDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemSaveReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemUpdateReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemRespDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemSaveReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemUpdateReqDTO; import java.util.List; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemServiceImpl.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ItemServiceImpl.java similarity index 88% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemServiceImpl.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/ItemServiceImpl.java index 07984149..2fbc86b6 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemServiceImpl.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ItemServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import io.dynamic.threadpool.server.enums.DelEnum; -import io.dynamic.threadpool.server.mapper.ItemInfoMapper; -import io.dynamic.threadpool.server.model.ItemInfo; -import io.dynamic.threadpool.server.model.biz.item.ItemQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemRespDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemSaveReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemUpdateReqDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolRespDTO; -import io.dynamic.threadpool.server.toolkit.BeanUtil; +import io.dynamic.threadpool.config.enums.DelEnum; +import io.dynamic.threadpool.config.mapper.ItemInfoMapper; +import io.dynamic.threadpool.config.model.ItemInfo; +import io.dynamic.threadpool.config.model.biz.item.ItemQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemRespDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemSaveReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemUpdateReqDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO; +import io.dynamic.threadpool.config.toolkit.BeanUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantService.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/TenantService.java similarity index 74% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/TenantService.java index a50cb412..cdca883f 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/TenantService.java @@ -1,10 +1,10 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dynamic.threadpool.server.model.biz.tenant.TenantQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantRespDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantSaveReqDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantUpdateReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantRespDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantSaveReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantUpdateReqDTO; /** * 业务接口 diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantServiceImpl.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/TenantServiceImpl.java similarity index 84% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantServiceImpl.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/TenantServiceImpl.java index c185beec..97a96f67 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantServiceImpl.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/TenantServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import io.dynamic.threadpool.server.enums.DelEnum; -import io.dynamic.threadpool.server.mapper.TenantInfoMapper; -import io.dynamic.threadpool.server.model.TenantInfo; -import io.dynamic.threadpool.server.model.biz.item.ItemQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.item.ItemRespDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantRespDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantSaveReqDTO; -import io.dynamic.threadpool.server.model.biz.tenant.TenantUpdateReqDTO; -import io.dynamic.threadpool.server.toolkit.BeanUtil; +import io.dynamic.threadpool.config.enums.DelEnum; +import io.dynamic.threadpool.config.mapper.TenantInfoMapper; +import io.dynamic.threadpool.config.model.TenantInfo; +import io.dynamic.threadpool.config.model.biz.item.ItemQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.item.ItemRespDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantRespDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantSaveReqDTO; +import io.dynamic.threadpool.config.model.biz.tenant.TenantUpdateReqDTO; +import io.dynamic.threadpool.config.toolkit.BeanUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolService.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ThreadPoolService.java similarity index 78% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolService.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/ThreadPoolService.java index 18bad66e..08a67f00 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolService.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ThreadPoolService.java @@ -1,9 +1,9 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolRespDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; import java.util.List; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolServiceImpl.java b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java similarity index 84% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolServiceImpl.java rename to config/src/main/java/io/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java index 0259c4ac..5c719a1e 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolServiceImpl.java +++ b/config/src/main/java/io/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java @@ -1,15 +1,15 @@ -package io.dynamic.threadpool.server.service.biz; +package io.dynamic.threadpool.config.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import io.dynamic.threadpool.server.mapper.ConfigInfoMapper; -import io.dynamic.threadpool.server.model.ConfigAllInfo; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolQueryReqDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolRespDTO; -import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; -import io.dynamic.threadpool.server.toolkit.BeanUtil; +import io.dynamic.threadpool.config.mapper.ConfigInfoMapper; +import io.dynamic.threadpool.config.model.ConfigAllInfo; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolQueryReqDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO; +import io.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; +import io.dynamic.threadpool.config.toolkit.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/BeanUtil.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/BeanUtil.java similarity index 98% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/BeanUtil.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/BeanUtil.java index ccf34059..28dfd4f5 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/BeanUtil.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/BeanUtil.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import com.github.dozermapper.core.DozerBeanMapperBuilder; import com.github.dozermapper.core.Mapper; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/ClassUtil.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/ClassUtil.java similarity index 90% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/ClassUtil.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/ClassUtil.java index 93bc35ff..8b013278 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/ClassUtil.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/ClassUtil.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import java.util.Objects; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/ConfigExecutor.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/ConfigExecutor.java similarity index 96% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/ConfigExecutor.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/ConfigExecutor.java index 5a7471c6..3e82a9dc 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/ConfigExecutor.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/ConfigExecutor.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import cn.hutool.core.thread.ThreadFactoryBuilder; import io.dynamic.threadpool.common.executor.ExecutorFactory; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/MapUtil.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/MapUtil.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/MapUtil.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/MapUtil.java index ee785847..81978529 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/MapUtil.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/MapUtil.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import java.util.Map; import java.util.Objects; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/Md5ConfigUtil.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java similarity index 96% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/Md5ConfigUtil.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java index 308d6df4..e184a5bb 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/Md5ConfigUtil.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/Md5ConfigUtil.java @@ -1,9 +1,9 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import io.dynamic.threadpool.common.toolkit.GroupKey; import io.dynamic.threadpool.common.toolkit.Md5Util; -import io.dynamic.threadpool.server.model.ConfigAllInfo; -import io.dynamic.threadpool.server.service.ConfigCacheService; +import io.dynamic.threadpool.config.model.ConfigAllInfo; +import io.dynamic.threadpool.config.service.ConfigCacheService; import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/RequestUtil.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/RequestUtil.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/RequestUtil.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/RequestUtil.java index 741d3c68..765947d8 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/RequestUtil.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/RequestUtil.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import org.springframework.util.StringUtils; diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/SimpleReadWriteLock.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/SimpleReadWriteLock.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java index 2aac5ad8..0ee9b5c5 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/SimpleReadWriteLock.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/SimpleReadWriteLock.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; /** * 简单读写锁. diff --git a/server/src/main/java/io/dynamic/threadpool/server/toolkit/SingletonRepository.java b/config/src/main/java/io/dynamic/threadpool/config/toolkit/SingletonRepository.java similarity index 94% rename from server/src/main/java/io/dynamic/threadpool/server/toolkit/SingletonRepository.java rename to config/src/main/java/io/dynamic/threadpool/config/toolkit/SingletonRepository.java index b42079fe..043a7524 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/toolkit/SingletonRepository.java +++ b/config/src/main/java/io/dynamic/threadpool/config/toolkit/SingletonRepository.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.toolkit; +package io.dynamic.threadpool.config.toolkit; import java.util.concurrent.ConcurrentHashMap; diff --git a/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java b/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java index 7c1dcb66..739415df 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java +++ b/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java @@ -4,11 +4,8 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication( - scanBasePackages = { - "io.dynamic.threadpool.server", "io.dynamic.threadpool.common.config" - }) -@MapperScan("io.dynamic.threadpool.server.mapper") +@MapperScan("io.dynamic.threadpool.config.mapper") +@SpringBootApplication(scanBasePackages = "io.dynamic.threadpool") public class ServerApplication { public static void main(String[] args) {