diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/JobState.java b/bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/enums/JobState.java
similarity index 68%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/JobState.java
rename to bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/enums/JobState.java
index 631151b5d67affa4f85de2e6b9a88998b2946dad..c442d8f1e7330a4f5274cd2f35b06fcef26715aa 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/JobState.java
+++ b/bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/enums/JobState.java
@@ -1,4 +1,4 @@
-package org.apache.bigtop.manager.server.enums;
+package org.apache.bigtop.manager.common.enums;
 
 public enum JobState {
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/MaintainState.java b/bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/enums/MaintainState.java
similarity index 74%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/MaintainState.java
rename to bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/enums/MaintainState.java
index 6ae4080af43e4b51a4d471cffb9727a2632e06e1..f1a5a4ea585b0641c8e4a905901eb9e1f50389db 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/MaintainState.java
+++ b/bigtop-manager-common/src/main/java/org/apache/bigtop/manager/common/enums/MaintainState.java
@@ -1,4 +1,4 @@
-package org.apache.bigtop.manager.server.enums;
+package org.apache.bigtop.manager.common.enums;
 
 import lombok.Getter;
 
diff --git a/bigtop-manager-dao/pom.xml b/bigtop-manager-dao/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0c99880ccdc0ace620976fa9c32b436944190a82
--- /dev/null
+++ b/bigtop-manager-dao/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>bigtop-manager</artifactId>
+        <groupId>org.apache.bigtop</groupId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bigtop-manager-dao</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Bigtop Manager Dao</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.bigtop</groupId>
+                <artifactId>bigtop-manager-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.bigtop</groupId>
+            <artifactId>bigtop-manager-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/AuditLog.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/AuditLog.java
similarity index 94%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/AuditLog.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/AuditLog.java
index 09fc37f2a198a050919bd735a5ab9e5c9bfb3527..23ee8f7bcd9abb69cc606ce8e54f110e4542a779 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/AuditLog.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/AuditLog.java
@@ -1,4 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/BaseEntity.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/BaseEntity.java
similarity index 94%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/BaseEntity.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/BaseEntity.java
index 104e8356909e1cba77709eb275ec539475247ed3..a381fec7d2c1d149fd3b76b32989060b75fc1186 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/BaseEntity.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/BaseEntity.java
@@ -1,4 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Cluster.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Cluster.java
similarity index 92%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Cluster.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Cluster.java
index debf36e576ba0bb3dcd877c38a3c6ab7bb032355..32fe91f82e8e0a533553546b83a56cbf0deec327 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Cluster.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Cluster.java
@@ -1,9 +1,9 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/CommandLog.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/CommandLog.java
similarity index 95%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/CommandLog.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/CommandLog.java
index e0cb32c0a95dcff4758aa00534725465d15482cb..2fb647ce39e02bc8e93f535ad4dd38826b763fd7 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/CommandLog.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/CommandLog.java
@@ -1,4 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Component.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Component.java
similarity index 96%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Component.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Component.java
index d5ef21ac8ef33080994fbb3aa050f78c18ae97e8..44945f12695070aac9c0ceb46884a4c83eaf40c6 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Component.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Component.java
@@ -1,4 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Host.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Host.java
similarity index 92%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Host.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Host.java
index b4db93866e8b5044f3ac60b8707bc7b9a6b362e9..21d94b8f33c3f7139c82fffcc48cc4d2d6ce455b 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Host.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Host.java
@@ -1,9 +1,9 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/HostComponent.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/HostComponent.java
similarity index 89%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/HostComponent.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/HostComponent.java
index 5fa79de1b394d76c5fc1846c00d5d4f0ad815f35..002a3e7ba51263e8b1d0147356f75ed459b60ec8 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/HostComponent.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/HostComponent.java
@@ -1,9 +1,9 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Job.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Job.java
similarity index 89%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Job.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Job.java
index cf8fb2405fba687f2e793d343a0f0155520641b3..7bd4034b282d5e09997b80f76955cb29c4589327 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Job.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Job.java
@@ -1,11 +1,10 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
-import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.bigtop.manager.server.enums.JobState;
-
+import org.apache.bigtop.manager.common.enums.JobState;
+import jakarta.persistence.*;
 import java.util.List;
 
 @Data
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Repo.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Repo.java
similarity index 95%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Repo.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Repo.java
index 907fc8c4f7924007159353a6b1fbcb457a77d868..749c96d0ea19e9b06991b2a42c4fa36e6de5a1a3 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Repo.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Repo.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Service.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Service.java
similarity index 91%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Service.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Service.java
index 38902f5824d90ac22c60171e0dc2ef5fcaa908ee..c6fe98c4d2fca5b98c0b2ea8f8e019357968849c 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Service.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Service.java
@@ -1,11 +1,9 @@
-package org.apache.bigtop.manager.server.orm.entity;
+package org.apache.bigtop.manager.dao.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.bigtop.manager.server.enums.MaintainState;
-
-import java.util.List;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfig.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfig.java
similarity index 96%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfig.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfig.java
index a838ca7a3d8c0a000b57a1dd5d66e530b3e7bb63..d496eba268816cef7d47a9f62b41fd234a31b8bc 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfig.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfig.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfigMapping.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfigMapping.java
similarity index 95%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfigMapping.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfigMapping.java
index 1415fb831c40acc51b25cb95a21537ca35ce1160..38e10e2417f59bbda09d70a81eb64e966a1a2c3e 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfigMapping.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfigMapping.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfigRecord.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfigRecord.java
similarity index 96%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfigRecord.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfigRecord.java
index b4374f2376520a3983988479a304174d5a1f868c..232c3a6af35a7b8bcfb75fccf9fb6eb636e9930b 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/ServiceConfigRecord.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfigRecord.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Setting.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Setting.java
similarity index 92%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Setting.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Setting.java
index bb878a3651f599c3a17555927f773ea162074053..f4ac46eb3c05695dbfa91471d1ef502bafcff962 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Setting.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Setting.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Stack.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stack.java
similarity index 92%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Stack.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stack.java
index 4652acc007760cf606620c571ccf723b73b4f2b1..9413d9c24129b9d75445daa55e7978b78c5de4b1 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Stack.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stack.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Stage.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stage.java
similarity index 93%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Stage.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stage.java
index d0954a2310880925b9cbc97fa1ea89b55b9540a1..ae2b96f1f8240a516b70b3f7e9effcbda7d26ddc 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Stage.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stage.java
@@ -1,10 +1,9 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 
 import java.util.List;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Task.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Task.java
similarity index 95%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Task.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Task.java
index cdb2fe58c047fa5f7be800641eac1a5da20a5af3..9c0c0bacb9edf7b37ae4858235551f65ff481a51 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/Task.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Task.java
@@ -1,10 +1,9 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.bigtop.manager.common.enums.Command;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/User.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/User.java
similarity index 92%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/User.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/User.java
index a7829b1bcb16becee2ac4e71c53bc648d7d31c33..4bfd0d876a69ae5115ec6ec515cf5a3d64b2d0e8 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/entity/User.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/User.java
@@ -1,5 +1,4 @@
-package org.apache.bigtop.manager.server.orm.entity;
-
+package org.apache.bigtop.manager.dao.entity;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/AuditLogRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java
similarity index 54%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/AuditLogRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java
index 5ae5deee4883b6b990d46bc1df7bcf110a63b46a..b3179a5b916fd3b5ebde032173300e5ca0420512 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/AuditLogRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.AuditLog;
+import org.apache.bigtop.manager.dao.entity.AuditLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AuditLogRepository extends JpaRepository<AuditLog, Long> {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ClusterRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java
similarity index 66%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ClusterRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java
index 8c077f35a7bf0020b447b27fa1be8fa02e0b3996..788b26243f44f984628fca2bfd7028f6d1d19baf 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ClusterRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Cluster;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/CommandLogRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/CommandLogRepository.java
similarity index 55%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/CommandLogRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/CommandLogRepository.java
index bd91a9f477fd05eb4e26c4cf7950f49448f835bf..e6153c1bfd5a82029c7619c5aa7221d53d2a48bf 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/CommandLogRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/CommandLogRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.CommandLog;
+import org.apache.bigtop.manager.dao.entity.CommandLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CommandLogRepository extends JpaRepository<CommandLog, Long> {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ComponentRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java
similarity index 82%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ComponentRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java
index 2f99a9779ce61809852053e4f42a0fa1550db75e..84621a6759f249e97062cd32f4660afb20c4c814 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ComponentRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Component;
+import org.apache.bigtop.manager.dao.entity.Component;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/HostComponentRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java
similarity index 88%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/HostComponentRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java
index ffdbea1ee3074d162827e23aae9536dde524baa9..079270065cbd6cdbac5e703dd1ac18d85e8beee8 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/HostComponentRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/HostRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java
similarity index 85%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/HostRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java
index 36c8a968ded3c47716be4985d4f538f5ade67366..db761318c4126259b315d6787ecb7cc9e2432b81 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/HostRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Host;
+import org.apache.bigtop.manager.dao.entity.Host;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/JobRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java
similarity index 79%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/JobRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java
index a7b4afcffa271c18f3ee1a121ae3b96c0c77c9fc..346df5761c13f0a4f211f64ec6f6869d0910b5a3 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/JobRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Job;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/RepoRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java
similarity index 50%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/RepoRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java
index 32bdbbbed169072e5e1f9bd6696863a8cdebd26d..b82116122a1eb964a884f06514706d29d9f49757 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/RepoRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java
@@ -1,11 +1,10 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Repo;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Repo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface RepoRepository extends JpaRepository<Repo, Long> {
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigMappingRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigMappingRepository.java
similarity index 92%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigMappingRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigMappingRepository.java
index 6f5f62869489ef89b18d547a8cd86ffd46c44cf8..1755b028e565ceb523b2a600ad38cb1ec4eee096 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigMappingRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigMappingRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.ServiceConfigMapping;
+import org.apache.bigtop.manager.dao.entity.ServiceConfigMapping;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigRecordRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRecordRepository.java
similarity index 70%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigRecordRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRecordRepository.java
index 825bdf2f63e235d747df0f9112d5711997d7b798..14fe6d8ede79d897ff9dc38424c858c52e91b69c 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigRecordRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRecordRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.ServiceConfigRecord;
+import org.apache.bigtop.manager.dao.entity.ServiceConfigRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java
similarity index 81%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java
index c56790132bd6a5dad304d63dffcd8ccc7becff87..9ee19f11c4b768326790dd3eece4a548391bb942 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceConfigRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.ServiceConfig;
+import org.apache.bigtop.manager.dao.entity.ServiceConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java
similarity index 77%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java
index 4bdd0e16231cbaf64a71e1bac2757ccd0842b8ee..dca07e60593ef1edfe16197e8e1ae2d55f1f566f 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/ServiceRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java
@@ -1,7 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.enums.MaintainState;
-import org.apache.bigtop.manager.server.orm.entity.Service;
+import org.apache.bigtop.manager.dao.entity.Service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/SettingRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java
similarity index 54%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/SettingRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java
index 7904d009b117aa4c2d264c2ea1a6c3d9cb38fce3..8e86361b35912640136c0c7f2b7bf59342a052c5 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/SettingRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Setting;
+import org.apache.bigtop.manager.dao.entity.Setting;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SettingRepository extends JpaRepository<Setting, Long> {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/StackRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java
similarity index 65%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/StackRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java
index a01d6bc309f8cf22be39a4a5cd87b6f1c6872494..d65c4cbc10571c95ad3d8a6f6d9331bcebf2ebed 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/StackRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Stack;
+import org.apache.bigtop.manager.dao.entity.Stack;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface StackRepository extends JpaRepository<Stack, Long> {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/StageRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java
similarity index 53%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/StageRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java
index 8c22e9e78ed906e436376aba9d4022bb00c7bf35..6877d9d2a1abdeb7b63c82837f54d970ea8a796b 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/StageRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java
@@ -1,7 +1,7 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Stage;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/TaskRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java
similarity index 64%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/TaskRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java
index fb50f2e6b283b55d33f0792095a5b26454cf2a11..5c6f7d483eeb625b30d63f023c8b72a413518d0f 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/TaskRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java
@@ -1,8 +1,8 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/UserRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java
similarity index 60%
rename from bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/UserRepository.java
rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java
index e8ae0748ce29cd4b29a26f0d25f276ff50ac9b7a..f41ff8874c0b9293d357c80e93c7772c1d913d13 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/orm/repository/UserRepository.java
+++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java
@@ -1,6 +1,6 @@
-package org.apache.bigtop.manager.server.orm.repository;
+package org.apache.bigtop.manager.dao.repository;
 
-import org.apache.bigtop.manager.server.orm.entity.User;
+import org.apache.bigtop.manager.dao.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
diff --git a/bigtop-manager-server/pom.xml b/bigtop-manager-server/pom.xml
index 9e6db746a9a723c1e0c846bd9a5d05693fc1d22f..9704f661ae87a7ebaa68acb6db56ea1af355382a 100644
--- a/bigtop-manager-server/pom.xml
+++ b/bigtop-manager-server/pom.xml
@@ -30,6 +30,11 @@
             <groupId>org.apache.bigtop</groupId>
             <artifactId>bigtop-manager-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.bigtop</groupId>
+            <artifactId>bigtop-manager-dao</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.bigtop</groupId>
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
index 4f2d44010ed1049f9b6605dc0f82e54c06a58ca0..308d1badc79c6243f245bd35d0557251f0a35b09 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
@@ -2,14 +2,18 @@ package org.apache.bigtop.manager.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
 @EnableAsync
 @EnableJpaAuditing
-@SpringBootApplication(scanBasePackages = "org.apache.bigtop.manager")
+@SpringBootApplication(scanBasePackages = {"org.apache.bigtop.manager"})
+@EnableJpaRepositories("org.apache.bigtop.manager")
+@EntityScan("org.apache.bigtop.manager")
 public class ServerApplication {
 
     public static void main(String[] args) {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java
index 3b29f2f0241f80267ce4c0ea3b2e238527f82483..53213d2910f18046ddba8c705001135d0a8e9abd 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java
@@ -7,8 +7,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.holder.SessionUserHolder;
-import org.apache.bigtop.manager.server.orm.entity.AuditLog;
-import org.apache.bigtop.manager.server.orm.repository.AuditLogRepository;
+import org.apache.bigtop.manager.dao.entity.AuditLog;
+import org.apache.bigtop.manager.dao.repository.AuditLogRepository;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/AbstractJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/AbstractJobFactory.java
index 75046ae47fc1fff6862a04beb9fff29168800797..0e25468f119de476f5d80e31509d181f63119c3d 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/AbstractJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/AbstractJobFactory.java
@@ -1,15 +1,15 @@
 package org.apache.bigtop.manager.server.job.factory;
 
 import jakarta.annotation.Resource;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
-import org.apache.bigtop.manager.server.orm.repository.JobRepository;
-import org.apache.bigtop.manager.server.orm.repository.StageRepository;
-import org.apache.bigtop.manager.server.orm.repository.TaskRepository;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.repository.JobRepository;
+import org.apache.bigtop.manager.dao.repository.StageRepository;
+import org.apache.bigtop.manager.dao.repository.TaskRepository;
 
 import java.util.List;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/JobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/JobFactory.java
index 1283b1b84251caad132ece5c4fd1b1a666b30f66..2af17fa5ef5faabacc152d2169a7c7afbea8eb9e 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/JobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/JobFactory.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.job.factory;
 
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
-import org.apache.bigtop.manager.server.orm.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Job;
 
 public interface JobFactory {
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/cluster/ClusterCreateJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/cluster/ClusterCreateJobFactory.java
index da721a270c0ee1910e4903bd4c9118598d93a7da..8c8a86f9c90255905ff1b7c52548b69ed328b6dd 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/cluster/ClusterCreateJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/cluster/ClusterCreateJobFactory.java
@@ -10,7 +10,7 @@ import org.apache.bigtop.manager.common.message.type.pojo.ComponentInfo;
 import org.apache.bigtop.manager.common.message.type.pojo.RepoInfo;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.helper.HostCacheStageHelper;
 import org.apache.bigtop.manager.server.job.helper.HostCheckStageHelper;
@@ -20,8 +20,8 @@ import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ClusterCommandDTO;
 import org.apache.bigtop.manager.server.model.mapper.RepoMapper;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
 import org.apache.bigtop.manager.server.service.ClusterService;
 import org.apache.bigtop.manager.server.utils.StackUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/AbstractComponentJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/AbstractComponentJobFactory.java
index 8e262eaad33e1d2e92ed5ea7d58518c4332438ab..17f6574608f0839f3213845bd8d96fbfca2557af 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/AbstractComponentJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/AbstractComponentJobFactory.java
@@ -9,16 +9,16 @@ import org.apache.bigtop.manager.common.message.type.RequestMessage;
 import org.apache.bigtop.manager.common.message.type.pojo.ScriptInfo;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.exception.ServerException;
 import org.apache.bigtop.manager.server.job.factory.AbstractJobFactory;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ComponentCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Component;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.ComponentRepository;
+import org.apache.bigtop.manager.dao.entity.Component;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.ComponentRepository;
 import org.apache.bigtop.manager.server.stack.dag.ComponentCommandWrapper;
 import org.apache.bigtop.manager.server.stack.dag.DAG;
 import org.apache.bigtop.manager.server.stack.dag.DagGraphEdge;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentInstallJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentInstallJobFactory.java
index 069ac3091e3129241c081d191d17b26e2364794b..83ec262b5be822535e209837280f078428e02791 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentInstallJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentInstallJobFactory.java
@@ -10,9 +10,9 @@ import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.helper.HostCacheStageHelper;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
 import org.apache.bigtop.manager.server.service.HostComponentService;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStartJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStartJobFactory.java
index 5f6064c95891520641af088e0ddbe4740cb28be2..6403dd2096f514153757140141758d4ee5e435c6 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStartJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStartJobFactory.java
@@ -5,17 +5,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ComponentCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
-import org.apache.bigtop.manager.server.orm.entity.Service;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.ServiceRepository;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
+import org.apache.bigtop.manager.dao.entity.Service;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.repository.ServiceRepository;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStopJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStopJobFactory.java
index 48ce34217b5458e271094bb86bfbf1fcc48b4865..d0553dd7311180d71f95cf6dd593d15b43035d92 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStopJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/component/ComponentStopJobFactory.java
@@ -5,15 +5,15 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ComponentCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.*;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.ServiceRepository;
+import org.apache.bigtop.manager.dao.entity.*;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.repository.ServiceRepository;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/host/HostAddJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/host/HostAddJobFactory.java
index 28b80c55326bbe64c081dae490eb4877872cacd9..f5ecbeb7681cbc575180baa676916fd0324a5136 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/host/HostAddJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/host/HostAddJobFactory.java
@@ -6,17 +6,17 @@ import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.common.message.type.RequestMessage;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.helper.HostCacheStageHelper;
 import org.apache.bigtop.manager.server.job.helper.HostCheckStageHelper;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
 import org.apache.bigtop.manager.server.model.dto.command.HostCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.*;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.*;
 import org.apache.bigtop.manager.server.service.HostService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/AbstractServiceJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/AbstractServiceJobFactory.java
index 81cfb71f59896d71a784f96748bb1734722356af..84734990296ef242d49710493cf1504b66ef7687 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/AbstractServiceJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/AbstractServiceJobFactory.java
@@ -4,10 +4,10 @@ import jakarta.annotation.Resource;
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.job.factory.component.AbstractComponentJobFactory;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Component;
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
-import org.apache.bigtop.manager.server.orm.repository.ComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.entity.Component;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
+import org.apache.bigtop.manager.dao.repository.ComponentRepository;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceConfigureJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceConfigureJobFactory.java
index 8918fe02ae77f93d36be9c4a49fd09c5fa446f6d..a3fddcdf659d8609cb97a2b0694ca7aea07b44af 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceConfigureJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceConfigureJobFactory.java
@@ -11,9 +11,9 @@ import org.apache.bigtop.manager.server.job.strategy.StageCallback;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.ServiceConfigDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
 import org.apache.bigtop.manager.server.service.ConfigService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceInstallJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceInstallJobFactory.java
index 00de83b962be37742ac992ad6604489fa5b52e68..bbecb882185b77addc1446e581d518863cfc2534 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceInstallJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceInstallJobFactory.java
@@ -6,8 +6,8 @@ import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.common.message.type.RequestMessage;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.helper.HostCacheStageHelper;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
@@ -15,9 +15,9 @@ import org.apache.bigtop.manager.server.model.dto.*;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
 import org.apache.bigtop.manager.server.model.mapper.ComponentMapper;
 import org.apache.bigtop.manager.server.model.mapper.ServiceMapper;
-import org.apache.bigtop.manager.server.orm.entity.*;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.ServiceRepository;
+import org.apache.bigtop.manager.dao.entity.*;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.repository.ServiceRepository;
 import org.apache.bigtop.manager.server.service.ServiceService;
 import org.apache.bigtop.manager.server.utils.StackUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStartJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStartJobFactory.java
index a6ea7e1f4a9e3cda1e4dbe6fce88f5b672e62abb..65ab202a0fe955f38cde7ef9203694614664c20f 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStartJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStartJobFactory.java
@@ -4,15 +4,15 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
-import org.apache.bigtop.manager.server.orm.entity.Service;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.ServiceRepository;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
+import org.apache.bigtop.manager.dao.entity.Service;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.repository.ServiceRepository;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStopJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStopJobFactory.java
index 0a212460ad021058507a5ba694ad1593522fc896..5716f2b181c9ad472028cbc66c07166d2b477866 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStopJobFactory.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/factory/service/ServiceStopJobFactory.java
@@ -4,15 +4,15 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.enums.Command;
 import org.apache.bigtop.manager.server.enums.CommandLevel;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.job.strategy.StageCallback;
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
-import org.apache.bigtop.manager.server.orm.entity.Service;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.ServiceRepository;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
+import org.apache.bigtop.manager.dao.entity.Service;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.repository.ServiceRepository;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCacheStageHelper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCacheStageHelper.java
index c75d70005cdc3794d4396b58b66483b1d0930755..d5a6958ac0bdfdde10b54f40db5aee92d85ccf57 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCacheStageHelper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCacheStageHelper.java
@@ -12,11 +12,11 @@ import org.apache.bigtop.manager.common.message.type.pojo.ClusterInfo;
 import org.apache.bigtop.manager.common.message.type.pojo.ComponentInfo;
 import org.apache.bigtop.manager.common.message.type.pojo.RepoInfo;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.model.dto.PropertyDTO;
 import org.apache.bigtop.manager.server.model.mapper.RepoMapper;
-import org.apache.bigtop.manager.server.orm.entity.*;
-import org.apache.bigtop.manager.server.orm.repository.*;
+import org.apache.bigtop.manager.dao.entity.*;
+import org.apache.bigtop.manager.dao.repository.*;
 import org.apache.bigtop.manager.server.utils.StackConfigUtils;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCheckStageHelper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCheckStageHelper.java
index 5c61dde322af17a1f4fb918a2116854f32f995d8..6b31ba8e5452f96984c80d378804d9e2c0cd762b 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCheckStageHelper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/helper/HostCheckStageHelper.java
@@ -8,14 +8,14 @@ import org.apache.bigtop.manager.common.message.type.HostCheckPayload;
 import org.apache.bigtop.manager.common.message.type.RequestMessage;
 import org.apache.bigtop.manager.common.message.type.pojo.HostCheckType;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
-import org.apache.bigtop.manager.server.enums.JobState;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
-import org.apache.bigtop.manager.server.orm.repository.StageRepository;
-import org.apache.bigtop.manager.server.orm.repository.TaskRepository;
+import org.apache.bigtop.manager.common.enums.JobState;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.repository.StageRepository;
+import org.apache.bigtop.manager.dao.repository.TaskRepository;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/listener/CommandEventListener.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/listener/CommandEventListener.java
index b86f1012509580323595366d3151212e0cd58483..70b91eba12f27104fc32ad65d9933fc3aa968fcf 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/listener/CommandEventListener.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/listener/CommandEventListener.java
@@ -24,14 +24,14 @@ import org.apache.bigtop.manager.server.enums.JobStrategyType;
 import org.apache.bigtop.manager.server.job.event.CommandEvent;
 import org.apache.bigtop.manager.server.job.strategy.AsyncJobStrategy;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
-import org.apache.bigtop.manager.server.orm.repository.JobRepository;
-import org.apache.bigtop.manager.server.orm.repository.StageRepository;
-import org.apache.bigtop.manager.server.orm.repository.TaskRepository;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.repository.JobRepository;
+import org.apache.bigtop.manager.dao.repository.StageRepository;
+import org.apache.bigtop.manager.dao.repository.TaskRepository;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.event.TransactionalEventListener;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AbstractJobStrategy.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AbstractJobStrategy.java
index 990838288696d979125e22f9eed0ef27378adbea..3c0df5bebdc982e7ee91173ef4d9e6aae43ed352 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AbstractJobStrategy.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AbstractJobStrategy.java
@@ -2,7 +2,7 @@ package org.apache.bigtop.manager.server.job.strategy;
 
 import jakarta.annotation.Resource;
 import org.apache.bigtop.manager.server.exception.ServerException;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Stage;
 import org.springframework.context.ApplicationContext;
 
 public abstract class AbstractJobStrategy implements JobStrategy {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AsyncJobStrategy.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AsyncJobStrategy.java
index cffa5c75f2ac4ce1306f2c7e332f2715c68581f0..c0e0b15cfeb88cec123fc437a611835fa5372283 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AsyncJobStrategy.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/AsyncJobStrategy.java
@@ -7,17 +7,17 @@ import org.apache.bigtop.manager.common.message.type.BaseCommandMessage;
 import org.apache.bigtop.manager.common.message.type.RequestMessage;
 import org.apache.bigtop.manager.common.message.type.ResultMessage;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.enums.JobStrategyType;
 import org.apache.bigtop.manager.server.holder.SpringContextHolder;
-import org.apache.bigtop.manager.server.orm.entity.CommandLog;
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.CommandLogRepository;
-import org.apache.bigtop.manager.server.orm.repository.JobRepository;
-import org.apache.bigtop.manager.server.orm.repository.StageRepository;
-import org.apache.bigtop.manager.server.orm.repository.TaskRepository;
+import org.apache.bigtop.manager.dao.entity.CommandLog;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.CommandLogRepository;
+import org.apache.bigtop.manager.dao.repository.JobRepository;
+import org.apache.bigtop.manager.dao.repository.StageRepository;
+import org.apache.bigtop.manager.dao.repository.TaskRepository;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/JobStrategy.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/JobStrategy.java
index 63bf289494566b454f67ca382927090906d782c6..aae83862809f8dc3f53c8178cdb1fe523bc907c0 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/JobStrategy.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/JobStrategy.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.job.strategy;
 
 import org.apache.bigtop.manager.server.enums.JobStrategyType;
-import org.apache.bigtop.manager.server.orm.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Job;
 
 public interface JobStrategy {
     Boolean handle(Job job, JobStrategyType strategyType);
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/StageCallback.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/StageCallback.java
index b6c8772beab07abd56fba8d6a0dcf4a8f812adb9..56fbac634a72151b35f73a021ecf6b48786fbc0c 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/StageCallback.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/StageCallback.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.job.strategy;
 
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
 
 public interface StageCallback {
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/SyncJobStrategy.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/SyncJobStrategy.java
index d2b71c5cdbb3974e7396b0ee8fbab6576a016497..8816066431b7dae9817fff35a5898af76ebe34d7 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/SyncJobStrategy.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/strategy/SyncJobStrategy.java
@@ -7,15 +7,15 @@ import org.apache.bigtop.manager.common.message.type.BaseCommandMessage;
 import org.apache.bigtop.manager.common.message.type.RequestMessage;
 import org.apache.bigtop.manager.common.message.type.ResultMessage;
 import org.apache.bigtop.manager.common.utils.JsonUtils;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.enums.JobStrategyType;
 import org.apache.bigtop.manager.server.holder.SpringContextHolder;
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
-import org.apache.bigtop.manager.server.orm.entity.Task;
-import org.apache.bigtop.manager.server.orm.repository.JobRepository;
-import org.apache.bigtop.manager.server.orm.repository.StageRepository;
-import org.apache.bigtop.manager.server.orm.repository.TaskRepository;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Task;
+import org.apache.bigtop.manager.dao.repository.JobRepository;
+import org.apache.bigtop.manager.dao.repository.StageRepository;
+import org.apache.bigtop.manager.dao.repository.TaskRepository;
 import org.springframework.stereotype.Component;
 
 import java.util.Comparator;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterCreateValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterCreateValidator.java
index 457e7b26ec9c257ebc3eb36c6501c01a98323a78..32c2c9d2e3614ffc36862990f3fec4e468c860ec 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterCreateValidator.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterCreateValidator.java
@@ -7,8 +7,8 @@ import org.apache.bigtop.manager.server.enums.CommandLevel;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.model.dto.command.ClusterCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterHostValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterHostValidator.java
index 7e64ceda258e59acf6a02c42bfcb7f9efd17b39a..f2a1872f47b6dd513da6e9ccb065e33d0f0dc360 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterHostValidator.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ClusterHostValidator.java
@@ -7,8 +7,8 @@ import org.apache.bigtop.manager.server.enums.CommandLevel;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.model.dto.command.ClusterCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.repository.HostRepository;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.repository.HostRepository;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/HostAddValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/HostAddValidator.java
index e0e10ca3efffc12829abd823fd72ea6946055a15..40f9a1969e176978d3add1a5ba4d4c0831a769fa 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/HostAddValidator.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/HostAddValidator.java
@@ -7,8 +7,8 @@ import org.apache.bigtop.manager.server.enums.CommandLevel;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.model.dto.command.HostCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.repository.HostRepository;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.repository.HostRepository;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/RequiredServicesValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/RequiredServicesValidator.java
index a79ce475e9b692aca9a6c7e94da3acf5ad9aebff..3016699dd7313561fbaff04b2ede2fa584003b36 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/RequiredServicesValidator.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/RequiredServicesValidator.java
@@ -10,10 +10,10 @@ import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Service;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
-import org.apache.bigtop.manager.server.orm.repository.ServiceRepository;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Service;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.repository.ServiceRepository;
 import org.apache.bigtop.manager.server.utils.StackUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ServiceHostValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ServiceHostValidator.java
index ac6a56864a2790323245d8458deaea6af3c5516a..2f85fc7b5a8da4f0856531c7a60222f391c049e1 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ServiceHostValidator.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/ServiceHostValidator.java
@@ -8,8 +8,8 @@ import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.repository.HostRepository;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.repository.HostRepository;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/StackValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/StackValidator.java
index c80482e7e4dbbb0fa83e162944eedd101c81f183..0a8997a365722220dfe72a3a615961f579c4b634 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/StackValidator.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/job/validator/StackValidator.java
@@ -7,8 +7,8 @@ import org.apache.bigtop.manager.server.enums.CommandLevel;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.job.CommandIdentifier;
 import org.apache.bigtop.manager.server.model.dto.command.ClusterCommandDTO;
-import org.apache.bigtop.manager.server.orm.entity.Stack;
-import org.apache.bigtop.manager.server.orm.repository.StackRepository;
+import org.apache.bigtop.manager.dao.entity.Stack;
+import org.apache.bigtop.manager.dao.repository.StackRepository;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ClusterMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ClusterMapper.java
index 039c51d1cfcc01dfff79cb024dded0d45a13309e..d3285e3a5a3d0d4bd32737518f3623c6f6ef87c6 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ClusterMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ClusterMapper.java
@@ -4,8 +4,8 @@ import org.apache.bigtop.manager.server.model.dto.ClusterDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.req.ClusterReq;
 import org.apache.bigtop.manager.server.model.vo.ClusterVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Stack;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Stack;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
index 57f0e0dde58d066f9a1381d97c7b6c6fc6889451..60185842bad471aceeb52e5b8210b2d6656b03fa 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ComponentMapper.java
@@ -2,9 +2,9 @@ package org.apache.bigtop.manager.server.model.mapper;
 
 import org.apache.bigtop.manager.server.model.dto.ComponentDTO;
 import org.apache.bigtop.manager.server.model.vo.ComponentVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Component;
-import org.apache.bigtop.manager.server.orm.entity.Service;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Component;
+import org.apache.bigtop.manager.dao.entity.Service;
 import org.apache.bigtop.manager.server.stack.pojo.ComponentModel;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ConfigMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ConfigMapper.java
index 571fbdf8dd9a97eb50b555d4b917f747ff8d707d..0b3b71fee4ca463e88ab0780ef55fdfffebbf385 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ConfigMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ConfigMapper.java
@@ -7,9 +7,9 @@ import org.apache.bigtop.manager.server.model.dto.ServiceConfigDTO;
 import org.apache.bigtop.manager.server.model.req.ServiceConfigReq;
 import org.apache.bigtop.manager.server.model.vo.TypeConfigVO;
 import org.apache.bigtop.manager.server.model.vo.ServiceConfigVO;
-import org.apache.bigtop.manager.server.orm.entity.ServiceConfig;
-import org.apache.bigtop.manager.server.orm.entity.ServiceConfigMapping;
-import org.apache.bigtop.manager.server.orm.entity.ServiceConfigRecord;
+import org.apache.bigtop.manager.dao.entity.ServiceConfig;
+import org.apache.bigtop.manager.dao.entity.ServiceConfigMapping;
+import org.apache.bigtop.manager.dao.entity.ServiceConfigRecord;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostComponentMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostComponentMapper.java
index f3f1eb47b26cc2b0fa56d6596632477a564c8bdc..6cbd5454ba692d641ae96a46f71f091061b294f4 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostComponentMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostComponentMapper.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.mapper;
 
 import org.apache.bigtop.manager.server.model.vo.HostComponentVO;
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostMapper.java
index a219ae3a1a1247b31e97e48e5674a45457fe2b63..147023aabc5e9df1e49b74db8b44bcc2f910cd0c 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/HostMapper.java
@@ -3,7 +3,7 @@ package org.apache.bigtop.manager.server.model.mapper;
 import org.apache.bigtop.manager.server.model.dto.HostDTO;
 import org.apache.bigtop.manager.server.model.req.HostReq;
 import org.apache.bigtop.manager.server.model.vo.HostVO;
-import org.apache.bigtop.manager.server.orm.entity.Host;
+import org.apache.bigtop.manager.dao.entity.Host;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/JobMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/JobMapper.java
index 4fe2401eb43b04b689ebecb1ebcaa10ed5d7bc38..f9a502abd3578a6dc33b21df13b1449fe05abd7f 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/JobMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/JobMapper.java
@@ -1,12 +1,12 @@
 package org.apache.bigtop.manager.server.model.mapper;
 
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.HostDTO;
 import org.apache.bigtop.manager.server.model.vo.JobVO;
 import org.apache.bigtop.manager.server.model.vo.CommandVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Job;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/RepoMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/RepoMapper.java
index f0a2efaa4282d35d289ea39b3888431198e0ac79..649b3809f665423702b83a5fb49118988f494495 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/RepoMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/RepoMapper.java
@@ -2,8 +2,8 @@ package org.apache.bigtop.manager.server.model.mapper;
 
 import org.apache.bigtop.manager.common.message.type.pojo.RepoInfo;
 import org.apache.bigtop.manager.server.model.dto.RepoDTO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Repo;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Repo;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
index c0ab45880f8986268f543529ba6334c73047a8d5..31ba5dc3f5dbe0eed8f0e1f45b5e66fa81cada71 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/ServiceMapper.java
@@ -2,8 +2,8 @@ package org.apache.bigtop.manager.server.model.mapper;
 
 import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
 import org.apache.bigtop.manager.server.model.vo.ServiceVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Service;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Service;
 import org.apache.bigtop.manager.server.stack.pojo.ServiceModel;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
index ca0bcf3391cd42adc0bd1c39f4cb8af8865fdaa4..bad0f387747188d65136b425af91372648cbfc28 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StackMapper.java
@@ -3,7 +3,7 @@ package org.apache.bigtop.manager.server.model.mapper;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.req.StackReq;
 import org.apache.bigtop.manager.server.model.vo.StackVO;
-import org.apache.bigtop.manager.server.orm.entity.Stack;
+import org.apache.bigtop.manager.dao.entity.Stack;
 import org.apache.bigtop.manager.server.stack.pojo.StackModel;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StageMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StageMapper.java
index b949d72b91e5e81ca033c32b9f92565f3e0149ed..bc7a77305cd3c718b9d733072dbd1839ec9bb33a 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StageMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/StageMapper.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.mapper;
 
 import org.apache.bigtop.manager.server.model.vo.StageVO;
-import org.apache.bigtop.manager.server.orm.entity.Stage;
+import org.apache.bigtop.manager.dao.entity.Stage;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/TaskMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/TaskMapper.java
index 265050f9cb354bc622bb6f7609ccaee8b47ba318..0ef0a5b1d722a41391f037b7290b64b651c760ea 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/TaskMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/TaskMapper.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.mapper;
 
 import org.apache.bigtop.manager.server.model.vo.TaskVO;
-import org.apache.bigtop.manager.server.orm.entity.Task;
+import org.apache.bigtop.manager.dao.entity.Task;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/UserMapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/UserMapper.java
index 89219cdf5668797820740e5eda711a08097a36c9..9e041caa5b3cb455a36ee8a6712914b0b29067ac 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/UserMapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/mapper/UserMapper.java
@@ -3,7 +3,7 @@ package org.apache.bigtop.manager.server.model.mapper;
 import org.apache.bigtop.manager.server.model.dto.UserDTO;
 import org.apache.bigtop.manager.server.model.req.UserReq;
 import org.apache.bigtop.manager.server.model.vo.UserVO;
-import org.apache.bigtop.manager.server.orm.entity.User;
+import org.apache.bigtop.manager.dao.entity.User;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ClusterVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ClusterVO.java
index 6465a484654689363474a328ecad557d15ee565d..e492a951744a0b362af1c6d72f3a447f3ed28940 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ClusterVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ClusterVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 public class ClusterVO {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostComponentVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostComponentVO.java
index fc306953ec9bd09d409eb9362c805f2d1b55cc5c..aef5e8497011d66ec637b3c4798ec872d5185b9d 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostComponentVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostComponentVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 public class HostComponentVO {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostVO.java
index 41a56a893f72159c32a4d5055e4adca30558d53a..b198b0fbd5e3b34bdd2ae8abf5a1a2049353678d 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/HostVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 @Data
 public class HostVO {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/JobVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/JobVO.java
index 72cf41a70b6b69b24d6c3a13bb8ebc8af55e9811..36f71f67656548f3854479572ea5f88d8c9d4851 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/JobVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/JobVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 
 import java.util.List;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java
index b8d5292dd5946dca56389da8f65d65b4cfc48c1d..e3e75f77764c2f05051cec288386f2e7fdb04351 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 
 import java.util.List;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/StageVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/StageVO.java
index 86f47c82543c2cd488c462612cfd05e0a6bf7844..35c6023da7e2420e26bd14c66032b9d8abd8817d 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/StageVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/StageVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 import java.util.List;
 
 @Data
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/TaskVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/TaskVO.java
index bcf7fe539e1763dd32bcaeac8ec3b6853824ed34..cf2f133d733d5f1b0a081f6cbf8978650968621f 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/TaskVO.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/TaskVO.java
@@ -1,7 +1,7 @@
 package org.apache.bigtop.manager.server.model.vo;
 
 import lombok.Data;
-import org.apache.bigtop.manager.server.enums.JobState;
+import org.apache.bigtop.manager.common.enums.JobState;
 
 @Data
 public class TaskVO {
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduled/HostHeartbeatScheduled.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduled/HostHeartbeatScheduled.java
index 78dfa12026c857d49ceded7bb05637d9ade96c65..bb9bf66e522d0a8f2e331eda067a053b5e5893db 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduled/HostHeartbeatScheduled.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduled/HostHeartbeatScheduled.java
@@ -4,8 +4,8 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.common.message.type.HeartbeatMessage;
 import org.apache.bigtop.manager.common.message.type.pojo.HostInfo;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.repository.HostRepository;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.repository.HostRepository;
 import org.apache.bigtop.manager.server.ws.ServerWebSocketHandler;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/ConfigService.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/ConfigService.java
index c94683736f6c89ec3e1ef0996b128978f3bd88fb..dceab585ce4c90198e7b1c087a2d3160b77f0d3a 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/ConfigService.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/ConfigService.java
@@ -3,7 +3,7 @@ package org.apache.bigtop.manager.server.service;
 import org.apache.bigtop.manager.server.model.dto.ServiceConfigDTO;
 import org.apache.bigtop.manager.server.model.dto.TypeConfigDTO;
 import org.apache.bigtop.manager.server.model.vo.ServiceConfigVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Cluster;
 
 import java.util.List;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java
index c7e5223e740cec8900825eb501d6039b9639ca2b..4084869157f6e8031652ca60cb0631f2b6923c76 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java
@@ -3,19 +3,19 @@ package org.apache.bigtop.manager.server.service.impl;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.model.dto.ClusterDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
 import org.apache.bigtop.manager.server.model.mapper.ClusterMapper;
 import org.apache.bigtop.manager.server.model.mapper.RepoMapper;
 import org.apache.bigtop.manager.server.model.vo.ClusterVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Repo;
-import org.apache.bigtop.manager.server.orm.entity.Stack;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
-import org.apache.bigtop.manager.server.orm.repository.RepoRepository;
-import org.apache.bigtop.manager.server.orm.repository.StackRepository;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Repo;
+import org.apache.bigtop.manager.dao.entity.Stack;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.repository.RepoRepository;
+import org.apache.bigtop.manager.dao.repository.StackRepository;
 import org.apache.bigtop.manager.server.service.ClusterService;
 import org.apache.bigtop.manager.server.service.HostService;
 import org.apache.bigtop.manager.server.utils.StackUtils;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java
index 2aede94df25b3c45c746317a7428e7c92b5089d9..10c8f4386e16741d9896700838d205ec70bcfa14 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java
@@ -12,7 +12,7 @@ import org.apache.bigtop.manager.server.job.validator.ValidatorContext;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.mapper.JobMapper;
 import org.apache.bigtop.manager.server.model.vo.CommandVO;
-import org.apache.bigtop.manager.server.orm.entity.Job;
+import org.apache.bigtop.manager.dao.entity.Job;
 import org.apache.bigtop.manager.server.service.CommandService;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java
index 150fcf8c4942709c5e5852e6d86a34cdba944665..f8b58543d0aae5b2110b716f2b90edc707a28655 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java
@@ -6,8 +6,8 @@ import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.model.mapper.ComponentMapper;
 import org.apache.bigtop.manager.server.model.vo.ComponentVO;
-import org.apache.bigtop.manager.server.orm.entity.Component;
-import org.apache.bigtop.manager.server.orm.repository.ComponentRepository;
+import org.apache.bigtop.manager.dao.entity.Component;
+import org.apache.bigtop.manager.dao.repository.ComponentRepository;
 import org.apache.bigtop.manager.server.service.ComponentService;
 import org.springframework.stereotype.Service;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java
index 21a223194af87aaf9cf284d3d4a9353ea0b1b800..cc8ca06fb8b8261df983a2a8454b6d6a8a5dee91 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java
@@ -10,8 +10,8 @@ import org.apache.bigtop.manager.server.model.dto.ServiceConfigDTO;
 import org.apache.bigtop.manager.server.model.dto.TypeConfigDTO;
 import org.apache.bigtop.manager.server.model.mapper.ConfigMapper;
 import org.apache.bigtop.manager.server.model.vo.ServiceConfigVO;
-import org.apache.bigtop.manager.server.orm.entity.*;
-import org.apache.bigtop.manager.server.orm.repository.*;
+import org.apache.bigtop.manager.dao.entity.*;
+import org.apache.bigtop.manager.dao.repository.*;
 import org.apache.bigtop.manager.server.service.ConfigService;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java
index 387ad3d21d438f65cab610f85aead7980507d22e..d0db1f9ceb0f2daa927aa29b24a45cf5eeadb10b 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java
@@ -2,17 +2,17 @@ package org.apache.bigtop.manager.server.service.impl;
 
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.model.dto.CommandDTO;
 import org.apache.bigtop.manager.server.model.dto.command.ComponentCommandDTO;
 import org.apache.bigtop.manager.server.model.mapper.HostComponentMapper;
 import org.apache.bigtop.manager.server.model.vo.HostComponentVO;
-import org.apache.bigtop.manager.server.orm.entity.Component;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.entity.HostComponent;
-import org.apache.bigtop.manager.server.orm.repository.ComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.HostComponentRepository;
-import org.apache.bigtop.manager.server.orm.repository.HostRepository;
+import org.apache.bigtop.manager.dao.entity.Component;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.entity.HostComponent;
+import org.apache.bigtop.manager.dao.repository.ComponentRepository;
+import org.apache.bigtop.manager.dao.repository.HostComponentRepository;
+import org.apache.bigtop.manager.dao.repository.HostRepository;
 import org.apache.bigtop.manager.server.service.HostComponentService;
 import org.springframework.stereotype.Service;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
index 42b039fc95d25a6a189d195f7abb95032350bb8e..78f60bdf44cd35fc3c18dfa66f41c0ce45c820df 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
@@ -3,15 +3,15 @@ package org.apache.bigtop.manager.server.service.impl;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.model.dto.HostDTO;
 import org.apache.bigtop.manager.server.model.mapper.HostMapper;
 import org.apache.bigtop.manager.server.model.vo.HostVO;
-import org.apache.bigtop.manager.server.orm.entity.Cluster;
-import org.apache.bigtop.manager.server.orm.entity.Host;
-import org.apache.bigtop.manager.server.orm.repository.ClusterRepository;
-import org.apache.bigtop.manager.server.orm.repository.HostRepository;
+import org.apache.bigtop.manager.dao.entity.Cluster;
+import org.apache.bigtop.manager.dao.entity.Host;
+import org.apache.bigtop.manager.dao.repository.ClusterRepository;
+import org.apache.bigtop.manager.dao.repository.HostRepository;
 import org.apache.bigtop.manager.server.service.HostService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java
index 47ac19fdf53dd0848e232d0bcd5ca5044c75c6e5..1e9c3bf28dcb3c7d36fc5c684cb09bc06569ad9f 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java
@@ -5,8 +5,8 @@ import org.apache.bigtop.manager.server.model.mapper.JobMapper;
 import org.apache.bigtop.manager.server.model.query.PageQuery;
 import org.apache.bigtop.manager.server.model.vo.JobVO;
 import org.apache.bigtop.manager.server.model.vo.PageVO;
-import org.apache.bigtop.manager.server.orm.entity.Job;
-import org.apache.bigtop.manager.server.orm.repository.JobRepository;
+import org.apache.bigtop.manager.dao.entity.Job;
+import org.apache.bigtop.manager.dao.repository.JobRepository;
 import org.apache.bigtop.manager.server.service.JobService;
 import org.apache.bigtop.manager.server.utils.ClusterUtils;
 import org.apache.bigtop.manager.server.utils.PageUtils;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java
index 05d94ebd2da52f2ccecc48ead9949ad683de7ccb..a2f4e3402d4040bde0737e4f9bc6181dc423a236 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java
@@ -5,8 +5,8 @@ import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.model.dto.LoginDTO;
 import org.apache.bigtop.manager.server.model.vo.LoginVO;
-import org.apache.bigtop.manager.server.orm.entity.User;
-import org.apache.bigtop.manager.server.orm.repository.UserRepository;
+import org.apache.bigtop.manager.dao.entity.User;
+import org.apache.bigtop.manager.dao.repository.UserRepository;
 import org.apache.bigtop.manager.server.service.LoginService;
 import org.apache.bigtop.manager.server.utils.JWTUtils;
 import org.springframework.stereotype.Service;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java
index a43a0a8de4a2cf996c55d5ffc828a7ebd0d48b62..961819591d32490aa4dc551f6c10c6c7e1976351 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java
@@ -3,15 +3,15 @@ package org.apache.bigtop.manager.server.service.impl;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.server.enums.ApiExceptionEnum;
-import org.apache.bigtop.manager.server.enums.MaintainState;
+import org.apache.bigtop.manager.common.enums.MaintainState;
 import org.apache.bigtop.manager.server.exception.ApiException;
 import org.apache.bigtop.manager.server.model.dto.*;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
 import org.apache.bigtop.manager.server.model.mapper.ComponentMapper;
 import org.apache.bigtop.manager.server.model.mapper.ServiceMapper;
 import org.apache.bigtop.manager.server.model.vo.ServiceVO;
-import org.apache.bigtop.manager.server.orm.entity.*;
-import org.apache.bigtop.manager.server.orm.repository.*;
+import org.apache.bigtop.manager.dao.entity.*;
+import org.apache.bigtop.manager.dao.repository.*;
 import org.apache.bigtop.manager.server.service.ConfigService;
 import org.apache.bigtop.manager.server.service.ServiceService;
 import org.apache.bigtop.manager.server.utils.StackUtils;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java
index 44837a9a697dcde842265d2601a8637f0d799c07..78d285f09c15b76c9b0065543d6492c72911b38a 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java
@@ -23,8 +23,8 @@ import org.apache.bigtop.manager.server.holder.SessionUserHolder;
 import org.apache.bigtop.manager.server.model.dto.UserDTO;
 import org.apache.bigtop.manager.server.model.mapper.UserMapper;
 import org.apache.bigtop.manager.server.model.vo.UserVO;
-import org.apache.bigtop.manager.server.orm.entity.User;
-import org.apache.bigtop.manager.server.orm.repository.UserRepository;
+import org.apache.bigtop.manager.dao.entity.User;
+import org.apache.bigtop.manager.dao.repository.UserRepository;
 import org.apache.bigtop.manager.server.service.UserService;
 import org.springframework.stereotype.Service;
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java
index b91ae3ee41e349dcef0b68270b9e0c3a83d03fd5..0ad046fd3f3eba1577d150910350910df6f4ea21 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java
@@ -5,8 +5,8 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.bigtop.manager.server.model.dto.ServiceDTO;
 import org.apache.bigtop.manager.server.model.dto.StackDTO;
-import org.apache.bigtop.manager.server.orm.entity.Stack;
-import org.apache.bigtop.manager.server.orm.repository.StackRepository;
+import org.apache.bigtop.manager.dao.entity.Stack;
+import org.apache.bigtop.manager.dao.repository.StackRepository;
 import org.apache.bigtop.manager.server.utils.StackUtils;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/dag/ComponentCommandWrapper.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/dag/ComponentCommandWrapper.java
index 7a838b6c806b448a54c85cc61ee4d0ff8c85ba1d..c955d2868b9b6f815ae63582a1dd7ef1804c1d28 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/dag/ComponentCommandWrapper.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/dag/ComponentCommandWrapper.java
@@ -3,7 +3,7 @@ package org.apache.bigtop.manager.server.stack.dag;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.bigtop.manager.common.enums.Command;
-import org.apache.bigtop.manager.server.orm.entity.Component;
+import org.apache.bigtop.manager.dao.entity.Component;
 import org.apache.commons.text.CaseUtils;
 
 import java.util.Objects;
diff --git a/pom.xml b/pom.xml
index 6c03bce5659803968cd2e212f3b31c52ab4005b7..a8931122d959b49b7ace30fc40890ebb414d2d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
         <module>bigtop-manager-server</module>
         <module>bigtop-manager-stack</module>
         <module>bigtop-manager-ui</module>
+        <module>bigtop-manager-dao</module>
     </modules>
 
     <dependencyManagement>