diff --git a/eventmesh-admin/eventmesh-admin-core/build.gradle b/eventmesh-admin/eventmesh-admin-core/build.gradle
index 9947c1c11d..04f015a097 100644
--- a/eventmesh-admin/eventmesh-admin-core/build.gradle
+++ b/eventmesh-admin/eventmesh-admin-core/build.gradle
@@ -42,4 +42,7 @@ dependencies {
     testImplementation "org.powermock:powermock-module-junit4"
     testImplementation "org.powermock:powermock-api-mockito2"
     testImplementation "commons-io:commons-io"
+
+    testCompileOnly "org.projectlombok:lombok"
+    testAnnotationProcessor "org.projectlombok:lombok"
 }
\ No newline at end of file
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/common/EventHttpHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/common/EventHttpHandler.java
similarity index 96%
rename from eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/common/EventHttpHandler.java
rename to eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/common/EventHttpHandler.java
index 25c2bcbd56..50548cf7e3 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/common/EventHttpHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/common/EventHttpHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.runtime.common;
+package org.apache.eventmesh.admin.core.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/controller/HttpHandlerManager.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/controller/HttpHandlerManager.java
index 1d010a8b42..3830a02ada 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/controller/HttpHandlerManager.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/controller/HttpHandlerManager.java
@@ -17,7 +17,7 @@
 
 package org.apache.eventmesh.admin.core.controller;
 
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ConfigurationHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ConfigurationHandler.java
index 083c7cf0fe..15ff0d98ca 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ConfigurationHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ConfigurationHandler.java
@@ -23,7 +23,7 @@
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
 import org.apache.eventmesh.admin.core.response.GetConfigurationResponse;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.configuration.EventMeshGrpcConfiguration;
 import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
 import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/DeleteWebHookConfigHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/DeleteWebHookConfigHandler.java
index d0b4ed2e77..bcac9465f3 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/DeleteWebHookConfigHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/DeleteWebHookConfigHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/EventHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/EventHandler.java
index f32fe30731..cf8470101d 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/EventHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/EventHandler.java
@@ -23,7 +23,7 @@
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
 import org.apache.eventmesh.admin.core.utils.HttpExchangeUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.plugin.MQAdminWrapper;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/GrpcClientHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/GrpcClientHandler.java
index 18f7dd415f..4ef05d8c62 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/GrpcClientHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/GrpcClientHandler.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.admin.core.response.GetClientResponse;
 import org.apache.eventmesh.admin.core.utils.HttpExchangeUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshGrpcServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.grpc.consumer.ConsumerManager;
 import org.apache.eventmesh.runtime.core.protocol.grpc.consumer.consumergroup.ConsumerGroupClient;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/HTTPClientHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/HTTPClientHandler.java
index 27c72fda4e..9ca7a9b34c 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/HTTPClientHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/HTTPClientHandler.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.common.enums.HttpMethod;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.Client;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/InsertWebHookConfigHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/InsertWebHookConfigHandler.java
index 1d59d7c838..f6baf58f5f 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/InsertWebHookConfigHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/InsertWebHookConfigHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/MetricsHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/MetricsHandler.java
index 24496c4d9e..024e74f5aa 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/MetricsHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/MetricsHandler.java
@@ -27,7 +27,7 @@
 import org.apache.eventmesh.metrics.api.model.TcpSummaryMetrics;
 import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 
 import java.io.IOException;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryRecommendEventMeshHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryRecommendEventMeshHandler.java
index 683f13f9f2..432b646d7c 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryRecommendEventMeshHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryRecommendEventMeshHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendStrategy;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByIdHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByIdHandler.java
index e3a339c6c5..6584f3fab5 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByIdHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByIdHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByManufacturerHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByManufacturerHandler.java
index 0bc7665706..624fff042f 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByManufacturerHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByManufacturerHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByIpPortHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByIpPortHandler.java
index ef37b2fddb..b01474f910 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByIpPortHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByIpPortHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByPathHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByPathHandler.java
index 28418fc8a0..3fdf4e6827 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByPathHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByPathHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientBySubSystemHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientBySubSystemHandler.java
index 115adc2074..e7ae0a5f72 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientBySubSystemHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientBySubSystemHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RegistryHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RegistryHandler.java
index 885ffee346..2daff36bed 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RegistryHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RegistryHandler.java
@@ -24,7 +24,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.registry.Registry;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectAllClientHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectAllClientHandler.java
index 2cada29052..61fdbac815 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectAllClientHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectAllClientHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientByIpPortHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientByIpPortHandler.java
index da9524e222..7af034e4f3 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientByIpPortHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientByIpPortHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientBySubSystemHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientBySubSystemHandler.java
index 42140173f6..abb0d797c1 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientBySubSystemHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientBySubSystemHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientBySystemHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientBySystemHandler.java
index b6aea673e6..54e63211f7 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientBySystemHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientBySystemHandler.java
@@ -22,7 +22,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientHandler.java
index 71a5985466..302a908f58 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowListenClientByTopicHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowListenClientByTopicHandler.java
index f8aed3ba4e..3b245c6982 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowListenClientByTopicHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowListenClientByTopicHandler.java
@@ -22,7 +22,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientGroupWrapper;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TCPClientHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TCPClientHandler.java
index 93c9132fd4..3d4ab64e79 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TCPClientHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TCPClientHandler.java
@@ -27,7 +27,7 @@
 import org.apache.eventmesh.admin.core.response.Error;
 import org.apache.eventmesh.admin.core.response.GetClientResponse;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TopicHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TopicHandler.java
index 47804e50db..6b8d21ce1c 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TopicHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TopicHandler.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.plugin.MQAdminWrapper;
 
diff --git a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/UpdateWebHookConfigHandler.java b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/UpdateWebHookConfigHandler.java
index f4b7a13368..6c13e2ebc9 100644
--- a/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/UpdateWebHookConfigHandler.java
+++ b/eventmesh-admin/eventmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/UpdateWebHookConfigHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;