().setCode(SERVICE_ERROR_CODE);
log.error("{}{} - registration failed: {}", PREFIX, appPathIdentifier, ex.getMessage());
}
if (log.isInfoEnabled()) {
@@ -145,7 +145,7 @@ public class DiscoveryClient implements DisposableBean {
.setLastDirtyTimestamp(instanceInfo.getLastDirtyTimestamp().toString())
.setStatus(instanceInfo.getStatus().toString());
renewResult = httpAgent.httpPostByDiscovery(BASE_PATH + "/apps/renew", instanceRenew);
- if (Objects.equals(ErrorCodeEnum.NOT_FOUND.getCode(), renewResult.getCode())) {
+ if (Objects.equals(SERVICE_NOT_FOUND_CODE, renewResult.getCode())) {
long timestamp = instanceInfo.setIsDirtyWithTime();
boolean success = register();
// TODO Abstract server registration logic
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
index db646ff8..404f8a29 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
@@ -17,10 +17,10 @@
package cn.hippo4j.springboot.starter.core;
-import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java
index 1e253b0f..48325113 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java
@@ -18,8 +18,7 @@
package cn.hippo4j.springboot.starter.core;
import cn.hippo4j.common.api.ThreadPoolConfigChange;
-import cn.hippo4j.common.api.ThreadPoolDynamicRefresh;
-import cn.hippo4j.common.enums.EnableEnum;
+import cn.hippo4j.common.extension.enums.EnableEnum;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
@@ -30,6 +29,7 @@ import cn.hippo4j.common.toolkit.ThreadPoolExecutorUtil;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.message.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.threadpool.dynamic.api.ThreadPoolDynamicRefresh;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java
index 62b64bff..82f67457 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ThreadPoolAdapterRegister.java
@@ -21,9 +21,9 @@ import cn.hippo4j.adapter.base.ThreadPoolAdapter;
import cn.hippo4j.adapter.base.ThreadPoolAdapterCacheConfig;
import cn.hippo4j.adapter.base.ThreadPoolAdapterRegisterAction;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.toolkit.CollectionUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.core.toolkit.IdentifyUtil;
import cn.hippo4j.core.toolkit.inet.InetUtils;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java
index 7efc1411..4fdee6b4 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/monitor/ReportingEventExecutor.java
@@ -18,7 +18,7 @@
package cn.hippo4j.springboot.starter.monitor;
import cn.hippo4j.core.config.ApplicationContextHolder;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import cn.hippo4j.common.monitor.Message;
import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry;
import cn.hippo4j.common.toolkit.CollectionUtil;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java
index 3cfbe586..09bed348 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/notify/ServerModeNotifyConfigBuilder.java
@@ -17,10 +17,10 @@
package cn.hippo4j.springboot.starter.notify;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.GroupKey;
import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.message.api.NotifyConfigBuilder;
import cn.hippo4j.message.dto.NotifyConfigDTO;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java
index 246f80ad..354ba94e 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/AbstractHealthCheck.java
@@ -20,7 +20,7 @@ package cn.hippo4j.springboot.starter.remote;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.springboot.starter.event.ApplicationRefreshedEvent;
import cn.hippo4j.springboot.starter.core.ShutdownExecuteException;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java
index e2bf9db5..91de1849 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpAgent.java
@@ -17,7 +17,7 @@
package cn.hippo4j.springboot.starter.remote;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.model.Result;
import java.util.Map;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java
index 5b7139d6..2d842a04 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/HttpScheduledHealthCheck.java
@@ -17,7 +17,7 @@
package cn.hippo4j.springboot.starter.remote;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.model.Result;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java
index 7ad8ca19..498aedd4 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java
@@ -17,12 +17,12 @@
package cn.hippo4j.springboot.starter.remote;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import cn.hippo4j.springboot.starter.security.SecurityProxy;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java
index c03d518a..83d6b3c2 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/security/SecurityProxy.java
@@ -18,11 +18,11 @@
package cn.hippo4j.springboot.starter.security;
import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.TokenInfo;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.springboot.starter.config.BootstrapProperties;
import lombok.extern.slf4j.Slf4j;
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java
index f648b346..f38d5f51 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolConfigService.java
@@ -17,6 +17,7 @@
package cn.hippo4j.springboot.starter.support;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterParameter;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
@@ -24,8 +25,6 @@ import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.common.toolkit.BooleanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.exception.ServiceException;
import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage;
import cn.hippo4j.core.executor.support.service.AbstractDynamicThreadPoolService;
@@ -55,13 +54,9 @@ import static cn.hippo4j.common.constant.Constants.REGISTER_DYNAMIC_THREAD_POOL_
public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolService {
private final HttpAgent httpAgent;
-
private final BootstrapProperties properties;
-
private final ServerModeNotifyConfigBuilder serverModeNotifyConfigBuilder;
-
private final Hippo4jBaseSendMessageService hippo4jBaseSendMessageService;
-
private final DynamicThreadPoolSubscribeConfig dynamicThreadPoolSubscribeConfig;
@Override
@@ -80,7 +75,7 @@ public class DynamicThreadPoolConfigService extends AbstractDynamicThreadPoolSer
failDynamicThreadPoolRegisterWrapper(registerWrapper);
Result registerResult = httpAgent.httpPost(REGISTER_DYNAMIC_THREAD_POOL_PATH, registerWrapper);
if (registerResult == null || !registerResult.isSuccess()) {
- throw new ServiceException("Dynamic thread pool registration returns error."
+ throw new RuntimeException("Dynamic thread pool registration returns error."
+ Optional.ofNullable(registerResult).map(Result::getMessage).orElse(""));
}
} catch (Throwable ex) {
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
index 0b7bbbdb..1f2617c7 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
@@ -17,9 +17,10 @@
package cn.hippo4j.springboot.starter.support;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.enums.EnableEnum;
+import cn.hippo4j.common.extension.enums.EnableEnum;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
@@ -28,7 +29,6 @@ import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
import cn.hippo4j.common.toolkit.BooleanUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.ReflectUtil;
-import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.core.executor.DynamicThreadPool;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
import cn.hippo4j.core.executor.DynamicThreadPoolWrapper;
@@ -53,6 +53,7 @@ import java.util.Optional;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+
import static cn.hippo4j.common.constant.Constants.INITIAL_CAPACITY;
import static cn.hippo4j.common.constant.Constants.TP_ID;
import static cn.hippo4j.common.constant.Constants.ITEM_ID;
@@ -70,9 +71,7 @@ import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT;
public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
private final BootstrapProperties properties;
-
private final HttpAgent httpAgent;
-
private final DynamicThreadPoolSubscribeConfig dynamicThreadPoolSubscribeConfig;
@Override
diff --git a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java
index 262cd268..e5b9d2c7 100644
--- a/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java
+++ b/starters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/support/ThreadPoolPluginRegisterPostProcessor.java
@@ -18,11 +18,11 @@
package cn.hippo4j.springboot.starter.support;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultGlobalThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.GlobalThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginRegistrar;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginSupport;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultGlobalThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.GlobalThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.framework.autoproxy.AutoProxyUtils;
import org.springframework.beans.BeansException;
@@ -59,7 +59,7 @@ import java.util.Objects;
public class ThreadPoolPluginRegisterPostProcessor extends DefaultGlobalThreadPoolPluginManager implements BeanPostProcessor, ApplicationContextAware {
/**
- * application context
+ * Application context
*/
private ConfigurableListableBeanFactory beanFactory;
diff --git a/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java b/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java
index 143b285e..e07dbe57 100644
--- a/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java
+++ b/threadpool/adapter/hystrix/src/main/java/cn/hippo4j/adapter/hystrix/ThreadPoolAdapterScheduler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.hystrix;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java
index 03014af3..96a0b0c8 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/AbstractWebThreadPoolService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java
index 0b25afdd..8f850287 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/IWebThreadPoolHandlerSupport.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java
index 71ef1fbe..824fda84 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolHandlerChoose.java
@@ -18,7 +18,6 @@
package cn.hippo4j.adapter.web;
import cn.hippo4j.core.config.ApplicationContextHolder;
-import cn.hippo4j.common.web.exception.ServiceException;
import lombok.extern.slf4j.Slf4j;
/**
@@ -37,7 +36,7 @@ public class WebThreadPoolHandlerChoose {
try {
webThreadPoolService = ApplicationContextHolder.getBean(WebThreadPoolService.class);
} catch (Exception ex) {
- throw new ServiceException("Web thread pool service bean not found.", ex);
+ throw new RuntimeException("Web thread pool service bean not found.", ex);
}
return webThreadPoolService;
}
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java
index 082c890f..b85f89b9 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.adapter.web;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java
index f82b3408..6307af4d 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/jetty/JettyWebThreadPoolHandlerSupport.java
@@ -19,7 +19,7 @@ package cn.hippo4j.adapter.web.jetty;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
import cn.hippo4j.common.constant.ChangeThreadPoolConstants;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java
index 446a4b43..d04d2af3 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/tomcat/TomcatWebThreadPoolHandlerSupport.java
@@ -19,7 +19,7 @@ package cn.hippo4j.adapter.web.tomcat;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
import cn.hippo4j.common.constant.ChangeThreadPoolConstants;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
index 0c2cd8bb..2d3d3c06 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
@@ -19,7 +19,7 @@ package cn.hippo4j.adapter.web.undertow;
import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport;
import cn.hippo4j.common.constant.ChangeThreadPoolConstants;
-import cn.hippo4j.common.enums.WebContainerEnum;
+import cn.hippo4j.common.extension.enums.WebContainerEnum;
import cn.hippo4j.common.model.ThreadPoolBaseInfo;
import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
index 15c4f07f..c0917f50 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolExecutor.java
@@ -18,12 +18,12 @@
package cn.hippo4j.core.executor;
import cn.hippo4j.common.toolkit.CollectionUtil;
-import cn.hippo4j.core.plugin.impl.TaskDecoratorPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectCountRecordPlugin;
-import cn.hippo4j.core.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginRegistrar;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java
index 964d6318..7351055f 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/DynamicThreadPoolWrapper.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor;
-import cn.hippo4j.core.provider.CommonDynamicThreadPoolProviderFactory;
+import cn.hippo4j.core.executor.provider.CommonDynamicThreadPoolProviderFactory;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java
index 3401dcd0..1cedb30a 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutor.java
@@ -17,13 +17,13 @@
package cn.hippo4j.core.executor;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginSupport;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandler.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandler.java
index 521a3e47..2b33a561 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.handler;
+package cn.hippo4j.core.executor.handler;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.core.config.BootstrapPropertiesInterface;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ExecuteAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ExecuteAwarePlugin.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/ExecuteAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ExecuteAwarePlugin.java
index 41176b8d..da5f9165 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ExecuteAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ExecuteAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import java.util.concurrent.ThreadPoolExecutor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/PluginRuntime.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/PluginRuntime.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/PluginRuntime.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/PluginRuntime.java
index 10515da1..522a473d 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/PluginRuntime.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/PluginRuntime.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/RejectedAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/RejectedAwarePlugin.java
similarity index 96%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/RejectedAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/RejectedAwarePlugin.java
index 00213a59..b7dd3928 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/RejectedAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/RejectedAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import java.util.concurrent.ThreadPoolExecutor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ShutdownAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ShutdownAwarePlugin.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/ShutdownAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ShutdownAwarePlugin.java
index ab526cf5..2fb8f9be 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ShutdownAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ShutdownAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import java.util.List;
import java.util.concurrent.ThreadPoolExecutor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/TaskAwarePlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/TaskAwarePlugin.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/TaskAwarePlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/TaskAwarePlugin.java
index c846a74e..235613ef 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/TaskAwarePlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/TaskAwarePlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ThreadPoolPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ThreadPoolPlugin.java
similarity index 89%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/ThreadPoolPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ThreadPoolPlugin.java
index 8b20137d..06159075 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/ThreadPoolPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/ThreadPoolPlugin.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginRegistrar;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginSupport;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
/**
* A marker superinterface indicating that
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/AbstractTaskTimerPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/AbstractTaskTimerPlugin.java
similarity index 96%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/AbstractTaskTimerPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/AbstractTaskTimerPlugin.java
index 7733249c..f9e715f7 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/AbstractTaskTimerPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/AbstractTaskTimerPlugin.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
import cn.hippo4j.core.toolkit.SystemClock;
import java.util.Optional;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPlugin.java
similarity index 94%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPlugin.java
index 749121f2..93218dc0 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPlugin.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import lombok.Getter;
import lombok.NonNull;
import org.springframework.core.task.TaskDecorator;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPlugin.java
similarity index 92%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPlugin.java
index 2d82402a..02f937cd 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPlugin.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
import lombok.Getter;
import lombok.Setter;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPlugin.java
similarity index 95%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPlugin.java
index 7c1ec674..7a5f5c13 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPlugin.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPlugin.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPlugin.java
index 5c47a7c7..56e61cf8 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPlugin.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.core.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
index 2d949a13..8910d621 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.core.config.ApplicationContextHolder;
-import cn.hippo4j.core.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
similarity index 96%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
index beec590b..ec07ef18 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
index 77246371..2e075e64 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManager.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import lombok.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManager.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManager.java
index 790ed894..319e7ef5 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManager.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrar.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrar.java
similarity index 81%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrar.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrar.java
index 356782ee..3bfc911c 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrar.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrar.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.impl.TaskDecoratorPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectCountRecordPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManager.java
similarity index 93%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManager.java
index d2d18ea3..e41e38e9 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManager.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/GlobalThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/GlobalThreadPoolPluginManager.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/GlobalThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/GlobalThreadPoolPluginManager.java
index 62d2085d..b6c20d2d 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/GlobalThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/GlobalThreadPoolPluginManager.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import java.util.Collection;
import java.util.Optional;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginManager.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginManager.java
similarity index 94%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginManager.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginManager.java
index 56027c2b..f5782108 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginManager.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginManager.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
-
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+package cn.hippo4j.core.executor.plugin.manager;
+
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import java.util.Collection;
import java.util.Optional;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginRegistrar.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginRegistrar.java
similarity index 92%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginRegistrar.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginRegistrar.java
index 5ba3e57c..c2898cdf 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginRegistrar.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginRegistrar.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
/**
* Registrar of {@link ThreadPoolPlugin}.
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupport.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupport.java
similarity index 94%
rename from threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupport.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupport.java
index 31426421..89818bb2 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupport.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupport.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/provider/CommonDynamicThreadPoolProviderFactory.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/provider/CommonDynamicThreadPoolProviderFactory.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/provider/CommonDynamicThreadPoolProviderFactory.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/provider/CommonDynamicThreadPoolProviderFactory.java
index 3350544e..b71b2674 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/provider/CommonDynamicThreadPoolProviderFactory.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/provider/CommonDynamicThreadPoolProviderFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.provider;
+package cn.hippo4j.core.executor.provider;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
@@ -32,14 +32,17 @@ public class CommonDynamicThreadPoolProviderFactory {
* Core pool size.
*/
private static final int CORE_POOL_SIZE = 2;
+
/**
* Maximum pool size.
*/
private static final int MAXIMUM_POOL_SIZE = 4;
+
/**
* Keep alive time.
*/
private static final long KEEP_ALIVE_TIME = 60L;
+
/**
* Work queue capacity.
*/
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandler.java
similarity index 98%
rename from threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandler.java
index ff6a1fb1..33119193 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandler.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.proxy;
+package cn.hippo4j.core.executor.proxy;
import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.core.config.ApplicationContextHolder;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyUtil.java
similarity index 97%
rename from threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyUtil.java
rename to threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyUtil.java
index 10ce57b5..ddd9f136 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/proxy/RejectedProxyUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/proxy/RejectedProxyUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.proxy;
+package cn.hippo4j.core.executor.proxy;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java
index 6a61c23d..4ae9d3ad 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractBuildThreadPoolTemplate.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.support;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
import lombok.Data;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java
index b44ef7d0..b556ae00 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.support;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java
index 8b31ede9..ca174ca0 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/executor/support/ThreadPoolBuilder.java
@@ -17,7 +17,7 @@
package cn.hippo4j.core.executor.support;
-import cn.hippo4j.common.design.builder.Builder;
+import cn.hippo4j.common.extension.design.Builder;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.toolkit.Assert;
import org.springframework.core.task.TaskDecorator;
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java
index ea924ace..12d28c05 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/extension/support/ExtensionAutoConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
- * extension auto configuration
+ * Extension auto configuration.
*/
@Configuration
public class ExtensionAutoConfiguration {
diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
index f14bdfd4..a267d91f 100644
--- a/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
+++ b/threadpool/core/src/main/java/cn/hippo4j/core/toolkit/FileUtil.java
@@ -17,7 +17,6 @@
package cn.hippo4j.core.toolkit;
-import cn.hippo4j.common.web.exception.IllegalException;
import lombok.SneakyThrows;
import org.springframework.core.io.ClassPathResource;
@@ -68,7 +67,7 @@ public class FileUtil {
strList.add(line);
}
} catch (IOException e) {
- throw new IllegalException("file read error", e);
+ throw new RuntimeException("file read error", e);
}
return strList;
}
diff --git a/infra/common/src/main/resources/META-INF/spring.factories b/threadpool/core/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from infra/common/src/main/resources/META-INF/spring.factories
rename to threadpool/core/src/main/resources/META-INF/spring.factories
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java
index 219ab297..ee0e8e14 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/ExtensibleThreadPoolExecutorTest.java
@@ -18,12 +18,12 @@
package cn.hippo4j.core.executor;
import cn.hippo4j.common.toolkit.ThreadUtil;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
-import cn.hippo4j.core.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
import lombok.Getter;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandlerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandlerTest.java
similarity index 96%
rename from threadpool/core/src/test/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandlerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandlerTest.java
index 824faf4c..a988cc04 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandlerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/handler/DynamicThreadPoolBannerHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.core.handler;
+package cn.hippo4j.core.executor.handler;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/PluginRuntimeTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/PluginRuntimeTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/PluginRuntimeTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/PluginRuntimeTest.java
index 80281460..24428752 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/PluginRuntimeTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/PluginRuntimeTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/ThreadPoolPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/ThreadPoolPluginTest.java
similarity index 94%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/ThreadPoolPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/ThreadPoolPluginTest.java
index 423400bf..d0c2968b 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/ThreadPoolPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/ThreadPoolPluginTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin;
+package cn.hippo4j.core.executor.plugin;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.*;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPluginTest.java
similarity index 92%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPluginTest.java
index 09f84f8f..5668947d 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskDecoratorPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskDecoratorPluginTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.PluginRuntime;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.PluginRuntime;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.core.task.TaskDecorator;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPluginTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPluginTest.java
index a4ae9125..6f5f7603 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectCountRecordPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectCountRecordPluginTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
similarity index 94%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
index c4494d72..01e699c4 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskRejectNotifyAlarmPluginTest.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPluginTest.java
similarity index 96%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPluginTest.java
index 391a1169..ea839368 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeRecordPluginTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
similarity index 94%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
index 1680442b..a5aabe04 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/TaskTimeoutNotifyAlarmPluginTest.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
similarity index 92%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
index 056dc1bd..424e4a7f 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/impl/ThreadPoolExecutorShutdownPluginTest.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.impl;
+package cn.hippo4j.core.executor.plugin.impl;
import cn.hippo4j.common.toolkit.ThreadUtil;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
-import cn.hippo4j.core.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
similarity index 98%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
index 834d0922..06e49b24 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultGlobalThreadPoolPluginManagerTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.*;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.junit.Assert;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManagerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManagerTest.java
similarity index 95%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManagerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManagerTest.java
index 94ae0e1b..ebb63bc3 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginManagerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginManagerTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
-
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+package cn.hippo4j.core.executor.plugin.manager;
+
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Before;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
similarity index 77%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
index ee6e5644..c968e735 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/DefaultThreadPoolPluginRegistrarTest.java
@@ -15,14 +15,18 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.impl.TaskDecoratorPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectCountRecordPlugin;
-import cn.hippo4j.core.plugin.impl.TaskRejectNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
-import cn.hippo4j.core.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskDecoratorPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectCountRecordPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskRejectNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.TaskTimeoutNotifyAlarmPlugin;
+import cn.hippo4j.core.executor.plugin.impl.ThreadPoolExecutorShutdownPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginRegistrar;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginRegistrar;
import org.junit.Assert;
import org.junit.Test;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManagerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManagerTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManagerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManagerTest.java
index be19f091..ce80299c 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/EmptyThreadPoolPluginManagerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/EmptyThreadPoolPluginManagerTest.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.EmptyThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
import lombok.Getter;
import org.junit.Assert;
import org.junit.Test;
@@ -26,7 +28,7 @@ import java.util.Collections;
import java.util.Optional;
/**
- * test for {@link cn.hippo4j.core.plugin.manager.EmptyThreadPoolPluginManager}
+ * test for {@link EmptyThreadPoolPluginManager}
*/
public class EmptyThreadPoolPluginManagerTest {
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupportTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupportTest.java
similarity index 93%
rename from threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupportTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupportTest.java
index 92196a5f..0d5c2e87 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/plugin/manager/ThreadPoolPluginSupportTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/plugin/manager/ThreadPoolPluginSupportTest.java
@@ -15,14 +15,17 @@
* limitations under the License.
*/
-package cn.hippo4j.core.plugin.manager;
+package cn.hippo4j.core.executor.plugin.manager;
import cn.hippo4j.core.executor.ExtensibleThreadPoolExecutor;
-import cn.hippo4j.core.plugin.ExecuteAwarePlugin;
-import cn.hippo4j.core.plugin.RejectedAwarePlugin;
-import cn.hippo4j.core.plugin.ShutdownAwarePlugin;
-import cn.hippo4j.core.plugin.TaskAwarePlugin;
-import cn.hippo4j.core.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.ExecuteAwarePlugin;
+import cn.hippo4j.core.executor.plugin.RejectedAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ShutdownAwarePlugin;
+import cn.hippo4j.core.executor.plugin.TaskAwarePlugin;
+import cn.hippo4j.core.executor.plugin.ThreadPoolPlugin;
+import cn.hippo4j.core.executor.plugin.manager.DefaultThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginManager;
+import cn.hippo4j.core.executor.plugin.manager.ThreadPoolPluginSupport;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.junit.Assert;
diff --git a/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java b/threadpool/core/src/test/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandlerTest.java
similarity index 96%
rename from threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
rename to threadpool/core/src/test/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandlerTest.java
index 663ef699..42a4286a 100644
--- a/threadpool/core/src/test/java/cn/hippo4j/core/proxy/RejectedProxyInvocationHandlerTest.java
+++ b/threadpool/core/src/test/java/cn/hippo4j/core/executor/proxy/RejectedProxyInvocationHandlerTest.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package cn.hippo4j.core.proxy;
+package cn.hippo4j.core.executor.proxy;
import cn.hippo4j.core.api.ThreadPoolCheckAlarm;
import cn.hippo4j.core.config.ApplicationContextHolder;
+import cn.hippo4j.core.executor.proxy.RejectedProxyInvocationHandler;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
index 880181cb..4a77c6c4 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java
@@ -18,7 +18,6 @@
package cn.hippo4j.rpc.client;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.web.exception.IllegalException;
import cn.hippo4j.rpc.exception.TimeOutException;
import cn.hippo4j.rpc.model.Request;
import cn.hippo4j.rpc.model.Response;
@@ -86,7 +85,7 @@ public class NettyClientConnection implements ClientConnection {
}
return response;
} catch (Exception ex) {
- throw new IllegalException(ex);
+ throw ex;
} finally {
connectionPool.release(this.channel);
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
index d04adbe3..0a45d78f 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/discovery/DefaultInstance.java
@@ -18,7 +18,6 @@
package cn.hippo4j.rpc.discovery;
import cn.hippo4j.common.toolkit.ReflectUtil;
-import cn.hippo4j.common.web.exception.IllegalException;
import java.util.Iterator;
import java.util.ServiceLoader;
@@ -48,7 +47,7 @@ public class DefaultInstance implements Instance {
Class> cls = Class.forName(name);
return getInstance(cls);
} catch (ClassNotFoundException e) {
- throw new IllegalException(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java
index 5c583eee..0fe0cc38 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java
@@ -17,7 +17,6 @@
package cn.hippo4j.rpc.handler;
-import cn.hippo4j.common.web.exception.IllegalException;
import io.netty.channel.ChannelHandler;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -66,7 +65,7 @@ public interface HandlerManager {
boolean b = cls.isAnnotationPresent(ChannelHandler.Sharable.class)
|| HandlerManager.class.isAssignableFrom(cls);
if (!b) {
- throw new IllegalException("Join the execution of the handler must add io.netty.channel.ChannelHandler."
+ throw new RuntimeException("Join the execution of the handler must add io.netty.channel.ChannelHandler."
+ "Sharable annotations, Please for the handler class " + cls.getName() + " add io.netty.channel."
+ "ChannelHandler.Sharable annotation");
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
index dca66b90..02d7c00d 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientTakeHandler.java
@@ -17,7 +17,6 @@
package cn.hippo4j.rpc.handler;
-import cn.hippo4j.common.web.exception.IllegalException;
import cn.hippo4j.rpc.model.Response;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -38,7 +37,7 @@ public class NettyClientTakeHandler extends AbstractNettyTakeHandler implements
ctx.flush();
} catch (Exception e) {
ctx.close();
- throw new IllegalException(e);
+ throw e;
}
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java
index 5eb12607..602aecc6 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java
@@ -17,7 +17,6 @@
package cn.hippo4j.rpc.support;
-import cn.hippo4j.common.web.exception.IllegalException;
import cn.hippo4j.rpc.client.Client;
import cn.hippo4j.rpc.client.ClientConnection;
import cn.hippo4j.rpc.client.NettyClientConnection;
@@ -103,7 +102,7 @@ public final class NettyClientSupport {
try {
c.close();
} catch (IOException e) {
- throw new IllegalException(e);
+ throw new RuntimeException(e);
}
});
}
diff --git a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyProxyCenter.java b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyProxyCenter.java
index 910e27f4..93214662 100644
--- a/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyProxyCenter.java
+++ b/threadpool/rpc/src/main/java/cn/hippo4j/rpc/support/NettyProxyCenter.java
@@ -18,7 +18,6 @@
package cn.hippo4j.rpc.support;
import cn.hippo4j.common.toolkit.IdUtil;
-import cn.hippo4j.common.web.exception.IllegalException;
import cn.hippo4j.rpc.client.Client;
import cn.hippo4j.rpc.exception.ConnectionException;
import cn.hippo4j.rpc.handler.NettyClientPoolHandler;
@@ -110,7 +109,7 @@ public class NettyProxyCenter {
public static T createProxy(Client client, Class cls, InetSocketAddress address) {
boolean b = cls.isInterface();
if (!b) {
- throw new IllegalException(cls.getName() + "is not a Interface");
+ throw new RuntimeException(cls.getName() + "is not a Interface");
}
String s = address.toString() + cls.getName();
Object o = map.get(s);
@@ -131,7 +130,7 @@ public class NettyProxyCenter {
return null;
}
if (response.isErr()) {
- throw new IllegalException(response.getErrMsg(), response.getThrowable());
+ throw new RuntimeException(response.getErrMsg(), response.getThrowable());
}
return response.getObj();
});
diff --git a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/discovery/DefaultInstanceTest.java b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/discovery/DefaultInstanceTest.java
index 0a0a9bb2..eeff9ee3 100644
--- a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/discovery/DefaultInstanceTest.java
+++ b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/discovery/DefaultInstanceTest.java
@@ -17,7 +17,6 @@
package cn.hippo4j.rpc.discovery;
-import cn.hippo4j.common.web.exception.IllegalException;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +40,7 @@ public class DefaultInstanceTest {
Assert.assertEquals(className, instanceInstance.getClass().getName());
}
- @Test(expected = IllegalException.class)
+ @Test(expected = RuntimeException.class)
public void testGetInstanceTest() {
String className = "cn.hippo4j.rpc.discovery.InstanceModelTest";
Object instanceInstance = instance.getInstance(className);
diff --git a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/handler/NettyClientPoolHandlerTest.java b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/handler/NettyClientPoolHandlerTest.java
index 7914df63..e6f07600 100644
--- a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/handler/NettyClientPoolHandlerTest.java
+++ b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/handler/NettyClientPoolHandlerTest.java
@@ -18,7 +18,6 @@
package cn.hippo4j.rpc.handler;
import cn.hippo4j.common.toolkit.ThreadUtil;
-import cn.hippo4j.common.web.exception.IllegalException;
import cn.hippo4j.rpc.client.CallManager;
import cn.hippo4j.rpc.client.ClientConnection;
import cn.hippo4j.rpc.client.NettyClientConnection;
@@ -104,7 +103,7 @@ public class NettyClientPoolHandlerTest {
Assert.assertFalse(handler.isEmpty());
}
- @Test(expected = IllegalException.class)
+ @Test(expected = RuntimeException.class)
public void testGetHandlerEntityFalse() {
TestFalseHandler handler = new TestFalseHandler();
long order = 0;
diff --git a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/model/DefaultResponseTest.java b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/model/DefaultResponseTest.java
index 33f4fb49..c3e4d209 100644
--- a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/model/DefaultResponseTest.java
+++ b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/model/DefaultResponseTest.java
@@ -17,7 +17,6 @@
package cn.hippo4j.rpc.model;
-import cn.hippo4j.common.web.exception.IllegalException;
import org.junit.Assert;
import org.junit.Test;
@@ -60,7 +59,7 @@ public class DefaultResponseTest {
@Test
public void testWriteObject() throws IOException, ClassNotFoundException {
String key = "name";
- Throwable throwable = new IllegalException("test throwable");
+ Throwable throwable = new RuntimeException("test throwable");
String errMsg = "test throwable";
Response response = new DefaultResponse(key, throwable, errMsg);
byte[] bytes;
@@ -78,7 +77,7 @@ public class DefaultResponseTest {
response1 = (Response) objectInputStream.readObject();
}
Assert.assertEquals(key, response1.getKey());
- Assert.assertThrows(IllegalException.class, () -> {
+ Assert.assertThrows(RuntimeException.class, () -> {
throw response1.getThrowable();
});
Assert.assertEquals(response1.hashCode(), response.hashCode());
diff --git a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/support/NettyProxyCenterTest.java b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/support/NettyProxyCenterTest.java
index aafff550..c807c514 100644
--- a/threadpool/rpc/src/test/java/cn/hippo4j/rpc/support/NettyProxyCenterTest.java
+++ b/threadpool/rpc/src/test/java/cn/hippo4j/rpc/support/NettyProxyCenterTest.java
@@ -18,7 +18,6 @@
package cn.hippo4j.rpc.support;
import cn.hippo4j.common.toolkit.ThreadUtil;
-import cn.hippo4j.common.web.exception.IllegalException;
import cn.hippo4j.rpc.client.Client;
import cn.hippo4j.rpc.client.NettyClientConnection;
import cn.hippo4j.rpc.client.RPCClient;
@@ -80,7 +79,7 @@ public class NettyProxyCenterTest {
NettyProxyCenter.removeProxy(ProxyInterface.class, "localhost8894");
}
- @Test(expected = IllegalException.class)
+ @Test(expected = RuntimeException.class)
public void getProxyTest() {
InetSocketAddress address = InetSocketAddress.createUnresolved("localhost", port.getPort());
NettyClientPoolHandler handler = new NettyClientPoolHandler(new NettyClientTakeHandler());
diff --git a/threadpool/server/auth/pom.xml b/threadpool/server/auth/pom.xml
index 2b431f09..ce8d8175 100644
--- a/threadpool/server/auth/pom.xml
+++ b/threadpool/server/auth/pom.xml
@@ -57,5 +57,10 @@
hippo4j-threadpool-infra-common
${project.version}
+
+ cn.hippo4j
+ hippo4j-threadpool-server-common
+ ${project.version}
+
diff --git a/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java b/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
index a397a4cf..e64ab45c 100644
--- a/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
+++ b/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
@@ -22,7 +22,7 @@ import cn.hippo4j.auth.model.biz.user.LoginUser;
import cn.hippo4j.auth.toolkit.JwtTokenUtil;
import cn.hippo4j.auth.toolkit.ReturnT;
import cn.hippo4j.common.toolkit.JSONUtil;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.server.common.base.Results;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationManager;
diff --git a/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java b/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
index 5347c4ba..ccd04f61 100644
--- a/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
+++ b/threadpool/server/auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
@@ -22,8 +22,8 @@ import cn.hippo4j.auth.toolkit.JwtTokenUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.UserContext;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.common.web.exception.ServiceException;
+import cn.hippo4j.server.common.base.Results;
+import cn.hippo4j.server.common.base.exception.ServiceException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -40,7 +40,7 @@ import java.io.IOException;
import java.util.Collections;
import static cn.hippo4j.common.constant.Constants.ACCESS_TOKEN;
-import static cn.hippo4j.common.web.exception.ErrorCodeEnum.LOGIN_TIMEOUT;
+import static cn.hippo4j.server.common.base.exception.ErrorCodeEnum.LOGIN_TIMEOUT;
/**
* JWT authorization filter.
diff --git a/threadpool/server/auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java b/threadpool/server/auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
index 9567664f..e3542d3a 100644
--- a/threadpool/server/auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
+++ b/threadpool/server/auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
@@ -27,7 +27,7 @@ import cn.hippo4j.auth.service.PermissionService;
import cn.hippo4j.auth.service.UserService;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.common.web.exception.ServiceException;
+import cn.hippo4j.server.common.base.exception.ServiceException;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
diff --git a/threadpool/server/common/pom.xml b/threadpool/server/common/pom.xml
new file mode 100644
index 00000000..5b2a21d7
--- /dev/null
+++ b/threadpool/server/common/pom.xml
@@ -0,0 +1,35 @@
+
+
+ 4.0.0
+
+ cn.hippo4j
+ hippo4j-threadpool-server
+ ${revision}
+
+
+ hippo4j-threadpool-server-common
+
+
+ true
+
+
+
+
+ org.projectlombok
+ lombok
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ cn.hippo4j
+ hippo4j-threadpool-infra-common
+ ${project.version}
+
+
+
\ No newline at end of file
diff --git a/infra/common/src/main/java/cn/hippo4j/common/web/base/Results.java b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/Results.java
similarity index 89%
rename from infra/common/src/main/java/cn/hippo4j/common/web/base/Results.java
rename to threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/Results.java
index f3dd8402..d6435e30 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/web/base/Results.java
+++ b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/Results.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.base;
+package cn.hippo4j.server.common.base;
-import cn.hippo4j.common.web.exception.AbstractException;
-import cn.hippo4j.common.web.exception.ErrorCode;
-import cn.hippo4j.common.web.exception.ErrorCodeEnum;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.exception.AbstractException;
+import cn.hippo4j.server.common.base.exception.ErrorCode;
+import cn.hippo4j.server.common.base.exception.ErrorCodeEnum;
import java.util.Optional;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/AbstractException.java
similarity index 95%
rename from infra/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java
rename to threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/AbstractException.java
index 07429614..550f5efa 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java
+++ b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/AbstractException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.exception;
+package cn.hippo4j.server.common.base.exception;
import lombok.Getter;
diff --git a/infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ErrorCode.java
similarity index 95%
rename from infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java
rename to threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ErrorCode.java
index 4f220641..9d5e6327 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCode.java
+++ b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ErrorCode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.exception;
+package cn.hippo4j.server.common.base.exception;
/**
* Error code abstract interface.
diff --git a/infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ErrorCodeEnum.java
similarity index 97%
rename from infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java
rename to threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ErrorCodeEnum.java
index 63116639..550d6847 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java
+++ b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ErrorCodeEnum.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.exception;
+package cn.hippo4j.server.common.base.exception;
/**
* Error code enum.
diff --git a/infra/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/IllegalException.java
similarity index 96%
rename from infra/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java
rename to threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/IllegalException.java
index 86250b4a..d014ca7c 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/web/exception/IllegalException.java
+++ b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/IllegalException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.exception;
+package cn.hippo4j.server.common.base.exception;
/**
* A generic exception to handle illegal operations
diff --git a/infra/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ServiceException.java
similarity index 97%
rename from infra/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java
rename to threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ServiceException.java
index f0a357da..6ad45d63 100644
--- a/infra/common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java
+++ b/threadpool/server/common/src/main/java/cn/hippo4j/server/common/base/exception/ServiceException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.exception;
+package cn.hippo4j.server.common.base.exception;
import lombok.EqualsAndHashCode;
diff --git a/infra/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java b/threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java
similarity index 91%
rename from infra/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java
rename to threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java
index 9da7c892..e76d94b6 100644
--- a/infra/common/src/test/java/cn/hippo4j/common/web/base/ResultsTest.java
+++ b/threadpool/server/common/src/test/java/cn/hippo4j/server/common/base/ResultsTest.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
-package cn.hippo4j.common.web.base;
+package cn.hippo4j.server.common.base;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.web.exception.AbstractException;
-import cn.hippo4j.common.web.exception.ErrorCode;
+import cn.hippo4j.server.common.base.exception.AbstractException;
+import cn.hippo4j.server.common.base.exception.ErrorCode;
import org.junit.jupiter.api.Test;
-import static cn.hippo4j.common.web.exception.ErrorCodeEnum.SERVICE_ERROR;
+import static cn.hippo4j.server.common.base.exception.ErrorCodeEnum.SERVICE_ERROR;
public class ResultsTest {
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java
index 0a1a2771..187841a3 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.config;
-import cn.hippo4j.common.enums.DelEnum;
+import cn.hippo4j.common.extension.enums.DelEnum;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ConfigController.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ConfigController.java
index 2011f5e8..b0a299f4 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ConfigController.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ConfigController.java
@@ -29,8 +29,7 @@ import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.UserContext;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.model.ConfigAllInfo;
import cn.hippo4j.config.model.ConfigInfoBase;
import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO;
@@ -39,6 +38,7 @@ import cn.hippo4j.config.service.ConfigServletInner;
import cn.hippo4j.config.service.biz.ConfigService;
import cn.hippo4j.config.toolkit.Md5ConfigUtil;
import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose;
+import cn.hippo4j.server.common.base.Results;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/MonitorController.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/MonitorController.java
index ef48fbba..addbc56e 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/MonitorController.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/MonitorController.java
@@ -19,13 +19,13 @@ package cn.hippo4j.config.controller;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.monitor.MessageWrapper;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.model.biz.monitor.MonitorActiveRespDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorQueryReqDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorRespDTO;
import cn.hippo4j.config.monitor.QueryMonitorExecuteChoose;
import cn.hippo4j.config.service.biz.HisRunDataService;
+import cn.hippo4j.server.common.base.Results;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ThreadPoolAdapterController.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ThreadPoolAdapterController.java
index 112630e4..56324112 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ThreadPoolAdapterController.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/controller/ThreadPoolAdapterController.java
@@ -18,9 +18,9 @@
package cn.hippo4j.config.controller;
import cn.hippo4j.adapter.base.ThreadPoolAdapterCacheConfig;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.service.ThreadPoolAdapterService;
+import cn.hippo4j.server.common.base.Results;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java
index 72e0abc1..b598747a 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java
@@ -19,9 +19,9 @@ package cn.hippo4j.config.service;
import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.design.observer.AbstractSubjectCenter;
-import cn.hippo4j.common.design.observer.Observer;
-import cn.hippo4j.common.design.observer.ObserverMessage;
+import cn.hippo4j.common.extension.design.AbstractSubjectCenter;
+import cn.hippo4j.common.extension.design.Observer;
+import cn.hippo4j.common.extension.design.ObserverMessage;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.Joiner;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/LongPollingService.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/LongPollingService.java
index e157d91b..21d8256c 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/LongPollingService.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/LongPollingService.java
@@ -22,7 +22,6 @@ import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.MapUtil;
import cn.hippo4j.common.toolkit.Md5Util;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.common.web.base.Results;
import cn.hippo4j.config.event.AbstractEvent;
import cn.hippo4j.config.event.LocalDataChangeEvent;
import cn.hippo4j.config.notify.NotifyCenter;
@@ -30,6 +29,7 @@ import cn.hippo4j.config.notify.listener.AbstractSubscriber;
import cn.hippo4j.config.toolkit.ConfigExecutor;
import cn.hippo4j.config.toolkit.Md5ConfigUtil;
import cn.hippo4j.config.toolkit.RequestUtil;
+import cn.hippo4j.server.common.base.Results;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ThreadPoolAdapterService.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ThreadPoolAdapterService.java
index c9299640..3d69cd56 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ThreadPoolAdapterService.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/ThreadPoolAdapterService.java
@@ -19,14 +19,14 @@ package cn.hippo4j.config.service;
import cn.hippo4j.adapter.base.ThreadPoolAdapterCacheConfig;
import cn.hippo4j.adapter.base.ThreadPoolAdapterState;
-import cn.hippo4j.common.design.observer.AbstractSubjectCenter;
-import cn.hippo4j.common.design.observer.Observer;
-import cn.hippo4j.common.design.observer.ObserverMessage;
+import cn.hippo4j.common.extension.design.AbstractSubjectCenter;
+import cn.hippo4j.common.extension.design.Observer;
+import cn.hippo4j.common.extension.design.ObserverMessage;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterReqDTO;
import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterRespDTO;
import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java
index 2c3a8294..399516d4 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java
@@ -19,7 +19,7 @@ package cn.hippo4j.config.service.biz;
import cn.hippo4j.common.monitor.Message;
import cn.hippo4j.common.monitor.MessageWrapper;
-import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.model.HisRunDataInfo;
import cn.hippo4j.config.model.biz.monitor.MonitorActiveRespDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorQueryReqDTO;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java
index 6648b322..62315301 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.service.biz.impl;
-import cn.hippo4j.common.enums.VerifyEnum;
+import cn.hippo4j.common.extension.enums.VerifyEnum;
import cn.hippo4j.common.model.InstanceInfo;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.ConditionUtil;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java
index a9b56bba..4da2b698 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java
@@ -18,7 +18,7 @@
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.core.config.ApplicationContextHolder;
-import cn.hippo4j.common.enums.DelEnum;
+import cn.hippo4j.common.extension.enums.DelEnum;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterParameter;
import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper;
import cn.hippo4j.common.model.register.notify.DynamicThreadPoolRegisterServerNotifyParameter;
@@ -31,7 +31,6 @@ import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.Md5Util;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.UserContext;
-import cn.hippo4j.common.web.exception.ServiceException;
import cn.hippo4j.config.event.LocalDataChangeEvent;
import cn.hippo4j.config.mapper.ConfigInfoMapper;
import cn.hippo4j.config.mapper.ConfigInstanceMapper;
@@ -47,6 +46,7 @@ import cn.hippo4j.config.service.biz.ItemService;
import cn.hippo4j.config.service.biz.NotifyService;
import cn.hippo4j.config.service.biz.OperationLogService;
import cn.hippo4j.config.service.biz.TenantService;
+import cn.hippo4j.server.common.base.exception.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java
index 165ada9b..385ccbd3 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java
@@ -23,8 +23,7 @@ import cn.hippo4j.common.monitor.RuntimeMessage;
import cn.hippo4j.common.toolkit.DateUtil;
import cn.hippo4j.common.toolkit.GroupKey;
import cn.hippo4j.common.toolkit.MessageConvert;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.config.ServerBootstrapProperties;
import cn.hippo4j.config.mapper.HisRunDataMapper;
import cn.hippo4j.config.model.HisRunDataInfo;
@@ -35,6 +34,7 @@ import cn.hippo4j.config.monitor.QueryMonitorExecuteChoose;
import cn.hippo4j.config.service.ConfigCacheService;
import cn.hippo4j.config.service.biz.HisRunDataService;
import cn.hippo4j.common.toolkit.BeanUtil;
+import cn.hippo4j.server.common.base.Results;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java
index d0eab4ad..58ff5852 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java
@@ -18,7 +18,7 @@
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.toolkit.Assert;
-import cn.hippo4j.common.enums.DelEnum;
+import cn.hippo4j.common.extension.enums.DelEnum;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.config.mapper.ItemInfoMapper;
import cn.hippo4j.config.model.ItemInfo;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java
index 5696cb0c..6cab4a76 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java
@@ -17,12 +17,11 @@
package cn.hippo4j.config.service.biz.impl;
-import cn.hippo4j.common.enums.EnableEnum;
+import cn.hippo4j.common.extension.enums.EnableEnum;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.BooleanUtil;
import cn.hippo4j.common.toolkit.GroupKey;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.common.web.exception.ServiceException;
import cn.hippo4j.config.mapper.NotifyInfoMapper;
import cn.hippo4j.config.model.NotifyInfo;
import cn.hippo4j.config.model.biz.notify.NotifyListRespDTO;
@@ -31,6 +30,7 @@ import cn.hippo4j.config.model.biz.notify.NotifyReqDTO;
import cn.hippo4j.config.model.biz.notify.NotifyRespDTO;
import cn.hippo4j.config.service.biz.NotifyService;
import cn.hippo4j.common.toolkit.BeanUtil;
+import cn.hippo4j.server.common.base.exception.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java
index de3d32dd..69af1375 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java
@@ -17,7 +17,7 @@
package cn.hippo4j.config.service.biz.impl;
-import cn.hippo4j.common.enums.DelEnum;
+import cn.hippo4j.common.extension.enums.DelEnum;
import cn.hippo4j.common.toolkit.Assert;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.config.mapper.TenantInfoMapper;
diff --git a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
index 97bd068d..a0e79497 100644
--- a/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
+++ b/threadpool/server/config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
@@ -18,7 +18,7 @@
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.constant.ConfigModifyTypeConstants;
-import cn.hippo4j.common.enums.DelEnum;
+import cn.hippo4j.common.extension.enums.DelEnum;
import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.JSONUtil;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java
index 9b0ab566..cf91bcb4 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java
@@ -19,10 +19,10 @@ package cn.hippo4j.console.config;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.common.web.exception.AbstractException;
-import cn.hippo4j.common.web.exception.ServiceException;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
+import cn.hippo4j.server.common.base.exception.AbstractException;
+import cn.hippo4j.server.common.base.exception.ServiceException;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java
index 13467a96..25bafa05 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java
@@ -20,8 +20,8 @@ package cn.hippo4j.console.controller;
import cn.hippo4j.common.api.ClientCloseHookExecute;
import cn.hippo4j.core.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java
index 1d58b101..5337751d 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java
@@ -20,14 +20,14 @@ package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.model.ThreadPoolParameterInfo;
import cn.hippo4j.common.toolkit.ConditionUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.config.model.biz.threadpool.ConfigModificationQueryRespDTO;
import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO;
import cn.hippo4j.config.service.biz.ConfigModificationQueryService;
import cn.hippo4j.config.service.biz.ConfigModificationVerifyService;
import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose;
+import cn.hippo4j.server.common.base.Results;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/DashboardController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/DashboardController.java
index db705ae8..7e0c3629 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/DashboardController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/DashboardController.java
@@ -18,21 +18,21 @@
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.console.model.ChartInfo;
import cn.hippo4j.console.model.LineChartInfo;
import cn.hippo4j.console.model.PieChartInfo;
import cn.hippo4j.console.model.RankingChart;
import cn.hippo4j.console.model.TenantChart;
import cn.hippo4j.console.service.DashboardService;
+import cn.hippo4j.server.common.base.Results;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
- * Dash board controller.
+ * Dashboard controller.
*/
@RestController
@AllArgsConstructor
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java
index 3ba4ef60..e5101d10 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java
@@ -18,8 +18,8 @@
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ItemController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ItemController.java
index 828120fb..7c4e3420 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ItemController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ItemController.java
@@ -18,8 +18,8 @@
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.model.biz.item.ItemQueryReqDTO;
import cn.hippo4j.config.model.biz.item.ItemRespDTO;
import cn.hippo4j.config.model.biz.item.ItemSaveReqDTO;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java
index de972232..52cd33f2 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java
@@ -18,8 +18,8 @@
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.model.biz.log.LogRecordQueryReqDTO;
import cn.hippo4j.config.model.biz.log.LogRecordRespDTO;
import cn.hippo4j.config.service.biz.OperationLogService;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/NotifyController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/NotifyController.java
index c4710d3f..a9f4ca85 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/NotifyController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/NotifyController.java
@@ -18,8 +18,8 @@
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.model.biz.notify.NotifyListRespDTO;
import cn.hippo4j.config.model.biz.notify.NotifyQueryReqDTO;
import cn.hippo4j.config.model.biz.notify.NotifyReqDTO;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/TenantController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/TenantController.java
index 0040f5e7..d9933920 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/TenantController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/TenantController.java
@@ -18,8 +18,8 @@
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.model.biz.tenant.TenantQueryReqDTO;
import cn.hippo4j.config.model.biz.tenant.TenantRespDTO;
import cn.hippo4j.config.model.biz.tenant.TenantSaveReqDTO;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java
index bb0094b2..1cd0e43c 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java
@@ -22,8 +22,8 @@ import cn.hippo4j.common.toolkit.BeanUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.UserContext;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterReqDTO;
import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterRespDTO;
import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
index 95143807..8084b50a 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
@@ -25,9 +25,8 @@ import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.toolkit.UserContext;
import cn.hippo4j.common.toolkit.http.HttpUtil;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.common.web.exception.ErrorCodeEnum;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.model.CacheItem;
import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolDelReqDTO;
@@ -42,6 +41,7 @@ import cn.hippo4j.console.model.WebThreadPoolReqDTO;
import cn.hippo4j.console.model.WebThreadPoolRespDTO;
import cn.hippo4j.discovery.core.BaseInstanceRegistry;
import cn.hippo4j.discovery.core.Lease;
+import cn.hippo4j.server.common.base.exception.ErrorCodeEnum;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/UserController.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/UserController.java
index 62c9748d..ed54851e 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/UserController.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/controller/UserController.java
@@ -26,8 +26,8 @@ import cn.hippo4j.auth.security.AuthManager;
import cn.hippo4j.auth.service.UserService;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.model.TokenInfo;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.model.Result;
+import cn.hippo4j.server.common.base.Results;
import cn.hippo4j.config.service.biz.TenantService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
diff --git a/threadpool/server/console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java b/threadpool/server/console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java
index 75035031..1d079044 100644
--- a/threadpool/server/console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java
+++ b/threadpool/server/console/src/main/java/cn/hippo4j/console/service/impl/DashboardServiceImpl.java
@@ -17,7 +17,7 @@
package cn.hippo4j.console.service.impl;
-import cn.hippo4j.common.enums.DelEnum;
+import cn.hippo4j.common.extension.enums.DelEnum;
import cn.hippo4j.common.model.InstanceInfo;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.DateUtil;
diff --git a/threadpool/server/discovery/pom.xml b/threadpool/server/discovery/pom.xml
index 42894bb4..a40cb7bb 100644
--- a/threadpool/server/discovery/pom.xml
+++ b/threadpool/server/discovery/pom.xml
@@ -27,5 +27,10 @@
hippo4j-threadpool-infra-common
${project.version}
+
+ cn.hippo4j
+ hippo4j-threadpool-server-common
+ ${project.version}
+
diff --git a/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/controller/ApplicationController.java b/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/controller/ApplicationController.java
index 089ed82a..d3d59617 100644
--- a/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/controller/ApplicationController.java
+++ b/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/controller/ApplicationController.java
@@ -18,11 +18,11 @@
package cn.hippo4j.discovery.controller;
import cn.hippo4j.common.model.InstanceInfo;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.common.web.exception.ErrorCodeEnum;
+import cn.hippo4j.common.model.Result;
import cn.hippo4j.discovery.core.InstanceRegistry;
import cn.hippo4j.discovery.core.Lease;
+import cn.hippo4j.server.common.base.Results;
+import cn.hippo4j.server.common.base.exception.ErrorCodeEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/BaseInstanceRegistry.java b/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/BaseInstanceRegistry.java
index 54bf589b..3c05f901 100644
--- a/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/BaseInstanceRegistry.java
+++ b/threadpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/BaseInstanceRegistry.java
@@ -17,8 +17,8 @@
package cn.hippo4j.discovery.core;
-import cn.hippo4j.common.design.builder.ThreadFactoryBuilder;
-import cn.hippo4j.common.design.observer.AbstractSubjectCenter;
+import cn.hippo4j.common.executor.ThreadFactoryBuilder;
+import cn.hippo4j.common.extension.design.AbstractSubjectCenter;
import cn.hippo4j.common.model.InstanceInfo;
import cn.hippo4j.common.model.InstanceInfo.InstanceStatus;
import cn.hippo4j.common.toolkit.CollectionUtil;
diff --git a/threadpool/server/pom.xml b/threadpool/server/pom.xml
index 07d2da69..786e33d9 100644
--- a/threadpool/server/pom.xml
+++ b/threadpool/server/pom.xml
@@ -20,5 +20,6 @@
config
console
discovery
+ common