diff --git a/.github/workflows/backend-build-test.yml b/.github/workflows/backend-build-test.yml
index daf5678c92..34917e8e50 100644
--- a/.github/workflows/backend-build-test.yml
+++ b/.github/workflows/backend-build-test.yml
@@ -66,11 +66,11 @@ jobs:
         run: |
           sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
           sudo chmod u+x /usr/local/bin/docker-compose
-          
+
           cd e2e
           sudo docker-compose version
           sudo docker-compose up --exit-code-from testing --remove-orphans
-      
+
       # upload application logs
       - name: Upload logs & API test reports
         uses: actions/upload-artifact@v4
diff --git a/hertzbeat-ai/pom.xml b/hertzbeat-ai/pom.xml
index d026a98b3b..9a3e5249f9 100644
--- a/hertzbeat-ai/pom.xml
+++ b/hertzbeat-ai/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
 		<dependency>
 			<groupId>org.apache.hertzbeat</groupId>
-			<artifactId>hertzbeat-common</artifactId>
+			<artifactId>hertzbeat-common-spring</artifactId>
 		</dependency>
         <!-- common -->
         <dependency>
diff --git a/hertzbeat-base/pom.xml b/hertzbeat-base/pom.xml
index 094c2e4c74..0b8a384e43 100644
--- a/hertzbeat-base/pom.xml
+++ b/hertzbeat-base/pom.xml
@@ -35,7 +35,7 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
diff --git a/hertzbeat-collector/hertzbeat-collector-common/pom.xml b/hertzbeat-collector/hertzbeat-collector-common/pom.xml
index 177adf6deb..c66fe8910f 100644
--- a/hertzbeat-collector/hertzbeat-collector-common/pom.xml
+++ b/hertzbeat-collector/hertzbeat-collector-common/pom.xml
@@ -49,7 +49,7 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-core</artifactId>
         </dependency>
         <!-- linux ssh -->
         <dependency>
diff --git a/hertzbeat-collector/pom.xml b/hertzbeat-collector/pom.xml
index a85b368439..2e24513ee2 100644
--- a/hertzbeat-collector/pom.xml
+++ b/hertzbeat-collector/pom.xml
@@ -81,7 +81,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-core</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/hertzbeat-common/pom.xml b/hertzbeat-common-core/pom.xml
similarity index 81%
rename from hertzbeat-common/pom.xml
rename to hertzbeat-common-core/pom.xml
index 379245e6ae..0121c11097 100644
--- a/hertzbeat-common/pom.xml
+++ b/hertzbeat-common-core/pom.xml
@@ -26,62 +26,10 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hertzbeat-common</artifactId>
+    <artifactId>hertzbeat-common-core</artifactId>
     <name>${project.artifactId}</name>
 
     <dependencies>
-        <!-- spring -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-        </dependency>
-        <!-- jpa -->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>${eclipse-jpa.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hibernate.orm</groupId>
-                    <artifactId>hibernate-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- validation -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <!-- jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-        </dependency>
-        <!-- swagger -->
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <!-- Tool dependencies  -->
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -187,6 +135,39 @@
             <groupId>com.github.jsqlparser</groupId>
             <artifactId>jsqlparser</artifactId>
         </dependency>
+        <!-- jackson for optional json processing -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- swagger annotations (optional) -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- validation annotations (optional) -->
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jakarta annotations -->
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/hertzbeat-common/src/main/java/org/apache/arrow/vector/table/ArrowTable.java b/hertzbeat-common-core/src/main/java/org/apache/arrow/vector/table/ArrowTable.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/arrow/vector/table/ArrowTable.java
rename to hertzbeat-common-core/src/main/java/org/apache/arrow/vector/table/ArrowTable.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CollectCodeConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/DataQueueConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ExportFileConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/GeneralConfigTypeEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/HertzBeatKeywordsEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImExportTaskConstant.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ImportTaskStatusEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ManagerEventTypeEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/NotifyLevelEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/PluginType.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SignConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/ThemeEnum.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/ArrowCell.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/DefaultMetadataReader.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/MetadataReader.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/arrow/RowWrapper.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/AlertReport.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorInfo.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Field.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java
similarity index 98%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java
index b9df1e1c63..85e71b3df8 100644
--- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java
+++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ImportTaskMessage.java
@@ -17,13 +17,13 @@
 
 package org.apache.hertzbeat.common.entity.dto;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.hertzbeat.common.constants.ImportTaskStatusEnum;
 import org.apache.hertzbeat.common.constants.ManagerEventTypeEnum;
 import org.apache.hertzbeat.common.constants.NotifyLevelEnum;
-import org.springframework.lang.Nullable;
 
 /**
  * Import task message
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MailServerConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ManagerMessage.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Message.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsData.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/MetricsHistoryData.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ModelProviderConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/Value.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/ValueRow.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AlibabaSmsProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/AwsSmsProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmslocalSmsProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TencentSmsProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/TwilioSmsProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/UniSmsProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/CommonRequestProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ConsulSdProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/DnsSdProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/EurekaSdProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/FtpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IcmpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ImapProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/IpmiProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JdbcProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/JmxProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/KafkaProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MemcachedProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ModbusProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MongodbProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NacosSdProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NebulaGraphProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NginxProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NgqlProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/NtpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PlcProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Pop3Protocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PrometheusProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/Protocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/PushProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedfishProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RedisProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RegistryProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/RocketmqProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/S7Protocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ScriptProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SmtpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SnmpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/TelnetProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/UdpProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/WebsocketProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/ZookeeperSdProtocol.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/log/LogEntry.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/ClusterMsg.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
similarity index 99%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
index d327879bef..03d2821c5d 100644
--- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
+++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
@@ -486,7 +486,7 @@ public final class CollectRep {
             }
 
             public long getTime() {
-                return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
+                return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
             }
 
             public Code getCode() {
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginContext.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ConnectionConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryResponseEntity.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisMetricsDataCodec.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/HashedWheelTimer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timeout.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/Timer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/Timer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/timer/TimerTask.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ArrowUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/BackoffUtils.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Base64Util.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ExponentialBackoff.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IntervalExpressionUtil.java
diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java
new file mode 100644
index 0000000000..3c72baa41a
--- /dev/null
+++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.util;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.constants.NetworkConstants;
+import org.apache.hertzbeat.common.constants.SignConstants;
+import org.apache.http.conn.util.InetAddressUtils;
+
+/**
+ * ipv4 ipv6 domain util.
+ */
+@Slf4j
+public final class IpDomainUtil {
+
+    private static final Pattern DOMAIN_PATTERN =
+            Pattern.compile("^[-\\w]+(\\.[-\\w]+)*$");
+
+    private static final String LOCALHOST = "localhost";
+
+    /**
+     * HTTP header schema.
+     */
+    private static final Pattern DOMAIN_SCHEMA = Pattern.compile("^([hH][tT]{2}[pP]://|[hH][tT]{2}[pP][sS]://){1}[^\\s]*");
+
+    private IpDomainUtil() {
+    }
+
+    /**
+     * whether it is ip or domain.
+     * @param ipDomain ip domain string
+     * @return true-yes false-no
+     */
+    public static boolean validateIpDomain(String ipDomain) {
+        if (ipDomain == null || ipDomain.trim().isEmpty()) {
+            return false;
+        }
+        ipDomain = ipDomain.trim();
+        if (LOCALHOST.equalsIgnoreCase(ipDomain)) {
+            return true;
+        }
+        if (InetAddressUtils.isIPv4Address(ipDomain)) {
+            return true;
+        }
+        if (InetAddressUtils.isIPv6Address(ipDomain)) {
+            return true;
+        }
+        return DOMAIN_PATTERN.matcher(ipDomain).matches();
+    }
+
+    /**
+     * if domain or ip has http / https schema.
+     * @param domainIp host
+     * @return true or false
+     */
+    public static boolean isHasSchema(String domainIp) {
+        if (domainIp == null || domainIp.trim().isEmpty()) {
+            return false;
+        }
+        return DOMAIN_SCHEMA.matcher(domainIp).matches();
+    }
+
+    /**
+     * if instance has the port with mark
+     * @param instance instance ip:port
+     * @return true if has
+     */
+    public static boolean isHasPortWithMark(String instance) {
+        if (instance == null || instance.trim().isEmpty()) {
+            return false;
+        }
+        String[] parts = instance.split(SignConstants.DOUBLE_MARK);
+        if (parts.length >= 2) {
+            String port = parts[parts.length - 1];
+            return CommonUtil.isNumeric(port);
+        }
+        return false;
+    }
+
+    /**
+     * get localhost IP.
+     * @return ip
+     */
+    public static String getLocalhostIp() {
+        try {
+            Enumeration<NetworkInterface> allNetInterfaces = NetworkInterface.getNetworkInterfaces();
+            InetAddress ip;
+            while (allNetInterfaces.hasMoreElements()) {
+                NetworkInterface netInterface = allNetInterfaces.nextElement();
+                if (!netInterface.isLoopback() && !netInterface.isVirtual() && netInterface.isUp()) {
+                    Enumeration<InetAddress> addresses = netInterface.getInetAddresses();
+                    while (addresses.hasMoreElements()) {
+                        ip = addresses.nextElement();
+                        if (ip instanceof Inet4Address) {
+                            return ip.getHostAddress();
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn(e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * check IP address type.
+     * @param ipDomain ip domain
+     * @return IP address type
+     */
+    public static String checkIpAddressType(String ipDomain){
+        if (ipDomain != null && !ipDomain.trim().isEmpty() && InetAddressUtils.isIPv6Address(ipDomain)) {
+            return NetworkConstants.IPV6;
+        }
+        return NetworkConstants.IPV4;
+    }
+
+    /**
+     * get current local host name.
+     * @return hostname
+     */
+    public static String getCurrentHostName() {
+        try {
+            InetAddress inetAddress = InetAddress.getLocalHost();
+            return inetAddress.getHostName();
+        } catch (UnknownHostException e) {
+            return null;
+        }
+    }
+
+}
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCheckerUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java
similarity index 96%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java
index b7a46e3a03..45854bef2e 100644
--- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java
+++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java
@@ -28,7 +28,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import javax.annotation.concurrent.ThreadSafe;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
 
 /**
  * json util
@@ -63,7 +62,7 @@ public final class JsonUtil {
     }
 
     public static <T> T fromJson(String jsonStr, Class<T> clazz) {
-        if (!StringUtils.hasText(jsonStr)) {
+        if (jsonStr == null || jsonStr.trim().isEmpty()) {
             return null;
         }
         try {
@@ -75,7 +74,7 @@ public final class JsonUtil {
     }
 
     public static <T> T fromJson(String jsonStr, TypeReference<T> type) {
-        if (!StringUtils.hasText(jsonStr)) {
+        if (jsonStr == null || jsonStr.trim().isEmpty()) {
             return null;
         }
         try {
@@ -87,7 +86,7 @@ public final class JsonUtil {
     }
     
     public static JsonNode fromJson(String jsonStr) {
-        if (!StringUtils.hasText(jsonStr)) {
+        if (jsonStr == null || jsonStr.trim().isEmpty()) {
             return null;
         }
         try {
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/LruHashMap.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/MapCapUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/NetworkUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Pair.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Pair.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/Pair.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/Pair.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/ProtoJsonUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdGenerator.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/SnowFlakeIdWorker.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/StrUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/TimeZoneUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java
similarity index 95%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java
index ce0dc27632..f26a71209e 100644
--- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java
+++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/ExcelExportUtils.java
@@ -15,6 +15,7 @@
 
 package org.apache.hertzbeat.common.util.export;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.poi.ss.usermodel.Cell;
@@ -24,7 +25,6 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Excel export utils
@@ -64,11 +64,11 @@ public final class ExcelExportUtils {
         headerCellStyle.setAlignment(HorizontalAlignment.CENTER);
 
         List<String> headers = new ArrayList<>();
-        ReflectionUtils.doWithFields(clazz, field -> {
-
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
             field.setAccessible(true);
             headers.add(field.getName());
-        });
+        }
 
         // set header
         Row headerRow = sheet.createRow(0);
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java
rename to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/export/YamlExportUtils.java
diff --git a/hertzbeat-common/src/main/message/cluster_msg.proto b/hertzbeat-common-core/src/main/message/cluster_msg.proto
similarity index 98%
rename from hertzbeat-common/src/main/message/cluster_msg.proto
rename to hertzbeat-common-core/src/main/message/cluster_msg.proto
index e1321e1a41..bcc1335fc3 100644
--- a/hertzbeat-common/src/main/message/cluster_msg.proto
+++ b/hertzbeat-common-core/src/main/message/cluster_msg.proto
@@ -40,7 +40,7 @@ enum MessageType
     GO_OFFLINE = 2;
     // collector go close to master
     GO_CLOSE = 3;
-    // issue cyclic collect task 
+    // issue cyclic collect task
     ISSUE_CYCLIC_TASK = 4;
     // delete cyclic collect task
     DELETE_CYCLIC_TASK = 5;
diff --git a/hertzbeat-common/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java b/hertzbeat-common-core/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/arrow/vector/table/ArrowTableTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/message/CollectRepTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/entity/plugin/PluginContextTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializerTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializerTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataSerializerTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodecTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ArrowUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/BackoffUtilsTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/Base64UtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ChineseCharacterCheckTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/CommonUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ExponentialBackoffTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/HertzBeatKeywordsUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IntervalExpressionUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/IpDomainUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/LruHashMapTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/MapCapUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/NetworkUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/PairTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/PairTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/PairTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/PairTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/ProtoJsonUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/SnowFlakeIdGeneratorTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrBufferTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/StrUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimePeriodUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/TimeZoneUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java
rename to hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/entity/PersonTest.java
diff --git a/hertzbeat-common/src/test/proto/person.proto b/hertzbeat-common-core/src/test/proto/person.proto
similarity index 100%
rename from hertzbeat-common/src/test/proto/person.proto
rename to hertzbeat-common-core/src/test/proto/person.proto
diff --git a/hertzbeat-common-spring/pom.xml b/hertzbeat-common-spring/pom.xml
new file mode 100644
index 0000000000..9e6d2f9bf4
--- /dev/null
+++ b/hertzbeat-common-spring/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hertzbeat</artifactId>
+        <groupId>org.apache.hertzbeat</groupId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hertzbeat-common-spring</artifactId>
+    <name>${project.artifactId}</name>
+
+    <dependencies>
+        <!-- hertzbeat-common-core dependency -->
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-common-core</artifactId>
+        </dependency>
+        
+        <!-- spring -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <!-- jpa -->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.jpa</artifactId>
+            <version>${eclipse-jpa.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hibernate.orm</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- validation -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <!-- swagger -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CacheFactory.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/cache/CaffeineCacheServiceImpl.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/BaseKafkaProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefine.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertDefineMonitorBind.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertGroupConverge.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertInhibit.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/AlertSilence.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeRule.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeTemplate.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/SingleAlert.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/CollectorSummary.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/PluginUpload.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/dto/sms/SmsConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java
diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java
new file mode 100644
index 0000000000..f93093157d
--- /dev/null
+++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Configmap.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.entity.job;
+
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Monitoring configuration parameter properties and values
+ * During the process, you need to replace the content with the identifier ^_^key^_^
+ * in the protocol configuration parameter with the real value in the configuration parameter
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Configmap implements Serializable {
+
+    /**
+     * Parameter key, replace the content with the identifier ^^_key_^^ in the protocol
+     * configuration parameter with the real value in the configuration parameter
+     */
+    private String key;
+
+    /**
+     * parameter value
+     */
+    private Object value;
+
+    /**
+     * Parameter type
+     * 0: number 1: string 2: encrypted string 3: json string mapped by map
+     * number,string,secret
+     */
+    private byte type = 1;
+}
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java
new file mode 100644
index 0000000000..154669560f
--- /dev/null
+++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/job/SshTunnel.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.entity.job;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.hertzbeat.common.entity.job.protocol.CommonRequestProtocol;
+import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
+
+/**
+ * ssh tunnel
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SshTunnel implements CommonRequestProtocol, Protocol {
+
+    /**
+     * enable ssh tunnel
+     */
+    private String enable = "false";
+
+    /**
+     * IP ADDRESS OR DOMAIN NAME OF THE PEER HOST
+     */
+    private String host;
+
+    /**
+     * Peer host port
+     */
+    private String port = "22";
+
+    /**
+     * TIME OUT PERIOD
+     */
+    private String timeout = "6000";
+
+    /**
+     * UserName
+     */
+    private String username;
+
+    /**
+     * Password (optional)
+     */
+    private String password;
+
+    /**
+     * Private key (optional)
+     */
+    private String privateKey;
+
+    /**
+     * private key passphrase (optional)
+     */
+    private String privateKeyPassphrase;
+
+    /**
+     * share connection session
+     */
+    private String shareConnection = "true";
+}
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Bulletin.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Collector.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/CollectorMonitorBind.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Define.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/GeneralConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Label.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MetricsFavorite.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/MonitorBind.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/Param.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ParamDefine.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginItem.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/PluginMetadata.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageComponent.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageHistory.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncident.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentComponentBind.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageIncidentContent.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/StatusPageOrg.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/ZonedDateTimeAttributeConverter.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetricsDto.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/CommonThreadPool.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/SpringContextHolder.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/AiProviderConfigChangeEvent.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SmsConfigChangeEvent.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/event/SystemConfigChangeEvent.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/CommonException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/IgnoreException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/exception/SendMessageException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailParamValidator.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/EmailValid.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/HostValid.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumParamValidator.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/PhoneNumValid.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/FileUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResourceBundleUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/ResponseUtil.java
diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java
similarity index 100%
rename from hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java
rename to hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java
diff --git a/hertzbeat-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hertzbeat-common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from hertzbeat-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to hertzbeat-common-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CacheFactoryTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/cache/CaffeineCacheTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/entity/manager/MetricsFavoriteTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueueTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueueTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueueTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/CommonThreadPoolTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/SpringContextHolderTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/EmailParamValidatorTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/HostParamValidatorTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/vaild/PhoneNumParamValidatorTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidatorTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResourceBundleUtilTest.java
diff --git a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java b/hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java
similarity index 100%
rename from hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java
rename to hertzbeat-common-spring/src/test/java/org/apache/hertzbeat/common/util/ResponseUtilTest.java
diff --git a/hertzbeat-common/src/test/resources/msg.properties b/hertzbeat-common-spring/src/test/resources/msg.properties
similarity index 100%
rename from hertzbeat-common/src/test/resources/msg.properties
rename to hertzbeat-common-spring/src/test/resources/msg.properties
diff --git a/hertzbeat-common/src/test/resources/msg_en.properties b/hertzbeat-common-spring/src/test/resources/msg_en.properties
similarity index 100%
rename from hertzbeat-common/src/test/resources/msg_en.properties
rename to hertzbeat-common-spring/src/test/resources/msg_en.properties
diff --git a/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml
index 5b6cfff6b4..af0d937df1 100644
--- a/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml
+++ b/hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml
@@ -58,24 +58,24 @@
         <!-- Testcontainers Jupiter / JUnit 5 -->
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Testcontainers JDBC Support -->
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>jdbc</artifactId>
+            <artifactId>testcontainers-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- Testcontainers Database Modules -->
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
+            <artifactId>testcontainers-mysql</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml
index 765c4ad22b..d56825f6de 100644
--- a/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml
+++ b/hertzbeat-e2e/hertzbeat-collector-kafka-e2e/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>kafka</artifactId>
+            <artifactId>testcontainers-kafka</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
@@ -58,4 +58,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml
index 4908029857..ea5b1fa1a4 100644
--- a/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml
+++ b/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml
@@ -70,35 +70,35 @@
             <version>${hertzbeat.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <!-- TestContainers -->
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <!-- Spring Boot Test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <!-- JUnit 5 -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <!-- AssertJ -->
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <!-- Awaitility -->
         <dependency>
             <groupId>org.awaitility</groupId>
diff --git a/hertzbeat-e2e/pom.xml b/hertzbeat-e2e/pom.xml
index 8b60b55dca..dbcbad9c5d 100644
--- a/hertzbeat-e2e/pom.xml
+++ b/hertzbeat-e2e/pom.xml
@@ -39,7 +39,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <testcontainers.version>1.20.2</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
         <junit.version>4.13.2</junit.version>
         <awaitility.version>4.2.0</awaitility.version>
     </properties>
@@ -87,5 +87,5 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-  
+
 </project>
diff --git a/hertzbeat-manager/pom.xml b/hertzbeat-manager/pom.xml
index 5f3671242c..1bdae24887 100644
--- a/hertzbeat-manager/pom.xml
+++ b/hertzbeat-manager/pom.xml
@@ -29,10 +29,10 @@
 
   
     <dependencies>
-        <!-- common -->
+        <!-- common-spring (includes common-core) -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
diff --git a/hertzbeat-otel/pom.xml b/hertzbeat-otel/pom.xml
index 0a03179e66..1078534b84 100644
--- a/hertzbeat-otel/pom.xml
+++ b/hertzbeat-otel/pom.xml
@@ -39,7 +39,7 @@
         <!-- hertzbeat common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
         </dependency>
         <!-- hertzbeat warehouse -->
         <dependency>
diff --git a/hertzbeat-plugin/pom.xml b/hertzbeat-plugin/pom.xml
index 6cbc0bddc5..49da586dd0 100644
--- a/hertzbeat-plugin/pom.xml
+++ b/hertzbeat-plugin/pom.xml
@@ -34,7 +34,7 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/hertzbeat-remoting/pom.xml b/hertzbeat-remoting/pom.xml
index 4ecbc81586..1fddaf8853 100644
--- a/hertzbeat-remoting/pom.xml
+++ b/hertzbeat-remoting/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/hertzbeat-startup/pom.xml b/hertzbeat-startup/pom.xml
index f45a196a6b..dfdf691686 100644
--- a/hertzbeat-startup/pom.xml
+++ b/hertzbeat-startup/pom.xml
@@ -60,7 +60,7 @@
         <!-- HertzBeat common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
         </dependency>
 
         <!-- HertzBeat base -->
diff --git a/hertzbeat-warehouse/pom.xml b/hertzbeat-warehouse/pom.xml
index 169d014d74..b2d5e2ac53 100644
--- a/hertzbeat-warehouse/pom.xml
+++ b/hertzbeat-warehouse/pom.xml
@@ -32,7 +32,7 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-common-spring</artifactId>
             <scope>provided</scope>
         </dependency>
         <!-- plugin -->
diff --git a/pom.xml b/pom.xml
index 08ad1b0a1b..bc1567a994 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,8 @@
         <module>hertzbeat-startup</module>
         <module>hertzbeat-manager</module>
         <module>hertzbeat-alerter</module>
-        <module>hertzbeat-common</module>
+        <module>hertzbeat-common-core</module>
+        <module>hertzbeat-common-spring</module>
         <module>hertzbeat-collector</module>
         <module>hertzbeat-warehouse</module>
         <module>hertzbeat-remoting</module>
@@ -133,7 +134,7 @@
         <kafka-clients.version>3.7.1</kafka-clients.version>
         <netty.version>4.1.117.Final</netty.version>
         <mysql.version>8.4.0</mysql.version>
-        <mssql-jdbc.version>10.2.0.jre8</mssql-jdbc.version>
+        <mssql-jdbc.version>12.10.2.jre11</mssql-jdbc.version>
         <ojdbc8.version>21.5.0.0</ojdbc8.version>
         <mongodb-driver.version>4.6.1</mongodb-driver.version>
         <clickhouse.version>0.4.6</clickhouse.version>
@@ -187,10 +188,16 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- common -->
+            <!-- common-core -->
             <dependency>
                 <groupId>org.apache.hertzbeat</groupId>
-                <artifactId>hertzbeat-common</artifactId>
+                <artifactId>hertzbeat-common-core</artifactId>
+                <version>${hertzbeat.version}</version>
+            </dependency>
+            <!-- common-spring -->
+            <dependency>
+                <groupId>org.apache.hertzbeat</groupId>
+                <artifactId>hertzbeat-common-spring</artifactId>
                 <version>${hertzbeat.version}</version>
             </dependency>
             <!-- base -->
@@ -602,6 +609,11 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${jacoco-maven-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>net/sf/jsqlparser/parser/**</exclude>
+                    </excludes>
+                </configuration>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>