diff --git a/frontend/package.json b/frontend/package.json
index c80b3196..53322574 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,7 +11,9 @@
     },
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
-        "@vueuse/core": "^13.1.0",
+        "@logicflow/core": "^2.0.13",
+        "@logicflow/extension": "^2.0.18",
+        "@vueuse/core": "^13.2.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-search": "^0.15.0",
         "@xterm/addon-web-links": "^0.11.0",
@@ -22,37 +24,37 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.13",
         "echarts": "^5.6.0",
-        "element-plus": "^2.9.8",
+        "element-plus": "^2.9.10",
         "js-base64": "^3.7.7",
         "jsencrypt": "^3.3.2",
         "mitt": "^3.0.1",
         "monaco-editor": "^0.52.2",
-        "monaco-sql-languages": "^0.12.2",
-        "monaco-themes": "^0.4.4",
+        "monaco-sql-languages": "^0.14.0",
+        "monaco-themes": "^0.4.5",
         "nprogress": "^0.2.0",
         "pinia": "^3.0.2",
         "qrcode.vue": "^3.6.0",
         "screenfull": "^6.0.2",
         "sortablejs": "^1.15.6",
         "splitpanes": "^4.0.3",
-        "sql-formatter": "^15.4.10",
+        "sql-formatter": "^15.6.1",
         "trzsz": "^1.1.5",
         "uuid": "^9.0.1",
-        "vue": "^3.5.13",
+        "vue": "^3.5.14",
         "vue-i18n": "^11.1.3",
-        "vue-router": "^4.5.0",
+        "vue-router": "^4.5.1",
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
-        "@tailwindcss/vite": "^4.1.4",
+        "@tailwindcss/vite": "^4.1.6",
         "@types/crypto-js": "^4.2.2",
         "@types/node": "^18.14.0",
         "@types/nprogress": "^0.2.0",
         "@types/sortablejs": "^1.15.8",
         "@typescript-eslint/eslint-plugin": "^6.7.4",
         "@typescript-eslint/parser": "^6.7.4",
-        "@vitejs/plugin-vue": "^5.2.3",
-        "@vue/compiler-sfc": "^3.5.13",
+        "@vitejs/plugin-vue": "^5.2.4",
+        "@vue/compiler-sfc": "^3.5.14",
         "autoprefixer": "^10.4.21",
         "code-inspector-plugin": "^0.20.9",
         "dotenv": "^16.3.1",
@@ -60,10 +62,10 @@
         "eslint-plugin-vue": "^10.0.0",
         "postcss": "^8.5.3",
         "prettier": "^3.5.3",
-        "sass": "^1.87.0",
-        "tailwindcss": "^4.1.4",
+        "sass": "^1.89.0",
+        "tailwindcss": "^4.1.7",
         "typescript": "^5.8.2",
-        "vite": "^6.3.3",
+        "vite": "^6.3.5",
         "vite-plugin-progress": "0.0.7",
         "vue-eslint-parser": "^10.1.3"
     },
diff --git a/frontend/src/common/assert.ts b/frontend/src/common/assert.ts
index a4c004cb..7cf038cd 100644
--- a/frontend/src/common/assert.ts
+++ b/frontend/src/common/assert.ts
@@ -1,10 +1,12 @@
 import { i18n } from '@/i18n';
+import { ElMessage } from 'element-plus';
 
 /**
  * 不符合业务断言错误
  */
 class AssertError extends Error {
     constructor(message: string) {
+        ElMessage.error(message);
         super(message);
         // 错误类名
         this.name = 'AssertError';
@@ -15,11 +17,11 @@ class AssertError extends Error {
  * 断言表达式为true
  *
  * @param condition 条件表达式
- * @param msg 错误消息
+ * @param msgOrI18nKey 错误消息 或者 i18n key
  */
-export function isTrue(condition: boolean, msg: string) {
+export function isTrue(condition: boolean, msgOrI18nKey: string) {
     if (!condition) {
-        throw new AssertError(msg);
+        throw new AssertError(i18n.global.t(msgOrI18nKey));
     }
 }
 
diff --git a/frontend/src/common/config.ts b/frontend/src/common/config.ts
index 61a007a0..80155add 100644
--- a/frontend/src/common/config.ts
+++ b/frontend/src/common/config.ts
@@ -15,7 +15,7 @@ const config = {
     baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`,
 
     // 系统版本
-    version: 'v1.9.4',
+    version: 'v1.10.0',
 };
 
 export default config;
diff --git a/frontend/src/components/pagetable/PageTable.vue b/frontend/src/components/pagetable/PageTable.vue
index 7458f055..3c50ffa2 100644
--- a/frontend/src/components/pagetable/PageTable.vue
+++ b/frontend/src/components/pagetable/PageTable.vue
@@ -133,7 +133,7 @@
                                     <template #reference>
                                         <el-link
                                             @click="formatText(item.getValueByData(scope.row))"
-                                            :underline="false"
+                                            underline="never"
                                             type="success"
                                             icon="MagicStick"
                                             class="mr-1"
diff --git a/frontend/src/components/terminal/TerminalBody.vue b/frontend/src/components/terminal/TerminalBody.vue
index 010a7827..83a381dc 100644
--- a/frontend/src/components/terminal/TerminalBody.vue
+++ b/frontend/src/components/terminal/TerminalBody.vue
@@ -91,7 +91,7 @@ onBeforeUnmount(() => {
     close();
 });
 
-function init() {
+const init = () => {
     state.status = TerminalStatus.NoConnected;
     if (term) {
         console.log('重新连接...');
@@ -100,9 +100,9 @@ function init() {
     nextTick(() => {
         initTerm();
     });
-}
+};
 
-async function initTerm() {
+const initTerm = async () => {
     term = new Terminal({
         fontSize: themeConfig.value.terminalFontSize || 15,
         fontWeight: themeConfig.value.terminalFontWeight || 'normal',
@@ -138,9 +138,9 @@ async function initTerm() {
 
         return true;
     });
-}
+};
 
-function initSocket() {
+const initSocket = () => {
     if (!props.socketUrl) {
         return;
     }
@@ -157,7 +157,7 @@ function initSocket() {
 
         // 如果有初始要执行的命令，则发送执行命令
         if (props.cmd) {
-            sendCmd(props.cmd + ' \r');
+            sendData(props.cmd + ' \r');
         }
     };
 
@@ -172,9 +172,9 @@ function initSocket() {
         console.log('terminal socket close...', e.reason);
         state.status = TerminalStatus.Disconnected;
     };
-}
+};
 
-function loadAddon() {
+const loadAddon = () => {
     // 注册搜索组件
     const searchAddon = new SearchAddon();
     state.addon.search = searchAddon;
@@ -191,7 +191,7 @@ function loadAddon() {
         // write the server output to the terminal
         writeToTerminal: (data: any) => term.write(typeof data === 'string' ? data : new Uint8Array(data)),
         // send the user input to the server
-        sendToServer: sendCmd,
+        sendToServer: sendData,
         // the terminal columns
         terminalColumns: term.cols,
         // there is a windows shell
@@ -217,7 +217,7 @@ function loadAddon() {
             .then(() => console.log('upload success'))
             .catch((err: any) => console.log(err));
     });
-}
+};
 
 // 写入内容至终端
 const write2Term = (data: any) => {
@@ -265,28 +265,28 @@ enum MsgType {
     Ping = 3,
 }
 
-const send = (msg: any) => {
-    state.status == TerminalStatus.Connected && socket?.send(msg);
+const send2Socket = (data: any) => {
+    state.status == TerminalStatus.Connected && socket?.send(data);
 };
 
 const sendResize = (cols: number, rows: number) => {
-    send(`${MsgType.Resize}|${rows}|${cols}`);
+    send2Socket(`${MsgType.Resize}|${rows}|${cols}`);
 };
 
 const sendPing = () => {
-    send(`${MsgType.Ping}|ping`);
+    send2Socket(`${MsgType.Ping}|ping`);
 };
 
-function sendCmd(key: any) {
-    send(`${MsgType.Data}|${key}`);
-}
+const sendData = (key: any) => {
+    send2Socket(`${MsgType.Data}|${key}`);
+};
 
-function closeSocket() {
+const closeSocket = () => {
     // 关闭 websocket
     socket && socket.readyState === 1 && socket.close();
-}
+};
 
-function close() {
+const close = () => {
     console.log('in terminal body close');
     closeSocket();
     if (term) {
@@ -295,7 +295,7 @@ function close() {
         state.addon.weblinks.dispose();
         term.dispose();
     }
-}
+};
 
 const getStatus = (): TerminalStatus => {
     return state.status;
diff --git a/frontend/src/i18n/en/flow.ts b/frontend/src/i18n/en/flow.ts
index 4ae92653..03f74fb7 100644
--- a/frontend/src/i18n/en/flow.ts
+++ b/frontend/src/i18n/en/flow.ts
@@ -6,23 +6,23 @@ export default {
         triggeringCondition: 'Condition',
         triggeringConditionTips: 'go template syntax. If the output is 1, the approval process is triggered',
         conditionPlaceholder: 'Trigger condition, return value =1, means to trigger the approval process',
-        conditionDefault: `{{/* DBMS- Run Sql rules The param parameter is described as follows */}}
-{{/* stmtType: select / read / insert / update / delete / ddl ;  */}}
-{{ if eq .bizType "db_sql_exec_flow"}}
-{{/* Enable process approval when select and read statements are not available */}}
-{{ if and (ne .param.stmtType "select") (ne .param.stmtType "read") }}
-    1
-{{ end }}
-{{ end }}
+        conditionDefault: `{'{{'}/* DBMS- Run Sql rules The param parameter is described as follows */{'}}'}
+{'{{'}/* stmtType: select / read / insert / update / delete / ddl ;  */{'}}'}
+{'{{'} if eq .bizType "db_sql_exec_flow"{'}}'}
+{'{{'}/* Enable process approval when select and read statements are not available */{'}}'}
+    {'{{'} if and (ne .param.stmtType "select") (ne .param.stmtType "read") {'}}'}
+        1
+    {'{{'} end {'}}'}
+{'{{'} end {'}}'}
 
-{{/* Redis-Run Cmd rules;   param: parameter is described as follows */}}
-{{/* cmdType: read(Read cmd) / write(Write cmd);  */}}
-{{/* cmd: get/set/hset... */}}
-{{ if eq .bizType "redis_run_cmd_flow"}}
-{{ if eq .param.cmdType "write" }}
-    1
-{{ end }}
-{{ end }}`,
+{'{{'}/* Redis-Run Cmd rules;   param: parameter is described as follows */{'}}'}
+{'{{'}/* cmdType: read(Read cmd) / write(Write cmd);  */{'}}'}
+{'{{'}/* cmd: get/set/hset... */{'}}'}
+{'{{'} if eq .bizType "redis_run_cmd_flow"{'}}'}
+    {'{{'} if eq .param.cmdType "write" {'}}'}
+        1
+    {'{{'} end {'}}'}
+{'{{'} end {'}}'}`,
         nodeName: 'Node Name',
         nodeNameTips: 'Click the specified node to drag and drop sort',
         auditor: 'Auditor',
@@ -32,6 +32,27 @@ export default {
         enable: 'Enable',
         disable: 'Disable',
 
+        todoTask: 'Pending Tasks',
+        doneTask: 'Completed Tasks',
+        flowDesign: 'Flow Design',
+        clear: 'Clear',
+        approvalMode: 'Approval Mode',
+        andSign: 'All Approve (AND)',
+        orSign: 'Any Approve (OR)',
+        voteSign: 'Vote Approval',
+        taskCandidate: 'Task Assignees',
+        mustOneStartNode: 'There must be one start node in the flow',
+        mustOneEndNode: 'There must be one end node in the flow',
+        mustOneOutEdgeForStartNode: 'The start node must have at least one outgoing edge',
+        mustOneInEdgeForEndNode: 'The end node must have at least one incoming edge',
+        approvalRecord: 'Approval Records',
+        start: 'Start',
+        end: 'End',
+        usertask: 'User Task', // 建议拼写修正为 userTask
+        serial: 'Exclusive Gateway',
+        parallel: 'Parallel Gateway',
+        flowEdge: 'Sequence Flow',
+
         // procinst
         startProcess: 'Start Process',
         cancelProcessConfirm: 'Confirm canceling the process?',
@@ -80,15 +101,17 @@ export default {
         redisRunCmd: 'Redis-Run Cmd',
 
         // task
-        approveNode: 'Approve Node',
-        approveForm: 'Approve Form',
-        approveResult: 'Result',
+        approveNode: 'Approval Node',
+        approveForm: 'Approval Form',
+        approveResult: 'Approval Result',
+        approvalRemark: 'Approval Comments',
+        approver: 'Approver',
         audit: 'Audit',
-        procinstStatus: 'Process status',
-        taskStatus: 'Task status',
+        procinstStatus: 'Process Status',
+        taskStatus: 'Task Status',
         taskName: 'Task Name',
-        taskBeginTime: 'Begin Time',
-        flowAudit: 'Approval Process',
-        notify: 'Notification',
+        taskBeginTime: 'Start Time',
+        flowAudit: 'Process Audit',
+        notify: 'Notify',
     },
 };
diff --git a/frontend/src/i18n/zh-cn/flow.ts b/frontend/src/i18n/zh-cn/flow.ts
index ed1a1bc4..fa4c494b 100644
--- a/frontend/src/i18n/zh-cn/flow.ts
+++ b/frontend/src/i18n/zh-cn/flow.ts
@@ -6,23 +6,23 @@ export default {
         triggeringCondition: '触发条件',
         triggeringConditionTips: 'go template语法。若输出结果为1，则表示触发该审批流程',
         conditionPlaceholder: '触发条件, 返回值=1, 则表示触发该审批流程',
-        conditionDefault: `{{/* DBMS-执行sql规则;  param参数描述如下 */}}
-{{/* stmtType: select / read / insert / update / delete / ddl ;  */}}
-{{ if eq .bizType "db_sql_exec_flow"}}
-   {{/* 不是select和read语句时，开启流程审批 */}}
-   {{ if and (ne .param.stmtType "select") (ne .param.stmtType "read") }}
+        conditionDefault: `{'{{'}/* DBMS-执行sql规则;  param参数描述如下 */{'}}'}
+{'{{'}/* stmtType: select / read / insert / update / delete / ddl ;  */{'}}'}
+{'{{'} if eq .bizType "db_sql_exec_flow"{'}}'}
+   {'{{'}/* 不是select和read语句时，开启流程审批 */{'}}'}
+   {'{{'} if and (ne .param.stmtType "select") (ne .param.stmtType "read"){'}}'}
        1
-   {{ end }}
-{{ end }}
+   {'{{'} end {'}}'}
+{'{{'} end {'}}'}
 
-{{/* Redis-执行命令规则;   param参数描述如下 */}}
-{{/* cmdType: read(读命令) / write(写命令);  */}}
-{{/* cmd: get/set/hset...等 */}}
-{{ if eq .bizType "redis_run_cmd_flow"}}
-   {{ if eq .param.cmdType "write" }}
+{'{{'}/* Redis-执行命令规则;   param参数描述如下 */{'}}'}
+{'{{'}/* cmdType: read(读命令) / write(写命令);  */{'}}'}
+{'{{'}/* cmd: get/set/hset...等 */{'}}'}
+{'{{'} if eq .bizType "redis_run_cmd_flow"{'}}'}
+   {'{{'} if eq .param.cmdType "write" {'}}'}
        1
-   {{ end }}
-{{ end }}`,
+   {'{{'} end {'}}'}
+{'{{'} end {'}}'}`,
         nodeName: '节点名称',
         nodeNameTips: '点击指定节点可进行拖拽排序',
         auditor: '审核人员',
@@ -32,6 +32,27 @@ export default {
         enable: '启用',
         disable: '禁用',
 
+        todoTask: '待办任务',
+        doneTask: '已办任务',
+        flowDesign: '流程设计',
+        clear: '清空',
+        approvalMode: '审批模式',
+        andSign: '会签',
+        orSign: '或签',
+        voteSign: '票签',
+        taskCandidate: '处理候选人',
+        mustOneStartNode: '流程必须要有一个开始节点',
+        mustOneEndNode: '流程必须要有一个结束节点',
+        mustOneOutEdgeForStartNode: '开始节点必须有出线',
+        mustOneInEdgeForEndNode: '结束节点必须有入线',
+        approvalRecord: '审批记录',
+        start: '开始',
+        end: '结束',
+        usertask: '用户任务',
+        serial: '互斥网关',
+        parallel: '并行网关',
+        flowEdge: '流程线',
+
         // procinst
         startProcess: '发起流程',
         cancelProcessConfirm: '确认取消该流程?',
@@ -57,7 +78,7 @@ export default {
         selectRedisPlaceholder: '请选择Redis实例与库',
         cmdPlaceholder: `如: SET 'key' 'value'; 多条命令;分割`,
         // ProcinstStatusEnum
-        active: '执行中',
+        active: '审批中',
         completed: '完成',
         suspended: '挂起',
         terminated: '终止',
@@ -83,10 +104,12 @@ export default {
         approveNode: '审批节点',
         approveForm: '审批表单',
         approveResult: '审批结果',
+        approvalRemark: '审批意见',
+        approver: '审批人',
         audit: '审核',
         procinstStatus: '流程状态',
         taskStatus: '任务状态',
-        taskName: '当前节点',
+        taskName: '任务名',
         taskBeginTime: '开始时间',
         flowAudit: '流程审批',
         notify: '通知',
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index af5265e6..ca21559b 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -9,7 +9,6 @@ import { registElSvgIcon } from '@/common/utils/svgIcons';
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
 import 'element-plus/theme-chalk/dark/css-vars.css';
-import { ElMessage } from 'element-plus';
 import { i18n } from '@/i18n/index';
 
 import 'splitpanes/dist/splitpanes.css';
@@ -31,12 +30,3 @@ app.use(pinia).use(router).use(i18n).use(ElementPlus, { size: getThemeConfig()?.
 
 // 屏蔽警告信息
 app.config.warnHandler = () => null;
-// 全局error处理
-app.config.errorHandler = function (err: any, vm, info) {
-    // 如果是断言错误，则进行提示即可
-    if (err.name == 'AssertError') {
-        ElMessage.error(err.message);
-    } else {
-        console.error(err, info);
-    }
-};
diff --git a/frontend/src/theme/dark.scss b/frontend/src/theme/dark.scss
index 6aef567f..5ed4e6f0 100644
--- a/frontend/src/theme/dark.scss
+++ b/frontend/src/theme/dark.scss
@@ -1,29 +1,29 @@
 html.dark {
     // 变量(自定义时，只需修改这里的值)
-	--next-bg-main: #1f1f1f;
-	--next-color-white: #ffffff;
-	--next-color-disabled: #191919;
-	--next-color-bar: #dadada;
-	--next-color-primary: #303030;
-	--next-border-color: #424242;
-	--next-border-black: #333333;
-	--next-border-columns: #2a2a2a;
-	--next-color-seting: #505050;
-	--next-text-color-regular: #9b9da1;
-	--next-text-color-placeholder: #7a7a7a;
-	--next-color-hover: #3c3c3c;
-	--next-color-hover-rgba: rgba(0, 0, 0, 0.3);
+    --next-bg-main: #1f1f1f;
+    --next-color-white: #ffffff;
+    --next-color-disabled: #191919;
+    --next-color-bar: #dadada;
+    --next-color-primary: #303030;
+    --next-border-color: #424242;
+    --next-border-black: #333333;
+    --next-border-columns: #2a2a2a;
+    --next-color-seting: #505050;
+    --next-text-color-regular: #9b9da1;
+    --next-text-color-placeholder: #7a7a7a;
+    --next-color-hover: #3c3c3c;
+    --next-color-hover-rgba: rgba(0, 0, 0, 0.3);
 
     /* 自定义深色背景颜色 */
     // root
-	--bg-main-color: var(--next-bg-main) !important;
-	--bg-topBar: var(--next-color-disabled) !important;
-	--bg-topBarColor: var(--next-color-bar) !important;
-	--bg-menuBar: var(--next-color-disabled) !important;
-	--bg-menuBarColor: var(--next-color-bar) !important;
-	--bg-menuBarActiveColor: var(--next-color-hover-rgba) !important;
-	--bg-columnsMenuBar: var(--next-color-disabled) !important;
-	--bg-columnsMenuBarColor: var(--next-color-bar) !important;
+    --bg-main-color: var(--next-bg-main) !important;
+    --bg-topBar: var(--next-color-disabled) !important;
+    --bg-topBarColor: var(--next-color-bar) !important;
+    --bg-menuBar: var(--next-color-disabled) !important;
+    --bg-menuBarColor: var(--next-color-bar) !important;
+    --bg-menuBarActiveColor: var(--next-color-hover-rgba) !important;
+    --bg-columnsMenuBar: var(--next-color-disabled) !important;
+    --bg-columnsMenuBarColor: var(--next-color-bar) !important;
 
     --tagsview3-active-background-color: var(--next-color-hover);
-  }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/frontend/src/theme/element.scss b/frontend/src/theme/element.scss
index 2ff80a8b..dc589b90 100644
--- a/frontend/src/theme/element.scss
+++ b/frontend/src/theme/element.scss
@@ -10,27 +10,6 @@
     max-height: 280px !important;
 }
 
-/* Form 表单
-------------------------------- */
-// .el-form {
-
-//     // 修复行内表单最后一个 el-form-item 位置下移问题
-//     &.el-form--inline {
-//         .el-form-item--large.el-form-item:last-of-type {
-//             margin-bottom: 22px !important;
-//         }
-
-//         .el-form-item--default.el-form-item:last-of-type,
-//         .el-form-item--small.el-form-item:last-of-type {
-//             margin-bottom: 18px !important;
-//         }
-//     }
-
-
-//     .el-form-item .el-form-item__label .el-icon {
-//         margin-right: 0px;
-//     }
-// }
 
 /* Alert 警告
 ------------------------------- */
@@ -239,36 +218,6 @@ $menuHeight: 46px !important;
     }
 }
 
-/* Dialog 对话框
-------------------------------- */
-.el-overlay {
-    overflow: hidden;
-
-    .el-overlay-dialog {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        position: unset !important;
-        width: 100%;
-        height: 100%;
-
-        .el-dialog {
-            margin: 0 auto !important;
-            position: absolute;
-
-            .el-dialog__body {
-                padding: 20px !important;
-            }
-        }
-    }
-}
-
-.el-dialog__body {
-    max-height: calc(90vh - 111px) !important;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
 /* Card 卡片
 ------------------------------- */
 .el-card__header {
diff --git a/frontend/src/views/flow/ProcInstEdit.vue b/frontend/src/views/flow/ProcInstEdit.vue
index e0772396..b1b54c5f 100755
--- a/frontend/src/views/flow/ProcInstEdit.vue
+++ b/frontend/src/views/flow/ProcInstEdit.vue
@@ -28,7 +28,7 @@
             <span v-if="flowProcdef || !state.form.procdefId">
                 <el-divider content-position="left">{{ $t('flow.approvalNode') }}</el-divider>
 
-                <ProcdefTasks v-if="flowProcdef" :procdef="flowProcdef" />
+                <FlowDesign height="300px" v-if="flowProcdef" :data="flowProcdef.flowDef" disabled center />
 
                 <el-result v-if="!state.form.procdefId" icon="error" :title="$t('flow.approvalNodeNotExist')" :sub-title="$t('flow.resourceNotExistFlow')">
                 </el-result>
@@ -51,10 +51,10 @@ import { ElMessage } from 'element-plus';
 import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
 import { FlowBizType } from './enums';
 import EnumSelect from '@/components/enumselect/EnumSelect.vue';
-import ProcdefTasks from './components/ProcdefTasks.vue';
 import RedisRunCmdFlowBizForm from './flowbiz/redis/RedisRunCmdFlowBizForm.vue';
 import { useI18n } from 'vue-i18n';
 import { Rules } from '@/common/rule';
+import FlowDesign from './components/flowdesign/FlowDesign.vue';
 
 const DbSqlExecFlowBizForm = defineAsyncComponent(() => import('./flowbiz/dbms/DbSqlExecFlowBizForm.vue'));
 
diff --git a/frontend/src/views/flow/ProcdefEdit.vue b/frontend/src/views/flow/ProcdefEdit.vue
index b91ee27c..9c2e114c 100755
--- a/frontend/src/views/flow/ProcdefEdit.vue
+++ b/frontend/src/views/flow/ProcdefEdit.vue
@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-drawer @open="initSort" :title="title" v-model="visible" :before-close="cancel" :destroy-on-close="true" :close-on-click-modal="false" size="40%">
+        <el-drawer :title="title" v-model="visible" :before-close="onCancel" :destroy-on-close="true" :close-on-click-modal="false" size="40%">
             <template #header>
-                <DrawerHeader :header="title" :back="cancel" />
+                <DrawerHeader :header="title" :back="onCancel" />
             </template>
 
             <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
@@ -38,45 +38,12 @@
                 <el-form-item ref="tagSelectRef" prop="codePaths" :label="$t('tag.relateTag')">
                     <tag-tree-check height="300px" v-model="form.codePaths" :tag-type="[TagResourceTypePath.Db, TagResourceTypeEnum.Redis.value]" />
                 </el-form-item>
-
-                <el-divider content-position="left">{{ $t('flow.approvalNode') }}</el-divider>
-
-                <el-table ref="taskTableRef" :data="tasks" row-key="taskKey" stripe style="width: 100%">
-                    <el-table-column prop="name" min-width="100px">
-                        <template #header>
-                            <el-button class="ml0" type="primary" circle size="small" icon="Plus" @click="addTask()"> </el-button>
-                            <span class="ml-2">{{ $t('flow.nodeName') }}<span class="ml-1" style="color: red">*</span></span>
-                            <el-tooltip :content="$t('flow.nodeNameTips')" placement="top">
-                                <SvgIcon class="ml-1" name="question-filled" />
-                            </el-tooltip>
-                        </template>
-                        <template #default="scope">
-                            <el-input v-model="scope.row.name"> </el-input>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column prop="userId" min-width="150px" show-overflow-tooltip>
-                        <template #header>
-                            <span class="ml-2">{{ $t('flow.auditor') }}<span class="ml-1" style="color: red">*</span></span>
-                        </template>
-
-                        <template #default="scope">
-                            <AccountSelectFormItem style="margin-bottom: 0px" v-model="scope.row.userId" label="" />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column :label="$t('common.operation')" width="110px">
-                        <template #default="scope">
-                            <el-link @click="deleteTask(scope.$index)" class="ml-1" type="danger" icon="delete" plain></el-link>
-                        </template>
-                    </el-table-column>
-                </el-table>
             </el-form>
 
             <template #footer>
                 <div>
-                    <el-button @click="cancel()">{{ $t('common.cancel') }}</el-button>
-                    <el-button type="primary" :loading="saveBtnLoading" @click="btnOk">{{ $t('common.confirm') }}</el-button>
+                    <el-button @click="onCancel()">{{ $t('common.cancel') }}</el-button>
+                    <el-button type="primary" :loading="saveBtnLoading" @click="onSave">{{ $t('common.confirm') }}</el-button>
                 </div>
             </template>
         </el-drawer>
@@ -84,13 +51,9 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, watch, ref, nextTick } from 'vue';
+import { toRefs, reactive, watch, ref } from 'vue';
 import { procdefApi } from './api';
-import { ElMessage } from 'element-plus';
 import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
-import AccountSelectFormItem from '@/views/system/account/components/AccountSelectFormItem.vue';
-import Sortable from 'sortablejs';
-import { randomUuid } from '../../common/utils/string';
 import { ProcdefStatus } from './enums';
 import TagTreeCheck from '../ops/component/TagTreeCheck.vue';
 import { TagResourceTypeEnum, TagResourceTypePath } from '@/common/commonEnum';
@@ -118,7 +81,6 @@ const visible = defineModel<boolean>('visible', { default: false });
 const emit = defineEmits(['cancel', 'val-change']);
 
 const formRef: any = ref(null);
-const taskTableRef: any = ref(null);
 
 const rules = {
     name: [Rules.requiredInput('common.name')],
@@ -135,14 +97,11 @@ const state = reactive({
         condition: '',
         remark: null,
         msgTmplId: null,
-        // 流程的审批节点任务
-        tasks: '',
         codePaths: [],
     },
-    sortable: '' as any,
 });
 
-const { form, tasks } = toRefs(state);
+const { form } = toRefs(state);
 
 const { isFetching: saveBtnLoading, execute: saveFlowDefExec } = procdefApi.save.useApi(form);
 
@@ -150,11 +109,6 @@ watch(props, async (newValue: any) => {
     if (newValue.data) {
         state.form = await procdefApi.detail.request({ id: newValue.data.id });
         state.form.codePaths = newValue.data.tags?.map((tag: any) => tag.codePath);
-        const tasks = JSON.parse(state.form.tasks);
-        tasks.forEach((t: any) => {
-            t.userId = Number.parseInt(t.userId);
-        });
-        state.tasks = tasks;
     } else {
         state.form = { status: ProcdefStatus.Enable.value } as any;
         state.form.condition = t('flow.conditionDefault');
@@ -162,37 +116,8 @@ watch(props, async (newValue: any) => {
     }
 });
 
-const initSort = () => {
-    nextTick(() => {
-        const table = taskTableRef.value.$el.querySelector('table > tbody') as any;
-        state.sortable = Sortable.create(table, {
-            animation: 200,
-            //拖拽结束事件
-            onEnd: (evt) => {
-                const curRow = state.tasks.splice(evt.oldIndex, 1)[0];
-                state.tasks.splice(evt.newIndex, 0, curRow);
-            },
-        });
-    });
-};
-
-const addTask = () => {
-    state.tasks.push({ taskKey: randomUuid() });
-};
-
-const deleteTask = (idx: any) => {
-    state.tasks.splice(idx, 1);
-};
-
-const btnOk = async () => {
+const onSave = async () => {
     await useI18nFormValidate(formRef);
-    const checkRes = checkTasks();
-    if (checkRes.err) {
-        ElMessage.error(checkRes.err);
-        return false;
-    }
-
-    state.form.tasks = JSON.stringify(checkRes.tasks);
     await saveFlowDefExec();
     useI18nSaveSuccessMsg();
     emit('val-change', state.form);
@@ -201,29 +126,7 @@ const btnOk = async () => {
     state.form = {} as any;
 };
 
-const checkTasks = () => {
-    if (state.tasks?.length == 0) {
-        return { err: t('flow.tasksNotEmpty') };
-    }
-
-    const tasks = [];
-    for (let i = 0; i < state.tasks.length; i++) {
-        const task = { ...state.tasks[i] };
-        if (!task.name || !task.userId) {
-            return { err: t('flow.tasksNoComplete', { index: i + 1 }) };
-        }
-        // 转为字符串(方便后续万一需要调整啥的)
-        task.userId = `${task.userId}`;
-        if (!task.taskKey) {
-            task.taskKey = randomUuid();
-        }
-        tasks.push(task);
-    }
-
-    return { tasks: tasks };
-};
-
-const cancel = () => {
+const onCancel = () => {
     visible.value = false;
     emit('cancel');
 };
diff --git a/frontend/src/views/flow/ProcdefList.vue b/frontend/src/views/flow/ProcdefList.vue
index ac48ca8c..292de432 100644
--- a/frontend/src/views/flow/ProcdefList.vue
+++ b/frontend/src/views/flow/ProcdefList.vue
@@ -10,36 +10,36 @@
             :columns="columns"
         >
             <template #tableHeader>
-                <el-button v-auth="perms.save" type="primary" icon="plus" @click="editFlowDef(false)">{{ $t('common.create') }}</el-button>
-                <el-button v-auth="perms.del" :disabled="state.selectionData.length < 1" @click="deleteProcdef()" type="danger" icon="delete">
+                <el-button v-auth="perms.save" type="primary" icon="plus" @click="onEditFlowDef(false)">{{ $t('common.create') }}</el-button>
+                <el-button v-auth="perms.del" :disabled="state.selectionData.length < 1" @click="onDeleteProcdef()" type="danger" icon="delete">
                     {{ $t('common.delete') }}
                 </el-button>
             </template>
 
-            <template #tasks="{ data }">
-                <el-link @click="showProcdefTasks(data)" icon="view" type="primary" :underline="false"> </el-link>
-            </template>
-
             <template #codePaths="{ data }">
-                <TagCodePath :path="data.tags?.map((tag: any) => tag.codePath)" />
+                <TagCodePath :path="data.tags" />
             </template>
 
             <template #action="{ data }">
-                <el-button link v-if="actionBtns[perms.save]" @click="editFlowDef(data)" type="primary">{{ $t('common.edit') }}</el-button>
+                <el-button link v-if="actionBtns[perms.save]" @click="onEditFlowDef(data)" type="primary">{{ $t('common.edit') }}</el-button>
+
+                <el-button link v-if="actionBtns[perms.save]" @click="onShowFlowDesign(data)" type="primary">{{ $t('flow.flowDesign') }}</el-button>
             </template>
         </page-table>
 
-        <el-dialog v-model="flowTasksDialog.visible" :title="flowTasksDialog.title">
-            <procdef-tasks :tasks="flowTasksDialog.tasks" />
-        </el-dialog>
-
-        <procdef-edit v-model:visible="flowDefEditor.visible" :title="flowDefEditor.title" v-model:data="flowDefEditor.data" @val-change="valChange()" />
+        <procdef-edit v-model:visible="flowDefEditor.visible" :title="flowDefEditor.title" v-model:data="flowDefEditor.data" @val-change="handleValChange()" />
+        <FlowDesignDrawer
+            :disabled="flowDesignEditor.disabled"
+            v-model:visible="flowDesignEditor.visible"
+            :data="flowDesignEditor.data"
+            @save="onSaveFlowDesign"
+        />
     </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, toRefs, reactive, onMounted, Ref } from 'vue';
-import { procdefApi } from './api';
+import { procdefApi, procinstApi } from './api';
 import PageTable from '@/components/pagetable/PageTable.vue';
 import { TableColumn } from '@/components/pagetable';
 import { hasPerms } from '@/components/auth/auth';
@@ -48,8 +48,9 @@ import ProcdefEdit from './ProcdefEdit.vue';
 import ProcdefTasks from './components/ProcdefTasks.vue';
 import { ProcdefStatus } from './enums';
 import TagCodePath from '../ops/component/TagCodePath.vue';
-import { useI18nCreateTitle, useI18nDeleteConfirm, useI18nDeleteSuccessMsg, useI18nEditTitle } from '@/hooks/useI18n';
+import { useI18nCreateTitle, useI18nDeleteConfirm, useI18nDeleteSuccessMsg, useI18nEditTitle, useI18nSaveSuccessMsg } from '@/hooks/useI18n';
 import { useI18n } from 'vue-i18n';
+import FlowDesignDrawer from './components/flowdesign/FlowDesignDrawer.vue';
 
 const { t } = useI18n();
 
@@ -64,7 +65,6 @@ const columns = [
     TableColumn.new('defKey', 'Key'),
     TableColumn.new('status', 'common.status').typeTag(ProcdefStatus),
     TableColumn.new('remark', 'common.remark'),
-    TableColumn.new('tasks', 'flow.approvalNode').isSlot().alignCenter().setMinWidth(60),
     TableColumn.new('codePaths', 'tag.relateTag').isSlot().setMinWidth('250px'),
     TableColumn.new('creator', 'common.creator'),
     TableColumn.new('createTime', 'common.createTime').isTime(),
@@ -93,14 +93,16 @@ const state = reactive({
         visible: false,
         data: null as any,
     },
-    flowTasksDialog: {
+    flowDesignEditor: {
         title: '',
+        disabled: false,
         visible: false,
-        tasks: '',
+        procdefId: 0,
+        data: null as any,
     },
 });
 
-const { selectionData, query, flowDefEditor, flowTasksDialog } = toRefs(state);
+const { selectionData, query, flowDefEditor, flowDesignEditor } = toRefs(state);
 
 onMounted(() => {
     if (Object.keys(actionBtns).length > 0) {
@@ -112,13 +114,7 @@ const search = async () => {
     pageTableRef.value.search();
 };
 
-const showProcdefTasks = (procdef: any) => {
-    state.flowTasksDialog.tasks = procdef.tasks;
-    state.flowTasksDialog.title = procdef.name + ' - ' + t('flow.approvalNode');
-    state.flowTasksDialog.visible = true;
-};
-
-const editFlowDef = (data: any) => {
+const onEditFlowDef = (data: any) => {
     if (!data) {
         state.flowDefEditor.data = null;
         state.flowDefEditor.title = useI18nCreateTitle('flow.procdef');
@@ -129,12 +125,12 @@ const editFlowDef = (data: any) => {
     state.flowDefEditor.visible = true;
 };
 
-const valChange = () => {
+const handleValChange = () => {
     state.flowDefEditor.visible = false;
     search();
 };
 
-const deleteProcdef = async () => {
+const onDeleteProcdef = async () => {
     try {
         await useI18nDeleteConfirm(state.selectionData.map((x: any) => x.name).join(', '));
         await procdefApi.del.request({ id: state.selectionData.map((x: any) => x.id).join(',') });
@@ -144,5 +140,18 @@ const deleteProcdef = async () => {
         //
     }
 };
+
+const onShowFlowDesign = async (data: any) => {
+    state.flowDesignEditor.procdefId = data.id;
+    state.flowDesignEditor.data = await procdefApi.flowDef.request({ id: data.id });
+    state.flowDesignEditor.title = t('flow.procDesign');
+    state.flowDesignEditor.visible = true;
+};
+
+const onSaveFlowDesign = async (data: any) => {
+    await procdefApi.saveFlowDef.request({ id: state.flowDesignEditor.procdefId, flow: data });
+    useI18nSaveSuccessMsg();
+    state.flowDesignEditor.visible = false;
+};
 </script>
 <style lang="scss"></style>
diff --git a/frontend/src/views/flow/ProcinstDetail.vue b/frontend/src/views/flow/ProcinstDetail.vue
index ffe1a7ba..bb285e49 100755
--- a/frontend/src/views/flow/ProcinstDetail.vue
+++ b/frontend/src/views/flow/ProcinstDetail.vue
@@ -1,6 +1,14 @@
 <template>
     <div>
-        <el-drawer :title="props.title" v-model="visible" :before-close="cancel" size="50%" :close-on-click-modal="!props.instTaskId">
+        <el-drawer
+            :title="props.title"
+            v-model="visible"
+            :before-close="cancel"
+            size="50%"
+            body-class="!p-2"
+            header-class="!mb-2"
+            :close-on-click-modal="!props.instTaskId"
+        >
             <template #header>
                 <DrawerHeader :header="title" :back="cancel" />
             </template>
@@ -13,7 +21,7 @@
                         <enum-tag :enums="FlowBizType" :value="procinst.bizType"></enum-tag>
                     </el-descriptions-item>
                     <el-descriptions-item :span="1" :label="$t('flow.initiator')">
-                        <AccountInfo :account-id="procinst.creatorId" :username="procinst.creator" />
+                        <AccountInfo :username="procinst.creator" />
                     </el-descriptions-item>
 
                     <el-descriptions-item :span="1" :label="$t('flow.procinstStatus')">
@@ -35,11 +43,6 @@
                 </el-descriptions>
             </div>
 
-            <div>
-                <el-divider content-position="left">{{ $t('flow.approveNode') }}</el-divider>
-                <procdef-tasks :tasks="procinst?.procdef?.tasks" :procinst-tasks="procinst.procinstTasks" />
-            </div>
-
             <div>
                 <el-divider content-position="left">{{ $t('flow.bizInfo') }}</el-divider>
                 <component v-if="procinst.bizType" ref="keyValueRef" :is="bizComponents[procinst.bizType]" :procinst="procinst"> </component>
@@ -61,11 +64,14 @@
                 </el-form>
             </div>
 
+            <div v-if="flowDef">
+                <el-divider content-position="left">{{ $t('flow.approveNode') }}</el-divider>
+                <FlowDesign height="300px" disabled center :data="flowDef" />
+            </div>
+
             <template #footer v-if="props.instTaskId">
-                <div>
-                    <el-button @click="cancel()">{{ $t('common.cancel') }}</el-button>
-                    <el-button type="primary" :loading="saveBtnLoading" @click="btnOk">{{ $t('common.confirm') }}</el-button>
-                </div>
+                <el-button @click="cancel()">{{ $t('common.cancel') }}</el-button>
+                <el-button type="primary" :loading="saveBtnLoading" @click="btnOk">{{ $t('common.confirm') }}</el-button>
             </template>
         </el-drawer>
     </div>
@@ -73,15 +79,15 @@
 
 <script lang="ts" setup>
 import { toRefs, reactive, watch, defineAsyncComponent, shallowReactive } from 'vue';
-import { procinstApi } from './api';
+import { procinstApi, procinstTaskApi } from './api';
 import { ElMessage } from 'element-plus';
 import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
 import { FlowBizType, ProcinstBizStatus, ProcinstTaskStatus, ProcinstStatus } from './enums';
-import ProcdefTasks from './components/ProcdefTasks.vue';
 import { formatTime } from '@/common/utils/format';
 import EnumTag from '@/components/enumtag/EnumTag.vue';
 import AccountInfo from '@/views/system/account/components/AccountInfo.vue';
 import { formatDate } from '@/common/utils/format';
+import FlowDesign from './components/flowdesign/FlowDesign.vue';
 
 const DbSqlExecBiz = defineAsyncComponent(() => import('./flowbiz/dbms/DbSqlExecBiz.vue'));
 const RedisRunCmdBiz = defineAsyncComponent(() => import('./flowbiz/redis/RedisRunCmdBiz.vue'));
@@ -112,6 +118,7 @@ const bizComponents: any = shallowReactive({
 
 const state = reactive({
     procinst: {} as any,
+    flowDef: null as any,
     tasks: [] as any,
     form: {
         status: ProcinstTaskStatus.Pass.value,
@@ -121,26 +128,66 @@ const state = reactive({
     sortable: '' as any,
 });
 
-const { procinst, form, saveBtnLoading } = toRefs(state);
+const { procinst, flowDef, form, saveBtnLoading } = toRefs(state);
 
 watch(
     () => props.procinstId,
     async (newValue: any) => {
-        if (newValue) {
-            state.procinst = await procinstApi.detail.request({ id: newValue });
-        } else {
+        if (!newValue) {
             state.procinst = {};
+            state.flowDef = null;
+            return;
         }
+
+        state.procinst = await procinstApi.detail.request({ id: newValue });
+
+        const flowdef = JSON.parse(state.procinst.flowDef);
+        procinstApi.hisOp.request({ id: newValue }).then((res: any) => {
+            const nodeKey2Ops = res.reduce(
+                (acc: { [x: string]: any[] }, item: { nodeKey: any }) => {
+                    const key = item.nodeKey;
+                    if (!acc[key]) {
+                        acc[key] = [];
+                    }
+                    acc[key].push(item);
+                    return acc;
+                },
+                {} as Record<string, typeof res>
+            );
+
+            const nodeKey2Tasks = state.procinst.procinstTasks.reduce(
+                (acc: { [x: string]: any[] }, item: { nodeKey: any }) => {
+                    const key = item.nodeKey;
+                    if (!acc[key]) {
+                        acc[key] = [];
+                    }
+                    acc[key].push(item);
+                    return acc;
+                },
+                {} as Record<string, typeof res>
+            );
+
+            flowdef.nodes.forEach((node: any) => {
+                const key = node.key;
+                if (nodeKey2Ops[key]) {
+                    // 将操作记录挂载到 node 下，例如命名为 historyList
+                    node.extra.opLog = nodeKey2Ops[key][0];
+                    node.extra.tasks = nodeKey2Tasks[key];
+                }
+            });
+
+            state.flowDef = flowdef;
+        });
     }
 );
 
 const btnOk = async () => {
     const status = state.form.status;
-    let api = procinstApi.completeTask;
+    let api = procinstTaskApi.passTask;
     if (status === ProcinstTaskStatus.Back.value) {
-        api = procinstApi.backTask;
+        api = procinstTaskApi.backTask;
     } else if (status === ProcinstTaskStatus.Reject.value) {
-        api = procinstApi.rejectTask;
+        api = procinstTaskApi.rejectTask;
     }
 
     try {
diff --git a/frontend/src/views/flow/ProcinstTaskList.vue b/frontend/src/views/flow/ProcinstTaskList.vue
index 7aa3b0cf..88a2dcde 100644
--- a/frontend/src/views/flow/ProcinstTaskList.vue
+++ b/frontend/src/views/flow/ProcinstTaskList.vue
@@ -1,39 +1,66 @@
 <template>
-    <div class="h-full">
-        <page-table
-            ref="pageTableRef"
-            :page-api="procinstApi.tasks"
-            :search-items="searchItems"
-            v-model:query-form="query"
-            v-model:selection-data="selectionData"
-            :columns="columns"
-        >
-            <template #tableHeader>
-                <!-- <el-button v-auth="perms.addAccount" type="primary" icon="plus" @click="editFlowDef(false)">添加</el-button> -->
-            </template>
+    <div class="h-full card !p-2">
+        <el-tabs v-model="activeTabName" @tab-change="onTaskTabChange" class="h-full">
+            <el-tab-pane :label="$t('flow.todoTask')" :name="todoTabName" class="h-full">
+                <div class="h-full">
+                    <page-table
+                        ref="todoPageTableRef"
+                        :page-api="procinstTaskApi.tasks"
+                        :search-items="todoSearchItems"
+                        v-model:query-form="todoQuery"
+                        v-model:selection-data="selectionData"
+                        :columns="todoColumns"
+                    >
+                        <template #tableHeader>
+                            <!-- <el-button v-auth="perms.addAccount" type="primary" icon="plus" @click="editFlowDef(false)">添加</el-button> -->
+                        </template>
 
-            <template #action="{ data }">
-                <el-button link @click="showProcinst(data, false)" type="primary">{{ $t('common.detail') }}</el-button>
-                <el-button v-if="data.status == ProcinstTaskStatus.Process.value" link @click="showProcinst(data, true)" type="primary">
-                    {{ $t('flow.audit') }}
-                </el-button>
-            </template>
-        </page-table>
+                        <template #action="{ data }">
+                            <el-button link @click="onShowProcinst(data, false)" type="primary">{{ $t('common.detail') }}</el-button>
+                            <el-button v-if="data.status == ProcinstTaskStatus.Process.value" link @click="onShowProcinst(data, true)" type="primary">
+                                {{ $t('flow.audit') }}
+                            </el-button>
+                        </template>
+                    </page-table>
+                </div>
+            </el-tab-pane>
+
+            <el-tab-pane :label="$t('flow.doneTask')" :name="doneTabName" class="h-full">
+                <div class="h-full">
+                    <page-table
+                        ref="donePageTableRef"
+                        :page-api="procinstTaskApi.tasks"
+                        :search-items="searchItems"
+                        v-model:query-form="query"
+                        v-model:selection-data="selectionData"
+                        :columns="columns"
+                    >
+                        <template #tableHeader>
+                            <!-- <el-button v-auth="perms.addAccount" type="primary" icon="plus" @click="editFlowDef(false)">添加</el-button> -->
+                        </template>
+
+                        <template #action="{ data }">
+                            <el-button link @click="onShowProcinst(data, false)" type="primary">{{ $t('common.detail') }}</el-button>
+                        </template>
+                    </page-table>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
 
         <ProcinstDetail
             v-model:visible="procinstDetail.visible"
             :title="procinstDetail.title"
             :procinst-id="procinstDetail.procinstId"
             :inst-task-id="procinstDetail.instTaskId"
-            @val-change="valChange()"
+            @val-change="onValChange()"
             @cancel="procinstDetail.procinstId = 0"
         />
     </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, toRefs, reactive, Ref } from 'vue';
-import { procinstApi } from './api';
+import { ref, toRefs, reactive, Ref, useTemplateRef } from 'vue';
+import { procinstTaskApi } from './api';
 import PageTable from '@/components/pagetable/PageTable.vue';
 import { TableColumn } from '@/components/pagetable';
 import { SearchItem } from '@/components/SearchForm';
@@ -45,11 +72,28 @@ import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 
+const todoSearchItems = [SearchItem.input('bizKey', 'flow.bizKey'), SearchItem.select('bizType', 'flow.bizType').withEnum(FlowBizType)];
+
+const todoColumns = [
+    TableColumn.new('procinst.bizType', 'flow.bizType').typeTag(FlowBizType),
+    TableColumn.new('procinst.remark', 'common.remark'),
+    TableColumn.new('procinst.creator', 'flow.initiator'),
+    TableColumn.new('procinst.status', 'flow.procinstStatus').typeTag(ProcinstStatus),
+    TableColumn.new('status', 'flow.taskStatus').typeTag(ProcinstTaskStatus),
+    TableColumn.new('procinst.bizKey', 'flow.bizKey'),
+    TableColumn.new('procinst.procdefName', 'flow.procdefName'),
+    TableColumn.new('procinst.createTime', 'flow.startingTime').isTime(),
+    TableColumn.new('nodeName', 'flow.taskName'),
+    TableColumn.new('createTime', 'flow.taskBeginTime').isTime(),
+    TableColumn.new('action', 'common.operation').isSlot().fixedRight().setMinWidth(160).noShowOverflowTooltip().alignCenter(),
+];
+
 const searchItems = [
     SearchItem.select('status', 'common.status').withEnum(ProcinstTaskStatus),
     SearchItem.input('bizKey', 'flow.bizKey'),
     SearchItem.select('bizType', 'flow.bizType').withEnum(FlowBizType),
 ];
+
 const columns = [
     TableColumn.new('procinst.bizType', 'flow.bizType').typeTag(FlowBizType),
     TableColumn.new('procinst.remark', 'common.remark'),
@@ -58,8 +102,8 @@ const columns = [
     TableColumn.new('status', 'flow.taskStatus').typeTag(ProcinstTaskStatus),
     TableColumn.new('procinst.bizKey', 'flow.bizKey'),
     TableColumn.new('procinst.procdefName', 'flow.procdefName'),
-    TableColumn.new('taskName', 'flow.taskName'),
     TableColumn.new('procinst.createTime', 'flow.startingTime').isTime(),
+    TableColumn.new('nodeName', 'flow.taskName'),
     TableColumn.new('createTime', 'flow.taskBeginTime').isTime(),
     TableColumn.new('endTime', 'flow.endTime').isTime(),
     TableColumn.new('duration', 'flow.duration').setFormatFunc((data: any, prop: string) => {
@@ -69,10 +113,18 @@ const columns = [
         }
         return formatTime(duration);
     }),
-    TableColumn.new('action', 'common.operation').isSlot().fixedRight().setMinWidth(160).noShowOverflowTooltip().alignCenter(),
+    TableColumn.new('remark', 'flow.approvalRemark'),
+    TableColumn.new('action', 'common.operation').isSlot().fixedRight().setMinWidth(80).noShowOverflowTooltip().alignCenter(),
 ];
 
-const pageTableRef: Ref<any> = ref(null);
+const todoTabName = 'todo';
+const doneTabName = 'done';
+
+const activeTabName = ref(todoTabName);
+
+const todoPageTableRef: Ref<any> = useTemplateRef('todoPageTableRef');
+const donePageTableRef: Ref<any> = useTemplateRef('donePageTableRef');
+
 const state = reactive({
     /**
      * 选中的数据
@@ -82,6 +134,12 @@ const state = reactive({
      * 查询条件
      */
     query: {
+        status: null,
+        bizType: '',
+        pageNum: 1,
+        pageSize: 0,
+    },
+    todoQuery: {
         status: ProcinstTaskStatus.Process.value,
         bizType: '',
         pageNum: 1,
@@ -95,13 +153,21 @@ const state = reactive({
     },
 });
 
-const { selectionData, query, procinstDetail } = toRefs(state);
+const { selectionData, query, todoQuery, procinstDetail } = toRefs(state);
 
-const search = async () => {
-    pageTableRef.value.search();
+const todoSearch = async () => {
+    todoPageTableRef.value.search();
 };
 
-const showProcinst = (data: any, audit: boolean) => {
+const onTaskTabChange = (activeName: string) => {
+    if (activeName === todoTabName) {
+        todoPageTableRef.value.search();
+    } else {
+        donePageTableRef.value.search();
+    }
+};
+
+const onShowProcinst = (data: any, audit: boolean) => {
     state.procinstDetail.procinstId = data.procinstId;
     if (!audit) {
         state.procinstDetail.instTaskId = 0;
@@ -113,9 +179,9 @@ const showProcinst = (data: any, audit: boolean) => {
     state.procinstDetail.visible = true;
 };
 
-const valChange = () => {
+const onValChange = () => {
     state.procinstDetail.visible = false;
-    search();
+    todoSearch();
 };
 </script>
 <style lang="scss"></style>
diff --git a/frontend/src/views/flow/api.ts b/frontend/src/views/flow/api.ts
index 5dcb9d85..5e876ad1 100644
--- a/frontend/src/views/flow/api.ts
+++ b/frontend/src/views/flow/api.ts
@@ -3,8 +3,10 @@ import Api from '@/common/Api';
 export const procdefApi = {
     list: Api.newGet('/flow/procdefs'),
     detail: Api.newGet('/flow/procdefs/detail/{id}'),
+    flowDef: Api.newGet('/flow/procdefs/flowdef/{id}'),
     getByResource: Api.newGet('/flow/procdefs/{resourceType}/{resourceCode}'),
     save: Api.newPost('/flow/procdefs'),
+    saveFlowDef: Api.newPost('/flow/procdefs/flowdef'),
     del: Api.newDelete('/flow/procdefs/{id}'),
 };
 
@@ -13,8 +15,12 @@ export const procinstApi = {
     start: Api.newPost('/flow/procinsts/start'),
     detail: Api.newGet('/flow/procinsts/{id}'),
     cancel: Api.newPost('/flow/procinsts/{id}/cancel'),
+    hisOp: Api.newGet('/flow/his-procinsts-op/{id}'),
+};
+
+export const procinstTaskApi = {
     tasks: Api.newGet('/flow/procinsts/tasks'),
-    completeTask: Api.newPost('/flow/procinsts/tasks/complete'),
+    passTask: Api.newPost('/flow/procinsts/tasks/pass'),
     backTask: Api.newPost('/flow/procinsts/tasks/back'),
     rejectTask: Api.newPost('/flow/procinsts/tasks/reject'),
     save: Api.newPost('/flow/procdefs'),
diff --git a/frontend/src/views/flow/components/ProcdefTasks.vue b/frontend/src/views/flow/components/ProcdefTasks.vue
deleted file mode 100755
index 4bd14367..00000000
--- a/frontend/src/views/flow/components/ProcdefTasks.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-    <el-steps align-center :active="stepActive">
-        <el-step v-for="task in tasksArr" :status="getStepStatus(task)" :title="task.name" :key="task.taskKey">
-            <template #description>
-                <div>{{ `${task.accountUsername}(${task.accountName})` }}</div>
-                <div v-if="task.completeTime">{{ `${formatDate(task.completeTime)}` }}</div>
-                <div v-if="task.remark">{{ task.remark }}</div>
-            </template>
-        </el-step>
-    </el-steps>
-</template>
-
-<script lang="ts" setup>
-import { toRefs, reactive, watch, onMounted } from 'vue';
-import { accountApi } from '../../system/api';
-import { ProcinstTaskStatus } from '../enums';
-import { formatDate } from '@/common/utils/format';
-import { ElSteps, ElStep } from 'element-plus';
-
-const props = defineProps({
-    // 流程定义任务
-    tasks: {
-        type: [String, Object],
-    },
-    procdef: {
-        type: [Object],
-    },
-    // 流程实例任务列表
-    procinstTasks: {
-        type: [Array],
-    },
-});
-
-const state = reactive({
-    tasksArr: [] as any,
-    stepActive: 0,
-});
-
-const { tasksArr, stepActive } = toRefs(state);
-
-watch(
-    () => props.tasks,
-    (newValue: any) => {
-        parseTasks(newValue);
-    }
-);
-
-watch(
-    () => props.procinstTasks,
-    () => {
-        parseTasks(props.tasks);
-    }
-);
-
-watch(
-    () => props.procdef,
-    async (newValue: any) => {
-        if (newValue) {
-            parseTasksByKey(newValue);
-        }
-    }
-);
-
-onMounted(() => {
-    if (props.procdef) {
-        parseTasksByKey(props.procdef);
-        return;
-    }
-    parseTasks(props.tasks);
-});
-
-const parseTasksByKey = async (procdef: any) => {
-    parseTasks(procdef.tasks);
-};
-
-const parseTasks = async (tasksStr: any) => {
-    if (!tasksStr) return;
-    const tasks = JSON.parse(tasksStr);
-    const userIds = tasks.map((x: any) => x.userId);
-    const usersRes = await accountApi.querySimple.request({ ids: [...new Set(userIds)].join(','), pageSize: 50 });
-    const users = usersRes.list;
-    // 将数组转换为 Map 结构，以 id 为 key
-    const userMap = users.reduce((acc: any, obj: any) => {
-        acc.set(obj.id, obj);
-        return acc;
-    }, new Map());
-
-    // 流程实例任务（用于显示完成时间，完成到哪一步等）
-    let instTasksMap: any;
-    if (props.procinstTasks) {
-        state.stepActive = props.procinstTasks.length - 1;
-        instTasksMap = props.procinstTasks.reduce((acc: any, obj: any) => {
-            acc.set(obj.taskKey, obj);
-            return acc;
-        }, new Map());
-    }
-
-    for (let task of tasks) {
-        const user = userMap.get(Number.parseInt(task.userId));
-        task.accountUsername = user.username;
-        task.accountName = user.name;
-
-        // 存在实例任务，则赋值实例任务对应的完成时间和备注
-        const instTask = instTasksMap?.get(task.taskKey);
-        if (instTask) {
-            task.status = instTask.status;
-            task.completeTime = instTask.endTime;
-            task.remark = instTask.remark;
-        }
-    }
-
-    state.tasksArr = tasks;
-};
-
-const getStepStatus = (task: any): any => {
-    const taskStatus = task.status;
-    if (!taskStatus) {
-        return 'wait';
-    }
-
-    if (taskStatus == ProcinstTaskStatus.Pass.value) {
-        return 'success';
-    }
-    if (taskStatus == ProcinstTaskStatus.Process.value) {
-        return 'proccess';
-    }
-    if (taskStatus == ProcinstTaskStatus.Back.value || taskStatus == ProcinstTaskStatus.Reject.value) {
-        return 'error';
-    }
-
-    return 'wait';
-};
-</script>
-<style lang="scss"></style>
diff --git a/frontend/src/views/flow/components/flowdesign/FlowDesign.vue b/frontend/src/views/flow/components/flowdesign/FlowDesign.vue
new file mode 100644
index 00000000..287c4010
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/FlowDesign.vue
@@ -0,0 +1,281 @@
+<template>
+    <div :style="{ height: props.height }" class="flex flex-col" v-loading="saveing">
+        <div class="h-[100vh]" ref="flowContainerRef"></div>
+    </div>
+
+    <PropSettingDrawer
+        v-model:visible="propSettingEditor.visible"
+        :disabled="props.disabled"
+        :lf="lf"
+        :node="propSettingEditor.node"
+        :nodes="propSettingEditor.nodes"
+    ></PropSettingDrawer>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref, useTemplateRef, watch } from 'vue';
+import LogicFlow from '@logicflow/core';
+import '@logicflow/core/lib/style/index.css';
+import '@logicflow/extension/lib/style/index.css';
+import { Control, DndPanel, Menu, SelectionSelect } from '@logicflow/extension';
+import { initCustomNodes } from './node';
+import PropSettingDrawer from './node/PropSettingDrawer.vue';
+import { NodeTypeEnum } from './node/enums';
+import { isTrue } from '@/common/assert';
+import { useI18n } from 'vue-i18n';
+
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+
+const props = defineProps({
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    // 流程数据
+    data: {
+        type: [Object, String],
+    },
+    // 居中显示
+    center: {
+        type: Boolean,
+        default: false,
+    },
+    height: {
+        type: [Number, String],
+        default: '100%',
+    },
+});
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+
+const { t } = useI18n();
+
+const flowContainerRef = useTemplateRef('flowContainerRef');
+
+const emit = defineEmits(['save']);
+
+const propSettingEditor = ref({
+    visible: false,
+    node: {},
+    nodes: [],
+});
+
+const saveing = ref(false);
+
+let lf: LogicFlow;
+
+onMounted(() => {
+    LogicFlow.use(DndPanel);
+    LogicFlow.use(SelectionSelect);
+    LogicFlow.use(Control);
+    LogicFlow.use(Menu);
+
+    const isDark = themeConfig.value.isDark;
+
+    lf = new LogicFlow({
+        container: flowContainerRef.value as HTMLElement,
+        grid: true,
+        nodeTextEdit: false, // 节点文本不可编辑
+        edgeTextEdit: false, // 连线文本不可编辑
+        edgeType: NodeTypeEnum.Edge.value,
+        isSilentMode: props.disabled,
+        background: {
+            backgroundColor: isDark ? '#000000' : false,
+        },
+    });
+
+    if (isDark) {
+        lf.setTheme({
+            baseEdge: {
+                stroke: '#FFFFFF', // 连线颜色
+                strokeWidth: 2,
+            },
+        });
+    }
+
+    initCustomNodes(lf, props.disabled);
+    initControl();
+    initEvent();
+
+    // custom node -> logicflow node,userData由 lf.render(userData)传入
+    lf.adapterIn = function (userData: any) {
+        const nodes = userData.nodes?.map((node: any) => {
+            const extra = node.extra;
+            const lfNode = extra.lfNode;
+            extra.lfNode = null; // 置空节点信息
+            lfNode.properties = extra;
+            return lfNode;
+        });
+
+        const edges = userData.edges?.map((edge: any) => {
+            const extra = edge.extra;
+            const lfEdge = extra.lfEdge;
+            extra.lfEdge = null; // 置空连线信息
+            lfEdge.properties = extra;
+            return lfEdge;
+        });
+
+        // 这里把userData转换为LogicFlow支持的格式
+        return { nodes, edges };
+    };
+
+    // logicflow node -> custom node
+    lf.adapterOut = function (logicFlowData) {
+        const flowNodes = logicFlowData.nodes.map((node) => {
+            const nodeProps = node.properties;
+            node.properties = {};
+            const text = node.text;
+            return {
+                name: text instanceof Object ? text.value : text,
+                key: node.id,
+                type: node.type,
+                extra: { ...nodeProps, lfNode: node },
+            };
+        });
+
+        const flowEdges = logicFlowData.edges.map((edge) => {
+            const edgeProps = edge.properties;
+            edge.properties = {};
+            const text = edge.text || '';
+            return {
+                name: text instanceof Object ? text.value : text,
+                key: edge.id,
+                sourceNodeKey: edge.sourceNodeId,
+                targetNodeKey: edge.targetNodeId,
+                extra: { ...edgeProps, lfEdge: edge },
+            };
+        });
+
+        // 这里把LogicFlow生成的数据转换为后端需要的格式。
+        return { edges: flowEdges, nodes: flowNodes };
+    };
+
+    renderData(props.data);
+});
+
+watch(
+    () => props.data,
+    (data) => {
+        renderData(data);
+    }
+);
+
+const renderData = (data: any) => {
+    if (typeof data == 'string') {
+        data = JSON.parse(data);
+    }
+
+    lf.render(data || {});
+    if (props.center) {
+        lf.translateCenter();
+    }
+};
+
+const getLfExtension = (): any => {
+    return lf.extension;
+};
+
+/**
+ * 初始化控制面板
+ */
+function initControl() {
+    if (props.disabled) {
+        return;
+    }
+    const control = getLfExtension().control;
+    // 控制面板-清空画布
+    control.addItem({
+        iconClass: 'lf-control-clear',
+        title: 'clear',
+        text: t('flow.clear'),
+        onClick: (lf: LogicFlow, ev: any) => {
+            lf.clearData();
+        },
+    });
+    // 控制面板-保存
+    control.addItem({
+        iconClass: 'lf-control-save',
+        title: '',
+        text: t('common.save'),
+        onClick: async (lf: LogicFlow, ev: any) => {
+            validateFlow(lf.getGraphRawData());
+            try {
+                saveing.value = true;
+                let graphData = lf.getGraphData();
+                emit('save', graphData);
+            } finally {
+                saveing.value = false;
+            }
+        },
+    });
+}
+
+function validateFlow(rawData: LogicFlow.GraphData) {
+    // 提取节点和边
+    const nodes = rawData.nodes || [];
+    const edges = rawData.edges || [];
+
+    // 查找开始节点和结束节点
+    const startNodes = nodes.filter((node) => node.type === 'start');
+    const endNodes = nodes.filter((node) => node.type === 'end');
+
+    // 检查是否只有一个开始节点和结束节点
+    isTrue(startNodes.length == 1, 'flow.mustOneStartNode');
+    isTrue(endNodes.length == 1, 'flow.mustOneEndNode');
+
+    const startNode = startNodes[0];
+    const endNode = endNodes[0];
+
+    // 检查开始节点是否有出线
+
+    isTrue(
+        edges.some((edge) => edge.sourceNodeId === startNode.id),
+        'flow.mustOneOutEdgeForStartNode'
+    );
+
+    // 检查结束节点是否有入线
+    isTrue(
+        edges.some((edge) => edge.targetNodeId === endNode.id),
+        'flow.mustOneInEdgeForEndNode'
+    );
+}
+
+const initEvent = () => {
+    const { eventCenter } = lf.graphModel;
+    eventCenter.on('node:dbclick', (args: any) => {
+        propSettingEditor.value.node = args.data;
+        let graphData: any = lf.getGraphData();
+        propSettingEditor.value.nodes = graphData['nodes'];
+        propSettingEditor.value.visible = true;
+    });
+
+    eventCenter.on('edge:dbclick  ', (args: any) => {
+        propSettingEditor.value.node = args.data;
+        let graphData: any = lf.getGraphData();
+        propSettingEditor.value.nodes = graphData['edges'];
+        propSettingEditor.value.visible = true;
+    });
+
+    eventCenter.on('edge:add', (args: any) => {
+        // 调整边类型
+        // lf.changeEdgeType(args.data.id, NodeTypeEnum.Edge.value);
+        // lf.setProperties(args.data.id, {
+        //     condition: 'PASS',
+        // });
+    });
+
+    // eventCenter.on('blank:click', () => {
+    //     propSettingEditor.value.visible = false;
+    // });
+};
+</script>
+
+<style lang="scss">
+.lf-control-save {
+    background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODg5NTU4MjQ3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE1ODQ4IiB3aWR0aD0iNDgiIGhlaWdodD0iNDgiPjxwYXRoIGQ9Ik01NjMuOTM1NTQgMTIyLjYxMTM2OGE0OC42MDk2MTkgNDguNjA5NjE5IDAgMCAwLTQ3Ljk3MDAxOCA0OS4zMTMxNzl2MzAuNjM2ODUyYTQ4LjYwOTYxOSA0OC42MDk2MTkgMCAwIDAgNDcuOTcwMDE4IDQ5LjMxMzE3OWMyNi40Nzk0NSAwIDQ3Ljk3MDAxOS0yMi4xMzAxNjkgNDcuOTcwMDE5LTQ5LjMxMzE3OXYtMzAuNjM2ODUyYTQ4LjYwOTYxOSA0OC42MDk2MTkgMCAwIDAtNDcuOTcwMDE5LTQ5LjMxMzE3OXoiIGZpbGw9IiMwMzAwMDAiIHAtaWQ9IjE1ODQ5Ij48L3BhdGg+PHBhdGggZD0iTTk5MS43MDAxODcgMjc3LjI2NjcwOGMwLTIuMDQ2NzIxLTAuODk1NDQtMy44Mzc2MDEtMS4xNTEyOC01LjgyMDM2MmE0OC45Mjk0MTkgNDguOTI5NDE5IDAgMCAwLTEzLjYyMzQ4NS00MC45OTgzNzZsLTIxNS43MzcxNjUtMjE1LjY3MzIwNGE0OS4zNzcxMzkgNDkuMzc3MTM5IDAgMCAwLTM2LjA3MzQ1NC0xNC40NTQ5NjZjLTAuNTExNjggMC0wLjg5NTQ0LTAuMjU1ODQtMS4zNDMxNi0wLjI1NTg0aC0zOC4yNDgwOTVMNjg1LjMzMTY2OCAwbC0wLjQ0NzcyIDAuMDYzOTZIMzM5LjExNjA1MkwzMzguOTI0MTcyIDBIODEuNjEyOTkybC0wLjcwMzU2IDAuMTI3OTJMODAuMjY5ODMxIDBhNDYuNDk4OTM4IDQ2LjQ5ODkzOCAwIDAgMC0zMC40NDQ5NzIgMTIuMDI0NDg1Yy0wLjk1OTQgMC44OTU0NC0yLjMwMjU2MSAxLjM0MzE2MS0zLjE5ODAwMSAyLjMwMjU2MS0xLjA4NzMyIDEuMDIzMzYtMS41OTkwMDEgMi40OTQ0NDEtMi40OTQ0NDEgMy42NDU3MjFhNDUuODU5MzM4IDQ1Ljg1OTMzOCAwIDAgMC0xMS44MzI2MDQgMjkuOTk3MjUybDAuMTI3OTIgMC42Mzk2LTAuMTI3OTIgMC43MDM1NnY5MjQuNzM0MDQxbDAuMTI3OTIgMC44MzE0ODEtMC4xMjc5MiAwLjU3NTY0YzAgMTIuMDI0NDg1IDQuOTI0OTIyIDIyLjY0MTg0OSAxMi4zNDQyODQgMzAuOTU2NjUyIDAuNzAzNTYgMC44MzE0OCAxLjE1MTI4IDEuODU0ODQxIDEuODU0ODQxIDIuNjIyMzYxIDEuMjc5MiAxLjM0MzE2MSAyLjk0MjE2MSAxLjk4Mjc2MSA0LjM0OTI4MiAzLjEzNDA0MWE0Ny4wNzQ1NzggNDcuMDc0NTc4IDAgMCAwIDI5LjQyMTYxMSAxMS4xOTMwMDVsMC41NzU2NDEtMC4xMjc5MiAwLjU3NTY0IDAuMTI3OTJoODYxLjE1Nzc3NmwwLjYzOTYtMC4xMjc5MiAwLjUxMTY4MSAwLjEyNzkyYTQ2LjQzNDk3OCA0Ni40MzQ5NzggMCAwIDAgMjkuMzU3NjUxLTExLjI1Njk2NWMxLjM0MzE2MS0xLjE1MTI4IDMuMTM0MDQxLTEuNzkwODgxIDQuMzQ5MjgyLTMuMTM0MDQxIDAuNzY3NTItMC43Njc1MiAxLjIxNTI0LTEuNzkwODgxIDEuODU0ODQxLTIuNjIyMzYxYTQ2LjgxODczOCA0Ni44MTg3MzggMCAwIDAgMTIuMjgwMzI0LTMwLjk1NjY1MmwtMC4xMjc5Mi0wLjYzOTYgMC4xMjc5Mi0wLjc2NzUyMSAwLjEyNzkyLTY5Ni43MTY1NTJ6TTM4Ni43NjYyNzEgOTUuOTQwMDM3aDI1MC40Njc0NTh2MTkzLjIyMzIzNkgzODYuNzY2MjcxVjk1Ljk0MDAzN3ogbTM1Mi40ODM2OTggODMxLjQ4MDMyNUgyODQuODEzOTkxdi0yNTAuODUxMjE4bDYyLjIzMzEwNS02Mi4yMzMxMDRoMzI5LjkwNTgwOGw2Mi4yOTcwNjUgNjIuMzYxMDI0djI1MC43MjMyOTh6IG0xNTYuNTEwMTgxIDBoLTYwLjU3MDE0NHYtMjY3LjA5NzA2NGMwLTAuNjM5Ni0wLjMxOTgtMS4yNzkyLTAuMzgzNzYtMS43OTA4ODFhNDguODY1NDU5IDQ4Ljg2NTQ1OSAwIDAgMC0xNC4zOTEwMDYtMzYuMzkzMjU0bC04OS4wOTYzMTQtODguOTA0NDM1YTQ5LjMxMzE3OSA0OS4zMTMxNzkgMCAwIDAtMzYuMDA5NDk0LTE0LjQ1NDk2NWMtMC41NzU2NCAwLTEuMDg3MzItMC4zMTk4LTEuNTM1MDQxLTAuMzE5OEgzMzAuODY1MjA5Yy0wLjYzOTYgMC0xLjIxNTI0IDAuMzE5OC0xLjg1NDg0IDAuMzgzNzZhNDkuMjQ5MjE5IDQ5LjI0OTIxOSAwIDAgMC0zNi40NTcyMTUgMTQuMzI3MDQ1bC04OS4wMzIzNTQgODguOTY4Mzk1YTQ5Ljg4ODgxOSA0OS44ODg4MTkgMCAwIDAtMTQuMzI3MDQ2IDM2LjU4NTEzNGMwIDAuNTExNjgtMC4zMTk4IDEuMDIzMzYtMC4zMTk4IDEuNTk5MDAxVjkyNy40MjAzNjJIMTI4LjIzOTg1di04MzEuNDgwMzI1aDE2Mi41ODYzODR2MjM5Ljg1MDA5NGwwLjEyNzkyIDAuNzAzNTYtMC4xMjc5MiAwLjYzOTYwMWMwIDExLjY0MDcyNSA0Ljc5NzAwMiAyMS45MzgyODkgMTEuOTYwNTI0IDMwLjI1MzA5MiAwLjgzMTQ4IDEuMDg3MzIgMS4zNDMxNjEgMi40MzA0ODEgMi4zNjY1MjEgMy4zODk4ODEgMS4wMjMzNiAxLjAyMzM2IDIuMzAyNTYxIDEuNDcxMDgxIDMuMzg5ODgyIDIuMzY2NTIxYTQ2LjY5MDgxOCA0Ni42OTA4MTggMCAwIDAgMzAuMzE3MDUxIDExLjk2MDUyNGwwLjcwMzU2MS0wLjEyNzkyIDAuNTc1NjQgMC4xMjc5MmgzNDMuNjU3MjE0bDAuNzY3NTItMC4xMjc5MiAwLjcwMzU2MSAwLjEyNzkyYTQ2LjM3MTAxOCA0Ni4zNzEwMTggMCAwIDAgMzAuMzE3MDUyLTExLjk2MDUyNGMxLjE1MTI4LTAuODk1NDQgMi4zNjY1MjEtMS4zNDMxNjEgMy4zODk4ODEtMi4zNjY1MjEgMS4wODczMi0wLjk1OTQgMS40NzEwODEtMi4zNjY1MjEgMi4zNjY1MjEtMy4zODk4ODFhNDYuNjI2ODU4IDQ2LjYyNjg1OCAwIDAgMCAxMi4wMjQ0ODQtMzAuMjUzMDkybC0wLjEyNzkyLTAuNjM5NjAxIDAuMTI3OTItMC43MDM1NlYxMjIuNDE5NDg4TDg5NS43NjAxNSAyODQuOTQxOTExVjkyNy40MjAzNjJ6IiBmaWxsPSIjMDMwMDAwIiBwLWlkPSIxNTg1MCI+PC9wYXRoPjwvc3ZnPg==');
+}
+.lf-control-clear {
+    background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODg5NjY5MjU1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE5MzQ1IiB3aWR0aD0iNDgiIGhlaWdodD0iNDgiPjxwYXRoIGQ9Ik05NzcuMTg4NTcxIDIxOC42OTcxNDNINjU2LjgyMjg1N1Y0Ni44MTE0MjljMC0yNi4zMzE0MjktMjEuMjExNDI5LTQ2LjgxMTQyOS00Ni44MTE0MjgtNDYuODExNDI5SDQxMy45ODg1NzFjLTI1LjYgMC00Ni44MTE0MjkgMjAuNDgtNDYuODExNDI4IDQ2LjgxMTQyOXYxNzEuODg1NzE0SDQ2LjgxMTQyOWE0Ni4wOCA0Ni4wOCAwIDAgMC00Ni44MTE0MjkgNDYuMDh2MjE4LjY5NzE0M2MwIDI1LjYgMjAuNDggNDYuODExNDI5IDQ2LjgxMTQyOSA0Ni44MTE0MjhINzMuMTQyODU3djQ0Ny42MzQyODZjMCAyNS42IDIxLjIxMTQyOSA0Ni4wOCA0Ni44MTE0MjkgNDYuMDhIOTA0LjA0NTcxNGMyNS42IDAgNDYuODExNDI5LTIwLjQ4IDQ2LjgxMTQyOS00Ni44MTE0MjlWNTMwLjI4NTcxNGgyNy4wNjI4NTdjMjUuNiAwIDQ2LjgxMTQyOS0yMC40OCA0Ni44MTE0MjktNDYuODExNDI4VjI2NC43NzcxNDNhNDcuMTc3MTQzIDQ3LjE3NzE0MyAwIDAgMC00Ny41NDI4NTgtNDYuMDh6IG0tMTE5Ljk1NDI4NSA3MTIuNDExNDI4aC0xMDIuNHYtMTE5Ljk1NDI4NWMwLTI1LjYtMjAuNDgtNDYuODExNDI5LTQ2LjgxMTQyOS00Ni44MTE0MjktMjUuNiAwLTQ2LjgxMTQyOSAyMC40OC00Ni44MTE0MjggNDYuODExNDI5djExOS45NTQyODVoLTEwMi40di0xMTkuOTU0Mjg1YzAtMjUuNi0yMC40OC00Ni44MTE0MjktNDYuODExNDI5LTQ2LjgxMTQyOXMtNDYuODExNDI5IDIwLjQ4LTQ2LjgxMTQyOSA0Ni44MTE0Mjl2MTE5Ljk1NDI4NWgtMTAyLjR2LTExOS45NTQyODVjMC0yNS42LTIwLjQ4LTQ2LjgxMTQyOS00Ni44MTE0MjgtNDYuODExNDI5LTI1LjYgMC00Ni44MTE0MjkgMjAuNDgtNDYuODExNDI5IDQ2LjgxMTQyOXYxMTkuOTU0Mjg1aC0xMDIuNFY1MzIuNDhoNjkxLjJ2Mzk4LjYyODU3MXpNOTIuODkxNDI5IDMxMS41ODg1NzFoMzIxLjA5NzE0MmMyNS42IDAgNDYuODExNDI5LTIwLjQ4IDQ2LjgxMTQyOS00Ni44MTE0MjhWOTIuODkxNDI5aDEwMi40djE3MS44ODU3MTRjMCAyNS42IDIwLjQ4IDQ2LjgxMTQyOSA0Ni44MTE0MjkgNDYuODExNDI4aDMyMS4wOTcxNDJ2MTI1LjA3NDI4Nkg5Mi44OTE0MjlWMzExLjU4ODU3MXoiIGZpbGw9IiMzMzMzMzMiIHAtaWQ9IjE5MzQ2Ij48L3BhdGg+PC9zdmc+');
+}
+</style>
diff --git a/frontend/src/views/flow/components/flowdesign/FlowDesignDrawer.vue b/frontend/src/views/flow/components/flowdesign/FlowDesignDrawer.vue
new file mode 100644
index 00000000..023eea26
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/FlowDesignDrawer.vue
@@ -0,0 +1,46 @@
+<template>
+    <el-drawer
+        :title="title"
+        v-model="visible"
+        :before-close="cancel"
+        :destroy-on-close="true"
+        :close-on-click-modal="false"
+        size="80%"
+        body-class="!p-2"
+        header-class="!mb-2"
+    >
+        <template #header>
+            <DrawerHeader :header="title" :back="cancel" />
+        </template>
+
+        <FlowDesign :disabled="props.disabled" :data="props.data" @save="(data) => emit('save', data)" />
+    </el-drawer>
+</template>
+
+<script lang="ts" setup>
+import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
+import FlowDesign from './FlowDesign.vue';
+
+const props = defineProps({
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    data: {
+        type: [Object],
+    },
+    title: {
+        type: String,
+    },
+});
+
+const visible = defineModel<boolean>('visible', { default: false });
+
+const emit = defineEmits(['cancel', 'save']);
+
+const cancel = () => {
+    visible.value = false;
+    emit('cancel');
+};
+</script>
+<style lang="scss"></style>
diff --git a/frontend/src/views/flow/components/flowdesign/node/PropSettingDrawer.vue b/frontend/src/views/flow/components/flowdesign/node/PropSettingDrawer.vue
new file mode 100644
index 00000000..4cb90d57
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/PropSettingDrawer.vue
@@ -0,0 +1,108 @@
+<template>
+    <el-drawer
+        body-class="!pt-2"
+        header-class="!mb-2"
+        :title="title"
+        v-model="visible"
+        :before-close="onCancel"
+        :destroy-on-close="true"
+        :close-on-click-modal="false"
+        size="40%"
+    >
+        <template #header>
+            <DrawerHeader :header="title" :back="onCancel" />
+        </template>
+
+        <el-form ref="propSettingFormRef" :model="form" label-position="top" :disabled="props.disabled">
+            <el-form-item ref="nameRef" :label="$t('common.name')" :rules="[Rules.requiredInput('common.name')]">
+                <el-input v-model="name" clearable></el-input>
+            </el-form-item>
+
+            <component ref="formItemsRef" :is="getCustomNode(props.node.type)?.propSettingComp" v-model="form" :disabled="disabled" :nodes="nodes" :node="node">
+                <template v-slot:[key]="data" v-for="(item, key) in $slots">
+                    <slot :name="key" v-bind="data || {}"></slot>
+                </template>
+            </component>
+        </el-form>
+
+        <template #footer>
+            <el-button @click="onCancel()">{{ $t('common.cancel') }}</el-button>
+            <el-button v-if="!props.disabled" type="primary" @click="onConfirm">{{ $t('common.confirm') }}</el-button>
+        </template>
+    </el-drawer>
+</template>
+
+<script lang="ts" setup>
+import { watch, ref, useTemplateRef } from 'vue';
+import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
+import { useI18nFormValidate, useI18nPleaseInput } from '@/hooks/useI18n';
+import { Rules } from '@/common/rule';
+import LogicFlow from '@logicflow/core';
+import { getCustomNode } from '.';
+import { notEmpty } from '@/common/assert';
+
+const props = defineProps({
+    data: {
+        type: [Boolean, Object],
+    },
+    title: {
+        type: String,
+    },
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    node: {
+        type: Object,
+        default: {},
+    },
+    nodes: {
+        type: Array,
+        default: () => [],
+    },
+    lf: {
+        type: LogicFlow,
+        default: null,
+    },
+});
+
+const propSettingFormRef = useTemplateRef('propSettingFormRef');
+const formItemsRef: any = useTemplateRef('formItemsRef');
+
+const visible = defineModel<boolean>('visible', { default: false });
+
+// 节点名
+const name = ref('');
+
+// 节点props表单信息
+const form = ref({});
+
+watch(
+    () => props.node,
+    (n) => {
+        if (!n) {
+            return;
+        }
+        name.value = n.text instanceof Object ? n.text.value : n.text;
+        form.value = { ...n.properties };
+    }
+);
+
+const onConfirm = async () => {
+    notEmpty(name.value, useI18nPleaseInput('common.name'));
+    if (formItemsRef.value?.confirm) {
+        formItemsRef.value?.confirm();
+    }
+    await useI18nFormValidate(propSettingFormRef);
+    const nodeId = props.node.id;
+    // 更新流程节点上的文本内容
+    props.lf.updateText(nodeId, name.value);
+    props.lf.setProperties(nodeId, form.value);
+    onCancel();
+};
+
+const onCancel = () => {
+    visible.value = false;
+};
+</script>
+<style lang="scss"></style>
diff --git a/frontend/src/views/flow/components/flowdesign/node/edge/PropSetting.vue b/frontend/src/views/flow/components/flowdesign/node/edge/PropSetting.vue
new file mode 100644
index 00000000..ff381f69
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/edge/PropSetting.vue
@@ -0,0 +1,14 @@
+<template>
+    <!-- <el-tabs v-model="activeTabName">
+        <el-tab-pane :label="$t('common.basic')" :name="basic"> </el-tab-pane>
+    </el-tabs> -->
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const basicTabName = 'basic';
+
+const activeTabName = ref(basicTabName);
+
+const form = defineModel<any>('modelValue', { required: true });
+</script>
diff --git a/frontend/src/views/flow/components/flowdesign/node/edge/index.ts b/frontend/src/views/flow/components/flowdesign/node/edge/index.ts
new file mode 100644
index 00000000..112c3ab3
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/edge/index.ts
@@ -0,0 +1,49 @@
+import { BezierEdge, BezierEdgeModel, CircleNode, CircleNodeModel } from '@logicflow/core';
+import PropSetting from './PropSetting.vue';
+import { NodeTypeEnum } from '../enums';
+
+class EdgeModel extends BezierEdgeModel {
+    setAttributes() {
+        this.offset = 20;
+
+        const {
+            properties: { isExecuted },
+        } = this;
+
+        if (isExecuted) {
+            this.stroke = 'green';
+        }
+    }
+
+    getEdgeStyle() {
+        const style = super.getEdgeStyle();
+        const { properties } = this;
+        if (properties.isActived) {
+            style.strokeDasharray = '4 4';
+        }
+        return style;
+    }
+
+    /**
+     * 重写此方法，使保存数据是能带上锚点数据。
+     */
+    getData() {
+        const data = super.getData();
+        data.sourceAnchorId = this.sourceAnchorId;
+        data.targetAnchorId = this.targetAnchorId;
+        return data;
+    }
+}
+
+const nodeType = NodeTypeEnum.Edge;
+
+export default {
+    type: nodeType.value,
+    // 注册配置信息
+    registerConf: {
+        type: nodeType.value,
+        model: EdgeModel,
+        view: BezierEdge,
+    },
+    propSettingComp: PropSetting,
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/end/PropSetting.vue b/frontend/src/views/flow/components/flowdesign/node/end/PropSetting.vue
new file mode 100644
index 00000000..a24baf2e
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/end/PropSetting.vue
@@ -0,0 +1,12 @@
+<template>
+    <el-tabs v-model="activeTabName"> </el-tabs>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const basicTabName = 'basic';
+
+const activeTabName = ref(basicTabName);
+
+const form = defineModel<any>('modelValue', { required: true });
+</script>
diff --git a/frontend/src/views/flow/components/flowdesign/node/end/index.ts b/frontend/src/views/flow/components/flowdesign/node/end/index.ts
new file mode 100644
index 00000000..1ebdccea
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/end/index.ts
@@ -0,0 +1,55 @@
+import { CircleNode, CircleNodeModel } from '@logicflow/core';
+import PropSetting from './PropSetting.vue';
+import { NodeTypeEnum } from '../enums';
+import { HisProcinstOpState } from '@/views/flow/enums';
+
+class endModel extends CircleNodeModel {
+    initNodeData(data: any) {
+        super.initNodeData(data);
+        this.r = 20;
+    }
+
+    getNodeStyle() {
+        const style = super.getNodeStyle();
+        const properties = this.properties;
+
+        const opLog: any = properties.opLog;
+        if (!opLog) {
+            return style;
+        }
+
+        if (opLog.state == HisProcinstOpState.Completed.value) {
+            style.stroke = 'green';
+        } else if (opLog.state == HisProcinstOpState.Failed.value) {
+            style.stroke = 'red';
+        } else {
+            style.stroke = 'rgb(24, 125, 255)';
+        }
+
+        return style;
+    }
+}
+
+class endView extends CircleNode {}
+
+const nodeType = NodeTypeEnum.End;
+const nodeTypeExtra = nodeType.extra;
+
+export default {
+    order: 10,
+    type: nodeType.value,
+    // 注册配置信息
+    registerConf: {
+        type: nodeType.value,
+        model: endModel,
+        view: endView,
+    },
+    dndPanelConf: {
+        type: nodeType.value,
+        text: nodeTypeExtra.text,
+        label: nodeType.label,
+        icon: 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODg4Njg1MDk0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwNzkgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0NzEiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTQ4Mi4zODEzMjIgNDYuOTg2MTQ4QzI4NS4wMjc4MjUgNDUuNTE2NzkzIDk5Ljg4MTQ2MiAxOTUuMTI5MDU2IDU4LjM1NzkzNiAzODcuODYzNzY2Yy00MC4wNDk0MjQgMTY5LjI5ODExMyAzMS42NTc1ODMgMzU4LjE0MzAxOCAxNzUuMjc0NzI1IDQ1Ni44NDA4ODYgMTM5LjM5OTM5IDk5Ljg0MTE3NSAzMzguMDcwMzcxIDEwNy42NjU4NzEgNDgzLjA3NjY2MiAxNC45Mzc0OTYgMTQ1LjgwNzg4Ni04OS4yODg5NjMgMjMxLjY3MDI1Mi0yNjcuNTkxNjI0IDIwNC40NjM0NDktNDM3LjI1NjYtMjQuOTEzNTQ2LTE3NS44Nzc5MzktMTY1LjQwODMwOC0zMjguODQyMjg4LTMzOS44NzM4NDMtMzY0Ljk5NDMxNC0zMi40MzYzOTgtNy4yMzY2Ny02NS42OTE0NzgtMTAuNjI1Mjk5LTk4LjkxNzYwNy0xMC40MDUwODZ6IG0xMC40NzkxMjMgMTM3LjU3NzQwOWMxNDUuMDE4MTU1LTAuNDU5NDExIDI3OC4yMjgzMTMgMTE5LjU1ODM0NyAyOTMuMDA5MTkyIDI2My45MzE1MjQgMTguODY3MTY4IDEzNy45OTUwNTUtNzAuMDk5NTQ0IDI4Mi4zNDQ5NzYtMjAzLjg1Nzg2MiAzMjMuODMyNDMyLTEzMC41NTA1MTEgNDQuNDI2NjQxLTI4Ny45NzI3NTktMTIuMjY5MzA3LTM1NS45ODQwNzItMTMzLjM2NjMwMS03NS4yNTQxNTItMTI1LjYzNzk0Ny00My4yMzU4NzUtMzA0LjY3NTI4NSA3Ni4wMTM5ODQtMzkxLjkwMjU5NSA1NC4wNzkwMTUtNDEuNzI2NjUzIDEyMi41NDIxNDUtNjQuMDY1OTggMTkwLjgxODc1OC02Mi40OTUwNnoiIHAtaWQ9IjI0NzIiPjwvcGF0aD48L3N2Zz4=',
+        properties: nodeTypeExtra.defaultProp,
+    },
+    propSettingComp: PropSetting,
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/enums.ts b/frontend/src/views/flow/components/flowdesign/node/enums.ts
new file mode 100644
index 00000000..c2ff7392
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/enums.ts
@@ -0,0 +1,38 @@
+import EnumValue from '@/common/Enum';
+import { i18n } from '@/i18n';
+
+export const NodeTypeEnum = {
+    Start: EnumValue.of('start', i18n.global.t('flow.start')).setExtra({
+        order: 1,
+        text: i18n.global.t('flow.start'),
+        defaultProp: {},
+    }),
+
+    End: EnumValue.of('end', i18n.global.t('flow.end')).setExtra({
+        order: 100,
+        text: i18n.global.t('flow.end'),
+        defaultProp: {},
+    }),
+
+    Edge: EnumValue.of('flow-edge', i18n.global.t('flow.flowEdge')).setExtra({
+        text: i18n.global.t('flow.flowEdge'),
+    }),
+
+    UserTask: EnumValue.of('usertask', i18n.global.t('flow.usertask')).setExtra({
+        order: 2,
+        type: 'usertask',
+        text: i18n.global.t('flow.usertask'),
+    }),
+
+    Serial: EnumValue.of('serial', i18n.global.t('flow.serial')).setExtra({
+        order: 3,
+        text: i18n.global.t('flow.serial'),
+        defaultProp: { condition: `{{ procinstTaskStatus == 1 }}` },
+    }),
+
+    Parallel: EnumValue.of('parallel', i18n.global.t('flow.parallel')).setExtra({
+        order: 4,
+        text: i18n.global.t('flow.parallel'),
+        defaultProp: {},
+    }),
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/index.ts b/frontend/src/views/flow/components/flowdesign/node/index.ts
new file mode 100644
index 00000000..6143c8e1
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/index.ts
@@ -0,0 +1,81 @@
+import EnumValue from '@/common/Enum';
+import LogicFlow from '@logicflow/core';
+
+const allNodes: Record<string, any> = import.meta.glob('./**/index.ts', { eager: true });
+
+const nodeMap = new Map<string, CustomNode>();
+
+export interface CustomNode {
+    order?: number; // 节点排序（影响拖拽面板显示顺序）
+    type: string; // 节点类型
+    registerConf: any; // 节点注册信息
+    dndPanelConf: any; // 节点拖拽面板配置信息
+    propSettingComp?: any; // 属性设置组件
+}
+
+/**
+ * 获取所有自定义节点
+ *
+ * @returns 自定义节点配置
+ */
+export const getCustomNodes = () => {
+    const nodes = [];
+    for (const path in allNodes) {
+        // path => ./start/index.ts
+        // 获取默认导出的部件
+        const node = allNodes[path].default;
+        nodes.push(node);
+        nodeMap.set(node.type, node);
+    }
+
+    return nodes.sort((a, b) => {
+        if (a.order !== undefined && b.order !== undefined) {
+            return a.order - b.order; // 按order字段排序
+        } else if (a.order !== undefined) {
+            return -1; // a有order字段，排在前面
+        } else if (b.order !== undefined) {
+            return 1; // b有order字段，排在前面
+        } else {
+            return 0; // 两个都没有order字段，保持原顺序
+        }
+    });
+};
+
+/**
+ * 根据节点类型获取自定义节点
+ *
+ * @param type 节点类型
+ * @returns 节点信息
+ */
+export const getCustomNode = (type: string): CustomNode | undefined => {
+    return nodeMap.get(type);
+};
+
+/**
+ * 注册自定义节点
+ *
+ * @param lf LogicFlow 实例
+ */
+export const initCustomNodes = (lf: LogicFlow, disable: boolean = false) => {
+    const customNodes = getCustomNodes();
+    const dndPanelItmes = [];
+
+    // 注册自定义节点
+    for (const node of customNodes) {
+        if (!node.registerConf) {
+            continue;
+        }
+        lf.register(node.registerConf);
+        if (node.dndPanelConf) {
+            dndPanelItmes.push(node.dndPanelConf);
+        }
+    }
+
+    if (disable) {
+        return;
+    }
+
+    const extension: any = lf.extension;
+    //  注册自定义节点面板
+    extension?.dndPanel?.setPatternItems(dndPanelItmes);
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/parallel/PropSetting.vue b/frontend/src/views/flow/components/flowdesign/node/parallel/PropSetting.vue
new file mode 100644
index 00000000..03ad780f
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/parallel/PropSetting.vue
@@ -0,0 +1,20 @@
+<template>
+    <el-tabs v-model="activeTabName">
+        <el-tab-pane :label="$t('common.basic')" :name="basic">
+            <el-form-item :label="$t('common.name')">
+                <el-input v-model="form.name" clearable></el-input>
+            </el-form-item>
+        </el-tab-pane>
+
+        <!-- <el-tab-pane :label="$t('')"> </el-tab-pane> -->
+    </el-tabs>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const basic = 'basic';
+
+const activeTabName = ref(basic);
+
+const form = defineModel<any>('modelValue', { required: true });
+</script>
diff --git a/frontend/src/views/flow/components/flowdesign/node/parallel/index.ts b/frontend/src/views/flow/components/flowdesign/node/parallel/index.ts
new file mode 100644
index 00000000..30542dc6
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/parallel/index.ts
@@ -0,0 +1,76 @@
+import { RectNode, RectNodeModel, h } from '@logicflow/core';
+import PropSetting from './PropSetting.vue';
+import { NodeTypeEnum } from '../enums';
+
+class UserTaskModel extends RectNodeModel {
+    initNodeData(data: any) {
+        super.initNodeData(data);
+        this.width = 100;
+        this.height = 60;
+        this.radius = 5;
+    }
+    getNodeStyle() {
+        return super.getNodeStyle();
+    }
+}
+
+class UserTaskView extends RectNode {
+    // 获取标签形状的方法，用于在节点中添加一个自定义的 SVG 元素
+    getShape() {
+        // 获取XxxNodeModel中定义的形状属性
+        const { model } = this.props;
+        const { x, y, width, height, radius } = model;
+        // 获取XxxNodeModel中定义的样式属性
+        const style = model.getNodeStyle();
+
+        return h('g', {}, [
+            h('rect', {
+                ...style,
+                x: x - width / 2,
+                y: y - height / 2,
+                width,
+                height,
+                rx: radius,
+                ry: radius,
+            }),
+            h(
+                'svg',
+                {
+                    x: x - width / 2,
+                    y: y - height / 2,
+                    width: 20,
+                    height: 20,
+                    viewBox: '0 0 1024 1024',
+                },
+                [
+                    h('path', {
+                        fill: style.stroke,
+                        d: 'M507.776 186.88c-90.765824 0-155.697664 69.77536-155.879936 149.255168v0.045056c0.005632 24.035328 6.509568 49.40288 16.67072 72.282624 7.33696 16.520704 16.459264 31.709184 27.575296 43.876352-66.06336 22.601216-143.458816 59.79904-182.578176 133.147648L211.456 589.44V826.88h592.64v-237.44l-2.107904-3.95264c-38.556672-72.2944-114.277888-109.44-179.70176-132.135424 31.938048-32.477696 41.35936-74.396672 41.3696-117.171712v-0.045056C663.473664 256.65536 598.541824 186.88 507.776 186.88zM445.803008 271.513088c4.195328 0.01024 8.801792 0.150528 13.88032 0.450048 40.459264 2.384384 54.076416 9.667584 64.543744 16.574976 10.466816 6.90688 17.84576 13.482496 45.508096 14.288896h0.017408c21.555712-0.8064 31.922688-4.649472 39.356928-9.003008 3.012608-1.76384 5.541888-3.597824 8.134144-5.348864 6.85056 14.685184 10.530304 30.919168 10.571776 47.719936-0.014336 47.84128-8.239104 81.344512-52.105216 108.761088l4.291072 32.34304c9.130496 2.77248 18.568192 5.814784 28.1472 9.150976 1.337856 5.5808 2.883584 12.900352 3.922944 20.681728 1.089024 8.152576 1.517568 16.634368 0.845824 23.003136-0.671232 6.368768-2.648576 9.806848-2.995712 10.153984-22.296064 22.296064-61.873664 35.298816-102.017024 35.298816-40.143872 0-79.72096-13.002752-102.017024-35.298816-0.347136-0.347136-2.32448-3.785216-2.996224-10.153984-0.671232-6.368768-0.2432-14.85056 0.846336-23.003136 1.044992-7.824384 2.603008-15.186944 3.945984-20.779008 9.483264-3.29728 18.82624-6.30784 27.86816-9.053696l2.55744-34.656256c-2.082816-2.671104-4.205056-4.440576-6.73792-6.34112-9.789952-7.34464-21.66272-23.502336-30.04928-42.38592-8.382976-18.876416-13.576704-40.45312-13.584384-57.724928 0.051712-20.707328 5.62432-40.556032 15.859712-57.700864 1.831424-0.681984 3.762688-1.402368 5.933056-2.116096 7.632896-2.510336 18.092544-4.906496 36.273152-4.860928zM368.312832 501.68576c-0.032256 0.23552-0.068096 0.464384-0.09984 0.700416-1.324544 9.913856-2.102784 20.70528-0.964096 31.506944 1.138688 10.801152 3.98848 22.43072 13.296128 31.737856 31.768576 31.768576 79.8464 45.796864 127.358976 45.796864 47.512064 0 95.5904-14.0288 127.358976-45.796864 9.307136-9.307136 12.15744-20.936704 13.296128-31.737856 1.138688-10.801664 0.360448-21.593088-0.964096-31.506944-0.026112-0.195584-0.05632-0.385536-0.082944-0.580096 48.299008 21.180928 94.98368 51.51488 120.743936 96.805888V791.04H682.496v-135.68h-35.84v135.68H368.128v-135.68h-35.84v135.68H247.296v-192.428032c25.808896-45.376512 72.621056-75.74016 121.016832-96.926208z',
+                    }),
+                ]
+            ),
+        ]);
+    }
+}
+
+const nodeType = NodeTypeEnum.Parallel;
+const nodeTypeExtra = nodeType.extra;
+
+export default {
+    order: nodeTypeExtra.order,
+    type: nodeType.value,
+    // 注册配置信息
+    // registerConf: {
+    //     type: nodeType.value,
+    //     model: UserTaskModel,
+    //     view: UserTaskView,
+    // },
+    dndPanelConf: {
+        type: nodeType.value,
+        text: nodeTypeExtra.text,
+        label: nodeType.label,
+        icon: 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1OTk5OTIwMTE3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwNzkgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM4MjciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTQ4NS44NzE0OTIgNDcuMTc0MzM4Yy05LjE2ODcyOS0wLjAwODA2Ni0xOC4zMzY1MSAzLjM5MjQ4Ny0yNS4xMzc2MTYgMTAuMjI0OTA4TDU3LjM4MTQyNCA0NjAuNzU1NDk0Yy0xMy42MDMxNjEgMTMuNjAyMjEyLTEzLjU0MDA1NiAzNi42NzQ0NDMgMC4wNjI2MzEgNTAuMjc2NjU1bDQwMy4yODg4NzIgNDAzLjI4NjAyNWMxMy42MDMxNjEgMTMuNjA2OTU2IDM2LjY3Mzk2OSAxMy42NjY3NCA1MC4yNzY2NTUgMGw0MDMuMzUyOTI2LTQwMy4zNTAwNzljMTMuNjAyNjg2LTEzLjYwMTczNyAxMy41Mzk1ODEtMzYuNjc0OTE4LTAuMDY0MDU0LTUwLjI3NzEzTDUxMS4wMDkxMDcgNTcuMzk5MjQ2Yy02LjgwMTEwNi02LjgwMTEwNi0xNS45NjkzNjEtMTAuMjE3MzE2LTI1LjEzNzYxNS0xMC4yMjQ5MDh6IG0tMC4wMzA4NDEgNTkuODA1MDM2bDM3OC45NDMxNTMgMzc4Ljk0Ni0zNzguOTQzMTUzIDM3OC45NDE3My0zNzguOTQzMTUzLTM3OC45NDE3MyAzNzguOTQzMTUzLTM3OC45NDZ6IG0tMTAuMzQ0OTUgMTU2LjQ5MDkxMWMwIDAuMDA0NzQ1LTQuNTgxOTkyIDAuODcyMDgzLTQuNTg0MzY1IDAuODcyMDgyLTAuMDA0NzQ1IDAtMy43NTIxMzggMi41MjU2MjMtMy43NTQ5ODQgMi41MjU2MjQtMC4wMDQ3NDUgMC4wMDQ3NDUtMi42MDgxODIgMy44NTYwNDgtMi42MTA1NTUgMy44NTYwNDcgMCAwLjAwNDc0NS0wLjg4MjUyMSA0LjU5MDUzMy0wLjg4Mzk0NCA0LjU5MDUzM1Y0NjMuNjEwNDAySDI3NS4yODM5MzhsLTAuMDMxNzktMC4wMzcwMDljMCAwLjAwNDc0NS00LjU2MzQ4OCAxLjAxMDE1NC00LjU2NTg2IDEuMDEwMTU1LTAuMDA0NzQ1IDAuMDA0NzQ1LTMuNzUxNjYzIDIuNTI1MTQ5LTMuNzU0MDM2IDIuNTI1MTQ5bDAuMDAzNzk2LTAuMDQ2NDk5Yy0wLjAwNDc0NSAwLjAwNDc0NS0yLjYwODE4MiAzLjg1NjA0OC0yLjYxMDU1NCAzLjg1NjA0OC0wLjAwNDc0NSAwLTAuODgyOTk2IDQuNTkxMDA3LTAuODg0ODkzIDQuNTkxMDA3djIwLjYyNTM3MXMwLjg3NjgyNyA0LjY0MTc3NiAwLjkwODE0MiA0LjY3MzU2NmMwIDAuMDA0NzQ1IDIuNTk5MTY3IDMuNzY0NDc0IDIuNTk5MTY3IDMuNzY0NDc0IDAuMDA0NzQ1IDAuMDA0NzQ1IDMuNzc1Mzg3IDIuNTI1MTQ5IDMuNzc2ODExIDIuNTI1MTQ5IDAuMDA0NzQ1IDAuMDA0NzQ1IDQuNTgxNTE4IDEuMDA5MjA2IDQuNTgzNDE1IDEuMDA5MjA2aDE4OC4zNTU2MTV2MTg4LjI2NDA0MWwtMC4wMjk4OTItMC4wMjc1MmMwIDAuMDA0NzQ1IDAuOTA5MDkyIDQuNjczNTY2IDAuOTA4NjE3IDQuNjczNTY2IDAgMC4wMDQ3NDUgMi41OTgyMTggMy43NjQgMi41OTgyMTggMy43NjQgMC4wMDQ3NDUgMC4wMDQ3NDUgMy43NzY4MTEgMi41MjQyIDMuNzc3Mjg1IDIuNTI0MiAwIDAgNC41NTAyMDMgMC45NjQxMzEgNC41ODQzNjUgMS4wMTA2MjlsMjAuNjIxMS0wLjAwNDc0NWMwLjAwNTIxOSAwIDQuNjcxNjY4LTAuOTY0MTMxIDQuNjc0NTE1LTAuOTY0MTMxIDAgMCAzLjc1MjEzOC0yLjUyNDIgMy43NTQ5ODUtMi41MjQyIDAuMDA0NzQ1LTAuMDA0NzQ1IDIuNTk1MzcxLTMuNzY1NDIzIDIuNTk4MjE4LTMuNzY1NDIzIDAgMCAwLjg5NTMzMi00LjY1OTMzMiAwLjg5Njc1NS00LjY1OTMzMVY1MDguMTI1NTIzaDE4OC4zMDkxMTZjMC4wMDUyMTkgMC4wMDQ3NDUgNC42NzIxNDItMC45NjM2NTYgNC42NzQwNC0wLjk2MzY1NiAwLjAwNDc0NSAwIDMuNzUzMDg3LTIuNTI1MTQ5IDMuNzU0OTg1LTIuNTI1MTQ5IDAuMDA0NzQ1LTAuMDA0NzQ1IDIuNTk1ODQ2LTMuNzY0NDc0IDIuNTk4NjkyLTMuNzY0NDc0IDAgMCAwLjg5NDg1Ny00LjY1OTMzMiAwLjg5Njc1Ni00LjY1OTMzMnYtMjAuNjIxMWMwLTAuMDA0NzQ1LTAuODkwNTg3LTQuNTQ1NDU4LTAuODg5MTY0LTQuNTkxMDA4LTAuMDA0NzQ1LTAuMDA0NzQ1LTIuNTg1ODgyLTMuODU2MDQ4LTIuNjE4MTQ2LTMuODU2MDQ3LTAuMDA0NzQ1LTAuMDA0NzQ1LTMuNzc1ODYyLTIuNTI0Mi0zLjc3NjgxLTIuNTI0MiAwIDAuMDA0NzQ1LTQuNjU5MzMyLTEuMDEwNjI5LTQuNjYxNzA0LTAuOTY0NjA1aC0xODguMjg5MTg4VjI3NS4zNjQ4NjZjMC0wLjAwNDc0NS0wLjg5MTA2Mi00LjU0NDAzNC0wLjg4OTYzOC00LjU5MDA1OS0wLjAwNDc0NS0wLjAwNDc0NS0yLjU4NTg4Mi0zLjg1Njk5Ny0yLjU4NTg4Mi0zLjg1Njk5Ni0wLjAwNDc0NS0wLjAwNDc0NS0zLjc3NDkxMy0yLjUyNDItMy43NzU4NjItMi41MjQyLTAuMDA0NzQ1IDAtNC42NzI2MTctMC45MTg1ODEtNC42NzQ1MTQtMC45MTg1ODJsLTIwLjYyNDg5Ny0wLjAwNDc0NHoiIHAtaWQ9IjM4MjgiPjwvcGF0aD48L3N2Zz4=',
+        properties: nodeTypeExtra.defaultProp,
+    },
+    propSettingComp: PropSetting,
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/serial/PropSetting.vue b/frontend/src/views/flow/components/flowdesign/node/serial/PropSetting.vue
new file mode 100644
index 00000000..f2ab5245
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/serial/PropSetting.vue
@@ -0,0 +1,16 @@
+<template>
+    <el-tabs v-model="activeTabName">
+        <!-- <el-tab-pane :label="$t('common.basic')" :name="basic"> </el-tab-pane> -->
+
+        <!-- <el-tab-pane :label="$t('')"> </el-tab-pane> -->
+    </el-tabs>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const basic = 'basic';
+
+const activeTabName = ref(basic);
+
+const form = defineModel<any>('modelValue', { required: true });
+</script>
diff --git a/frontend/src/views/flow/components/flowdesign/node/serial/index.ts b/frontend/src/views/flow/components/flowdesign/node/serial/index.ts
new file mode 100644
index 00000000..24a22547
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/serial/index.ts
@@ -0,0 +1,76 @@
+import { RectNode, RectNodeModel, h } from '@logicflow/core';
+import PropSetting from './PropSetting.vue';
+import { NodeTypeEnum } from '../enums';
+
+class UserTaskModel extends RectNodeModel {
+    initNodeData(data: any) {
+        super.initNodeData(data);
+        this.width = 100;
+        this.height = 60;
+        this.radius = 5;
+    }
+    getNodeStyle() {
+        return super.getNodeStyle();
+    }
+}
+
+class UserTaskView extends RectNode {
+    // 获取标签形状的方法，用于在节点中添加一个自定义的 SVG 元素
+    getShape() {
+        // 获取XxxNodeModel中定义的形状属性
+        const { model } = this.props;
+        const { x, y, width, height, radius } = model;
+        // 获取XxxNodeModel中定义的样式属性
+        const style = model.getNodeStyle();
+
+        return h('g', {}, [
+            h('rect', {
+                ...style,
+                x: x - width / 2,
+                y: y - height / 2,
+                width,
+                height,
+                rx: radius,
+                ry: radius,
+            }),
+            h(
+                'svg',
+                {
+                    x: x - width / 2,
+                    y: y - height / 2,
+                    width: 20,
+                    height: 20,
+                    viewBox: '0 0 1024 1024',
+                },
+                [
+                    h('path', {
+                        fill: style.stroke,
+                        d: 'M507.776 186.88c-90.765824 0-155.697664 69.77536-155.879936 149.255168v0.045056c0.005632 24.035328 6.509568 49.40288 16.67072 72.282624 7.33696 16.520704 16.459264 31.709184 27.575296 43.876352-66.06336 22.601216-143.458816 59.79904-182.578176 133.147648L211.456 589.44V826.88h592.64v-237.44l-2.107904-3.95264c-38.556672-72.2944-114.277888-109.44-179.70176-132.135424 31.938048-32.477696 41.35936-74.396672 41.3696-117.171712v-0.045056C663.473664 256.65536 598.541824 186.88 507.776 186.88zM445.803008 271.513088c4.195328 0.01024 8.801792 0.150528 13.88032 0.450048 40.459264 2.384384 54.076416 9.667584 64.543744 16.574976 10.466816 6.90688 17.84576 13.482496 45.508096 14.288896h0.017408c21.555712-0.8064 31.922688-4.649472 39.356928-9.003008 3.012608-1.76384 5.541888-3.597824 8.134144-5.348864 6.85056 14.685184 10.530304 30.919168 10.571776 47.719936-0.014336 47.84128-8.239104 81.344512-52.105216 108.761088l4.291072 32.34304c9.130496 2.77248 18.568192 5.814784 28.1472 9.150976 1.337856 5.5808 2.883584 12.900352 3.922944 20.681728 1.089024 8.152576 1.517568 16.634368 0.845824 23.003136-0.671232 6.368768-2.648576 9.806848-2.995712 10.153984-22.296064 22.296064-61.873664 35.298816-102.017024 35.298816-40.143872 0-79.72096-13.002752-102.017024-35.298816-0.347136-0.347136-2.32448-3.785216-2.996224-10.153984-0.671232-6.368768-0.2432-14.85056 0.846336-23.003136 1.044992-7.824384 2.603008-15.186944 3.945984-20.779008 9.483264-3.29728 18.82624-6.30784 27.86816-9.053696l2.55744-34.656256c-2.082816-2.671104-4.205056-4.440576-6.73792-6.34112-9.789952-7.34464-21.66272-23.502336-30.04928-42.38592-8.382976-18.876416-13.576704-40.45312-13.584384-57.724928 0.051712-20.707328 5.62432-40.556032 15.859712-57.700864 1.831424-0.681984 3.762688-1.402368 5.933056-2.116096 7.632896-2.510336 18.092544-4.906496 36.273152-4.860928zM368.312832 501.68576c-0.032256 0.23552-0.068096 0.464384-0.09984 0.700416-1.324544 9.913856-2.102784 20.70528-0.964096 31.506944 1.138688 10.801152 3.98848 22.43072 13.296128 31.737856 31.768576 31.768576 79.8464 45.796864 127.358976 45.796864 47.512064 0 95.5904-14.0288 127.358976-45.796864 9.307136-9.307136 12.15744-20.936704 13.296128-31.737856 1.138688-10.801664 0.360448-21.593088-0.964096-31.506944-0.026112-0.195584-0.05632-0.385536-0.082944-0.580096 48.299008 21.180928 94.98368 51.51488 120.743936 96.805888V791.04H682.496v-135.68h-35.84v135.68H368.128v-135.68h-35.84v135.68H247.296v-192.428032c25.808896-45.376512 72.621056-75.74016 121.016832-96.926208z',
+                    }),
+                ]
+            ),
+        ]);
+    }
+}
+
+const nodeType = NodeTypeEnum.Serial;
+const nodeTypeExtra = nodeType.extra;
+
+export default {
+    order: nodeTypeExtra.order,
+    type: nodeType.value,
+    // 注册配置信息
+    // registerConf: {
+    //     type: nodeType.value,
+    //     model: UserTaskModel,
+    //     view: UserTaskView,
+    // },
+    dndPanelConf: {
+        type: nodeType.value,
+        text: nodeTypeExtra.text,
+        label: nodeType.label,
+        icon: 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1OTk5Njg2MzM0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwNzkgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MDciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTQ4NS44NzE0OTIgNDcuMTc0MzM4Yy05LjE2ODcyOS0wLjAwODA2Ni0xOC4zMzY1MSAzLjM5MjQ4Ny0yNS4xMzc2MTYgMTAuMjI0OTA4TDU3LjM4MTQyNCA0NjAuNzU1NDk0Yy0xMy42MDMxNjEgMTMuNjAyMjEyLTEzLjU0MDA1NiAzNi42NzQ0NDMgMC4wNjI2MzEgNTAuMjc2NjU1bDQwMy4yODg4NzIgNDAzLjI4NjAyNWMxMy42MDMxNjEgMTMuNjA2OTU2IDM2LjY3Mzk2OSAxMy42NjY3NCA1MC4yNzY2NTUgMGw0MDMuMzUyOTI2LTQwMy4zNTAwNzljMTMuNjAyNjg2LTEzLjYwMTczNyAxMy41Mzk1ODEtMzYuNjc0OTE4LTAuMDY0MDU0LTUwLjI3NzEzTDUxMS4wMDkxMDcgNTcuMzk5MjQ2Yy02LjgwMTEwNi02LjgwMTEwNi0xNS45NjkzNjEtMTAuMjE3MzE2LTI1LjEzNzYxNS0xMC4yMjQ5MDh6IG0tMC4wMzA4NDEgNTkuODA1MDM2bDM3OC45NDMxNTMgMzc4Ljk0Ni0zNzguOTQzMTUzIDM3OC45NDE3My0zNzguOTQzMTUzLTM3OC45NDE3MyAzNzguOTQzMTUzLTM3OC45NDZ6TTM0NC4zMTg5MSAzMTcuODI5MzExYy0wLjAwNjY0MyAwLTQuNTYwNjQxIDAuODcyMDgzLTQuNTY0NDM2IDAuODcyMDgzLTAuMDA0NzQ1IDAtMy44NjQxMTQgMi42MTU3NzMtMy44NjY5NjEgMi42MTU3NzNsLTE0LjU4MTUyNSAxNC41ODQ4NDdjLTAuMDA0NzQ1IDAtMi42NjE3OTcgMy45MDI1NDYtMi42NjM2OTYgMy45NDg1NyAwIDAuMDA0NzQ1LTAuODI0MTYxIDQuNDk4MDExLTAuODIzNjg2IDQuNDk4MDExIDAgMC4wMDQ3NDUgMC44ODYzMTcgNC40NTI5MzYgMC44ODc3NCA0LjQ1MjkzNSAwIDAuMDA0NzQ1IDIuNTMyNzQxIDMuOTQ4NTcgMi41MzU1ODggMy45NDg1N2wxMzMuMTg4MDg0IDEzMy4xODQ3NjMtMTMzLjEyNDAzIDEzMy4xMjQ5OHYtMC4wNDE3NTRjMCAwLjAwNDc0NS0yLjY2MTc5NyAzLjk0NzYyMS0yLjY2MzY5NiAzLjk0NzYyMSAwIDAuMDA0NzQ1LTAuODIzNjg2IDQuNDk5NDM0LTAuODIzNjg2IDQuNDk5NDM0IDAgMC4wMDk0ODkgMC44ODYzMTcgNC40NTI5MzYgMC44ODc3NCA0LjQ1MjkzNiAwIDAgMi41MzMyMTUgMy45MDE1OTcgMi41MzU1ODggMy45NDc2MjFsMTQuNTgyNDc0IDE0LjU3OTYyN2MwLjAwNDc0NSAwLjAwNDc0NSAzLjk5MDc5OCAyLjYxNzE5NyAzLjk5NDExOSAyLjYxNzE5NyAwLjAwNDc0NSAwIDQuNDM0NDMxIDAuODcyMDgzIDQuNDM4MjI3IDAuODcyMDgzIDAuMDA0NzQ1IDAgNC40OTc1MzYtMC44MjU1ODQgNC41MDA4NTgtMC44MjU1ODQgMC4wMDQ3NDUgMCAzLjkyODY0Mi0yLjY2MzY5NSAzLjkzMTAxNC0yLjY2MzY5NmwxMzMuMTI1OTI5LTEzMy4xMjg3NzUgMTMzLjE1NDg3MSAxMzMuMTU2NzY5YzAuMDA0NzQ1IDAuMDA0NzQ1IDMuOTkxMjczIDIuNjE3MTk3IDMuOTk0MTIgMi42MTcxOTcgMC4wMDQ3NDUgMCA0LjQzNDQzMSAwLjg3MjA4MyA0LjQzODIyNiAwLjg3MjA4MyAwLjAwNDc0NSAwIDQuNDk4MDExLTAuODI3MDA4IDQuNTAxODA3LTAuODI3MDA4IDAuMDA0NzQ1IDAgMy45MjY3NDQtMi42NjE3OTcgMy45MjkxMTYtMi42NjE3OTdsMTQuNTgyOTQ5LTE0LjU4MDU3N2MwLjAwNDc0NS0wLjAwNDc0NSAyLjU5Nzc0My0zLjg1NTU3MyAyLjYwMDExNi0zLjg1NTU3MyAwLTAuMDA0NzQ1IDAuODg3NzQtNC41NDU0NTggMC44ODc3NC00LjU5MTAwNyAwLTAuMDA0NzQ1LTAuODg2NzkxLTQuNDUyOTM2LTAuODg4Njg5LTQuNDUyOTM2IDAgMC0yLjU5NjMyLTMuOTk0MTE5LTIuNTk5MTY3LTMuOTk0MTE5bC0xMzMuMTQwMTYzLTEzMy4xNDI1MzUgMTMzLjE0MTExMi0xMzMuMTM5MjE0YzAuMDA0NzQ1IDAgMi41OTY3OTQtMy44NTYwNDggMi41OTkxNjctMy44NTYwNDggMC0wLjAwNDc0NSAwLjg4Nzc0LTQuNTQ0NTA5IDAuODg3NzQtNC41NDQ1MDkgMC0wLjAwOTQ4OS0wLjg4NjMxNy00LjQ1MjkzNi0wLjg4NzI2Ni00LjQ1MjkzNSAwLTAuMDA0NzQ1LTIuNjU5ODk5LTMuOTQ4NTctMi42NjI3NDYtMy45NDg1N2wtMTQuNTgyOTQ5LTE0LjU4NDM3MmMtMC4wMDQ3NDUgMC0zLjg2MzYzOS0yLjYxNjI0OC0zLjg2Njk2LTIuNjE2MjQ4LTAuMDA0NzQ1IDAtNC40MzM5NTctMC44NzMwMzItNC40Mzc3NTMtMC44NzMwMzItMC4wMDQ3NDUgMC00LjU2MTExNiAwLjg3MzAzMi00LjU2NDQzNiAwLjg3MzAzMi0wLjAwNDc0NSAwLTMuODY0NTg4IDIuNjE2MjQ4LTMuODY2OTYxIDIuNjE2MjQ4bC0xMzMuMTQzNDg0IDEzMy4xNDM0ODQtMTMzLjIwMzI2OC0xMzMuMjA3NTM4di0wLjA0MTc1NGMtMC4wMDQ3NDUgMC0zLjkyNzY5My0yLjUyNDItMy45MzEwMTQtMi41MjQyLTAuMDA0NzQ1IDAtNC40MzE1ODQtMC44NzE2MDgtNC40MzY4MDQtMC44NzIwODNoLTAuMDAwOTQ5eiIgcC1pZD0iMzQwOCI+PC9wYXRoPjwvc3ZnPg==',
+        properties: nodeTypeExtra.defaultProp,
+    },
+    propSettingComp: PropSetting,
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/start/PropSetting.vue b/frontend/src/views/flow/components/flowdesign/node/start/PropSetting.vue
new file mode 100644
index 00000000..a24baf2e
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/start/PropSetting.vue
@@ -0,0 +1,12 @@
+<template>
+    <el-tabs v-model="activeTabName"> </el-tabs>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+const basicTabName = 'basic';
+
+const activeTabName = ref(basicTabName);
+
+const form = defineModel<any>('modelValue', { required: true });
+</script>
diff --git a/frontend/src/views/flow/components/flowdesign/node/start/index.ts b/frontend/src/views/flow/components/flowdesign/node/start/index.ts
new file mode 100644
index 00000000..f46f642b
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/start/index.ts
@@ -0,0 +1,56 @@
+import { CircleNode, CircleNodeModel } from '@logicflow/core';
+import PropSetting from './PropSetting.vue';
+import { NodeTypeEnum } from '../enums';
+import { HisProcinstOpState } from '@/views/flow/enums';
+
+class StartModel extends CircleNodeModel {
+    initNodeData(data: any) {
+        super.initNodeData(data);
+        this.r = 20;
+    }
+
+    getNodeStyle() {
+        const style = super.getNodeStyle();
+        const properties = this.properties;
+
+        const opLog: any = properties.opLog;
+        if (!opLog) {
+            return style;
+        }
+
+        if (opLog.state == HisProcinstOpState.Completed.value) {
+            style.stroke = 'green';
+        } else if (opLog.state == HisProcinstOpState.Failed.value) {
+            style.stroke = 'red';
+        } else {
+            style.stroke = 'rgb(24, 125, 255)';
+        }
+
+        return style;
+    }
+}
+
+class StartView extends CircleNode {}
+
+const nodeType = NodeTypeEnum.Start;
+const nodeTypeExtra = nodeType.extra;
+
+export default {
+    order: nodeTypeExtra.order,
+    type: nodeType.value,
+    // 注册配置信息
+    registerConf: {
+        type: nodeType.value,
+        model: StartModel,
+        view: StartView,
+    },
+    // 拖拽面板配置
+    dndPanelConf: {
+        type: nodeType.value,
+        text: nodeTypeExtra.text,
+        label: nodeType.label,
+        icon: 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODg4MTUzNDkzIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwNzggMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE5MjUiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTQ4Mi4wMjQ5NDcgNDYuOTUzNjM5QzMxMC44Mjg4ODkgNDYuMzg1MDM5IDE0Ni41NTkwMjMgMTU3LjAwMjg5MiA4MS41ODM0MjMgMzE1LjI0MDc1NmMtNjguNDAxOTE0IDE1Ni42OTg2NTctMzIuODYxNTY3IDM1MS4zNTY4MjIgODYuNzkwNzYgNDczLjU2NjkgMTE1LjA3ODg0NyAxMjMuODczMTYyIDMwNC42ODQ2MzUgMTY5LjMzOTMyOCA0NjMuNDgwMTgzIDExMS4zODEwNDggMTY0LjU3MDc3Ny01Ni4wNDA3OTcgMjg2LjA2NzAyLTIxNy42NTk4ODUgMjkyLjY3MTQxOC0zOTEuNjA4NzY1IDExLjA3NzczMy0xNzAuOTI2NDcyLTg5LjQ4MzMwNC0zNDEuNDU0NzM0LTI0My40NTk5OTEtNDE1LjkxMDAwN0M2MjAuNzcxODg3IDYyLjU4MjA3IDU1My40NDI2MjQgNDYuODkxNDYzIDQ4Ni4wNzAxNzEgNDYuOTg3ODEyYTM5NS4wMjk4NTcgMzk1LjAyOTg1NyAwIDAgMC00LjA0NTIyNC0wLjAzNDE3M3ogbTEyLjAzMjIwMiA0Ny40NDkxNDdjMTY3LjU3NzA0OCAwLjkyMDI5NyAzMjUuNDA0ODM2IDEyMi4xNDkzMjYgMzY4Ljc0NDIxMSAyODQuMzE0MjMyIDQ2LjA1MjgwMiAxNTUuMTU4MDI3LTE2LjIzODc5OCAzMzQuODAyMzk5LTE0OS45MzY2ODQgNDI2LjY5OTE2OEM1NzMuOTgzNDE3IDkwNy40OTYwMjEgMzY4LjAzMTA5MSA5MDAuMTEwODY2IDIzNi44ODE0NjQgNzg4LjI1NjE0MmMtMTMyLjE0MjA2Ny0xMDUuMzU3MTE2LTE3OS40NDIxODItMzAwLjIzNTk4MS0xMTEuNjQ0NDY1LTQ1NC43NzY1MjFDMTgzLjk5ODgxNyAxOTAuNjExNTE3IDMzMS41MDMwNTEgOTIuNjM3MTgzIDQ4Ni4wNzAxNzEgOTQuNDUwMjQ4YzIuNjY0NTQxLTAuMDQ2NTEzIDUuMzI3MTg0LTAuMDYxNzAxIDcuOTg2OTc4LTAuMDQ3NDYyeiIgcC1pZD0iMTkyNiI+PC9wYXRoPjwvc3ZnPg==',
+        properties: nodeTypeExtra.defaultProp,
+    },
+    propSettingComp: PropSetting,
+};
diff --git a/frontend/src/views/flow/components/flowdesign/node/usertask/PropSetting.vue b/frontend/src/views/flow/components/flowdesign/node/usertask/PropSetting.vue
new file mode 100644
index 00000000..4e1efcc4
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/usertask/PropSetting.vue
@@ -0,0 +1,147 @@
+<template>
+    <el-tabs v-model="activeTabName">
+        <el-tab-pane :name="approvalRecordTabName" v-if="activeTabName == approvalRecordTabName" :label="$t('flow.approvalRecord')">
+            <el-table :data="props.node?.properties?.tasks" stripe width="100%">
+                <el-table-column :label="$t('common.time')" min-width="135">
+                    <template #default="scope">
+                        {{ formatDate(scope.row.endTime) }}
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="$t('flow.approver')" min-width="100">
+                    <template #default="scope">
+                        <AccountInfo :username="scope.row.handler" />
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="$t('flow.approveResult')" width="80">
+                    <template #default="scope">
+                        <EnumTag :enums="ProcinstTaskStatus" :value="scope.row.status" />
+                    </template>
+                </el-table-column>
+
+                <el-table-column :label="$t('flow.approvalRemark')" min-width="150">
+                    <template #default="scope">
+                        {{ scope.row.remark }}
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-tab-pane>
+
+        <el-tab-pane :label="$t('common.basic')" :name="basicTabName">
+            <el-form-item prop="completionCondition" :label="$t('flow.approvalMode')" :rules="[Rules.requiredSelect('flow.approvalMode')]">
+                <el-radio-group v-model="form.completionCondition">
+                    <el-radio value="{{ eq .nrOfCompleted 1.0 }}">{{ $t('flow.orSign') }}</el-radio>
+                    <el-radio value="{{ eq .nrOfAll .nrOfCompleted }}">{{ $t('flow.andSign') }}</el-radio>
+                    <!-- <el-radio value="3">{{ $t('flow.voteSign') }}</el-radio> -->
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item label-position="top" :label="$t('flow.taskCandidate')">
+                <el-table :data="taskCandidates" stripe>
+                    <el-table-column :label="$t('common.type')" width="150">
+                        <template #header>
+                            <el-button class="ml-0" type="primary" circle size="small" icon="Plus" @click="onAddCandidate"> </el-button>
+                            <span class="ml-2">{{ $t('common.type') }}</span>
+                        </template>
+                        <template #default="scope">
+                            <EnumSelect :enums="UserTaskCandidateType" v-model="scope.row.type" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="$t('common.name')" min-width="150">
+                        <template #default="scope">
+                            <AccountSelectFormItem label="" v-if="scope.row.type == UserTaskCandidateType.Account.value" v-model="scope.row.id" />
+                            <RoleSelectFormItem label="" v-else-if="scope.row.type == UserTaskCandidateType.Role.value" v-model="scope.row.id" />
+                            <el-input v-else v-model="scope.row.name" clearable> </el-input>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="$t('common.operation')" min-width="50">
+                        <template #default="scope">
+                            <el-button type="danger" @click="onDeleteCandidate(scope.$index, scope.row)" icon="delete" plain></el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-form-item>
+        </el-tab-pane>
+    </el-tabs>
+</template>
+<script lang="ts" setup>
+import { notEmpty } from '@/common/assert';
+import { Rules } from '@/common/rule';
+import { formatDate } from '@/common/utils/format';
+import EnumSelect from '@/components/enumselect/EnumSelect.vue';
+import EnumTag from '@/components/enumtag/EnumTag.vue';
+import { useI18nPleaseSelect } from '@/hooks/useI18n';
+import { ProcinstTaskStatus, UserTaskCandidateType } from '@/views/flow/enums';
+import AccountInfo from '@/views/system/account/components/AccountInfo.vue';
+import AccountSelectFormItem from '@/views/system/account/components/AccountSelectFormItem.vue';
+import RoleSelectFormItem from '@/views/system/role/components/RoleSelectFormItem.vue';
+import { computed, onMounted, Ref, ref, watch } from 'vue';
+
+const props = defineProps({
+    // 节点信息
+    node: {
+        type: Object,
+        default: false,
+    },
+});
+
+const basicTabName = 'basic';
+const approvalRecordTabName = 'approvalRecord';
+
+const activeTabName = computed(() => {
+    // 如果存在审批记录 tasks 且长度大于0，则激活审批记录 tab
+    if (props.node?.properties?.tasks && props.node.properties.tasks.length > 0) {
+        return approvalRecordTabName;
+    }
+    return basicTabName;
+});
+
+const form: any = defineModel<any>('modelValue', { required: true });
+
+const taskCandidates: Ref<any> = ref([]);
+
+onMounted(() => {
+    const rawCandidates = form.value?.candidates || [];
+    taskCandidates.value = rawCandidates.map((item: any) => {
+        if (item && typeof item === 'object') {
+            return item;
+        }
+
+        if (item.indexOf(':') == -1) {
+            return { type: UserTaskCandidateType.Account.value, id: Number.parseInt(item) };
+        }
+
+        let [type, id] = item.split(':');
+        if (type == '') {
+            type = UserTaskCandidateType.Account.value;
+        }
+        return { type: type, id: Number.parseInt(id) };
+    });
+});
+
+const onAddCandidate = () => {
+    // 往数组头部添加元素
+    taskCandidates.value = [...(taskCandidates.value || []), {}];
+};
+
+const onDeleteCandidate = async (idx: any, row: any) => {
+    taskCandidates.value.splice(idx, 1);
+};
+
+const confirm = () => {
+    notEmpty(taskCandidates.value, useI18nPleaseSelect('flow.taskCandidate'));
+    form.value.candidates = taskCandidates.value.map((x: any) => {
+        if (x.type == UserTaskCandidateType.Account.value) {
+            return `${x.id}`;
+        }
+        return `${x.type}:${x.id}`;
+    });
+};
+
+defineExpose({
+    confirm,
+});
+</script>
diff --git a/frontend/src/views/flow/components/flowdesign/node/usertask/index.ts b/frontend/src/views/flow/components/flowdesign/node/usertask/index.ts
new file mode 100644
index 00000000..e514a9ce
--- /dev/null
+++ b/frontend/src/views/flow/components/flowdesign/node/usertask/index.ts
@@ -0,0 +1,99 @@
+import { RectNode, RectNodeModel, h } from '@logicflow/core';
+import PropSetting from './PropSetting.vue';
+import { NodeTypeEnum } from '../enums';
+import { HisProcinstOpState, ProcinstTaskStatus } from '@/views/flow/enums';
+
+class UserTaskModel extends RectNodeModel {
+    initNodeData(data: any) {
+        super.initNodeData(data);
+        this.width = 100;
+        this.height = 60;
+        this.radius = 5;
+    }
+
+    getNodeStyle() {
+        const style = super.getNodeStyle();
+        const properties = this.properties;
+
+        const opLog: any = properties.opLog;
+        if (!opLog) {
+            return style;
+        }
+
+        if (opLog.state == HisProcinstOpState.Completed.value && opLog.extra) {
+            if (opLog.extra.approvalResult == ProcinstTaskStatus.Pass.value) {
+                style.stroke = 'green';
+            } else {
+                style.stroke = 'red';
+            }
+        } else if (opLog.state == HisProcinstOpState.Failed.value) {
+            style.stroke = 'red';
+        } else {
+            style.stroke = 'rgb(24, 125, 255)';
+        }
+
+        return style;
+    }
+}
+
+class UserTaskView extends RectNode {
+    // 获取标签形状的方法，用于在节点中添加一个自定义的 SVG 元素
+    getShape() {
+        // 获取XxxNodeModel中定义的形状属性
+        const { model } = this.props;
+        console.log(model.properties);
+        const { x, y, width, height, radius } = model;
+        // 获取XxxNodeModel中定义的样式属性
+        const style = model.getNodeStyle();
+
+        return h('g', {}, [
+            h('rect', {
+                ...style,
+                x: x - width / 2,
+                y: y - height / 2,
+                width,
+                height,
+                rx: radius,
+                ry: radius,
+            }),
+            h(
+                'svg',
+                {
+                    x: x - width / 2,
+                    y: y - height / 2,
+                    width: 20,
+                    height: 20,
+                    viewBox: '0 0 1024 1024',
+                },
+                [
+                    h('path', {
+                        fill: style.stroke,
+                        d: 'M507.776 186.88c-90.765824 0-155.697664 69.77536-155.879936 149.255168v0.045056c0.005632 24.035328 6.509568 49.40288 16.67072 72.282624 7.33696 16.520704 16.459264 31.709184 27.575296 43.876352-66.06336 22.601216-143.458816 59.79904-182.578176 133.147648L211.456 589.44V826.88h592.64v-237.44l-2.107904-3.95264c-38.556672-72.2944-114.277888-109.44-179.70176-132.135424 31.938048-32.477696 41.35936-74.396672 41.3696-117.171712v-0.045056C663.473664 256.65536 598.541824 186.88 507.776 186.88zM445.803008 271.513088c4.195328 0.01024 8.801792 0.150528 13.88032 0.450048 40.459264 2.384384 54.076416 9.667584 64.543744 16.574976 10.466816 6.90688 17.84576 13.482496 45.508096 14.288896h0.017408c21.555712-0.8064 31.922688-4.649472 39.356928-9.003008 3.012608-1.76384 5.541888-3.597824 8.134144-5.348864 6.85056 14.685184 10.530304 30.919168 10.571776 47.719936-0.014336 47.84128-8.239104 81.344512-52.105216 108.761088l4.291072 32.34304c9.130496 2.77248 18.568192 5.814784 28.1472 9.150976 1.337856 5.5808 2.883584 12.900352 3.922944 20.681728 1.089024 8.152576 1.517568 16.634368 0.845824 23.003136-0.671232 6.368768-2.648576 9.806848-2.995712 10.153984-22.296064 22.296064-61.873664 35.298816-102.017024 35.298816-40.143872 0-79.72096-13.002752-102.017024-35.298816-0.347136-0.347136-2.32448-3.785216-2.996224-10.153984-0.671232-6.368768-0.2432-14.85056 0.846336-23.003136 1.044992-7.824384 2.603008-15.186944 3.945984-20.779008 9.483264-3.29728 18.82624-6.30784 27.86816-9.053696l2.55744-34.656256c-2.082816-2.671104-4.205056-4.440576-6.73792-6.34112-9.789952-7.34464-21.66272-23.502336-30.04928-42.38592-8.382976-18.876416-13.576704-40.45312-13.584384-57.724928 0.051712-20.707328 5.62432-40.556032 15.859712-57.700864 1.831424-0.681984 3.762688-1.402368 5.933056-2.116096 7.632896-2.510336 18.092544-4.906496 36.273152-4.860928zM368.312832 501.68576c-0.032256 0.23552-0.068096 0.464384-0.09984 0.700416-1.324544 9.913856-2.102784 20.70528-0.964096 31.506944 1.138688 10.801152 3.98848 22.43072 13.296128 31.737856 31.768576 31.768576 79.8464 45.796864 127.358976 45.796864 47.512064 0 95.5904-14.0288 127.358976-45.796864 9.307136-9.307136 12.15744-20.936704 13.296128-31.737856 1.138688-10.801664 0.360448-21.593088-0.964096-31.506944-0.026112-0.195584-0.05632-0.385536-0.082944-0.580096 48.299008 21.180928 94.98368 51.51488 120.743936 96.805888V791.04H682.496v-135.68h-35.84v135.68H368.128v-135.68h-35.84v135.68H247.296v-192.428032c25.808896-45.376512 72.621056-75.74016 121.016832-96.926208z',
+                    }),
+                ]
+            ),
+        ]);
+    }
+}
+
+const nodeType = NodeTypeEnum.UserTask;
+const nodeTypeExtra = nodeType.extra;
+
+export default {
+    order: nodeTypeExtra.order,
+    type: nodeType.value,
+    // 注册配置信息
+    registerConf: {
+        type: nodeType.value,
+        model: UserTaskModel,
+        view: UserTaskView,
+    },
+    dndPanelConf: {
+        type: nodeType.value,
+        text: nodeTypeExtra.text,
+        label: nodeType.label,
+        icon: 'data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODg4ODY2Mjc1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI4OTEiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTMzNS43NTE2OCAyNDQuNzgzMTA0Yy01Mi4xNDQ2NCAwLTg5LjQ0NzkzNiA0MC4wODYwMTYtODkuNTUyMzg0IDg1Ljc0NjY4OHYwLjAyNTZjMC4wMDMwNzIgMTMuODA4NjQgMy43Mzk2NDggMjguMzgxNjk2IDkuNTc3NDcyIDQxLjUyNjI3MiA0LjIxNTI5NiA5LjQ5MTQ1NiA5LjQ1NTYxNiAxOC4yMTY5NiAxNS44NDEyOCAyNS4yMDY3ODQtMzcuOTUyNTEyIDEyLjk4NDMyLTgyLjQxNjEyOCAzNC4zNTQ2ODgtMTA0Ljg4OTg1NiA3Ni40OTI4bC0xLjIxMTM5MiAyLjI3MTIzMnYxMzYuNDA4NTc2aDM0MC40Njk3NlY0NzYuMDUyNDhsLTEuMjEwODgtMi4yNzA3MmMtMjIuMTUwNjU2LTQxLjUzMjkyOC02NS42NTIyMjQtNjIuODczMDg4LTEwMy4yMzgxNDQtNzUuOTExMTY4IDE4LjM0ODAzMi0xOC42NTgzMDQgMjMuNzYwODk2LTQyLjc0MDczNiAyMy43NjcwNC02Ny4zMTUydi0wLjAyNTZjLTAuMTA0OTYtNDUuNjYwNjcyLTM3LjQwNzc0NC04NS43NDY2ODgtODkuNTUyODk2LTg1Ljc0NjY4OHogbS0zNS42MDI5NDQgNDguNjIxNTY4YzIuNDA5OTg0IDAuMDA2MTQ0IDUuMDU2NTEyIDAuMDg2NTI4IDcuOTczODg4IDAuMjU4NTYgMjMuMjQzNzc2IDEuMzY5NiAzMS4wNjcxMzYgNS41NTM2NjQgMzcuMDgwMDY0IDkuNTIyMTc2IDYuMDEzNDQgMy45NjggMTAuMjUyOCA3Ljc0NTUzNiAyNi4xNDQyNTYgOC4yMDg4OTZoMC4wMTAyNGMxMi4zODM3NDQtMC40NjMzNiAxOC4zMzk4NC0yLjY3MTEwNCAyMi42MDk5Mi01LjE3MjIyNCAxLjczMDU2LTEuMDEzNzYgMy4xODQ2NC0yLjA2Njk0NCA0LjY3MzUzNi0zLjA3MzAyNCAzLjkzNTc0NCA4LjQzNjczNiA2LjA0OTI4IDE3Ljc2MjgxNiA2LjA3MzM0NCAyNy40MTUwNC0wLjAwODE5MiAyNy40ODQ2NzItNC43MzM0NCA0Ni43MzIyODgtMjkuOTM0MDggNjIuNDgyOTQ0bDIuNDY1MjggMTguNTgwNDhhNDIyLjQwMjU2IDQyMi40MDI1NiAwIDAgMSAxNi4xNzA0OTYgNS4yNTc3MjhjMC43NjggMy4yMDYxNDQgMS42NTYzMiA3LjQxMTIgMi4yNTMzMTIgMTEuODgxNDcyIDAuNjI1NjY0IDQuNjgzNzc2IDAuODcxOTM2IDkuNTU2NDggMC40ODY0IDEzLjIxNTIzMi0wLjM4NjA0OCAzLjY1ODc1Mi0xLjUyMjE3NiA1LjYzNDA0OC0xLjcyMTM0NCA1LjgzMzcyOC0xMi44MDkyMTYgMTIuODA4NzA0LTM1LjU0NjExMiAyMC4yNzg3ODQtNTguNjA4NjQgMjAuMjc4Nzg0LTIzLjA2MjAxNiAwLTQ1Ljc5OTQyNC03LjQ3MDA4LTU4LjYwODY0LTIwLjI3ODc4NC0wLjE5OTE2OC0wLjE5OTY4LTEuMzM1Mjk2LTIuMTc0OTc2LTEuNzIwODMyLTUuODMzNzI4LTAuMzg1NTM2LTMuNjU4NzUyLTAuMTM5Nzc2LTguNTMxNDU2IDAuNDg2NC0xMy4yMTQ3MiAwLjYwMDA2NC00LjQ5NTM2IDEuNDk1MDQtOC43MjU1MDQgMi4yNjY2MjQtMTEuOTM3NzkyYTQyMi45ODIxNDQgNDIyLjk4MjE0NCAwIDAgMSAxNi4wMTAyNC01LjIwMTkybDEuNDY5NDQtMTkuOTA5NjMyYy0xLjE5NjU0NC0xLjUzNDQ2NC0yLjQxNTYxNi0yLjU1MDc4NC0zLjg3MDcyLTMuNjQyODgtNS42MjQ4MzItNC4yMTg4OC0xMi40NDUxODQtMTMuNTAxOTUyLTE3LjI2MzEwNC0yNC4zNTA3Mi00LjgxNjM4NC0xMC44NDQxNi03LjgwMDMyLTIzLjIzOTY4LTcuODA0OTI4LTMzLjE2MjI0IDAuMDMwMjA4LTExLjg5NjgzMiAzLjIzMTc0NC0yMy4yOTk1ODQgOS4xMTE1NTItMzMuMTQ5NDQgMS4wNTIxNi0wLjM5MTY4IDIuMTYxNjY0LTAuODA1Mzc2IDMuNDA4Mzg0LTEuMjE1NDg4IDQuMzg1MjgtMS40NDIzMDQgMTAuMzk0MTEyLTIuODE5MDcyIDIwLjgzODkxMi0yLjc5MjQ0OHogbS00NC41MTg0IDEzMi4yMzMyMTZjLTAuMDE3OTIgMC4xMzUxNjgtMC4wMzg5MTIgMC4yNjY3NTItMC4wNTY4MzIgMC40MDI0MzItMC43NjA4MzIgNS42OTU0ODgtMS4yMDgzMiAxMS44OTUyOTYtMC41NTM5ODQgMTguMTAwNzM2IDAuNjU0MzM2IDYuMjA1NDQgMi4yOTE3MTIgMTIuODg2NTI4IDcuNjM4NTI4IDE4LjIzMzM0NCAxOC4yNTA3NTIgMTguMjUwNzUyIDQ1Ljg3MTYxNiAyNi4zMTAxNDQgNzMuMTY3MzYgMjYuMzEwMTQ0IDI3LjI5NTIzMiAwIDU0LjkxNjYwOC04LjA1ODg4IDczLjE2NzM2LTI2LjMxMDE0NCA1LjM0NjgxNi01LjM0NjgxNiA2Ljk4NDE5Mi0xMi4wMjc5MDQgNy42Mzg1MjgtMTguMjMzMzQ0IDAuNjUzODI0LTYuMjA1NDQgMC4yMDY4NDgtMTIuNDA1MjQ4LTAuNTUzOTg0LTE4LjEwMDczNi0wLjAxNTM2LTAuMTEyNjQtMC4wMzIyNTYtMC4yMjExODQtMC4wNDc2MTYtMC4zMzI4IDI3Ljc0NzMyOCAxMi4xNjc2OCA1NC41Njc5MzYgMjkuNTk0NjI0IDY5LjM2Njc4NCA1NS42MTQ0NjR2MTEwLjU0ODk5MmgtNDkuMjY4NzM2di03Ny45NDczOTJoLTIwLjU5MDA4djc3Ljk0NzM5MkgyNTUuNTI0MzUydi03Ny45NDczOTJoLTIwLjU4OTU2OHY3Ny45NDczOTJIMTg2LjEwNjg4VjQ4MS4zMjE5ODRjMTQuODI3NTItMjYuMDY4NDggNDEuNzIwODMyLTQzLjUxMjMyIDY5LjUyMzk2OC01NS42ODQwOTZ6TTIxOS45ODA4IDEwNy41MkMxMTAuMDQ2MjA4IDEwNy41MiAyMC40OCAxOTYuNzA3ODQgMjAuNDggMzA2LjQzMnY0MTEuMTM2YzAgMTA5LjcyMzY0OCA4OS41NjYyMDggMTk4LjkxMiAxOTkuNTAwOCAxOTguOTEyaDU4NC4wMzg0YzEwOS45MzQ1OTIgMCAxOTkuNTAwOC04OS4xODgzNTIgMTk5LjUwMDgtMTk4LjkxMnYtNDExLjEzNmMwLTEwOS43MjM2NDgtODkuNTY2MjA4LTE5OC45MTItMTk5LjUwMDgtMTk4LjkxMkgyMTkuOTgwOHogbTAgNjEuNDRoNTg0LjAzODRDODgxLjA5NDE0NCAxNjguOTYgOTQyLjA4IDIyOS43OTg0IDk0Mi4wOCAzMDYuNDMydjQxMS4xMzZjMCA3Ni42MzMwODgtNjAuOTg1ODU2IDEzNy40NzItMTM4LjA2MDggMTM3LjQ3MkgyMTkuOTgwOEMxNDIuOTA1ODU2IDg1NS4wNCA4MS45MiA3OTQuMjAwNTc2IDgxLjkyIDcxNy41Njh2LTQxMS4xMzZDODEuOTIgMjI5Ljc5ODQgMTQyLjkwNTg1NiAxNjguOTYgMjE5Ljk4MDggMTY4Ljk2eiIgcC1pZD0iMjg5MiI+PC9wYXRoPjwvc3ZnPg==',
+        properties: nodeTypeExtra.defaultProp,
+    },
+    propSettingComp: PropSetting,
+};
diff --git a/frontend/src/views/flow/enums.ts b/frontend/src/views/flow/enums.ts
index 3c062c0d..94012611 100644
--- a/frontend/src/views/flow/enums.ts
+++ b/frontend/src/views/flow/enums.ts
@@ -5,6 +5,12 @@ export const ProcdefStatus = {
     Disable: EnumValue.of(-1, 'flow.disable').setTagType('warning'),
 };
 
+export const UserTaskCandidateType = {
+    Account: EnumValue.of('account', 'common.account'),
+    Role: EnumValue.of('role', 'common.role'),
+    Other: EnumValue.of('other', 'common.other'),
+};
+
 export const ProcinstStatus = {
     Active: EnumValue.of(1, 'flow.active').setTagType('primary'),
     Completed: EnumValue.of(2, 'flow.completed').setTagType('success'),
@@ -28,6 +34,12 @@ export const ProcinstTaskStatus = {
     Canceled: EnumValue.of(-3, 'flow.canceled').setTagType('warning'),
 };
 
+export const HisProcinstOpState = {
+    Pending: EnumValue.of(1, 'flow.waitProcess').setTagType('primary'),
+    Completed: EnumValue.of(2, 'flow.pass').setTagType('success'),
+    Failed: EnumValue.of(-1, 'flow.reject').setTagType('danger'),
+};
+
 export const FlowBizType = {
     DbSqlExec: EnumValue.of('db_sql_exec_flow', 'flow.dbSqlExec').setTagType('warning'),
     RedisRunWriteCmd: EnumValue.of('redis_run_cmd_flow', 'flow.redisRunCmd').setTagType('danger'),
diff --git a/frontend/src/views/flow/flowbiz/dbms/DbSqlExecBiz.vue b/frontend/src/views/flow/flowbiz/dbms/DbSqlExecBiz.vue
index 7b731933..c98e32c5 100755
--- a/frontend/src/views/flow/flowbiz/dbms/DbSqlExecBiz.vue
+++ b/frontend/src/views/flow/flowbiz/dbms/DbSqlExecBiz.vue
@@ -24,7 +24,7 @@
                     <template #default="scope">
                         <el-popover placement="top" width="50%" trigger="hover">
                             <template #reference>
-                                <el-link icon="view" :type="scope.row.errorMsg ? 'danger' : 'success'" :underline="false"> </el-link>
+                                <el-link icon="view" :type="scope.row.errorMsg ? 'danger' : 'success'" underline="never"> </el-link>
                             </template>
 
                             <el-text v-if="scope.row.errorMsg">{{ scope.row.errorMsg }}</el-text>
diff --git a/frontend/src/views/msg/tmpl/TmplList.vue b/frontend/src/views/msg/tmpl/TmplList.vue
index 655c1d21..87034bb0 100755
--- a/frontend/src/views/msg/tmpl/TmplList.vue
+++ b/frontend/src/views/msg/tmpl/TmplList.vue
@@ -19,7 +19,7 @@
             <template #relateChannel="{ data }">
                 <el-popover placement="top-start" trigger="click" width="auto">
                     <template #reference>
-                        <el-link @click="getRelateChannels(data.id)" icon="view" type="primary" :underline="false"></el-link>
+                        <el-link @click="getRelateChannels(data.id)" icon="view" type="primary" underline="never"></el-link>
                     </template>
                     <el-row v-for="item in state.relateChannels" :key="item.id">
                         {{ $t(EnumValue.getLabelByValue(ChannelTypeEnum, item.type)) }}
diff --git a/frontend/src/views/ops/component/TagCodePath.vue b/frontend/src/views/ops/component/TagCodePath.vue
index 3cb5e0fe..71a2f362 100644
--- a/frontend/src/views/ops/component/TagCodePath.vue
+++ b/frontend/src/views/ops/component/TagCodePath.vue
@@ -1,36 +1,34 @@
 <template>
-    <div v-if="codePaths">
-        <el-row v-for="(path, idx) in codePaths?.slice(0, 1)" :key="idx">
-            <span v-for="item in path" :key="item.code">
-                <SvgIcon
-                    :name="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.icon"
-                    :color="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.iconColor"
-                    class="mr-0.5"
-                />
-                <span> {{ item.name ? item.name : item.code }}</span>
-                <SvgIcon v-if="!item.isEnd" class="mr-1 ml-1" name="arrow-right" />
-            </span>
+    <el-row v-for="(path, idx) in codePaths?.slice(0, 1)" :key="idx">
+        <span v-for="item in path" :key="item.code">
+            <SvgIcon
+                :name="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.icon"
+                :color="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.iconColor"
+                class="mr-0.5"
+            />
+            <span> {{ item.name ? item.name : item.code }}</span>
+            <SvgIcon v-if="!item.isEnd" class="mr-1 ml-1" name="arrow-right" />
+        </span>
 
-            <!-- 展示剩余的标签信息 -->
-            <el-popover :show-after="300" v-if="paths.length > 1 && idx == 0" placement="bottom" width="500" trigger="hover">
-                <template #reference>
-                    <SvgIcon class="mt-1 ml-1" color="var(--el-color-primary)" name="MoreFilled" />
-                </template>
+        <!-- 展示剩余的标签信息 -->
+        <el-popover :show-after="300" v-if="paths.length > 1 && idx == 0" placement="bottom" width="500" trigger="hover">
+            <template #reference>
+                <SvgIcon class="mt-1 ml-1" color="var(--el-color-primary)" name="MoreFilled" />
+            </template>
 
-                <el-row v-for="i in paths.slice(1)" :key="i">
-                    <span v-for="item in parseTagPath(i)" :key="item.code">
-                        <SvgIcon
-                            :name="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.icon"
-                            :color="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.iconColor"
-                            class="mr-0.5"
-                        />
-                        <span> {{ item.name ? item.name : item.code }}</span>
-                        <SvgIcon v-if="!item.isEnd" class="mr-1 ml-1" name="arrow-right" />
-                    </span>
-                </el-row>
-            </el-popover>
-        </el-row>
-    </div>
+            <el-row v-for="i in paths.slice(1)" :key="i">
+                <span v-for="item in parseTagPath(i)" :key="item.code">
+                    <SvgIcon
+                        :name="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.icon"
+                        :color="EnumValue.getEnumByValue(TagResourceTypeEnum, item.type)?.extra.iconColor"
+                        class="mr-0.5"
+                    />
+                    <span> {{ item.name ? item.name : item.code }}</span>
+                    <SvgIcon v-if="!item.isEnd" class="mr-1 ml-1" name="arrow-right" />
+                </span>
+            </el-row>
+        </el-popover>
+    </el-row>
 </template>
 
 <script lang="ts" setup>
@@ -41,7 +39,7 @@ import { getAllTagInfoByCodePaths } from './tag';
 
 const props = defineProps({
     path: {
-        type: [String, Array<string>],
+        type: [String, Array<string>, Array<Object>],
     },
     tagInfos: {
         type: Object, // key: code , value: code info
@@ -53,7 +51,16 @@ let allTagInfos: any = {};
 
 const paths = computed(() => {
     if (Array.isArray(props.path)) {
-        return props.path;
+        const ps = [];
+        // 兼容["default/test1/test2/"] 与 [{id: 1, codePath: "default/test1/test2/"}]
+        for (let p of props.path as any) {
+            if (typeof p === 'string') {
+                ps.push(p);
+            } else {
+                ps.push(p.codePath);
+            }
+        }
+        return ps;
     }
 
     return [props.path];
diff --git a/frontend/src/views/ops/component/TagTree.vue b/frontend/src/views/ops/component/TagTree.vue
index 239601f0..eae88641 100644
--- a/frontend/src/views/ops/component/TagTree.vue
+++ b/frontend/src/views/ops/component/TagTree.vue
@@ -35,7 +35,7 @@
                             <slot name="label" :data="data" v-if="!data.disabled"> {{ $t(data.label) }}</slot>
                             <!-- 禁用状态 -->
                             <slot name="disabledLabel" :data="data" v-else>
-                                <el-link type="danger" disabled :underline="false">
+                                <el-link type="danger" disabled underline="never">
                                     {{ `${$t(data.label)}` }}
                                 </el-link>
                             </slot>
diff --git a/frontend/src/views/ops/component/TagTreeCheck.vue b/frontend/src/views/ops/component/TagTreeCheck.vue
index 83c91b1f..df0dc197 100755
--- a/frontend/src/views/ops/component/TagTreeCheck.vue
+++ b/frontend/src/views/ops/component/TagTreeCheck.vue
@@ -7,7 +7,7 @@
                     v-bind="$attrs"
                     ref="tagTreeRef"
                     :data="state.tags"
-                    :default-expanded-keys="state.defaultExpandedKeys"
+                    :default-expanded-keys="checkedTags"
                     :default-checked-keys="checkedTags"
                     multiple
                     :render-after-expand="true"
@@ -75,12 +75,10 @@ const tagTreeRef: any = ref(null);
 const filterTag = ref('');
 
 const state = reactive({
-    defaultExpandedKeys: [] as any,
     tags: [],
 });
 
 onMounted(() => {
-    state.defaultExpandedKeys = checkedTags.value;
     search();
 });
 
diff --git a/frontend/src/views/ops/db/DbList.vue b/frontend/src/views/ops/db/DbList.vue
index 858acc31..94262495 100644
--- a/frontend/src/views/ops/db/DbList.vue
+++ b/frontend/src/views/ops/db/DbList.vue
@@ -486,7 +486,7 @@ const onDumpDbs = async (row: any) => {
  * 数据库信息导出
  */
 const dumpDbs = async () => {
-    isTrue(state.exportDialog.value.length > 0, t('db.noDumpDbMsg'));
+    isTrue(state.exportDialog.value.length > 0, 'db.noDumpDbMsg');
     let type = 0;
     for (let c of state.exportDialog.contents) {
         if (c == '结构') {
diff --git a/frontend/src/views/ops/db/DbSqlExecLog.vue b/frontend/src/views/ops/db/DbSqlExecLog.vue
index f2c5ebba..f60972f0 100644
--- a/frontend/src/views/ops/db/DbSqlExecLog.vue
+++ b/frontend/src/views/ops/db/DbSqlExecLog.vue
@@ -25,7 +25,7 @@
                     type="primary"
                     plain
                     size="small"
-                    :underline="false"
+                    underline="never"
                     @click="onShowRollbackSql(data)"
                 >
                     {{ $t('db.restoreSql') }}</el-link
diff --git a/frontend/src/views/ops/db/SqlExec.vue b/frontend/src/views/ops/db/SqlExec.vue
index 56e2c394..3183f11d 100644
--- a/frontend/src/views/ops/db/SqlExec.vue
+++ b/frontend/src/views/ops/db/SqlExec.vue
@@ -119,7 +119,7 @@
                                         </el-row>
 
                                         <template #reference>
-                                            <el-link type="primary" icon="setting" :underline="false"></el-link>
+                                            <el-link type="primary" icon="setting" underline="never"></el-link>
                                         </template>
                                     </el-popover>
                                 </el-descriptions-item>
diff --git a/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue b/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
index 5c1fac0c..7f3afb16 100644
--- a/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
+++ b/frontend/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
@@ -3,16 +3,16 @@
         <div>
             <div class="card !p-1 flex items-center justify-between">
                 <div>
-                    <el-link @click="onRunSql()" :underline="false" class="ml-3.5" icon="VideoPlay"> </el-link>
+                    <el-link @click="onRunSql()" underline="never" class="ml-3.5" icon="VideoPlay"> </el-link>
                     <el-divider direction="vertical" border-style="dashed" />
 
                     <el-tooltip :show-after="1000" class="box-item" effect="dark" content="format sql" placement="top">
-                        <el-link @click="formatSql()" type="primary" :underline="false" icon="MagicStick"> </el-link>
+                        <el-link @click="formatSql()" type="primary" underline="never" icon="MagicStick"> </el-link>
                     </el-tooltip>
                     <el-divider direction="vertical" border-style="dashed" />
 
                     <el-tooltip :show-after="1000" class="box-item" effect="dark" content="commit" placement="top">
-                        <el-link @click="onCommit()" type="success" :underline="false" icon="CircleCheck"> </el-link>
+                        <el-link @click="onCommit()" type="success" underline="never" icon="CircleCheck"> </el-link>
                     </el-tooltip>
                     <el-divider direction="vertical" border-style="dashed" />
 
@@ -28,7 +28,7 @@
                         :limit="100"
                     >
                         <el-tooltip :show-after="1000" class="box-item" effect="dark" :content="$t('db.sqlScriptRun')" placement="top">
-                            <el-link v-auth="'db:sqlscript:run'" type="success" :underline="false" icon="Document"></el-link>
+                            <el-link v-auth="'db:sqlscript:run'" type="success" underline="never" icon="Document"></el-link>
                         </el-tooltip>
                     </el-upload>
                 </div>
@@ -96,13 +96,13 @@
                             <el-row>
                                 <span v-if="dt.hasUpdatedFileds" class="mt-1">
                                     <span>
-                                        <el-link type="success" :underline="false" @click="submitUpdateFields(dt)"
+                                        <el-link type="success" underline="never" @click="submitUpdateFields(dt)"
                                             ><span style="font-size: 12px">{{ $t('common.submit') }}</span></el-link
                                         >
                                     </span>
                                     <span>
                                         <el-divider direction="vertical" border-style="dashed" />
-                                        <el-link type="warning" :underline="false" @click="cancelUpdateFields(dt)"
+                                        <el-link type="warning" underline="never" @click="cancelUpdateFields(dt)"
                                             ><span style="font-size: 12px">{{ $t('common.cancel') }}</span></el-link
                                         >
                                     </span>
diff --git a/frontend/src/views/ops/db/component/table/DbTableDataOp.vue b/frontend/src/views/ops/db/component/table/DbTableDataOp.vue
index c9be1c49..bc66d1b9 100644
--- a/frontend/src/views/ops/db/component/table/DbTableDataOp.vue
+++ b/frontend/src/views/ops/db/component/table/DbTableDataOp.vue
@@ -3,7 +3,7 @@
         <el-row>
             <el-col :span="8">
                 <div class="mt-1">
-                    <el-link :disabled="state.loading" @click="onRefresh()" icon="refresh" :underline="false" class="ml-1"> </el-link>
+                    <el-link :disabled="state.loading" @click="onRefresh()" icon="refresh" underline="never" class="ml-1"> </el-link>
                     <el-divider direction="vertical" border-style="dashed" />
 
                     <el-popover
@@ -37,25 +37,25 @@
                             </el-checkbox-group>
                         </div>
                         <template #reference>
-                            <el-link icon="Operation" size="small" :underline="false"></el-link>
+                            <el-link icon="Operation" size="small" underline="never"></el-link>
                         </template>
                     </el-popover>
                     <el-divider direction="vertical" border-style="dashed" />
 
-                    <el-link @click="onShowAddDataDialog()" type="primary" icon="plus" :underline="false"></el-link>
+                    <el-link @click="onShowAddDataDialog()" type="primary" icon="plus" underline="never"></el-link>
                     <el-divider direction="vertical" border-style="dashed" />
 
                     <el-tooltip :show-after="500" effect="dark" content="commit" placement="top">
-                        <el-link @click="onCommit()" type="success" icon="CircleCheck" :underline="false"> </el-link>
+                        <el-link @click="onCommit()" type="success" icon="CircleCheck" underline="never"> </el-link>
                     </el-tooltip>
                     <el-divider direction="vertical" border-style="dashed" />
 
                     <el-tooltip :show-after="500" v-if="hasUpdatedFileds" :content="$t('db.submitUpdate')" placement="top">
-                        <el-link @click="submitUpdateFields()" type="success" :underline="false" class="!text-[12px]">{{ $t('common.submit') }}</el-link>
+                        <el-link @click="submitUpdateFields()" type="success" underline="never" class="!text-[12px]">{{ $t('common.submit') }}</el-link>
                     </el-tooltip>
                     <el-divider v-if="hasUpdatedFileds" direction="vertical" border-style="dashed" />
                     <el-tooltip :show-after="500" v-if="hasUpdatedFileds" :content="$t('db.cancelUpdate')" placement="top">
-                        <el-link @click="cancelUpdateFields" type="warning" :underline="false" class="!text-[12px]">{{ $t('common.cancel') }}</el-link>
+                        <el-link @click="cancelUpdateFields" type="warning" underline="never" class="!text-[12px]">{{ $t('common.cancel') }}</el-link>
                     </el-tooltip>
                 </div>
             </el-col>
@@ -160,10 +160,10 @@
             </el-col>
             <el-col :span="12">
                 <el-row :gutter="10" justify="left">
-                    <el-link class="op-page" :underline="false" @click="pageNum = 1" :disabled="pageNum == 1" icon="DArrowLeft" :title="$t('db.homePage')" />
+                    <el-link class="op-page" underline="never" @click="pageNum = 1" :disabled="pageNum == 1" icon="DArrowLeft" :title="$t('db.homePage')" />
                     <el-link
                         class="op-page"
-                        :underline="false"
+                        underline="never"
                         @click="pageNum = --pageNum || 1"
                         :disabled="pageNum == 1"
                         icon="Back"
@@ -180,8 +180,8 @@
                             @keydown.enter="handleSetPageNum"
                         />
                     </div>
-                    <el-link class="op-page" :underline="false" @click="++pageNum" :disabled="datas.length < pageSize" icon="Right" />
-                    <el-link class="op-page" :underline="false" @click="handleEndPage" :disabled="datas.length < pageSize" icon="DArrowRight" />
+                    <el-link class="op-page" underline="never" @click="++pageNum" :disabled="datas.length < pageSize" icon="Right" />
+                    <el-link class="op-page" underline="never" @click="handleEndPage" :disabled="datas.length < pageSize" icon="DArrowRight" />
                     <div style="width: 90px" class="op-page ml-2">
                         <el-select size="small" :default-first-option="true" v-model="pageSize" @change="handleSizeChange">
                             <el-option
diff --git a/frontend/src/views/ops/db/component/table/DbTableOp.vue b/frontend/src/views/ops/db/component/table/DbTableOp.vue
index 87c1c730..2d35ee87 100644
--- a/frontend/src/views/ops/db/component/table/DbTableOp.vue
+++ b/frontend/src/views/ops/db/component/table/DbTableOp.vue
@@ -66,7 +66,7 @@
 
                                 <el-popconfirm v-else-if="item.prop === 'action'" :title="$t('common.deleteConfirm')" @confirm="deleteRow(scope.$index)">
                                     <template #reference>
-                                        <el-link type="danger" plain size="small" :underline="false">{{ $t('common.delete') }}</el-link>
+                                        <el-link type="danger" plain size="small" underline="never">{{ $t('common.delete') }}</el-link>
                                     </template>
                                 </el-popconfirm>
                             </template>
@@ -107,7 +107,7 @@
 
                                 <el-popconfirm v-else-if="item.prop === 'action'" :title="$t('common.deleteConfirm')" @confirm="deleteIndex(scope.$index)">
                                     <template #reference>
-                                        <el-link type="danger" plain size="small" :underline="false">{{ $t('common.delete') }}</el-link>
+                                        <el-link type="danger" plain size="small" underline="never">{{ $t('common.delete') }}</el-link>
                                     </template>
                                 </el-popconfirm>
                             </template>
diff --git a/frontend/src/views/ops/db/component/table/DbTablesOp.vue b/frontend/src/views/ops/db/component/table/DbTablesOp.vue
index 5241bfea..b4bef51a 100644
--- a/frontend/src/views/ops/db/component/table/DbTablesOp.vue
+++ b/frontend/src/views/ops/db/component/table/DbTablesOp.vue
@@ -137,13 +137,10 @@ import { DbInst } from '../../db';
 import MonacoEditor from '@/components/monaco/MonacoEditor.vue';
 import { format as sqlFormatter } from 'sql-formatter';
 import { fuzzyMatchField } from '@/common/utils/string';
-import { useI18n } from 'vue-i18n';
 import { useI18nCreateTitle, useI18nDeleteConfirm, useI18nEditTitle } from '@/hooks/useI18n';
 
 const DbTableOp = defineAsyncComponent(() => import('./DbTableOp.vue'));
 
-const { t } = useI18n();
-
 const props = defineProps({
     height: {
         type: [String],
@@ -256,7 +253,7 @@ const handleDumpTableSelectionChange = (vals: any) => {
  * 数据库信息导出
  */
 const dump = (db: string) => {
-    isTrue(state.dumpInfo.tables.length > 0, t('db.selectExportTable'));
+    isTrue(state.dumpInfo.tables.length > 0, 'db.selectExportTable');
     const tableNames = state.dumpInfo.tables.map((x: any) => x.tableName);
     const a = document.createElement('a');
     a.setAttribute(
diff --git a/frontend/src/views/ops/machine/MachineList.vue b/frontend/src/views/ops/machine/MachineList.vue
index c1c3928f..cb3a7531 100644
--- a/frontend/src/views/ops/machine/MachineList.vue
+++ b/frontend/src/views/ops/machine/MachineList.vue
@@ -20,7 +20,7 @@
             </template>
 
             <template #ipPort="{ data }">
-                <el-link :disabled="data.status == -1" @click="showMachineStats(data)" type="primary" :underline="false">
+                <el-link :disabled="data.status == -1" @click="showMachineStats(data)" type="primary" underline="never">
                     {{ `${data.ip}:${data.port}` }}
                 </el-link>
             </template>
diff --git a/frontend/src/views/ops/machine/MachineStats.vue b/frontend/src/views/ops/machine/MachineStats.vue
index dc358fce..82822d2b 100644
--- a/frontend/src/views/ops/machine/MachineStats.vue
+++ b/frontend/src/views/ops/machine/MachineStats.vue
@@ -5,7 +5,7 @@
                 <el-col :lg="12" :md="12">
                     <el-descriptions size="small" :title="$t('machine.basicInfo')" :column="2" border>
                         <template #extra>
-                            <el-link @click="onRefresh" icon="refresh" :underline="false" type="success"></el-link>
+                            <el-link @click="onRefresh" icon="refresh" underline="never" type="success"></el-link>
                         </template>
                         <el-descriptions-item :label="$t('machine.hostname')">
                             {{ stats.hostname }}
diff --git a/frontend/src/views/ops/machine/cronjob/CronJobList.vue b/frontend/src/views/ops/machine/cronjob/CronJobList.vue
index c2bf094a..8bcfba29 100644
--- a/frontend/src/views/ops/machine/cronjob/CronJobList.vue
+++ b/frontend/src/views/ops/machine/cronjob/CronJobList.vue
@@ -22,7 +22,7 @@
             </template>
 
             <template #codePaths="{ data }">
-                <TagCodePath :path="data.tags?.map((tag: any) => tag.codePath)" />
+                <TagCodePath :path="data.tags" />
             </template>
 
             <template #action="{ data }">
diff --git a/frontend/src/views/ops/machine/file/MachineFile.vue b/frontend/src/views/ops/machine/file/MachineFile.vue
index 01c1d24b..62527880 100755
--- a/frontend/src/views/ops/machine/file/MachineFile.vue
+++ b/frontend/src/views/ops/machine/file/MachineFile.vue
@@ -172,7 +172,7 @@
                                         v-model="scope.row.name"
                                     />
                                 </div>
-                                <el-link v-else @click="getFile(scope.row)" style="font-weight: bold" :underline="false">{{ scope.row.name }}</el-link>
+                                <el-link v-else @click="getFile(scope.row)" style="font-weight: bold" underline="never">{{ scope.row.name }}</el-link>
                             </span>
                         </template>
                     </el-table-column>
@@ -231,7 +231,7 @@
                                             <el-link
                                                 @click="showFileStat(scope.row)"
                                                 icon="InfoFilled"
-                                                :underline="false"
+                                                underline="never"
                                                 link
                                                 :loading="scope.row.loadingStat"
                                             ></el-link>
@@ -247,7 +247,7 @@
                                     v-auth="'machine:file:write'"
                                     type="primary"
                                     icon="download"
-                                    :underline="false"
+                                    underline="never"
                                     :title="$t('machine.download')"
                                 ></el-link>
 
@@ -258,7 +258,7 @@
                                     v-auth="'machine:file:rm'"
                                     type="danger"
                                     icon="delete"
-                                    :underline="false"
+                                    underline="never"
                                     :title="$t('common.delete')"
                                 ></el-link>
                             </div>
@@ -469,7 +469,7 @@ const setCopyOrMvFile = (files: any[], type = 'cp') => {
 
 const pasteFile = async () => {
     const cmFile = state.copyOrMvFile;
-    isTrue(state.nowPath != cmFile.fromPath, t('machine.sameDirNoPaste'));
+    isTrue(state.nowPath != cmFile.fromPath, 'machine.sameDirNoPaste');
     const api = isCpFile() ? machineApi.cpFile : machineApi.mvFile;
     try {
         state.loading = true;
@@ -544,7 +544,7 @@ const getFile = async (row: any) => {
     if (row.type == folderType) {
         await setFiles(row.path);
     } else {
-        isTrue(row.size < 1 * 1024 * 1024, t('machine.fileTooLargeTips'));
+        isTrue(row.size < 1 * 1024 * 1024, 'machine.fileTooLargeTips');
         await showFileContent(row.path);
     }
 };
diff --git a/frontend/src/views/ops/machine/security/CmdConfList.vue b/frontend/src/views/ops/machine/security/CmdConfList.vue
index 892def1b..f95f44f6 100644
--- a/frontend/src/views/ops/machine/security/CmdConfList.vue
+++ b/frontend/src/views/ops/machine/security/CmdConfList.vue
@@ -11,7 +11,7 @@
             </el-table-column>
             <el-table-column prop="codePaths" :label="$t('machine.relateMachine')" min-width="250px" show-overflow-tooltip>
                 <template #default="scope">
-                    <TagCodePath :path="scope.row.tags?.map((tag: any) => tag.codePath)" />
+                    <TagCodePath :path="scope.row.tags" />
                 </template>
             </el-table-column>
             <el-table-column prop="remark" :label="$t('common.remark')" show-overflow-tooltip width="120px"> </el-table-column>
diff --git a/frontend/src/views/ops/mongo/MongoDataOp.vue b/frontend/src/views/ops/mongo/MongoDataOp.vue
index 47e18060..2fc47f09 100644
--- a/frontend/src/views/ops/mongo/MongoDataOp.vue
+++ b/frontend/src/views/ops/mongo/MongoDataOp.vue
@@ -78,9 +78,9 @@
                                 <el-row>
                                     <el-col :span="2">
                                         <div class="mt-1">
-                                            <el-link @click="findCommand(state.activeName)" icon="refresh" :underline="false" class=""> </el-link>
+                                            <el-link @click="findCommand(state.activeName)" icon="refresh" underline="never" class=""> </el-link>
                                             <el-divider direction="vertical" border-style="dashed" />
-                                            <el-link v-auth="perms.saveData" @click="onEditDoc(null)" type="primary" icon="plus" :underline="false"> </el-link>
+                                            <el-link v-auth="perms.saveData" @click="onEditDoc(null)" type="primary" icon="plus" underline="never"> </el-link>
                                         </div>
                                     </el-col>
                                     <el-col :span="22">
@@ -101,13 +101,13 @@
                                                 <el-input type="textarea" v-model="item.value" :rows="10" />
                                                 <div style="padding: 3px; float: right" class="mr-1 mongo-doc-btns">
                                                     <div>
-                                                        <el-link @click="onEditDoc(item)" :underline="false" type="success" icon="MagicStick"></el-link>
+                                                        <el-link @click="onEditDoc(item)" underline="never" type="success" icon="MagicStick"></el-link>
 
                                                         <el-divider direction="vertical" border-style="dashed" />
 
                                                         <el-popconfirm @confirm="onDeleteDoc(item.value)" :title="$t('mongo.deleteDocConfirm')" width="160">
                                                             <template #reference>
-                                                                <el-link v-auth="perms.delData" :underline="false" type="danger" icon="DocumentDelete">
+                                                                <el-link v-auth="perms.delData" underline="never" type="danger" icon="DocumentDelete">
                                                                 </el-link>
                                                             </template>
                                                         </el-popconfirm>
@@ -466,7 +466,7 @@ const onSaveDoc = async () => {
             collection: dataTab.collection,
             doc: docObj,
         });
-        isTrue(res.InsertedID, t('mongo.insertFail'));
+        isTrue(res.InsertedID, 'mongo.insertFail');
         ElMessage.success(t('mongo.insertSuccess'));
     } else {
         const docObj = parseDocJsonString(state.docEditDialog.doc);
@@ -481,7 +481,7 @@ const onSaveDoc = async () => {
             docId: id,
             update: { $set: docObj },
         });
-        isTrue(res.ModifiedCount == 1, t('common.modifyFail'));
+        isTrue(res.ModifiedCount == 1, 'common.modifyFail');
         useI18nSaveSuccessMsg();
     }
     findCommand(state.activeName);
@@ -499,7 +499,7 @@ const onDeleteDoc = async (doc: string) => {
         collection: dataTab.collection,
         docId: id,
     });
-    isTrue(res.DeletedCount == 1, t('common.deleteFail'));
+    isTrue(res.DeletedCount == 1, 'common.deleteFail');
     useI18nDeleteSuccessMsg();
     findCommand(state.activeName);
 };
diff --git a/frontend/src/views/ops/mongo/MongoDbs.vue b/frontend/src/views/ops/mongo/MongoDbs.vue
index 2c67c0de..3c87cf8a 100644
--- a/frontend/src/views/ops/mongo/MongoDbs.vue
+++ b/frontend/src/views/ops/mongo/MongoDbs.vue
@@ -15,13 +15,13 @@
 
                 <el-table-column min-width="150" :label="$t('common.operation')">
                     <template #default="scope">
-                        <el-link type="success" @click="showDatabaseStats(scope.row.Name)" plain size="small" :underline="false">stats</el-link>
+                        <el-link type="success" @click="showDatabaseStats(scope.row.Name)" plain size="small" underline="never">stats</el-link>
                         <el-divider direction="vertical" border-style="dashed" />
-                        <el-link type="primary" @click="showCollections(scope.row.Name)" plain size="small" :underline="false">{{ $t('mongo.coll') }}</el-link>
+                        <el-link type="primary" @click="showCollections(scope.row.Name)" plain size="small" underline="never">{{ $t('mongo.coll') }}</el-link>
                         <el-divider direction="vertical" border-style="dashed" />
                         <el-popconfirm @confirm="onDeleteDb(scope.row.Name)" :title="$t('mongo.deleteDbConfirm')">
                             <template #reference>
-                                <el-link type="danger" plain size="small" :underline="false">{{ $t('common.delete') }}</el-link>
+                                <el-link type="danger" plain size="small" underline="never">{{ $t('common.delete') }}</el-link>
                             </template>
                         </el-popconfirm>
                     </template>
@@ -77,11 +77,11 @@
                 <el-table-column prop="name" :label="$t('common.name')" show-overflow-tooltip> </el-table-column>
                 <el-table-column min-width="80" :label="$t('common.operation')">
                     <template #default="scope">
-                        <el-link type="success" @click="showCollectionStats(scope.row.name)" plain size="small" :underline="false">stats</el-link>
+                        <el-link type="success" @click="showCollectionStats(scope.row.name)" plain size="small" underline="never">stats</el-link>
                         <el-divider direction="vertical" border-style="dashed" />
                         <el-popconfirm @confirm="onDeleteCollection(scope.row.name)" width="160" :title="$t('mongo.deleteCollConfirm')">
                             <template #reference>
-                                <el-link type="danger" plain size="small" :underline="false">{{ $t('common.delete') }}</el-link>
+                                <el-link type="danger" plain size="small" underline="never">{{ $t('common.delete') }}</el-link>
                             </template>
                         </el-popconfirm>
                     </template>
diff --git a/frontend/src/views/ops/redis/DataOperation.vue b/frontend/src/views/ops/redis/DataOperation.vue
index 5a2062e5..72c6939e 100644
--- a/frontend/src/views/ops/redis/DataOperation.vue
+++ b/frontend/src/views/ops/redis/DataOperation.vue
@@ -386,7 +386,7 @@ const autoOpenRedis = (codePath: string) => {
 };
 
 const scan = async (appendKey = false) => {
-    isTrue(state.scanParam.id != null, t('redis.redisSelectErr'));
+    isTrue(state.scanParam.id != null, 'redis.redisSelectErr');
 
     const match: string = state.scanParam.match || '';
     if (!match) {
diff --git a/frontend/src/views/ops/redis/KeyValueHash.vue b/frontend/src/views/ops/redis/KeyValueHash.vue
index 0ee01cf2..d63eb8e8 100644
--- a/frontend/src/views/ops/redis/KeyValueHash.vue
+++ b/frontend/src/views/ops/redis/KeyValueHash.vue
@@ -19,10 +19,10 @@
                         />
                     </template>
                     <template #default="scope">
-                        <el-link @click="showEditDialog(scope.row)" :underline="false" type="primary" icon="edit" plain></el-link>
+                        <el-link @click="showEditDialog(scope.row)" underline="never" type="primary" icon="edit" plain></el-link>
                         <el-popconfirm :title="$t('redis.deleteConfirm')" @confirm="hdel(scope.row.field, scope.$index)">
                             <template #reference>
-                                <el-link v-auth="'redis:data:del'" :underline="false" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
+                                <el-link v-auth="'redis:data:del'" underline="never" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
                             </template>
                         </el-popconfirm>
                     </template>
diff --git a/frontend/src/views/ops/redis/KeyValueList.vue b/frontend/src/views/ops/redis/KeyValueList.vue
index 276c0ee1..a9b0b501 100644
--- a/frontend/src/views/ops/redis/KeyValueList.vue
+++ b/frontend/src/views/ops/redis/KeyValueList.vue
@@ -9,10 +9,10 @@
                 <el-table-column resizable sortable prop="value" label="value" show-overflow-tooltip min-width="200"> </el-table-column>
                 <el-table-column :label="$t('common.operation')">
                     <template #default="scope">
-                        <el-link @click="showEditDialog(scope.row, scope.$index)" :underline="false" type="primary" icon="edit" plain></el-link>
+                        <el-link @click="showEditDialog(scope.row, scope.$index)" underline="never" type="primary" icon="edit" plain></el-link>
                         <el-popconfirm :title="$t('redis.deleteConfirm')" @confirm="lrem(scope.row, scope.$index)">
                             <template #reference>
-                                <el-link v-auth="'redis:data:del'" :underline="false" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
+                                <el-link v-auth="'redis:data:del'" underline="never" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
                             </template>
                         </el-popconfirm>
                     </template>
diff --git a/frontend/src/views/ops/redis/KeyValueSet.vue b/frontend/src/views/ops/redis/KeyValueSet.vue
index 06bc6bd2..7c39a072 100644
--- a/frontend/src/views/ops/redis/KeyValueSet.vue
+++ b/frontend/src/views/ops/redis/KeyValueSet.vue
@@ -18,10 +18,10 @@
                         />
                     </template>
                     <template #default="scope">
-                        <el-link @click="showEditDialog(scope.row)" :underline="false" type="primary" icon="edit" plain></el-link>
+                        <el-link @click="showEditDialog(scope.row)" underline="never" type="primary" icon="edit" plain></el-link>
                         <el-popconfirm :title="$t('redis.deleteConfirm')" @confirm="srem(scope.row, scope.$index)">
                             <template #reference>
-                                <el-link v-auth="'redis:data:del'" :underline="false" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
+                                <el-link v-auth="'redis:data:del'" underline="never" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
                             </template>
                         </el-popconfirm>
                     </template>
diff --git a/frontend/src/views/ops/redis/KeyValueZset.vue b/frontend/src/views/ops/redis/KeyValueZset.vue
index c54cffa1..5a3bf785 100644
--- a/frontend/src/views/ops/redis/KeyValueZset.vue
+++ b/frontend/src/views/ops/redis/KeyValueZset.vue
@@ -20,10 +20,10 @@
                         />
                     </template>
                     <template #default="scope">
-                        <el-link @click="showEditDialog(scope.row)" :underline="false" type="primary" icon="edit" plain></el-link>
+                        <el-link @click="showEditDialog(scope.row)" underline="never" type="primary" icon="edit" plain></el-link>
                         <el-popconfirm :title="$t('redis.deleteConfirm')" @confirm="zrem(scope.row, scope.$index)">
                             <template #reference>
-                                <el-link v-auth="'redis:data:del'" :underline="false" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
+                                <el-link v-auth="'redis:data:del'" underline="never" type="danger" icon="delete" size="small" plain class="ml-1"></el-link>
                             </template>
                         </el-popconfirm>
                     </template>
diff --git a/frontend/src/views/ops/tag/TeamList.vue b/frontend/src/views/ops/tag/TeamList.vue
index a40004eb..776288e1 100755
--- a/frontend/src/views/ops/tag/TeamList.vue
+++ b/frontend/src/views/ops/tag/TeamList.vue
@@ -17,10 +17,10 @@
             </template>
 
             <template #tags="{ data }">
-                <TagCodePath :path="data.tags?.map((tag: any) => tag.codePath)" />
+                <TagCodePath :path="data.tags" />
             </template>
 
-            <template #validityDate="{ data }"> {{ data.validityStartDate }} ~ {{ data.validityEndDate }} </template>
+            <template #validityDate="{ data }"> {{ formatDate(data.validityStartDate) }} ~ {{ formatDate(data.validityEndDate) }} </template>
 
             <template #action="{ data }">
                 <el-button @click.prevent="showMembers(data)" link type="primary">{{ $t('team.member') }}</el-button>
@@ -228,8 +228,8 @@ const showSaveTeamDialog = async (data: any) => {
 const saveTeam = async () => {
     await useI18nFormValidate(teamForm);
     const form = state.addTeamDialog.form;
-    form.validityStartDate = form.validityDate[0];
-    form.validityEndDate = form.validityDate[1];
+    form.validityStartDate = formatDate(form.validityDate[0]);
+    form.validityEndDate = formatDate(form.validityDate[1]);
     await tagApi.saveTeam.request(form);
     useI18nSaveSuccessMsg();
     search();
diff --git a/frontend/src/views/system/account/components/AccountInfo.vue b/frontend/src/views/system/account/components/AccountInfo.vue
index cc752bda..dd62789a 100644
--- a/frontend/src/views/system/account/components/AccountInfo.vue
+++ b/frontend/src/views/system/account/components/AccountInfo.vue
@@ -1,8 +1,8 @@
 <template>
     <div>
         <el-popover
-            v-if="props.accountId"
-            @show="getAccountInfo(props.accountId)"
+            v-if="props.username"
+            @show="getAccountInfo(props.username)"
             placement="top-start"
             :title="$t('system.account.accountInfo')"
             :width="400"
@@ -32,9 +32,6 @@
 import { reactive, toRefs } from 'vue';
 import { accountApi } from '../../api';
 const props = defineProps({
-    accountId: {
-        type: [Number],
-    },
     username: {
         type: [String],
         required: true,
@@ -48,10 +45,10 @@ const state = reactive({
 
 const { account, loading } = toRefs(state);
 
-const getAccountInfo = async (id: number) => {
+const getAccountInfo = async (username: string) => {
     try {
         state.loading = true;
-        state.account = await accountApi.getAccountDetail.request({ id });
+        state.account = await accountApi.getAccountDetail.request({ username });
     } finally {
         state.loading = false;
     }
diff --git a/frontend/src/views/system/api.ts b/frontend/src/views/system/api.ts
index 90b18f78..fbbdcd23 100644
--- a/frontend/src/views/system/api.ts
+++ b/frontend/src/views/system/api.ts
@@ -26,7 +26,7 @@ export const roleApi = {
 export const accountApi = {
     list: Api.newGet('/sys/accounts'),
     querySimple: Api.newGet('/sys/accounts/simple'),
-    getAccountDetail: Api.newGet('/sys/accounts/{id}'),
+    getAccountDetail: Api.newGet('/sys/accounts/detail'),
     save: Api.newPost('/sys/accounts'),
     update: Api.newPut('/sys/accounts/{id}'),
     del: Api.newDelete('/sys/accounts/{id}'),
diff --git a/frontend/src/views/system/role/ShowResource.vue b/frontend/src/views/system/role/ShowResource.vue
index 68136e9c..fb6cf4b3 100644
--- a/frontend/src/views/system/role/ShowResource.vue
+++ b/frontend/src/views/system/role/ShowResource.vue
@@ -11,7 +11,7 @@
 
                         <el-popover :show-after="500" placement="right-start" :title="$t('system.role.permissionInfo')" trigger="hover" :width="300">
                             <template #reference>
-                                <el-link style="margin-left: 25px" icon="InfoFilled" type="info" :underline="false" />
+                                <el-link style="margin-left: 25px" icon="InfoFilled" type="info" underline="never" />
                             </template>
                             <template #default>
                                 <el-descriptions :column="1" size="small">
diff --git a/frontend/src/views/system/role/components/RoleSelectFormItem.vue b/frontend/src/views/system/role/components/RoleSelectFormItem.vue
new file mode 100644
index 00000000..34032ee2
--- /dev/null
+++ b/frontend/src/views/system/role/components/RoleSelectFormItem.vue
@@ -0,0 +1,38 @@
+<template>
+    <el-form-item :label="label">
+        <el-select v-model="roleId" filterable v-bind="$attrs" :ref="(el: any) => props.focus && el?.focus()">
+            <el-option v-for="item in roles" :key="item.id" :label="`${item.name} [${item.code}]`" :value="item.id"> </el-option>
+        </el-select>
+    </el-form-item>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue';
+import { roleApi } from '../../api';
+
+const props = defineProps({
+    // 是否获取焦点
+    focus: {
+        type: Boolean,
+        default: false,
+    },
+    label: {
+        type: String,
+        default: '角色',
+    },
+});
+
+onMounted(() => {
+    getRole();
+});
+
+const roleId = defineModel('modelValue');
+
+const roles: any = ref([]);
+
+const getRole = () => {
+    roleApi.list.request().then((res) => {
+        roles.value = res.list;
+    });
+};
+</script>
diff --git a/frontend/src/views/system/syslog/SyslogList.vue b/frontend/src/views/system/syslog/SyslogList.vue
index aa3c2500..cbca29c0 100755
--- a/frontend/src/views/system/syslog/SyslogList.vue
+++ b/frontend/src/views/system/syslog/SyslogList.vue
@@ -2,7 +2,7 @@
     <div class="h-full">
         <page-table :page-api="logApi.list" :search-items="searchItems" v-model:query-form="query" :columns="columns">
             <template #creator="{ data }">
-                <account-info :account-id="data.creatorId" :username="data.creator" />
+                <account-info :username="data.creator" />
             </template>
         </page-table>
     </div>
diff --git a/server/go.mod b/server/go.mod
index 835e1305..69aa440f 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -13,33 +13,33 @@ require (
 	github.com/go-ldap/ldap/v3 v3.4.8
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1
-	github.com/go-playground/validator/v10 v10.25.0
+	github.com/go-playground/validator/v10 v10.26.0
 	github.com/go-sql-driver/mysql v1.9.2
 	github.com/golang-jwt/jwt/v5 v5.2.2
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230
+	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20250508043914-ed57fa5c5274
 	github.com/may-fly/cast v1.7.1
 	github.com/microsoft/go-mssqldb v1.8.0
 	github.com/mojocn/base64Captcha v1.3.8 // 验证码
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.13.9
 	github.com/pquerna/otp v1.4.0
-	github.com/redis/go-redis/v9 v9.7.3
+	github.com/redis/go-redis/v9 v9.8.0
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
 	github.com/sijms/go-ora/v2 v2.8.24
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
 	github.com/veops/go-ansiterm v0.0.5
 	go.mongodb.org/mongo-driver v1.16.0 // mongo
-	golang.org/x/crypto v0.37.0 // ssh
-	golang.org/x/oauth2 v0.29.0
-	golang.org/x/sync v0.13.0
+	golang.org/x/crypto v0.38.0 // ssh
+	golang.org/x/oauth2 v0.30.0
+	golang.org/x/sync v0.14.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	// gorm
 	gorm.io/driver/mysql v1.5.7
-	gorm.io/gorm v1.25.12
+	gorm.io/gorm v1.26.1
 )
 
 require (
@@ -48,7 +48,7 @@ require (
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
 	github.com/bytedance/sonic v1.11.6 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -93,8 +93,8 @@ require (
 	golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/image v0.23.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
diff --git a/server/internal/db/api/db.go b/server/internal/db/api/db.go
index 1e054e04..f8157487 100644
--- a/server/internal/db/api/db.go
+++ b/server/internal/db/api/db.go
@@ -77,7 +77,7 @@ func (d *Db) ReqConfs() *req.Confs {
 
 // @router /api/dbs [get]
 func (d *Db) Dbs(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.DbQuery](rc, new(entity.DbQuery))
+	queryCond := req.BindQuery[*entity.DbQuery](rc, new(entity.DbQuery))
 
 	// 不存在可访问标签id，即没有可操作数据
 	tags := d.tagApp.GetAccountTags(rc.GetLoginAccount().Id, &tagentity.TagTreeQuery{
@@ -85,14 +85,15 @@ func (d *Db) Dbs(rc *req.Ctx) {
 		CodePathLikes: collx.AsArray(queryCond.TagPath),
 	})
 	if len(tags) == 0 {
-		rc.ResData = model.EmptyPageResult[any]()
+		rc.ResData = model.NewEmptyPageResult[any]()
 		return
 	}
 	queryCond.Codes = tags.GetCodes()
 
-	var dbvos []*vo.DbListVO
-	res, err := d.dbApp.GetPageList(queryCond, page, &dbvos)
+	res, err := d.dbApp.GetPageList(queryCond)
 	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.DbListPO, *vo.DbListVO](res)
+	dbvos := resVo.List
 
 	instances, _ := d.instanceApp.GetByIds(collx.ArrayMap(dbvos, func(i *vo.DbListVO) uint64 {
 		return i.InstanceId
@@ -110,7 +111,7 @@ func (d *Db) Dbs(rc *req.Ctx) {
 		}
 	}
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (d *Db) Save(rc *req.Ctx) {
diff --git a/server/internal/db/api/db_backup.go b/server/internal/db/api/db_backup.go
deleted file mode 100644
index e582183c..00000000
--- a/server/internal/db/api/db_backup.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package api
-
-import (
-	"context"
-	"mayfly-go/internal/db/api/form"
-	"mayfly-go/internal/db/api/vo"
-	"mayfly-go/internal/db/application"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/biz"
-	"mayfly-go/pkg/req"
-	"mayfly-go/pkg/utils/timex"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type DbBackup struct {
-	backupApp  *application.DbBackupApp  `inject:"DbBackupApp"`
-	dbApp      application.Db            `inject:"DbApp"`
-	restoreApp *application.DbRestoreApp `inject:"DbRestoreApp"`
-}
-
-// todo: 鉴权，避免未经授权进行数据库备份和恢复
-
-// GetPageList 获取数据库备份任务
-// @router /api/dbs/:dbId/backups [GET]
-func (d *DbBackup) GetPageList(rc *req.Ctx) {
-	dbId := uint64(rc.PathParamInt("dbId"))
-	biz.IsTrue(dbId > 0, "无效的 dbId: %v", dbId)
-	db, err := d.dbApp.GetById(dbId)
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-
-	queryCond, page := req.BindQueryAndPage[*entity.DbBackupQuery](rc, new(entity.DbBackupQuery))
-	queryCond.DbInstanceId = db.InstanceId
-	queryCond.InDbNames = strings.Fields(db.Database)
-	res, err := d.backupApp.GetPageList(queryCond, page, new([]vo.DbBackup))
-	biz.ErrIsNilAppendErr(err, "获取数据库备份任务失败: %v")
-	rc.ResData = res
-}
-
-// Create 保存数据库备份任务
-// @router /api/dbs/:dbId/backups [POST]
-func (d *DbBackup) Create(rc *req.Ctx) {
-	backupForm := req.BindJsonAndValid(rc, &form.DbBackupForm{})
-	rc.ReqParam = backupForm
-
-	dbNames := strings.Fields(backupForm.DbNames)
-	biz.IsTrue(len(dbNames) > 0, "解析数据库备份任务失败：数据库名称未定义")
-
-	dbId := uint64(rc.PathParamInt("dbId"))
-	biz.IsTrue(dbId > 0, "无效的 dbId: %v", dbId)
-	db, err := d.dbApp.GetById(dbId)
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-	jobs := make([]*entity.DbBackup, 0, len(dbNames))
-	for _, dbName := range dbNames {
-		job := &entity.DbBackup{
-			DbInstanceId: db.InstanceId,
-			DbName:       dbName,
-			Enabled:      true,
-			Repeated:     backupForm.Repeated,
-			StartTime:    backupForm.StartTime,
-			Interval:     backupForm.Interval,
-			Name:         backupForm.Name,
-		}
-		jobs = append(jobs, job)
-	}
-	biz.ErrIsNilAppendErr(d.backupApp.Create(rc.MetaCtx, jobs), "添加数据库备份任务失败: %v")
-}
-
-// Update 保存数据库备份任务
-// @router /api/dbs/:dbId/backups/:backupId [PUT]
-func (d *DbBackup) Update(rc *req.Ctx) {
-	backupForm := &form.DbBackupForm{}
-	req.BindJsonAndValid(rc, backupForm)
-	rc.ReqParam = backupForm
-
-	job := &entity.DbBackup{}
-	job.Id = backupForm.Id
-	job.Name = backupForm.Name
-	job.StartTime = backupForm.StartTime
-	job.Interval = backupForm.Interval
-	job.MaxSaveDays = backupForm.MaxSaveDays
-	biz.ErrIsNilAppendErr(d.backupApp.Update(rc.MetaCtx, job), "保存数据库备份任务失败: %v")
-}
-
-func (d *DbBackup) walk(rc *req.Ctx, paramName string, fn func(ctx context.Context, id uint64) error) error {
-	idsStr := rc.PathParam(paramName)
-	biz.NotEmpty(idsStr, paramName+" 为空")
-	rc.ReqParam = idsStr
-	ids := strings.Fields(idsStr)
-	for _, v := range ids {
-		value, err := strconv.Atoi(v)
-		if err != nil {
-			return err
-		}
-		backupId := uint64(value)
-		err = fn(rc.MetaCtx, backupId)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Delete 删除数据库备份任务
-// @router /api/dbs/:dbId/backups/:backupId [DELETE]
-func (d *DbBackup) Delete(rc *req.Ctx) {
-	err := d.walk(rc, "backupId", d.backupApp.Delete)
-	biz.ErrIsNilAppendErr(err, "删除数据库备份任务失败: %v")
-}
-
-// Enable 启用数据库备份任务
-// @router /api/dbs/:dbId/backups/:backupId/enable [PUT]
-func (d *DbBackup) Enable(rc *req.Ctx) {
-	err := d.walk(rc, "backupId", d.backupApp.Enable)
-	biz.ErrIsNilAppendErr(err, "启用数据库备份任务失败: %v")
-}
-
-// Disable 禁用数据库备份任务
-// @router /api/dbs/:dbId/backups/:backupId/disable [PUT]
-func (d *DbBackup) Disable(rc *req.Ctx) {
-	err := d.walk(rc, "backupId", d.backupApp.Disable)
-	biz.ErrIsNilAppendErr(err, "禁用数据库备份任务失败: %v")
-}
-
-// Start 禁用数据库备份任务
-// @router /api/dbs/:dbId/backups/:backupId/start [PUT]
-func (d *DbBackup) Start(rc *req.Ctx) {
-	err := d.walk(rc, "backupId", d.backupApp.StartNow)
-	biz.ErrIsNilAppendErr(err, "运行数据库备份任务失败: %v")
-}
-
-// GetDbNamesWithoutBackup 获取未配置定时备份的数据库名称
-// @router /api/dbs/:dbId/db-names-without-backup [GET]
-func (d *DbBackup) GetDbNamesWithoutBackup(rc *req.Ctx) {
-	dbId := uint64(rc.PathParamInt("dbId"))
-	db, err := d.dbApp.GetById(dbId, "instance_id", "database")
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-	dbNames := strings.Fields(db.Database)
-	dbNamesWithoutBackup, err := d.backupApp.GetDbNamesWithoutBackup(db.InstanceId, dbNames)
-	biz.ErrIsNilAppendErr(err, "获取未配置定时备份的数据库名称失败: %v")
-	rc.ResData = dbNamesWithoutBackup
-}
-
-// GetHistoryPageList 获取数据库备份历史
-// @router /api/dbs/:dbId/backups/:backupId/histories [GET]
-func (d *DbBackup) GetHistoryPageList(rc *req.Ctx) {
-	dbId := uint64(rc.PathParamInt("dbId"))
-	biz.IsTrue(dbId > 0, "无效的 dbId: %v", dbId)
-	db, err := d.dbApp.GetById(dbId, "instance_id", "database")
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-
-	backupHistoryCond, page := req.BindQueryAndPage[*entity.DbBackupHistoryQuery](rc, new(entity.DbBackupHistoryQuery))
-	backupHistoryCond.DbInstanceId = db.InstanceId
-	backupHistoryCond.InDbNames = strings.Fields(db.Database)
-	backupHistories := make([]*vo.DbBackupHistory, 0, page.PageSize)
-	res, err := d.backupApp.GetHistoryPageList(backupHistoryCond, page, &backupHistories)
-	biz.ErrIsNilAppendErr(err, "获取数据库备份历史失败: %v")
-	historyIds := make([]uint64, 0, len(backupHistories))
-	for _, history := range backupHistories {
-		historyIds = append(historyIds, history.Id)
-	}
-	restores := make([]*entity.DbRestore, 0, page.PageSize)
-	if err := d.restoreApp.GetRestoresEnabled(&restores, historyIds...); err != nil {
-		biz.ErrIsNilAppendErr(err, "获取数据库备份恢复记录失败")
-	}
-	for _, history := range backupHistories {
-		for _, restore := range restores {
-			if restore.DbBackupHistoryId == history.Id {
-				history.LastStatus = restore.LastStatus
-				history.LastResult = restore.LastResult
-				history.LastTime = restore.LastTime
-				break
-			}
-		}
-	}
-	rc.ResData = res
-}
-
-// RestoreHistories 从数据库备份历史中恢复数据库
-// @router /api/dbs/:dbId/backup-histories/:backupHistoryId/restore [POST]
-func (d *DbBackup) RestoreHistories(rc *req.Ctx) {
-	pm := rc.PathParam("backupHistoryId")
-	biz.NotEmpty(pm, "backupHistoryId 为空")
-	idsStr := strings.Fields(pm)
-	ids := make([]uint64, 0, len(idsStr))
-	for _, s := range idsStr {
-		id, err := strconv.ParseUint(s, 10, 64)
-		biz.ErrIsNilAppendErr(err, "从数据库备份历史恢复数据库失败: %v")
-		ids = append(ids, id)
-	}
-	histories := make([]*entity.DbBackupHistory, 0, len(ids))
-	err := d.backupApp.GetHistories(ids, &histories)
-	biz.ErrIsNilAppendErr(err, "添加数据库恢复任务失败: %v")
-	restores := make([]*entity.DbRestore, 0, len(histories))
-	now := time.Now()
-	for _, history := range histories {
-		job := &entity.DbRestore{
-			DbInstanceId:        history.DbInstanceId,
-			DbName:              history.DbName,
-			Enabled:             true,
-			Repeated:            false,
-			StartTime:           now,
-			Interval:            0,
-			PointInTime:         timex.NewNullTime(time.Time{}),
-			DbBackupId:          history.DbBackupId,
-			DbBackupHistoryId:   history.Id,
-			DbBackupHistoryName: history.Name,
-		}
-		restores = append(restores, job)
-	}
-	biz.ErrIsNilAppendErr(d.restoreApp.Create(rc.MetaCtx, restores), "添加数据库恢复任务失败: %v")
-}
-
-// DeleteHistories 删除数据库备份历史
-// @router /api/dbs/:dbId/backup-histories/:backupHistoryId [DELETE]
-func (d *DbBackup) DeleteHistories(rc *req.Ctx) {
-	err := d.walk(rc, "backupHistoryId", d.backupApp.DeleteHistory)
-	biz.ErrIsNilAppendErr(err, "删除数据库备份历史失败: %v")
-}
diff --git a/server/internal/db/api/db_data_sync.go b/server/internal/db/api/db_data_sync.go
index ecda6ac8..e61264e2 100644
--- a/server/internal/db/api/db_data_sync.go
+++ b/server/internal/db/api/db_data_sync.go
@@ -8,6 +8,7 @@ import (
 	"mayfly-go/internal/db/imsg"
 	"mayfly-go/internal/pkg/utils"
 	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/utils/stringx"
 	"strings"
@@ -49,17 +50,17 @@ func (d *DataSyncTask) ReqConfs() *req.Confs {
 }
 
 func (d *DataSyncTask) Tasks(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.DataSyncTaskQuery](rc, new(entity.DataSyncTaskQuery))
-	res, err := d.dataSyncTaskApp.GetPageList(queryCond, page, new([]vo.DataSyncTaskListVO))
+	queryCond := req.BindQuery[*entity.DataSyncTaskQuery](rc, new(entity.DataSyncTaskQuery))
+	res, err := d.dataSyncTaskApp.GetPageList(queryCond)
 	biz.ErrIsNil(err)
-	rc.ResData = res
+	rc.ResData = model.PageResultConv[*entity.DataSyncTask, *vo.DataSyncLogListVO](res)
 }
 
 func (d *DataSyncTask) Logs(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.DataSyncLogQuery](rc, new(entity.DataSyncLogQuery))
-	res, err := d.dataSyncTaskApp.GetTaskLogList(queryCond, page, new([]vo.DataSyncLogListVO))
+	queryCond := req.BindQuery(rc, new(entity.DataSyncLogQuery))
+	res, err := d.dataSyncTaskApp.GetTaskLogList(queryCond)
 	biz.ErrIsNil(err)
-	rc.ResData = res
+	rc.ResData = model.PageResultConv[*entity.DataSyncLog, *vo.DataSyncLogListVO](res)
 }
 
 func (d *DataSyncTask) SaveTask(rc *req.Ctx) {
diff --git a/server/internal/db/api/db_instance.go b/server/internal/db/api/db_instance.go
index f9441b52..1105c9ca 100644
--- a/server/internal/db/api/db_instance.go
+++ b/server/internal/db/api/db_instance.go
@@ -55,7 +55,7 @@ func (d *Instance) ReqConfs() *req.Confs {
 // Instances 获取数据库实例信息
 // @router /api/instances [get]
 func (d *Instance) Instances(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.InstanceQuery](rc, new(entity.InstanceQuery))
+	queryCond := req.BindQuery(rc, new(entity.InstanceQuery))
 
 	tags := d.tagApp.GetAccountTags(rc.GetLoginAccount().Id, &tagentity.TagTreeQuery{
 		TypePaths:     collx.AsArray(tagentity.NewTypePaths(tagentity.TagTypeDbInstance, tagentity.TagTypeAuthCert)),
@@ -63,7 +63,7 @@ func (d *Instance) Instances(rc *req.Ctx) {
 	})
 	// 不存在可操作的数据库，即没有可操作数据
 	if len(tags) == 0 {
-		rc.ResData = model.EmptyPageResult[any]()
+		rc.ResData = model.NewEmptyPageResult[any]()
 		return
 	}
 
@@ -71,9 +71,10 @@ func (d *Instance) Instances(rc *req.Ctx) {
 	dbInstCodes := tagentity.GetCodesByCodePaths(tagentity.TagTypeDbInstance, tagCodePaths...)
 	queryCond.Codes = dbInstCodes
 
-	var instvos []*vo.InstanceListVO
-	res, err := d.instanceApp.GetPageList(queryCond, page, &instvos)
+	res, err := d.instanceApp.GetPageList(queryCond)
 	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.DbInstance, *vo.InstanceListVO](res)
+	instvos := resVo.List
 
 	// 填充授权凭证信息
 	d.resourceAuthCertApp.FillAuthCertByAcNames(tagentity.GetCodesByCodePaths(tagentity.TagTypeAuthCert, tagCodePaths...), collx.ArrayMap(instvos, func(vos *vo.InstanceListVO) tagentity.IAuthCert {
@@ -85,7 +86,7 @@ func (d *Instance) Instances(rc *req.Ctx) {
 		return insvo
 	})...)
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (d *Instance) TestConn(rc *req.Ctx) {
diff --git a/server/internal/db/api/db_restore.go b/server/internal/db/api/db_restore.go
deleted file mode 100644
index c72ff4d8..00000000
--- a/server/internal/db/api/db_restore.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package api
-
-import (
-	"context"
-	"mayfly-go/internal/db/api/form"
-	"mayfly-go/internal/db/api/vo"
-	"mayfly-go/internal/db/application"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/biz"
-	"mayfly-go/pkg/req"
-	"strconv"
-	"strings"
-)
-
-type DbRestore struct {
-	restoreApp *application.DbRestoreApp `inject:"DbRestoreApp"`
-	dbApp      application.Db            `inject:"DbApp"`
-}
-
-// GetPageList 获取数据库恢复任务
-// @router /api/dbs/:dbId/restores [GET]
-func (d *DbRestore) GetPageList(rc *req.Ctx) {
-	dbId := uint64(rc.PathParamInt("dbId"))
-	biz.IsTrue(dbId > 0, "无效的 dbId: %v", dbId)
-	db, err := d.dbApp.GetById(dbId, "db_instance_id", "database")
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-
-	var restores []vo.DbRestore
-	queryCond, page := req.BindQueryAndPage[*entity.DbRestoreQuery](rc, new(entity.DbRestoreQuery))
-	queryCond.DbInstanceId = db.InstanceId
-	queryCond.InDbNames = strings.Fields(db.Database)
-	res, err := d.restoreApp.GetPageList(queryCond, page, &restores)
-	biz.ErrIsNilAppendErr(err, "获取数据库恢复任务失败: %v")
-	rc.ResData = res
-}
-
-// Create 保存数据库恢复任务
-// @router /api/dbs/:dbId/restores [POST]
-func (d *DbRestore) Create(rc *req.Ctx) {
-	restoreForm := &form.DbRestoreForm{}
-	req.BindJsonAndValid(rc, restoreForm)
-	rc.ReqParam = restoreForm
-
-	dbId := uint64(rc.PathParamInt("dbId"))
-	biz.IsTrue(dbId > 0, "无效的 dbId: %v", dbId)
-	db, err := d.dbApp.GetById(dbId, "instanceId")
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-
-	job := &entity.DbRestore{
-		DbInstanceId:        db.InstanceId,
-		DbName:              restoreForm.DbName,
-		Enabled:             true,
-		Repeated:            restoreForm.Repeated,
-		StartTime:           restoreForm.StartTime,
-		Interval:            restoreForm.Interval,
-		PointInTime:         restoreForm.PointInTime,
-		DbBackupId:          restoreForm.DbBackupId,
-		DbBackupHistoryId:   restoreForm.DbBackupHistoryId,
-		DbBackupHistoryName: restoreForm.DbBackupHistoryName,
-	}
-	biz.ErrIsNilAppendErr(d.restoreApp.Create(rc.MetaCtx, job), "添加数据库恢复任务失败: %v")
-}
-
-func (d *DbRestore) createWithBackupHistory(backupHistoryIds string) {
-
-}
-
-// Update 保存数据库恢复任务
-// @router /api/dbs/:dbId/restores/:restoreId [PUT]
-func (d *DbRestore) Update(rc *req.Ctx) {
-	restoreForm := &form.DbRestoreForm{}
-	req.BindJsonAndValid(rc, restoreForm)
-	rc.ReqParam = restoreForm
-
-	job := &entity.DbRestore{}
-	job.Id = restoreForm.Id
-	job.StartTime = restoreForm.StartTime
-	job.Interval = restoreForm.Interval
-	biz.ErrIsNilAppendErr(d.restoreApp.Update(rc.MetaCtx, job), "保存数据库恢复任务失败: %v")
-}
-
-func (d *DbRestore) walk(rc *req.Ctx, fn func(ctx context.Context, restoreId uint64) error) error {
-	idsStr := rc.PathParam("restoreId")
-	biz.NotEmpty(idsStr, "restoreId 为空")
-	rc.ReqParam = idsStr
-	ids := strings.Fields(idsStr)
-	for _, v := range ids {
-		value, err := strconv.Atoi(v)
-		if err != nil {
-			return err
-		}
-		restoreId := uint64(value)
-		err = fn(rc.MetaCtx, restoreId)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Delete 删除数据库恢复任务
-// @router /api/dbs/:dbId/restores/:restoreId [DELETE]
-func (d *DbRestore) Delete(rc *req.Ctx) {
-	err := d.walk(rc, d.restoreApp.Delete)
-	biz.ErrIsNilAppendErr(err, "删除数据库恢复任务失败: %v")
-}
-
-// Enable 启用数据库恢复任务
-// @router /api/dbs/:dbId/restores/:restoreId/enable [PUT]
-func (d *DbRestore) Enable(rc *req.Ctx) {
-	err := d.walk(rc, d.restoreApp.Enable)
-	biz.ErrIsNilAppendErr(err, "启用数据库恢复任务失败: %v")
-}
-
-// Disable 禁用数据库恢复任务
-// @router /api/dbs/:dbId/restores/:restoreId/disable [PUT]
-func (d *DbRestore) Disable(rc *req.Ctx) {
-	err := d.walk(rc, d.restoreApp.Disable)
-	biz.ErrIsNilAppendErr(err, "禁用数据库恢复任务失败: %v")
-}
-
-// GetDbNamesWithoutRestore 获取未配置定时恢复的数据库名称
-// @router /api/dbs/:dbId/db-names-without-backup [GET]
-func (d *DbRestore) GetDbNamesWithoutRestore(rc *req.Ctx) {
-	dbId := uint64(rc.PathParamInt("dbId"))
-	db, err := d.dbApp.GetById(dbId, "instance_id", "database")
-	biz.ErrIsNilAppendErr(err, "获取数据库信息失败: %v")
-	dbNames := strings.Fields(db.Database)
-	dbNamesWithoutRestore, err := d.restoreApp.GetDbNamesWithoutRestore(db.InstanceId, dbNames)
-	biz.ErrIsNilAppendErr(err, "获取未配置定时备份的数据库名称失败: %v")
-	rc.ResData = dbNamesWithoutRestore
-}
-
-// GetHistoryPageList 获取数据库备份历史
-// @router /api/dbs/:dbId/restores/:restoreId/histories [GET]
-func (d *DbRestore) GetHistoryPageList(rc *req.Ctx) {
-	queryCond := &entity.DbRestoreHistoryQuery{
-		DbRestoreId: uint64(rc.PathParamInt("restoreId")),
-	}
-	res, err := d.restoreApp.GetHistoryPageList(queryCond, rc.GetPageParam(), new([]vo.DbRestoreHistory))
-	biz.ErrIsNilAppendErr(err, "获取数据库备份历史失败: %v")
-	rc.ResData = res
-}
diff --git a/server/internal/db/api/db_sql_exec.go b/server/internal/db/api/db_sql_exec.go
index ad358619..d417ff5f 100644
--- a/server/internal/db/api/db_sql_exec.go
+++ b/server/internal/db/api/db_sql_exec.go
@@ -26,14 +26,13 @@ func (d *DbSqlExec) ReqConfs() *req.Confs {
 }
 
 func (d *DbSqlExec) DbSqlExecs(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage(rc, new(entity.DbSqlExecQuery))
-
+	queryCond := req.BindQuery(rc, new(entity.DbSqlExecQuery))
 	if statusStr := rc.Query("status"); statusStr != "" {
 		queryCond.Status = collx.ArrayMap[string, int8](strings.Split(statusStr, ","), func(val string) int8 {
 			return cast.ToInt8(val)
 		})
 	}
-	res, err := d.dbSqlExecApp.GetPageList(queryCond, page, new([]entity.DbSqlExec))
+	res, err := d.dbSqlExecApp.GetPageList(queryCond)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/db/api/db_transfer.go b/server/internal/db/api/db_transfer.go
index 1e3c0b47..c4cc775a 100644
--- a/server/internal/db/api/db_transfer.go
+++ b/server/internal/db/api/db_transfer.go
@@ -11,6 +11,7 @@ import (
 	fileapp "mayfly-go/internal/file/application"
 	tagapp "mayfly-go/internal/tag/application"
 	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/utils/collx"
 	"strings"
@@ -60,21 +61,20 @@ func (d *DbTransferTask) ReqConfs() *req.Confs {
 }
 
 func (d *DbTransferTask) Tasks(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.DbTransferTaskQuery](rc, new(entity.DbTransferTaskQuery))
-	res, err := d.dbTransferTask.GetPageList(queryCond, page, new([]vo.DbTransferTaskListVO))
-	biz.ErrIsNil(err)
+	queryCond := req.BindQuery(rc, new(entity.DbTransferTaskQuery))
 
-	if res.List != nil {
-		list := res.List.(*[]vo.DbTransferTaskListVO)
-		for _, item := range *list {
-			item.RunningState = entity.DbTransferTaskRunStateSuccess
-			if d.dbTransferTask.IsRunning(item.Id) {
-				item.RunningState = entity.DbTransferTaskRunStateRunning
-			}
+	res, err := d.dbTransferTask.GetPageList(queryCond)
+	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.DbTransferTask, *vo.DbTransferTaskListVO](res)
+
+	for _, item := range resVo.List {
+		item.RunningState = entity.DbTransferTaskRunStateSuccess
+		if d.dbTransferTask.IsRunning(item.Id) {
+			item.RunningState = entity.DbTransferTaskRunStateRunning
 		}
 	}
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (d *DbTransferTask) SaveTask(rc *req.Ctx) {
@@ -122,8 +122,9 @@ func (d *DbTransferTask) Stop(rc *req.Ctx) {
 }
 
 func (d *DbTransferTask) Files(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.DbTransferFileQuery](rc, new(entity.DbTransferFileQuery))
-	res, err := d.dbTransferFile.GetPageList(queryCond, page, new([]vo.DbTransferFileListVO))
+	queryCond := req.BindQuery(rc, new(entity.DbTransferFileQuery))
+
+	res, err := d.dbTransferFile.GetPageList(queryCond)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/db/api/vo/db_backup.go b/server/internal/db/api/vo/db_backup.go
deleted file mode 100644
index 6579398a..00000000
--- a/server/internal/db/api/vo/db_backup.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package vo
-
-import (
-	"encoding/json"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/utils/timex"
-	"time"
-)
-
-// DbBackup 数据库备份任务
-type DbBackup struct {
-	Id           uint64             `json:"id"`
-	DbName       string             `json:"dbName"`               // 数据库名
-	CreateTime   time.Time          `json:"createTime"`           // 创建时间
-	StartTime    time.Time          `json:"startTime"`            // 开始时间
-	Interval     time.Duration      `json:"-"`                    // 间隔时间
-	IntervalDay  uint64             `json:"intervalDay" gorm:"-"` // 间隔天数
-	MaxSaveDays  int                `json:"maxSaveDays"`          // 数据库备份历史保留天数，过期将自动删除
-	Enabled      bool               `json:"enabled"`              // 是否启用
-	EnabledDesc  string             `json:"enabledDesc"`          // 启用状态描述
-	LastTime     timex.NullTime     `json:"lastTime"`             // 最近一次执行时间
-	LastStatus   entity.DbJobStatus `json:"lastStatus"`           // 最近一次执行状态
-	LastResult   string             `json:"lastResult"`           // 最近一次执行结果
-	DbInstanceId uint64             `json:"dbInstanceId"`         // 数据库实例ID
-	Name         string             `json:"name"`                 // 备份任务名称
-}
-
-func (backup *DbBackup) MarshalJSON() ([]byte, error) {
-	type dbBackup DbBackup
-	backup.IntervalDay = uint64(backup.Interval / time.Hour / 24)
-	if len(backup.EnabledDesc) == 0 {
-		if backup.Enabled {
-			backup.EnabledDesc = "已启用"
-		} else {
-			backup.EnabledDesc = "已禁用"
-		}
-	}
-	return json.Marshal((*dbBackup)(backup))
-}
-
-// DbBackupHistory 数据库备份历史
-type DbBackupHistory struct {
-	Id             uint64             `json:"id"`
-	DbBackupId     uint64             `json:"dbBackupId"`
-	CreateTime     time.Time          `json:"createTime"`
-	DbName         string             `json:"dbName"` // 数据库名称
-	Name           string             `json:"name"`   // 备份历史名称
-	BinlogFileName string             `json:"binlogFileName"`
-	LastTime       timex.NullTime     `json:"lastTime" gorm:"-"`   // 最近一次恢复时间
-	LastStatus     entity.DbJobStatus `json:"lastStatus" gorm:"-"` // 最近一次恢复状态
-	LastResult     string             `json:"lastResult" gorm:"-"` // 最近一次恢复结果
-}
diff --git a/server/internal/db/api/vo/db_restore.go b/server/internal/db/api/vo/db_restore.go
deleted file mode 100644
index ae188cf6..00000000
--- a/server/internal/db/api/vo/db_restore.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package vo
-
-import (
-	"encoding/json"
-	"mayfly-go/pkg/utils/timex"
-	"time"
-)
-
-// DbRestore 数据库备份任务
-type DbRestore struct {
-	Id                  uint64         `json:"id"`
-	DbName              string         `json:"dbName"`               // 数据库名
-	StartTime           time.Time      `json:"startTime"`            // 开始时间
-	Interval            time.Duration  `json:"-"`                    // 间隔时间
-	IntervalDay         uint64         `json:"intervalDay" gorm:"-"` // 间隔天数
-	Enabled             bool           `json:"enabled"`              // 是否启用
-	EnabledDesc         string         `json:"enabledDesc"`          // 启用状态描述
-	LastTime            timex.NullTime `json:"lastTime"`             // 最近一次执行时间
-	LastStatus          string         `json:"lastStatus"`           // 最近一次执行状态
-	LastResult          string         `json:"lastResult"`           // 最近一次执行结果
-	PointInTime         timex.NullTime `json:"pointInTime"`          // 指定数据库恢复的时间点
-	DbBackupId          uint64         `json:"dbBackupId"`           // 数据库备份任务ID
-	DbBackupHistoryId   uint64         `json:"dbBackupHistoryId"`    // 数据库备份历史ID
-	DbBackupHistoryName string         `json:"dbBackupHistoryName"`  // 数据库备份历史名称
-	DbInstanceId        uint64         `json:"dbInstanceId"`         // 数据库实例ID
-}
-
-func (restore *DbRestore) MarshalJSON() ([]byte, error) {
-	type dbBackup DbRestore
-	restore.IntervalDay = uint64(restore.Interval / time.Hour / 24)
-	if len(restore.EnabledDesc) == 0 {
-		if restore.Enabled {
-			restore.EnabledDesc = "已启用"
-		} else {
-			restore.EnabledDesc = "已禁用"
-		}
-	}
-	return json.Marshal((*dbBackup)(restore))
-}
-
-// DbRestoreHistory 数据库备份历史
-type DbRestoreHistory struct {
-	Id          uint64 `json:"id"`
-	DbRestoreId uint64 `json:"dbRestoreId"`
-}
diff --git a/server/internal/db/application/application.go b/server/internal/db/application/application.go
index 1c59cc81..7fc12ae3 100644
--- a/server/internal/db/application/application.go
+++ b/server/internal/db/application/application.go
@@ -13,11 +13,6 @@ func InitIoc() {
 	ioc.Register(new(dataSyncAppImpl), ioc.WithComponentName("DbDataSyncTaskApp"))
 	ioc.Register(new(dbTransferAppImpl), ioc.WithComponentName("DbTransferTaskApp"))
 	ioc.Register(new(dbTransferFileAppImpl), ioc.WithComponentName("DbTransferFileApp"))
-
-	ioc.Register(newDbScheduler(), ioc.WithComponentName("DbScheduler"))
-	ioc.Register(new(DbBackupApp), ioc.WithComponentName("DbBackupApp"))
-	ioc.Register(new(DbRestoreApp), ioc.WithComponentName("DbRestoreApp"))
-	ioc.Register(newDbBinlogApp(), ioc.WithComponentName("DbBinlogApp"))
 }
 
 func Init() {
@@ -43,18 +38,6 @@ func GetDbSqlExecApp() DbSqlExec {
 	return ioc.Get[DbSqlExec]("DbSqlExecApp")
 }
 
-func GetDbBackupApp() *DbBackupApp {
-	return ioc.Get[*DbBackupApp]("DbBackupApp")
-}
-
-func GetDbRestoreApp() *DbRestoreApp {
-	return ioc.Get[*DbRestoreApp]("DbRestoreApp")
-}
-
-func GetDbBinlogApp() *DbBinlogApp {
-	return ioc.Get[*DbBinlogApp]("DbBinlogApp")
-}
-
 func GetDataSyncTaskApp() DataSyncTask {
 	return ioc.Get[DataSyncTask]("DbDataSyncTaskApp")
 }
diff --git a/server/internal/db/application/db.go b/server/internal/db/application/db.go
index c9dfb3aa..b4181f5c 100644
--- a/server/internal/db/application/db.go
+++ b/server/internal/db/application/db.go
@@ -29,7 +29,7 @@ type Db interface {
 	base.App[*entity.Db]
 
 	// 分页获取
-	GetPageList(condition *entity.DbQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DbQuery, orderBy ...string) (*model.PageResult[*entity.DbListPO], error)
 
 	SaveDb(ctx context.Context, entity *entity.Db) error
 
@@ -62,8 +62,8 @@ type dbAppImpl struct {
 var _ (Db) = (*dbAppImpl)(nil)
 
 // 分页获取数据库信息列表
-func (d *dbAppImpl) GetPageList(condition *entity.DbQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return d.GetRepo().GetDbList(condition, pageParam, toEntity, orderBy...)
+func (d *dbAppImpl) GetPageList(condition *entity.DbQuery, orderBy ...string) (*model.PageResult[*entity.DbListPO], error) {
+	return d.GetRepo().GetDbList(condition, orderBy...)
 }
 
 func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db) error {
diff --git a/server/internal/db/application/db_backup.go b/server/internal/db/application/db_backup.go
deleted file mode 100644
index 7f280529..00000000
--- a/server/internal/db/application/db_backup.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package application
-
-import (
-	"context"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"math"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/logx"
-	"mayfly-go/pkg/model"
-	"mayfly-go/pkg/utils/timex"
-	"sync"
-	"time"
-
-	"gorm.io/gorm"
-
-	"github.com/google/uuid"
-)
-
-const maxBackupHistoryDays = 30
-
-var (
-	errRestoringBackupHistory = errors.New("正在从备份历史中恢复数据库")
-)
-
-type DbBackupApp struct {
-	scheduler         *dbScheduler               `inject:"DbScheduler"`
-	backupRepo        repository.DbBackup        `inject:"DbBackupRepo"`
-	backupHistoryRepo repository.DbBackupHistory `inject:"DbBackupHistoryRepo"`
-	restoreRepo       repository.DbRestore       `inject:"DbRestoreRepo"`
-	dbApp             Db                         `inject:"DbApp"`
-	mutex             sync.Mutex
-	closed            chan struct{}
-	wg                sync.WaitGroup
-	ctx               context.Context
-	cancel            context.CancelFunc
-}
-
-func (app *DbBackupApp) Init() error {
-	var jobs []*entity.DbBackup
-	if err := app.backupRepo.ListToDo(&jobs); err != nil {
-		return err
-	}
-	if err := app.scheduler.AddJob(context.Background(), jobs); err != nil {
-		return err
-	}
-	app.ctx, app.cancel = context.WithCancel(context.Background())
-	app.wg.Add(1)
-	go func() {
-		defer app.wg.Done()
-		for app.ctx.Err() == nil {
-			if err := app.prune(app.ctx); err != nil {
-				logx.Errorf("清理数据库备份历史失败: %s", err.Error())
-				timex.SleepWithContext(app.ctx, time.Minute*15)
-				continue
-			}
-			timex.SleepWithContext(app.ctx, time.Hour*24)
-		}
-	}()
-	return nil
-}
-
-func (app *DbBackupApp) prune(ctx context.Context) error {
-	jobs, err := app.backupRepo.SelectByCond(map[string]any{})
-	if err != nil {
-		return err
-	}
-	for _, job := range jobs {
-		if ctx.Err() != nil {
-			return nil
-		}
-		historyCond := map[string]any{
-			"db_backup_id": job.Id,
-		}
-		histories, _ := app.backupHistoryRepo.SelectByCond(historyCond)
-		expiringTime := time.Now().Add(-math.MaxInt64)
-		if job.MaxSaveDays > 0 {
-			expiringTime = time.Now().Add(-time.Hour * 24 * time.Duration(job.MaxSaveDays+1))
-		}
-		for _, history := range histories {
-			if ctx.Err() != nil {
-				return nil
-			}
-			if history.CreateTime.After(expiringTime) {
-				break
-			}
-			err := app.DeleteHistory(ctx, history.Id)
-			if errors.Is(err, errRestoringBackupHistory) {
-				break
-			}
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (app *DbBackupApp) Close() {
-	app.scheduler.Close()
-	if app.cancel != nil {
-		app.cancel()
-		app.cancel = nil
-	}
-	app.wg.Wait()
-}
-
-func (app *DbBackupApp) Create(ctx context.Context, jobs []*entity.DbBackup) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if err := app.backupRepo.AddJob(ctx, jobs); err != nil {
-		return err
-	}
-	return app.scheduler.AddJob(ctx, jobs)
-}
-
-func (app *DbBackupApp) Update(ctx context.Context, job *entity.DbBackup) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if err := app.backupRepo.UpdateById(ctx, job); err != nil {
-		return err
-	}
-	_ = app.scheduler.UpdateJob(ctx, job)
-	return nil
-}
-
-func (app *DbBackupApp) Delete(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if err := app.scheduler.RemoveJob(ctx, entity.DbJobTypeBackup, jobId); err != nil {
-		return err
-	}
-	history := &entity.DbBackupHistory{
-		DbBackupId: jobId,
-	}
-	err := app.backupHistoryRepo.GetByCond(history)
-	switch {
-	default:
-		return err
-	case err == nil:
-		return fmt.Errorf("请先删除关联的数据库备份历史【%s】", history.Name)
-	case errors.Is(err, gorm.ErrRecordNotFound):
-	}
-	if err := app.backupRepo.DeleteById(ctx, jobId); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (app *DbBackupApp) Enable(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	repo := app.backupRepo
-	job, err := repo.GetById(jobId)
-	if err != nil {
-		return err
-	}
-	if job.IsEnabled() {
-		return nil
-	}
-	if job.IsExpired() {
-		return errors.New("任务已过期")
-	}
-	_ = app.scheduler.EnableJob(ctx, job)
-	if err := repo.UpdateEnabled(ctx, jobId, true); err != nil {
-		logx.Errorf("数据库备份任务已启用( jobId: %d )，任务状态保存失败: %v", jobId, err)
-		return err
-	}
-	return nil
-}
-
-func (app *DbBackupApp) Disable(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	repo := app.backupRepo
-	job, err := repo.GetById(jobId)
-	if err != nil {
-		return err
-	}
-	if !job.IsEnabled() {
-		return nil
-	}
-	_ = app.scheduler.DisableJob(ctx, entity.DbJobTypeBackup, jobId)
-	if err := repo.UpdateEnabled(ctx, jobId, false); err != nil {
-		logx.Errorf("数据库恢复任务已禁用( jobId: %d )，任务状态保存失败: %v", jobId, err)
-		return err
-	}
-	return nil
-}
-
-func (app *DbBackupApp) StartNow(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	job, err := app.backupRepo.GetById(jobId)
-	if err != nil {
-		return err
-	}
-	if !job.IsEnabled() {
-		return errors.New("任务未启用")
-	}
-	_ = app.scheduler.StartJobNow(ctx, job)
-	return nil
-}
-
-// GetPageList 分页获取数据库备份任务
-func (app *DbBackupApp) GetPageList(condition *entity.DbBackupQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.backupRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
-}
-
-// GetDbNamesWithoutBackup 获取未配置定时备份的数据库名称
-func (app *DbBackupApp) GetDbNamesWithoutBackup(instanceId uint64, dbNames []string) ([]string, error) {
-	return app.backupRepo.GetDbNamesWithoutBackup(instanceId, dbNames)
-}
-
-// GetHistoryPageList 分页获取数据库备份历史
-func (app *DbBackupApp) GetHistoryPageList(condition *entity.DbBackupHistoryQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.backupHistoryRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
-}
-
-func (app *DbBackupApp) GetHistories(backupHistoryIds []uint64, toEntity any) error {
-	return app.backupHistoryRepo.GetHistories(backupHistoryIds, toEntity)
-}
-
-func NewIncUUID() (uuid.UUID, error) {
-	var uid uuid.UUID
-	now, seq, err := uuid.GetTime()
-	if err != nil {
-		return uid, err
-	}
-	timeHi := uint32((now >> 28) & 0xffffffff)
-	timeMid := uint16((now >> 12) & 0xffff)
-	timeLow := uint16(now & 0x0fff)
-	timeLow |= 0x1000 // Version 1
-
-	binary.BigEndian.PutUint32(uid[0:], timeHi)
-	binary.BigEndian.PutUint16(uid[4:], timeMid)
-	binary.BigEndian.PutUint16(uid[6:], timeLow)
-	binary.BigEndian.PutUint16(uid[8:], seq)
-
-	copy(uid[10:], uuid.NodeID())
-
-	return uid, nil
-}
-
-func (app *DbBackupApp) DeleteHistory(ctx context.Context, historyId uint64) (retErr error) {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if _, err := app.backupHistoryRepo.UpdateDeleting(false, historyId); err != nil {
-		return err
-	}
-	ok, err := app.backupHistoryRepo.UpdateDeleting(true, historyId)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return errRestoringBackupHistory
-	}
-	job, err := app.backupHistoryRepo.GetById(historyId)
-	if err != nil {
-		return err
-	}
-	conn, err := app.dbApp.GetDbConnByInstanceId(job.DbInstanceId)
-	if err != nil {
-		return err
-	}
-	dbProgram, err := conn.GetDialect().GetDbProgram()
-	if err != nil {
-		return err
-	}
-	if err := dbProgram.RemoveBackupHistory(ctx, job.DbBackupId, job.Uuid); err != nil {
-		return err
-	}
-	return app.backupHistoryRepo.DeleteById(ctx, historyId)
-}
diff --git a/server/internal/db/application/db_binlog.go b/server/internal/db/application/db_binlog.go
deleted file mode 100644
index 85472f7b..00000000
--- a/server/internal/db/application/db_binlog.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package application
-
-import (
-	"context"
-	"math"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/logx"
-	"mayfly-go/pkg/utils/timex"
-	"sync"
-	"time"
-)
-
-type DbBinlogApp struct {
-	scheduler         *dbScheduler               `inject:"DbScheduler"`
-	binlogRepo        repository.DbBinlog        `inject:"DbBinlogRepo"`
-	binlogHistoryRepo repository.DbBinlogHistory `inject:"DbBinlogHistoryRepo"`
-	backupRepo        repository.DbBackup        `inject:"DbBackupRepo"`
-	backupHistoryRepo repository.DbBackupHistory `inject:"DbBackupHistoryRepo"`
-	instanceRepo      repository.Instance        `inject:"DbInstanceRepo"`
-	dbApp             Db                         `inject:"DbApp"`
-
-	context   context.Context
-	cancel    context.CancelFunc
-	waitGroup sync.WaitGroup
-}
-
-func newDbBinlogApp() *DbBinlogApp {
-	ctx, cancel := context.WithCancel(context.Background())
-	svc := &DbBinlogApp{
-		context: ctx,
-		cancel:  cancel,
-	}
-	return svc
-}
-
-func (app *DbBinlogApp) Init() error {
-	app.context, app.cancel = context.WithCancel(context.Background())
-	app.waitGroup.Add(1)
-	go app.run()
-	return nil
-}
-
-func (app *DbBinlogApp) run() {
-	defer app.waitGroup.Done()
-
-	for app.context.Err() == nil {
-		if err := app.fetchBinlog(app.context); err != nil {
-			timex.SleepWithContext(app.context, time.Minute)
-			continue
-		}
-		if err := app.pruneBinlog(app.context); err != nil {
-			timex.SleepWithContext(app.context, time.Minute)
-			continue
-		}
-		timex.SleepWithContext(app.context, entity.BinlogDownloadInterval)
-	}
-}
-
-func (app *DbBinlogApp) fetchBinlog(ctx context.Context) error {
-	jobs, err := app.loadJobs(ctx)
-	if err != nil {
-		logx.Errorf("DbBinlogApp: 加载 BINLOG 同步任务失败: %s", err.Error())
-		timex.SleepWithContext(app.context, time.Minute)
-		return err
-	}
-	if ctx.Err() != nil {
-		return ctx.Err()
-	}
-	if err := app.scheduler.AddJob(app.context, jobs); err != nil {
-		logx.Error("DbBinlogApp: 添加 BINLOG 同步任务失败: ", err.Error())
-		return err
-	}
-	return nil
-}
-
-func (app *DbBinlogApp) pruneBinlog(ctx context.Context) error {
-	jobs, err := app.binlogRepo.SelectByCond(map[string]any{})
-	if err != nil {
-		logx.Error("DbBinlogApp: 获取 BINLOG 同步任务失败: ", err.Error())
-		return err
-	}
-	for _, instance := range jobs {
-		if ctx.Err() != nil {
-			return ctx.Err()
-		}
-		var histories []*entity.DbBinlogHistory
-		backupHistory, backupHistoryExists, err := app.backupHistoryRepo.GetEarliestHistoryForBinlog(instance.Id)
-		if err != nil {
-			logx.Errorf("DbBinlogApp: 获取数据库备份历史失败: %s", err.Error())
-			return err
-		}
-		var binlogSeq int64 = math.MaxInt64
-		if backupHistoryExists {
-			binlogSeq = backupHistory.BinlogSequence
-		}
-		if err := app.binlogHistoryRepo.GetHistoriesBeforeSequence(ctx, instance.Id, binlogSeq, &histories); err != nil {
-			logx.Errorf("DbBinlogApp: 获取数据库 BINLOG 历史失败: %s", err.Error())
-			return err
-		}
-		conn, err := app.dbApp.GetDbConnByInstanceId(instance.Id)
-		if err != nil {
-			logx.Errorf("DbBinlogApp: 创建数据库连接失败: %s", err.Error())
-			return err
-		}
-		dbProgram, err := conn.GetDialect().GetDbProgram()
-		if err != nil {
-			logx.Errorf("DbBinlogApp: 获取数据库备份与恢复程序失败: %s", err.Error())
-			return err
-		}
-		for i, history := range histories {
-			// todo: 在避免并发访问的前提下删除本地最新的 BINLOG 文件
-			if !backupHistoryExists && i == len(histories)-1 {
-				// 暂不删除本地最新的 BINLOG 文件
-				break
-			}
-			if ctx.Err() != nil {
-				return ctx.Err()
-			}
-			if err := dbProgram.PruneBinlog(history); err != nil {
-				logx.Errorf("清理 BINLOG 文件失败: %v", err)
-				continue
-			}
-			if err := app.binlogHistoryRepo.DeleteById(ctx, history.Id); err != nil {
-				logx.Errorf("删除 BINLOG 历史失败: %v", err)
-				continue
-			}
-		}
-	}
-	return nil
-}
-
-func (app *DbBinlogApp) loadJobs(ctx context.Context) ([]*entity.DbBinlog, error) {
-	var instanceIds []uint64
-	if err := app.backupRepo.ListDbInstances(true, true, &instanceIds); err != nil {
-		return nil, err
-	}
-	jobs := make([]*entity.DbBinlog, 0, len(instanceIds))
-	for _, id := range instanceIds {
-		if ctx.Err() != nil {
-			break
-		}
-		binlog := entity.NewDbBinlog(id)
-		if err := app.AddJobIfNotExists(app.context, binlog); err != nil {
-			return nil, err
-		}
-		jobs = append(jobs, binlog)
-	}
-	return jobs, nil
-}
-
-func (app *DbBinlogApp) Close() {
-	cancel := app.cancel
-	if cancel == nil {
-		return
-	}
-	app.cancel = nil
-	cancel()
-	app.waitGroup.Wait()
-}
-
-func (app *DbBinlogApp) AddJobIfNotExists(ctx context.Context, job *entity.DbBinlog) error {
-	if err := app.binlogRepo.AddJobIfNotExists(ctx, job); err != nil {
-		return err
-	}
-	if job.Id == 0 {
-		return nil
-	}
-	return nil
-}
diff --git a/server/internal/db/application/db_data_sync.go b/server/internal/db/application/db_data_sync.go
index ff014398..c2591d8f 100644
--- a/server/internal/db/application/db_data_sync.go
+++ b/server/internal/db/application/db_data_sync.go
@@ -28,7 +28,7 @@ type DataSyncTask interface {
 	base.App[*entity.DataSyncTask]
 
 	// GetPageList 分页获取数据库实例
-	GetPageList(condition *entity.DataSyncTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DataSyncTaskQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncTask], error)
 
 	Save(ctx context.Context, instanceEntity *entity.DataSyncTask) error
 
@@ -44,7 +44,7 @@ type DataSyncTask interface {
 
 	StopTask(ctx context.Context, id uint64) error
 
-	GetTaskLogList(condition *entity.DataSyncLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetTaskLogList(condition *entity.DataSyncLogQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncLog], error)
 }
 
 var _ (DataSyncTask) = (*dataSyncAppImpl)(nil)
@@ -65,8 +65,8 @@ func (app *dataSyncAppImpl) InjectDbDataSyncTaskRepo(repo repository.DataSyncTas
 	app.Repo = repo
 }
 
-func (app *dataSyncAppImpl) GetPageList(condition *entity.DataSyncTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.GetRepo().GetTaskList(condition, pageParam, toEntity, orderBy...)
+func (app *dataSyncAppImpl) GetPageList(condition *entity.DataSyncTaskQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncTask], error) {
+	return app.GetRepo().GetTaskList(condition, orderBy...)
 }
 
 func (app *dataSyncAppImpl) Save(ctx context.Context, taskEntity *entity.DataSyncTask) error {
@@ -406,39 +406,36 @@ func (app *dataSyncAppImpl) InitCronJob() {
 	_ = app.UpdateByCond(context.TODO(), &entity.DataSyncTask{RunningState: entity.DataSyncTaskRunStateReady}, &entity.DataSyncTask{RunningState: entity.DataSyncTaskRunStateRunning})
 
 	// 把所有正常任务添加到定时任务中
-	pageParam := &model.PageParam{
-		PageSize: 100,
-		PageNum:  1,
-	}
 	cond := new(entity.DataSyncTaskQuery)
+	cond.PageNum = 1
+	cond.PageSize = 100
 	cond.Status = entity.DataSyncTaskStatusEnable
-	jobs := new([]entity.DataSyncTask)
 
-	pr, err := app.GetPageList(cond, pageParam, jobs)
+	tasks, err := app.GetPageList(cond)
 	if err != nil {
 		logx.ErrorTrace("the data synchronization task failed to initialize", err)
 		return
 	}
 
-	total := pr.Total
+	total := tasks.Total
 	add := 0
 
 	for {
-		for _, job := range *jobs {
-			app.AddCronJob(contextx.NewTraceId(), &job)
+		for _, job := range tasks.List {
+			app.AddCronJob(contextx.NewTraceId(), job)
 			add++
 		}
 		if add >= int(total) {
 			return
 		}
 
-		pageParam.PageNum++
-		_, _ = app.GetPageList(cond, pageParam, jobs)
+		cond.PageNum = cond.PageNum + 1
+		tasks, _ = app.GetPageList(cond)
 	}
 }
 
-func (app *dataSyncAppImpl) GetTaskLogList(condition *entity.DataSyncLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.dbDataSyncLogRepo.GetTaskLogList(condition, pageParam, toEntity, orderBy...)
+func (app *dataSyncAppImpl) GetTaskLogList(condition *entity.DataSyncLogQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncLog], error) {
+	return app.dbDataSyncLogRepo.GetTaskLogList(condition, orderBy...)
 }
 
 // MarkRunning 标记任务执行中
diff --git a/server/internal/db/application/db_instance.go b/server/internal/db/application/db_instance.go
index 6d25ddc8..811ab49a 100644
--- a/server/internal/db/application/db_instance.go
+++ b/server/internal/db/application/db_instance.go
@@ -25,7 +25,7 @@ type Instance interface {
 	base.App[*entity.DbInstance]
 
 	// GetPageList 分页获取数据库实例
-	GetPageList(condition *entity.InstanceQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.InstanceQuery, orderBy ...string) (*model.PageResult[*entity.DbInstance], error)
 
 	TestConn(instanceEntity *entity.DbInstance, authCert *tagentity.ResourceAuthCert) error
 
@@ -55,8 +55,8 @@ type instanceAppImpl struct {
 var _ (Instance) = (*instanceAppImpl)(nil)
 
 // GetPageList 分页获取数据库实例
-func (app *instanceAppImpl) GetPageList(condition *entity.InstanceQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.GetRepo().GetInstanceList(condition, pageParam, toEntity, orderBy...)
+func (app *instanceAppImpl) GetPageList(condition *entity.InstanceQuery, orderBy ...string) (*model.PageResult[*entity.DbInstance], error) {
+	return app.GetRepo().GetInstanceList(condition, orderBy...)
 }
 
 func (app *instanceAppImpl) TestConn(instanceEntity *entity.DbInstance, authCert *tagentity.ResourceAuthCert) error {
diff --git a/server/internal/db/application/db_restore.go b/server/internal/db/application/db_restore.go
deleted file mode 100644
index c6593280..00000000
--- a/server/internal/db/application/db_restore.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package application
-
-import (
-	"context"
-	"errors"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/logx"
-	"mayfly-go/pkg/model"
-	"sync"
-)
-
-type DbRestoreApp struct {
-	scheduler          *dbScheduler                `inject:"DbScheduler"`
-	restoreRepo        repository.DbRestore        `inject:"DbRestoreRepo"`
-	restoreHistoryRepo repository.DbRestoreHistory `inject:"DbRestoreHistoryRepo"`
-	mutex              sync.Mutex
-}
-
-func (app *DbRestoreApp) Init() error {
-	var jobs []*entity.DbRestore
-	if err := app.restoreRepo.ListToDo(&jobs); err != nil {
-		return err
-	}
-	if err := app.scheduler.AddJob(context.Background(), jobs); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (app *DbRestoreApp) Close() {
-	app.scheduler.Close()
-}
-
-func (app *DbRestoreApp) Create(ctx context.Context, jobs any) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if err := app.restoreRepo.AddJob(ctx, jobs); err != nil {
-		return err
-	}
-	_ = app.scheduler.AddJob(ctx, jobs)
-	return nil
-}
-
-func (app *DbRestoreApp) Update(ctx context.Context, job *entity.DbRestore) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if err := app.restoreRepo.UpdateById(ctx, job); err != nil {
-		return err
-	}
-	_ = app.scheduler.UpdateJob(ctx, job)
-	return nil
-}
-
-func (app *DbRestoreApp) Delete(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	if err := app.scheduler.RemoveJob(ctx, entity.DbJobTypeRestore, jobId); err != nil {
-		return err
-	}
-	history := &entity.DbRestoreHistory{
-		DbRestoreId: jobId,
-	}
-	if err := app.restoreHistoryRepo.DeleteByCond(ctx, history); err != nil {
-		return err
-	}
-	if err := app.restoreRepo.DeleteById(ctx, jobId); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (app *DbRestoreApp) Enable(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	repo := app.restoreRepo
-	job, err := repo.GetById(jobId)
-	if err != nil {
-		return err
-	}
-	if job.IsEnabled() {
-		return nil
-	}
-	if job.IsExpired() {
-		return errors.New("任务已过期")
-	}
-	_ = app.scheduler.EnableJob(ctx, job)
-	if err := repo.UpdateEnabled(ctx, jobId, true); err != nil {
-		logx.Errorf("数据库恢复任务已启用( jobId: %d )，任务状态保存失败: %v", jobId, err)
-		return err
-	}
-	return nil
-}
-
-func (app *DbRestoreApp) Disable(ctx context.Context, jobId uint64) error {
-	app.mutex.Lock()
-	defer app.mutex.Unlock()
-
-	repo := app.restoreRepo
-	job, err := repo.GetById(jobId)
-	if err != nil {
-		return err
-	}
-	if !job.IsEnabled() {
-		return nil
-	}
-	_ = app.scheduler.DisableJob(ctx, entity.DbJobTypeRestore, jobId)
-	if err := repo.UpdateEnabled(ctx, jobId, false); err != nil {
-		logx.Errorf("数据库恢复任务已禁用( jobId: %d )，任务状态保存失败: %v", jobId, err)
-		return err
-	}
-	return nil
-}
-
-// GetPageList 分页获取数据库恢复任务
-func (app *DbRestoreApp) GetPageList(condition *entity.DbRestoreQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.restoreRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
-}
-
-// GetRestoresEnabled 获取数据库恢复任务
-func (app *DbRestoreApp) GetRestoresEnabled(toEntity any, backupHistoryId ...uint64) error {
-	return app.restoreRepo.GetEnabledRestores(toEntity, backupHistoryId...)
-}
-
-// GetDbNamesWithoutRestore 获取未配置定时恢复的数据库名称
-func (app *DbRestoreApp) GetDbNamesWithoutRestore(instanceId uint64, dbNames []string) ([]string, error) {
-	return app.restoreRepo.GetDbNamesWithoutRestore(instanceId, dbNames)
-}
-
-// GetHistoryPageList 分页获取数据库备份历史
-func (app *DbRestoreApp) GetHistoryPageList(condition *entity.DbRestoreHistoryQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.restoreHistoryRepo.GetDbRestoreHistories(condition, pageParam, toEntity, orderBy...)
-}
diff --git a/server/internal/db/application/db_scheduler.go b/server/internal/db/application/db_scheduler.go
deleted file mode 100644
index 8eaa04e9..00000000
--- a/server/internal/db/application/db_scheduler.go
+++ /dev/null
@@ -1,381 +0,0 @@
-package application
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"mayfly-go/internal/db/dbm/dbi"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/runner"
-	"reflect"
-	"strconv"
-	"sync"
-	"time"
-
-	"golang.org/x/sync/singleflight"
-	"gorm.io/gorm"
-)
-
-const (
-	maxRunning = 8
-)
-
-type dbScheduler struct {
-	mutex              sync.Mutex
-	runner             *runner.Runner[entity.DbJob]
-	dbApp              Db                          `inject:"DbApp"`
-	backupRepo         repository.DbBackup         `inject:"DbBackupRepo"`
-	backupHistoryRepo  repository.DbBackupHistory  `inject:"DbBackupHistoryRepo"`
-	restoreRepo        repository.DbRestore        `inject:"DbRestoreRepo"`
-	restoreHistoryRepo repository.DbRestoreHistory `inject:"DbRestoreHistoryRepo"`
-	binlogRepo         repository.DbBinlog         `inject:"DbBinlogRepo"`
-	binlogHistoryRepo  repository.DbBinlogHistory  `inject:"DbBinlogHistoryRepo"`
-	sfGroup            singleflight.Group
-}
-
-func newDbScheduler() *dbScheduler {
-	scheduler := &dbScheduler{}
-	scheduler.runner = runner.NewRunner[entity.DbJob](maxRunning, scheduler.runJob,
-		runner.WithScheduleJob[entity.DbJob](scheduler.scheduleJob),
-		runner.WithRunnableJob[entity.DbJob](scheduler.runnableJob),
-		runner.WithUpdateJob[entity.DbJob](scheduler.updateJob),
-	)
-	return scheduler
-}
-
-func (s *dbScheduler) scheduleJob(job entity.DbJob) (time.Time, error) {
-	return job.Schedule()
-}
-
-func (s *dbScheduler) UpdateJob(ctx context.Context, job entity.DbJob) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-
-	_ = s.runner.Update(ctx, job)
-	return nil
-}
-
-func (s *dbScheduler) Close() {
-	s.runner.Close()
-}
-
-func (s *dbScheduler) AddJob(ctx context.Context, jobs any) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-
-	reflectValue := reflect.ValueOf(jobs)
-	switch reflectValue.Kind() {
-	case reflect.Array, reflect.Slice:
-		reflectLen := reflectValue.Len()
-		for i := 0; i < reflectLen; i++ {
-			job := reflectValue.Index(i).Interface().(entity.DbJob)
-			_ = s.runner.Add(ctx, job)
-		}
-	default:
-		job := jobs.(entity.DbJob)
-		_ = s.runner.Add(ctx, job)
-	}
-	return nil
-}
-
-func (s *dbScheduler) RemoveJob(ctx context.Context, jobType entity.DbJobType, jobId uint64) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-
-	if err := s.runner.Remove(ctx, entity.FormatJobKey(jobType, jobId)); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *dbScheduler) EnableJob(ctx context.Context, job entity.DbJob) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-
-	_ = s.runner.Add(ctx, job)
-	return nil
-}
-
-func (s *dbScheduler) DisableJob(ctx context.Context, jobType entity.DbJobType, jobId uint64) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-
-	_ = s.runner.Remove(ctx, entity.FormatJobKey(jobType, jobId))
-	return nil
-}
-
-func (s *dbScheduler) StartJobNow(ctx context.Context, job entity.DbJob) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-
-	_ = s.runner.StartNow(ctx, job)
-	return nil
-}
-
-func (s *dbScheduler) backup(ctx context.Context, dbProgram dbi.DbProgram, backup *entity.DbBackup) error {
-	id, err := NewIncUUID()
-	if err != nil {
-		return err
-	}
-	history := &entity.DbBackupHistory{
-		Uuid:         id.String(),
-		DbBackupId:   backup.Id,
-		DbInstanceId: backup.DbInstanceId,
-		DbName:       backup.DbName,
-	}
-	binlogInfo, err := dbProgram.Backup(ctx, history)
-	if err != nil {
-		return err
-	}
-	now := time.Now()
-	name := backup.DbName
-	if len(backup.Name) > 0 {
-		name = fmt.Sprintf("%s-%s", backup.DbName, backup.Name)
-	}
-	history.Name = fmt.Sprintf("%s[%s]", name, now.Format(time.DateTime))
-	history.CreateTime = now
-	history.BinlogFileName = binlogInfo.FileName
-	history.BinlogSequence = binlogInfo.Sequence
-	history.BinlogPosition = binlogInfo.Position
-
-	if err := s.backupHistoryRepo.Insert(ctx, history); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *dbScheduler) singleFlightFetchBinlog(ctx context.Context, dbProgram dbi.DbProgram, instanceId uint64, targetTime time.Time) error {
-	key := strconv.FormatUint(instanceId, 10)
-	for ctx.Err() == nil {
-		c := s.sfGroup.DoChan(key, func() (interface{}, error) {
-			if err := s.fetchBinlog(ctx, dbProgram, instanceId, true, targetTime); err != nil {
-				return targetTime, err
-			}
-			return targetTime, nil
-		})
-		select {
-		case res := <-c:
-			if targetTime.Compare(res.Val.(time.Time)) <= 0 {
-				return res.Err
-			}
-		case <-ctx.Done():
-		}
-	}
-	return ctx.Err()
-}
-
-func (s *dbScheduler) restore(ctx context.Context, dbProgram dbi.DbProgram, restore *entity.DbRestore) error {
-	if restore.PointInTime.Valid {
-		if err := s.fetchBinlog(ctx, dbProgram, restore.DbInstanceId, true, restore.PointInTime.Time); err != nil {
-			return err
-		}
-		if err := s.restorePointInTime(ctx, dbProgram, restore); err != nil {
-			return err
-		}
-	} else {
-		backupHistory, err := s.backupHistoryRepo.GetById(restore.DbBackupHistoryId)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				err = errors.New("备份历史已删除")
-			}
-			return err
-		}
-		if err := s.restoreBackupHistory(ctx, dbProgram, backupHistory); err != nil {
-			return err
-		}
-	}
-
-	history := &entity.DbRestoreHistory{
-		CreateTime:  time.Now(),
-		DbRestoreId: restore.Id,
-	}
-	if err := s.restoreHistoryRepo.Insert(ctx, history); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *dbScheduler) updateJob(ctx context.Context, job entity.DbJob) error {
-	switch t := job.(type) {
-	case *entity.DbBackup:
-		return s.backupRepo.UpdateById(ctx, t)
-	case *entity.DbRestore:
-		return s.restoreRepo.UpdateById(ctx, t)
-	case *entity.DbBinlog:
-		return s.binlogRepo.UpdateById(ctx, t)
-	default:
-		return fmt.Errorf("无效的数据库任务类型: %T", t)
-	}
-}
-
-func (s *dbScheduler) runJob(ctx context.Context, job entity.DbJob) error {
-	conn, err := s.dbApp.GetDbConnByInstanceId(job.GetInstanceId())
-	if err != nil {
-		return err
-	}
-	dbProgram, err := conn.GetDialect().GetDbProgram()
-	if err != nil {
-		return err
-	}
-	switch t := job.(type) {
-	case *entity.DbBackup:
-		return s.backup(ctx, dbProgram, t)
-	case *entity.DbRestore:
-		return s.restore(ctx, dbProgram, t)
-	case *entity.DbBinlog:
-		return s.fetchBinlog(ctx, dbProgram, t.DbInstanceId, false, time.Now())
-	default:
-		return fmt.Errorf("无效的数据库任务类型: %T", t)
-	}
-}
-
-func (s *dbScheduler) runnableJob(job entity.DbJob, nextRunning runner.NextJobFunc[entity.DbJob]) (bool, error) {
-	if job.IsExpired() {
-		return false, runner.ErrJobExpired
-	}
-	const maxCountByInstanceId = 4
-	const maxCountByDbName = 1
-	var countByInstanceId, countByDbName int
-	for item, ok := nextRunning(); ok; item, ok = nextRunning() {
-		if job.GetInstanceId() == item.GetInstanceId() {
-			countByInstanceId++
-			if countByInstanceId >= maxCountByInstanceId {
-				return false, nil
-			}
-			if job.GetDbName() == item.GetDbName() {
-				countByDbName++
-				if countByDbName >= maxCountByDbName {
-					return false, nil
-				}
-			}
-			if (job.GetJobType() == entity.DbJobTypeBinlog && item.GetJobType() == entity.DbJobTypeRestore) ||
-				(job.GetJobType() == entity.DbJobTypeRestore && item.GetJobType() == entity.DbJobTypeBinlog) {
-				return false, nil
-			}
-		}
-	}
-	return true, nil
-}
-
-func (s *dbScheduler) restorePointInTime(ctx context.Context, dbProgram dbi.DbProgram, job *entity.DbRestore) error {
-	binlogHistory, err := s.binlogHistoryRepo.GetHistoryByTime(job.DbInstanceId, job.PointInTime.Time)
-	if err != nil {
-		return err
-	}
-	position, err := dbProgram.GetBinlogEventPositionAtOrAfterTime(ctx, binlogHistory.FileName, job.PointInTime.Time)
-	if err != nil {
-		return err
-	}
-	target := &entity.BinlogInfo{
-		FileName: binlogHistory.FileName,
-		Sequence: binlogHistory.Sequence,
-		Position: position,
-	}
-	backupHistory, err := s.backupHistoryRepo.GetLatestHistoryForBinlog(job.DbInstanceId, job.DbName, target)
-	if err != nil {
-		return err
-	}
-	start := &entity.BinlogInfo{
-		FileName: backupHistory.BinlogFileName,
-		Sequence: backupHistory.BinlogSequence,
-		Position: backupHistory.BinlogPosition,
-	}
-	binlogHistories, err := s.binlogHistoryRepo.GetHistories(job.DbInstanceId, start, target)
-	if err != nil {
-		return err
-	}
-	restoreInfo := &dbi.RestoreInfo{
-		BackupHistory:   backupHistory,
-		BinlogHistories: binlogHistories,
-		StartPosition:   backupHistory.BinlogPosition,
-		TargetPosition:  target.Position,
-		TargetTime:      job.PointInTime.Time,
-	}
-	if err := dbProgram.ReplayBinlog(ctx, job.DbName, job.DbName, restoreInfo); err != nil {
-		return err
-	}
-	if err := s.restoreBackupHistory(ctx, dbProgram, backupHistory); err != nil {
-		return err
-	}
-	// 由于 ReplayBinlog 未记录 BINLOG 事件，系统自动备份，避免数据丢失
-	backup := &entity.DbBackup{
-		DbInstanceId: backupHistory.DbInstanceId,
-		DbName:       backupHistory.DbName,
-		Enabled:      true,
-		Repeated:     false,
-		StartTime:    time.Now(),
-		Interval:     0,
-		Name:         "系统备份",
-	}
-	backup.Id = backupHistory.DbBackupId
-	if err := s.backup(ctx, dbProgram, backup); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *dbScheduler) restoreBackupHistory(ctx context.Context, program dbi.DbProgram, backupHistory *entity.DbBackupHistory) (retErr error) {
-	if _, err := s.backupHistoryRepo.UpdateRestoring(false, backupHistory.Id); err != nil {
-		return err
-	}
-	ok, err := s.backupHistoryRepo.UpdateRestoring(true, backupHistory.Id)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_, err = s.backupHistoryRepo.UpdateRestoring(false, backupHistory.Id)
-		if err == nil {
-			return
-		}
-		if retErr == nil {
-			retErr = err
-			return
-		}
-		retErr = fmt.Errorf("%w, %w", retErr, err)
-	}()
-	if !ok {
-		return errors.New("关联的数据库备份历史已删除")
-	}
-	return program.RestoreBackupHistory(ctx, backupHistory.DbName, backupHistory.DbBackupId, backupHistory.Uuid)
-}
-
-func (s *dbScheduler) fetchBinlog(ctx context.Context, dbProgram dbi.DbProgram, instanceId uint64, downloadLatestBinlogFile bool, targetTime time.Time) error {
-	if enabled, err := dbProgram.CheckBinlogEnabled(ctx); err != nil {
-		return err
-	} else if !enabled {
-		return errors.New("数据库未启用 BINLOG")
-	}
-	if enabled, err := dbProgram.CheckBinlogRowFormat(ctx); err != nil {
-		return err
-	} else if !enabled {
-		return errors.New("数据库未启用 BINLOG 行模式")
-	}
-
-	earliestBackupSequence := int64(-1)
-	binlogHistory, ok, err := s.binlogHistoryRepo.GetLatestHistory(instanceId)
-	if err != nil {
-		return err
-	}
-	if downloadLatestBinlogFile && targetTime.Before(binlogHistory.LastEventTime) {
-		return nil
-	}
-
-	if !ok {
-		backupHistory, ok, err := s.backupHistoryRepo.GetEarliestHistoryForBinlog(instanceId)
-		if err != nil {
-			return err
-		}
-		if !ok {
-			return nil
-		}
-		earliestBackupSequence = backupHistory.BinlogSequence
-	}
-
-	// todo: 将循环从 dbProgram.FetchBinlogs 中提取出来，实现 BINLOG 同步成功后逐一保存 binlogHistory
-	binlogFiles, err := dbProgram.FetchBinlogs(ctx, downloadLatestBinlogFile, earliestBackupSequence, binlogHistory)
-	if err != nil {
-		return err
-	}
-	return s.binlogHistoryRepo.InsertWithBinlogFiles(ctx, instanceId, binlogFiles)
-}
diff --git a/server/internal/db/application/db_sql_exec.go b/server/internal/db/application/db_sql_exec.go
index cb27d16e..77bc1c9f 100644
--- a/server/internal/db/application/db_sql_exec.go
+++ b/server/internal/db/application/db_sql_exec.go
@@ -61,7 +61,7 @@ type DbSqlExec interface {
 	DeleteBy(ctx context.Context, condition *entity.DbSqlExec) error
 
 	// 分页获取
-	GetPageList(condition *entity.DbSqlExecQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DbSqlExecQuery, orderBy ...string) (*model.PageResult[*entity.DbSqlExec], error)
 }
 
 var _ (DbSqlExec) = (*dbSqlExecAppImpl)(nil)
@@ -313,8 +313,8 @@ func (d *dbSqlExecAppImpl) DeleteBy(ctx context.Context, condition *entity.DbSql
 	return d.dbSqlExecRepo.DeleteByCond(ctx, condition)
 }
 
-func (d *dbSqlExecAppImpl) GetPageList(condition *entity.DbSqlExecQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return d.dbSqlExecRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (d *dbSqlExecAppImpl) GetPageList(condition *entity.DbSqlExecQuery, orderBy ...string) (*model.PageResult[*entity.DbSqlExec], error) {
+	return d.dbSqlExecRepo.GetPageList(condition, orderBy...)
 }
 
 // 保存sql执行记录，如果是查询类则根据系统配置判断是否保存
diff --git a/server/internal/db/application/db_transfer.go b/server/internal/db/application/db_transfer.go
index ab9e119a..d8418c3c 100644
--- a/server/internal/db/application/db_transfer.go
+++ b/server/internal/db/application/db_transfer.go
@@ -34,7 +34,7 @@ type DbTransferTask interface {
 	base.App[*entity.DbTransferTask]
 
 	// GetPageList 分页获取数据库实例
-	GetPageList(condition *entity.DbTransferTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DbTransferTaskQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferTask], error)
 
 	Save(ctx context.Context, instanceEntity *entity.DbTransferTask) error
 
@@ -69,8 +69,8 @@ type dbTransferAppImpl struct {
 	fileApp         fileapp.File   `inject:"T"`
 }
 
-func (app *dbTransferAppImpl) GetPageList(condition *entity.DbTransferTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.GetRepo().GetTaskList(condition, pageParam, toEntity, orderBy...)
+func (app *dbTransferAppImpl) GetPageList(condition *entity.DbTransferTaskQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferTask], error) {
+	return app.GetRepo().GetTaskList(condition, orderBy...)
 }
 
 func (app *dbTransferAppImpl) Save(ctx context.Context, taskEntity *entity.DbTransferTask) error {
@@ -144,16 +144,15 @@ func (app *dbTransferAppImpl) InitCronJob() {
 	_ = app.transferFileApp.UpdateByCond(context.TODO(), &entity.DbTransferFile{Status: entity.DbTransferFileStatusFail}, &entity.DbTransferFile{Status: entity.DbTransferFileStatusRunning})
 
 	// 把所有需要定时执行的任务添加到定时任务中
-	pageParam := &model.PageParam{
-		PageSize: 100,
-		PageNum:  1,
-	}
 	cond := new(entity.DbTransferTaskQuery)
+	cond.PageNum = 1
+	cond.PageSize = 100
+
 	cond.Status = entity.DbTransferTaskStatusEnable
 	cond.CronAble = entity.DbTransferTaskCronAbleEnable
-	jobs := new([]entity.DbTransferTask)
+	jobs := []entity.DbTransferTask{}
 
-	pr, _ := app.GetPageList(cond, pageParam, jobs)
+	pr, _ := app.GetPageList(cond)
 	if nil == pr || pr.Total == 0 {
 		return
 	}
@@ -161,15 +160,15 @@ func (app *dbTransferAppImpl) InitCronJob() {
 	add := 0
 
 	for {
-		for _, job := range *jobs {
+		for _, job := range jobs {
 			app.AddCronJob(contextx.NewTraceId(), &job)
 			add++
 		}
 		if add >= int(total) {
 			return
 		}
-		pageParam.PageNum++
-		_, _ = app.GetPageList(cond, pageParam, jobs)
+		cond.PageNum++
+		_, _ = app.GetPageList(cond)
 	}
 }
 
diff --git a/server/internal/db/application/db_transfer_file.go b/server/internal/db/application/db_transfer_file.go
index 421505a6..67cf5bd1 100644
--- a/server/internal/db/application/db_transfer_file.go
+++ b/server/internal/db/application/db_transfer_file.go
@@ -13,7 +13,7 @@ type DbTransferFile interface {
 	base.App[*entity.DbTransferFile]
 
 	// GetPageList 分页获取数据库实例
-	GetPageList(condition *entity.DbTransferFileQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DbTransferFileQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferFile], error)
 
 	Save(ctx context.Context, instanceEntity *entity.DbTransferFile) error
 
@@ -28,8 +28,8 @@ type dbTransferFileAppImpl struct {
 	fileApp fileapp.File `inject:"T"`
 }
 
-func (app *dbTransferFileAppImpl) GetPageList(condition *entity.DbTransferFileQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return app.GetRepo().GetPageList(condition, pageParam, toEntity, orderBy...)
+func (app *dbTransferFileAppImpl) GetPageList(condition *entity.DbTransferFileQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferFile], error) {
+	return app.GetRepo().GetPageList(condition, orderBy...)
 }
 
 func (app *dbTransferFileAppImpl) Save(ctx context.Context, taskEntity *entity.DbTransferFile) error {
diff --git a/server/internal/db/dbm/dbi/db_program.go b/server/internal/db/dbm/dbi/db_program.go
index 30dfa293..dfcd4126 100644
--- a/server/internal/db/dbm/dbi/db_program.go
+++ b/server/internal/db/dbm/dbi/db_program.go
@@ -2,8 +2,6 @@ package dbi
 
 import (
 	"context"
-	"mayfly-go/internal/db/domain/entity"
-	"path/filepath"
 	"time"
 )
 
@@ -11,9 +9,9 @@ type DbProgram interface {
 	CheckBinlogEnabled(ctx context.Context) (bool, error)
 	CheckBinlogRowFormat(ctx context.Context) (bool, error)
 
-	Backup(ctx context.Context, backupHistory *entity.DbBackupHistory) (*entity.BinlogInfo, error)
+	// Backup(ctx context.Context, backupHistory *entity.DbBackupHistory) (*entity.BinlogInfo, error)
 
-	FetchBinlogs(ctx context.Context, downloadLatestBinlogFile bool, earliestBackupSequence int64, latestBinlogHistory *entity.DbBinlogHistory) ([]*entity.BinlogFile, error)
+	// FetchBinlogs(ctx context.Context, downloadLatestBinlogFile bool, earliestBackupSequence int64, latestBinlogHistory *entity.DbBinlogHistory) ([]*entity.BinlogFile, error)
 
 	ReplayBinlog(ctx context.Context, originalDatabase, targetDatabase string, restoreInfo *RestoreInfo) error
 
@@ -23,21 +21,22 @@ type DbProgram interface {
 
 	GetBinlogEventPositionAtOrAfterTime(ctx context.Context, binlogName string, targetTime time.Time) (position int64, parseErr error)
 
-	PruneBinlog(history *entity.DbBinlogHistory) error
+	// PruneBinlog(history *entity.DbBinlogHistory) error
 }
 
 type RestoreInfo struct {
-	BackupHistory   *entity.DbBackupHistory
-	BinlogHistories []*entity.DbBinlogHistory
-	StartPosition   int64
-	TargetPosition  int64
-	TargetTime      time.Time
+	// BackupHistory   *entity.DbBackupHistory
+	// BinlogHistories []*entity.DbBinlogHistory
+	StartPosition  int64
+	TargetPosition int64
+	TargetTime     time.Time
 }
 
 func (ri *RestoreInfo) GetBinlogPaths(binlogDir string) []string {
-	files := make([]string, 0, len(ri.BinlogHistories))
-	for _, history := range ri.BinlogHistories {
-		files = append(files, filepath.Join(binlogDir, history.FileName))
-	}
-	return files
+	// files := make([]string, 0, len(ri.BinlogHistories))
+	// for _, history := range ri.BinlogHistories {
+	// 	files = append(files, filepath.Join(binlogDir, history.FileName))
+	// }
+	// return files
+	return nil
 }
diff --git a/server/internal/db/dbm/mysql/dialect.go b/server/internal/db/dbm/mysql/dialect.go
index f578bbd2..fcf5d24f 100644
--- a/server/internal/db/dbm/mysql/dialect.go
+++ b/server/internal/db/dbm/mysql/dialect.go
@@ -24,7 +24,8 @@ type MysqlDialect struct {
 
 // GetDbProgram 获取数据库程序模块，用于数据库备份与恢复
 func (md *MysqlDialect) GetDbProgram() (dbi.DbProgram, error) {
-	return NewDbProgramMysql(md.dc), nil
+	return nil, nil
+	// return NewDbProgramMysql(md.dc), nil
 }
 
 func (md *MysqlDialect) CopyTable(copy *dbi.DbCopyTable) error {
diff --git a/server/internal/db/dbm/mysql/program.go b/server/internal/db/dbm/mysql/program.go
index c88260a8..e18f1062 100644
--- a/server/internal/db/dbm/mysql/program.go
+++ b/server/internal/db/dbm/mysql/program.go
@@ -1,853 +1,853 @@
 package mysql
 
-import (
-	"bufio"
-	"compress/gzip"
-	"context"
-	"database/sql"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"mayfly-go/internal/db/config"
-	"mayfly-go/internal/db/dbm/dbi"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/logx"
-
-	"github.com/pkg/errors"
-)
-
-var _ dbi.DbProgram = (*DbProgramMysql)(nil)
-
-type DbProgramMysql struct {
-	dbConn *dbi.DbConn
-	// mysqlBin 用于集成测试
-	mysqlBin *config.MysqlBin
-	// backupPath 用于集成测试
-	backupPath string
-}
-
-func NewDbProgramMysql(dbConn *dbi.DbConn) *DbProgramMysql {
-	return &DbProgramMysql{
-		dbConn: dbConn,
-	}
-}
-
-func (svc *DbProgramMysql) dbInfo() *dbi.DbInfo {
-	dbInfo := svc.dbConn.Info
-	err := dbInfo.IfUseSshTunnelChangeIpPort()
-	if err != nil {
-		logx.Errorf("通过ssh隧道连接db失败: %s", err.Error())
-	}
-	return dbInfo
-}
-
-func (svc *DbProgramMysql) getMysqlBin() *config.MysqlBin {
-	if svc.mysqlBin != nil {
-		return svc.mysqlBin
-	}
-	dbInfo := svc.dbInfo()
-	var mysqlBin *config.MysqlBin
-	switch dbInfo.Type {
-	case DbTypeMariadb:
-		mysqlBin = config.GetMysqlBin(config.ConfigKeyDbMariadbBin)
-	case DbTypeMysql:
-		mysqlBin = config.GetMysqlBin(config.ConfigKeyDbMysqlBin)
-	default:
-		panic(fmt.Sprintf("不兼容 MySQL 的数据库类型: %v", dbInfo.Type))
-	}
-	svc.mysqlBin = mysqlBin
-	return svc.mysqlBin
-}
-
-func (svc *DbProgramMysql) getBackupPath() string {
-	if len(svc.backupPath) > 0 {
-		return svc.backupPath
-	}
-	return config.GetDbBackupRestore().BackupPath
-}
-
-func (svc *DbProgramMysql) GetBinlogFilePath(fileName string) string {
-	return filepath.Join(svc.getBinlogDir(svc.dbInfo().InstanceId), fileName)
-}
-
-func (svc *DbProgramMysql) Backup(ctx context.Context, backupHistory *entity.DbBackupHistory) (*entity.BinlogInfo, error) {
-	binlogEnabled, err := svc.CheckBinlogEnabled(ctx)
-	if err != nil {
-		return nil, err
-	}
-	rowFormatEnabled, err := svc.CheckBinlogRowFormat(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	dir := svc.getDbBackupDir(backupHistory.DbInstanceId, backupHistory.DbBackupId)
-	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
-		return nil, err
-	}
-	tmpFile := filepath.Join(dir, "backup.tmp")
-	defer func() {
-		_ = os.Remove(tmpFile)
-	}()
-
-	dbInfo := svc.dbInfo()
-	args := []string{
-		"--host", dbInfo.Host,
-		"--port", strconv.Itoa(dbInfo.Port),
-		"--user", dbInfo.Username,
-		"--password=" + dbInfo.Password,
-		"--add-drop-database",
-		"--result-file", tmpFile,
-		"--single-transaction",
-		"--databases", backupHistory.DbName,
-	}
-	if binlogEnabled && rowFormatEnabled {
-		args = append(args, "--master-data=2")
-	}
-	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqldumpPath, args...)
-	logx.Debugf("backup database using mysqldump binary: %s", cmd.String())
-	if err := runCmd(cmd); err != nil {
-		logx.Errorf("运行 mysqldump 程序失败: %v", err)
-		return nil, errors.Wrap(err, "运行 mysqldump 程序失败")
-	}
-
-	logx.Debugf("Checking dumped file stat: %s", tmpFile)
-	if _, err := os.Stat(tmpFile); err != nil {
-		logx.Errorf("未找到备份文件: %v", err)
-		return nil, errors.Wrapf(err, "未找到备份文件")
-	}
-	reader, err := os.Open(tmpFile)
-	if err != nil {
-		return nil, err
-	}
-	binlogInfo := &entity.BinlogInfo{}
-	if binlogEnabled && rowFormatEnabled {
-		binlogInfo, err = readBinlogInfoFromBackup(reader)
-	}
-	if err != nil {
-		_ = reader.Close()
-		return nil, errors.Wrapf(err, "从备份文件中读取 binlog 信息失败")
-	}
-
-	if _, err := reader.Seek(0, io.SeekStart); err != nil {
-		_ = reader.Close()
-		return nil, errors.Wrapf(err, "跳转到备份文件开始处失败")
-	}
-	gzipTmpFile := tmpFile + ".gz"
-	writer, err := os.Create(gzipTmpFile)
-	if err != nil {
-		_ = reader.Close()
-		return nil, errors.Wrapf(err, "创建备份压缩文件失败")
-	}
-	defer func() {
-		_ = os.Remove(gzipTmpFile)
-	}()
-	gzipWriter := gzip.NewWriter(writer)
-	gzipWriter.Name = backupHistory.Uuid + ".sql"
-	_, err = io.Copy(gzipWriter, reader)
-	_ = gzipWriter.Close()
-	_ = writer.Close()
-	_ = reader.Close()
-	if err != nil {
-		return nil, errors.Wrapf(err, "压缩备份文件失败")
-	}
-	destPath := filepath.Join(dir, backupHistory.Uuid+".sql")
-	if err := os.Rename(gzipTmpFile, destPath+".gz"); err != nil {
-		return nil, errors.Wrap(err, "备份文件更名失败")
-	}
-	return binlogInfo, nil
-}
-
-func (svc *DbProgramMysql) RemoveBackupHistory(_ context.Context, dbBackupId uint64, dbBackupHistoryUuid string) error {
-	fileName := filepath.Join(svc.getDbBackupDir(svc.dbInfo().InstanceId, dbBackupId),
-		fmt.Sprintf("%v.sql", dbBackupHistoryUuid))
-	_ = os.Remove(fileName)
-	_ = os.Remove(fileName + ".gz")
-	return nil
-}
-
-func (svc *DbProgramMysql) RestoreBackupHistory(ctx context.Context, dbName string, dbBackupId uint64, dbBackupHistoryUuid string) error {
-	dbInfo := svc.dbInfo()
-	args := []string{
-		"--host", dbInfo.Host,
-		"--port", strconv.Itoa(dbInfo.Port),
-		"--database", dbName,
-		"--user", dbInfo.Username,
-		"--password=" + dbInfo.Password,
-	}
-
-	compressed := false
-	fileName := filepath.Join(svc.getDbBackupDir(svc.dbInfo().InstanceId, dbBackupId),
-		fmt.Sprintf("%v.sql", dbBackupHistoryUuid))
-	_, err := os.Stat(fileName)
-	if err != nil {
-		compressed = true
-		fileName += ".gz"
-	}
-	file, err := os.Open(fileName)
-	if err != nil {
-		return errors.Wrap(err, "打开备份文件失败")
-	}
-	defer func() { _ = file.Close() }()
-
-	var reader io.ReadCloser
-	if compressed {
-		reader, err = gzip.NewReader(file)
-		if err != nil {
-			return errors.Wrap(err, "解压缩备份文件失败")
-		}
-		defer func() { _ = reader.Close() }()
-	} else {
-		reader = file
-	}
-
-	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlPath, args...)
-	cmd.Stdin = reader
-	logx.Debug("恢复数据库: ", cmd.String())
-	if err := runCmd(cmd); err != nil {
-		logx.Errorf("运行 mysql 程序失败: %v", err)
-		return errors.Wrap(err, "运行 mysql 程序失败")
-	}
-	return nil
-}
-
-// Download binlog files on server.
-func (svc *DbProgramMysql) downloadBinlogFilesOnServer(ctx context.Context, binlogFilesOnServerSorted []*entity.BinlogFile, downloadLatestBinlogFile bool) error {
-	if len(binlogFilesOnServerSorted) == 0 {
-		logx.Debug("No binlog file found on server to download")
-		return nil
-	}
-	dbInfo := svc.dbInfo()
-	if err := os.MkdirAll(svc.getBinlogDir(dbInfo.InstanceId), os.ModePerm); err != nil {
-		return errors.Wrapf(err, "创建 binlog 目录失败: %q", svc.getBinlogDir(svc.dbInfo().InstanceId))
-	}
-	latestBinlogFileOnServer := binlogFilesOnServerSorted[len(binlogFilesOnServerSorted)-1]
-	for _, fileOnServer := range binlogFilesOnServerSorted {
-		isLatest := fileOnServer.Name == latestBinlogFileOnServer.Name
-		if isLatest && !downloadLatestBinlogFile {
-			continue
-		}
-		binlogFilePath := filepath.Join(svc.getBinlogDir(dbInfo.InstanceId), fileOnServer.Name)
-		logx.Debug("Downloading binlog file from MySQL server.", logx.String("path", binlogFilePath), logx.Bool("isLatest", isLatest))
-		if err := svc.downloadBinlogFile(ctx, fileOnServer, isLatest); err != nil {
-			logx.Error("下载 binlog 文件失败", logx.String("path", binlogFilePath), logx.String("error", err.Error()))
-			return errors.Wrapf(err, "下载 binlog 文件失败: %q", binlogFilePath)
-		}
-	}
-	return nil
-}
-
-// Parse the first binlog eventTs of a local binlog file.
-func (svc *DbProgramMysql) parseLocalBinlogLastEventTime(ctx context.Context, filePath string, lastEventTime time.Time) (eventTime time.Time, parseErr error) {
-	return svc.parseLocalBinlogEventTime(ctx, filePath, false, lastEventTime)
-}
-
-// Parse the first binlog eventTs of a local binlog file.
-func (svc *DbProgramMysql) parseLocalBinlogFirstEventTime(ctx context.Context, filePath string) (eventTime time.Time, parseErr error) {
-	return svc.parseLocalBinlogEventTime(ctx, filePath, true, time.Time{})
-}
-
-// Parse the first binlog eventTs of a local binlog file.
-func (svc *DbProgramMysql) parseLocalBinlogEventTime(ctx context.Context, filePath string, firstOrLast bool, startTime time.Time) (eventTime time.Time, parseErr error) {
-	args := []string{
-		// Local binlog file path.
-		filePath,
-		// Verify checksum binlog events.
-		"--verify-binlog-checksum",
-		// Tell mysqlbinlog to suppress the BINLOG statements for row events, which reduces the unneeded output.
-		"--base64-output=DECODE-ROWS",
-	}
-	if !startTime.IsZero() {
-		args = append(args, "--start-datetime", startTime.Local().Format(time.DateTime))
-	}
-	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, args...)
-	var stderr strings.Builder
-	cmd.Stderr = &stderr
-	pr, err := cmd.StdoutPipe()
-	if err != nil {
-		return time.Time{}, err
-	}
-
-	if err := cmd.Start(); err != nil {
-		return time.Time{}, err
-	}
-	defer func() {
-		_ = cmd.Cancel()
-		if err := cmd.Wait(); err != nil && parseErr != nil && stderr.Len() > 0 {
-			parseErr = errors.Wrap(parseErr, stderr.String())
-		}
-	}()
-	lastEventTime := time.Time{}
-	for s := bufio.NewScanner(pr); s.Scan(); {
-		line := s.Text()
-		eventTimeParsed, found, err := parseBinlogEventTimeInLine(line)
-		if err != nil {
-			return time.Time{}, errors.Wrap(err, "解析 binlog 文件失败")
-		}
-		if !found {
-			continue
-		}
-		if !firstOrLast {
-			lastEventTime = eventTimeParsed
-			continue
-		}
-		return eventTimeParsed, nil
-	}
-	if lastEventTime.IsZero() {
-		return time.Time{}, errors.New("解析 binlog 文件失败")
-	}
-	return lastEventTime, nil
-}
-
-// FetchBinlogs downloads binlog files from startingFileName on server to `binlogDir`.
-func (svc *DbProgramMysql) FetchBinlogs(ctx context.Context, downloadLatestBinlogFile bool, earliestBackupSequence int64, latestBinlogHistory *entity.DbBinlogHistory) ([]*entity.BinlogFile, error) {
-	// Read binlog files list on server.
-	binlogFilesOnServerSorted, err := svc.GetSortedBinlogFilesOnServer(ctx)
-	if err != nil {
-		return nil, err
-	}
-	if len(binlogFilesOnServerSorted) == 0 {
-		logx.Debug("No binlog file found on server to download")
-		return nil, nil
-	}
-	indexHistory := -1
-	for i, file := range binlogFilesOnServerSorted {
-		if latestBinlogHistory.Sequence == file.Sequence {
-			indexHistory = i + 1
-			file.FirstEventTime = latestBinlogHistory.FirstEventTime
-			file.LastEventTime = latestBinlogHistory.LastEventTime
-			file.LocalSize = latestBinlogHistory.FileSize
-			break
-		}
-		if earliestBackupSequence == file.Sequence {
-			indexHistory = i
-			break
-		}
-	}
-	if indexHistory < 0 {
-		// todo: 数据库服务器上的 binlog 序列已被删除, 导致 binlog 同步失败，如何处理？
-		return nil, errors.New(fmt.Sprintf("数据库服务器上的 binlog 序列已被删除: %d, %d", earliestBackupSequence, latestBinlogHistory.Sequence))
-	}
-	if indexHistory >= len(binlogFilesOnServerSorted)-1 {
-		indexHistory = len(binlogFilesOnServerSorted) - 1
-		if binlogFilesOnServerSorted[indexHistory].LocalSize == binlogFilesOnServerSorted[indexHistory].RemoteSize {
-			// 没有新的事件，不需要重新下载
-			return nil, nil
-		}
-	}
-	binlogFilesOnServerSorted = binlogFilesOnServerSorted[indexHistory:]
-
-	if err := svc.downloadBinlogFilesOnServer(ctx, binlogFilesOnServerSorted, downloadLatestBinlogFile); err != nil {
-		return nil, err
-	}
-
-	return binlogFilesOnServerSorted, nil
-}
-
-// Syncs the binlog specified by `meta` between the instance and local.
-// If isLast is true, it means that this is the last binlog file containing the targetTs event.
-// It may keep growing as there are ongoing writes to the database. So we just need to check that
-// the file size is larger or equal to the binlog file size we queried from the MySQL server earlier.
-func (svc *DbProgramMysql) downloadBinlogFile(ctx context.Context, binlogFileToDownload *entity.BinlogFile, isLast bool) error {
-	dbInfo := svc.dbInfo()
-	tempBinlogPrefix := filepath.Join(svc.getBinlogDir(dbInfo.InstanceId), "tmp-")
-	args := []string{
-		binlogFileToDownload.Name,
-		"--read-from-remote-server",
-		// Verify checksum binlog events.
-		"--verify-binlog-checksum",
-		"--host", dbInfo.Host,
-		"--port", strconv.Itoa(dbInfo.Port),
-		"--user", dbInfo.Username,
-		"--raw",
-		// With --raw this is a prefix for the file names.
-		"--result-file", tempBinlogPrefix,
-	}
-
-	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, args...)
-	// We cannot set password as a flag. Otherwise, there is warning message
-	// "mysqlbinlog: [Warning] Using a password on the command line interface can be insecure."
-	if dbInfo.Password != "" {
-		cmd.Env = append(cmd.Env, fmt.Sprintf("MYSQL_PWD=%s", dbInfo.Password))
-	}
-
-	logx.Debug("Downloading binlog files using mysqlbinlog:", cmd.String())
-	binlogFilePathTemp := tempBinlogPrefix + binlogFileToDownload.Name
-	defer func() {
-		_ = os.Remove(binlogFilePathTemp)
-	}()
-	if err := runCmd(cmd); err != nil {
-		logx.Errorf("运行 mysqlbinlog 程序失败: %v", err)
-		return errors.Wrap(err, "运行 mysqlbinlog 程序失败")
-	}
-
-	logx.Debug("Checking downloaded binlog file stat", logx.String("path", binlogFilePathTemp))
-	binlogFileTempInfo, err := os.Stat(binlogFilePathTemp)
-	if err != nil {
-		logx.Error("未找到 binlog 文件", logx.String("path", binlogFilePathTemp), logx.String("error", err.Error()))
-		return errors.Wrapf(err, "未找到 binlog 文件: %q", binlogFilePathTemp)
-	}
-
-	if (isLast && binlogFileTempInfo.Size() < binlogFileToDownload.RemoteSize) || (!isLast && binlogFileTempInfo.Size() != binlogFileToDownload.RemoteSize) {
-		logx.Error("Downloaded archived binlog file size is not equal to size queried on the MySQL server earlier.",
-			logx.String("binlog", binlogFileToDownload.Name),
-			logx.Int64("sizeInfo", binlogFileToDownload.RemoteSize),
-			logx.Int64("downloadedSize", binlogFileTempInfo.Size()),
-		)
-		return errors.Errorf("下载的 binlog 文件 %q 与服务上的文件大小不一致 %d != %d", binlogFilePathTemp, binlogFileTempInfo.Size(), binlogFileToDownload.RemoteSize)
-	}
-
-	binlogFilePath := svc.GetBinlogFilePath(binlogFileToDownload.Name)
-	if err := os.Rename(binlogFilePathTemp, binlogFilePath); err != nil {
-		return errors.Wrapf(err, "binlog 文件更名失败: %q -> %q", binlogFilePathTemp, binlogFilePath)
-	}
-	firstEventTime, err := svc.parseLocalBinlogFirstEventTime(ctx, binlogFilePath)
-	if err != nil {
-		return err
-	}
-	lastEventTime, err := svc.parseLocalBinlogLastEventTime(ctx, binlogFilePath, binlogFileToDownload.LastEventTime)
-	if err != nil {
-		return err
-	}
-
-	binlogFileToDownload.FirstEventTime = firstEventTime
-	binlogFileToDownload.LastEventTime = lastEventTime
-	binlogFileToDownload.Downloaded = true
-
-	return nil
-}
-
-// GetSortedBinlogFilesOnServer returns the information of binlog files in ascending order by their numeric extension.
-func (svc *DbProgramMysql) GetSortedBinlogFilesOnServer(_ context.Context) ([]*entity.BinlogFile, error) {
-	query := "SHOW BINARY LOGS"
-	columns, rows, err := svc.dbConn.Query(query)
-	if err != nil {
-		return nil, errors.Wrapf(err, "SQL 语句 %q 执行失败", query)
-	}
-	findFileName := false
-	findFileSize := false
-	for _, column := range columns {
-		switch column.Name {
-		case "Log_name":
-			findFileName = true
-		case "File_size":
-			findFileSize = true
-		}
-	}
-	if !findFileName || !findFileSize {
-		return nil, errors.Errorf("SQL 语句 %q 执行结果解析失败", query)
-	}
-
-	var binlogFiles []*entity.BinlogFile
-
-	for _, row := range rows {
-		name, nameOk := row["Log_name"].(string)
-		size, sizeOk := row["File_size"].(uint64)
-		if !nameOk || !sizeOk {
-			return nil, errors.Errorf("SQL 语句 %q 执行结果解析失败", query)
-		}
-		_, seq, err := ParseBinlogName(name)
-		if err != nil {
-			return nil, errors.Wrapf(err, "SQL 语句 %q 执行结果解析失败", query)
-		}
-		binlogFile := &entity.BinlogFile{
-			Name:       name,
-			RemoteSize: int64(size),
-			Sequence:   seq,
-		}
-		binlogFiles = append(binlogFiles, binlogFile)
-	}
-
-	return sortBinlogFiles(binlogFiles), nil
-}
-
-var regexpBinlogInfo = regexp.MustCompile("CHANGE MASTER TO MASTER_LOG_FILE='([^.]+).([0-9]+)', MASTER_LOG_POS=([0-9]+);")
-
-func readBinlogInfoFromBackup(reader io.Reader) (*entity.BinlogInfo, error) {
-	matching := false
-	r := bufio.NewReader(reader)
-	const maxMatchRow = 100
-	for i := 0; i < maxMatchRow; i++ {
-		row, err := r.ReadString('\n')
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return nil, err
-		}
-		if !matching {
-			if row == "-- Position to start replication or point-in-time recovery from\n" {
-				matching = true
-			} else {
-				continue
-			}
-		}
-		res := regexpBinlogInfo.FindStringSubmatch(row)
-		if res == nil {
-			continue
-		}
-		seq, err := strconv.ParseInt(res[2], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		pos, err := strconv.ParseInt(res[3], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		return &entity.BinlogInfo{
-			FileName: fmt.Sprintf("%s.%s", res[1], res[2]),
-			Sequence: seq,
-			Position: pos,
-		}, nil
-	}
-	return nil, errors.New("备份文件中未找到 binlog 信息")
-}
-
-// Use command like mysqlbinlog --start-datetime=targetTs binlog.000001 to parse the first binlog event position with timestamp equal or after targetTs.
-func (svc *DbProgramMysql) GetBinlogEventPositionAtOrAfterTime(ctx context.Context, binlogName string, targetTime time.Time) (position int64, parseErr error) {
-	binlogPath := svc.GetBinlogFilePath(binlogName)
-	args := []string{
-		// Local binlog file path.
-		binlogPath,
-		// Verify checksum binlog events.
-		"--verify-binlog-checksum",
-		// Tell mysqlbinlog to suppress the BINLOG statements for row events, which reduces the unneeded output.
-		"--base64-output=DECODE-ROWS",
-		// Instruct mysqlbinlog to start output only after encountering the first binlog event with timestamp equal or after targetTime.
-		"--start-datetime", targetTime.Local().Format(time.DateTime),
-	}
-	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, args...)
-	var stderr strings.Builder
-	cmd.Stderr = &stderr
-	pr, err := cmd.StdoutPipe()
-	if err != nil {
-		return 0, err
-	}
-	if err := cmd.Start(); err != nil {
-		return 0, err
-	}
-	defer func() {
-		_ = cmd.Cancel()
-		if err := cmd.Wait(); err != nil && parseErr != nil && stderr.Len() > 0 {
-			parseErr = errors.Wrap(errors.New(stderr.String()), parseErr.Error())
-		}
-	}()
-
-	for s := bufio.NewScanner(pr); s.Scan(); {
-		line := s.Text()
-		posParsed, found, err := parseBinlogEventPosInLine(line)
-		if err != nil {
-			return 0, errors.Wrap(err, "binlog 文件解析失败")
-		}
-		// When invoking mysqlbinlog with --start-datetime, the first valid event will always be FORMAT_DESCRIPTION_EVENT which should be skipped.
-		if found && posParsed != 4 {
-			return posParsed, nil
-		}
-	}
-	return 0, errors.Errorf("在 %s 之后没有 binlog 事件", targetTime.Local().Format(time.DateTime))
-}
-
-// ReplayBinlog replays the binlog for `originDatabase` from `startBinlogInfo.Position` to `targetTs`, read binlog from `binlogDir`.
-func (svc *DbProgramMysql) ReplayBinlog(ctx context.Context, originalDatabase, targetDatabase string, restoreInfo *dbi.RestoreInfo) (replayErr error) {
-	const (
-		// Variable lower_case_table_names related.
-
-		// LetterCaseOnDiskLetterCaseCmp stores table and database names using the letter case specified in the CREATE TABLE or CREATE DATABASE statement.
-		// Name comparisons are case-sensitive.
-		LetterCaseOnDiskLetterCaseCmp = 0
-		// LowerCaseOnDiskLowerCaseCmp stores table names in lowercase on disk and name comparisons are not case-sensitive.
-		LowerCaseOnDiskLowerCaseCmp = 1
-		// LetterCaseOnDiskLowerCaseCmp stores table and database names are stored on disk using the letter case specified in the CREATE TABLE or CREATE DATABASE statement, but MySQL converts them to lowercase on lookup.
-		// Name comparisons are not case-sensitive.
-		LetterCaseOnDiskLowerCaseCmp = 2
-	)
-
-	caseVariable := "lower_case_table_names"
-	identifierCaseSensitive, err := svc.getServerVariable(ctx, caseVariable)
-	if err != nil {
-		return err
-	}
-
-	identifierCaseSensitiveValue, err := strconv.Atoi(identifierCaseSensitive)
-	if err != nil {
-		return err
-	}
-
-	var originalDBName string
-	switch identifierCaseSensitiveValue {
-	case LetterCaseOnDiskLetterCaseCmp:
-		originalDBName = originalDatabase
-	case LowerCaseOnDiskLowerCaseCmp:
-		originalDBName = strings.ToLower(originalDatabase)
-	case LetterCaseOnDiskLowerCaseCmp:
-		originalDBName = strings.ToLower(originalDatabase)
-	default:
-		return errors.Errorf("参数 %s 的值 %s 不符合预期: [%d, %d, %d] ", caseVariable, identifierCaseSensitive, 0, 1, 2)
-	}
-
-	// Extract the SQL statements from the binlog and replay them to the pitrDatabase via the mysql client by pipe.
-	mysqlbinlogArgs := []string{
-		// Verify checksum binlog events.
-		"--verify-binlog-checksum",
-		// Disable binary logging.
-		"--disable-log-bin",
-		// Create rewrite rules for databases when playing back from logs written in row-based format, so that we can apply the binlog to PITR database instead of the original database.
-		"--rewrite-db", fmt.Sprintf("%s->%s", originalDBName, targetDatabase),
-		// List entries for just this database. It's applied after the --rewrite-db option, so we should provide the rewritten database, i.e., pitrDatabase.
-		"--database", targetDatabase,
-		// Decode binary log from first event with position equal to or greater than argument.
-		"--start-position", fmt.Sprintf("%d", restoreInfo.StartPosition),
-		// 	Stop decoding binary log at first event with position equal to or greater than argument.
-		"--stop-position", fmt.Sprintf("%d", restoreInfo.TargetPosition),
-	}
-
-	dbInfo := svc.dbInfo()
-	mysqlbinlogArgs = append(mysqlbinlogArgs, restoreInfo.GetBinlogPaths(svc.getBinlogDir(dbInfo.InstanceId))...)
-
-	mysqlArgs := []string{
-		"--host", dbInfo.Host,
-		"--port", strconv.Itoa(dbInfo.Port),
-		"--user", dbInfo.Username,
-	}
-
-	if dbInfo.Password != "" {
-		// The --password parameter of mysql/mysqlbinlog does not support the "--password PASSWORD" format (split by space).
-		// If provided like that, the program will hang.
-		mysqlArgs = append(mysqlArgs, fmt.Sprintf("--password=%s", dbInfo.Password))
-	}
-
-	mysqlbinlogCmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, mysqlbinlogArgs...)
-	mysqlCmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlPath, mysqlArgs...)
-	logx.Debug("Start replay binlog commands.",
-		logx.String("mysqlbinlog", mysqlbinlogCmd.String()),
-		logx.String("mysql", mysqlCmd.String()))
-	defer func() {
-		if replayErr == nil {
-			logx.Debug("Replayed binlog successfully.")
-		}
-	}()
-
-	mysqlRead, err := mysqlbinlogCmd.StdoutPipe()
-	if err != nil {
-		return errors.Wrap(err, "创建 mysqlbinlog 输出管道失败")
-	}
-	defer func() {
-		_ = mysqlRead.Close()
-	}()
-
-	var mysqlbinlogErr, mysqlErr strings.Builder
-	mysqlbinlogCmd.Stderr = &mysqlbinlogErr
-	mysqlCmd.Stderr = &mysqlErr
-	mysqlCmd.Stdout = os.Stdout
-	mysqlCmd.Stdin = mysqlRead
-
-	if err := mysqlbinlogCmd.Start(); err != nil {
-		return errors.Wrap(err, "启动 mysqlbinlog 程序失败")
-	}
-	defer func() {
-		_ = mysqlbinlogCmd.Cancel()
-		if err := mysqlbinlogCmd.Wait(); err != nil {
-			if mysqlbinlogErr.Len() > 0 {
-				logx.Errorf("运行 mysqlbinlog 程序失败: %s", mysqlbinlogErr.String())
-				if replayErr != nil {
-					replayErr = errors.Wrap(replayErr, "运行 mysqlbinlog 程序失败: "+mysqlbinlogErr.String())
-				} else {
-					replayErr = errors.Errorf("运行 mysqlbinlog 程序失败: %s", mysqlbinlogErr.String())
-				}
-			}
-		}
-	}()
-	if err := mysqlCmd.Start(); err != nil {
-		logx.Error("启动 mysql 程序失败")
-		return errors.Wrap(err, "启动 mysql 程序失败")
-	}
-	if err := mysqlCmd.Wait(); err != nil {
-		logx.Errorf("运行 mysql 程序失败: %s", mysqlErr.String())
-		return errors.Errorf("运行 mysql 程序失败: %s", mysqlErr.String())
-	}
-
-	return nil
-}
-
-func (svc *DbProgramMysql) getServerVariable(_ context.Context, varName string) (string, error) {
-	query := fmt.Sprintf("SHOW VARIABLES LIKE '%s'", varName)
-	_, rows, err := svc.dbConn.Query(query)
-	if err != nil {
-		return "", err
-	}
-	if len(rows) == 0 {
-		return "", sql.ErrNoRows
-	}
-
-	var varNameFound, value string
-	varNameFound = rows[0]["Variable_name"].(string)
-	if varName != varNameFound {
-		return "", errors.Errorf("未找到数据库参数 %s", varName)
-	}
-	value = rows[0]["Value"].(string)
-	return value, nil
-}
-
-// CheckBinlogEnabled checks whether binlog is enabled for the current instance.
-func (svc *DbProgramMysql) CheckBinlogEnabled(ctx context.Context) (bool, error) {
-	value, err := svc.getServerVariable(ctx, "log_bin")
-	switch {
-	case err == nil:
-		return strings.ToUpper(value) == "ON", nil
-	case errors.Is(err, sql.ErrNoRows):
-		return false, nil
-	default:
-		return false, err
-	}
-}
-
-// CheckBinlogRowFormat checks whether the binlog format is ROW or MIXED.
-func (svc *DbProgramMysql) CheckBinlogRowFormat(ctx context.Context) (bool, error) {
-	value, err := svc.getServerVariable(ctx, "binlog_format")
-	switch {
-	case err == nil:
-		value = strings.ToUpper(value)
-		return value == "ROW" || value == "MIXED", nil
-	case errors.Is(err, sql.ErrNoRows):
-		return false, nil
-	default:
-		return false, err
-	}
-}
-
-func runCmd(cmd *exec.Cmd) error {
-	var stderr strings.Builder
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = &stderr
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-	if err := cmd.Wait(); err != nil {
-		return errors.New(stderr.String())
-	}
-	return nil
-}
-
-func (svc *DbProgramMysql) execute(database string, sql string) error {
-	dbInfo := svc.dbInfo()
-	args := []string{
-		"--host", dbInfo.Host,
-		"--port", strconv.Itoa(dbInfo.Port),
-		"--user", dbInfo.Username,
-		"--password=" + dbInfo.Password,
-		"--execute", sql,
-	}
-	if len(database) > 0 {
-		args = append(args, database)
-	}
-
-	cmd := exec.Command(svc.getMysqlBin().MysqlPath, args...)
-	logx.Debug("execute sql using mysql binary: ", cmd.String())
-	if err := runCmd(cmd); err != nil {
-		logx.Errorf("运行 mysql 程序失败: %v", err)
-		return errors.Wrap(err, "运行 mysql 程序失败")
-	}
-	return nil
-}
-
-// sortBinlogFiles will sort binlog files in ascending order by their numeric extension.
-// For mysql binlog, after the serial number reaches 999999, the next serial number will not return to 000000, but 1000000,
-// so we cannot directly use string to compare lexicographical order.
-func sortBinlogFiles(binlogFiles []*entity.BinlogFile) []*entity.BinlogFile {
-	var sorted []*entity.BinlogFile
-	sorted = append(sorted, binlogFiles...)
-	sort.Slice(sorted, func(i, j int) bool {
-		return sorted[i].Sequence < sorted[j].Sequence
-	})
-	return sorted
-}
-
-func parseBinlogEventTimeInLine(line string) (eventTs time.Time, found bool, err error) {
-	// The target line starts with string like "#220421 14:49:26 server id 1"
-	if !strings.Contains(line, "server id") {
-		return time.Time{}, false, nil
-	}
-	if strings.Contains(line, "end_log_pos 0") {
-		// https://github.com/mysql/mysql-server/blob/8.0/client/mysqlbinlog.cc#L1209-L1212
-		// Fake events with end_log_pos=0 could be generated and we need to ignore them.
-		return time.Time{}, false, nil
-	}
-	fields := strings.Fields(line)
-	// fields should starts with ["#220421", "14:49:26", "server", "id", "1", "end_log_pos", "34794"]
-	if len(fields) < 7 ||
-		(len(fields[0]) != 7 || fields[2] != "server" || fields[3] != "id" || fields[5] != "end_log_pos") {
-		return time.Time{}, false, errors.Errorf("found unexpected mysqlbinlog output line %q when parsing binlog event timestamp", line)
-	}
-	datetime, err := time.ParseInLocation("060102 15:04:05", fmt.Sprintf("%s %s", fields[0][1:], fields[1]), time.Local)
-	if err != nil {
-		return time.Time{}, false, err
-	}
-	return datetime, true, nil
-}
-
-func parseBinlogEventPosInLine(line string) (pos int64, found bool, err error) {
-	// The mysqlbinlog output will contains a line starting with "# at 35065", which is the binlog event's start position.
-	if !strings.HasPrefix(line, "# at ") {
-		return 0, false, nil
-	}
-	// This is the line containing the start position of the binlog event.
-	fields := strings.Fields(line)
-	if len(fields) != 3 {
-		return 0, false, errors.Errorf("unexpected mysqlbinlog output line %q when parsing binlog event start position", line)
-	}
-	pos, err = strconv.ParseInt(fields[2], 10, 0)
-	if err != nil {
-		return 0, false, err
-	}
-	return pos, true, nil
-}
-
-// ParseBinlogName parses the numeric extension and the binary log base name by using split the dot.
-// Examples:
-//   - ("binlog.000001") => ("binlog", 1)
-//   - ("binlog000001") => ("", err)
-func ParseBinlogName(name string) (string, int64, error) {
-	s := strings.Split(name, ".")
-	if len(s) != 2 {
-		return "", 0, errors.Errorf("failed to parse binlog extension, expecting two parts in the binlog file name %q but got %d", name, len(s))
-	}
-	seq, err := strconv.ParseInt(s[1], 10, 0)
-	if err != nil {
-		return "", 0, errors.Wrapf(err, "failed to parse the sequence number %s", s[1])
-	}
-	return s[0], seq, nil
-}
-
-// getBinlogDir gets the binlogDir.
-func (svc *DbProgramMysql) getBinlogDir(instanceId uint64) string {
-	return filepath.Join(
-		svc.getBackupPath(),
-		fmt.Sprintf("instance-%d", instanceId),
-		"binlog")
-}
-
-func (svc *DbProgramMysql) getDbInstanceBackupRoot(instanceId uint64) string {
-	return filepath.Join(
-		svc.getBackupPath(),
-		fmt.Sprintf("instance-%d", instanceId))
-}
-
-func (svc *DbProgramMysql) getDbBackupDir(instanceId, backupId uint64) string {
-	return filepath.Join(
-		svc.getBackupPath(),
-		fmt.Sprintf("instance-%d", instanceId),
-		fmt.Sprintf("backup-%d", backupId))
-}
-
-func (svc *DbProgramMysql) PruneBinlog(history *entity.DbBinlogHistory) error {
-	binlogFilePath := filepath.Join(svc.getBinlogDir(history.DbInstanceId), history.FileName)
-	_ = os.Remove(binlogFilePath)
-	return nil
-}
+// import (
+// 	"bufio"
+// 	"compress/gzip"
+// 	"context"
+// 	"database/sql"
+// 	"fmt"
+// 	"io"
+// 	"os"
+// 	"os/exec"
+// 	"path/filepath"
+// 	"regexp"
+// 	"sort"
+// 	"strconv"
+// 	"strings"
+// 	"time"
+
+// 	"mayfly-go/internal/db/config"
+// 	"mayfly-go/internal/db/dbm/dbi"
+// 	"mayfly-go/internal/db/domain/entity"
+// 	"mayfly-go/pkg/logx"
+
+// 	"github.com/pkg/errors"
+// )
+
+// var _ dbi.DbProgram = (*DbProgramMysql)(nil)
+
+// type DbProgramMysql struct {
+// 	dbConn *dbi.DbConn
+// 	// mysqlBin 用于集成测试
+// 	mysqlBin *config.MysqlBin
+// 	// backupPath 用于集成测试
+// 	backupPath string
+// }
+
+// func NewDbProgramMysql(dbConn *dbi.DbConn) *DbProgramMysql {
+// 	return &DbProgramMysql{
+// 		dbConn: dbConn,
+// 	}
+// }
+
+// func (svc *DbProgramMysql) dbInfo() *dbi.DbInfo {
+// 	dbInfo := svc.dbConn.Info
+// 	err := dbInfo.IfUseSshTunnelChangeIpPort()
+// 	if err != nil {
+// 		logx.Errorf("通过ssh隧道连接db失败: %s", err.Error())
+// 	}
+// 	return dbInfo
+// }
+
+// func (svc *DbProgramMysql) getMysqlBin() *config.MysqlBin {
+// 	if svc.mysqlBin != nil {
+// 		return svc.mysqlBin
+// 	}
+// 	dbInfo := svc.dbInfo()
+// 	var mysqlBin *config.MysqlBin
+// 	switch dbInfo.Type {
+// 	case DbTypeMariadb:
+// 		mysqlBin = config.GetMysqlBin(config.ConfigKeyDbMariadbBin)
+// 	case DbTypeMysql:
+// 		mysqlBin = config.GetMysqlBin(config.ConfigKeyDbMysqlBin)
+// 	default:
+// 		panic(fmt.Sprintf("不兼容 MySQL 的数据库类型: %v", dbInfo.Type))
+// 	}
+// 	svc.mysqlBin = mysqlBin
+// 	return svc.mysqlBin
+// }
+
+// func (svc *DbProgramMysql) getBackupPath() string {
+// 	if len(svc.backupPath) > 0 {
+// 		return svc.backupPath
+// 	}
+// 	return config.GetDbBackupRestore().BackupPath
+// }
+
+// func (svc *DbProgramMysql) GetBinlogFilePath(fileName string) string {
+// 	return filepath.Join(svc.getBinlogDir(svc.dbInfo().InstanceId), fileName)
+// }
+
+// func (svc *DbProgramMysql) Backup(ctx context.Context, backupHistory *entity.DbBackupHistory) (*entity.BinlogInfo, error) {
+// 	binlogEnabled, err := svc.CheckBinlogEnabled(ctx)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+// 	rowFormatEnabled, err := svc.CheckBinlogRowFormat(ctx)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	dir := svc.getDbBackupDir(backupHistory.DbInstanceId, backupHistory.DbBackupId)
+// 	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
+// 		return nil, err
+// 	}
+// 	tmpFile := filepath.Join(dir, "backup.tmp")
+// 	defer func() {
+// 		_ = os.Remove(tmpFile)
+// 	}()
+
+// 	dbInfo := svc.dbInfo()
+// 	args := []string{
+// 		"--host", dbInfo.Host,
+// 		"--port", strconv.Itoa(dbInfo.Port),
+// 		"--user", dbInfo.Username,
+// 		"--password=" + dbInfo.Password,
+// 		"--add-drop-database",
+// 		"--result-file", tmpFile,
+// 		"--single-transaction",
+// 		"--databases", backupHistory.DbName,
+// 	}
+// 	if binlogEnabled && rowFormatEnabled {
+// 		args = append(args, "--master-data=2")
+// 	}
+// 	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqldumpPath, args...)
+// 	logx.Debugf("backup database using mysqldump binary: %s", cmd.String())
+// 	if err := runCmd(cmd); err != nil {
+// 		logx.Errorf("运行 mysqldump 程序失败: %v", err)
+// 		return nil, errors.Wrap(err, "运行 mysqldump 程序失败")
+// 	}
+
+// 	logx.Debugf("Checking dumped file stat: %s", tmpFile)
+// 	if _, err := os.Stat(tmpFile); err != nil {
+// 		logx.Errorf("未找到备份文件: %v", err)
+// 		return nil, errors.Wrapf(err, "未找到备份文件")
+// 	}
+// 	reader, err := os.Open(tmpFile)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+// 	binlogInfo := &entity.BinlogInfo{}
+// 	if binlogEnabled && rowFormatEnabled {
+// 		binlogInfo, err = readBinlogInfoFromBackup(reader)
+// 	}
+// 	if err != nil {
+// 		_ = reader.Close()
+// 		return nil, errors.Wrapf(err, "从备份文件中读取 binlog 信息失败")
+// 	}
+
+// 	if _, err := reader.Seek(0, io.SeekStart); err != nil {
+// 		_ = reader.Close()
+// 		return nil, errors.Wrapf(err, "跳转到备份文件开始处失败")
+// 	}
+// 	gzipTmpFile := tmpFile + ".gz"
+// 	writer, err := os.Create(gzipTmpFile)
+// 	if err != nil {
+// 		_ = reader.Close()
+// 		return nil, errors.Wrapf(err, "创建备份压缩文件失败")
+// 	}
+// 	defer func() {
+// 		_ = os.Remove(gzipTmpFile)
+// 	}()
+// 	gzipWriter := gzip.NewWriter(writer)
+// 	gzipWriter.Name = backupHistory.Uuid + ".sql"
+// 	_, err = io.Copy(gzipWriter, reader)
+// 	_ = gzipWriter.Close()
+// 	_ = writer.Close()
+// 	_ = reader.Close()
+// 	if err != nil {
+// 		return nil, errors.Wrapf(err, "压缩备份文件失败")
+// 	}
+// 	destPath := filepath.Join(dir, backupHistory.Uuid+".sql")
+// 	if err := os.Rename(gzipTmpFile, destPath+".gz"); err != nil {
+// 		return nil, errors.Wrap(err, "备份文件更名失败")
+// 	}
+// 	return binlogInfo, nil
+// }
+
+// func (svc *DbProgramMysql) RemoveBackupHistory(_ context.Context, dbBackupId uint64, dbBackupHistoryUuid string) error {
+// 	fileName := filepath.Join(svc.getDbBackupDir(svc.dbInfo().InstanceId, dbBackupId),
+// 		fmt.Sprintf("%v.sql", dbBackupHistoryUuid))
+// 	_ = os.Remove(fileName)
+// 	_ = os.Remove(fileName + ".gz")
+// 	return nil
+// }
+
+// func (svc *DbProgramMysql) RestoreBackupHistory(ctx context.Context, dbName string, dbBackupId uint64, dbBackupHistoryUuid string) error {
+// 	dbInfo := svc.dbInfo()
+// 	args := []string{
+// 		"--host", dbInfo.Host,
+// 		"--port", strconv.Itoa(dbInfo.Port),
+// 		"--database", dbName,
+// 		"--user", dbInfo.Username,
+// 		"--password=" + dbInfo.Password,
+// 	}
+
+// 	compressed := false
+// 	fileName := filepath.Join(svc.getDbBackupDir(svc.dbInfo().InstanceId, dbBackupId),
+// 		fmt.Sprintf("%v.sql", dbBackupHistoryUuid))
+// 	_, err := os.Stat(fileName)
+// 	if err != nil {
+// 		compressed = true
+// 		fileName += ".gz"
+// 	}
+// 	file, err := os.Open(fileName)
+// 	if err != nil {
+// 		return errors.Wrap(err, "打开备份文件失败")
+// 	}
+// 	defer func() { _ = file.Close() }()
+
+// 	var reader io.ReadCloser
+// 	if compressed {
+// 		reader, err = gzip.NewReader(file)
+// 		if err != nil {
+// 			return errors.Wrap(err, "解压缩备份文件失败")
+// 		}
+// 		defer func() { _ = reader.Close() }()
+// 	} else {
+// 		reader = file
+// 	}
+
+// 	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlPath, args...)
+// 	cmd.Stdin = reader
+// 	logx.Debug("恢复数据库: ", cmd.String())
+// 	if err := runCmd(cmd); err != nil {
+// 		logx.Errorf("运行 mysql 程序失败: %v", err)
+// 		return errors.Wrap(err, "运行 mysql 程序失败")
+// 	}
+// 	return nil
+// }
+
+// // Download binlog files on server.
+// func (svc *DbProgramMysql) downloadBinlogFilesOnServer(ctx context.Context, binlogFilesOnServerSorted []*entity.BinlogFile, downloadLatestBinlogFile bool) error {
+// 	if len(binlogFilesOnServerSorted) == 0 {
+// 		logx.Debug("No binlog file found on server to download")
+// 		return nil
+// 	}
+// 	dbInfo := svc.dbInfo()
+// 	if err := os.MkdirAll(svc.getBinlogDir(dbInfo.InstanceId), os.ModePerm); err != nil {
+// 		return errors.Wrapf(err, "创建 binlog 目录失败: %q", svc.getBinlogDir(svc.dbInfo().InstanceId))
+// 	}
+// 	latestBinlogFileOnServer := binlogFilesOnServerSorted[len(binlogFilesOnServerSorted)-1]
+// 	for _, fileOnServer := range binlogFilesOnServerSorted {
+// 		isLatest := fileOnServer.Name == latestBinlogFileOnServer.Name
+// 		if isLatest && !downloadLatestBinlogFile {
+// 			continue
+// 		}
+// 		binlogFilePath := filepath.Join(svc.getBinlogDir(dbInfo.InstanceId), fileOnServer.Name)
+// 		logx.Debug("Downloading binlog file from MySQL server.", logx.String("path", binlogFilePath), logx.Bool("isLatest", isLatest))
+// 		if err := svc.downloadBinlogFile(ctx, fileOnServer, isLatest); err != nil {
+// 			logx.Error("下载 binlog 文件失败", logx.String("path", binlogFilePath), logx.String("error", err.Error()))
+// 			return errors.Wrapf(err, "下载 binlog 文件失败: %q", binlogFilePath)
+// 		}
+// 	}
+// 	return nil
+// }
+
+// // Parse the first binlog eventTs of a local binlog file.
+// func (svc *DbProgramMysql) parseLocalBinlogLastEventTime(ctx context.Context, filePath string, lastEventTime time.Time) (eventTime time.Time, parseErr error) {
+// 	return svc.parseLocalBinlogEventTime(ctx, filePath, false, lastEventTime)
+// }
+
+// // Parse the first binlog eventTs of a local binlog file.
+// func (svc *DbProgramMysql) parseLocalBinlogFirstEventTime(ctx context.Context, filePath string) (eventTime time.Time, parseErr error) {
+// 	return svc.parseLocalBinlogEventTime(ctx, filePath, true, time.Time{})
+// }
+
+// // Parse the first binlog eventTs of a local binlog file.
+// func (svc *DbProgramMysql) parseLocalBinlogEventTime(ctx context.Context, filePath string, firstOrLast bool, startTime time.Time) (eventTime time.Time, parseErr error) {
+// 	args := []string{
+// 		// Local binlog file path.
+// 		filePath,
+// 		// Verify checksum binlog events.
+// 		"--verify-binlog-checksum",
+// 		// Tell mysqlbinlog to suppress the BINLOG statements for row events, which reduces the unneeded output.
+// 		"--base64-output=DECODE-ROWS",
+// 	}
+// 	if !startTime.IsZero() {
+// 		args = append(args, "--start-datetime", startTime.Local().Format(time.DateTime))
+// 	}
+// 	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, args...)
+// 	var stderr strings.Builder
+// 	cmd.Stderr = &stderr
+// 	pr, err := cmd.StdoutPipe()
+// 	if err != nil {
+// 		return time.Time{}, err
+// 	}
+
+// 	if err := cmd.Start(); err != nil {
+// 		return time.Time{}, err
+// 	}
+// 	defer func() {
+// 		_ = cmd.Cancel()
+// 		if err := cmd.Wait(); err != nil && parseErr != nil && stderr.Len() > 0 {
+// 			parseErr = errors.Wrap(parseErr, stderr.String())
+// 		}
+// 	}()
+// 	lastEventTime := time.Time{}
+// 	for s := bufio.NewScanner(pr); s.Scan(); {
+// 		line := s.Text()
+// 		eventTimeParsed, found, err := parseBinlogEventTimeInLine(line)
+// 		if err != nil {
+// 			return time.Time{}, errors.Wrap(err, "解析 binlog 文件失败")
+// 		}
+// 		if !found {
+// 			continue
+// 		}
+// 		if !firstOrLast {
+// 			lastEventTime = eventTimeParsed
+// 			continue
+// 		}
+// 		return eventTimeParsed, nil
+// 	}
+// 	if lastEventTime.IsZero() {
+// 		return time.Time{}, errors.New("解析 binlog 文件失败")
+// 	}
+// 	return lastEventTime, nil
+// }
+
+// // FetchBinlogs downloads binlog files from startingFileName on server to `binlogDir`.
+// func (svc *DbProgramMysql) FetchBinlogs(ctx context.Context, downloadLatestBinlogFile bool, earliestBackupSequence int64, latestBinlogHistory *entity.DbBinlogHistory) ([]*entity.BinlogFile, error) {
+// 	// Read binlog files list on server.
+// 	binlogFilesOnServerSorted, err := svc.GetSortedBinlogFilesOnServer(ctx)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+// 	if len(binlogFilesOnServerSorted) == 0 {
+// 		logx.Debug("No binlog file found on server to download")
+// 		return nil, nil
+// 	}
+// 	indexHistory := -1
+// 	for i, file := range binlogFilesOnServerSorted {
+// 		if latestBinlogHistory.Sequence == file.Sequence {
+// 			indexHistory = i + 1
+// 			file.FirstEventTime = latestBinlogHistory.FirstEventTime
+// 			file.LastEventTime = latestBinlogHistory.LastEventTime
+// 			file.LocalSize = latestBinlogHistory.FileSize
+// 			break
+// 		}
+// 		if earliestBackupSequence == file.Sequence {
+// 			indexHistory = i
+// 			break
+// 		}
+// 	}
+// 	if indexHistory < 0 {
+// 		// todo: 数据库服务器上的 binlog 序列已被删除, 导致 binlog 同步失败，如何处理？
+// 		return nil, errors.New(fmt.Sprintf("数据库服务器上的 binlog 序列已被删除: %d, %d", earliestBackupSequence, latestBinlogHistory.Sequence))
+// 	}
+// 	if indexHistory >= len(binlogFilesOnServerSorted)-1 {
+// 		indexHistory = len(binlogFilesOnServerSorted) - 1
+// 		if binlogFilesOnServerSorted[indexHistory].LocalSize == binlogFilesOnServerSorted[indexHistory].RemoteSize {
+// 			// 没有新的事件，不需要重新下载
+// 			return nil, nil
+// 		}
+// 	}
+// 	binlogFilesOnServerSorted = binlogFilesOnServerSorted[indexHistory:]
+
+// 	if err := svc.downloadBinlogFilesOnServer(ctx, binlogFilesOnServerSorted, downloadLatestBinlogFile); err != nil {
+// 		return nil, err
+// 	}
+
+// 	return binlogFilesOnServerSorted, nil
+// }
+
+// // Syncs the binlog specified by `meta` between the instance and local.
+// // If isLast is true, it means that this is the last binlog file containing the targetTs event.
+// // It may keep growing as there are ongoing writes to the database. So we just need to check that
+// // the file size is larger or equal to the binlog file size we queried from the MySQL server earlier.
+// func (svc *DbProgramMysql) downloadBinlogFile(ctx context.Context, binlogFileToDownload *entity.BinlogFile, isLast bool) error {
+// 	dbInfo := svc.dbInfo()
+// 	tempBinlogPrefix := filepath.Join(svc.getBinlogDir(dbInfo.InstanceId), "tmp-")
+// 	args := []string{
+// 		binlogFileToDownload.Name,
+// 		"--read-from-remote-server",
+// 		// Verify checksum binlog events.
+// 		"--verify-binlog-checksum",
+// 		"--host", dbInfo.Host,
+// 		"--port", strconv.Itoa(dbInfo.Port),
+// 		"--user", dbInfo.Username,
+// 		"--raw",
+// 		// With --raw this is a prefix for the file names.
+// 		"--result-file", tempBinlogPrefix,
+// 	}
+
+// 	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, args...)
+// 	// We cannot set password as a flag. Otherwise, there is warning message
+// 	// "mysqlbinlog: [Warning] Using a password on the command line interface can be insecure."
+// 	if dbInfo.Password != "" {
+// 		cmd.Env = append(cmd.Env, fmt.Sprintf("MYSQL_PWD=%s", dbInfo.Password))
+// 	}
+
+// 	logx.Debug("Downloading binlog files using mysqlbinlog:", cmd.String())
+// 	binlogFilePathTemp := tempBinlogPrefix + binlogFileToDownload.Name
+// 	defer func() {
+// 		_ = os.Remove(binlogFilePathTemp)
+// 	}()
+// 	if err := runCmd(cmd); err != nil {
+// 		logx.Errorf("运行 mysqlbinlog 程序失败: %v", err)
+// 		return errors.Wrap(err, "运行 mysqlbinlog 程序失败")
+// 	}
+
+// 	logx.Debug("Checking downloaded binlog file stat", logx.String("path", binlogFilePathTemp))
+// 	binlogFileTempInfo, err := os.Stat(binlogFilePathTemp)
+// 	if err != nil {
+// 		logx.Error("未找到 binlog 文件", logx.String("path", binlogFilePathTemp), logx.String("error", err.Error()))
+// 		return errors.Wrapf(err, "未找到 binlog 文件: %q", binlogFilePathTemp)
+// 	}
+
+// 	if (isLast && binlogFileTempInfo.Size() < binlogFileToDownload.RemoteSize) || (!isLast && binlogFileTempInfo.Size() != binlogFileToDownload.RemoteSize) {
+// 		logx.Error("Downloaded archived binlog file size is not equal to size queried on the MySQL server earlier.",
+// 			logx.String("binlog", binlogFileToDownload.Name),
+// 			logx.Int64("sizeInfo", binlogFileToDownload.RemoteSize),
+// 			logx.Int64("downloadedSize", binlogFileTempInfo.Size()),
+// 		)
+// 		return errors.Errorf("下载的 binlog 文件 %q 与服务上的文件大小不一致 %d != %d", binlogFilePathTemp, binlogFileTempInfo.Size(), binlogFileToDownload.RemoteSize)
+// 	}
+
+// 	binlogFilePath := svc.GetBinlogFilePath(binlogFileToDownload.Name)
+// 	if err := os.Rename(binlogFilePathTemp, binlogFilePath); err != nil {
+// 		return errors.Wrapf(err, "binlog 文件更名失败: %q -> %q", binlogFilePathTemp, binlogFilePath)
+// 	}
+// 	firstEventTime, err := svc.parseLocalBinlogFirstEventTime(ctx, binlogFilePath)
+// 	if err != nil {
+// 		return err
+// 	}
+// 	lastEventTime, err := svc.parseLocalBinlogLastEventTime(ctx, binlogFilePath, binlogFileToDownload.LastEventTime)
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	binlogFileToDownload.FirstEventTime = firstEventTime
+// 	binlogFileToDownload.LastEventTime = lastEventTime
+// 	binlogFileToDownload.Downloaded = true
+
+// 	return nil
+// }
+
+// // GetSortedBinlogFilesOnServer returns the information of binlog files in ascending order by their numeric extension.
+// func (svc *DbProgramMysql) GetSortedBinlogFilesOnServer(_ context.Context) ([]*entity.BinlogFile, error) {
+// 	query := "SHOW BINARY LOGS"
+// 	columns, rows, err := svc.dbConn.Query(query)
+// 	if err != nil {
+// 		return nil, errors.Wrapf(err, "SQL 语句 %q 执行失败", query)
+// 	}
+// 	findFileName := false
+// 	findFileSize := false
+// 	for _, column := range columns {
+// 		switch column.Name {
+// 		case "Log_name":
+// 			findFileName = true
+// 		case "File_size":
+// 			findFileSize = true
+// 		}
+// 	}
+// 	if !findFileName || !findFileSize {
+// 		return nil, errors.Errorf("SQL 语句 %q 执行结果解析失败", query)
+// 	}
+
+// 	var binlogFiles []*entity.BinlogFile
+
+// 	for _, row := range rows {
+// 		name, nameOk := row["Log_name"].(string)
+// 		size, sizeOk := row["File_size"].(uint64)
+// 		if !nameOk || !sizeOk {
+// 			return nil, errors.Errorf("SQL 语句 %q 执行结果解析失败", query)
+// 		}
+// 		_, seq, err := ParseBinlogName(name)
+// 		if err != nil {
+// 			return nil, errors.Wrapf(err, "SQL 语句 %q 执行结果解析失败", query)
+// 		}
+// 		binlogFile := &entity.BinlogFile{
+// 			Name:       name,
+// 			RemoteSize: int64(size),
+// 			Sequence:   seq,
+// 		}
+// 		binlogFiles = append(binlogFiles, binlogFile)
+// 	}
+
+// 	return sortBinlogFiles(binlogFiles), nil
+// }
+
+// var regexpBinlogInfo = regexp.MustCompile("CHANGE MASTER TO MASTER_LOG_FILE='([^.]+).([0-9]+)', MASTER_LOG_POS=([0-9]+);")
+
+// func readBinlogInfoFromBackup(reader io.Reader) (*entity.BinlogInfo, error) {
+// 	matching := false
+// 	r := bufio.NewReader(reader)
+// 	const maxMatchRow = 100
+// 	for i := 0; i < maxMatchRow; i++ {
+// 		row, err := r.ReadString('\n')
+// 		if err == io.EOF {
+// 			break
+// 		} else if err != nil {
+// 			return nil, err
+// 		}
+// 		if !matching {
+// 			if row == "-- Position to start replication or point-in-time recovery from\n" {
+// 				matching = true
+// 			} else {
+// 				continue
+// 			}
+// 		}
+// 		res := regexpBinlogInfo.FindStringSubmatch(row)
+// 		if res == nil {
+// 			continue
+// 		}
+// 		seq, err := strconv.ParseInt(res[2], 10, 64)
+// 		if err != nil {
+// 			return nil, err
+// 		}
+// 		pos, err := strconv.ParseInt(res[3], 10, 64)
+// 		if err != nil {
+// 			return nil, err
+// 		}
+
+// 		return &entity.BinlogInfo{
+// 			FileName: fmt.Sprintf("%s.%s", res[1], res[2]),
+// 			Sequence: seq,
+// 			Position: pos,
+// 		}, nil
+// 	}
+// 	return nil, errors.New("备份文件中未找到 binlog 信息")
+// }
+
+// // Use command like mysqlbinlog --start-datetime=targetTs binlog.000001 to parse the first binlog event position with timestamp equal or after targetTs.
+// func (svc *DbProgramMysql) GetBinlogEventPositionAtOrAfterTime(ctx context.Context, binlogName string, targetTime time.Time) (position int64, parseErr error) {
+// 	binlogPath := svc.GetBinlogFilePath(binlogName)
+// 	args := []string{
+// 		// Local binlog file path.
+// 		binlogPath,
+// 		// Verify checksum binlog events.
+// 		"--verify-binlog-checksum",
+// 		// Tell mysqlbinlog to suppress the BINLOG statements for row events, which reduces the unneeded output.
+// 		"--base64-output=DECODE-ROWS",
+// 		// Instruct mysqlbinlog to start output only after encountering the first binlog event with timestamp equal or after targetTime.
+// 		"--start-datetime", targetTime.Local().Format(time.DateTime),
+// 	}
+// 	cmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, args...)
+// 	var stderr strings.Builder
+// 	cmd.Stderr = &stderr
+// 	pr, err := cmd.StdoutPipe()
+// 	if err != nil {
+// 		return 0, err
+// 	}
+// 	if err := cmd.Start(); err != nil {
+// 		return 0, err
+// 	}
+// 	defer func() {
+// 		_ = cmd.Cancel()
+// 		if err := cmd.Wait(); err != nil && parseErr != nil && stderr.Len() > 0 {
+// 			parseErr = errors.Wrap(errors.New(stderr.String()), parseErr.Error())
+// 		}
+// 	}()
+
+// 	for s := bufio.NewScanner(pr); s.Scan(); {
+// 		line := s.Text()
+// 		posParsed, found, err := parseBinlogEventPosInLine(line)
+// 		if err != nil {
+// 			return 0, errors.Wrap(err, "binlog 文件解析失败")
+// 		}
+// 		// When invoking mysqlbinlog with --start-datetime, the first valid event will always be FORMAT_DESCRIPTION_EVENT which should be skipped.
+// 		if found && posParsed != 4 {
+// 			return posParsed, nil
+// 		}
+// 	}
+// 	return 0, errors.Errorf("在 %s 之后没有 binlog 事件", targetTime.Local().Format(time.DateTime))
+// }
+
+// // ReplayBinlog replays the binlog for `originDatabase` from `startBinlogInfo.Position` to `targetTs`, read binlog from `binlogDir`.
+// func (svc *DbProgramMysql) ReplayBinlog(ctx context.Context, originalDatabase, targetDatabase string, restoreInfo *dbi.RestoreInfo) (replayErr error) {
+// 	const (
+// 		// Variable lower_case_table_names related.
+
+// 		// LetterCaseOnDiskLetterCaseCmp stores table and database names using the letter case specified in the CREATE TABLE or CREATE DATABASE statement.
+// 		// Name comparisons are case-sensitive.
+// 		LetterCaseOnDiskLetterCaseCmp = 0
+// 		// LowerCaseOnDiskLowerCaseCmp stores table names in lowercase on disk and name comparisons are not case-sensitive.
+// 		LowerCaseOnDiskLowerCaseCmp = 1
+// 		// LetterCaseOnDiskLowerCaseCmp stores table and database names are stored on disk using the letter case specified in the CREATE TABLE or CREATE DATABASE statement, but MySQL converts them to lowercase on lookup.
+// 		// Name comparisons are not case-sensitive.
+// 		LetterCaseOnDiskLowerCaseCmp = 2
+// 	)
+
+// 	caseVariable := "lower_case_table_names"
+// 	identifierCaseSensitive, err := svc.getServerVariable(ctx, caseVariable)
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	identifierCaseSensitiveValue, err := strconv.Atoi(identifierCaseSensitive)
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	var originalDBName string
+// 	switch identifierCaseSensitiveValue {
+// 	case LetterCaseOnDiskLetterCaseCmp:
+// 		originalDBName = originalDatabase
+// 	case LowerCaseOnDiskLowerCaseCmp:
+// 		originalDBName = strings.ToLower(originalDatabase)
+// 	case LetterCaseOnDiskLowerCaseCmp:
+// 		originalDBName = strings.ToLower(originalDatabase)
+// 	default:
+// 		return errors.Errorf("参数 %s 的值 %s 不符合预期: [%d, %d, %d] ", caseVariable, identifierCaseSensitive, 0, 1, 2)
+// 	}
+
+// 	// Extract the SQL statements from the binlog and replay them to the pitrDatabase via the mysql client by pipe.
+// 	mysqlbinlogArgs := []string{
+// 		// Verify checksum binlog events.
+// 		"--verify-binlog-checksum",
+// 		// Disable binary logging.
+// 		"--disable-log-bin",
+// 		// Create rewrite rules for databases when playing back from logs written in row-based format, so that we can apply the binlog to PITR database instead of the original database.
+// 		"--rewrite-db", fmt.Sprintf("%s->%s", originalDBName, targetDatabase),
+// 		// List entries for just this database. It's applied after the --rewrite-db option, so we should provide the rewritten database, i.e., pitrDatabase.
+// 		"--database", targetDatabase,
+// 		// Decode binary log from first event with position equal to or greater than argument.
+// 		"--start-position", fmt.Sprintf("%d", restoreInfo.StartPosition),
+// 		// 	Stop decoding binary log at first event with position equal to or greater than argument.
+// 		"--stop-position", fmt.Sprintf("%d", restoreInfo.TargetPosition),
+// 	}
+
+// 	dbInfo := svc.dbInfo()
+// 	mysqlbinlogArgs = append(mysqlbinlogArgs, restoreInfo.GetBinlogPaths(svc.getBinlogDir(dbInfo.InstanceId))...)
+
+// 	mysqlArgs := []string{
+// 		"--host", dbInfo.Host,
+// 		"--port", strconv.Itoa(dbInfo.Port),
+// 		"--user", dbInfo.Username,
+// 	}
+
+// 	if dbInfo.Password != "" {
+// 		// The --password parameter of mysql/mysqlbinlog does not support the "--password PASSWORD" format (split by space).
+// 		// If provided like that, the program will hang.
+// 		mysqlArgs = append(mysqlArgs, fmt.Sprintf("--password=%s", dbInfo.Password))
+// 	}
+
+// 	mysqlbinlogCmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlbinlogPath, mysqlbinlogArgs...)
+// 	mysqlCmd := exec.CommandContext(ctx, svc.getMysqlBin().MysqlPath, mysqlArgs...)
+// 	logx.Debug("Start replay binlog commands.",
+// 		logx.String("mysqlbinlog", mysqlbinlogCmd.String()),
+// 		logx.String("mysql", mysqlCmd.String()))
+// 	defer func() {
+// 		if replayErr == nil {
+// 			logx.Debug("Replayed binlog successfully.")
+// 		}
+// 	}()
+
+// 	mysqlRead, err := mysqlbinlogCmd.StdoutPipe()
+// 	if err != nil {
+// 		return errors.Wrap(err, "创建 mysqlbinlog 输出管道失败")
+// 	}
+// 	defer func() {
+// 		_ = mysqlRead.Close()
+// 	}()
+
+// 	var mysqlbinlogErr, mysqlErr strings.Builder
+// 	mysqlbinlogCmd.Stderr = &mysqlbinlogErr
+// 	mysqlCmd.Stderr = &mysqlErr
+// 	mysqlCmd.Stdout = os.Stdout
+// 	mysqlCmd.Stdin = mysqlRead
+
+// 	if err := mysqlbinlogCmd.Start(); err != nil {
+// 		return errors.Wrap(err, "启动 mysqlbinlog 程序失败")
+// 	}
+// 	defer func() {
+// 		_ = mysqlbinlogCmd.Cancel()
+// 		if err := mysqlbinlogCmd.Wait(); err != nil {
+// 			if mysqlbinlogErr.Len() > 0 {
+// 				logx.Errorf("运行 mysqlbinlog 程序失败: %s", mysqlbinlogErr.String())
+// 				if replayErr != nil {
+// 					replayErr = errors.Wrap(replayErr, "运行 mysqlbinlog 程序失败: "+mysqlbinlogErr.String())
+// 				} else {
+// 					replayErr = errors.Errorf("运行 mysqlbinlog 程序失败: %s", mysqlbinlogErr.String())
+// 				}
+// 			}
+// 		}
+// 	}()
+// 	if err := mysqlCmd.Start(); err != nil {
+// 		logx.Error("启动 mysql 程序失败")
+// 		return errors.Wrap(err, "启动 mysql 程序失败")
+// 	}
+// 	if err := mysqlCmd.Wait(); err != nil {
+// 		logx.Errorf("运行 mysql 程序失败: %s", mysqlErr.String())
+// 		return errors.Errorf("运行 mysql 程序失败: %s", mysqlErr.String())
+// 	}
+
+// 	return nil
+// }
+
+// func (svc *DbProgramMysql) getServerVariable(_ context.Context, varName string) (string, error) {
+// 	query := fmt.Sprintf("SHOW VARIABLES LIKE '%s'", varName)
+// 	_, rows, err := svc.dbConn.Query(query)
+// 	if err != nil {
+// 		return "", err
+// 	}
+// 	if len(rows) == 0 {
+// 		return "", sql.ErrNoRows
+// 	}
+
+// 	var varNameFound, value string
+// 	varNameFound = rows[0]["Variable_name"].(string)
+// 	if varName != varNameFound {
+// 		return "", errors.Errorf("未找到数据库参数 %s", varName)
+// 	}
+// 	value = rows[0]["Value"].(string)
+// 	return value, nil
+// }
+
+// // CheckBinlogEnabled checks whether binlog is enabled for the current instance.
+// func (svc *DbProgramMysql) CheckBinlogEnabled(ctx context.Context) (bool, error) {
+// 	value, err := svc.getServerVariable(ctx, "log_bin")
+// 	switch {
+// 	case err == nil:
+// 		return strings.ToUpper(value) == "ON", nil
+// 	case errors.Is(err, sql.ErrNoRows):
+// 		return false, nil
+// 	default:
+// 		return false, err
+// 	}
+// }
+
+// // CheckBinlogRowFormat checks whether the binlog format is ROW or MIXED.
+// func (svc *DbProgramMysql) CheckBinlogRowFormat(ctx context.Context) (bool, error) {
+// 	value, err := svc.getServerVariable(ctx, "binlog_format")
+// 	switch {
+// 	case err == nil:
+// 		value = strings.ToUpper(value)
+// 		return value == "ROW" || value == "MIXED", nil
+// 	case errors.Is(err, sql.ErrNoRows):
+// 		return false, nil
+// 	default:
+// 		return false, err
+// 	}
+// }
+
+// func runCmd(cmd *exec.Cmd) error {
+// 	var stderr strings.Builder
+// 	cmd.Stdout = os.Stdout
+// 	cmd.Stderr = &stderr
+// 	if err := cmd.Start(); err != nil {
+// 		return err
+// 	}
+// 	if err := cmd.Wait(); err != nil {
+// 		return errors.New(stderr.String())
+// 	}
+// 	return nil
+// }
+
+// func (svc *DbProgramMysql) execute(database string, sql string) error {
+// 	dbInfo := svc.dbInfo()
+// 	args := []string{
+// 		"--host", dbInfo.Host,
+// 		"--port", strconv.Itoa(dbInfo.Port),
+// 		"--user", dbInfo.Username,
+// 		"--password=" + dbInfo.Password,
+// 		"--execute", sql,
+// 	}
+// 	if len(database) > 0 {
+// 		args = append(args, database)
+// 	}
+
+// 	cmd := exec.Command(svc.getMysqlBin().MysqlPath, args...)
+// 	logx.Debug("execute sql using mysql binary: ", cmd.String())
+// 	if err := runCmd(cmd); err != nil {
+// 		logx.Errorf("运行 mysql 程序失败: %v", err)
+// 		return errors.Wrap(err, "运行 mysql 程序失败")
+// 	}
+// 	return nil
+// }
+
+// // sortBinlogFiles will sort binlog files in ascending order by their numeric extension.
+// // For mysql binlog, after the serial number reaches 999999, the next serial number will not return to 000000, but 1000000,
+// // so we cannot directly use string to compare lexicographical order.
+// func sortBinlogFiles(binlogFiles []*entity.BinlogFile) []*entity.BinlogFile {
+// 	var sorted []*entity.BinlogFile
+// 	sorted = append(sorted, binlogFiles...)
+// 	sort.Slice(sorted, func(i, j int) bool {
+// 		return sorted[i].Sequence < sorted[j].Sequence
+// 	})
+// 	return sorted
+// }
+
+// func parseBinlogEventTimeInLine(line string) (eventTs time.Time, found bool, err error) {
+// 	// The target line starts with string like "#220421 14:49:26 server id 1"
+// 	if !strings.Contains(line, "server id") {
+// 		return time.Time{}, false, nil
+// 	}
+// 	if strings.Contains(line, "end_log_pos 0") {
+// 		// https://github.com/mysql/mysql-server/blob/8.0/client/mysqlbinlog.cc#L1209-L1212
+// 		// Fake events with end_log_pos=0 could be generated and we need to ignore them.
+// 		return time.Time{}, false, nil
+// 	}
+// 	fields := strings.Fields(line)
+// 	// fields should starts with ["#220421", "14:49:26", "server", "id", "1", "end_log_pos", "34794"]
+// 	if len(fields) < 7 ||
+// 		(len(fields[0]) != 7 || fields[2] != "server" || fields[3] != "id" || fields[5] != "end_log_pos") {
+// 		return time.Time{}, false, errors.Errorf("found unexpected mysqlbinlog output line %q when parsing binlog event timestamp", line)
+// 	}
+// 	datetime, err := time.ParseInLocation("060102 15:04:05", fmt.Sprintf("%s %s", fields[0][1:], fields[1]), time.Local)
+// 	if err != nil {
+// 		return time.Time{}, false, err
+// 	}
+// 	return datetime, true, nil
+// }
+
+// func parseBinlogEventPosInLine(line string) (pos int64, found bool, err error) {
+// 	// The mysqlbinlog output will contains a line starting with "# at 35065", which is the binlog event's start position.
+// 	if !strings.HasPrefix(line, "# at ") {
+// 		return 0, false, nil
+// 	}
+// 	// This is the line containing the start position of the binlog event.
+// 	fields := strings.Fields(line)
+// 	if len(fields) != 3 {
+// 		return 0, false, errors.Errorf("unexpected mysqlbinlog output line %q when parsing binlog event start position", line)
+// 	}
+// 	pos, err = strconv.ParseInt(fields[2], 10, 0)
+// 	if err != nil {
+// 		return 0, false, err
+// 	}
+// 	return pos, true, nil
+// }
+
+// // ParseBinlogName parses the numeric extension and the binary log base name by using split the dot.
+// // Examples:
+// //   - ("binlog.000001") => ("binlog", 1)
+// //   - ("binlog000001") => ("", err)
+// func ParseBinlogName(name string) (string, int64, error) {
+// 	s := strings.Split(name, ".")
+// 	if len(s) != 2 {
+// 		return "", 0, errors.Errorf("failed to parse binlog extension, expecting two parts in the binlog file name %q but got %d", name, len(s))
+// 	}
+// 	seq, err := strconv.ParseInt(s[1], 10, 0)
+// 	if err != nil {
+// 		return "", 0, errors.Wrapf(err, "failed to parse the sequence number %s", s[1])
+// 	}
+// 	return s[0], seq, nil
+// }
+
+// // getBinlogDir gets the binlogDir.
+// func (svc *DbProgramMysql) getBinlogDir(instanceId uint64) string {
+// 	return filepath.Join(
+// 		svc.getBackupPath(),
+// 		fmt.Sprintf("instance-%d", instanceId),
+// 		"binlog")
+// }
+
+// func (svc *DbProgramMysql) getDbInstanceBackupRoot(instanceId uint64) string {
+// 	return filepath.Join(
+// 		svc.getBackupPath(),
+// 		fmt.Sprintf("instance-%d", instanceId))
+// }
+
+// func (svc *DbProgramMysql) getDbBackupDir(instanceId, backupId uint64) string {
+// 	return filepath.Join(
+// 		svc.getBackupPath(),
+// 		fmt.Sprintf("instance-%d", instanceId),
+// 		fmt.Sprintf("backup-%d", backupId))
+// }
+
+// func (svc *DbProgramMysql) PruneBinlog(history *entity.DbBinlogHistory) error {
+// 	binlogFilePath := filepath.Join(svc.getBinlogDir(history.DbInstanceId), history.FileName)
+// 	_ = os.Remove(binlogFilePath)
+// 	return nil
+// }
diff --git a/server/internal/db/dbm/mysql/program_test.go b/server/internal/db/dbm/mysql/program_test.go
index 979429a7..9795d5e8 100644
--- a/server/internal/db/dbm/mysql/program_test.go
+++ b/server/internal/db/dbm/mysql/program_test.go
@@ -1,26 +1,18 @@
 package mysql
 
-import (
-	"mayfly-go/internal/db/domain/entity"
-	"strings"
-	"testing"
+// func Test_readBinlogInfoFromBackup(t *testing.T) {
+// 	text := `
+// --
+// -- Position to start replication or point-in-time recovery from
+// --
 
-	"github.com/stretchr/testify/require"
-)
-
-func Test_readBinlogInfoFromBackup(t *testing.T) {
-	text := `
---
--- Position to start replication or point-in-time recovery from
---
-
--- CHANGE MASTER TO MASTER_LOG_FILE='binlog.000003', MASTER_LOG_POS=379;
-`
-	got, err := readBinlogInfoFromBackup(strings.NewReader(text))
-	require.NoError(t, err)
-	require.Equal(t, &entity.BinlogInfo{
-		FileName: "binlog.000003",
-		Sequence: 3,
-		Position: 379,
-	}, got)
-}
+// -- CHANGE MASTER TO MASTER_LOG_FILE='binlog.000003', MASTER_LOG_POS=379;
+// `
+// 	got, err := readBinlogInfoFromBackup(strings.NewReader(text))
+// 	require.NoError(t, err)
+// 	require.Equal(t, &entity.BinlogInfo{
+// 		FileName: "binlog.000003",
+// 		Sequence: 3,
+// 		Position: 379,
+// 	}, got)
+// }
diff --git a/server/internal/db/domain/entity/db_backup.go b/server/internal/db/domain/entity/db_backup.go
deleted file mode 100644
index d8f62f2e..00000000
--- a/server/internal/db/domain/entity/db_backup.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/pkg/runner"
-	"time"
-)
-
-var _ DbJob = (*DbBackup)(nil)
-
-// DbBackup 数据库备份任务
-type DbBackup struct {
-	DbJobBaseImpl
-
-	DbInstanceId uint64        // 数据库实例ID
-	DbName       string        // 数据库名称
-	Name         string        // 数据库备份名称
-	Enabled      bool          // 是否启用
-	EnabledDesc  string        // 启用状态描述
-	StartTime    time.Time     // 开始时间
-	Interval     time.Duration // 间隔时间
-	MaxSaveDays  int           // 数据库备份历史保留天数，过期将自动删除
-	Repeated     bool          // 是否重复执行
-}
-
-func (b *DbBackup) GetInstanceId() uint64 {
-	return b.DbInstanceId
-}
-
-func (b *DbBackup) GetDbName() string {
-	return b.DbName
-}
-
-func (b *DbBackup) GetJobType() DbJobType {
-	return DbJobTypeBackup
-}
-
-func (b *DbBackup) Schedule() (time.Time, error) {
-	if b.IsFinished() {
-		return time.Time{}, runner.ErrJobFinished
-	}
-	if !b.Enabled {
-		return time.Time{}, runner.ErrJobDisabled
-	}
-	switch b.LastStatus {
-	case DbJobSuccess:
-		lastTime := b.LastTime.Time
-		if lastTime.Before(b.StartTime) {
-			lastTime = b.StartTime.Add(-b.Interval)
-		}
-		return lastTime.Add(b.Interval - lastTime.Sub(b.StartTime)%b.Interval), nil
-	case DbJobRunning, DbJobFailed:
-		return time.Now().Add(time.Minute), nil
-	default:
-		return b.StartTime, nil
-	}
-}
-
-func (b *DbBackup) IsFinished() bool {
-	return !b.Repeated && b.LastStatus == DbJobSuccess
-}
-
-func (b *DbBackup) IsEnabled() bool {
-	return b.Enabled
-}
-
-func (b *DbBackup) IsExpired() bool {
-	return false
-}
-
-func (b *DbBackup) SetEnabled(enabled bool, desc string) {
-	b.Enabled = enabled
-	b.EnabledDesc = desc
-}
-
-func (b *DbBackup) Update(job runner.Job) {
-	backup := job.(*DbBackup)
-	b.StartTime = backup.StartTime
-	b.Interval = backup.Interval
-}
-
-func (b *DbBackup) GetInterval() time.Duration {
-	return b.Interval
-}
-
-func (b *DbBackup) GetKey() DbJobKey {
-	return b.getKey(b.GetJobType())
-}
-
-func (b *DbBackup) SetStatus(status runner.JobStatus, err error) {
-	b.setLastStatus(b.GetJobType(), status, err)
-}
diff --git a/server/internal/db/domain/entity/db_backup_history.go b/server/internal/db/domain/entity/db_backup_history.go
deleted file mode 100644
index d3c2b709..00000000
--- a/server/internal/db/domain/entity/db_backup_history.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/pkg/model"
-	"time"
-)
-
-// DbBackupHistory 数据库备份历史
-type DbBackupHistory struct {
-	model.DeletedModel
-
-	Uuid           string    `json:"uuid"`
-	Name           string    `json:"name"`       // 备份历史名称
-	CreateTime     time.Time `json:"createTime"` // 创建时间: 2023-11-08 02:00:00
-	DbBackupId     uint64    `json:"dbBackupId"`
-	DbInstanceId   uint64    `json:"dbInstanceId"`
-	DbName         string    `json:"dbName"`
-	BinlogFileName string    `json:"binlogFileName"`
-	BinlogSequence int64     `json:"binlogSequence"`
-	BinlogPosition int64     `json:"binlogPosition"`
-}
-
-func (d *DbBackupHistory) TableName() string {
-	return "t_db_backup_history"
-}
diff --git a/server/internal/db/domain/entity/db_binlog.go b/server/internal/db/domain/entity/db_binlog.go
deleted file mode 100644
index 388f52d1..00000000
--- a/server/internal/db/domain/entity/db_binlog.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/pkg/runner"
-	"time"
-)
-
-const (
-	BinlogDownloadInterval = time.Minute * 15
-)
-
-// BinlogFile is the metadata of the MySQL binlog file.
-type BinlogFile struct {
-	Name       string
-	RemoteSize int64
-	LocalSize  int64
-
-	// Sequence is parsed from Name and is for the sorting purpose.
-	Sequence       int64
-	FirstEventTime time.Time
-	LastEventTime  time.Time
-
-	Downloaded bool
-}
-
-var _ DbJob = (*DbBinlog)(nil)
-
-// DbBinlog 数据库备份任务
-type DbBinlog struct {
-	DbJobBaseImpl
-	DbInstanceId uint64 // 数据库实例ID
-}
-
-func NewDbBinlog(instanceId uint64) *DbBinlog {
-	job := &DbBinlog{}
-	job.Id = instanceId
-	job.DbInstanceId = instanceId
-	return job
-}
-
-func (b *DbBinlog) GetInstanceId() uint64 {
-	return b.DbInstanceId
-}
-
-func (b *DbBinlog) GetDbName() string {
-	// binlog 是全库级别的
-	return ""
-}
-
-func (b *DbBinlog) Schedule() (time.Time, error) {
-	switch b.LastStatus {
-	case DbJobSuccess:
-		return time.Time{}, runner.ErrJobFinished
-	case DbJobFailed:
-		return time.Now().Add(BinlogDownloadInterval), nil
-	default:
-		return time.Now(), nil
-	}
-}
-
-func (b *DbBinlog) Update(_ runner.Job) {}
-
-func (b *DbBinlog) IsEnabled() bool {
-	return true
-}
-
-func (b *DbBinlog) IsExpired() bool {
-	return false
-}
-
-func (b *DbBinlog) SetEnabled(_ bool, _ string) {}
-
-func (b *DbBinlog) GetInterval() time.Duration {
-	return 0
-}
-
-func (b *DbBinlog) GetJobType() DbJobType {
-	return DbJobTypeBinlog
-}
-
-func (b *DbBinlog) GetKey() DbJobKey {
-	return b.getKey(b.GetJobType())
-}
-
-func (b *DbBinlog) SetStatus(status DbJobStatus, err error) {
-	b.setLastStatus(b.GetJobType(), status, err)
-}
diff --git a/server/internal/db/domain/entity/db_binlog_history.go b/server/internal/db/domain/entity/db_binlog_history.go
deleted file mode 100644
index 43fcc46f..00000000
--- a/server/internal/db/domain/entity/db_binlog_history.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/pkg/model"
-	"time"
-)
-
-// DbBinlogHistory 数据库 binlog 历史
-type DbBinlogHistory struct {
-	model.DeletedModel
-
-	CreateTime     time.Time `json:"createTime"` // 创建时间: 2023-11-08 02:00:00
-	FileName       string
-	FileSize       int64
-	Sequence       int64
-	FirstEventTime time.Time
-	LastEventTime  time.Time
-	DbInstanceId   uint64 `json:"dbInstanceId"`
-}
-
-func (d *DbBinlogHistory) TableName() string {
-	return "t_db_binlog_history"
-}
-
-type BinlogInfo struct {
-	FileName string `json:"fileName"`
-	Sequence int64  `json:"sequence"`
-	Position int64  `json:"position"`
-}
diff --git a/server/internal/db/domain/entity/db_job.go b/server/internal/db/domain/entity/db_job.go
deleted file mode 100644
index 61734e7d..00000000
--- a/server/internal/db/domain/entity/db_job.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package entity
-
-import (
-	"fmt"
-	"mayfly-go/pkg/model"
-	"mayfly-go/pkg/runner"
-	"mayfly-go/pkg/utils/stringx"
-	"mayfly-go/pkg/utils/timex"
-	"time"
-)
-
-const LastResultSize = 256
-
-type DbJobKey = runner.JobKey
-
-type DbJobStatus = runner.JobStatus
-
-const (
-	DbJobRunning = runner.JobRunning
-	DbJobSuccess = runner.JobSuccess
-	DbJobFailed  = runner.JobFailed
-)
-
-type DbJobType string
-
-func (typ DbJobType) String() string {
-	return string(typ)
-}
-
-const (
-	DbJobUnknown     DbJobType = "db-unknown"
-	DbJobTypeBackup  DbJobType = "db-backup"
-	DbJobTypeRestore DbJobType = "db-restore"
-	DbJobTypeBinlog  DbJobType = "db-binlog"
-)
-
-const (
-	DbJobNameUnknown = "未知任务"
-	DbJobNameBackup  = "数据库备份"
-	DbJobNameRestore = "数据库恢复"
-	DbJobNameBinlog  = "BINLOG同步"
-)
-
-var _ runner.Job = (DbJob)(nil)
-
-type DbJobBase interface {
-	model.ModelI
-}
-
-type DbJob interface {
-	runner.Job
-	DbJobBase
-
-	GetInstanceId() uint64
-	GetKey() string
-	GetJobType() DbJobType
-	GetDbName() string
-	Schedule() (time.Time, error)
-	IsEnabled() bool
-	IsExpired() bool
-	SetEnabled(enabled bool, desc string)
-	Update(job runner.Job)
-	GetInterval() time.Duration
-}
-
-var _ DbJobBase = (*DbJobBaseImpl)(nil)
-
-type DbJobBaseImpl struct {
-	model.Model
-
-	LastStatus DbJobStatus    // 最近一次执行状态
-	LastResult string         // 最近一次执行结果
-	LastTime   timex.NullTime // 最近一次执行时间
-	jobKey     runner.JobKey
-}
-
-func (d *DbJobBaseImpl) getJobType() DbJobType {
-	job, ok := any(d).(DbJob)
-	if !ok {
-		return DbJobUnknown
-	}
-	return job.GetJobType()
-}
-
-func (d *DbJobBaseImpl) setLastStatus(jobType DbJobType, status DbJobStatus, err error) {
-	var statusName, jobName string
-	switch status {
-	case DbJobRunning:
-		statusName = "运行中"
-	case DbJobSuccess:
-		statusName = "成功"
-	case DbJobFailed:
-		statusName = "失败"
-	default:
-		return
-	}
-
-	switch jobType {
-	case DbJobTypeBackup:
-		jobName = DbJobNameBackup
-	case DbJobTypeRestore:
-		jobName = DbJobNameRestore
-	case DbJobTypeBinlog:
-		jobName = DbJobNameBinlog
-	default:
-		jobName = jobType.String()
-	}
-	d.LastStatus = status
-	var result = jobName + statusName
-	if err != nil {
-		result = fmt.Sprintf("%s: %v", result, err)
-	}
-	d.LastResult = stringx.Truncate(result, LastResultSize, LastResultSize, "")
-	d.LastTime = timex.NewNullTime(time.Now())
-}
-
-func FormatJobKey(typ DbJobType, jobId uint64) DbJobKey {
-	return fmt.Sprintf("%v-%d", typ, jobId)
-}
-
-func (d *DbJobBaseImpl) getKey(jobType DbJobType) DbJobKey {
-	if len(d.jobKey) == 0 {
-		d.jobKey = FormatJobKey(jobType, d.Id)
-	}
-	return d.jobKey
-}
diff --git a/server/internal/db/domain/entity/db_restore.go b/server/internal/db/domain/entity/db_restore.go
deleted file mode 100644
index 5660a338..00000000
--- a/server/internal/db/domain/entity/db_restore.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/pkg/runner"
-	"mayfly-go/pkg/utils/timex"
-	"time"
-)
-
-var _ DbJob = (*DbRestore)(nil)
-
-// DbRestore 数据库恢复任务
-type DbRestore struct {
-	DbJobBaseImpl
-
-	DbInstanceId        uint64         // 数据库实例ID
-	DbName              string         // 数据库名称
-	Enabled             bool           // 是否启用
-	EnabledDesc         string         // 启用状态描述
-	StartTime           time.Time      // 开始时间
-	Interval            time.Duration  // 间隔时间
-	Repeated            bool           // 是否重复执行
-	PointInTime         timex.NullTime `json:"pointInTime"`         // 指定数据库恢复的时间点
-	DbBackupId          uint64         `json:"dbBackupId"`          // 用于恢复的数据库恢复任务ID
-	DbBackupHistoryId   uint64         `json:"dbBackupHistoryId"`   // 用于恢复的数据库恢复历史ID
-	DbBackupHistoryName string         `json:"dbBackupHistoryName"` // 数据库恢复历史名称
-}
-
-func (r *DbRestore) GetInstanceId() uint64 {
-	return r.DbInstanceId
-}
-
-func (r *DbRestore) GetDbName() string {
-	return r.DbName
-}
-
-func (r *DbRestore) Schedule() (time.Time, error) {
-	if !r.Enabled {
-		return time.Time{}, runner.ErrJobDisabled
-	}
-	switch r.LastStatus {
-	case DbJobSuccess, DbJobFailed:
-		return time.Time{}, runner.ErrJobFinished
-	default:
-		if time.Now().Sub(r.StartTime) > time.Hour {
-			return time.Time{}, runner.ErrJobExpired
-		}
-		return r.StartTime, nil
-	}
-}
-
-func (r *DbRestore) IsEnabled() bool {
-	return r.Enabled
-}
-
-func (r *DbRestore) SetEnabled(enabled bool, desc string) {
-	r.Enabled = enabled
-	r.EnabledDesc = desc
-}
-
-func (r *DbRestore) IsExpired() bool {
-	return !r.Repeated && time.Now().After(r.StartTime.Add(time.Hour))
-}
-
-func (r *DbRestore) IsFinished() bool {
-	return !r.Repeated && r.LastStatus == DbJobSuccess
-}
-
-func (r *DbRestore) Update(job runner.Job) {
-	restore := job.(*DbRestore)
-	r.StartTime = restore.StartTime
-	r.Interval = restore.Interval
-}
-
-func (r *DbRestore) GetInterval() time.Duration {
-	return r.Interval
-}
-
-func (r *DbRestore) GetJobType() DbJobType {
-	return DbJobTypeRestore
-}
-
-func (r *DbRestore) GetKey() DbJobKey {
-	return r.getKey(r.GetJobType())
-}
-
-func (r *DbRestore) SetStatus(status DbJobStatus, err error) {
-	r.setLastStatus(r.GetJobType(), status, err)
-}
diff --git a/server/internal/db/domain/entity/db_restore_history.go b/server/internal/db/domain/entity/db_restore_history.go
deleted file mode 100644
index 1bee17a8..00000000
--- a/server/internal/db/domain/entity/db_restore_history.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package entity
-
-import (
-	"mayfly-go/pkg/model"
-	"time"
-)
-
-// DbRestoreHistory 数据库恢复历史
-type DbRestoreHistory struct {
-	model.DeletedModel
-
-	CreateTime  time.Time `orm:"column(create_time)" json:"createTime"` // 创建时间: 2023-11-08 02:00:00
-	DbRestoreId uint64    `orm:"column(db_restore_id)" json:"dbRestoreId"`
-}
-
-func (d *DbRestoreHistory) TableName() string {
-	return "t_db_restore_history"
-}
diff --git a/server/internal/db/domain/entity/po.go b/server/internal/db/domain/entity/po.go
new file mode 100644
index 00000000..d55f4303
--- /dev/null
+++ b/server/internal/db/domain/entity/po.go
@@ -0,0 +1,20 @@
+package entity
+
+import "time"
+
+type DbListPO struct {
+	Id              *int64            `json:"id"`
+	Code            string            `json:"code"`
+	Name            *string           `json:"name"`
+	GetDatabaseMode DbGetDatabaseMode `json:"getDatabaseMode"` // 获取数据库方式
+	Database        *string           `json:"database"`
+	Remark          *string           `json:"remark"`
+	InstanceId      uint64            `json:"instanceId"`
+	AuthCertName    string            `json:"authCertName"`
+	CreateTime      *time.Time        `json:"createTime"`
+	Creator         *string           `json:"creator"`
+	CreatorId       *int64            `json:"creatorId"`
+	UpdateTime      *time.Time        `json:"updateTime"`
+	Modifier        *string           `json:"modifier"`
+	ModifierId      *int64            `json:"modifierId"`
+}
diff --git a/server/internal/db/domain/entity/query.go b/server/internal/db/domain/entity/query.go
index 102be009..f6ea6bbf 100644
--- a/server/internal/db/domain/entity/query.go
+++ b/server/internal/db/domain/entity/query.go
@@ -1,7 +1,11 @@
 package entity
 
+import "mayfly-go/pkg/model"
+
 // InstanceQuery 数据库实例查询
 type InstanceQuery struct {
+	model.PageParam
+
 	Id      uint64 `json:"id" form:"id"`
 	Name    string `json:"name" form:"name"`
 	Code    string `json:"code" form:"code"`
@@ -12,19 +16,27 @@ type InstanceQuery struct {
 }
 
 type DataSyncTaskQuery struct {
+	model.PageParam
+
 	Name   string `json:"name" form:"name"`
 	Status int8   `json:"status" form:"status"`
 }
 type DataSyncLogQuery struct {
+	model.PageParam
+
 	TaskId uint64 `json:"task_id" form:"taskId"`
 }
 
 type DbTransferTaskQuery struct {
+	model.PageParam
+
 	Name     string `json:"name" form:"name"`
 	Status   int8   `json:"status" form:"status"`
 	CronAble int8   `json:"cronAble" form:"cronAble"`
 }
 type DbTransferFileQuery struct {
+	model.PageParam
+
 	TaskId uint64 `json:"task_id" form:"taskId"`
 	Name   string `json:"name" form:"name"`
 }
@@ -35,6 +47,8 @@ type DbTransferLogQuery struct {
 
 // 数据库查询实体，不与数据库表字段一一对应
 type DbQuery struct {
+	model.PageParam
+
 	Id         uint64 `form:"id"`
 	TagPath    string `form:"tagPath"`
 	Code       string `json:"code" form:"code"`
@@ -43,6 +57,8 @@ type DbQuery struct {
 }
 
 type DbSqlExecQuery struct {
+	model.PageParam
+
 	Id         uint64 `json:"id" form:"id"`
 	DbId       uint64 `json:"dbId" form:"dbId"`
 	Db         string `json:"db" form:"db"`
@@ -76,6 +92,8 @@ type DbBackupHistoryQuery struct {
 
 // DbRestoreQuery 数据库备份任务查询
 type DbRestoreQuery struct {
+	*model.PageParam
+
 	Id           uint64   `json:"id" form:"id"`
 	DbName       string   `json:"dbName" form:"dbName"`
 	InDbNames    []string `json:"-" form:"-"`
diff --git a/server/internal/db/domain/repository/db.go b/server/internal/db/domain/repository/db.go
index 7046ccad..1d82f0d7 100644
--- a/server/internal/db/domain/repository/db.go
+++ b/server/internal/db/domain/repository/db.go
@@ -10,5 +10,5 @@ type Db interface {
 	base.Repo[*entity.Db]
 
 	// 分页获取数据信息列表
-	GetDbList(condition *entity.DbQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetDbList(condition *entity.DbQuery, orderBy ...string) (*model.PageResult[*entity.DbListPO], error)
 }
diff --git a/server/internal/db/domain/repository/db_backup.go b/server/internal/db/domain/repository/db_backup.go
deleted file mode 100644
index 8ee3478f..00000000
--- a/server/internal/db/domain/repository/db_backup.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package repository
-
-import (
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/model"
-)
-
-type DbBackup interface {
-	DbJob[*entity.DbBackup]
-
-	ListToDo(jobs any) error
-	ListDbInstances(enabled bool, repeated bool, instanceIds *[]uint64) error
-	GetDbNamesWithoutBackup(instanceId uint64, dbNames []string) ([]string, error)
-
-	// GetPageList 分页获取数据库任务列表
-	GetPageList(condition *entity.DbBackupQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-}
diff --git a/server/internal/db/domain/repository/db_backup_history.go b/server/internal/db/domain/repository/db_backup_history.go
deleted file mode 100644
index 4ae5ce87..00000000
--- a/server/internal/db/domain/repository/db_backup_history.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package repository
-
-import (
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/model"
-)
-
-type DbBackupHistory interface {
-	base.Repo[*entity.DbBackupHistory]
-
-	// GetPageList 分页获取数据备份历史
-	GetPageList(condition *entity.DbBackupHistoryQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-
-	GetLatestHistoryForBinlog(instanceId uint64, dbName string, bi *entity.BinlogInfo) (*entity.DbBackupHistory, error)
-
-	GetEarliestHistoryForBinlog(instanceId uint64) (*entity.DbBackupHistory, bool, error)
-
-	GetHistories(backupHistoryIds []uint64, toEntity any) error
-
-	UpdateDeleting(deleting bool, backupHistoryId ...uint64) (bool, error)
-	UpdateRestoring(restoring bool, backupHistoryId ...uint64) (bool, error)
-	ZeroBinlogInfo(backupHistoryId uint64) error
-}
diff --git a/server/internal/db/domain/repository/db_binlog.go b/server/internal/db/domain/repository/db_binlog.go
deleted file mode 100644
index f3229c6e..00000000
--- a/server/internal/db/domain/repository/db_binlog.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package repository
-
-import (
-	"context"
-	"mayfly-go/internal/db/domain/entity"
-)
-
-type DbBinlog interface {
-	DbJob[*entity.DbBinlog]
-
-	AddJobIfNotExists(ctx context.Context, job *entity.DbBinlog) error
-}
diff --git a/server/internal/db/domain/repository/db_binlog_history.go b/server/internal/db/domain/repository/db_binlog_history.go
deleted file mode 100644
index a93130d3..00000000
--- a/server/internal/db/domain/repository/db_binlog_history.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package repository
-
-import (
-	"context"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/base"
-	"time"
-)
-
-type DbBinlogHistory interface {
-	base.Repo[*entity.DbBinlogHistory]
-
-	GetHistories(instanceId uint64, start, target *entity.BinlogInfo) ([]*entity.DbBinlogHistory, error)
-
-	GetHistoryByTime(instanceId uint64, targetTime time.Time) (*entity.DbBinlogHistory, error)
-
-	GetLatestHistory(instanceId uint64) (*entity.DbBinlogHistory, bool, error)
-
-	InsertWithBinlogFiles(ctx context.Context, instanceId uint64, binlogFiles []*entity.BinlogFile) error
-
-	Upsert(ctx context.Context, history *entity.DbBinlogHistory) error
-
-	GetHistoriesBeforeSequence(ctx context.Context, instanceId uint64, binlogSeq int64, histories *[]*entity.DbBinlogHistory) error
-}
diff --git a/server/internal/db/domain/repository/db_data_sync.go b/server/internal/db/domain/repository/db_data_sync.go
index 7a24f768..fe0fdf22 100644
--- a/server/internal/db/domain/repository/db_data_sync.go
+++ b/server/internal/db/domain/repository/db_data_sync.go
@@ -10,12 +10,12 @@ type DataSyncTask interface {
 	base.Repo[*entity.DataSyncTask]
 
 	// 分页获取数据库实例信息列表
-	GetTaskList(condition *entity.DataSyncTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetTaskList(condition *entity.DataSyncTaskQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncTask], error)
 }
 
 type DataSyncLog interface {
 	base.Repo[*entity.DataSyncLog]
 
 	// 分页获取数据库实例信息列表
-	GetTaskLogList(condition *entity.DataSyncLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetTaskLogList(condition *entity.DataSyncLogQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncLog], error)
 }
diff --git a/server/internal/db/domain/repository/db_job.go b/server/internal/db/domain/repository/db_job.go
deleted file mode 100644
index 17063f58..00000000
--- a/server/internal/db/domain/repository/db_job.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package repository
-
-import (
-	"context"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/base"
-)
-
-type DbJobBase[T entity.DbJob] interface {
-	base.Repo[T]
-
-	// UpdateLastStatus 更新任务执行状态
-	UpdateLastStatus(ctx context.Context, job entity.DbJob) error
-}
-
-type DbJob[T entity.DbJob] interface {
-	DbJobBase[T]
-
-	// AddJob 添加数据库任务
-	AddJob(ctx context.Context, jobs any) error
-	UpdateEnabled(ctx context.Context, jobId uint64, enabled bool) error
-}
diff --git a/server/internal/db/domain/repository/db_restore.go b/server/internal/db/domain/repository/db_restore.go
deleted file mode 100644
index 4f30e67e..00000000
--- a/server/internal/db/domain/repository/db_restore.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package repository
-
-import (
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/model"
-)
-
-type DbRestore interface {
-	DbJob[*entity.DbRestore]
-
-	ListToDo(jobs any) error
-	GetDbNamesWithoutRestore(instanceId uint64, dbNames []string) ([]string, error)
-
-	// GetPageList 分页获取数据库任务列表
-	GetPageList(condition *entity.DbRestoreQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-
-	GetEnabledRestores(toEntity any, backupHistoryId ...uint64) error
-}
diff --git a/server/internal/db/domain/repository/db_restore_history.go b/server/internal/db/domain/repository/db_restore_history.go
deleted file mode 100644
index 486df33b..00000000
--- a/server/internal/db/domain/repository/db_restore_history.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package repository
-
-import (
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/model"
-)
-
-type DbRestoreHistory interface {
-	base.Repo[*entity.DbRestoreHistory]
-
-	// GetDbRestoreHistories 分页获取数据备份历史
-	GetDbRestoreHistories(condition *entity.DbRestoreHistoryQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-}
diff --git a/server/internal/db/domain/repository/db_sql_exec.go b/server/internal/db/domain/repository/db_sql_exec.go
index ea30c737..16433c34 100644
--- a/server/internal/db/domain/repository/db_sql_exec.go
+++ b/server/internal/db/domain/repository/db_sql_exec.go
@@ -10,5 +10,5 @@ type DbSqlExec interface {
 	base.Repo[*entity.DbSqlExec]
 
 	// 分页获取
-	GetPageList(condition *entity.DbSqlExecQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DbSqlExecQuery, orderBy ...string) (*model.PageResult[*entity.DbSqlExec], error)
 }
diff --git a/server/internal/db/domain/repository/db_transfer.go b/server/internal/db/domain/repository/db_transfer.go
index 2afb4b76..6ce91bc6 100644
--- a/server/internal/db/domain/repository/db_transfer.go
+++ b/server/internal/db/domain/repository/db_transfer.go
@@ -10,5 +10,5 @@ type DbTransferTask interface {
 	base.Repo[*entity.DbTransferTask]
 
 	// 分页获取数据库实例信息列表
-	GetTaskList(condition *entity.DbTransferTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetTaskList(condition *entity.DbTransferTaskQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferTask], error)
 }
diff --git a/server/internal/db/domain/repository/db_transfer_file.go b/server/internal/db/domain/repository/db_transfer_file.go
index 22156d66..7ffdab8c 100644
--- a/server/internal/db/domain/repository/db_transfer_file.go
+++ b/server/internal/db/domain/repository/db_transfer_file.go
@@ -10,5 +10,5 @@ type DbTransferFile interface {
 	base.Repo[*entity.DbTransferFile]
 
 	// 分页获取数据库实例信息列表
-	GetPageList(condition *entity.DbTransferFileQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.DbTransferFileQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferFile], error)
 }
diff --git a/server/internal/db/domain/repository/instance.go b/server/internal/db/domain/repository/instance.go
index be9dcbdd..ecfd2787 100644
--- a/server/internal/db/domain/repository/instance.go
+++ b/server/internal/db/domain/repository/instance.go
@@ -10,5 +10,5 @@ type Instance interface {
 	base.Repo[*entity.DbInstance]
 
 	// 分页获取数据库实例信息列表
-	GetInstanceList(condition *entity.InstanceQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetInstanceList(condition *entity.InstanceQuery, orderBy ...string) (*model.PageResult[*entity.DbInstance], error)
 }
diff --git a/server/internal/db/domain/repository/repository.go b/server/internal/db/domain/repository/repository.go
deleted file mode 100644
index 467dbe1c..00000000
--- a/server/internal/db/domain/repository/repository.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package repository
-
-type Repositories struct {
-	Instance       Instance
-	Backup         DbBackup
-	BackupHistory  DbBackupHistory
-	Restore        DbRestore
-	RestoreHistory DbRestoreHistory
-	Binlog         DbBinlog
-	BinlogHistory  DbBinlogHistory
-}
diff --git a/server/internal/db/infrastructure/persistence/db.go b/server/internal/db/infrastructure/persistence/db.go
index aa55b6e0..55e2fa8d 100644
--- a/server/internal/db/infrastructure/persistence/db.go
+++ b/server/internal/db/infrastructure/persistence/db.go
@@ -4,6 +4,7 @@ import (
 	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/internal/db/domain/repository"
 	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/gormx"
 	"mayfly-go/pkg/model"
 )
 
@@ -16,7 +17,8 @@ func newDbRepo() repository.Db {
 }
 
 // 分页获取数据库信息列表
-func (d *dbRepoImpl) GetDbList(condition *entity.DbQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *dbRepoImpl) GetDbList(condition *entity.DbQuery, orderBy ...string) (*model.PageResult[*entity.DbListPO], error) {
 	pd := model.NewCond().Eq("instance_id", condition.InstanceId).In("code", condition.Codes).Eq("id", condition.Id)
-	return d.PageByCondToAny(pd, pageParam, toEntity)
+	list := []*entity.DbListPO{}
+	return gormx.PageByCond(d.GetModel(), pd, condition.PageParam, list)
 }
diff --git a/server/internal/db/infrastructure/persistence/db_backup.go b/server/internal/db/infrastructure/persistence/db_backup.go
deleted file mode 100644
index 50cdc0d3..00000000
--- a/server/internal/db/infrastructure/persistence/db_backup.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package persistence
-
-import (
-	"context"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/gormx"
-	"mayfly-go/pkg/model"
-	"slices"
-)
-
-var _ repository.DbBackup = (*dbBackupRepoImpl)(nil)
-
-type dbBackupRepoImpl struct {
-	dbJobBaseImpl[*entity.DbBackup]
-}
-
-func NewDbBackupRepo() repository.DbBackup {
-	dr := &dbBackupRepoImpl{}
-	return dr
-}
-
-func (d *dbBackupRepoImpl) GetDbNamesWithoutBackup(instanceId uint64, dbNames []string) ([]string, error) {
-	var dbNamesWithBackup []string
-	err := global.Db.Model(d.NewModel()).
-		Where("db_instance_id = ?", instanceId).
-		Where("repeated = ?", true).
-		Scopes(gormx.UndeleteScope).
-		Pluck("db_name", &dbNamesWithBackup).
-		Error
-	if err != nil {
-		return nil, err
-	}
-	result := make([]string, 0, len(dbNames))
-	for _, name := range dbNames {
-		if !slices.Contains(dbNamesWithBackup, name) {
-			result = append(result, name)
-		}
-	}
-	return result, nil
-}
-
-func (d *dbBackupRepoImpl) ListDbInstances(enabled bool, repeated bool, instanceIds *[]uint64) error {
-	return global.Db.Model(d.NewModel()).
-		Where("enabled = ?", enabled).
-		Where("repeated = ?", repeated).
-		Scopes(gormx.UndeleteScope).
-		Distinct().
-		Pluck("db_instance_id", &instanceIds).
-		Error
-}
-
-func (d *dbBackupRepoImpl) ListToDo(jobs any) error {
-	db := global.Db.Model(d.NewModel())
-	err := db.Where("enabled = ?", true).
-		Where(db.Where("repeated = ?", true).Or("last_status <> ?", entity.DbJobSuccess)).
-		Scopes(gormx.UndeleteScope).
-		Find(jobs).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// GetPageList 分页获取数据库备份任务列表
-func (d *dbBackupRepoImpl) GetPageList(condition *entity.DbBackupQuery, pageParam *model.PageParam, toEntity any, _ ...string) (*model.PageResult[any], error) {
-	qd := model.NewCond().
-		Eq("id", condition.Id).
-		Eq0("db_instance_id", condition.DbInstanceId).
-		Eq0("repeated", condition.Repeated).
-		In0("db_name", condition.InDbNames).
-		Like("db_name", condition.DbName)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
-}
-
-// AddJob 添加数据库任务
-func (d *dbBackupRepoImpl) AddJob(ctx context.Context, jobs any) error {
-	return addJob[*entity.DbBackup](ctx, d.dbJobBaseImpl, jobs)
-}
-
-func (d *dbBackupRepoImpl) UpdateEnabled(ctx context.Context, jobId uint64, enabled bool) error {
-	cond := map[string]any{
-		"id": jobId,
-	}
-	desc := "已禁用"
-	if enabled {
-		desc = "已启用"
-	}
-	return d.UpdateByCond(ctx, map[string]any{
-		"enabled":      enabled,
-		"enabled_desc": desc,
-	}, cond)
-}
diff --git a/server/internal/db/infrastructure/persistence/db_backup_history.go b/server/internal/db/infrastructure/persistence/db_backup_history.go
deleted file mode 100644
index f4075e9d..00000000
--- a/server/internal/db/infrastructure/persistence/db_backup_history.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package persistence
-
-import (
-	"errors"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/gormx"
-	"mayfly-go/pkg/model"
-
-	"gorm.io/gorm"
-)
-
-var _ repository.DbBackupHistory = (*dbBackupHistoryRepoImpl)(nil)
-
-type dbBackupHistoryRepoImpl struct {
-	base.RepoImpl[*entity.DbBackupHistory]
-}
-
-func NewDbBackupHistoryRepo() repository.DbBackupHistory {
-	return &dbBackupHistoryRepoImpl{}
-}
-
-func (repo *dbBackupHistoryRepoImpl) GetPageList(condition *entity.DbBackupHistoryQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	qd := model.NewCond().
-		Eq("id", condition.Id).
-		Eq0("db_instance_id", condition.DbInstanceId).
-		In0("db_name", condition.InDbNames).
-		Eq("db_backup_id", condition.DbBackupId).
-		Eq("db_name", condition.DbName)
-	return repo.PageByCondToAny(qd, pageParam, toEntity)
-}
-
-func (repo *dbBackupHistoryRepoImpl) GetHistories(backupHistoryIds []uint64, toEntity any) error {
-	return global.Db.Model(repo.NewModel()).
-		Where("id in ?", backupHistoryIds).
-		Where("deleting = false").
-		Scopes(gormx.UndeleteScope).
-		Find(toEntity).
-		Error
-}
-
-func (repo *dbBackupHistoryRepoImpl) GetLatestHistoryForBinlog(instanceId uint64, dbName string, bi *entity.BinlogInfo) (*entity.DbBackupHistory, error) {
-	history := &entity.DbBackupHistory{}
-	db := global.Db
-	err := db.Model(repo.NewModel()).
-		Where("db_instance_id = ?", instanceId).
-		Where("db_name = ?", dbName).
-		Where(db.Where("binlog_sequence < ?", bi.Sequence).
-			Or(db.Where("binlog_sequence = ?", bi.Sequence).
-				Where("binlog_position <= ?", bi.Position))).
-		Where("binlog_sequence > 0").
-		Where("deleting = false").
-		Scopes(gormx.UndeleteScope).
-		Order("binlog_sequence desc, binlog_position desc").
-		First(history).Error
-	if err != nil {
-		return nil, err
-	}
-	return history, err
-}
-
-func (repo *dbBackupHistoryRepoImpl) GetEarliestHistoryForBinlog(instanceId uint64) (*entity.DbBackupHistory, bool, error) {
-	history := &entity.DbBackupHistory{}
-	db := global.Db.Model(repo.NewModel())
-	err := db.Where("db_instance_id = ?", instanceId).
-		Where("binlog_sequence > 0").
-		Where("deleting = false").
-		Scopes(gormx.UndeleteScope).
-		Order("binlog_sequence").
-		First(history).Error
-	switch {
-	case err == nil:
-		return history, true, nil
-	case errors.Is(err, gorm.ErrRecordNotFound):
-		return history, false, nil
-	default:
-		return nil, false, err
-	}
-}
-
-func (repo *dbBackupHistoryRepoImpl) UpdateDeleting(deleting bool, backupHistoryId ...uint64) (bool, error) {
-	db := global.Db.Model(repo.NewModel()).
-		Where("id in ?", backupHistoryId).
-		Where("restoring = false").
-		Scopes(gormx.UndeleteScope).
-		Update("deleting", deleting)
-	if db.Error != nil {
-		return false, db.Error
-	}
-	if db.RowsAffected != int64(len(backupHistoryId)) {
-		return false, nil
-	}
-	return true, nil
-}
-
-func (repo *dbBackupHistoryRepoImpl) UpdateRestoring(restoring bool, backupHistoryId ...uint64) (bool, error) {
-	db := global.Db.Model(repo.NewModel()).
-		Where("id in ?", backupHistoryId).
-		Where("deleting = false").
-		Scopes(gormx.UndeleteScope).
-		Update("restoring", restoring)
-	if db.Error != nil {
-		return false, db.Error
-	}
-	if db.RowsAffected != int64(len(backupHistoryId)) {
-		return false, nil
-	}
-	return true, nil
-}
-
-func (repo *dbBackupHistoryRepoImpl) ZeroBinlogInfo(backupHistoryId uint64) error {
-	return global.Db.Model(repo.NewModel()).
-		Where("id = ?", backupHistoryId).
-		Where("restoring = false").
-		Scopes(gormx.UndeleteScope).
-		Updates(&map[string]any{
-			"binlog_file_name": "",
-			"binlog_sequence":  0,
-			"binlog_position":  0,
-		}).Error
-}
diff --git a/server/internal/db/infrastructure/persistence/db_binlog.go b/server/internal/db/infrastructure/persistence/db_binlog.go
deleted file mode 100644
index 7c5a110c..00000000
--- a/server/internal/db/infrastructure/persistence/db_binlog.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package persistence
-
-import (
-	"context"
-	"fmt"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/global"
-
-	"gorm.io/gorm/clause"
-)
-
-var _ repository.DbBinlog = (*dbBinlogRepoImpl)(nil)
-
-type dbBinlogRepoImpl struct {
-	dbJobBaseImpl[*entity.DbBinlog]
-}
-
-func NewDbBinlogRepo() repository.DbBinlog {
-	return &dbBinlogRepoImpl{}
-}
-
-func (d *dbBinlogRepoImpl) AddJobIfNotExists(_ context.Context, job *entity.DbBinlog) error {
-	// todo: 如果存在已删除记录，如何处理？
-	if err := global.Db.Clauses(clause.OnConflict{DoNothing: true}).Create(job).Error; err != nil {
-		return fmt.Errorf("启动 binlog 下载失败: %w", err)
-	}
-	return nil
-}
-
-// AddJob 添加数据库任务
-func (d *dbBinlogRepoImpl) AddJob(ctx context.Context, jobs any) error {
-	panic("not implement, use AddJobIfNotExists")
-}
-
-func (d *dbBinlogRepoImpl) UpdateEnabled(_ context.Context, jobId uint64, enabled bool) error {
-	panic("not implement")
-}
diff --git a/server/internal/db/infrastructure/persistence/db_binlog_history.go b/server/internal/db/infrastructure/persistence/db_binlog_history.go
deleted file mode 100644
index 26eefdb9..00000000
--- a/server/internal/db/infrastructure/persistence/db_binlog_history.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package persistence
-
-import (
-	"context"
-	"errors"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/gormx"
-	"mayfly-go/pkg/model"
-	"time"
-
-	"gorm.io/gorm"
-)
-
-var _ repository.DbBinlogHistory = (*dbBinlogHistoryRepoImpl)(nil)
-
-type dbBinlogHistoryRepoImpl struct {
-	base.RepoImpl[*entity.DbBinlogHistory]
-}
-
-func NewDbBinlogHistoryRepo() repository.DbBinlogHistory {
-	return &dbBinlogHistoryRepoImpl{}
-}
-
-func (repo *dbBinlogHistoryRepoImpl) GetHistoryByTime(instanceId uint64, targetTime time.Time) (*entity.DbBinlogHistory, error) {
-	qc := model.NewCond().
-		Eq("db_instance_id", instanceId).
-		Le("first_event_time", targetTime).
-		OrderByDesc("first_event_time")
-	history := &entity.DbBinlogHistory{}
-	if err := repo.GetByCond(qc.Dest(history)); err != nil {
-		return nil, err
-	}
-	return history, nil
-}
-
-func (repo *dbBinlogHistoryRepoImpl) GetHistories(instanceId uint64, start, target *entity.BinlogInfo) ([]*entity.DbBinlogHistory, error) {
-	qc := model.NewCond().
-		Eq("db_instance_id", instanceId).
-		Ge("sequence", start.Sequence).
-		Le("sequence", target.Sequence).
-		OrderByAsc("sequence")
-	histories, err := repo.SelectByCond(qc)
-	if err != nil {
-		return nil, err
-	}
-	if len(histories) == 0 {
-		return nil, errors.New("未找到满足条件的 binlog 文件")
-	}
-	return histories, nil
-}
-
-func (repo *dbBinlogHistoryRepoImpl) GetLatestHistory(instanceId uint64) (*entity.DbBinlogHistory, bool, error) {
-	history := &entity.DbBinlogHistory{}
-	qc := model.NewCond().
-		Eq("db_instance_id", instanceId).
-		OrderByDesc("sequence").
-		Dest(history)
-	err := repo.GetByCond(qc)
-	switch {
-	case err == nil:
-		return history, true, nil
-	case errors.Is(err, gorm.ErrRecordNotFound):
-		return history, false, nil
-	default:
-		return nil, false, err
-	}
-}
-
-func (repo *dbBinlogHistoryRepoImpl) Upsert(_ context.Context, history *entity.DbBinlogHistory) error {
-	return gormx.Tx(func(db *gorm.DB) error {
-		old := &entity.DbBinlogHistory{}
-		err := db.Where("db_instance_id = ?", history.DbInstanceId).
-			Where("sequence = ?", history.Sequence).
-			Scopes(gormx.UndeleteScope).
-			First(old).Error
-		switch {
-		case err == nil:
-			return db.Model(old).Select("create_time", "file_size", "first_event_time", "last_event_time").Updates(history).Error
-		case errors.Is(err, gorm.ErrRecordNotFound):
-			return db.Create(history).Error
-		default:
-			return err
-		}
-	})
-}
-
-func (repo *dbBinlogHistoryRepoImpl) InsertWithBinlogFiles(ctx context.Context, instanceId uint64, binlogFiles []*entity.BinlogFile) error {
-	if len(binlogFiles) == 0 {
-		return nil
-	}
-	histories := make([]*entity.DbBinlogHistory, 0, len(binlogFiles))
-	for _, fileOnServer := range binlogFiles {
-		if !fileOnServer.Downloaded {
-			break
-		}
-		history := &entity.DbBinlogHistory{
-			CreateTime:     time.Now(),
-			FileName:       fileOnServer.Name,
-			FileSize:       fileOnServer.RemoteSize,
-			Sequence:       fileOnServer.Sequence,
-			FirstEventTime: fileOnServer.FirstEventTime,
-			LastEventTime:  fileOnServer.LastEventTime,
-			DbInstanceId:   instanceId,
-		}
-		histories = append(histories, history)
-	}
-	if len(histories) > 1 {
-		if err := repo.BatchInsert(ctx, histories[:len(histories)-1]); err != nil {
-			return err
-		}
-	}
-	if len(histories) > 0 {
-		if err := repo.Upsert(ctx, histories[len(histories)-1]); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (repo *dbBinlogHistoryRepoImpl) GetHistoriesBeforeSequence(ctx context.Context, instanceId uint64, binlogSeq int64, histories *[]*entity.DbBinlogHistory) error {
-	return global.Db.Model(repo.NewModel()).
-		Where("db_instance_id = ?", instanceId).
-		Where("sequence < ?", binlogSeq).
-		Scopes(gormx.UndeleteScope).
-		Order("id").
-		Find(histories).
-		Error
-}
diff --git a/server/internal/db/infrastructure/persistence/db_data_sync.go b/server/internal/db/infrastructure/persistence/db_data_sync.go
index 462d233d..202fe28b 100644
--- a/server/internal/db/infrastructure/persistence/db_data_sync.go
+++ b/server/internal/db/infrastructure/persistence/db_data_sync.go
@@ -16,24 +16,24 @@ func newDataSyncTaskRepo() repository.DataSyncTask {
 }
 
 // 分页获取数据库信息列表
-func (d *dataSyncTaskRepoImpl) GetTaskList(condition *entity.DataSyncTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *dataSyncTaskRepoImpl) GetTaskList(condition *entity.DataSyncTaskQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncTask], error) {
 	qd := model.NewCond().
 		Like("task_name", condition.Name).
 		Eq("status", condition.Status)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
+	return d.PageByCond(qd, condition.PageParam)
 }
 
 type dataSyncLogRepoImpl struct {
 	base.RepoImpl[*entity.DataSyncLog]
 }
 
-// 分页获取数据库信息列表
-func (d *dataSyncLogRepoImpl) GetTaskLogList(condition *entity.DataSyncLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	qd := model.NewCond().
-		Eq("task_id", condition.TaskId)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
-}
-
 func newDataSyncLogRepo() repository.DataSyncLog {
 	return &dataSyncLogRepoImpl{}
 }
+
+// 分页获取数据库信息列表
+func (d *dataSyncLogRepoImpl) GetTaskLogList(condition *entity.DataSyncLogQuery, orderBy ...string) (*model.PageResult[*entity.DataSyncLog], error) {
+	qd := model.NewCond().
+		Eq("task_id", condition.TaskId)
+	return d.PageByCond(qd, condition.PageParam)
+}
diff --git a/server/internal/db/infrastructure/persistence/db_job_base.go b/server/internal/db/infrastructure/persistence/db_job_base.go
deleted file mode 100644
index 805c3cb4..00000000
--- a/server/internal/db/infrastructure/persistence/db_job_base.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package persistence
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/gormx"
-	"reflect"
-
-	"gorm.io/gorm"
-)
-
-var _ repository.DbJobBase[entity.DbJob] = (*dbJobBaseImpl[entity.DbJob])(nil)
-
-type dbJobBaseImpl[T entity.DbJob] struct {
-	base.RepoImpl[T]
-}
-
-func (d *dbJobBaseImpl[T]) UpdateLastStatus(ctx context.Context, job entity.DbJob) error {
-	return d.UpdateById(ctx, job.(T), "last_status", "last_result", "last_time")
-}
-
-func addJob[T entity.DbJob](ctx context.Context, repo dbJobBaseImpl[T], jobs any) error {
-	// refactor jobs from any to []T
-	return gormx.Tx(func(db *gorm.DB) error {
-		var instanceId uint64
-		var dbNames []string
-		reflectValue := reflect.ValueOf(jobs)
-		var plural bool
-		switch reflectValue.Kind() {
-		case reflect.Slice, reflect.Array:
-			plural = true
-			reflectLen := reflectValue.Len()
-			dbNames = make([]string, 0, reflectLen)
-			for i := 0; i < reflectLen; i++ {
-				job := reflectValue.Index(i).Interface().(entity.DbJob)
-				if instanceId == 0 {
-					instanceId = job.GetInstanceId()
-				}
-				if job.GetInstanceId() != instanceId {
-					return errors.New("不支持同时为多个数据库实例添加数据库任务")
-				}
-				if job.GetInterval() == 0 {
-					// 单次执行的数据库任务可重复创建
-					continue
-				}
-				dbNames = append(dbNames, job.GetDbName())
-			}
-		default:
-			job := jobs.(entity.DbJob)
-			instanceId = job.GetInstanceId()
-			if job.GetInterval() > 0 {
-				dbNames = append(dbNames, job.GetDbName())
-			}
-		}
-
-		var res []string
-		err := db.Model(repo.NewModel()).Select("db_name").
-			Where("db_instance_id = ?", instanceId).
-			Where("db_name in ?", dbNames).
-			Where("repeated = true").
-			Scopes(gormx.UndeleteScope).
-			Find(&res).Error
-		if err != nil {
-			return err
-		}
-		if len(res) > 0 {
-			return errors.New(fmt.Sprintf("数据库任务已存在: %v", res))
-		}
-		if plural {
-			return repo.BatchInsertWithDb(ctx, db, jobs.([]T))
-		}
-		return repo.InsertWithDb(ctx, db, jobs.(T))
-	})
-}
diff --git a/server/internal/db/infrastructure/persistence/db_restore.go b/server/internal/db/infrastructure/persistence/db_restore.go
deleted file mode 100644
index 7606736b..00000000
--- a/server/internal/db/infrastructure/persistence/db_restore.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package persistence
-
-import (
-	"context"
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/gormx"
-	"mayfly-go/pkg/model"
-	"slices"
-)
-
-var _ repository.DbRestore = (*dbRestoreRepoImpl)(nil)
-
-type dbRestoreRepoImpl struct {
-	dbJobBaseImpl[*entity.DbRestore]
-}
-
-func NewDbRestoreRepo() repository.DbRestore {
-	return &dbRestoreRepoImpl{}
-}
-
-func (d *dbRestoreRepoImpl) GetDbNamesWithoutRestore(instanceId uint64, dbNames []string) ([]string, error) {
-	var dbNamesWithRestore []string
-	err := global.Db.Model(d.NewModel()).
-		Where("db_instance_id = ?", instanceId).
-		Where("repeated = ?", true).
-		Scopes(gormx.UndeleteScope).
-		Pluck("db_name", &dbNamesWithRestore).
-		Error
-	if err != nil {
-		return nil, err
-	}
-
-	result := make([]string, 0, len(dbNames))
-	for _, name := range dbNames {
-		if !slices.Contains(dbNamesWithRestore, name) {
-			result = append(result, name)
-		}
-	}
-	return result, nil
-}
-
-func (d *dbRestoreRepoImpl) ListToDo(jobs any) error {
-	db := global.Db.Model(d.NewModel())
-	err := db.Where("enabled = ?", true).
-		Where(db.Where("repeated = ?", true).Or("last_status <> ?", entity.DbJobSuccess)).
-		Scopes(gormx.UndeleteScope).
-		Find(jobs).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// GetPageList 分页获取数据库备份任务列表
-func (d *dbRestoreRepoImpl) GetPageList(condition *entity.DbRestoreQuery, pageParam *model.PageParam, toEntity any, _ ...string) (*model.PageResult[any], error) {
-	qd := model.NewCond().
-		Eq("id", condition.Id).
-		Eq0("db_instance_id", condition.DbInstanceId).
-		Eq0("repeated", condition.Repeated).
-		In0("db_name", condition.InDbNames).
-		Like("db_name", condition.DbName)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
-}
-
-func (d *dbRestoreRepoImpl) GetEnabledRestores(toEntity any, backupHistoryId ...uint64) error {
-	return global.Db.Model(d.NewModel()).
-		Select("id", "db_backup_history_id", "last_status", "last_result", "last_time").
-		Where("db_backup_history_id in ?", backupHistoryId).
-		Where("enabled = true").
-		Scopes(gormx.UndeleteScope).
-		Order("id DESC").
-		Find(toEntity).
-		Error
-}
-
-// AddJob 添加数据库任务
-func (d *dbRestoreRepoImpl) AddJob(ctx context.Context, jobs any) error {
-	return addJob[*entity.DbRestore](ctx, d.dbJobBaseImpl, jobs)
-}
-
-func (d *dbRestoreRepoImpl) UpdateEnabled(ctx context.Context, jobId uint64, enabled bool) error {
-	cond := map[string]any{
-		"id": jobId,
-	}
-	desc := "已禁用"
-	if enabled {
-		desc = "已启用"
-	}
-	return d.UpdateByCond(ctx, map[string]any{
-		"enabled":      enabled,
-		"enabled_desc": desc,
-	}, cond)
-}
diff --git a/server/internal/db/infrastructure/persistence/db_restore_history.go b/server/internal/db/infrastructure/persistence/db_restore_history.go
deleted file mode 100644
index feba1d3c..00000000
--- a/server/internal/db/infrastructure/persistence/db_restore_history.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package persistence
-
-import (
-	"mayfly-go/internal/db/domain/entity"
-	"mayfly-go/internal/db/domain/repository"
-	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/model"
-)
-
-var _ repository.DbRestoreHistory = (*dbRestoreHistoryRepoImpl)(nil)
-
-type dbRestoreHistoryRepoImpl struct {
-	base.RepoImpl[*entity.DbRestoreHistory]
-}
-
-func NewDbRestoreHistoryRepo() repository.DbRestoreHistory {
-	return &dbRestoreHistoryRepoImpl{}
-}
-
-func (d *dbRestoreHistoryRepoImpl) GetDbRestoreHistories(condition *entity.DbRestoreHistoryQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	qd := model.NewCond().
-		Eq("id", condition.Id).
-		Eq("db_backup_id", condition.DbRestoreId)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
-
-}
diff --git a/server/internal/db/infrastructure/persistence/db_sql_exec.go b/server/internal/db/infrastructure/persistence/db_sql_exec.go
index 693a4d01..88a0fa89 100644
--- a/server/internal/db/infrastructure/persistence/db_sql_exec.go
+++ b/server/internal/db/infrastructure/persistence/db_sql_exec.go
@@ -16,7 +16,7 @@ func newDbSqlExecRepo() repository.DbSqlExec {
 }
 
 // 分页获取
-func (d *dbSqlExecRepoImpl) GetPageList(condition *entity.DbSqlExecQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *dbSqlExecRepoImpl) GetPageList(condition *entity.DbSqlExecQuery, orderBy ...string) (*model.PageResult[*entity.DbSqlExec], error) {
 	qd := model.NewCond().
 		Eq("db_id", condition.DbId).
 		Eq("`table`", condition.Table).
@@ -25,5 +25,5 @@ func (d *dbSqlExecRepoImpl) GetPageList(condition *entity.DbSqlExecQuery, pagePa
 		Eq("flow_biz_key", condition.FlowBizKey).
 		In("status", condition.Status).
 		RLike("db", condition.Db).OrderBy(orderBy...)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
+	return d.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/db/infrastructure/persistence/db_transfer.go b/server/internal/db/infrastructure/persistence/db_transfer.go
index 7eeec1da..3204e919 100644
--- a/server/internal/db/infrastructure/persistence/db_transfer.go
+++ b/server/internal/db/infrastructure/persistence/db_transfer.go
@@ -16,11 +16,11 @@ func newDbTransferTaskRepo() repository.DbTransferTask {
 }
 
 // 分页获取数据库信息列表
-func (d *dbTransferTaskRepoImpl) GetTaskList(condition *entity.DbTransferTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *dbTransferTaskRepoImpl) GetTaskList(condition *entity.DbTransferTaskQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferTask], error) {
 	qd := model.NewCond().
 		Like("task_name", condition.Name).
 		Eq("status", condition.Status).
 		Eq("cron_able", condition.CronAble)
 	//Eq("status", condition.Status)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
+	return d.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/db/infrastructure/persistence/db_transfer_file.go b/server/internal/db/infrastructure/persistence/db_transfer_file.go
index 3e432fd9..f398cd63 100644
--- a/server/internal/db/infrastructure/persistence/db_transfer_file.go
+++ b/server/internal/db/infrastructure/persistence/db_transfer_file.go
@@ -16,10 +16,10 @@ func newDbTransferFileRepo() repository.DbTransferFile {
 }
 
 // 分页获取数据库信息列表
-func (d *dbTransferFileRepoImpl) GetPageList(condition *entity.DbTransferFileQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *dbTransferFileRepoImpl) GetPageList(condition *entity.DbTransferFileQuery, orderBy ...string) (*model.PageResult[*entity.DbTransferFile], error) {
 	qd := model.NewCond().
 		Eq("task_id", condition.TaskId).
 		OrderByDesc("create_time")
 	//Eq("status", condition.Status)
-	return d.PageByCondToAny(qd, pageParam, toEntity)
+	return d.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/db/infrastructure/persistence/instance.go b/server/internal/db/infrastructure/persistence/instance.go
index bdfac854..0204d554 100644
--- a/server/internal/db/infrastructure/persistence/instance.go
+++ b/server/internal/db/infrastructure/persistence/instance.go
@@ -16,7 +16,7 @@ func NewInstanceRepo() repository.Instance {
 }
 
 // 分页获取数据库信息列表
-func (d *instanceRepoImpl) GetInstanceList(condition *entity.InstanceQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *instanceRepoImpl) GetInstanceList(condition *entity.InstanceQuery, orderBy ...string) (*model.PageResult[*entity.DbInstance], error) {
 	qd := model.NewCond().
 		Eq("id", condition.Id).
 		Eq("host", condition.Host).
@@ -30,5 +30,5 @@ func (d *instanceRepoImpl) GetInstanceList(condition *entity.InstanceQuery, page
 		qd.And("host like ? or name like ? or code like ?", keyword, keyword, keyword)
 	}
 
-	return d.PageByCondToAny(qd, pageParam, toEntity)
+	return d.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/db/infrastructure/persistence/persistence.go b/server/internal/db/infrastructure/persistence/persistence.go
index 1e269883..9d18acc1 100644
--- a/server/internal/db/infrastructure/persistence/persistence.go
+++ b/server/internal/db/infrastructure/persistence/persistence.go
@@ -13,11 +13,4 @@ func InitIoc() {
 	ioc.Register(newDataSyncLogRepo(), ioc.WithComponentName("DbDataSyncLogRepo"))
 	ioc.Register(newDbTransferTaskRepo(), ioc.WithComponentName("DbTransferTaskRepo"))
 	ioc.Register(newDbTransferFileRepo(), ioc.WithComponentName("DbTransferFileRepo"))
-
-	ioc.Register(NewDbBackupRepo(), ioc.WithComponentName("DbBackupRepo"))
-	ioc.Register(NewDbBackupHistoryRepo(), ioc.WithComponentName("DbBackupHistoryRepo"))
-	ioc.Register(NewDbRestoreRepo(), ioc.WithComponentName("DbRestoreRepo"))
-	ioc.Register(NewDbRestoreHistoryRepo(), ioc.WithComponentName("DbRestoreHistoryRepo"))
-	ioc.Register(NewDbBinlogRepo(), ioc.WithComponentName("DbBinlogRepo"))
-	ioc.Register(NewDbBinlogHistoryRepo(), ioc.WithComponentName("DbBinlogHistoryRepo"))
 }
diff --git a/server/internal/db/init/terminate.go b/server/internal/db/init/terminate.go
index ac026c30..41aa8412 100644
--- a/server/internal/db/init/terminate.go
+++ b/server/internal/db/init/terminate.go
@@ -1,23 +1,10 @@
 package init
 
-import "mayfly-go/internal/db/application"
-
 // 终止进程时的处理函数
 func Terminate() {
 	closeDbTasks()
 }
 
 func closeDbTasks() {
-	restoreApp := application.GetDbRestoreApp()
-	if restoreApp != nil {
-		restoreApp.Close()
-	}
-	binlogApp := application.GetDbBinlogApp()
-	if binlogApp != nil {
-		binlogApp.Close()
-	}
-	backupApp := application.GetDbBackupApp()
-	if backupApp != nil {
-		backupApp.Close()
-	}
+
 }
diff --git a/server/internal/flow/api/api.go b/server/internal/flow/api/api.go
index 091b948e..a9ae389f 100644
--- a/server/internal/flow/api/api.go
+++ b/server/internal/flow/api/api.go
@@ -5,4 +5,6 @@ import "mayfly-go/pkg/ioc"
 func InitIoc() {
 	ioc.Register(new(Procdef))
 	ioc.Register(new(Procinst))
+	ioc.Register(new(ProcinstTask))
+	ioc.Register(new(HisProcinstOp))
 }
diff --git a/server/internal/flow/api/form/procdef.go b/server/internal/flow/api/form/procdef.go
index b80d20ee..0912ce7f 100644
--- a/server/internal/flow/api/form/procdef.go
+++ b/server/internal/flow/api/form/procdef.go
@@ -14,3 +14,8 @@ type Procdef struct {
 
 	CodePaths []string `json:"codePaths"`
 }
+
+type ProcdefFlow struct {
+	Id   uint64          `json:"id" binding:"required"`
+	Flow *entity.FlowDef `json:"flow" binding:"required"`
+}
diff --git a/server/internal/flow/api/his_procinst_op.go b/server/internal/flow/api/his_procinst_op.go
new file mode 100644
index 00000000..49a2eb91
--- /dev/null
+++ b/server/internal/flow/api/his_procinst_op.go
@@ -0,0 +1,27 @@
+package api
+
+import (
+	"mayfly-go/internal/flow/application"
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/req"
+)
+
+type HisProcinstOp struct {
+	hisProcinstOpApp application.HisProcinstOp `inject:"T"`
+	procinstTaskApp  application.ProcinstTask  `inject:"T"`
+}
+
+func (p *HisProcinstOp) ReqConfs() *req.Confs {
+	reqs := [...]*req.Conf{
+		req.NewGet(":id", p.GetHisProcinstOps),
+	}
+
+	return req.NewConfs("/flow/his-procinsts-op", reqs[:]...)
+}
+
+func (p *HisProcinstOp) GetHisProcinstOps(rc *req.Ctx) {
+	res, err := p.hisProcinstOpApp.ListByCond(&entity.HisProcinstOp{ProcinstId: uint64(rc.PathParamInt("id"))})
+	biz.ErrIsNil(err)
+	rc.ResData = res
+}
diff --git a/server/internal/flow/api/procdef.go b/server/internal/flow/api/procdef.go
index b6948597..f83539c6 100644
--- a/server/internal/flow/api/procdef.go
+++ b/server/internal/flow/api/procdef.go
@@ -12,6 +12,7 @@ import (
 	tagapp "mayfly-go/internal/tag/application"
 	tagentity "mayfly-go/internal/tag/domain/entity"
 	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/structx"
@@ -36,6 +37,10 @@ func (p *Procdef) ReqConfs() *req.Confs {
 
 		req.NewPost("", p.Save).Log(req.NewLogSaveI(imsg.LogProcdefSave)).RequiredPermissionCode("flow:procdef:save"),
 
+		req.NewPost("/flowdef", p.SaveFlowDef).Log(req.NewLogSaveI(imsg.LogProcdefSave)).RequiredPermissionCode("flow:procdef:save"),
+
+		req.NewGet("/flowdef/:id", p.GetFlowDef),
+
 		req.NewDelete(":id", p.Delete).Log(req.NewLogSaveI(imsg.LogProcdefDelete)).RequiredPermissionCode("flow:procdef:del"),
 	}
 
@@ -44,15 +49,16 @@ func (p *Procdef) ReqConfs() *req.Confs {
 
 func (p *Procdef) GetProcdefPage(rc *req.Ctx) {
 	cond, page := req.BindQueryAndPage(rc, new(entity.Procdef))
-	var procdefs []*vo.Procdef
-	res, err := p.procdefApp.GetPageList(cond, page, &procdefs)
-	biz.ErrIsNil(err)
 
-	p.tagTreeRelateApp.FillTagInfo(tagentity.TagRelateTypeFlowDef, collx.ArrayMap(procdefs, func(mvo *vo.Procdef) tagentity.IRelateTag {
+	res, err := p.procdefApp.GetPageList(cond, page)
+	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.ProcdefPagePO, *vo.Procdef](res)
+
+	p.tagTreeRelateApp.FillTagInfo(tagentity.TagRelateTypeFlowDef, collx.ArrayMap(resVo.List, func(mvo *vo.Procdef) tagentity.IRelateTag {
 		return mvo
 	})...)
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (p *Procdef) GetProcdefDetail(rc *req.Ctx) {
@@ -91,6 +97,23 @@ func (a *Procdef) Save(rc *req.Ctx) {
 	}))
 }
 
+func (a *Procdef) SaveFlowDef(rc *req.Ctx) {
+	form := req.BindJsonAndValid(rc, &form.ProcdefFlow{})
+	rc.ReqParam = form
+
+	biz.ErrIsNil(a.procdefApp.SaveFlowDef(rc.MetaCtx, &dto.SaveFlowDef{
+		Id:      form.Id,
+		FlowDef: form.Flow,
+	}))
+}
+
+func (a *Procdef) GetFlowDef(rc *req.Ctx) {
+	defId := rc.PathParamInt("id")
+	procdef, err := a.procdefApp.GetById(uint64(defId))
+	biz.ErrIsNil(err)
+	rc.ResData = procdef.GetFlowDef()
+}
+
 func (p *Procdef) Delete(rc *req.Ctx) {
 	idsStr := rc.PathParam("id")
 	rc.ReqParam = idsStr
diff --git a/server/internal/flow/api/procinst.go b/server/internal/flow/api/procinst.go
index f3f58148..81f25100 100644
--- a/server/internal/flow/api/procinst.go
+++ b/server/internal/flow/api/procinst.go
@@ -1,27 +1,23 @@
 package api
 
 import (
-	"fmt"
 	"mayfly-go/internal/flow/api/form"
 	"mayfly-go/internal/flow/api/vo"
 	"mayfly-go/internal/flow/application"
 	"mayfly-go/internal/flow/application/dto"
 	"mayfly-go/internal/flow/domain/entity"
-	"mayfly-go/internal/flow/domain/repository"
 	"mayfly-go/internal/flow/imsg"
 	"mayfly-go/internal/pkg/consts"
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/req"
-	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/jsonx"
 	"mayfly-go/pkg/utils/structx"
 )
 
 type Procinst struct {
-	procinstApp application.Procinst `inject:"T"`
-	procdefApp  application.Procdef  `inject:"T"`
-
-	procinstTaskRepo repository.ProcinstTask `inject:"T"`
+	procinstApp     application.Procinst     `inject:"T"`
+	procdefApp      application.Procdef      `inject:"T"`
+	procinstTaskApp application.ProcinstTask `inject:"T"`
 }
 
 func (p *Procinst) ReqConfs() *req.Confs {
@@ -33,27 +29,19 @@ func (p *Procinst) ReqConfs() *req.Confs {
 		req.NewPost("/start", p.ProcinstStart).Log(req.NewLogSaveI(imsg.LogProcinstStart)),
 
 		req.NewPost("/:id/cancel", p.ProcinstCancel).Log(req.NewLogSaveI(imsg.LogProcinstCancel)),
-
-		req.NewGet("/tasks", p.GetTasks),
-
-		req.NewPost("/tasks/complete", p.CompleteTask).Log(req.NewLogSaveI(imsg.LogCompleteTask)),
-
-		req.NewPost("/tasks/reject", p.RejectTask).Log(req.NewLogSaveI(imsg.LogRejectTask)),
-
-		req.NewPost("/tasks/back", p.BackTask).Log(req.NewLogSaveI(imsg.LogBackTask)),
 	}
 
 	return req.NewConfs("/flow/procinsts", reqs[:]...)
 }
 
 func (p *Procinst) GetProcinstPage(rc *req.Ctx) {
-	cond, page := req.BindQueryAndPage(rc, new(entity.ProcinstQuery))
+	cond := req.BindQuery(rc, new(entity.ProcinstQuery))
 	// 非管理员只能获取自己申请的流程
 	if laId := rc.GetLoginAccount().Id; laId != consts.AdminId {
 		cond.CreatorId = laId
 	}
 
-	res, err := p.procinstApp.GetPageList(cond, page, new([]entity.Procinst))
+	res, err := p.procinstApp.GetPageList(cond)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
@@ -83,52 +71,14 @@ func (p *Procinst) GetProcinstDetail(rc *req.Ctx) {
 
 	// 流程定义信息
 	procdef, _ := p.procdefApp.GetById(pi.ProcdefId)
+	procdef.FlowDef = "" // 流程定义信息不需要返回
 	pivo.Procdef = procdef
 
 	// 流程实例任务信息
-	instTasks, err := p.procinstTaskRepo.SelectByCond(&entity.ProcinstTask{ProcinstId: pi.Id})
+	taskQuery := &entity.ProcinstTaskQuery{ProcinstId: pi.Id}
+	tasks, err := p.procinstTaskApp.GetTasks(rc.MetaCtx, taskQuery)
 	biz.ErrIsNil(err)
-	pivo.ProcinstTasks = instTasks
+	pivo.ProcinstTasks = tasks.List
 
 	rc.ResData = pivo
 }
-
-func (p *Procinst) GetTasks(rc *req.Ctx) {
-	instTaskQuery, page := req.BindQueryAndPage(rc, new(entity.ProcinstTaskQuery))
-	if laId := rc.GetLoginAccount().Id; laId != consts.AdminId {
-		// 赋值操作人为当前登录账号
-		instTaskQuery.Assignee = fmt.Sprintf("%d", rc.GetLoginAccount().Id)
-	}
-
-	taskVos := new([]*vo.ProcinstTask)
-	res, err := p.procinstApp.GetProcinstTasks(instTaskQuery, page, taskVos)
-	biz.ErrIsNil(err)
-
-	instIds := collx.ArrayMap[*vo.ProcinstTask, uint64](*taskVos, func(val *vo.ProcinstTask) uint64 { return val.ProcinstId })
-	insts, _ := p.procinstApp.GetByIds(instIds)
-	instId2Inst := collx.ArrayToMap[*entity.Procinst, uint64](insts, func(val *entity.Procinst) uint64 { return val.Id })
-
-	// 赋值任务对应的流程实例
-	for _, task := range *taskVos {
-		task.Procinst = instId2Inst[task.ProcinstId]
-	}
-	rc.ResData = res
-}
-
-func (p *Procinst) CompleteTask(rc *req.Ctx) {
-	auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
-	rc.ReqParam = auditForm
-	biz.ErrIsNil(p.procinstApp.CompleteTask(rc.MetaCtx, auditForm.Id, auditForm.Remark))
-}
-
-func (p *Procinst) RejectTask(rc *req.Ctx) {
-	auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
-	rc.ReqParam = auditForm
-	biz.ErrIsNil(p.procinstApp.RejectTask(rc.MetaCtx, auditForm.Id, auditForm.Remark))
-}
-
-func (p *Procinst) BackTask(rc *req.Ctx) {
-	auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
-	rc.ReqParam = auditForm
-	biz.ErrIsNil(p.procinstApp.BackTask(rc.MetaCtx, auditForm.Id, auditForm.Remark))
-}
diff --git a/server/internal/flow/api/procinst_task.go b/server/internal/flow/api/procinst_task.go
new file mode 100644
index 00000000..1ec63530
--- /dev/null
+++ b/server/internal/flow/api/procinst_task.go
@@ -0,0 +1,111 @@
+package api
+
+import (
+	"fmt"
+	"mayfly-go/internal/flow/api/form"
+	"mayfly-go/internal/flow/api/vo"
+	"mayfly-go/internal/flow/application"
+	"mayfly-go/internal/flow/application/dto"
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/imsg"
+	"mayfly-go/internal/pkg/consts"
+	sysapp "mayfly-go/internal/sys/application"
+	sysentity "mayfly-go/internal/sys/domain/entity"
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/contextx"
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/req"
+	"mayfly-go/pkg/utils/collx"
+)
+
+type ProcinstTask struct {
+	procinstApp     application.Procinst     `inject:"T"`
+	procinstTaskApp application.ProcinstTask `inject:"T"`
+
+	roleApp sysapp.Role `inject:"T"`
+}
+
+func (p *ProcinstTask) ReqConfs() *req.Confs {
+	reqs := [...]*req.Conf{
+
+		req.NewGet("/tasks", p.GetTasks),
+
+		req.NewPost("/tasks/pass", p.PassTask).Log(req.NewLogSaveI(imsg.LogCompleteTask)),
+
+		req.NewPost("/tasks/reject", p.RejectTask).Log(req.NewLogSaveI(imsg.LogRejectTask)),
+
+		req.NewPost("/tasks/back", p.BackTask).Log(req.NewLogSaveI(imsg.LogBackTask)),
+	}
+
+	return req.NewConfs("/flow/procinsts", reqs[:]...)
+}
+
+func (p *ProcinstTask) GetTasks(rc *req.Ctx) {
+	instTaskQuery := req.BindQuery(rc, new(entity.ProcinstTaskQuery))
+	if laId := rc.GetLoginAccount().Id; laId != consts.AdminId {
+		// 赋值操作人为当前登录账号
+		instTaskQuery.Assignee = fmt.Sprintf("%d", rc.GetLoginAccount().Id)
+	}
+	ctx := rc.MetaCtx
+	// 代办任务
+	if instTaskQuery.Status == entity.ProcinstTaskStatusProcess {
+		instTaskQuery.Candidates = p.GetLaCandidates(contextx.GetLoginAccount(ctx))
+	} else {
+		// 我的任务
+		instTaskQuery.Handler = contextx.GetLoginAccount(ctx).Username
+	}
+
+	res, err := p.procinstTaskApp.GetTasks(rc.MetaCtx, instTaskQuery)
+	biz.ErrIsNil(err)
+
+	resVos := model.PageResultConv[*entity.ProcinstTaskPO, *vo.ProcinstTask](res)
+	taskVos := resVos.List
+
+	instIds := collx.ArrayMap[*vo.ProcinstTask, uint64](taskVos, func(val *vo.ProcinstTask) uint64 { return val.ProcinstId })
+	insts, _ := p.procinstApp.GetByIds(instIds)
+	instId2Inst := collx.ArrayToMap[*entity.Procinst, uint64](insts, func(val *entity.Procinst) uint64 { return val.Id })
+
+	// 赋值任务对应的流程实例
+	for _, task := range taskVos {
+		task.Procinst = instId2Inst[task.ProcinstId]
+	}
+
+	rc.ResData = resVos
+}
+
+func (p *ProcinstTask) PassTask(rc *req.Ctx) {
+	auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
+	rc.ReqParam = auditForm
+
+	la := rc.GetLoginAccount()
+	op := dto.UserTaskOp{TaskId: auditForm.Id, Remark: auditForm.Remark, Handler: la.Username}
+	op.Candidate = p.GetLaCandidates(la)
+	biz.ErrIsNil(p.procinstTaskApp.PassTask(rc.MetaCtx, op))
+}
+
+func (p *ProcinstTask) RejectTask(rc *req.Ctx) {
+	auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
+	rc.ReqParam = auditForm
+
+	la := rc.GetLoginAccount()
+	op := dto.UserTaskOp{TaskId: auditForm.Id, Remark: auditForm.Remark, Handler: la.Username}
+	op.Candidate = p.GetLaCandidates(la)
+	biz.ErrIsNil(p.procinstTaskApp.RejectTask(rc.MetaCtx, op))
+}
+
+func (p *ProcinstTask) BackTask(rc *req.Ctx) {
+	auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
+	rc.ReqParam = auditForm
+	biz.ErrIsNil(p.procinstTaskApp.BackTask(rc.MetaCtx, dto.UserTaskOp{TaskId: auditForm.Id, Remark: auditForm.Remark}))
+}
+
+func (p *ProcinstTask) GetLaCandidates(la *model.LoginAccount) []string {
+	candidates := []string{fmt.Sprintf("%d", la.Id)}
+
+	roles, err := p.roleApp.GetAccountRoles(la.Id)
+	if err == nil {
+		candidates = append(candidates, collx.ArrayMap(roles, func(val *sysentity.AccountRole) string { return fmt.Sprintf("role:%d", val.RoleId) })...)
+	}
+
+	return candidates
+}
diff --git a/server/internal/flow/api/vo/procinst.go b/server/internal/flow/api/vo/procinst.go
index a7ccba9e..37848d9c 100644
--- a/server/internal/flow/api/vo/procinst.go
+++ b/server/internal/flow/api/vo/procinst.go
@@ -10,32 +10,33 @@ type ProcinstVO struct {
 	ProcdefId   uint64 `json:"procdefId"`   // 流程定义id
 	ProcdefName string `json:"procdefName"` // 流程定义名称
 
-	BizType      string     `json:"bizType"`      // 业务类型
-	BizKey       string     `json:"bizKey"`       // 业务key
-	BizForm      string     `json:"bizForm"`      // 业务form
-	BizStatus    int8       `json:"bizStatus"`    // 业务状态
-	BizHandleRes string     `json:"bizHandleRes"` // 业务处理结果
-	TaskKey      string     `json:"taskKey"`      // 当前任务key
-	Remark       string     `json:"remark"`
-	Status       int8       `json:"status"`
-	EndTime      *time.Time `json:"endTime"`
-	Duration     int64      `json:"duration"` // 持续时间（开始到结束）
+	BizType      string `json:"bizType"`      // 业务类型
+	BizKey       string `json:"bizKey"`       // 业务key
+	BizForm      string `json:"bizForm"`      // 业务form
+	BizStatus    int8   `json:"bizStatus"`    // 业务状态
+	BizHandleRes string `json:"bizHandleRes"` // 业务处理结果
+	TaskKey      string `json:"taskKey"`      // 当前任务key
+
+	FlowDef  string     `json:"flowDef"` // 流程定义json
+	Remark   string     `json:"remark"`
+	Status   int8       `json:"status"`
+	EndTime  *time.Time `json:"endTime"`
+	Duration int64      `json:"duration"` // 持续时间（开始到结束）
 
 	Creator    string     `json:"creator"`
 	CreatorId  uint64     `json:"creatorId"`
 	CreateTime *time.Time `json:"createTime"`
 	UpdateTime *time.Time `json:"updateTime"`
 
-	Procdef       *entity.Procdef        `json:"procdef"`
-	ProcinstTasks []*entity.ProcinstTask `json:"procinstTasks"`
+	Procdef       *entity.Procdef          `json:"procdef"`
+	ProcinstTasks []*entity.ProcinstTaskPO `json:"procinstTasks"`
 }
 
 type ProcinstTask struct {
 	Id         uint64 `json:"id"`
 	ProcinstId uint64 `json:"procinstId"` // 流程实例id
-	TaskKey    string `json:"taskKey"`    // 当前任务key
-	TaskName   string `json:"taskName"`   // 当前任务名称
-	Assignee   string `json:"assignee"`   // 分配到该任务的用户
+	NodeKey    string `json:"nodeKey"`    // 当前任务key
+	NodeName   string `json:"nodeName"`   // 当前任务名称
 
 	Status     entity.ProcinstTaskStatus `json:"status"` // 状态
 	Remark     string                    `json:"remark"`
diff --git a/server/internal/flow/application/application.go b/server/internal/flow/application/application.go
index 96ea39a5..defb5c89 100644
--- a/server/internal/flow/application/application.go
+++ b/server/internal/flow/application/application.go
@@ -7,4 +7,33 @@ import (
 func InitIoc() {
 	ioc.Register(new(procdefAppImpl), ioc.WithComponentName("ProcdefApp"))
 	ioc.Register(new(procinstAppImpl), ioc.WithComponentName("ProcinstApp"))
+	ioc.Register(new(executionAppImpl), ioc.WithComponentName("ExecutionApp"))
+
+	ioc.Register(new(procinstTaskAppImpl), ioc.WithComponentName("ProcinstTaskApp"))
+	ioc.Register(new(hisProcinstOpAppImpl), ioc.WithComponentName("HisProcinstOpApp"))
+}
+
+func Init() {
+	GetExecutionApp().Init()
+	GetProcinstTaskApp().Init()
+}
+
+func GetProcdefApp() Procdef {
+	return ioc.Get[Procdef]("ProcdefApp")
+}
+
+func GetProcinstApp() Procinst {
+	return ioc.Get[Procinst]("ProcinstApp")
+}
+
+func GetExecutionApp() Execution {
+	return ioc.Get[Execution]("ExecutionApp")
+}
+
+func GetHisProcinstOpApp() HisProcinstOp {
+	return ioc.Get[HisProcinstOp]("HisProcinstOpApp")
+}
+
+func GetProcinstTaskApp() ProcinstTask {
+	return ioc.Get[ProcinstTask]("ProcinstTaskApp")
 }
diff --git a/server/internal/flow/application/const.go b/server/internal/flow/application/const.go
index 0c103bfe..94bb68cd 100644
--- a/server/internal/flow/application/const.go
+++ b/server/internal/flow/application/const.go
@@ -2,4 +2,5 @@ package application
 
 const (
 	FlowTaskNotifyBizKey = "flow:task:notify" // 工单任务处理通知
+
 )
diff --git a/server/internal/flow/application/dto/dto.go b/server/internal/flow/application/dto/dto.go
index 7e6d5fba..3a345050 100644
--- a/server/internal/flow/application/dto/dto.go
+++ b/server/internal/flow/application/dto/dto.go
@@ -8,6 +8,11 @@ type SaveProcdef struct {
 	CodePaths []string
 }
 
+type SaveFlowDef struct {
+	Id      uint64
+	FlowDef *entity.FlowDef // 消息模板id
+}
+
 // 启动流程实例请求入参
 type StarProc struct {
 	BizType string // 业务类型
diff --git a/server/internal/flow/application/dto/task.go b/server/internal/flow/application/dto/task.go
new file mode 100644
index 00000000..f572f5e6
--- /dev/null
+++ b/server/internal/flow/application/dto/task.go
@@ -0,0 +1,12 @@
+package dto
+
+import "mayfly-go/pkg/utils/collx"
+
+// UserTaskOp 用户任务操作
+type UserTaskOp struct {
+	TaskId    uint64   // 任务id
+	Candidate []string // 任务处理候选人
+	Remark    string   // 备注
+	Vars      collx.M  // 任务变量
+	Handler   string   // 处理人
+}
diff --git a/server/internal/flow/application/event.go b/server/internal/flow/application/event.go
new file mode 100644
index 00000000..b4cff9a6
--- /dev/null
+++ b/server/internal/flow/application/event.go
@@ -0,0 +1,11 @@
+package application
+
+import "mayfly-go/pkg/eventbus"
+
+var flowEventBus eventbus.Bus[any] = eventbus.New[any]()
+
+const (
+	EventTopicFlowProcinstCreate    = "flow:procinst:create"    // 流程实例创建事件
+	EventTopicFlowProcinstCancel    = "flow:procinst:cancel"    // 流程实例取消事件
+	EventTopicFlowProcinstCompleted = "flow:procinst:completed" // 流程实例完成事件
+)
diff --git a/server/internal/flow/application/execution.go b/server/internal/flow/application/execution.go
new file mode 100644
index 00000000..d371a5a3
--- /dev/null
+++ b/server/internal/flow/application/execution.go
@@ -0,0 +1,170 @@
+package application
+
+import (
+	"context"
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/errorx"
+	"mayfly-go/pkg/eventbus"
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
+)
+
+type Execution interface {
+	base.App[*entity.Execution]
+
+	Init()
+
+	// CreateExecution 创建执行流(初始化)
+	CreateExecution(ctx context.Context, procinst *entity.Procinst) error
+
+	// ContinueExecution 推进执行流继续执行后续节点
+	ContinueExecution(ctx *ExecutionCtx) error
+
+	// MoveTo 移动执行流到指定节点
+	MoveTo(ctx *ExecutionCtx, node *entity.FlowNode) error
+
+	CreateChildExecution(context.Context, *entity.Execution) (*entity.Execution, error)
+
+	// CancelExecution 取消流程实例的所有执行流
+	CancelExecution(ctx context.Context, procinstId uint64) error
+}
+
+type executionAppImpl struct {
+	base.AppImpl[*entity.Execution, repository.Execution]
+
+	hisProcinstOpApp HisProcinstOp `inject:"T"`
+}
+
+var _ (Execution) = (*executionAppImpl)(nil)
+
+func (e *executionAppImpl) Init() {
+	nodeBehaviorRegistry.Register(&StartNodeBehavior{})
+	nodeBehaviorRegistry.Register(&EndNodeBehavior{})
+	nodeBehaviorRegistry.Register(&UserTaskNodeBehavior{})
+
+	const subId = "ExecutionApp"
+
+	flowEventBus.Subscribe(EventTopicFlowProcinstCreate, subId, func(ctx context.Context, event *eventbus.Event[any]) error {
+		procinst := event.Val.(*entity.Procinst)
+		return e.CreateExecution(ctx, procinst)
+	})
+
+	flowEventBus.Subscribe(EventTopicFlowProcinstCancel, subId, func(ctx context.Context, event *eventbus.Event[any]) error {
+		procinstId := event.Val.(uint64)
+		return e.CancelExecution(ctx, procinstId)
+	})
+
+}
+
+func (e *executionAppImpl) CreateExecution(ctx context.Context, procinst *entity.Procinst) error {
+	flowDef := procinst.GetFlowDef()
+	startNodes := flowDef.GetNodeByType(FlowNodeTypeStart)
+	if len(startNodes) == 0 || len(startNodes) > 1 {
+		return errorx.NewBiz("start node not found or more than one")
+	}
+	startNode := startNodes[0]
+
+	// 创建执行流
+	execution := &entity.Execution{
+		ProcinstId:   procinst.Id,
+		ParentId:     0,
+		NodeKey:      startNode.Key,
+		NodeName:     startNode.Name,
+		NodeType:     startNode.Type,
+		State:        entity.ExectionStateActive,
+		IsConcurrent: -1,
+	}
+
+	return e.Tx(ctx, func(ctx context.Context) error {
+		if err := e.Save(ctx, execution); err != nil {
+			return err
+		}
+		return e.executeNode(NewExecutionCtx(ctx, procinst, execution))
+	})
+}
+
+func (e *executionAppImpl) ContinueExecution(ctx *ExecutionCtx) error {
+	// 合并流程实例与执行流变量，执行流变量优先级高
+	vars := collx.MapMerge(ctx.ProcinsVars, ctx.ExecutionVars)
+
+	nextNode, err := ctx.GetNextNode(vars)
+	if err != nil {
+		return err
+	}
+
+	return e.MoveTo(ctx, nextNode)
+}
+
+func (e *executionAppImpl) MoveTo(ctx *ExecutionCtx, nextNode *entity.FlowNode) error {
+	execution := ctx.Execution
+	if execution == nil {
+		return errorx.NewBiz("execution is nil")
+	}
+
+	// 记录当前节点结束
+	e.hisProcinstOpApp.RecordEnd(ctx, "copmpleted")
+
+	// 下一个节点为空，说明流程已结束
+	if nextNode == nil {
+		return nil
+	}
+
+	// 执行流推进下一节点，并执行节点逻辑
+	execution.NodeKey = nextNode.Key
+	execution.NodeName = nextNode.Name
+	execution.NodeType = nextNode.Type
+
+	return e.Tx(ctx, func(c context.Context) error {
+		// 更新当前执行流的最新节点信息
+		if err := e.Save(c, execution); err != nil {
+			return err
+		}
+
+		return e.executeNode(ctx)
+	})
+}
+
+func (e *executionAppImpl) CreateChildExecution(ctx context.Context, parentExection *entity.Execution) (*entity.Execution, error) {
+	execution := &entity.Execution{
+		ProcinstId: parentExection.ProcinstId,
+		ParentId:   parentExection.Id,
+	}
+
+	return execution, e.Save(ctx, execution)
+}
+
+func (e *executionAppImpl) CancelExecution(ctx context.Context, procinstId uint64) error {
+	executions, err := e.ListByCond(model.NewCond().
+		Eq("procinst_id", procinstId).
+		In("state", collx.AsArray(entity.ExectionStateActive, entity.ExectionStateSuspended)))
+
+	if err != nil {
+		return err
+	}
+
+	return e.Tx(ctx, func(ctx context.Context) error {
+		for _, execution := range executions {
+			execution.State = entity.ExectionStateTerminated
+			if err := e.UpdateById(ctx, execution); err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
+
+func (e *executionAppImpl) executeNode(ctx *ExecutionCtx) error {
+	flowNode := ctx.GetFlowNode()
+	node, err := nodeBehaviorRegistry.GetNode(flowNode.Type)
+	if err != nil {
+		return err
+	}
+
+	// 节点开始操作记录
+	e.hisProcinstOpApp.RecordStart(ctx)
+
+	// 执行节点逻辑
+	return node.Execute(ctx)
+}
diff --git a/server/internal/flow/application/his_procinst_op.go b/server/internal/flow/application/his_procinst_op.go
new file mode 100644
index 00000000..17b03b9b
--- /dev/null
+++ b/server/internal/flow/application/his_procinst_op.go
@@ -0,0 +1,68 @@
+package application
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+	"time"
+)
+
+type HisProcinstOp interface {
+	base.App[*entity.HisProcinstOp]
+
+	RecordStart(ctx *ExecutionCtx) error
+
+	RecordEnd(ctx *ExecutionCtx, remark string) error
+}
+
+type hisProcinstOpAppImpl struct {
+	base.AppImpl[*entity.HisProcinstOp, repository.HisProcinstOp]
+}
+
+var _ (HisProcinstOp) = (*hisProcinstOpAppImpl)(nil)
+
+func (h *hisProcinstOpAppImpl) RecordStart(ctx *ExecutionCtx) error {
+	execution := ctx.Execution
+	opLog := &entity.HisProcinstOp{
+		ProcinstId:  execution.ProcinstId,
+		ExecutionId: execution.Id,
+		NodeKey:     execution.NodeKey,
+		NodeType:    execution.NodeType,
+		NodeName:    execution.NodeName,
+		State:       entity.ProcinstOpStatePending,
+	}
+	ctx.HisProcinstOp = opLog
+
+	return h.Save(ctx, opLog)
+}
+
+func (h *hisProcinstOpAppImpl) RecordEnd(ctx *ExecutionCtx, remark string) error {
+	execution := ctx.Execution
+	// 从执行流上下文获取当前节点的执行记录，若存在则使用该记录即可
+	op := ctx.HisProcinstOp
+
+	if op == nil || op.State != entity.ProcinstOpStatePending {
+		op = &entity.HisProcinstOp{
+			State:       entity.ProcinstOpStatePending,
+			NodeKey:     execution.NodeKey,
+			ExecutionId: execution.Id,
+			ProcinstId:  execution.ProcinstId,
+		}
+		// 不存在未完成的节点类型
+		if err := h.GetByCond(op); err != nil {
+			return nil
+		}
+	}
+
+	now := time.Now()
+	updateOp := &entity.HisProcinstOp{
+		State:    entity.ProcinstOpStateCompleted,
+		EndTime:  &now,
+		Duration: int64(now.Sub(*op.CreateTime).Seconds()),
+		Remark:   remark,
+	}
+	updateOp.Extra = ctx.OpExtra
+	updateOp.Id = op.Id
+
+	return h.Save(ctx, updateOp)
+}
diff --git a/server/internal/flow/application/node.go b/server/internal/flow/application/node.go
new file mode 100644
index 00000000..d58319c7
--- /dev/null
+++ b/server/internal/flow/application/node.go
@@ -0,0 +1,159 @@
+package application
+
+import (
+	"context"
+	"fmt"
+	"mayfly-go/internal/flow/domain/entity"
+	"sync"
+	"time"
+
+	"mayfly-go/pkg/errorx"
+	"mayfly-go/pkg/utils/collx"
+)
+
+/******************* 执行流上下文 *******************/
+
+type ExecutionCtx struct {
+	parent context.Context
+
+	Procinst  *entity.Procinst  // 流程实例
+	Execution *entity.Execution // 当前执行流
+
+	ProcinsVars   collx.M // 流程实例变量
+	ExecutionVars collx.M // 执行流变量
+	OpExtra       collx.M // 操作额外信息，记录用户任务审批状态等
+
+	HisProcinstOp *entity.HisProcinstOp // 当前节点操作记录，用于start这种立即完成的避免在开始节点时重复查询节点信息
+
+	flowDef *entity.FlowDef
+}
+
+// GetProcinst 获取流程实例，若上下文不存在则从库中获取
+func (e *ExecutionCtx) GetProcinst() *entity.Procinst {
+	if e.Procinst == nil {
+		pi, err := GetProcinstApp().GetById(e.Execution.ProcinstId)
+		if err != nil {
+			panic(err)
+		}
+		e.Procinst = pi
+	}
+	return e.Procinst
+}
+
+// GetFlowDef 获取流程定义
+func (ec *ExecutionCtx) GetFlowDef() *entity.FlowDef {
+	if ec.flowDef == nil {
+		ec.flowDef = ec.Procinst.GetFlowDef()
+	}
+	return ec.flowDef
+
+}
+
+// GetNode 获取当前节点信息
+func (ec *ExecutionCtx) GetFlowNode() *entity.FlowNode {
+	nodes := ec.GetFlowDef().GetNodes(ec.Execution.NodeKey)
+	if len(nodes) == 0 {
+		return nil
+	}
+	return nodes[0]
+}
+
+// GetNextNodes 获取该执行流的下一个节点
+func (e *ExecutionCtx) GetNextNode(vars collx.M) (*entity.FlowNode, error) {
+	nextNodes := e.GetProcinst().GetFlowDef().GetNextNodes(e.Execution.NodeKey, vars)
+	if len(nextNodes) == 0 {
+		return nil, nil
+	}
+	if len(nextNodes) > 1 {
+		return nil, errorx.NewBiz("执行流的下一节点只允许单个节点")
+	}
+	return nextNodes[0], nil
+}
+
+/*  context.Context 实现方法  */
+
+// 实现Deadline方法（继承父上下文）
+func (ec *ExecutionCtx) Deadline() (deadline time.Time, ok bool) {
+	return ec.parent.Deadline()
+}
+
+// 实现Done方法（继承父上下文）
+func (ec *ExecutionCtx) Done() <-chan struct{} {
+	return ec.parent.Done()
+}
+
+// 实现Err方法（继承父上下文）
+func (ec *ExecutionCtx) Err() error {
+	return ec.parent.Err()
+}
+
+// 实现Value方法
+func (ec *ExecutionCtx) Value(key interface{}) interface{} {
+	return ec.parent.Value(key)
+}
+
+func NewExecutionCtx(ctx context.Context, procinst *entity.Procinst, execution *entity.Execution) *ExecutionCtx {
+	return &ExecutionCtx{
+		parent:    ctx,
+		Procinst:  procinst,
+		Execution: execution,
+
+		ExecutionVars: collx.M(execution.Vars),
+		ProcinsVars:   collx.M(procinst.Vars),
+	}
+}
+
+/******************* 节点定义 *******************/
+
+// NodeBehavior node handler
+type NodeBehavior interface {
+	// GetType 获取节点类型
+	GetType() entity.FlowNodeType
+
+	// Validate 验证节点信息
+	Validate(context.Context, *entity.FlowDef, *entity.FlowNode) error
+
+	// Execute 执行节点
+	Execute(*ExecutionCtx) error
+
+	// Leave 离开节点
+	Leave(*ExecutionCtx) error
+}
+
+type DefaultNodeBehavior struct {
+}
+
+func (h *DefaultNodeBehavior) Validate(ctx context.Context, flowDef *entity.FlowDef, node *entity.FlowNode) error {
+	return nil
+}
+
+func (h *DefaultNodeBehavior) Execute(ctx *ExecutionCtx) error {
+	return h.Leave(ctx)
+}
+
+func (h *DefaultNodeBehavior) Leave(ctx *ExecutionCtx) error {
+	// 默认执行流推进下一节点
+	return GetExecutionApp().ContinueExecution(ctx)
+}
+
+/******************* 节点注册器 *******************/
+
+type NodeBehaviorRegistry struct {
+	nodes sync.Map
+}
+
+func (r *NodeBehaviorRegistry) Register(node NodeBehavior) {
+	if _, loaded := r.nodes.LoadOrStore(node.GetType(), node); loaded {
+		panic(fmt.Sprintf("handler already registered: %s", node.GetType()))
+	}
+}
+
+func (r *NodeBehaviorRegistry) GetNode(nodeType entity.FlowNodeType) (NodeBehavior, error) {
+	val, ok := r.nodes.Load(nodeType)
+	if !ok {
+		return nil, fmt.Errorf("node handler not found: %s", nodeType)
+	}
+	return val.(NodeBehavior), nil
+}
+
+var nodeBehaviorRegistry = &NodeBehaviorRegistry{}
diff --git a/server/internal/flow/application/node_end.go b/server/internal/flow/application/node_end.go
new file mode 100644
index 00000000..f36aea35
--- /dev/null
+++ b/server/internal/flow/application/node_end.go
@@ -0,0 +1,61 @@
+package application
+
+import (
+	"context"
+	"errors"
+	"mayfly-go/internal/flow/domain/entity"
+)
+
+/******************* 结束节点 *******************/
+
+const FlowNodeTypeEnd entity.FlowNodeType = "end" // 开始节点
+
+// EndNodeBehavior 结束节点
+type EndNodeBehavior struct {
+	DefaultNodeBehavior
+}
+
+var _ NodeBehavior = (*EndNodeBehavior)(nil)
+
+func (h *EndNodeBehavior) GetType() entity.FlowNodeType {
+	return FlowNodeTypeEnd
+}
+
+func (h *EndNodeBehavior) Validate(ctx context.Context, flowDef *entity.FlowDef, node *entity.FlowNode) error {
+	// 检查是否有连线指向结束节点
+	hasIncomingEdge := false
+	for _, edge := range flowDef.Edges {
+		if edge.TargetNodeKey == node.Key {
+			hasIncomingEdge = true
+			break
+		}
+	}
+	if !hasIncomingEdge {
+		return errors.New("end node not has incoming edge")
+	}
+
+	return nil
+}
+
+func (h *EndNodeBehavior) Execute(ctx *ExecutionCtx) error {
+	// 执行流状态变为已完成
+	execution := ctx.Execution
+	execution.State = entity.ExectionStateCompleted
+
+	procinstApp := GetProcinstApp()
+	exectuionApp := GetExecutionApp()
+
+	if err := procinstApp.Tx(ctx, func(c context.Context) error {
+		if ctx.GetProcinst().Status == entity.ProcinstStatusActive {
+			if err := procinstApp.CompletedProc(c, ctx.Procinst.Id); err != nil {
+				return err
+			}
+		}
+
+		return exectuionApp.Save(c, execution)
+	}); err != nil {
+		return err
+	}
+
+	return h.Leave(ctx)
+}
diff --git a/server/internal/flow/application/node_start.go b/server/internal/flow/application/node_start.go
new file mode 100644
index 00000000..b205d19c
--- /dev/null
+++ b/server/internal/flow/application/node_start.go
@@ -0,0 +1,31 @@
+package application
+
+import (
+	"context"
+	"errors"
+	"mayfly-go/internal/flow/domain/entity"
+)
+
+/******************* 开始节点处理器 *******************/
+
+const FlowNodeTypeStart entity.FlowNodeType = "start" // 开始节点
+
+// StartNodeBehavior 开始节点处理器
+type StartNodeBehavior struct {
+	DefaultNodeBehavior
+}
+
+var _ NodeBehavior = (*StartNodeBehavior)(nil)
+
+func (h *StartNodeBehavior) GetType() entity.FlowNodeType {
+	return FlowNodeTypeStart
+}
+
+func (h *StartNodeBehavior) Validate(ctx context.Context, flowDef *entity.FlowDef, node *entity.FlowNode) error {
+	// 检查开始节点是否有一个连线指出去
+	edgesFromStartNode := flowDef.GetEdgeBySourceNode(node.Key)
+	if len(edgesFromStartNode) == 0 {
+		return errors.New("start node not has outgoing edge")
+	}
+	return nil
+}
diff --git a/server/internal/flow/application/node_usertask.go b/server/internal/flow/application/node_usertask.go
new file mode 100644
index 00000000..6f6783cc
--- /dev/null
+++ b/server/internal/flow/application/node_usertask.go
@@ -0,0 +1,124 @@
+package application
+
+import (
+	"context"
+	"mayfly-go/internal/event"
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/imsg"
+	"mayfly-go/internal/flow/infrastructure/persistence"
+	msgdto "mayfly-go/internal/msg/application/dto"
+	"mayfly-go/pkg/errorx"
+	"mayfly-go/pkg/global"
+	"strings"
+
+	"github.com/may-fly/cast"
+)
+
+/******************* 用户任务节点 *******************/
+
+const (
+	FlowNodeTypeUserTask entity.FlowNodeType = "usertask" // 用户任务
+
+	NrOfCompleted = "nrOfCompleted" // number of completed
+	NrOfAll       = "nrOfAll"       // 总候选人处理数
+)
+
+// UserTaskNode 用户任务节点
+type UserTaskNode struct {
+	entity.FlowNode
+
+	CompletionCondition string   `json:"completionCondition" form:"completionCondition"` // 完成条件，如会签{{.nrOfAll == .nrOfCompleted}}
+	Candidates          []string `json:"candidates" form:"candidates"`                   // 节点处理候选人
+}
+
+// ToUserTaskNode 将标准节点转换成用户任务节点(方便取值)
+func ToUserTaskNode(node *entity.FlowNode) *UserTaskNode {
+	return &UserTaskNode{
+		FlowNode:            *node,
+		CompletionCondition: node.GetExtraString("completionCondition"),
+		Candidates:          node.GetExtraStringSlice("candidates"),
+	}
+}
+
+type FlowNodeUserTaskApprovalMode string
+
+// UserTaskNodeBehavior 用户任务节点行为处理器
+type UserTaskNodeBehavior struct {
+	DefaultNodeBehavior
+}
+
+var _ NodeBehavior = (*UserTaskNodeBehavior)(nil)
+
+func (h *UserTaskNodeBehavior) GetType() entity.FlowNodeType {
+	return FlowNodeTypeUserTask
+}
+
+func (h *UserTaskNodeBehavior) Validate(ctx context.Context, flowDef *entity.FlowDef, node *entity.FlowNode) error {
+	usertaskNode := ToUserTaskNode(node)
+	if len(usertaskNode.Candidates) == 0 {
+		return errorx.NewBizI(ctx, imsg.ErrUserTaskNodeCandidateNotEmpty, "name", node.Name)
+	}
+
+	return nil
+}
+
+func (u *UserTaskNodeBehavior) Execute(ctx *ExecutionCtx) error {
+	flowNode := ctx.GetFlowNode()
+	usertaskNode := ToUserTaskNode(flowNode)
+
+	candidates := usertaskNode.Candidates
+	if len(candidates) == 0 {
+		return errorx.NewBiz("candidates cannot be empty")
+	}
+
+	taskApp := GetProcinstTaskApp()
+	task := &entity.ProcinstTask{
+		ProcinstId:  ctx.GetProcinst().Id,
+		ExecutionId: ctx.Execution.Id,
+		NodeKey:     flowNode.Key,
+		NodeName:    flowNode.Name,
+		NodeType:    flowNode.Type,
+		Status:      entity.ProcinstTaskStatusProcess,
+	}
+
+	// 赋值总的候选人审批数量，会签时需要该值
+	task.Vars.Set(NrOfAll, len(candidates))
+	procinst := ctx.GetProcinst()
+	procinstId := procinst.Id
+
+	// 创建审批任务与审批候选人
+	return taskApp.Tx(ctx, func(c context.Context) error {
+		if err := taskApp.Save(c, task); err != nil {
+			return err
+		}
+
+		taskCandidates := make([]*entity.ProcinstTaskCandidate, 0, len(usertaskNode.Candidates))
+		for _, candidate := range usertaskNode.Candidates {
+			taskCandidates = append(taskCandidates, &entity.ProcinstTaskCandidate{
+				ProcinstId: procinstId,
+				TaskId:     task.Id,
+				Candidate:  candidate,
+				Status:     entity.ProcinstTaskStatusProcess,
+			})
+
+			// 用户账号类型
+			if !strings.Contains(candidate, ":") {
+				// 发送通知消息
+				global.EventBus.Publish(ctx, event.EventTopicBizMsgTmplSend, msgdto.BizMsgTmplSend{
+					BizType: FlowTaskNotifyBizKey,
+					BizId:   procinst.ProcdefId,
+					Params: map[string]any{
+						"creator":        procinst.Creator,
+						"procdefName":    procinst.ProcdefName,
+						"bizKey":         procinst.BizKey,
+						"taskName":       flowNode.Name,
+						"procinstRemark": procinst.Remark,
+					},
+					ReceiverIds: []uint64{cast.ToUint64(candidate)},
+				})
+			}
+		}
+
+		return persistence.GetProcinstTaskCandidateRepo().BatchInsert(c, taskCandidates)
+	})
+}
diff --git a/server/internal/flow/application/procdef.go b/server/internal/flow/application/procdef.go
index 80685ba0..6c239195 100644
--- a/server/internal/flow/application/procdef.go
+++ b/server/internal/flow/application/procdef.go
@@ -13,16 +13,20 @@ import (
 	"mayfly-go/pkg/base"
 	"mayfly-go/pkg/errorx"
 	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/jsonx"
 )
 
 type Procdef interface {
 	base.App[*entity.Procdef]
 
-	GetPageList(condition *entity.Procdef, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.Procdef, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.ProcdefPagePO], error)
 
 	// 保存流程实例信息
 	SaveProcdef(ctx context.Context, def *dto.SaveProcdef) error
 
+	// SaveFlowDef 保存流程定义流程信息
+	SaveFlowDef(ctx context.Context, def *dto.SaveFlowDef) error
+
 	// 删除流程实例信息
 	DeleteProcdef(ctx context.Context, defId uint64) error
 
@@ -45,8 +49,8 @@ type procdefAppImpl struct {
 
 var _ (Procdef) = (*procdefAppImpl)(nil)
 
-func (p *procdefAppImpl) GetPageList(condition *entity.Procdef, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return p.Repo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (p *procdefAppImpl) GetPageList(condition *entity.Procdef, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.ProcdefPagePO], error) {
+	return p.Repo.GetPageList(condition, pageParam, orderBy...)
 }
 
 func (p *procdefAppImpl) SaveProcdef(ctx context.Context, defParam *dto.SaveProcdef) error {
@@ -82,6 +86,18 @@ func (p *procdefAppImpl) SaveProcdef(ctx context.Context, defParam *dto.SaveProc
 	})
 }
 
+func (p *procdefAppImpl) SaveFlowDef(ctx context.Context, def *dto.SaveFlowDef) error {
+	if err := validateFlowDef(ctx, def.FlowDef); err != nil {
+		return err
+	}
+
+	procdef := &entity.Procdef{
+		FlowDef: jsonx.ToStr(def.FlowDef),
+	}
+	procdef.Id = def.Id
+	return p.Save(ctx, procdef)
+}
+
 func (p *procdefAppImpl) DeleteProcdef(ctx context.Context, defId uint64) error {
 	if err := p.canModify(ctx, defId); err != nil {
 		return err
@@ -121,3 +137,30 @@ func (p *procdefAppImpl) canModify(ctx context.Context, prodefId uint64) error {
 	}
 	return nil
 }
+
+// validateFlowDef 校验流程定义信息
+func validateFlowDef(ctx context.Context, p *entity.FlowDef) error {
+	// 检查是否有开始节点
+	startNodes := p.GetNodeByType(FlowNodeTypeStart)
+	if len(startNodes) != 1 {
+		return errorx.NewBiz("not one start node")
+	}
+
+	// 检查是否有结束节点
+	endNodes := p.GetNodeByType(FlowNodeTypeEnd)
+	if len(endNodes) != 1 {
+		return errorx.NewBiz("not one end node")
+	}
+
+	// 校验节点自身逻辑
+	for _, node := range p.Nodes {
+		nh, _ := nodeBehaviorRegistry.GetNode(node.Type)
+		if nh != nil {
+			if err := nh.Validate(ctx, p, node); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/server/internal/flow/application/procinst.go b/server/internal/flow/application/procinst.go
index 0af6bc64..68a6bce8 100644
--- a/server/internal/flow/application/procinst.go
+++ b/server/internal/flow/application/procinst.go
@@ -2,67 +2,46 @@ package application
 
 import (
 	"context"
-	"fmt"
-	"mayfly-go/internal/event"
 	"mayfly-go/internal/flow/application/dto"
 	"mayfly-go/internal/flow/domain/entity"
 	"mayfly-go/internal/flow/domain/repository"
 	"mayfly-go/internal/flow/imsg"
-	msgdto "mayfly-go/internal/msg/application/dto"
 	"mayfly-go/internal/pkg/consts"
 	"mayfly-go/pkg/base"
 	"mayfly-go/pkg/contextx"
 	"mayfly-go/pkg/errorx"
-	"mayfly-go/pkg/global"
-	"mayfly-go/pkg/i18n"
 	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/utils/anyx"
 	"mayfly-go/pkg/utils/jsonx"
 	"mayfly-go/pkg/utils/stringx"
-
-	"github.com/may-fly/cast"
 )
 
 type Procinst interface {
 	base.App[*entity.Procinst]
 
-	GetPageList(condition *entity.ProcinstQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-
-	// 获取流程实例审批节点任务
-	GetProcinstTasks(condition *entity.ProcinstTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.ProcinstQuery, orderBy ...string) (*model.PageResult[*entity.Procinst], error)
 
 	// StartProc 根据流程定义启动一个流程实例
 	StartProc(ctx context.Context, procdefId uint64, reqParam *dto.StarProc) (*entity.Procinst, error)
 
-	// 取消流程
+	// CancelProc 取消流程
 	CancelProc(ctx context.Context, procinstId uint64) error
 
-	// 完成任务
-	CompleteTask(ctx context.Context, taskId uint64, remark string) error
-
-	// 拒绝任务
-	RejectTask(ctx context.Context, taskId uint64, remark string) error
-
-	// 驳回任务（允许重新提交）
-	BackTask(ctx context.Context, taskId uint64, remark string) error
+	// CompletedProc 完成流程
+	CompletedProc(ctx context.Context, procinstId uint64) error
 }
 
 type procinstAppImpl struct {
 	base.AppImpl[*entity.Procinst, repository.Procinst]
 
-	procinstTaskRepo repository.ProcinstTask `inject:"T"`
-	procdefApp       Procdef                 `inject:"T"`
+	procdefApp Procdef `inject:"T"`
 }
 
 var _ (Procinst) = (*procinstAppImpl)(nil)
 
-func (p *procinstAppImpl) GetPageList(condition *entity.ProcinstQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return p.Repo.GetPageList(condition, pageParam, toEntity, orderBy...)
-}
-
-func (p *procinstAppImpl) GetProcinstTasks(condition *entity.ProcinstTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return p.procinstTaskRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (p *procinstAppImpl) GetPageList(condition *entity.ProcinstQuery, orderBy ...string) (*model.PageResult[*entity.Procinst], error) {
+	return p.Repo.GetPageList(condition, orderBy...)
 }
 
 func (p *procinstAppImpl) StartProc(ctx context.Context, procdefId uint64, reqParam *dto.StarProc) (*entity.Procinst, error) {
@@ -74,6 +53,9 @@ func (p *procinstAppImpl) StartProc(ctx context.Context, procdefId uint64, reqPa
 	if procdef.Status != entity.ProcdefStatusEnable {
 		return nil, errorx.NewBizI(ctx, imsg.ErrProcdefNotEnable)
 	}
+	if flowdef := procdef.GetFlowDef(); flowdef == nil || len(flowdef.Nodes) == 0 {
+		return nil, errorx.NewBizI(ctx, imsg.ErrProcdefFlowNotExist)
+	}
 
 	bizKey := reqParam.BizKey
 	if bizKey == "" {
@@ -88,15 +70,15 @@ func (p *procinstAppImpl) StartProc(ctx context.Context, procdefId uint64, reqPa
 		ProcdefName: procdef.Name,
 		Remark:      reqParam.Remark,
 		Status:      entity.ProcinstStatusActive,
+		FlowDef:     procdef.FlowDef,
 	}
 
-	task := p.getNextTask(procdef, "")
-	procinst.TaskKey = task.TaskKey
-
-	if err := p.Save(ctx, procinst); err != nil {
-		return nil, err
-	}
-	return procinst, p.createProcinstTask(ctx, procinst, task)
+	return procinst, p.Tx(ctx, func(ctx context.Context) error {
+		if err := p.Save(ctx, procinst); err != nil {
+			return err
+		}
+		return flowEventBus.PublishSync(ctx, EventTopicFlowProcinstCreate, procinst)
+	})
 }
 
 func (p *procinstAppImpl) CancelProc(ctx context.Context, procinstId uint64) error {
@@ -117,119 +99,35 @@ func (p *procinstAppImpl) CancelProc(ctx context.Context, procinstId uint64) err
 	procinst.SetEnd()
 
 	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.cancelInstTasks(ctx, procinstId, i18n.T(imsg.ErrProcinstCancelled))
-	}, func(ctx context.Context) error {
-		return p.Save(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.triggerProcinstStatusChangeEvent(ctx, procinst)
-	})
-}
-
-func (p *procinstAppImpl) CompleteTask(ctx context.Context, instTaskId uint64, remark string) error {
-	instTask, err := p.getAndValidInstTask(ctx, instTaskId)
-	if err != nil {
-		return err
-	}
-
-	// 赋值状态和备注
-	instTask.Status = entity.ProcinstTaskStatusPass
-	instTask.Remark = remark
-	instTask.SetEnd()
-
-	procinst, _ := p.GetById(instTask.ProcinstId)
-	procdef, _ := p.procdefApp.GetById(procinst.ProcdefId)
-
-	// 获取下一实例审批任务
-	task := p.getNextTask(procdef, instTask.TaskKey)
-	if task == nil {
-		procinst.Status = entity.ProcinstStatusCompleted
-		procinst.SetEnd()
-	} else {
-		procinst.TaskKey = task.TaskKey
-
-	}
-
-	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.UpdateById(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}, func(ctx context.Context) error {
-		return p.createProcinstTask(ctx, procinst, task)
-	}, func(ctx context.Context) error {
-		// 下一审批节点任务不存在，说明该流程已结束
-		if task == nil {
-			return p.triggerProcinstStatusChangeEvent(ctx, procinst)
+		if err := p.Save(ctx, procinst); err != nil {
+			return err
 		}
-		return nil
+
+		return flowEventBus.PublishSync(ctx, EventTopicFlowProcinstCancel, procinstId)
 	})
 }
 
-func (p *procinstAppImpl) RejectTask(ctx context.Context, instTaskId uint64, remark string) error {
-	instTask, err := p.getAndValidInstTask(ctx, instTaskId)
+func (p *procinstAppImpl) CompletedProc(ctx context.Context, procinstId uint64) error {
+	procinst, err := p.GetById(procinstId)
 	if err != nil {
 		return err
 	}
+	// 已完成或已终止，则不进行后续处理
+	if procinst.Status == entity.ProcinstStatusCompleted || procinst.Status == entity.ProcinstStatusTerminated {
+		return nil
+	}
 
-	// 赋值状态和备注
-	instTask.Status = entity.ProcinstTaskStatusReject
-	instTask.Remark = remark
-	instTask.SetEnd()
-
-	procinst, _ := p.GetById(instTask.ProcinstId)
-	// 更新流程实例为终止状态，无法重新提交
-	procinst.Status = entity.ProcinstStatusTerminated
-	procinst.BizStatus = entity.ProcinstBizStatusNo
+	procinst.Status = entity.ProcinstStatusCompleted
 	procinst.SetEnd()
 
-	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.UpdateById(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}, func(ctx context.Context) error {
-		return p.triggerProcinstStatusChangeEvent(ctx, procinst)
-	})
+	// 业务处理
+	p.bizHandle(ctx, procinst)
+
+	return p.Save(ctx, procinst)
 }
 
-func (p *procinstAppImpl) BackTask(ctx context.Context, instTaskId uint64, remark string) error {
-	instTask, err := p.getAndValidInstTask(ctx, instTaskId)
-	if err != nil {
-		return err
-	}
-
-	// 赋值状态和备注
-	instTask.Status = entity.ProcinstTaskStatusBack
-	instTask.Remark = remark
-
-	procinst, _ := p.GetById(instTask.ProcinstId)
-
-	// 更新流程实例为挂起状态，等待重新提交
-	procinst.Status = entity.ProcinstStatusSuspended
-
-	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.UpdateById(ctx, procinst)
-	}, func(ctx context.Context) error {
-		return p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}, func(ctx context.Context) error {
-		return p.triggerProcinstStatusChangeEvent(ctx, procinst)
-	})
-}
-
-// 取消处理中的流程实例任务
-func (p *procinstAppImpl) cancelInstTasks(ctx context.Context, procinstId uint64, cancelReason string) error {
-	// 流程实例任务信息
-	instTasks, _ := p.procinstTaskRepo.SelectByCond(&entity.ProcinstTask{ProcinstId: procinstId, Status: entity.ProcinstTaskStatusProcess})
-	for _, instTask := range instTasks {
-		instTask.Status = entity.ProcinstTaskStatusCanceled
-		instTask.Remark = cancelReason
-		instTask.SetEnd()
-		p.procinstTaskRepo.UpdateById(ctx, instTask)
-	}
-	return nil
-}
-
-// 触发流程实例状态改变事件
-func (p *procinstAppImpl) triggerProcinstStatusChangeEvent(ctx context.Context, procinst *entity.Procinst) error {
-
+// 业务处理
+func (p *procinstAppImpl) bizHandle(ctx context.Context, procinst *entity.Procinst) {
 	handleRes, err := FlowBizHandle(ctx, &BizHandleParam{
 		Procinst: *procinst,
 	})
@@ -239,100 +137,17 @@ func (p *procinstAppImpl) triggerProcinstStatusChangeEvent(ctx context.Context,
 	}
 
 	if err != nil {
-		// 业务处理错误，非完成状态则终止流程
-		if procinst.Status != entity.ProcinstStatusCompleted {
-			procinst.Status = entity.ProcinstStatusTerminated
-			procinst.SetEnd()
-			p.cancelInstTasks(ctx, procinst.Id, i18n.T(imsg.ErrBizHandlerFail))
-		}
 		procinst.BizStatus = entity.ProcinstBizStatusFail
 		if procinst.BizHandleRes == "" {
 			procinst.BizHandleRes = err.Error()
 		} else {
 			logx.Errorf("process business [%s] processing failed: %v", procinst.BizKey, err.Error())
 		}
-		return p.UpdateById(ctx, procinst)
+		return
 	}
 
-	// 处理成功，并且状态为完成，则更新业务状态为成功
-	if procinst.Status == entity.ProcinstStatusCompleted {
-		procinst.BizStatus = entity.ProcinstBizStatusSuccess
-		if procinst.BizHandleRes == "" {
-			procinst.BizHandleRes = "success"
-		}
-		return p.UpdateById(ctx, procinst)
+	procinst.BizStatus = entity.ProcinstBizStatusSuccess
+	if procinst.BizHandleRes == "" {
+		procinst.BizHandleRes = "success"
 	}
-	return err
-}
-
-// 获取并校验实例任务
-func (p *procinstAppImpl) getAndValidInstTask(ctx context.Context, instTaskId uint64) (*entity.ProcinstTask, error) {
-	instTask, err := p.procinstTaskRepo.GetById(instTaskId)
-	if err != nil {
-		return nil, errorx.NewBiz("procinst not found")
-	}
-
-	la := contextx.GetLoginAccount(ctx)
-	if instTask.Assignee != fmt.Sprintf("%d", la.Id) {
-		return nil, errorx.NewBiz("the current user is not a task handler and cannot complete the task")
-	}
-
-	return instTask, nil
-}
-
-// 创建流程实例节点任务
-func (p *procinstAppImpl) createProcinstTask(ctx context.Context, procinst *entity.Procinst, task *entity.ProcdefTask) error {
-	if task == nil {
-		return nil
-	}
-
-	procinstTask := &entity.ProcinstTask{
-		ProcinstId: procinst.Id,
-		Status:     entity.ProcinstTaskStatusProcess,
-
-		TaskKey:  task.TaskKey,
-		TaskName: task.Name,
-		Assignee: task.UserId,
-	}
-
-	if err := p.procinstTaskRepo.Insert(ctx, procinstTask); err != nil {
-		return err
-	}
-
-	// 发送通知消息
-	global.EventBus.Publish(ctx, event.EventTopicBizMsgTmplSend, msgdto.BizMsgTmplSend{
-		BizType: FlowTaskNotifyBizKey,
-		BizId:   procinst.ProcdefId,
-		Params: map[string]any{
-			"creator":        procinst.Creator,
-			"procdefName":    procinst.ProcdefName,
-			"bizKey":         procinst.BizKey,
-			"taskName":       task.Name,
-			"procinstRemark": procinst.Remark,
-		},
-		ReceiverIds: []uint64{cast.ToUint64(task.UserId)},
-	})
-
-	return nil
-}
-
-// 获取下一审批节点任务
-func (p *procinstAppImpl) getNextTask(procdef *entity.Procdef, nowTaskKey string) *entity.ProcdefTask {
-	tasks := procdef.GetTasks()
-	if len(tasks) == 0 {
-		return nil
-	}
-
-	if nowTaskKey == "" {
-		// nowTaskKey为空，则说明为刚启动该流程实例
-		return tasks[0]
-	}
-
-	for index, t := range tasks {
-		if (t.TaskKey == nowTaskKey) && (index < len(tasks)-1) {
-			return tasks[index+1]
-		}
-	}
-
-	return nil
 }
diff --git a/server/internal/flow/application/procinst_task.go b/server/internal/flow/application/procinst_task.go
new file mode 100644
index 00000000..955fb52f
--- /dev/null
+++ b/server/internal/flow/application/procinst_task.go
@@ -0,0 +1,232 @@
+package application
+
+import (
+	"context"
+	"mayfly-go/internal/flow/application/dto"
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/errorx"
+	"mayfly-go/pkg/eventbus"
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/stringx"
+
+	"github.com/may-fly/cast"
+)
+
+type ProcinstTask interface {
+	base.App[*entity.ProcinstTask]
+
+	Init()
+
+	// 获取代办任务
+	GetTasks(ctx context.Context, condition *entity.ProcinstTaskQuery, orderBy ...string) (*model.PageResult[*entity.ProcinstTaskPO], error)
+
+	// 任务审批通过
+	PassTask(ctx context.Context, taskOp dto.UserTaskOp) error
+
+	// 拒绝任务
+	RejectTask(ctx context.Context, taskOp dto.UserTaskOp) error
+
+	// 驳回任务（允许重新提交）
+	BackTask(ctx context.Context, taskOp dto.UserTaskOp) error
+}
+
+type procinstTaskAppImpl struct {
+	base.AppImpl[*entity.ProcinstTask, repository.ProcinstTask]
+
+	procinstApp               Procinst                         `inject:"T"`
+	executionApp              Execution                        `inject:"T"`
+	procinstTaskCandidateRepo repository.ProcinstTaskCandidate `inject:"T"`
+}
+
+var _ (ProcinstTask) = (*procinstTaskAppImpl)(nil)
+
+func (p *procinstTaskAppImpl) Init() {
+	const subId = "ProcinstTaskApp"
+
+	flowEventBus.Subscribe(EventTopicFlowProcinstCancel, subId, func(ctx context.Context, event *eventbus.Event[any]) error {
+		procinstId := event.Val.(uint64)
+		if err := p.UpdateByCond(ctx, &entity.ProcinstTask{Status: entity.ProcinstTaskStatusCanceled}, &entity.ProcinstTask{ProcinstId: procinstId, Status: entity.ProcinstTaskStatusProcess}); err != nil {
+			return err
+		}
+
+		return p.procinstTaskCandidateRepo.DeleteByCond(ctx, &entity.ProcinstTaskCandidate{ProcinstId: procinstId})
+	})
+
+}
+
+func (p *procinstTaskAppImpl) GetTasks(ctx context.Context, condition *entity.ProcinstTaskQuery, orderBy ...string) (*model.PageResult[*entity.ProcinstTaskPO], error) {
+	return p.Repo.GetPageList(condition, orderBy...)
+}
+
+func (p *procinstTaskAppImpl) PassTask(ctx context.Context, taskOp dto.UserTaskOp) error {
+	return p.CompleteTask(ctx, taskOp)
+}
+
+func (p *procinstTaskAppImpl) RejectTask(ctx context.Context, taskOp dto.UserTaskOp) error {
+	taskId := taskOp.TaskId
+	instTask, taskCandidates, procinst, execution, err := p.getAndValidInstTask(ctx, taskId, taskOp.Candidate)
+	if err != nil {
+		return err
+	}
+
+	// 赋值状态和备注
+	instTask.Status = entity.ProcinstTaskStatusReject
+	instTask.Remark = taskOp.Remark
+	instTask.SetEnd()
+
+	// 更新流程实例为终止状态，无法重新提交
+	procinst.Status = entity.ProcinstStatusTerminated
+	procinst.BizStatus = entity.ProcinstBizStatusNo
+	procinst.SetEnd()
+
+	procinstId := procinst.Id
+
+	return p.Tx(ctx, func(ctx context.Context) error {
+		executionCtx := NewExecutionCtx(ctx, procinst, execution)
+		executionCtx.OpExtra.Set("approvalResult", instTask.Status)
+
+		for _, taskCandidate := range taskCandidates {
+			taskCandidate.Status = entity.ProcinstTaskStatusReject
+			taskCandidate.SetEnd()
+			taskCandidate.Handler = &taskOp.Handler
+			if err := p.procinstTaskCandidateRepo.UpdateById(ctx, taskCandidate); err != nil {
+				return err
+			}
+		}
+
+		if err := p.procinstApp.Save(ctx, procinst); err != nil {
+			return err
+		}
+		if err := p.Save(ctx, instTask); err != nil {
+			return err
+		}
+		if err := p.UpdateByCond(ctx, &entity.ProcinstTask{Status: entity.ProcinstTaskStatusCanceled}, &entity.ProcinstTask{ProcinstId: procinstId, Status: entity.ProcinstTaskStatusProcess}); err != nil {
+			return err
+		}
+		// 跳转至结束节点
+		if err := p.executionApp.MoveTo(executionCtx, executionCtx.GetFlowDef().GetNodeByType(FlowNodeTypeEnd)[0]); err != nil {
+			return err
+		}
+
+		// 删除待处理的其他候选人任务
+		return p.procinstTaskCandidateRepo.DeleteByCond(ctx, &entity.ProcinstTaskCandidate{ProcinstId: procinstId, Status: entity.ProcinstTaskStatusProcess})
+	})
+}
+
+func (p *procinstTaskAppImpl) BackTask(ctx context.Context, taskOp dto.UserTaskOp) error {
+	// instTask, err := p.getAndValidInstTask(ctx, instTaskId)
+	// if err != nil {
+	// 	return err
+	// }
+
+	// // 赋值状态和备注
+	// instTask.Status = entity.ProcinstTaskStatusBack
+	// instTask.Remark = remark
+
+	// procinst, _ := p.GetById(instTask.ProcinstId)
+
+	// // 更新流程实例为挂起状态，等待重新提交
+	// procinst.Status = entity.ProcinstStatusSuspended
+
+	// return p.Tx(ctx, func(ctx context.Context) error {
+	// 	return p.UpdateById(ctx, procinst)
+	// }, func(ctx context.Context) error {
+	// 	return p.procinstTaskRepo.UpdateById(ctx, instTask)
+	// }, func(ctx context.Context) error {
+	// 	return p.triggerProcinstStatusChangeEvent(ctx, procinst)
+	// })
+	return nil
+}
+
+func (p *procinstTaskAppImpl) CompleteTask(ctx context.Context, taskOp dto.UserTaskOp) error {
+	taskId := taskOp.TaskId
+	instTask, taskCandidates, procinst, execution, err := p.getAndValidInstTask(ctx, taskId, taskOp.Candidate)
+	if err != nil {
+		return err
+	}
+
+	return p.Tx(ctx, func(ctx context.Context) error {
+		executionCtx := NewExecutionCtx(ctx, procinst, execution)
+		usertaskNode := ToUserTaskNode(executionCtx.GetFlowNode())
+
+		for _, taskCandidate := range taskCandidates {
+			taskCandidate.Status = entity.ProcinstTaskStatusCompleted
+			taskCandidate.SetEnd()
+			taskCandidate.Handler = &taskOp.Handler
+			if err := p.procinstTaskCandidateRepo.UpdateById(ctx, taskCandidate); err != nil {
+				return err
+			}
+		}
+
+		executionCtx.parent = ctx
+
+		vars := instTask.Vars
+		// map[string]any整数会被解析为float64，故统一转为float64
+		nrOfCompleted := cast.ToFloat64(vars.GetInt(NrOfCompleted) + len(taskCandidates))
+		vars.Set(NrOfCompleted, nrOfCompleted)
+		// 完成比例
+		vars.Set("nrOfCompletedRate", float32(nrOfCompleted)/float32(vars.GetInt(NrOfAll)))
+
+		isCompleteRes, err := stringx.TemplateParse(usertaskNode.CompletionCondition, vars)
+		if err != nil {
+			return err
+		}
+		// 不满足通过条件则保存更新任务完成数等变量即可
+		if !cast.ToBool(isCompleteRes) {
+			return p.Save(ctx, instTask)
+		}
+
+		// 赋值状态和备注
+		instTask.Status = entity.ProcinstTaskStatusCompleted
+		instTask.Remark = taskOp.Remark
+		instTask.SetEnd()
+		if err := p.Save(ctx, instTask); err != nil {
+			return err
+		}
+
+		// 删除待处理的任务处理候选人
+		if err := p.procinstTaskCandidateRepo.DeleteByCond(ctx, &entity.ProcinstTaskCandidate{TaskId: taskId, Status: entity.ProcinstTaskStatusProcess}); err != nil {
+			return err
+		}
+
+		executionCtx.OpExtra.Set("approvalResult", instTask.Status)
+		// 继续推进执行流
+		return p.executionApp.ContinueExecution(executionCtx)
+	})
+}
+
+// getAndValidInstTask 获取并校验实例任务
+func (p *procinstTaskAppImpl) getAndValidInstTask(ctx context.Context, instTaskId uint64, candidates []string) (*entity.ProcinstTask, []*entity.ProcinstTaskCandidate, *entity.Procinst, *entity.Execution, error) {
+	instTask, err := p.GetById(instTaskId)
+	if err != nil {
+		return nil, nil, nil, nil, errorx.NewBiz("procinst task not found")
+	}
+
+	taskCandidates, err := p.procinstTaskCandidateRepo.SelectByCond(model.NewCond().
+		In("candidate", candidates).
+		Eq("task_id", instTask.Id).
+		Eq("status", entity.ProcinstTaskStatusProcess))
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+	if len(taskCandidates) == 0 {
+		return nil, nil, nil, nil, errorx.NewBiz("the current candidates is not a task handler and cannot complete the task")
+	}
+
+	procinst, err := p.procinstApp.GetById(instTask.ProcinstId)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+
+	execution, err := p.executionApp.GetById(instTask.ExecutionId)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+	if execution.NodeKey != instTask.NodeKey {
+		return nil, nil, nil, nil, errorx.NewBiz("the current process instance node does not match and cannot process the task")
+	}
+
+	return instTask, taskCandidates, procinst, execution, nil
+}
diff --git a/server/internal/flow/domain/entity/execution.go b/server/internal/flow/domain/entity/execution.go
new file mode 100644
index 00000000..53f821fe
--- /dev/null
+++ b/server/internal/flow/domain/entity/execution.go
@@ -0,0 +1,35 @@
+package entity
+
+import (
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
+)
+
+// Execution 流程执行流信息
+type Execution struct {
+	model.Model
+
+	ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"`
+	ParentId   uint64 `json:"parentId" gorm:"default:0;comment:父级执行id"` // 父执行流ID（并行网关分支时指向网关的Execution ID）
+
+	Vars     collx.M      `json:"vars" gorm:"type:text;comment:执行流变量"`
+	NodeKey  string       `json:"nodeKey" gorm:"not null;size:64;comment:节点key"`
+	NodeName string       `json:"nodeName" gorm:"size:64;comment:节点名称"`
+	NodeType FlowNodeType `json:"nodeType" gorm:"comment:节点类型"`
+
+	State        ExectionState `json:"state" gorm:"comment:执行状态"`
+	IsConcurrent int8          `json:"isConcurrent" gorm:"comment:是否并行"`
+}
+
+func (m *Execution) TableName() string {
+	return "t_flow_execution"
+}
+
+type ExectionState int8
+
+const (
+	ExectionStateActive     ExectionState = 1  // 运行中
+	ExectionStateSuspended  ExectionState = -1 // 挂起
+	ExectionStateTerminated ExectionState = -2 // 已终止
+	ExectionStateCompleted  ExectionState = 2  // 完成
+)
diff --git a/server/internal/flow/domain/entity/his_procinst_op.go b/server/internal/flow/domain/entity/his_procinst_op.go
new file mode 100644
index 00000000..32170af8
--- /dev/null
+++ b/server/internal/flow/domain/entity/his_procinst_op.go
@@ -0,0 +1,36 @@
+package entity
+
+import (
+	"mayfly-go/pkg/model"
+	"time"
+)
+
+// HisProcinstOp 流程实例关联的节点操作记录历史表
+type HisProcinstOp struct {
+	model.Model
+	model.ExtraData
+
+	ProcinstId  uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"` // 流程实例id
+	ExecutionId uint64 `json:"executionId" gorm:"not null;index:idx_execution_id;comment:执行流id"`
+
+	NodeKey  string       `json:"nodeKey" gorm:"not null;size:64;comment:节点key"` // 当前任务key
+	NodeName string       `json:"nodeName" gorm:"size:64;comment:节点名称"`
+	NodeType FlowNodeType `json:"nodeType" gorm:"comment:节点类型"`
+
+	State    ProcinstOpState `json:"state" ` // 状态
+	Remark   string          `json:"remark" gorm:"size:255;"`
+	EndTime  *time.Time      `json:"endTime" gorm:"comment:结束时间"`
+	Duration int64           `json:"duration" gorm:"comment:任务持续时间（开始到结束）"` // 持续时间（开始到结束）
+}
+
+func (a *HisProcinstOp) TableName() string {
+	return "t_flow_his_procinst_op"
+}
+
+type ProcinstOpState int8
+
+const (
+	ProcinstOpStatePending   ProcinstOpState = 1  // 待处理
+	ProcinstOpStateCompleted ProcinstOpState = 2  // 正常完成
+	ProcinstOpStateFailed    ProcinstOpState = -1 // 执行失败
+)
diff --git a/server/internal/flow/domain/entity/po.go b/server/internal/flow/domain/entity/po.go
new file mode 100644
index 00000000..be4d37d4
--- /dev/null
+++ b/server/internal/flow/domain/entity/po.go
@@ -0,0 +1,34 @@
+package entity
+
+import (
+	"mayfly-go/pkg/model"
+	"time"
+)
+
+type ProcdefPagePO struct {
+	model.Model
+
+	Name      string        `json:"name" form:"name" gorm:"size:150;comment:流程名称"`                 // 名称
+	DefKey    string        `json:"defKey" form:"defKey" gorm:"not null;size:100;comment:流程定义key"` //
+	Status    ProcdefStatus `json:"status" gorm:"comment:状态"`                                      // 状态
+	Condition *string       `json:"condition" gorm:"type:text;comment:触发审批的条件（计算结果返回1则需要启用该流程）"`   // 触发审批的条件（计算结果返回1则需要启用该流程）
+	Remark    *string       `json:"remark" gorm:"size:255;"`
+}
+
+type ProcinstTaskPO struct {
+	Id         uint64 `json:"id"`
+	ProcinstId uint64 `json:"procinstId"` // 流程实例id
+	NodeKey    string `json:"nodeKey"`    // 当前任务key
+	NodeName   string `json:"nodeName"`   // 当前任务名称
+
+	BizKey string `json:"bizKey"`
+
+	Candidate string `json:"candidate"` // 处理候选人
+	Handler   string `json:"handler"`   // 处理人
+
+	Status     ProcinstTaskStatus `json:"status"`   // 状态
+	Remark     string             `json:"remark"`   // 审批意见
+	Duration   int64              `json:"duration"` // 持续时间（开始到结束）
+	CreateTime *time.Time         `json:"createTime"`
+	EndTime    *time.Time         `json:"endTime"`
+}
diff --git a/server/internal/flow/domain/entity/procdef.go b/server/internal/flow/domain/entity/procdef.go
index dbfa40e1..c61817e8 100644
--- a/server/internal/flow/domain/entity/procdef.go
+++ b/server/internal/flow/domain/entity/procdef.go
@@ -1,13 +1,15 @@
 package entity
 
 import (
-	"encoding/json"
 	"mayfly-go/pkg/enumx"
 	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/jsonx"
 	"mayfly-go/pkg/utils/stringx"
 	"strings"
+
+	"github.com/may-fly/cast"
 )
 
 // 流程定义信息
@@ -16,7 +18,7 @@ type Procdef struct {
 
 	Name      string        `json:"name" form:"name" gorm:"size:150;comment:流程名称"`                 // 名称
 	DefKey    string        `json:"defKey" form:"defKey" gorm:"not null;size:100;comment:流程定义key"` //
-	Tasks     string        `json:"tasks" gorm:"not null;size:3000;comment:审批节点任务信息"`              // 审批节点任务信息
+	FlowDef   string        `json:"flowDef" gorm:"type:text;comment:流程定义信息"`                       // 流程定义信息
 	Status    ProcdefStatus `json:"status" gorm:"comment:状态"`                                      // 状态
 	Condition *string       `json:"condition" gorm:"type:text;comment:触发审批的条件（计算结果返回1则需要启用该流程）"`   // 触发审批的条件（计算结果返回1则需要启用该流程）
 	Remark    *string       `json:"remark" gorm:"size:255;"`
@@ -26,18 +28,6 @@ func (p *Procdef) TableName() string {
 	return "t_flow_procdef"
 }
 
-// 获取审批节点任务列表
-func (p *Procdef) GetTasks() []*ProcdefTask {
-	var tasks []*ProcdefTask
-	err := json.Unmarshal([]byte(p.Tasks), &tasks)
-	if err != nil {
-		logx.ErrorTrace("解析procdef tasks失败", err)
-		return tasks
-	}
-
-	return tasks
-}
-
 // MatchCondition 是否匹配审批条件，匹配则需要启用该流程
 // @param bizType 业务类型
 // @param param 业务参数
@@ -55,12 +45,6 @@ func (p *Procdef) MatchCondition(bizType string, param map[string]any) bool {
 	return strings.TrimSpace(res) == "1"
 }
 
-type ProcdefTask struct {
-	Name    string `json:"name" form:"name"`       // 审批节点任务名称
-	TaskKey string `json:"taskKey" form:"taskKey"` // 任务key
-	UserId  string `json:"userId"`                 // 审批人
-}
-
 type ProcdefStatus int8
 
 const (
@@ -71,3 +55,102 @@ const (
 var ProcdefStatusEnum = enumx.NewEnum[ProcdefStatus]("流程定义状态").
 	Add(ProcdefStatusEnable, "启用").
 	Add(ProcdefStatusDisable, "禁用")
+
+// GetFlowDef 获取流程定义信息
+func (p *Procdef) GetFlowDef() *FlowDef {
+	if p.FlowDef == "" {
+		return nil
+	}
+	flow, err := jsonx.To(p.FlowDef, new(FlowDef))
+	if err != nil {
+		logx.ErrorTrace("parse flow def failed", err)
+		return flow
+	}
+
+	return flow
+}
+
+// FlowDef 流程定义-流程内容
+type FlowDef struct {
+	Nodes []*FlowNode `json:"nodes" form:"nodes"`
+	Edges []*FlowEdge `json:"edges" form:"edges"`
+}
+
+func (p *FlowDef) GetNodes(keys ...string) []*FlowNode {
+	result := make([]*FlowNode, 0)
+	keySet := make(map[string]bool)
+	for _, k := range keys {
+		keySet[k] = true
+	}
+
+	for _, node := range p.Nodes {
+		if keySet[node.Key] {
+			result = append(result, node)
+		}
+	}
+	return result
+}
+
+func (p *FlowDef) GetNodeByType(nodeType FlowNodeType) []*FlowNode {
+	return collx.ArrayFilter(p.Nodes, func(node *FlowNode) bool {
+		return node.Type == nodeType
+	})
+}
+
+func (p *FlowDef) GetEdgeBySourceNode(sourceNodeKey string) []*FlowEdge {
+	return collx.ArrayFilter(p.Edges, func(edge *FlowEdge) bool {
+		return edge.SourceNodeKey == sourceNodeKey
+	})
+}
+
+func (p *FlowDef) GetNextNodes(key string, vars collx.M) []*FlowNode {
+	edges := p.GetEdgeBySourceNode(key)
+	targetNodeKeys := make([]string, 0)
+
+	for _, edge := range edges {
+		if edge.MatchCondition(vars) {
+			targetNodeKeys = append(targetNodeKeys, edge.TargetNodeKey)
+		}
+	}
+
+	return p.GetNodes(targetNodeKeys...)
+}
+
+// FlowNode 流程定义-流程节点
+type FlowNode struct {
+	model.ExtraData
+
+	Name string       `json:"name" form:"name"` // 审批节点任务名称
+	Key  string       `json:"key" form:"key"`   // 任务key
+	Type FlowNodeType `json:"type" form:"type"` // 任务节点类型
+}
+
+type FlowNodeType string
+
+// FlowEdge 流程定义-流程节点-跳转
+type FlowEdge struct {
+	model.ExtraData
+
+	Name          string `json:"name" form:"name"`                   // 跳转名
+	Key           string `json:"key" form:"key"`                     // 跳转key
+	SourceNodeKey string `json:"sourceNodeKey" form:"sourceNodeKey"` // 源节点key
+	TargetNodeKey string `json:"targetNodeKey" form:"targetNodeKey"` // 目标节点key
+
+	Condition string `json:"condition"` // 跳转条件
+}
+
+// MatchCondition 匹配条件
+func (p *FlowEdge) MatchCondition(vars collx.M) bool {
+	if p.Condition == "" {
+		return true
+	}
+
+	// 解析条件
+	res, err := stringx.TemplateParse(p.Condition, vars)
+	if err != nil {
+		logx.Warnf("parse condition error, edge: %s, err: %s", p.Condition, err.Error())
+		return false
+	}
+
+	return cast.ToBool(res)
+}
diff --git a/server/internal/flow/domain/entity/procinst.go b/server/internal/flow/domain/entity/procinst.go
index 007239b6..9105b519 100644
--- a/server/internal/flow/domain/entity/procinst.go
+++ b/server/internal/flow/domain/entity/procinst.go
@@ -2,7 +2,10 @@ package entity
 
 import (
 	"mayfly-go/pkg/enumx"
+	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/jsonx"
 	"time"
 )
 
@@ -10,19 +13,21 @@ import (
 type Procinst struct {
 	model.Model
 
-	ProcdefId   uint64 `json:"procdefId" gorm:"not null;index:idx_procdef_id;comment:流程定义id"` // 流程定义id
-	ProcdefName string `json:"procdefName" gorm:"not null;size:64;comment:流程定义名称"`            // 流程定义名称
+	ProcdefId   uint64  `json:"procdefId" gorm:"not null;index:idx_procdef_id;comment:流程定义id"` // 流程定义id
+	ProcdefName string  `json:"procdefName" gorm:"not null;size:64;comment:流程定义名称"`            // 流程定义名称
+	FlowDef     string  `json:"flowDef" gorm:"type:text;comment:流程定义json"`                     // 流程定义json
+	Vars        collx.M `json:"vars" gorm:"type:text;comment:流程变量"`                            // 流程变量
 
 	BizType      string            `json:"bizType" gorm:"not null;size:64;comment:关联业务类型"`  // 业务类型
 	BizKey       string            `json:"bizKey" gorm:"not null;size:64;comment:关联业务key"`  // 业务key
 	BizForm      string            `json:"bizForm" gorm:"type:text;comment:业务form"`         // 业务表单
 	BizStatus    ProcinstBizStatus `json:"bizStatus" gorm:"comment:业务状态"`                   // 业务状态
-	BizHandleRes string            `json:"bizHandleRes" gorm:"size:4000;comment:关联的业务处理结果"` // 业务处理结果
-	TaskKey      string            `json:"taskKey" gorm:"size:100;comment:当前任务key"`         // 当前任务key
-	Status       ProcinstStatus    `json:"status" gorm:"comment:状态"`                        // 状态
-	Remark       string            `json:"remark" gorm:"size:255;"`
-	EndTime      *time.Time        `json:"endTime" gorm:"comment:结束时间"`
-	Duration     int64             `json:"duration" gorm:"comment:流程持续时间（开始到结束）"` // 持续时间（开始到结束）
+	BizHandleRes string            `json:"bizHandleRes" gorm:"type:text;comment:关联的业务处理结果"` // 业务处理结果
+
+	Status   ProcinstStatus `json:"status" gorm:"comment:流程状态"` // 流程状态
+	Remark   string         `json:"remark" gorm:"size:255;"`
+	EndTime  *time.Time     `json:"endTime" gorm:"comment:结束时间"`
+	Duration int64          `json:"duration" gorm:"comment:流程持续时间（开始到结束）"` // 持续时间（开始到结束）
 }
 
 func (a *Procinst) TableName() string {
@@ -36,6 +41,17 @@ func (a *Procinst) SetEnd() {
 	a.Duration = int64(time.Since(*a.CreateTime).Seconds())
 }
 
+// GetProcdefFlow 获取流程定义信息
+func (p *Procinst) GetFlowDef() *FlowDef {
+	flow, err := jsonx.To(p.FlowDef, new(FlowDef))
+	if err != nil {
+		logx.ErrorTrace("parse procdef flow failed", err)
+		return flow
+	}
+
+	return flow
+}
+
 type ProcinstStatus int8
 
 const (
@@ -61,41 +77,3 @@ const (
 	ProcinstBizStatusNo      ProcinstBizStatus = -1 // 不处理
 	ProcinstBizStatusFail    ProcinstBizStatus = -2 // 失败
 )
-
-//----------流程实例关联任务-----------
-
-// 流程实例关联的审批节点任务
-type ProcinstTask struct {
-	model.Model
-
-	ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"` // 流程实例id
-	TaskKey    string `json:"taskKey" gorm:"not null;size:64;comment:任务key"`                   // 当前任务key
-	TaskName   string `json:"taskName" gorm:"size:64;comment:任务名称"`                            // 当前任务名称
-	Assignee   string `json:"assignee" gorm:"size:64;comment:分配到该任务的用户"`                       // 分配到该任务的用户
-
-	Status   ProcinstTaskStatus `json:"status" ` // 状态
-	Remark   string             `json:"remark" gorm:"size:255;"`
-	EndTime  *time.Time         `json:"endTime" gorm:"comment:结束时间"`
-	Duration int64              `json:"duration" gorm:"comment:任务持续时间（开始到结束）"` // 持续时间（开始到结束）
-}
-
-func (a *ProcinstTask) TableName() string {
-	return "t_flow_procinst_task"
-}
-
-// 设置流程任务终止结束的一些信息
-func (p *ProcinstTask) SetEnd() {
-	nowTime := time.Now()
-	p.EndTime = &nowTime
-	p.Duration = int64(time.Since(*p.CreateTime).Seconds())
-}
-
-type ProcinstTaskStatus int8
-
-const (
-	ProcinstTaskStatusProcess  ProcinstTaskStatus = 1  // 处理中
-	ProcinstTaskStatusPass     ProcinstTaskStatus = 2  // 通过
-	ProcinstTaskStatusReject   ProcinstTaskStatus = -1 // 拒绝
-	ProcinstTaskStatusBack     ProcinstTaskStatus = -2 // 驳回
-	ProcinstTaskStatusCanceled ProcinstTaskStatus = -3 // 取消
-)
diff --git a/server/internal/flow/domain/entity/procinst_task.go b/server/internal/flow/domain/entity/procinst_task.go
new file mode 100644
index 00000000..3d0f7170
--- /dev/null
+++ b/server/internal/flow/domain/entity/procinst_task.go
@@ -0,0 +1,48 @@
+package entity
+
+import (
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
+	"time"
+)
+
+//----------流程实例关联任务-----------
+
+// 流程实例关联的节点任务
+type ProcinstTask struct {
+	model.Model
+	model.ExtraData
+
+	ProcinstId  uint64       `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"` // 流程实例id
+	ExecutionId uint64       `json:"executionId" gorm:"not null;comment:执行流id"`
+	NodeKey     string       `json:"nodeKey" gorm:"not null;size:64;comment:节点key"`
+	NodeName    string       `json:"nodeName" gorm:"size:64;comment:节点名称"`
+	NodeType    FlowNodeType `json:"nodeType" gorm:"comment:节点类型"`
+	Vars        collx.M      `json:"vars" gorm:"type:text;comment:任务变量"`
+
+	Status   ProcinstTaskStatus `json:"status" ` // 状态
+	Remark   string             `json:"remark" gorm:"size:255;"`
+	EndTime  *time.Time         `json:"endTime" gorm:"comment:结束时间"`
+	Duration int64              `json:"duration" gorm:"comment:任务持续时间（开始到结束）"` // 持续时间（开始到结束）
+}
+
+func (a *ProcinstTask) TableName() string {
+	return "t_flow_procinst_task"
+}
+
+// 设置流程任务终止结束的一些信息
+func (p *ProcinstTask) SetEnd() {
+	nowTime := time.Now()
+	p.EndTime = &nowTime
+	p.Duration = int64(time.Since(*p.CreateTime).Seconds())
+}
+
+type ProcinstTaskStatus int8
+
+const (
+	ProcinstTaskStatusProcess   ProcinstTaskStatus = 1  // 审批中
+	ProcinstTaskStatusCompleted ProcinstTaskStatus = 2  // 完成
+	ProcinstTaskStatusReject    ProcinstTaskStatus = -1 // 拒绝
+	ProcinstTaskStatusBack      ProcinstTaskStatus = -2 // 驳回
+	ProcinstTaskStatusCanceled  ProcinstTaskStatus = -3 // 取消
+)
diff --git a/server/internal/flow/domain/entity/procinst_task_candidate.go b/server/internal/flow/domain/entity/procinst_task_candidate.go
new file mode 100644
index 00000000..1ea9c602
--- /dev/null
+++ b/server/internal/flow/domain/entity/procinst_task_candidate.go
@@ -0,0 +1,33 @@
+package entity
+
+import (
+	"mayfly-go/pkg/model"
+	"time"
+)
+
+// ProcinstTaskCandidate 流程实例任务处理候选人
+type ProcinstTaskCandidate struct {
+	model.Model
+	model.ExtraData
+
+	ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"`
+	TaskId     uint64 `json:"taskId" gorm:"not null;index:idx_task_id;comment:流程实例任务id"` // 流程实例任务id
+	Candidate  string `json:"condidate" gorm:"size:64;comment:处理候选人"`                    // 处理候选人
+
+	Handler  *string            `json:"handler" gorm:"size:60;"` // 处理人
+	Status   ProcinstTaskStatus `json:"status" `                 // 状态
+	Remark   string             `json:"remark" gorm:"size:255;"`
+	EndTime  *time.Time         `json:"endTime" gorm:"comment:结束时间"`
+	Duration int64              `json:"duration" gorm:"comment:任务持续时间（开始到结束）"` // 持续时间（开始到结束）
+}
+
+func (a *ProcinstTaskCandidate) TableName() string {
+	return "t_flow_procinst_task_candidate"
+}
+
+// 设置流程任务终止结束的一些信息
+func (p *ProcinstTaskCandidate) SetEnd() {
+	nowTime := time.Now()
+	p.EndTime = &nowTime
+	p.Duration = int64(time.Since(*p.CreateTime).Seconds())
+}
diff --git a/server/internal/flow/domain/entity/query.go b/server/internal/flow/domain/entity/query.go
index b47d2317..bac97983 100644
--- a/server/internal/flow/domain/entity/query.go
+++ b/server/internal/flow/domain/entity/query.go
@@ -1,6 +1,10 @@
 package entity
 
+import "mayfly-go/pkg/model"
+
 type ProcinstQuery struct {
+	model.PageParam
+
 	ProcdefId   uint64 `json:"procdefId" form:"procdefId"` // 流程定义id
 	ProcdefName string `json:"procdefName"`                // 流程定义名称
 
@@ -12,10 +16,14 @@ type ProcinstQuery struct {
 }
 
 type ProcinstTaskQuery struct {
+	model.PageParam
+
 	ProcinstId   uint64             `json:"procinstId"`   // 流程实例id
 	ProcinstName string             `json:"procinstName"` // 流程实例名称
 	BizType      string             `json:"bizType" form:"bizType"`
 	BizKey       string             `json:"bizKey" form:"bizKey"` // 业务key
 	Assignee     string             `json:"assignee"`             // 分配到该任务的用户
+	Handler      string             `json:"hanlder"`              // 任务处理人
+	Candidates   []string           `json:"candidates"`           // 任务处理候选人
 	Status       ProcinstTaskStatus `json:"status" form:"status"` // 状态
 }
diff --git a/server/internal/flow/domain/repository/execution.go b/server/internal/flow/domain/repository/execution.go
new file mode 100644
index 00000000..1996a63a
--- /dev/null
+++ b/server/internal/flow/domain/repository/execution.go
@@ -0,0 +1,10 @@
+package repository
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/pkg/base"
+)
+
+type Execution interface {
+	base.Repo[*entity.Execution]
+}
diff --git a/server/internal/flow/domain/repository/his_procinst_op.go b/server/internal/flow/domain/repository/his_procinst_op.go
new file mode 100644
index 00000000..defd773b
--- /dev/null
+++ b/server/internal/flow/domain/repository/his_procinst_op.go
@@ -0,0 +1,10 @@
+package repository
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/pkg/base"
+)
+
+type HisProcinstOp interface {
+	base.Repo[*entity.HisProcinstOp]
+}
diff --git a/server/internal/flow/domain/repository/procdef.go b/server/internal/flow/domain/repository/procdef.go
index 9e22ff7f..760cd88e 100644
--- a/server/internal/flow/domain/repository/procdef.go
+++ b/server/internal/flow/domain/repository/procdef.go
@@ -9,5 +9,5 @@ import (
 type Procdef interface {
 	base.Repo[*entity.Procdef]
 
-	GetPageList(condition *entity.Procdef, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.Procdef, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.ProcdefPagePO], error)
 }
diff --git a/server/internal/flow/domain/repository/procinst.go b/server/internal/flow/domain/repository/procinst.go
index 80bcac62..05924bd5 100644
--- a/server/internal/flow/domain/repository/procinst.go
+++ b/server/internal/flow/domain/repository/procinst.go
@@ -9,11 +9,5 @@ import (
 type Procinst interface {
 	base.Repo[*entity.Procinst]
 
-	GetPageList(condition *entity.ProcinstQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
-}
-
-type ProcinstTask interface {
-	base.Repo[*entity.ProcinstTask]
-
-	GetPageList(condition *entity.ProcinstTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.ProcinstQuery, orderBy ...string) (*model.PageResult[*entity.Procinst], error)
 }
diff --git a/server/internal/flow/domain/repository/procinst_task.go b/server/internal/flow/domain/repository/procinst_task.go
new file mode 100644
index 00000000..692fcb11
--- /dev/null
+++ b/server/internal/flow/domain/repository/procinst_task.go
@@ -0,0 +1,13 @@
+package repository
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/model"
+)
+
+type ProcinstTask interface {
+	base.Repo[*entity.ProcinstTask]
+
+	GetPageList(condition *entity.ProcinstTaskQuery, orderBy ...string) (*model.PageResult[*entity.ProcinstTaskPO], error)
+}
diff --git a/server/internal/flow/domain/repository/procinst_task_candidate.go b/server/internal/flow/domain/repository/procinst_task_candidate.go
new file mode 100644
index 00000000..613d0e7e
--- /dev/null
+++ b/server/internal/flow/domain/repository/procinst_task_candidate.go
@@ -0,0 +1,10 @@
+package repository
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/pkg/base"
+)
+
+type ProcinstTaskCandidate interface {
+	base.Repo[*entity.ProcinstTaskCandidate]
+}
diff --git a/server/internal/flow/imsg/en.go b/server/internal/flow/imsg/en.go
index a664e438..be3b5975 100644
--- a/server/internal/flow/imsg/en.go
+++ b/server/internal/flow/imsg/en.go
@@ -7,9 +7,12 @@ var En = map[i18n.MsgId]string{
 	LogProcdefDelete: "ProcDef - Delete",
 
 	ErrProcdefKeyExist:        "the process instance key already exists",
+	ErrProcdefFlowNotExist:    "The process definition does not exist",
 	ErrExistProcinstRunning:   "There is a running process instance that cannot be manipulated",
 	ErrExistProcinstSuspended: "There is a pending process instance that cannot be manipulated",
 
+	ErrUserTaskNodeCandidateNotEmpty: "The candidate of the user task node [{{.name}}] cannot be empty",
+
 	// procinst
 	LogProcinstStart:  "Process - Start",
 	LogProcinstCancel: "Process - Cancel",
diff --git a/server/internal/flow/imsg/imsg.go b/server/internal/flow/imsg/imsg.go
index 5f8dc921..841a798a 100644
--- a/server/internal/flow/imsg/imsg.go
+++ b/server/internal/flow/imsg/imsg.go
@@ -15,9 +15,12 @@ const (
 	LogProcdefDelete
 
 	ErrProcdefKeyExist
+	ErrProcdefFlowNotExist
 	ErrExistProcinstRunning
 	ErrExistProcinstSuspended
 
+	ErrUserTaskNodeCandidateNotEmpty
+
 	// procinst
 	LogProcinstStart
 	LogProcinstCancel
diff --git a/server/internal/flow/imsg/zh_cn.go b/server/internal/flow/imsg/zh_cn.go
index dd376f6d..28b96ae3 100644
--- a/server/internal/flow/imsg/zh_cn.go
+++ b/server/internal/flow/imsg/zh_cn.go
@@ -7,9 +7,12 @@ var Zh_CN = map[i18n.MsgId]string{
 	LogProcdefDelete: "流程定义-删除",
 
 	ErrProcdefKeyExist:        "该流程实例key已存在",
+	ErrProcdefFlowNotExist:    "流程审批流未设置",
 	ErrExistProcinstRunning:   "存在运行中的流程实例，无法操作",
 	ErrExistProcinstSuspended: "存在挂起中的流程实例，无法操作",
 
+	ErrUserTaskNodeCandidateNotEmpty: "用户任务节点 [{{.name}}] 的候选人不能为空",
+
 	// procinst
 	LogProcinstStart:  "流程-启动",
 	LogProcinstCancel: "流程-取消",
diff --git a/server/internal/flow/infrastructure/persistence/execution.go b/server/internal/flow/infrastructure/persistence/execution.go
new file mode 100644
index 00000000..23fd1307
--- /dev/null
+++ b/server/internal/flow/infrastructure/persistence/execution.go
@@ -0,0 +1,15 @@
+package persistence
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+)
+
+type exectionImpl struct {
+	base.RepoImpl[*entity.Execution]
+}
+
+func newExectionRepo() repository.Execution {
+	return &exectionImpl{}
+}
diff --git a/server/internal/flow/infrastructure/persistence/hist_procinst_op.go b/server/internal/flow/infrastructure/persistence/hist_procinst_op.go
new file mode 100644
index 00000000..7849f426
--- /dev/null
+++ b/server/internal/flow/infrastructure/persistence/hist_procinst_op.go
@@ -0,0 +1,15 @@
+package persistence
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+)
+
+type hisProcinstOpImpl struct {
+	base.RepoImpl[*entity.HisProcinstOp]
+}
+
+func newHisProcinstOpRepo() repository.HisProcinstOp {
+	return &hisProcinstOpImpl{}
+}
diff --git a/server/internal/flow/infrastructure/persistence/persistence.go b/server/internal/flow/infrastructure/persistence/persistence.go
index 6b55cbfc..07c43269 100644
--- a/server/internal/flow/infrastructure/persistence/persistence.go
+++ b/server/internal/flow/infrastructure/persistence/persistence.go
@@ -1,11 +1,19 @@
 package persistence
 
 import (
+	"mayfly-go/internal/flow/domain/repository"
 	"mayfly-go/pkg/ioc"
 )
 
 func InitIoc() {
 	ioc.Register(newProcdefRepo(), ioc.WithComponentName("ProcdefRepo"))
 	ioc.Register(newProcinstRepo(), ioc.WithComponentName("ProcinstRepo"))
+	ioc.Register(newExectionRepo(), ioc.WithComponentName("ExectionRepo"))
 	ioc.Register(newProcinstTaskRepo(), ioc.WithComponentName("ProcinstTaskRepo"))
+	ioc.Register(newProcinstTaskCandidateRepo(), ioc.WithComponentName("ProcinstTaskCandidateRepo"))
+	ioc.Register(newHisProcinstOpRepo(), ioc.WithComponentName("HisProcinstTaskRepo"))
+}
+
+func GetProcinstTaskCandidateRepo() repository.ProcinstTaskCandidate {
+	return ioc.Get[repository.ProcinstTaskCandidate]("ProcinstTaskCandidateRepo")
 }
diff --git a/server/internal/flow/infrastructure/persistence/procdef.go b/server/internal/flow/infrastructure/persistence/procdef.go
index 44df930e..8ff6079b 100644
--- a/server/internal/flow/infrastructure/persistence/procdef.go
+++ b/server/internal/flow/infrastructure/persistence/procdef.go
@@ -4,6 +4,7 @@ import (
 	"mayfly-go/internal/flow/domain/entity"
 	"mayfly-go/internal/flow/domain/repository"
 	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/gormx"
 	"mayfly-go/pkg/model"
 )
 
@@ -15,9 +16,11 @@ func newProcdefRepo() repository.Procdef {
 	return &procdefImpl{}
 }
 
-func (p *procdefImpl) GetPageList(condition *entity.Procdef, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (p *procdefImpl) GetPageList(condition *entity.Procdef, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.ProcdefPagePO], error) {
 	qd := model.NewCond().
 		Like("name", condition.Name).
 		Like("def_key", condition.DefKey)
-	return p.PageByCondToAny(qd, pageParam, toEntity)
+
+	var res []*entity.ProcdefPagePO
+	return gormx.PageByCond(p.GetModel(), qd, pageParam, res)
 }
diff --git a/server/internal/flow/infrastructure/persistence/procinst.go b/server/internal/flow/infrastructure/persistence/procinst.go
index df452360..45eb9278 100644
--- a/server/internal/flow/infrastructure/persistence/procinst.go
+++ b/server/internal/flow/infrastructure/persistence/procinst.go
@@ -4,7 +4,6 @@ import (
 	"mayfly-go/internal/flow/domain/entity"
 	"mayfly-go/internal/flow/domain/repository"
 	"mayfly-go/pkg/base"
-	"mayfly-go/pkg/gormx"
 	"mayfly-go/pkg/model"
 )
 
@@ -16,30 +15,7 @@ func newProcinstRepo() repository.Procinst {
 	return &procinstImpl{}
 }
 
-func (p *procinstImpl) GetPageList(condition *entity.ProcinstQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (p *procinstImpl) GetPageList(condition *entity.ProcinstQuery, orderBy ...string) (*model.PageResult[*entity.Procinst], error) {
 	qd := model.NewModelCond(condition)
-	return p.PageByCondToAny(qd, pageParam, toEntity)
-}
-
-//-----------procinst task--------------
-
-type procinstTaskImpl struct {
-	base.RepoImpl[*entity.ProcinstTask]
-}
-
-func newProcinstTaskRepo() repository.ProcinstTask {
-	return &procinstTaskImpl{}
-}
-
-func (p *procinstTaskImpl) GetPageList(condition *entity.ProcinstTaskQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	qd := gormx.NewQueryWithTableName("t_flow_procinst_task t").
-		Joins("JOIN t_flow_procinst tp ON t.procinst_id = tp.id ").
-		WithCond(model.NewCond().Columns("t.*, tp.biz_key").
-			Eq("tp.biz_key", condition.BizKey).
-			Eq0("tp.is_deleted", model.ModelUndeleted).
-			Eq("tp.biz_type", condition.BizType).
-			Eq0("t.is_deleted", model.ModelUndeleted).
-			Eq("t.status", condition.Status).
-			OrderByDesc("t.id"))
-	return gormx.PageQuery(qd, pageParam, toEntity)
+	return p.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/flow/infrastructure/persistence/procinst_task.go b/server/internal/flow/infrastructure/persistence/procinst_task.go
new file mode 100644
index 00000000..8e2bda37
--- /dev/null
+++ b/server/internal/flow/infrastructure/persistence/procinst_task.go
@@ -0,0 +1,36 @@
+package persistence
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/gormx"
+	"mayfly-go/pkg/model"
+)
+
+type procinstTaskImpl struct {
+	base.RepoImpl[*entity.ProcinstTask]
+}
+
+func newProcinstTaskRepo() repository.ProcinstTask {
+	return &procinstTaskImpl{}
+}
+
+func (p *procinstTaskImpl) GetPageList(condition *entity.ProcinstTaskQuery, orderBy ...string) (*model.PageResult[*entity.ProcinstTaskPO], error) {
+	qd := gormx.NewQueryWithTableName("t_flow_procinst_task t").
+		Joins("JOIN t_flow_procinst tp ON t.procinst_id = tp.id JOIN t_flow_procinst_task_candidate tptc ON  tptc.task_id = t.id ").
+		WithCond(model.NewCond().Columns("DISTINCT(t.id) id, t.procinst_id, t.execution_id, t.node_key, t.node_name, t.status, t.remark, t.create_time, tp.biz_key, tptc.status, tptc.duration, tptc.end_time, tptc.handler, tptc.candidate").
+			Eq0("tp.is_deleted", model.ModelUndeleted).
+			Eq0("t.is_deleted", model.ModelUndeleted).
+			Eq0("tptc.is_deleted", model.ModelUndeleted).
+			Eq("t.procinst_id", condition.ProcinstId).
+			Eq("tp.biz_key", condition.BizKey).
+			Eq("tp.biz_type", condition.BizType).
+			Eq("tptc.handler", condition.Handler).
+			Eq("tptc.status", condition.Status).
+			In("tptc.candidate", condition.Candidates).
+			OrderByDesc("t.id"))
+
+	tasks := []*entity.ProcinstTaskPO{}
+	return gormx.PageQuery(qd, condition.PageParam, tasks)
+}
diff --git a/server/internal/flow/infrastructure/persistence/procinst_task_candidate.go b/server/internal/flow/infrastructure/persistence/procinst_task_candidate.go
new file mode 100644
index 00000000..ca43fb81
--- /dev/null
+++ b/server/internal/flow/infrastructure/persistence/procinst_task_candidate.go
@@ -0,0 +1,15 @@
+package persistence
+
+import (
+	"mayfly-go/internal/flow/domain/entity"
+	"mayfly-go/internal/flow/domain/repository"
+	"mayfly-go/pkg/base"
+)
+
+type procinstTaskCandidateImpl struct {
+	base.RepoImpl[*entity.ProcinstTaskCandidate]
+}
+
+func newProcinstTaskCandidateRepo() repository.ProcinstTaskCandidate {
+	return &procinstTaskCandidateImpl{}
+}
diff --git a/server/internal/flow/init/init.go b/server/internal/flow/init/init.go
index a652156d..b75c2ff0 100644
--- a/server/internal/flow/init/init.go
+++ b/server/internal/flow/init/init.go
@@ -13,4 +13,6 @@ func init() {
 		application.InitIoc()
 		api.InitIoc()
 	})
+
+	initialize.AddInitFunc(application.Init)
 }
diff --git a/server/internal/machine/api/machine.go b/server/internal/machine/api/machine.go
index fd256e00..bb615653 100644
--- a/server/internal/machine/api/machine.go
+++ b/server/internal/machine/api/machine.go
@@ -76,7 +76,7 @@ func (m *Machine) ReqConfs() *req.Confs {
 }
 
 func (m *Machine) Machines(rc *req.Ctx) {
-	condition, pageParam := req.BindQueryAndPage(rc, new(entity.MachineQuery))
+	condition := req.BindQuery(rc, new(entity.MachineQuery))
 
 	tags := m.tagTreeApp.GetAccountTags(rc.GetLoginAccount().Id, &tagentity.TagTreeQuery{
 		TypePaths:     collx.AsArray(tagentity.NewTypePaths(tagentity.TagTypeMachine, tagentity.TagTypeAuthCert)),
@@ -84,7 +84,7 @@ func (m *Machine) Machines(rc *req.Ctx) {
 	})
 	// 不存在可操作的机器-授权凭证标签，即没有可操作数据
 	if len(tags) == 0 {
-		rc.ResData = model.EmptyPageResult[any]()
+		rc.ResData = model.NewEmptyPageResult[any]()
 		return
 	}
 
@@ -92,14 +92,16 @@ func (m *Machine) Machines(rc *req.Ctx) {
 	machineCodes := tagentity.GetCodesByCodePaths(tagentity.TagTypeMachine, tagCodePaths...)
 	condition.Codes = collx.ArrayDeduplicate(machineCodes)
 
-	var machinevos []*vo.MachineVO
-	res, err := m.machineApp.GetMachineList(condition, pageParam, &machinevos)
+	res, err := m.machineApp.GetMachineList(condition)
 	biz.ErrIsNil(err)
 	if res.Total == 0 {
 		rc.ResData = res
 		return
 	}
 
+	resVo := model.PageResultConv[*entity.Machine, *vo.MachineVO](res)
+	machinevos := resVo.List
+
 	// 填充标签信息
 	m.tagTreeApp.FillTagInfo(tagentity.TagType(consts.ResourceTypeMachine), collx.ArrayMap(machinevos, func(mvo *vo.MachineVO) tagentity.ITagResource {
 		return mvo
@@ -120,7 +122,7 @@ func (m *Machine) Machines(rc *req.Ctx) {
 			}
 		}
 	}
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (m *Machine) SimpleMachieInfo(rc *req.Ctx) {
@@ -270,7 +272,7 @@ func (m *Machine) WsSSH(rc *req.Ctx) {
 
 func (m *Machine) MachineTermOpRecords(rc *req.Ctx) {
 	mid := GetMachineId(rc)
-	res, err := m.machineTermOpApp.GetPageList(&entity.MachineTermOp{MachineId: mid}, rc.GetPageParam(), new([]entity.MachineTermOp))
+	res, err := m.machineTermOpApp.GetPageList(&entity.MachineTermOp{MachineId: mid}, rc.GetPageParam())
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/machine/api/machine_cronjob.go b/server/internal/machine/api/machine_cronjob.go
index 8809d598..60cffb8b 100644
--- a/server/internal/machine/api/machine_cronjob.go
+++ b/server/internal/machine/api/machine_cronjob.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/scheduler"
 	"mayfly-go/pkg/utils/collx"
@@ -44,9 +45,10 @@ func (mcj *MachineCronJob) ReqConfs() *req.Confs {
 func (m *MachineCronJob) MachineCronJobs(rc *req.Ctx) {
 	cond, pageParam := req.BindQueryAndPage(rc, new(entity.MachineCronJob))
 
-	var vos []*vo.MachineCronJobVO
-	pageRes, err := m.machineCronJobApp.GetPageList(cond, pageParam, &vos)
+	pageRes, err := m.machineCronJobApp.GetPageList(cond, pageParam)
 	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.MachineCronJob, *vo.MachineCronJobVO](pageRes)
+	vos := resVo.List
 
 	for _, mcj := range vos {
 		mcj.Running = scheduler.ExistKey(mcj.Key)
@@ -56,7 +58,7 @@ func (m *MachineCronJob) MachineCronJobs(rc *req.Ctx) {
 		return mvo
 	})...)
 
-	rc.ResData = pageRes
+	rc.ResData = resVo
 }
 
 func (m *MachineCronJob) Save(rc *req.Ctx) {
@@ -89,7 +91,7 @@ func (m *MachineCronJob) RunCronJob(rc *req.Ctx) {
 
 func (m *MachineCronJob) CronJobExecs(rc *req.Ctx) {
 	cond, pageParam := req.BindQueryAndPage[*entity.MachineCronJobExec](rc, new(entity.MachineCronJobExec))
-	res, err := m.machineCronJobApp.GetExecPageList(cond, pageParam, new([]entity.MachineCronJobExec))
+	res, err := m.machineCronJobApp.GetExecPageList(cond, pageParam)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/machine/api/machine_file.go b/server/internal/machine/api/machine_file.go
index 95ed41c1..e1da7544 100644
--- a/server/internal/machine/api/machine_file.go
+++ b/server/internal/machine/api/machine_file.go
@@ -18,6 +18,7 @@ import (
 	"mayfly-go/pkg/errorx"
 	"mayfly-go/pkg/i18n"
 	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/utils/anyx"
 	"mayfly-go/pkg/utils/collx"
@@ -86,9 +87,9 @@ const (
 
 func (m *MachineFile) MachineFiles(rc *req.Ctx) {
 	condition := &entity.MachineFile{MachineId: GetMachineId(rc)}
-	res, err := m.machineFileApp.GetPageList(condition, rc.GetPageParam(), new([]vo.MachineFileVO))
+	res, err := m.machineFileApp.GetPageList(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
-	rc.ResData = res
+	rc.ResData = model.PageResultConv[*entity.MachineFile, *vo.MachineFileVO](res)
 }
 
 func (m *MachineFile) SaveMachineFiles(rc *req.Ctx) {
diff --git a/server/internal/machine/api/machine_script.go b/server/internal/machine/api/machine_script.go
index 01334a5b..ae4582bd 100644
--- a/server/internal/machine/api/machine_script.go
+++ b/server/internal/machine/api/machine_script.go
@@ -7,6 +7,7 @@ import (
 	"mayfly-go/internal/machine/domain/entity"
 	tagapp "mayfly-go/internal/tag/application"
 	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/jsonx"
@@ -39,9 +40,9 @@ func (ms *MachineScript) ReqConfs() *req.Confs {
 
 func (m *MachineScript) MachineScripts(rc *req.Ctx) {
 	condition := &entity.MachineScript{MachineId: GetMachineId(rc)}
-	res, err := m.machineScriptApp.GetPageList(condition, rc.GetPageParam(), new([]vo.MachineScriptVO))
+	res, err := m.machineScriptApp.GetPageList(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
-	rc.ResData = res
+	rc.ResData = model.PageResultConv[*entity.MachineScript, *vo.MachineScriptVO](res)
 }
 
 func (m *MachineScript) SaveMachineScript(rc *req.Ctx) {
diff --git a/server/internal/machine/application/machine.go b/server/internal/machine/application/machine.go
index df8b1e22..ec174bce 100644
--- a/server/internal/machine/application/machine.go
+++ b/server/internal/machine/application/machine.go
@@ -35,7 +35,7 @@ type Machine interface {
 	Delete(ctx context.Context, id uint64) error
 
 	// 分页获取机器信息列表
-	GetMachineList(condition *entity.MachineQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetMachineList(condition *entity.MachineQuery, orderBy ...string) (*model.PageResult[*entity.Machine], error)
 
 	// 新建机器客户端连接（需手动调用Close）
 	NewCli(authCertName string) (*mcm.Cli, error)
@@ -71,8 +71,8 @@ type machineAppImpl struct {
 var _ (Machine) = (*machineAppImpl)(nil)
 
 // 分页获取机器信息列表
-func (m *machineAppImpl) GetMachineList(condition *entity.MachineQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.GetRepo().GetMachineList(condition, pageParam, toEntity, orderBy...)
+func (m *machineAppImpl) GetMachineList(condition *entity.MachineQuery, orderBy ...string) (*model.PageResult[*entity.Machine], error) {
+	return m.GetRepo().GetMachineList(condition, orderBy...)
 }
 
 func (m *machineAppImpl) SaveMachine(ctx context.Context, param *dto.SaveMachine) error {
diff --git a/server/internal/machine/application/machine_cronjob.go b/server/internal/machine/application/machine_cronjob.go
index 89ca2300..e664f6a6 100644
--- a/server/internal/machine/application/machine_cronjob.go
+++ b/server/internal/machine/application/machine_cronjob.go
@@ -22,10 +22,10 @@ type MachineCronJob interface {
 	base.App[*entity.MachineCronJob]
 
 	// 分页获取机器任务列表信息
-	GetPageList(condition *entity.MachineCronJob, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineCronJob, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJob], error)
 
 	// 获取分页执行结果列表
-	GetExecPageList(condition *entity.MachineCronJobExec, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetExecPageList(condition *entity.MachineCronJobExec, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJobExec], error)
 
 	SaveMachineCronJob(ctx context.Context, param *dto.SaveMachineCronJob) error
 
@@ -52,13 +52,13 @@ type machineCronJobAppImpl struct {
 var _ (MachineCronJob) = (*machineCronJobAppImpl)(nil)
 
 // 分页获取机器脚本任务列表
-func (m *machineCronJobAppImpl) GetPageList(condition *entity.MachineCronJob, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.GetRepo().GetPageList(condition, pageParam, toEntity, orderBy...)
+func (m *machineCronJobAppImpl) GetPageList(condition *entity.MachineCronJob, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJob], error) {
+	return m.GetRepo().GetPageList(condition, pageParam, orderBy...)
 }
 
 // 获取分页执行结果列表
-func (m *machineCronJobAppImpl) GetExecPageList(condition *entity.MachineCronJobExec, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.machineCronJobExecRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (m *machineCronJobAppImpl) GetExecPageList(condition *entity.MachineCronJobExec, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJobExec], error) {
+	return m.machineCronJobExecRepo.GetPageList(condition, pageParam, orderBy...)
 }
 
 // 保存机器任务信息
@@ -101,14 +101,14 @@ func (m *machineCronJobAppImpl) InitCronJob() {
 		}
 	}()
 
-	pageParam := &model.PageParam{
+	pageParam := model.PageParam{
 		PageSize: 100,
 		PageNum:  1,
 	}
 
 	var mcjs []*entity.MachineCronJob
 	cond := &entity.MachineCronJob{Status: entity.MachineCronJobStatusEnable}
-	pr, _ := m.GetPageList(cond, pageParam, &mcjs)
+	pr, _ := m.GetPageList(cond, pageParam)
 	total := pr.Total
 	add := 0
 
@@ -122,7 +122,7 @@ func (m *machineCronJobAppImpl) InitCronJob() {
 		}
 
 		pageParam.PageNum = pageParam.PageNum + 1
-		m.GetPageList(cond, pageParam, mcjs)
+		m.GetPageList(cond, pageParam)
 	}
 }
 
diff --git a/server/internal/machine/application/machine_file.go b/server/internal/machine/application/machine_file.go
index c4ff501c..7f395f33 100644
--- a/server/internal/machine/application/machine_file.go
+++ b/server/internal/machine/application/machine_file.go
@@ -30,7 +30,7 @@ type MachineFile interface {
 	base.App[*entity.MachineFile]
 
 	// 分页获取机器文件信息列表
-	GetPageList(condition *entity.MachineFile, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineFile, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineFile], error)
 
 	// 根据条件获取
 	GetMachineFile(condition *entity.MachineFile, cols ...string) error
@@ -91,9 +91,9 @@ func (m *machineFileAppImpl) InjectMachineFileRepo(repo repository.MachineFile)
 	m.Repo = repo
 }
 
-// 分页获取机器脚本信息列表
-func (m *machineFileAppImpl) GetPageList(condition *entity.MachineFile, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.GetRepo().GetPageList(condition, pageParam, toEntity, orderBy...)
+// 分页获取机器文件配置信息列表
+func (m *machineFileAppImpl) GetPageList(condition *entity.MachineFile, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineFile], error) {
+	return m.GetRepo().GetPageList(condition, pageParam, orderBy...)
 }
 
 // 根据条件获取
diff --git a/server/internal/machine/application/machine_script.go b/server/internal/machine/application/machine_script.go
index a4c06b2e..9d64198d 100644
--- a/server/internal/machine/application/machine_script.go
+++ b/server/internal/machine/application/machine_script.go
@@ -13,7 +13,7 @@ type MachineScript interface {
 	base.App[*entity.MachineScript]
 
 	// 分页获取机器脚本信息列表
-	GetPageList(condition *entity.MachineScript, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineScript, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineScript], error)
 
 	Save(ctx context.Context, entity *entity.MachineScript) error
 
@@ -29,8 +29,8 @@ type machineScriptAppImpl struct {
 const Common_Script_Machine_Id = 9999999
 
 // 分页获取机器脚本信息列表
-func (m *machineScriptAppImpl) GetPageList(condition *entity.MachineScript, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.GetRepo().GetPageList(condition, pageParam, toEntity, orderBy...)
+func (m *machineScriptAppImpl) GetPageList(condition *entity.MachineScript, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineScript], error) {
+	return m.GetRepo().GetPageList(condition, pageParam, orderBy...)
 }
 
 // 保存机器脚本
diff --git a/server/internal/machine/application/machine_term_op.go b/server/internal/machine/application/machine_term_op.go
index ffefa154..99a839c4 100644
--- a/server/internal/machine/application/machine_term_op.go
+++ b/server/internal/machine/application/machine_term_op.go
@@ -29,7 +29,7 @@ type MachineTermOp interface {
 	// 终端连接操作
 	TermConn(ctx context.Context, cli *mcm.Cli, wsConn *websocket.Conn, rows, cols int) error
 
-	GetPageList(condition *entity.MachineTermOp, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineTermOp, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineTermOp], error)
 
 	// 定时删除终端文件回放记录
 	TimerDeleteTermOp()
@@ -110,8 +110,8 @@ func (m *machineTermOpAppImpl) TermConn(ctx context.Context, cli *mcm.Cli, wsCon
 	return nil
 }
 
-func (m *machineTermOpAppImpl) GetPageList(condition *entity.MachineTermOp, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.GetRepo().GetPageList(condition, pageParam, toEntity)
+func (m *machineTermOpAppImpl) GetPageList(condition *entity.MachineTermOp, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineTermOp], error) {
+	return m.GetRepo().GetPageList(condition, pageParam)
 }
 
 func (m *machineTermOpAppImpl) TimerDeleteTermOp() {
diff --git a/server/internal/machine/domain/entity/query.go b/server/internal/machine/domain/entity/query.go
index b6045b19..5b61025d 100644
--- a/server/internal/machine/domain/entity/query.go
+++ b/server/internal/machine/domain/entity/query.go
@@ -1,8 +1,13 @@
 package entity
 
-import "time"
+import (
+	"mayfly-go/pkg/model"
+	"time"
+)
 
 type MachineQuery struct {
+	model.PageParam
+
 	Id       uint64 `json:"id" form:"id"`
 	Code     string `json:"code" form:"code"`
 	Name     string `json:"name" form:"name"`
diff --git a/server/internal/machine/domain/repository/machine.go b/server/internal/machine/domain/repository/machine.go
index d6f046ce..d056680d 100644
--- a/server/internal/machine/domain/repository/machine.go
+++ b/server/internal/machine/domain/repository/machine.go
@@ -10,5 +10,5 @@ type Machine interface {
 	base.Repo[*entity.Machine]
 
 	// 分页获取机器信息列表
-	GetMachineList(condition *entity.MachineQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetMachineList(condition *entity.MachineQuery, orderBy ...string) (*model.PageResult[*entity.Machine], error)
 }
diff --git a/server/internal/machine/domain/repository/machine_cronjob.go b/server/internal/machine/domain/repository/machine_cronjob.go
index c6d9fa62..e8707d45 100644
--- a/server/internal/machine/domain/repository/machine_cronjob.go
+++ b/server/internal/machine/domain/repository/machine_cronjob.go
@@ -9,11 +9,11 @@ import (
 type MachineCronJob interface {
 	base.Repo[*entity.MachineCronJob]
 
-	GetPageList(condition *entity.MachineCronJob, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineCronJob, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJob], error)
 }
 
 type MachineCronJobExec interface {
 	base.Repo[*entity.MachineCronJobExec]
 
-	GetPageList(condition *entity.MachineCronJobExec, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineCronJobExec, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJobExec], error)
 }
diff --git a/server/internal/machine/domain/repository/machine_file.go b/server/internal/machine/domain/repository/machine_file.go
index daac7f75..f51bed9f 100644
--- a/server/internal/machine/domain/repository/machine_file.go
+++ b/server/internal/machine/domain/repository/machine_file.go
@@ -10,5 +10,5 @@ type MachineFile interface {
 	base.Repo[*entity.MachineFile]
 
 	// 分页获取机器脚本信息列表
-	GetPageList(condition *entity.MachineFile, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineFile, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineFile], error)
 }
diff --git a/server/internal/machine/domain/repository/machine_script.go b/server/internal/machine/domain/repository/machine_script.go
index e677f57b..6a0315f1 100644
--- a/server/internal/machine/domain/repository/machine_script.go
+++ b/server/internal/machine/domain/repository/machine_script.go
@@ -10,5 +10,5 @@ type MachineScript interface {
 	base.Repo[*entity.MachineScript]
 
 	// 分页获取机器脚本信息列表
-	GetPageList(condition *entity.MachineScript, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineScript, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineScript], error)
 }
diff --git a/server/internal/machine/domain/repository/machine_term_op.go b/server/internal/machine/domain/repository/machine_term_op.go
index 698e295f..14aaa7ad 100644
--- a/server/internal/machine/domain/repository/machine_term_op.go
+++ b/server/internal/machine/domain/repository/machine_term_op.go
@@ -10,7 +10,7 @@ type MachineTermOp interface {
 	base.Repo[*entity.MachineTermOp]
 
 	// 分页获取机器终端执行记录列表
-	GetPageList(condition *entity.MachineTermOp, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MachineTermOp, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineTermOp], error)
 
 	// 根据条件获取记录列表
 	SelectByQuery(cond *entity.MachineTermOpQuery) ([]*entity.MachineTermOp, error)
diff --git a/server/internal/machine/infrastructure/persistence/machine.go b/server/internal/machine/infrastructure/persistence/machine.go
index 569ed588..b33176c6 100644
--- a/server/internal/machine/infrastructure/persistence/machine.go
+++ b/server/internal/machine/infrastructure/persistence/machine.go
@@ -16,7 +16,7 @@ func newMachineRepo() repository.Machine {
 }
 
 // 分页获取机器信息列表
-func (m *machineRepoImpl) GetMachineList(condition *entity.MachineQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *machineRepoImpl) GetMachineList(condition *entity.MachineQuery, orderBy ...string) (*model.PageResult[*entity.Machine], error) {
 	qd := model.NewCond().
 		Eq("id", condition.Id).
 		Eq("status", condition.Status).
@@ -32,5 +32,5 @@ func (m *machineRepoImpl) GetMachineList(condition *entity.MachineQuery, pagePar
 		qd.And("ip like ? or name like ? or code like ?", keyword, keyword, keyword)
 	}
 
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/machine/infrastructure/persistence/machine_cronjob.go b/server/internal/machine/infrastructure/persistence/machine_cronjob.go
index 125ba91a..53cb0a04 100644
--- a/server/internal/machine/infrastructure/persistence/machine_cronjob.go
+++ b/server/internal/machine/infrastructure/persistence/machine_cronjob.go
@@ -16,7 +16,7 @@ func newMachineCronJobRepo() repository.MachineCronJob {
 }
 
 // 分页获取机器信息列表
-func (m *machineCronJobRepoImpl) GetPageList(condition *entity.MachineCronJob, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *machineCronJobRepoImpl) GetPageList(condition *entity.MachineCronJob, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJob], error) {
 	qd := model.NewCond().Like("name", condition.Name).Eq("status", condition.Status).OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, pageParam)
 }
diff --git a/server/internal/machine/infrastructure/persistence/machine_cronjob_exec.go b/server/internal/machine/infrastructure/persistence/machine_cronjob_exec.go
index fcab530a..f1c688b1 100644
--- a/server/internal/machine/infrastructure/persistence/machine_cronjob_exec.go
+++ b/server/internal/machine/infrastructure/persistence/machine_cronjob_exec.go
@@ -16,7 +16,7 @@ func newMachineCronJobExecRepo() repository.MachineCronJobExec {
 }
 
 // 分页获取机器信息列表
-func (m *machineCropJobExecRepoImpl) GetPageList(condition *entity.MachineCronJobExec, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *machineCropJobExecRepoImpl) GetPageList(condition *entity.MachineCronJobExec, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineCronJobExec], error) {
 	qd := model.NewModelCond(condition).OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, pageParam)
 }
diff --git a/server/internal/machine/infrastructure/persistence/machine_file.go b/server/internal/machine/infrastructure/persistence/machine_file.go
index 2ab0b78d..2856b19f 100644
--- a/server/internal/machine/infrastructure/persistence/machine_file.go
+++ b/server/internal/machine/infrastructure/persistence/machine_file.go
@@ -16,7 +16,7 @@ func newMachineFileRepo() repository.MachineFile {
 }
 
 // 分页获取机器文件信息列表
-func (m *machineFileRepoImpl) GetPageList(condition *entity.MachineFile, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *machineFileRepoImpl) GetPageList(condition *entity.MachineFile, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineFile], error) {
 	qd := model.NewModelCond(condition).OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, pageParam)
 }
diff --git a/server/internal/machine/infrastructure/persistence/machine_script.go b/server/internal/machine/infrastructure/persistence/machine_script.go
index 47aac0b7..ab13f3bf 100644
--- a/server/internal/machine/infrastructure/persistence/machine_script.go
+++ b/server/internal/machine/infrastructure/persistence/machine_script.go
@@ -16,7 +16,7 @@ func newMachineScriptRepo() repository.MachineScript {
 }
 
 // 分页获取机器信息列表
-func (m *machineScriptRepoImpl) GetPageList(condition *entity.MachineScript, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *machineScriptRepoImpl) GetPageList(condition *entity.MachineScript, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineScript], error) {
 	qd := model.NewModelCond(condition).OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, pageParam)
 }
diff --git a/server/internal/machine/infrastructure/persistence/machine_term_op.go b/server/internal/machine/infrastructure/persistence/machine_term_op.go
index dd7ae236..682a8050 100644
--- a/server/internal/machine/infrastructure/persistence/machine_term_op.go
+++ b/server/internal/machine/infrastructure/persistence/machine_term_op.go
@@ -15,9 +15,9 @@ func newMachineTermOpRepoImpl() repository.MachineTermOp {
 	return &machineTermOpRepoImpl{}
 }
 
-func (m *machineTermOpRepoImpl) GetPageList(condition *entity.MachineTermOp, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *machineTermOpRepoImpl) GetPageList(condition *entity.MachineTermOp, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MachineTermOp], error) {
 	pd := model.NewModelCond(condition).OrderBy(orderBy...)
-	return m.PageByCondToAny(pd, pageParam, toEntity)
+	return m.PageByCond(pd, pageParam)
 }
 
 // 根据条件获取记录列表
diff --git a/server/internal/mongo/api/mongo.go b/server/internal/mongo/api/mongo.go
index b3e7dba2..7eb6085e 100644
--- a/server/internal/mongo/api/mongo.go
+++ b/server/internal/mongo/api/mongo.go
@@ -68,7 +68,7 @@ func (ma *Mongo) ReqConfs() *req.Confs {
 }
 
 func (m *Mongo) Mongos(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.MongoQuery](rc, new(entity.MongoQuery))
+	queryCond := req.BindQuery(rc, new(entity.MongoQuery))
 
 	// 不存在可访问标签id，即没有可操作数据
 	tags := m.tagTreeApp.GetAccountTags(rc.GetLoginAccount().Id, &tagentity.TagTreeQuery{
@@ -76,21 +76,22 @@ func (m *Mongo) Mongos(rc *req.Ctx) {
 		CodePathLikes: []string{queryCond.TagPath},
 	})
 	if len(tags) == 0 {
-		rc.ResData = model.EmptyPageResult[any]()
+		rc.ResData = model.NewEmptyPageResult[any]()
 		return
 	}
 	queryCond.Codes = tags.GetCodes()
 
-	var mongovos []*vo.Mongo
-	res, err := m.mongoApp.GetPageList(queryCond, page, &mongovos)
+	res, err := m.mongoApp.GetPageList(queryCond)
 	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.Mongo, *vo.Mongo](res)
+	mongovos := resVo.List
 
 	// 填充标签信息
 	m.tagTreeApp.FillTagInfo(tagentity.TagType(consts.ResourceTypeMongo), collx.ArrayMap(mongovos, func(mvo *vo.Mongo) tagentity.ITagResource {
 		return mvo
 	})...)
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (m *Mongo) TestConn(rc *req.Ctx) {
diff --git a/server/internal/mongo/application/mongo.go b/server/internal/mongo/application/mongo.go
index bfd41a8c..0df1e7d8 100644
--- a/server/internal/mongo/application/mongo.go
+++ b/server/internal/mongo/application/mongo.go
@@ -20,7 +20,7 @@ type Mongo interface {
 	base.App[*entity.Mongo]
 
 	// 分页获取机器脚本信息列表
-	GetPageList(condition *entity.MongoQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MongoQuery, orderBy ...string) (*model.PageResult[*entity.Mongo], error)
 
 	TestConn(entity *entity.Mongo) error
 
@@ -40,9 +40,11 @@ type mongoAppImpl struct {
 	tagTreeApp tagapp.TagTree `inject:"T"`
 }
 
+var _ Mongo = (*mongoAppImpl)(nil)
+
 // 分页获取数据库信息列表
-func (d *mongoAppImpl) GetPageList(condition *entity.MongoQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return d.GetRepo().GetList(condition, pageParam, toEntity, orderBy...)
+func (d *mongoAppImpl) GetPageList(condition *entity.MongoQuery, orderBy ...string) (*model.PageResult[*entity.Mongo], error) {
+	return d.GetRepo().GetList(condition, orderBy...)
 }
 
 func (d *mongoAppImpl) Delete(ctx context.Context, id uint64) error {
diff --git a/server/internal/mongo/domain/entity/query.go b/server/internal/mongo/domain/entity/query.go
index edce0aad..25f67a3a 100644
--- a/server/internal/mongo/domain/entity/query.go
+++ b/server/internal/mongo/domain/entity/query.go
@@ -4,6 +4,7 @@ import "mayfly-go/pkg/model"
 
 type MongoQuery struct {
 	model.Model
+	model.PageParam
 
 	Code               string `json:"code" form:"code"`
 	Name               string
diff --git a/server/internal/mongo/domain/repository/mongo.go b/server/internal/mongo/domain/repository/mongo.go
index 266027f8..8c03cfe3 100644
--- a/server/internal/mongo/domain/repository/mongo.go
+++ b/server/internal/mongo/domain/repository/mongo.go
@@ -10,5 +10,5 @@ type Mongo interface {
 	base.Repo[*entity.Mongo]
 
 	// 分页获取列表
-	GetList(condition *entity.MongoQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetList(condition *entity.MongoQuery, orderBy ...string) (*model.PageResult[*entity.Mongo], error)
 }
diff --git a/server/internal/mongo/infrastructure/persistence/mongo.go b/server/internal/mongo/infrastructure/persistence/mongo.go
index e07ad245..62a2617f 100644
--- a/server/internal/mongo/infrastructure/persistence/mongo.go
+++ b/server/internal/mongo/infrastructure/persistence/mongo.go
@@ -16,7 +16,7 @@ func newMongoRepo() repository.Mongo {
 }
 
 // 分页获取数据库信息列表
-func (d *mongoRepoImpl) GetList(condition *entity.MongoQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (d *mongoRepoImpl) GetList(condition *entity.MongoQuery, orderBy ...string) (*model.PageResult[*entity.Mongo], error) {
 	qd := model.NewCond().
 		Like("name", condition.Name).
 		Eq("code", condition.Code).
@@ -27,5 +27,5 @@ func (d *mongoRepoImpl) GetList(condition *entity.MongoQuery, pageParam *model.P
 		keyword = "%" + keyword + "%"
 		qd.And("name like ? or code like ?", keyword, keyword)
 	}
-	return d.PageByCondToAny(qd, pageParam, toEntity)
+	return d.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/msg/api/msg.go b/server/internal/msg/api/msg.go
index 7596cde9..ace51558 100644
--- a/server/internal/msg/api/msg.go
+++ b/server/internal/msg/api/msg.go
@@ -24,7 +24,7 @@ func (m *Msg) GetMsgs(rc *req.Ctx) {
 	condition := &entity.Msg{
 		RecipientId: int64(rc.GetLoginAccount().Id),
 	}
-	res, err := m.msgApp.GetPageList(condition, rc.GetPageParam(), new([]entity.Msg))
+	res, err := m.msgApp.GetPageList(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/msg/api/msg_channel.go b/server/internal/msg/api/msg_channel.go
index c2a6f725..2b85399b 100644
--- a/server/internal/msg/api/msg_channel.go
+++ b/server/internal/msg/api/msg_channel.go
@@ -30,7 +30,7 @@ func (m *MsgChannel) ReqConfs() *req.Confs {
 
 func (m *MsgChannel) GetMsgChannels(rc *req.Ctx) {
 	condition := &entity.MsgChannel{}
-	res, err := m.msgChannelApp.GetPageList(condition, rc.GetPageParam(), new([]entity.MsgChannel))
+	res, err := m.msgChannelApp.GetPageList(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/msg/api/msg_tmpl.go b/server/internal/msg/api/msg_tmpl.go
index b147b153..83663f72 100644
--- a/server/internal/msg/api/msg_tmpl.go
+++ b/server/internal/msg/api/msg_tmpl.go
@@ -38,7 +38,7 @@ func (m *MsgTmpl) GetMsgTmpls(rc *req.Ctx) {
 		Code: rc.Query("code"),
 	}
 	condition.Id = cast.ToUint64(rc.QueryInt("id"))
-	res, err := m.msgTmplApp.GetPageList(condition, rc.GetPageParam(), new([]entity.MsgTmpl))
+	res, err := m.msgTmplApp.GetPageList(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/msg/application/msg.go b/server/internal/msg/application/msg.go
index 1aba98a2..9788a258 100644
--- a/server/internal/msg/application/msg.go
+++ b/server/internal/msg/application/msg.go
@@ -11,7 +11,7 @@ import (
 )
 
 type Msg interface {
-	GetPageList(condition *entity.Msg, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.Msg, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Msg], error)
 
 	Create(ctx context.Context, msg *entity.Msg)
 
@@ -19,12 +19,14 @@ type Msg interface {
 	CreateAndSend(la *model.LoginAccount, msg *dto.SysMsg)
 }
 
+var _ (Msg) = (*msgAppImpl)(nil)
+
 type msgAppImpl struct {
 	msgRepo repository.Msg `inject:"T"`
 }
 
-func (a *msgAppImpl) GetPageList(condition *entity.Msg, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return a.msgRepo.GetPageList(condition, pageParam, toEntity)
+func (a *msgAppImpl) GetPageList(condition *entity.Msg, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Msg], error) {
+	return a.msgRepo.GetPageList(condition, pageParam)
 }
 
 func (a *msgAppImpl) Create(ctx context.Context, msg *entity.Msg) {
diff --git a/server/internal/msg/application/msg_channel.go b/server/internal/msg/application/msg_channel.go
index 26bdc6a7..3ca68a89 100644
--- a/server/internal/msg/application/msg_channel.go
+++ b/server/internal/msg/application/msg_channel.go
@@ -12,7 +12,7 @@ import (
 type MsgChannel interface {
 	base.App[*entity.MsgChannel]
 
-	GetPageList(condition *entity.MsgChannel, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MsgChannel, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgChannel], error)
 
 	SaveChannel(ctx context.Context, msgChannel *entity.MsgChannel) error
 
@@ -27,8 +27,8 @@ type msgChannelAppImpl struct {
 
 var _ (MsgChannel) = (*msgChannelAppImpl)(nil)
 
-func (m *msgChannelAppImpl) GetPageList(condition *entity.MsgChannel, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.Repo.GetPageList(condition, pageParam, toEntity)
+func (m *msgChannelAppImpl) GetPageList(condition *entity.MsgChannel, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgChannel], error) {
+	return m.Repo.GetPageList(condition, pageParam)
 }
 
 func (m *msgChannelAppImpl) SaveChannel(ctx context.Context, msgChannel *entity.MsgChannel) error {
diff --git a/server/internal/msg/application/msg_tmpl.go b/server/internal/msg/application/msg_tmpl.go
index b60b3709..82bff770 100644
--- a/server/internal/msg/application/msg_tmpl.go
+++ b/server/internal/msg/application/msg_tmpl.go
@@ -20,7 +20,7 @@ import (
 type MsgTmpl interface {
 	base.App[*entity.MsgTmpl]
 
-	GetPageList(condition *entity.MsgTmpl, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MsgTmpl, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgTmpl], error)
 
 	SaveTmpl(ctx context.Context, msgTmpl *dto.MsgTmplSave) error
 
@@ -47,8 +47,8 @@ type msgTmplAppImpl struct {
 
 var _ (MsgTmpl) = (*msgTmplAppImpl)(nil)
 
-func (m *msgTmplAppImpl) GetPageList(condition *entity.MsgTmpl, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.Repo.GetPageList(condition, pageParam, toEntity)
+func (m *msgTmplAppImpl) GetPageList(condition *entity.MsgTmpl, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgTmpl], error) {
+	return m.Repo.GetPageList(condition, pageParam)
 }
 
 func (m *msgTmplAppImpl) SaveTmpl(ctx context.Context, msgTmpl *dto.MsgTmplSave) error {
diff --git a/server/internal/msg/domain/repository/msg.go b/server/internal/msg/domain/repository/msg.go
index b6065b41..4e5a9d3a 100644
--- a/server/internal/msg/domain/repository/msg.go
+++ b/server/internal/msg/domain/repository/msg.go
@@ -9,5 +9,5 @@ import (
 type Msg interface {
 	base.Repo[*entity.Msg]
 
-	GetPageList(condition *entity.Msg, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.Msg, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Msg], error)
 }
diff --git a/server/internal/msg/domain/repository/msg_channel.go b/server/internal/msg/domain/repository/msg_channel.go
index cfd04aac..3408392a 100644
--- a/server/internal/msg/domain/repository/msg_channel.go
+++ b/server/internal/msg/domain/repository/msg_channel.go
@@ -9,5 +9,5 @@ import (
 type MsgChannel interface {
 	base.Repo[*entity.MsgChannel]
 
-	GetPageList(condition *entity.MsgChannel, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MsgChannel, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgChannel], error)
 }
diff --git a/server/internal/msg/domain/repository/msg_tmpl.go b/server/internal/msg/domain/repository/msg_tmpl.go
index eaa4cc77..f5df60bd 100644
--- a/server/internal/msg/domain/repository/msg_tmpl.go
+++ b/server/internal/msg/domain/repository/msg_tmpl.go
@@ -9,7 +9,7 @@ import (
 type MsgTmpl interface {
 	base.Repo[*entity.MsgTmpl]
 
-	GetPageList(condition *entity.MsgTmpl, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.MsgTmpl, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgTmpl], error)
 }
 
 type MsgTmplChannel interface {
diff --git a/server/internal/msg/infrastructure/persistence/msg.go b/server/internal/msg/infrastructure/persistence/msg.go
index 3a95df38..689d6215 100644
--- a/server/internal/msg/infrastructure/persistence/msg.go
+++ b/server/internal/msg/infrastructure/persistence/msg.go
@@ -15,7 +15,7 @@ func newMsgRepo() repository.Msg {
 	return &msgRepoImpl{}
 }
 
-func (m *msgRepoImpl) GetPageList(condition *entity.Msg, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *msgRepoImpl) GetPageList(condition *entity.Msg, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Msg], error) {
 	pd := model.NewModelCond(condition).OrderBy(orderBy...)
-	return m.PageByCondToAny(pd, pageParam, toEntity)
+	return m.PageByCond(pd, pageParam)
 }
diff --git a/server/internal/msg/infrastructure/persistence/msg_channel.go b/server/internal/msg/infrastructure/persistence/msg_channel.go
index 180565e5..b75185f9 100644
--- a/server/internal/msg/infrastructure/persistence/msg_channel.go
+++ b/server/internal/msg/infrastructure/persistence/msg_channel.go
@@ -15,10 +15,10 @@ func newMsgChannelRepo() repository.MsgChannel {
 	return &msgChannelRepoImpl{}
 }
 
-func (m *msgChannelRepoImpl) GetPageList(condition *entity.MsgChannel, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *msgChannelRepoImpl) GetPageList(condition *entity.MsgChannel, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgChannel], error) {
 	pd := model.NewCond().
 		Eq("id", condition.Id).
 		Like("code", condition.Code).
 		OrderBy(orderBy...)
-	return m.PageByCondToAny(pd, pageParam, toEntity)
+	return m.PageByCond(pd, pageParam)
 }
diff --git a/server/internal/msg/infrastructure/persistence/msg_tmpl.go b/server/internal/msg/infrastructure/persistence/msg_tmpl.go
index 547390df..74b2b12d 100644
--- a/server/internal/msg/infrastructure/persistence/msg_tmpl.go
+++ b/server/internal/msg/infrastructure/persistence/msg_tmpl.go
@@ -15,12 +15,12 @@ func newMsgTmplRepo() repository.MsgTmpl {
 	return &msgTmplRepoImpl{}
 }
 
-func (m *msgTmplRepoImpl) GetPageList(condition *entity.MsgTmpl, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *msgTmplRepoImpl) GetPageList(condition *entity.MsgTmpl, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.MsgTmpl], error) {
 	pd := model.NewCond().
 		Eq("id", condition.Id).
 		Like("code", condition.Code).
 		OrderBy(orderBy...)
-	return m.PageByCondToAny(pd, pageParam, toEntity)
+	return m.PageByCond(pd, pageParam)
 }
 
 type msgTmplChannelRepoImpl struct {
diff --git a/server/internal/msg/init/init.go b/server/internal/msg/init/init.go
index 849ca8de..444d9d1a 100644
--- a/server/internal/msg/init/init.go
+++ b/server/internal/msg/init/init.go
@@ -26,7 +26,7 @@ func init() {
 func Init() {
 	msgTmplBizApp := ioc.Get[application.MsgTmplBiz]("MsgTmplBizApp")
 
-	global.EventBus.SubscribeAsync(event.EventTopicBizMsgTmplSend, "BizMsgTmplSend", func(ctx context.Context, event *eventbus.Event) error {
+	global.EventBus.SubscribeAsync(event.EventTopicBizMsgTmplSend, "BizMsgTmplSend", func(ctx context.Context, event *eventbus.Event[any]) error {
 		return msgTmplBizApp.Send(ctx, event.Val.(dto.BizMsgTmplSend))
 	}, false)
 }
diff --git a/server/internal/pkg/config/app.go b/server/internal/pkg/config/app.go
index fe2f6149..daf4a95a 100644
--- a/server/internal/pkg/config/app.go
+++ b/server/internal/pkg/config/app.go
@@ -4,7 +4,7 @@ import "fmt"
 
 const (
 	AppName = "mayfly-go"
-	Version = "v1.9.4"
+	Version = "v1.10.0"
 )
 
 func GetAppInfo() string {
diff --git a/server/internal/redis/api/redis.go b/server/internal/redis/api/redis.go
index 4282d737..c8d3574d 100644
--- a/server/internal/redis/api/redis.go
+++ b/server/internal/redis/api/redis.go
@@ -60,7 +60,7 @@ func (rs *Redis) ReqConfs() *req.Confs {
 }
 
 func (r *Redis) RedisList(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.RedisQuery](rc, new(entity.RedisQuery))
+	queryCond := req.BindQuery(rc, new(entity.RedisQuery))
 
 	// 不存在可访问标签id，即没有可操作数据
 	tags := r.tagApp.GetAccountTags(rc.GetLoginAccount().Id, &tagentity.TagTreeQuery{
@@ -68,21 +68,22 @@ func (r *Redis) RedisList(rc *req.Ctx) {
 		CodePathLikes: collx.AsArray(queryCond.TagPath),
 	})
 	if len(tags) == 0 {
-		rc.ResData = model.EmptyPageResult[any]()
+		rc.ResData = model.NewEmptyPageResult[any]()
 		return
 	}
 	queryCond.Codes = tags.GetCodes()
 
-	var redisvos []*vo.Redis
-	res, err := r.redisApp.GetPageList(queryCond, page, &redisvos)
+	res, err := r.redisApp.GetPageList(queryCond)
 	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.Redis, *vo.Redis](res)
+	redisvos := resVo.List
 
 	// 填充标签信息
 	r.tagApp.FillTagInfo(tagentity.TagType(consts.ResourceTypeRedis), collx.ArrayMap(redisvos, func(rvo *vo.Redis) tagentity.ITagResource {
 		return rvo
 	})...)
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (r *Redis) TestConn(rc *req.Ctx) {
diff --git a/server/internal/redis/application/redis.go b/server/internal/redis/application/redis.go
index b32c55b0..701a180f 100644
--- a/server/internal/redis/application/redis.go
+++ b/server/internal/redis/application/redis.go
@@ -33,7 +33,7 @@ type Redis interface {
 	flowapp.FlowBizHandler
 
 	// 分页获取机器脚本信息列表
-	GetPageList(condition *entity.RedisQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.RedisQuery, orderBy ...string) (*model.PageResult[*entity.Redis], error)
 
 	// 测试连接
 	TestConn(re *dto.SaveRedis) error
@@ -52,6 +52,8 @@ type Redis interface {
 	RunCmd(ctx context.Context, redisConn *rdm.RedisConn, cmdParam *dto.RunCmd) (any, error)
 }
 
+var _ Redis = (*redisAppImpl)(nil)
+
 type redisAppImpl struct {
 	base.AppImpl[*entity.Redis, repository.Redis]
 
@@ -61,8 +63,8 @@ type redisAppImpl struct {
 }
 
 // 分页获取redis列表
-func (r *redisAppImpl) GetPageList(condition *entity.RedisQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return r.GetRepo().GetRedisList(condition, pageParam, toEntity, orderBy...)
+func (r *redisAppImpl) GetPageList(condition *entity.RedisQuery, orderBy ...string) (*model.PageResult[*entity.Redis], error) {
+	return r.GetRepo().GetRedisList(condition, orderBy...)
 }
 
 func (r *redisAppImpl) TestConn(param *dto.SaveRedis) error {
diff --git a/server/internal/redis/domain/entity/query.go b/server/internal/redis/domain/entity/query.go
index 07553fef..a8a3cf59 100644
--- a/server/internal/redis/domain/entity/query.go
+++ b/server/internal/redis/domain/entity/query.go
@@ -1,6 +1,10 @@
 package entity
 
+import "mayfly-go/pkg/model"
+
 type RedisQuery struct {
+	model.PageParam
+
 	Id                 uint64 `form:"id"`
 	Code               string `json:"code" form:"code"`
 	Name               string `orm:"column(name)" json:"name" form:"name"`
diff --git a/server/internal/redis/domain/repository/redis.go b/server/internal/redis/domain/repository/redis.go
index b9842c4d..022742df 100644
--- a/server/internal/redis/domain/repository/redis.go
+++ b/server/internal/redis/domain/repository/redis.go
@@ -10,5 +10,5 @@ type Redis interface {
 	base.Repo[*entity.Redis]
 
 	// 分页获取机器信息列表
-	GetRedisList(condition *entity.RedisQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetRedisList(condition *entity.RedisQuery, orderBy ...string) (*model.PageResult[*entity.Redis], error)
 }
diff --git a/server/internal/redis/infrastructure/persistence/redis_repo.go b/server/internal/redis/infrastructure/persistence/redis_repo.go
index eb6d21b8..2ee76d90 100644
--- a/server/internal/redis/infrastructure/persistence/redis_repo.go
+++ b/server/internal/redis/infrastructure/persistence/redis_repo.go
@@ -16,7 +16,7 @@ func newRedisRepo() repository.Redis {
 }
 
 // 分页获取redis信息列表
-func (r *redisRepoImpl) GetRedisList(condition *entity.RedisQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (r *redisRepoImpl) GetRedisList(condition *entity.RedisQuery, orderBy ...string) (*model.PageResult[*entity.Redis], error) {
 	qd := model.NewCond().
 		Eq("id", condition.Id).
 		Like("host", condition.Host).
@@ -29,5 +29,5 @@ func (r *redisRepoImpl) GetRedisList(condition *entity.RedisQuery, pageParam *mo
 		qd.And("host like ? or name like ? or code like ?", keyword, keyword, keyword)
 	}
 
-	return r.PageByCondToAny(qd, pageParam, toEntity)
+	return r.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/sys/api/account.go b/server/internal/sys/api/account.go
index 553a1bc6..6688e574 100644
--- a/server/internal/sys/api/account.go
+++ b/server/internal/sys/api/account.go
@@ -56,8 +56,8 @@ func (a *Account) ReqConfs() *req.Confs {
 		// 获取用户列表信息（只包含最基础信息）
 		req.NewGet("/simple", a.SimpleAccounts),
 
-		// 根据账号id获取账号基础信息
-		req.NewGet("/:id", a.AccountDetail),
+		// 根据username获取账号基础信息
+		req.NewGet("/detail", a.AccountDetail),
 
 		req.NewPost("", a.SaveAccount).Log(req.NewLogSaveI(imsg.LogAccountCreate)).RequiredPermission(addAccountPermission),
 
@@ -172,9 +172,10 @@ func (a *Account) Accounts(rc *req.Ctx) {
 	condition := &entity.AccountQuery{}
 	condition.Username = rc.Query("username")
 	condition.Name = rc.Query("name")
-	res, err := a.accountApp.GetPageList(condition, rc.GetPageParam(), new([]vo.AccountManageVO))
+	condition.PageParam = rc.GetPageParam()
+	res, err := a.accountApp.GetPageList(condition)
 	biz.ErrIsNil(err)
-	rc.ResData = res
+	rc.ResData = model.PageResultConv[*entity.Account, *vo.AccountManageVO](res)
 }
 
 func (a *Account) SimpleAccounts(rc *req.Ctx) {
@@ -187,20 +188,23 @@ func (a *Account) SimpleAccounts(rc *req.Ctx) {
 			return cast.ToUint64(val)
 		})
 	}
-	res, err := a.accountApp.GetPageList(condition, rc.GetPageParam(), new([]vo.SimpleAccountVO))
+	condition.PageParam = rc.GetPageParam()
+	res, err := a.accountApp.GetPageList(condition)
 	biz.ErrIsNil(err)
-	rc.ResData = res
+	rc.ResData = model.PageResultConv[*entity.Account, *vo.SimpleAccountVO](res)
 }
 
 // 获取账号详情
 func (a *Account) AccountDetail(rc *req.Ctx) {
-	accountId := uint64(rc.PathParamInt("id"))
-	account, err := a.accountApp.GetById(accountId)
+	username := rc.Query("username")
+	biz.NotEmpty(username, "username is required")
+	account := &entity.Account{Username: username}
+	err := a.accountApp.GetByCond(account)
 	biz.ErrIsNilAppendErr(err, "Account does not exist: %s")
 	accountvo := new(vo.SimpleAccountVO)
 	structx.Copy(accountvo, account)
 
-	accountvo.Roles = a.getAccountRoles(accountId)
+	accountvo.Roles = a.getAccountRoles(account.Id)
 	rc.ResData = accountvo
 }
 
diff --git a/server/internal/sys/api/config.go b/server/internal/sys/api/config.go
index 541cd548..adf45512 100644
--- a/server/internal/sys/api/config.go
+++ b/server/internal/sys/api/config.go
@@ -35,7 +35,7 @@ func (c *Config) ReqConfs() *req.Confs {
 func (c *Config) Configs(rc *req.Ctx) {
 	condition := &entity.Config{Key: rc.Query("key")}
 	condition.Permission = rc.GetLoginAccount().Username
-	res, err := c.configApp.GetPageList(condition, rc.GetPageParam(), new([]entity.Config))
+	res, err := c.configApp.GetPageList(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/sys/api/role.go b/server/internal/sys/api/role.go
index 2a2cc925..489182f6 100644
--- a/server/internal/sys/api/role.go
+++ b/server/internal/sys/api/role.go
@@ -39,16 +39,22 @@ func (r *Role) ReqConfs() *req.Confs {
 }
 
 func (r *Role) Roles(rc *req.Ctx) {
-	cond, pageParam := req.BindQueryAndPage(rc, new(entity.RoleQuery))
+	cond := req.BindQuery(rc, new(entity.RoleQuery))
 
 	notIdsStr := rc.Query("notIds")
 	if notIdsStr != "" {
-		cond.NotIds = collx.ArrayMap[string, uint64](strings.Split(notIdsStr, ","), func(val string) uint64 {
+		cond.NotIds = collx.ArrayMap(strings.Split(notIdsStr, ","), func(val string) uint64 {
+			return cast.ToUint64(val)
+		})
+	}
+	ids := rc.Query("ids")
+	if ids != "" {
+		cond.Ids = collx.ArrayMap(strings.Split(ids, ","), func(val string) uint64 {
 			return cast.ToUint64(val)
 		})
 	}
 
-	res, err := r.roleApp.GetPageList(cond, pageParam, new([]entity.Role))
+	res, err := r.roleApp.GetPageList(cond)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
@@ -101,10 +107,9 @@ func (r *Role) SaveResource(rc *req.Ctx) {
 
 // 查看角色关联的用户
 func (r *Role) RoleAccount(rc *req.Ctx) {
-	cond, pageParam := req.BindQueryAndPage[*entity.RoleAccountQuery](rc, new(entity.RoleAccountQuery))
+	cond := req.BindQuery(rc, new(entity.RoleAccountQuery))
 	cond.RoleId = uint64(rc.PathParamInt("id"))
-	var accounts []*vo.AccountRoleVO
-	res, err := r.roleApp.GetRoleAccountPage(cond, pageParam, &accounts)
+	res, err := r.roleApp.GetRoleAccountPage(cond)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/sys/api/syslog.go b/server/internal/sys/api/syslog.go
index d0d8b336..9591fcd0 100644
--- a/server/internal/sys/api/syslog.go
+++ b/server/internal/sys/api/syslog.go
@@ -21,8 +21,8 @@ func (s *Syslog) ReqConfs() *req.Confs {
 }
 
 func (r *Syslog) Syslogs(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage[*entity.SysLogQuery](rc, new(entity.SysLogQuery))
-	res, err := r.syslogApp.GetPageList(queryCond, page, new([]entity.SysLog), "create_time DESC")
+	queryCond := req.BindQuery(rc, new(entity.SysLogQuery))
+	res, err := r.syslogApp.GetPageList(queryCond, "create_time DESC")
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/sys/application/account.go b/server/internal/sys/application/account.go
index c271c6cc..7678f89e 100644
--- a/server/internal/sys/application/account.go
+++ b/server/internal/sys/application/account.go
@@ -13,7 +13,7 @@ import (
 type Account interface {
 	base.App[*entity.Account]
 
-	GetPageList(condition *entity.AccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.AccountQuery, orderBy ...string) (*model.PageResult[*entity.Account], error)
 
 	Create(ctx context.Context, account *entity.Account) error
 
@@ -22,14 +22,16 @@ type Account interface {
 	Delete(ctx context.Context, id uint64) error
 }
 
+var _ Account = (*accountAppImpl)(nil)
+
 type accountAppImpl struct {
 	base.AppImpl[*entity.Account, repository.Account]
 
 	accountRoleRepo repository.AccountRole `inject:"T"`
 }
 
-func (a *accountAppImpl) GetPageList(condition *entity.AccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return a.GetRepo().GetPageList(condition, pageParam, toEntity)
+func (a *accountAppImpl) GetPageList(condition *entity.AccountQuery, orderBy ...string) (*model.PageResult[*entity.Account], error) {
+	return a.GetRepo().GetPageList(condition)
 }
 
 func (a *accountAppImpl) Create(ctx context.Context, account *entity.Account) error {
diff --git a/server/internal/sys/application/config.go b/server/internal/sys/application/config.go
index 3762d931..e81fea4d 100644
--- a/server/internal/sys/application/config.go
+++ b/server/internal/sys/application/config.go
@@ -17,7 +17,7 @@ const SysConfigKeyPrefix = "mayfly:sys:config:"
 type Config interface {
 	base.App[*entity.Config]
 
-	GetPageList(condition *entity.Config, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.Config, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Config], error)
 
 	Save(ctx context.Context, config *entity.Config) error
 
@@ -25,12 +25,14 @@ type Config interface {
 	GetConfig(key string) *entity.Config
 }
 
+var _ (Config) = (*configAppImpl)(nil)
+
 type configAppImpl struct {
 	base.AppImpl[*entity.Config, repository.Config]
 }
 
-func (a *configAppImpl) GetPageList(condition *entity.Config, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return a.GetRepo().GetPageList(condition, pageParam, toEntity)
+func (a *configAppImpl) GetPageList(condition *entity.Config, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Config], error) {
+	return a.GetRepo().GetPageList(condition, pageParam)
 }
 
 func (a *configAppImpl) Save(ctx context.Context, config *entity.Config) error {
diff --git a/server/internal/sys/application/role.go b/server/internal/sys/application/role.go
index cd199763..58155c22 100644
--- a/server/internal/sys/application/role.go
+++ b/server/internal/sys/application/role.go
@@ -16,7 +16,7 @@ import (
 type Role interface {
 	base.App[*entity.Role]
 
-	GetPageList(condition *entity.RoleQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.RoleQuery, orderBy ...string) (*model.PageResult[*entity.Role], error)
 
 	ListByQuery(condition *entity.RoleQuery) ([]*entity.Role, error)
 
@@ -40,7 +40,7 @@ type Role interface {
 	GetAccountRoles(accountId uint64) ([]*entity.AccountRole, error)
 
 	// 获取角色关联的用户信息
-	GetRoleAccountPage(condition *entity.RoleAccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetRoleAccountPage(condition *entity.RoleAccountQuery, orderBy ...string) (*model.PageResult[*entity.AccountRolePO], error)
 }
 
 type roleAppImpl struct {
@@ -52,8 +52,8 @@ type roleAppImpl struct {
 
 var _ (Role) = (*roleAppImpl)(nil)
 
-func (m *roleAppImpl) GetPageList(condition *entity.RoleQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.GetRepo().GetPageList(condition, pageParam, toEntity, orderBy...)
+func (m *roleAppImpl) GetPageList(condition *entity.RoleQuery, orderBy ...string) (*model.PageResult[*entity.Role], error) {
+	return m.GetRepo().GetPageList(condition, orderBy...)
 }
 
 func (m *roleAppImpl) ListByQuery(condition *entity.RoleQuery) ([]*entity.Role, error) {
@@ -148,6 +148,6 @@ func (m *roleAppImpl) GetAccountRoles(accountId uint64) ([]*entity.AccountRole,
 	return m.accountRoleRepo.SelectByCond(&entity.AccountRole{AccountId: accountId})
 }
 
-func (m *roleAppImpl) GetRoleAccountPage(condition *entity.RoleAccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.accountRoleRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (m *roleAppImpl) GetRoleAccountPage(condition *entity.RoleAccountQuery, orderBy ...string) (*model.PageResult[*entity.AccountRolePO], error) {
+	return m.accountRoleRepo.GetPageList(condition, orderBy...)
 }
diff --git a/server/internal/sys/application/syslog.go b/server/internal/sys/application/syslog.go
index 333498f4..79e2a25d 100644
--- a/server/internal/sys/application/syslog.go
+++ b/server/internal/sys/application/syslog.go
@@ -35,7 +35,7 @@ type AppendLogReq struct {
 }
 
 type Syslog interface {
-	GetPageList(condition *entity.SysLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.SysLogQuery, orderBy ...string) (*model.PageResult[*entity.SysLog], error)
 
 	// 从请求上下文的参数保存系统日志
 	SaveFromReq(req *req.Ctx)
@@ -55,12 +55,14 @@ type Syslog interface {
 	Flush(logId uint64, clearExtra bool)
 }
 
+var _ (Syslog) = (*syslogAppImpl)(nil)
+
 type syslogAppImpl struct {
 	syslogRepo repository.Syslog `inject:"T"`
 }
 
-func (m *syslogAppImpl) GetPageList(condition *entity.SysLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return m.syslogRepo.GetPageList(condition, pageParam, toEntity, orderBy...)
+func (m *syslogAppImpl) GetPageList(condition *entity.SysLogQuery, orderBy ...string) (*model.PageResult[*entity.SysLog], error) {
+	return m.syslogRepo.GetPageList(condition, orderBy...)
 }
 
 func (m *syslogAppImpl) SaveFromReq(req *req.Ctx) {
diff --git a/server/internal/sys/domain/entity/po.go b/server/internal/sys/domain/entity/po.go
new file mode 100644
index 00000000..c33d46f9
--- /dev/null
+++ b/server/internal/sys/domain/entity/po.go
@@ -0,0 +1,16 @@
+package entity
+
+import "time"
+
+type AccountRolePO struct {
+	RoleId        uint64        `json:"roleId"`
+	RoleName      string        `json:"roleName"`
+	Code          string        `json:"code"`
+	Status        int           `json:"status"`
+	AccountId     uint64        `json:"accountId" gorm:"column:accountId"`
+	AccountName   string        `json:"accountName" gorm:"column:accountName"`
+	Username      string        `json:"username"`
+	AccountStatus AccountStatus `json:"accountStatus" gorm:"column:accountStatus"`
+	CreateTime    *time.Time    `json:"createTime"`
+	Creator       string        `json:"creator"`
+}
diff --git a/server/internal/sys/domain/entity/query.go b/server/internal/sys/domain/entity/query.go
index df5ed48e..4e61f644 100644
--- a/server/internal/sys/domain/entity/query.go
+++ b/server/internal/sys/domain/entity/query.go
@@ -1,18 +1,23 @@
 package entity
 
+import "mayfly-go/pkg/model"
+
 type AccountQuery struct {
+	model.PageParam
 	Ids      []uint64 `json:"ids"`
 	Name     string   `json:"name" form:"name"`
 	Username string   `json:"code" form:"code"`
 }
 
 type SysLogQuery struct {
+	model.PageParam
 	CreatorId   uint64 `json:"creatorId" form:"creatorId"`
 	Type        int8   `json:"type" form:"type"`
 	Description string `json:"description" form:"description"`
 }
 
 type RoleQuery struct {
+	model.PageParam
 	Ids    []uint64 `json:"ids"`
 	Name   string   `json:"name" form:"name"`
 	Code   string   `json:"code" form:"code"`
@@ -20,6 +25,7 @@ type RoleQuery struct {
 }
 
 type RoleAccountQuery struct {
+	model.PageParam
 	RoleId   uint64 `json:"roleId" `
 	Name     string `json:"name" form:"name"`
 	Username string `json:"username" form:"username"`
diff --git a/server/internal/sys/domain/repository/account.go b/server/internal/sys/domain/repository/account.go
index 0825fabd..dc412d23 100644
--- a/server/internal/sys/domain/repository/account.go
+++ b/server/internal/sys/domain/repository/account.go
@@ -9,5 +9,5 @@ import (
 type Account interface {
 	base.Repo[*entity.Account]
 
-	GetPageList(condition *entity.AccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.AccountQuery, orderBy ...string) (*model.PageResult[*entity.Account], error)
 }
diff --git a/server/internal/sys/domain/repository/config.go b/server/internal/sys/domain/repository/config.go
index 53bef1a5..b5d9194a 100644
--- a/server/internal/sys/domain/repository/config.go
+++ b/server/internal/sys/domain/repository/config.go
@@ -9,5 +9,5 @@ import (
 type Config interface {
 	base.Repo[*entity.Config]
 
-	GetPageList(condition *entity.Config, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.Config, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Config], error)
 }
diff --git a/server/internal/sys/domain/repository/role.go b/server/internal/sys/domain/repository/role.go
index 39047273..e556c01b 100644
--- a/server/internal/sys/domain/repository/role.go
+++ b/server/internal/sys/domain/repository/role.go
@@ -9,7 +9,7 @@ import (
 type Role interface {
 	base.Repo[*entity.Role]
 
-	GetPageList(condition *entity.RoleQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.RoleQuery, orderBy ...string) (*model.PageResult[*entity.Role], error)
 
 	ListByQuery(condition *entity.RoleQuery) ([]*entity.Role, error)
 }
@@ -17,7 +17,7 @@ type Role interface {
 type AccountRole interface {
 	base.Repo[*entity.AccountRole]
 
-	GetPageList(condition *entity.RoleAccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.RoleAccountQuery, orderBy ...string) (*model.PageResult[*entity.AccountRolePO], error)
 }
 
 type RoleResource interface {
diff --git a/server/internal/sys/domain/repository/syslog.go b/server/internal/sys/domain/repository/syslog.go
index fa1bd469..c7990486 100644
--- a/server/internal/sys/domain/repository/syslog.go
+++ b/server/internal/sys/domain/repository/syslog.go
@@ -9,5 +9,5 @@ import (
 type Syslog interface {
 	base.Repo[*entity.SysLog]
 
-	GetPageList(condition *entity.SysLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.SysLogQuery, orderBy ...string) (*model.PageResult[*entity.SysLog], error)
 }
diff --git a/server/internal/sys/infrastructure/persistence/account.go b/server/internal/sys/infrastructure/persistence/account.go
index c195494a..2b96d7f9 100644
--- a/server/internal/sys/infrastructure/persistence/account.go
+++ b/server/internal/sys/infrastructure/persistence/account.go
@@ -15,10 +15,10 @@ func newAccountRepo() repository.Account {
 	return &AccountRepoImpl{}
 }
 
-func (m *AccountRepoImpl) GetPageList(condition *entity.AccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *AccountRepoImpl) GetPageList(condition *entity.AccountQuery, orderBy ...string) (*model.PageResult[*entity.Account], error) {
 	qd := model.NewCond().
 		Like("name", condition.Name).
 		Like("username", condition.Username).
 		In("id", condition.Ids)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/sys/infrastructure/persistence/account_role.go b/server/internal/sys/infrastructure/persistence/account_role.go
index f68ac9fa..c421054e 100644
--- a/server/internal/sys/infrastructure/persistence/account_role.go
+++ b/server/internal/sys/infrastructure/persistence/account_role.go
@@ -16,7 +16,7 @@ func newAccountRoleRepo() repository.AccountRole {
 	return &accountRoleRepoImpl{}
 }
 
-func (m *accountRoleRepoImpl) GetPageList(condition *entity.RoleAccountQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *accountRoleRepoImpl) GetPageList(condition *entity.RoleAccountQuery, orderBy ...string) (*model.PageResult[*entity.AccountRolePO], error) {
 	qd := gormx.NewQueryWithTableName("t_sys_account_role t").
 		Joins("JOIN t_sys_account a ON t.account_id = a.id AND a.status = 1").
 		WithCond(model.NewCond().Columns("t.creator, t.create_time, a.username, a.name accountName, a.status accountStatus, a.id accountId").
@@ -27,5 +27,6 @@ func (m *accountRoleRepoImpl) GetPageList(condition *entity.RoleAccountQuery, pa
 			Eq("t.role_id", condition.RoleId).
 			OrderByDesc("t.id"))
 
-	return gormx.PageQuery(qd, pageParam, toEntity)
+	var res []*entity.AccountRolePO
+	return gormx.PageQuery(qd, condition.PageParam, res)
 }
diff --git a/server/internal/sys/infrastructure/persistence/config.go b/server/internal/sys/infrastructure/persistence/config.go
index d19ae0f6..c295d837 100644
--- a/server/internal/sys/infrastructure/persistence/config.go
+++ b/server/internal/sys/infrastructure/persistence/config.go
@@ -15,10 +15,10 @@ func newConfigRepo() repository.Config {
 	return &configRepoImpl{}
 }
 
-func (m *configRepoImpl) GetPageList(condition *entity.Config, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *configRepoImpl) GetPageList(condition *entity.Config, pageParam model.PageParam, orderBy ...string) (*model.PageResult[*entity.Config], error) {
 	qd := model.NewCond().
 		Like("`key`", condition.Key).
 		And("permission = 'all' OR permission LIKE ?", "%"+condition.Permission+",%").
 		OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, pageParam)
 }
diff --git a/server/internal/sys/infrastructure/persistence/role.go b/server/internal/sys/infrastructure/persistence/role.go
index ea4009cd..743ac4dc 100644
--- a/server/internal/sys/infrastructure/persistence/role.go
+++ b/server/internal/sys/infrastructure/persistence/role.go
@@ -15,14 +15,14 @@ func newRoleRepo() repository.Role {
 	return &roleRepoImpl{}
 }
 
-func (m *roleRepoImpl) GetPageList(condition *entity.RoleQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *roleRepoImpl) GetPageList(condition *entity.RoleQuery, orderBy ...string) (*model.PageResult[*entity.Role], error) {
 	qd := model.NewCond().
 		Like("name", condition.Name).
 		Like("code", condition.Code).
 		In("id", condition.Ids).
 		NotIn("id", condition.NotIds).
 		OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, condition.PageParam)
 }
 
 func (m *roleRepoImpl) ListByQuery(condition *entity.RoleQuery) ([]*entity.Role, error) {
diff --git a/server/internal/sys/infrastructure/persistence/syslog.go b/server/internal/sys/infrastructure/persistence/syslog.go
index 164f2520..dcaddd6c 100644
--- a/server/internal/sys/infrastructure/persistence/syslog.go
+++ b/server/internal/sys/infrastructure/persistence/syslog.go
@@ -15,8 +15,8 @@ func newSyslogRepo() repository.Syslog {
 	return &syslogRepoImpl{}
 }
 
-func (m *syslogRepoImpl) GetPageList(condition *entity.SysLogQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (m *syslogRepoImpl) GetPageList(condition *entity.SysLogQuery, orderBy ...string) (*model.PageResult[*entity.SysLog], error) {
 	qd := model.NewCond().Like("description", condition.Description).
 		Eq("creator_id", condition.CreatorId).Eq("type", condition.Type).OrderBy(orderBy...)
-	return m.PageByCondToAny(qd, pageParam, toEntity)
+	return m.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/tag/api/team.go b/server/internal/tag/api/team.go
index e8829b56..bde3329a 100644
--- a/server/internal/tag/api/team.go
+++ b/server/internal/tag/api/team.go
@@ -46,16 +46,17 @@ func (t *Team) ReqConfs() *req.Confs {
 }
 
 func (p *Team) GetTeams(rc *req.Ctx) {
-	queryCond, page := req.BindQueryAndPage(rc, new(entity.TeamQuery))
-	var teams []*vo.Team
-	res, err := p.teamApp.GetPageList(queryCond, page, &teams)
-	biz.ErrIsNil(err)
+	queryCond := req.BindQuery(rc, new(entity.TeamQuery))
 
+	res, err := p.teamApp.GetPageList(queryCond)
+	biz.ErrIsNil(err)
+	resVo := model.PageResultConv[*entity.Team, *vo.Team](res)
+	teams := resVo.List
 	p.tagTreeRelateApp.FillTagInfo(entity.TagRelateTypeTeam, collx.ArrayMap(teams, func(mvo *vo.Team) entity.IRelateTag {
 		return mvo
 	})...)
 
-	rc.ResData = res
+	rc.ResData = resVo
 }
 
 func (p *Team) SaveTeam(rc *req.Ctx) {
@@ -79,7 +80,7 @@ func (p *Team) GetTeamMembers(rc *req.Ctx) {
 	condition := &entity.TeamMember{TeamId: uint64(rc.PathParamInt("id"))}
 	condition.Username = rc.Query("username")
 
-	res, err := p.teamApp.GetMemberPage(condition, rc.GetPageParam(), &[]vo.TeamMember{})
+	res, err := p.teamApp.GetMemberPage(condition, rc.GetPageParam())
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/tag/api/vo/team.go b/server/internal/tag/api/vo/team.go
index c3af7f12..f2340c79 100644
--- a/server/internal/tag/api/vo/team.go
+++ b/server/internal/tag/api/vo/team.go
@@ -10,23 +10,12 @@ type Team struct {
 	model.Model
 	entity.RelateTags // 标签信息
 
-	Name              string          `json:"name"`              // 名称
-	ValidityStartDate *model.JsonTime `json:"validityStartDate"` // 生效开始时间
-	ValidityEndDate   *model.JsonTime `json:"validityEndDate"`   // 生效结束时间
-	Remark            string          `json:"remark"`            // 备注说明
+	Name              string     `json:"name"`              // 名称
+	ValidityStartDate *time.Time `json:"validityStartDate"` // 生效开始时间
+	ValidityEndDate   *time.Time `json:"validityEndDate"`   // 生效结束时间
+	Remark            string     `json:"remark"`            // 备注说明
 }
 
 func (t *Team) GetRelateId() uint64 {
 	return t.Id
 }
-
-// 团队成员信息
-type TeamMember struct {
-	Id         uint64     `json:"id"`
-	TeamId     uint64     `json:"teamId"`
-	AccountId  uint64     `json:"accountId"`
-	Username   string     `json:"username"`
-	Name       string     `json:"name"`
-	Creator    string     `json:"creator"`
-	CreateTime *time.Time `json:"createTime"`
-}
diff --git a/server/internal/tag/application/team.go b/server/internal/tag/application/team.go
index a1b30ec9..ecd4e2af 100644
--- a/server/internal/tag/application/team.go
+++ b/server/internal/tag/application/team.go
@@ -18,7 +18,7 @@ type Team interface {
 	base.App[*entity.Team]
 
 	// 分页获取项目团队信息列表
-	GetPageList(condition *entity.TeamQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.TeamQuery, orderBy ...string) (*model.PageResult[*entity.Team], error)
 
 	// SaveTeam 保存团队信息
 	SaveTeam(ctx context.Context, team *dto.SaveTeam) error
@@ -27,7 +27,7 @@ type Team interface {
 
 	//--------------- 团队成员相关接口 ---------------
 
-	GetMemberPage(condition *entity.TeamMember, pageParam *model.PageParam, toEntity any) (*model.PageResult[any], error)
+	GetMemberPage(condition *entity.TeamMember, pageParam model.PageParam) (*model.PageResult[*entity.TeamMemberPO], error)
 
 	SaveMember(ctx context.Context, tagTeamMember *entity.TeamMember) error
 
@@ -47,15 +47,15 @@ type teamAppImpl struct {
 
 var _ (Team) = (*teamAppImpl)(nil)
 
-func (p *teamAppImpl) GetPageList(condition *entity.TeamQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
-	return p.GetRepo().GetPageList(condition, pageParam, toEntity, orderBy...)
+func (p *teamAppImpl) GetPageList(condition *entity.TeamQuery, orderBy ...string) (*model.PageResult[*entity.Team], error) {
+	return p.GetRepo().GetPageList(condition, orderBy...)
 }
 
 func (p *teamAppImpl) SaveTeam(ctx context.Context, saveParam *dto.SaveTeam) error {
 	team := &entity.Team{
 		Name:              saveParam.Name,
-		ValidityStartDate: saveParam.ValidityStartDate,
-		ValidityEndDate:   saveParam.ValidityEndDate,
+		ValidityStartDate: &saveParam.ValidityStartDate.Time,
+		ValidityEndDate:   &saveParam.ValidityEndDate.Time,
 		Remark:            saveParam.Remark,
 	}
 	team.Id = saveParam.Id
@@ -111,8 +111,8 @@ func (p *teamAppImpl) Delete(ctx context.Context, id uint64) error {
 
 // --------------- 团队成员相关接口 ---------------
 
-func (p *teamAppImpl) GetMemberPage(condition *entity.TeamMember, pageParam *model.PageParam, toEntity any) (*model.PageResult[any], error) {
-	return p.teamMemberRepo.GetPageList(condition, pageParam, toEntity)
+func (p *teamAppImpl) GetMemberPage(condition *entity.TeamMember, pageParam model.PageParam) (*model.PageResult[*entity.TeamMemberPO], error) {
+	return p.teamMemberRepo.GetPageList(condition, pageParam)
 }
 
 // 保存团队成员信息
diff --git a/server/internal/tag/domain/entity/po.go b/server/internal/tag/domain/entity/po.go
new file mode 100644
index 00000000..e7cd1bb6
--- /dev/null
+++ b/server/internal/tag/domain/entity/po.go
@@ -0,0 +1,13 @@
+package entity
+
+import "time"
+
+type TeamMemberPO struct {
+	Id         uint64     `json:"id"`
+	TeamId     uint64     `json:"teamId"`
+	AccountId  uint64     `json:"accountId"`
+	Username   string     `json:"username"`
+	Name       string     `json:"name"`
+	Creator    string     `json:"creator"`
+	CreateTime *time.Time `json:"createTime"`
+}
diff --git a/server/internal/tag/domain/entity/query.go b/server/internal/tag/domain/entity/query.go
index f67f6ad6..9348c3b1 100644
--- a/server/internal/tag/domain/entity/query.go
+++ b/server/internal/tag/domain/entity/query.go
@@ -21,6 +21,7 @@ func NewTypePaths(types ...TagType) TypePath {
 }
 
 type TagTreeQuery struct {
+	model.PageParam
 	model.Model
 
 	Types         []TagType
@@ -34,6 +35,7 @@ type TagTreeQuery struct {
 }
 
 type TeamQuery struct {
+	model.PageParam
 	model.Model
 
 	Name string `json:"name" form:"name"` // 团队名称
diff --git a/server/internal/tag/domain/entity/team.go b/server/internal/tag/domain/entity/team.go
index b42aa41b..35f23aae 100644
--- a/server/internal/tag/domain/entity/team.go
+++ b/server/internal/tag/domain/entity/team.go
@@ -2,14 +2,15 @@ package entity
 
 import (
 	"mayfly-go/pkg/model"
+	"time"
 )
 
 // 团队信息
 type Team struct {
 	model.Model
 
-	Name              string          `json:"name" gorm:"not null;size:36;comment:名称"` // 名称
-	ValidityStartDate *model.JsonTime `json:"validityStartDate" gorm:"comment:生效开始时间"` // 生效开始时间
-	ValidityEndDate   *model.JsonTime `json:"validityEndDate" gorm:"comment:生效结束时间"`   // 生效结束时间
-	Remark            string          `json:"remark" gorm:"size:255;"`                 // 备注说明
+	Name              string     `json:"name" gorm:"not null;size:36;comment:名称"` // 名称
+	ValidityStartDate *time.Time `json:"validityStartDate" gorm:"comment:生效开始时间"` // 生效开始时间
+	ValidityEndDate   *time.Time `json:"validityEndDate" gorm:"comment:生效结束时间"`   // 生效结束时间
+	Remark            string     `json:"remark" gorm:"size:255;"`                 // 备注说明
 }
diff --git a/server/internal/tag/domain/repository/team.go b/server/internal/tag/domain/repository/team.go
index 589c0968..2f5cc1e7 100644
--- a/server/internal/tag/domain/repository/team.go
+++ b/server/internal/tag/domain/repository/team.go
@@ -9,5 +9,5 @@ import (
 type Team interface {
 	base.Repo[*entity.Team]
 
-	GetPageList(condition *entity.TeamQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error)
+	GetPageList(condition *entity.TeamQuery, orderBy ...string) (*model.PageResult[*entity.Team], error)
 }
diff --git a/server/internal/tag/domain/repository/team_member.go b/server/internal/tag/domain/repository/team_member.go
index bff9cf01..9c48e0aa 100644
--- a/server/internal/tag/domain/repository/team_member.go
+++ b/server/internal/tag/domain/repository/team_member.go
@@ -10,9 +10,9 @@ type TeamMember interface {
 	base.Repo[*entity.TeamMember]
 
 	// 获取项目成员列表
-	ListMemeber(condition *entity.TeamMember, toEntity any, orderBy ...string)
+	ListMemeber(condition *entity.TeamMember, toEntity []any, orderBy ...string)
 
-	GetPageList(condition *entity.TeamMember, pageParam *model.PageParam, toEntity any) (*model.PageResult[any], error)
+	GetPageList(condition *entity.TeamMember, pageParam model.PageParam) (*model.PageResult[*entity.TeamMemberPO], error)
 
 	// 是否存在指定的团队成员关联信息
 	IsExist(teamId, accountId uint64) bool
diff --git a/server/internal/tag/infrastructure/persistence/team.go b/server/internal/tag/infrastructure/persistence/team.go
index a434e8aa..3ef79fb1 100644
--- a/server/internal/tag/infrastructure/persistence/team.go
+++ b/server/internal/tag/infrastructure/persistence/team.go
@@ -15,9 +15,9 @@ func newTeamRepo() repository.Team {
 	return &teamRepoImpl{}
 }
 
-func (p *teamRepoImpl) GetPageList(condition *entity.TeamQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
+func (p *teamRepoImpl) GetPageList(condition *entity.TeamQuery, orderBy ...string) (*model.PageResult[*entity.Team], error) {
 	qd := model.NewCond().
 		Like("name", condition.Name).
 		OrderBy(orderBy...)
-	return p.PageByCondToAny(qd, pageParam, toEntity)
+	return p.PageByCond(qd, condition.PageParam)
 }
diff --git a/server/internal/tag/infrastructure/persistence/team_member.go b/server/internal/tag/infrastructure/persistence/team_member.go
index 6b9c21ec..5f812903 100644
--- a/server/internal/tag/infrastructure/persistence/team_member.go
+++ b/server/internal/tag/infrastructure/persistence/team_member.go
@@ -16,11 +16,11 @@ func newTeamMemberRepo() repository.TeamMember {
 	return &teamMemberRepoImpl{}
 }
 
-func (p *teamMemberRepoImpl) ListMemeber(condition *entity.TeamMember, toEntity any, orderBy ...string) {
+func (p *teamMemberRepoImpl) ListMemeber(condition *entity.TeamMember, toEntity []any, orderBy ...string) {
 	p.SelectByCondToAny(model.NewModelCond(condition).OrderBy(orderBy...), toEntity)
 }
 
-func (p *teamMemberRepoImpl) GetPageList(condition *entity.TeamMember, pageParam *model.PageParam, toEntity any) (*model.PageResult[any], error) {
+func (p *teamMemberRepoImpl) GetPageList(condition *entity.TeamMember, pageParam model.PageParam) (*model.PageResult[*entity.TeamMemberPO], error) {
 	qd := gormx.NewQueryWithTableName("t_team_member t").
 		Joins("JOIN t_sys_account a ON t.account_id = a.id AND a.status = 1").
 		WithCond(model.NewCond().Columns("t.*, a.name").
@@ -30,7 +30,9 @@ func (p *teamMemberRepoImpl) GetPageList(condition *entity.TeamMember, pageParam
 			Eq0("t.is_deleted", model.ModelUndeleted).
 			Like("a.username", condition.Username).
 			OrderByDesc("t.id"))
-	return gormx.PageQuery(qd, pageParam, toEntity)
+
+	var res []*entity.TeamMemberPO
+	return gormx.PageQuery(qd, pageParam, res)
 }
 
 func (p *teamMemberRepoImpl) IsExist(teamId, accountId uint64) bool {
diff --git a/server/internal/tag/init/init.go b/server/internal/tag/init/init.go
index 775dbc86..d7bb5046 100644
--- a/server/internal/tag/init/init.go
+++ b/server/internal/tag/init/init.go
@@ -22,7 +22,7 @@ func init() {
 }
 
 func Init() {
-	global.EventBus.SubscribeAsync(event.EventTopicResourceOp, "ResourceOpLogApp", func(ctx context.Context, event *eventbus.Event) error {
+	global.EventBus.SubscribeAsync(event.EventTopicResourceOp, "ResourceOpLogApp", func(ctx context.Context, event *eventbus.Event[any]) error {
 		codePath := event.Val.(string)
 		return application.GetResourceOpLogApp().AddResourceOpLog(ctx, codePath)
 	}, false)
diff --git a/server/migration/migration.go b/server/migration/migration.go
index 167b3c12..34c2667a 100644
--- a/server/migration/migration.go
+++ b/server/migration/migration.go
@@ -25,6 +25,7 @@ func RunMigrations(db *gorm.DB) error {
 	err := run(db,
 		migrations.Init,
 		migrations.V1_9,
+		migrations.V1_10,
 	)
 
 	if err == nil {
diff --git a/server/migration/migrations/init.go b/server/migration/migrations/init.go
index 7eb1f2dc..e01f90c3 100644
--- a/server/migration/migrations/init.go
+++ b/server/migration/migrations/init.go
@@ -263,10 +263,11 @@ func initTag(tx *gorm.DB) error {
 	tag.Creator = "admin"
 	tag.Modifier = "admin"
 
+	end := now.AddDate(20, 0, 0)
 	team := &tagentity.Team{
 		Name:              "default_team",
-		ValidityStartDate: &model.JsonTime{Time: now},
-		ValidityEndDate:   &model.JsonTime{Time: now.AddDate(20, 0, 0)},
+		ValidityStartDate: &now,
+		ValidityEndDate:   &end,
 		Remark:            "默认团队",
 	}
 	team.Id = 1
diff --git a/server/migration/migrations/v1_10.go b/server/migration/migrations/v1_10.go
new file mode 100644
index 00000000..2e200cff
--- /dev/null
+++ b/server/migration/migrations/v1_10.go
@@ -0,0 +1,38 @@
+package migrations
+
+import (
+	flowentity "mayfly-go/internal/flow/domain/entity"
+
+	"github.com/go-gormigrate/gormigrate/v2"
+	"gorm.io/gorm"
+)
+
+func V1_10() []*gormigrate.Migration {
+	var migrations []*gormigrate.Migration
+	migrations = append(migrations, V1_10_0()...)
+	return migrations
+}
+
+func V1_10_0() []*gormigrate.Migration {
+	return []*gormigrate.Migration{
+		{
+			ID: "20250213-v1.10.0-flow-recode",
+			Migrate: func(tx *gorm.DB) error {
+				err := tx.AutoMigrate(&flowentity.Procdef{},
+					&flowentity.Procinst{},
+					&flowentity.Execution{},
+					&flowentity.ProcinstTask{},
+					flowentity.ProcinstTaskCandidate{},
+					&flowentity.HisProcinstOp{})
+				if err != nil {
+					return err
+				}
+
+				return nil
+			},
+			Rollback: func(tx *gorm.DB) error {
+				return nil
+			},
+		},
+	}
+}
diff --git a/server/pkg/base/app.go b/server/pkg/base/app.go
index d25ab467..8d213420 100644
--- a/server/pkg/base/app.go
+++ b/server/pkg/base/app.go
@@ -54,13 +54,9 @@ type App[T model.ModelI] interface {
 	// @param cond 可为*model.QueryCond也可以为普通查询model
 	ListByCond(cond any, cols ...string) ([]T, error)
 
-	// PageByCondToAny 分页查询并绑定至指定toModels
-	// @param cond 可为*model.QueryCond也可以为普通查询model
-	PageByCondToAny(cond any, pageParam *model.PageParam, toModels any) (*model.PageResult[any], error)
-
 	// PageByCond 根据指定条件分页查询
 	// @param cond 可为*model.QueryCond也可以为普通查询model
-	PageByCond(cond any, pageParam *model.PageParam, cols ...string) (*model.PageResult[[]T], error)
+	PageByCond(cond any, pageParam model.PageParam, cols ...string) (*model.PageResult[T], error)
 
 	// CountByCond 根据指定条件统计model表的数量
 	// @param cond 可为*model.QueryCond也可以为普通查询model
@@ -147,12 +143,7 @@ func (ai *AppImpl[T, R]) ListByCond(cond any, cols ...string) ([]T, error) {
 	return ai.GetRepo().SelectByCond(cond, cols...)
 }
 
-// PageByCondToAny 分页查询
-func (ai *AppImpl[T, R]) PageByCondToAny(cond any, pageParam *model.PageParam, toModels any) (*model.PageResult[any], error) {
-	return ai.GetRepo().PageByCondToAny(cond, pageParam, toModels)
-}
-
-func (ai *AppImpl[T, R]) PageByCond(cond any, pageParam *model.PageParam, cols ...string) (*model.PageResult[[]T], error) {
+func (ai *AppImpl[T, R]) PageByCond(cond any, pageParam model.PageParam, cols ...string) (*model.PageResult[T], error) {
 	return ai.GetRepo().PageByCond(cond, pageParam, cols...)
 }
 
diff --git a/server/pkg/base/repo.go b/server/pkg/base/repo.go
index 331aa8cf..fe1136f9 100644
--- a/server/pkg/base/repo.go
+++ b/server/pkg/base/repo.go
@@ -1,6 +1,7 @@
 package base
 
 import (
+	"cmp"
 	"context"
 	"mayfly-go/pkg/contextx"
 	"mayfly-go/pkg/gormx"
@@ -80,11 +81,8 @@ type Repo[T model.ModelI] interface {
 	// SelectByCond 根据条件查询模型实例数组
 	SelectByCond(cond any, cols ...string) ([]T, error)
 
-	// PageByCondToAny 根据查询条件分页查询，并绑定至指定res
-	PageByCondToAny(cond any, pageParam *model.PageParam, toModels any) (*model.PageResult[any], error)
-
 	// PageByCond 根据查询条件分页查询
-	PageByCond(cond any, pageParam *model.PageParam, cols ...string) (*model.PageResult[[]T], error)
+	PageByCond(cond any, pageParam model.PageParam, cols ...string) (*model.PageResult[T], error)
 
 	// SelectBySql 根据sql语句查询数据
 	SelectBySql(sql string, res any, params ...any) error
@@ -172,9 +170,9 @@ func (br *RepoImpl[T]) UpdateByCondWithDb(ctx context.Context, db *gorm.DB, valu
 	}
 
 	if db == nil {
-		return gormx.UpdateByCond(br.getModel(), values, toQueryCond(cond))
+		return gormx.UpdateByCond(br.GetModel(), values, toQueryCond(cond))
 	}
-	return gormx.UpdateByCondWithDb(db, br.getModel(), values, toQueryCond(cond))
+	return gormx.UpdateByCondWithDb(db, br.GetModel(), values, toQueryCond(cond))
 }
 
 func (br *RepoImpl[T]) Save(ctx context.Context, e T) error {
@@ -195,22 +193,22 @@ func (br *RepoImpl[T]) DeleteById(ctx context.Context, id ...uint64) error {
 	if db := GetDbFromCtx(ctx); db != nil {
 		return br.DeleteByIdWithDb(ctx, db, id...)
 	}
-	return gormx.DeleteById(br.getModel(), id...)
+	return gormx.DeleteById(br.GetModel(), id...)
 }
 
 func (br *RepoImpl[T]) DeleteByIdWithDb(ctx context.Context, db *gorm.DB, id ...uint64) error {
-	return gormx.DeleteByIdWithDb(db, br.getModel(), id...)
+	return gormx.DeleteByIdWithDb(db, br.GetModel(), id...)
 }
 
 func (br *RepoImpl[T]) DeleteByCond(ctx context.Context, cond any) error {
 	if db := GetDbFromCtx(ctx); db != nil {
 		return br.DeleteByCondWithDb(ctx, db, cond)
 	}
-	return gormx.DeleteByCond(br.getModel(), toQueryCond(cond))
+	return gormx.DeleteByCond(br.GetModel(), toQueryCond(cond))
 }
 
 func (br *RepoImpl[T]) DeleteByCondWithDb(ctx context.Context, db *gorm.DB, cond any) error {
-	return gormx.DeleteByCondWithDb(db, br.getModel(), toQueryCond(cond))
+	return gormx.DeleteByCondWithDb(db, br.GetModel(), toQueryCond(cond))
 }
 
 func (br *RepoImpl[T]) ExecBySql(sql string, params ...any) error {
@@ -228,11 +226,11 @@ func (br *RepoImpl[T]) GetByIds(ids []uint64, cols ...string) ([]T, error) {
 }
 
 func (br *RepoImpl[T]) GetByCond(cond any) error {
-	return gormx.GetByCond(br.getModel(), toQueryCond(cond))
+	return gormx.GetByCond(br.GetModel(), toQueryCond(cond))
 }
 
 func (br *RepoImpl[T]) SelectByCondToAny(cond any, res any) error {
-	return gormx.SelectByCond(br.getModel(), toQueryCond(cond).Dest(res))
+	return gormx.SelectByCond(br.GetModel(), toQueryCond(cond).Dest(res))
 }
 
 func (br *RepoImpl[T]) SelectByCond(cond any, cols ...string) ([]T, error) {
@@ -240,20 +238,9 @@ func (br *RepoImpl[T]) SelectByCond(cond any, cols ...string) ([]T, error) {
 	return models, br.SelectByCondToAny(toQueryCond(cond).Dest(models).Columns(cols...), &models)
 }
 
-func (br *RepoImpl[T]) PageByCondToAny(cond any, pageParam *model.PageParam, toModels any) (*model.PageResult[any], error) {
-	return gormx.PageByCond(br.getModel(), toQueryCond(cond), pageParam, toModels)
-}
-
-func (br *RepoImpl[T]) PageByCond(cond any, pageParam *model.PageParam, cols ...string) (*model.PageResult[[]T], error) {
+func (br *RepoImpl[T]) PageByCond(cond any, pageParam model.PageParam, cols ...string) (*model.PageResult[T], error) {
 	var models []T
-	res, err := br.PageByCondToAny(toQueryCond(cond).Columns(cols...), pageParam, &models)
-	if err != nil {
-		return nil, err
-	}
-	return &model.PageResult[[]T]{
-		List:  models,
-		Total: res.Total,
-	}, nil
+	return gormx.PageByCond(br.GetModel(), toQueryCond(cond).Columns(cols...), pageParam, models)
 }
 
 func (br *RepoImpl[T]) SelectBySql(sql string, res any, params ...any) error {
@@ -261,7 +248,7 @@ func (br *RepoImpl[T]) SelectBySql(sql string, res any, params ...any) error {
 }
 
 func (br *RepoImpl[T]) CountByCond(cond any) int64 {
-	return gormx.CountByCond(br.getModel(), toQueryCond(cond))
+	return gormx.CountByCond(br.GetModel(), toQueryCond(cond))
 }
 
 // NewModel 新建模型实例
@@ -282,7 +269,7 @@ func (br *RepoImpl[T]) NewModel() T {
 // }
 
 // getModel 获取表的模型实例
-func (br *RepoImpl[T]) getModel() T {
+func (br *RepoImpl[T]) GetModel() T {
 	if br.model != nil {
 		return br.model.(T)
 	}
@@ -311,7 +298,7 @@ func (br *RepoImpl[T]) getModelType() reflect.Type {
 // 从上下文获取登录账号信息，并赋值至实体
 func (br *RepoImpl[T]) fillBaseInfo(ctx context.Context, e T) T {
 	// 默认使用数据库id策略, 若要改变则实体结构体自行覆盖FillBaseInfo方法。可参考 sys/entity.Resource
-	e.FillBaseInfo(model.IdGenTypeNone, contextx.GetLoginAccount(ctx))
+	e.FillBaseInfo(model.IdGenTypeNone, cmp.Or(contextx.GetLoginAccount(ctx), model.SysAccount))
 	return e
 }
 
diff --git a/server/pkg/eventbus/eventbus.go b/server/pkg/eventbus/eventbus.go
index 51131501..f92e0e3b 100644
--- a/server/pkg/eventbus/eventbus.go
+++ b/server/pkg/eventbus/eventbus.go
@@ -8,16 +8,18 @@ import (
 )
 
 // BusSubscriber defines subscription-related bus behavior
-type BusSubscriber interface {
-	Subscribe(topic string, subId string, fn EventHandleFunc) error
-	SubscribeAsync(topic string, subId string, fn EventHandleFunc, transactional bool) error
-	SubscribeOnce(topic string, subId string, fn EventHandleFunc) error
+type BusSubscriber[T any] interface {
+	Subscribe(topic string, subId string, fn EventHandleFunc[T]) error
+	SubscribeAsync(topic string, subId string, fn EventHandleFunc[T], transactional bool) error
+	SubscribeOnce(topic string, subId string, fn EventHandleFunc[T]) error
 	Unsubscribe(topic string, subId string) error
 }
 
 // BusPublisher defines publishing-related bus behavior
-type BusPublisher interface {
-	Publish(ctx context.Context, topic string, val any)
+type BusPublisher[T any] interface {
+	Publish(ctx context.Context, topic string, val T)
+
+	PublishSync(ctx context.Context, topic string, val T) error
 }
 
 // BusController defines bus control behavior (checking handler's presence, synchronization)
@@ -25,90 +27,90 @@ type BusController interface {
 	WaitAsync()
 }
 
-// Bus englobes global (subscribe, publish, control) bus behavior
-type Bus interface {
-	BusController
-	BusSubscriber
-	BusPublisher
-}
-
-// EventBus - box for handlers and callbacks.
-type EventBus struct {
-	subscriberManager map[string]*SubscriberManager // topic -> SubscriberManager
-	lock              sync.Mutex                    // a lock for the map
-	wg                sync.WaitGroup
-}
-
-func New() Bus {
-	b := &EventBus{
-		make(map[string]*SubscriberManager),
-		sync.Mutex{},
-		sync.WaitGroup{},
-	}
-	return Bus(b)
-}
-
-type Event struct {
+type Event[T any] struct {
 	Topic string
-	Val   any
+	Val   T
 }
 
 // 订阅者们的事件处理器
-type SubscriberManager struct {
+type SubscriberManager[T any] struct {
 	// 事件处理器 subId -> handler
-	handlers map[string]*eventHandler
+	handlers map[string]*eventHandler[T]
 }
 
-func NewSubscriberManager() *SubscriberManager {
-	return &SubscriberManager{
-		handlers: make(map[string]*eventHandler),
+func NewSubscriberManager[T any]() *SubscriberManager[T] {
+	return &SubscriberManager[T]{
+		handlers: make(map[string]*eventHandler[T]),
 	}
 }
 
-func (sm *SubscriberManager) addSubscriber(subId string, eventHandler *eventHandler) {
+func (sm *SubscriberManager[T]) addSubscriber(subId string, eventHandler *eventHandler[T]) {
 	sm.handlers[subId] = eventHandler
 }
 
-func (sm *SubscriberManager) delSubscriber(subId string) {
+func (sm *SubscriberManager[T]) delSubscriber(subId string) {
 	delete(sm.handlers, subId)
 }
 
 // 事件处理函数
-type EventHandleFunc func(ctx context.Context, event *Event) error
+type EventHandleFunc[T any] func(ctx context.Context, event *Event[T]) error
 
-type eventHandler struct {
-	handlerFunc   EventHandleFunc // 事件处理函数
-	once          bool            // 是否只执行一次
+type eventHandler[T any] struct {
+	handlerFunc   EventHandleFunc[T] // 事件处理函数
+	once          bool               // 是否只执行一次
 	async         bool
 	transactional bool
 
 	sync.Mutex // lock for an event handler - useful for running async callbacks serially
 }
 
-func (bus *EventBus) Subscribe(topic string, subId string, fn EventHandleFunc) error {
-	eh := &eventHandler{}
+// Bus englobes global (subscribe, publish, control) bus behavior
+type Bus[T any] interface {
+	BusController
+	BusSubscriber[T]
+	BusPublisher[T]
+}
+
+// EventBus - box for handlers and callbacks.
+type EventBus[T any] struct {
+	subscriberManager map[string]*SubscriberManager[T] // topic -> SubscriberManager
+	lock              sync.Mutex                       // a lock for the map
+	wg                sync.WaitGroup
+}
+
+func New[T any]() Bus[T] {
+	b := &EventBus[T]{
+		make(map[string]*SubscriberManager[T]),
+		sync.Mutex{},
+		sync.WaitGroup{},
+	}
+	return Bus[T](b)
+}
+
+func (bus *EventBus[T]) Subscribe(topic string, subId string, fn EventHandleFunc[T]) error {
+	eh := &eventHandler[T]{}
 	eh.handlerFunc = fn
 	return bus.doSubscribe(topic, subId, eh)
 }
 
 // SubscribeAsync subscribes to a topic with an asynchronous callback
 // Transactional determines whether subsequent callbacks for a topic are
-func (bus *EventBus) SubscribeAsync(topic string, subId string, fn EventHandleFunc, transactional bool) error {
-	eh := &eventHandler{}
+func (bus *EventBus[T]) SubscribeAsync(topic string, subId string, fn EventHandleFunc[T], transactional bool) error {
+	eh := &eventHandler[T]{}
 	eh.handlerFunc = fn
 	eh.async = true
 	return bus.doSubscribe(topic, subId, eh)
 }
 
 // SubscribeOnce subscribes to a topic once. Handler will be removed after executing.
-func (bus *EventBus) SubscribeOnce(topic string, subId string, fn EventHandleFunc) error {
-	eh := &eventHandler{}
+func (bus *EventBus[T]) SubscribeOnce(topic string, subId string, fn EventHandleFunc[T]) error {
+	eh := &eventHandler[T]{}
 	eh.handlerFunc = fn
 	eh.once = true
 	return bus.doSubscribe(topic, subId, eh)
 }
 
-func (bus *EventBus) Unsubscribe(topic string, subId string) error {
+func (bus *EventBus[T]) Unsubscribe(topic string, subId string) error {
 	bus.lock.Lock()
 	defer bus.lock.Unlock()
 	subManager := bus.subscriberManager[topic]
@@ -119,73 +121,91 @@ func (bus *EventBus) Unsubscribe(topic string, subId string) error {
 	return nil
 }
 
-func (bus *EventBus) Publish(ctx context.Context, topic string, val any) {
-	bus.lock.Lock() // will unlock if handler is not found or always after setUpPublish
+func (bus *EventBus[T]) Publish(ctx context.Context, topic string, val T) {
+	bus.publishInternal(ctx, topic, val, false)
+}
+
+func (bus *EventBus[T]) PublishSync(ctx context.Context, topic string, val T) error {
+	return bus.publishInternal(ctx, topic, val, true)
+}
+
+func (bus *EventBus[T]) publishInternal(ctx context.Context, topic string, val T, syncSubHandleErrorOnStop bool) error {
+	bus.lock.Lock()
 	defer bus.lock.Unlock()
-	logx.Debugf("topic - [%s] - published the event", topic)
-	event := &Event{
-		Topic: topic,
-		Val:   val,
-	}
-	subscriberManager := bus.subscriberManager[topic]
-	if subscriberManager == nil {
-		return
+
+	event := &Event[T]{Topic: topic, Val: val}
+	logx.Debugf("topic-[%s] - published the event", topic)
+
+	subManager := bus.subscriberManager[topic]
+	if subManager == nil || len(subManager.handlers) == 0 {
+		return nil
 	}
 
-	handlers := subscriberManager.handlers
-	if len(handlers) == 0 {
-		return
-	}
-
-	for subId, handler := range handlers {
-		logx.Debugf("subscriber - [%s] - starts executing events published by topic - [%s]", subId, topic)
+	var syncSubError error
+	for subId, handler := range subManager.handlers {
 		if handler.once {
-			subscriberManager.delSubscriber(subId)
+			subManager.delSubscriber(subId)
 		}
+
+		// 同步执行处理
 		if !handler.async {
-			bus.doPublish(ctx, handler, event)
-		} else {
-			bus.wg.Add(1)
-			if handler.transactional {
-				bus.lock.Unlock()
-				handler.Lock()
-				bus.lock.Lock()
+			// 同步订阅者其中一个执行失败则停止后续订阅者处理字段设置为true，并且已经出现订阅者处理失败则跳过后续同步订阅者的处理
+			if syncSubHandleErrorOnStop && syncSubError != nil {
+				continue
 			}
-			go bus.doPublishAsync(ctx, handler, event)
+
+			logx.Debugf("subscriber-[%s] - starts executing events published by topic-[%s]", subId, topic)
+
+			err := bus.doPublish(ctx, handler, event)
+			if err != nil {
+				syncSubError = err
+				logx.Errorf("subscriber-[%s] failed to handle event topic-[%s]: %v", subId, topic, err)
+			}
+			continue
 		}
+
+		logx.Debugf("async subscriber-[%s] - starts executing events published by topic-[%s]", subId, topic)
+		// 异步执行
+		bus.wg.Add(1)
+		if handler.transactional {
+			bus.lock.Unlock()
+			handler.Lock()
+			bus.lock.Lock()
+		}
+		go bus.doPublishAsync(ctx, subId, handler, event)
 	}
+
+	return syncSubError
 }
 
 // WaitAsync waits for all async callbacks to complete
-func (bus *EventBus) WaitAsync() {
+func (bus *EventBus[T]) WaitAsync() {
 	bus.wg.Wait()
 }
 
-func (bus *EventBus) doSubscribe(topic string, subId string, handler *eventHandler) error {
+func (bus *EventBus[T]) doSubscribe(topic string, subId string, handler *eventHandler[T]) error {
 	bus.lock.Lock()
 	defer bus.lock.Unlock()
-	logx.Debugf("subscribers - [%s] - subscribed to topic - [%s]", subId, topic)
+	logx.Debugf("subscribers-[%s] -> subscribed to topic-[%s]", subId, topic)
 	subManager := bus.subscriberManager[topic]
 	if subManager == nil {
-		subManager = NewSubscriberManager()
+		subManager = NewSubscriberManager[T]()
 		bus.subscriberManager[topic] = subManager
 	}
 	subManager.addSubscriber(subId, handler)
 	return nil
 }
 
-func (bus *EventBus) doPublish(ctx context.Context, handler *eventHandler, event *Event) error {
-	err := handler.handlerFunc(ctx, event)
-	if err != nil {
-		logx.Errorf("subscriber failed to execute topic [%s]: %s", event.Topic, err.Error())
-	}
-	return err
+func (bus *EventBus[T]) doPublish(ctx context.Context, handler *eventHandler[T], event *Event[T]) error {
+	return handler.handlerFunc(ctx, event)
 }
 
-func (bus *EventBus) doPublishAsync(ctx context.Context, handler *eventHandler, event *Event) {
+func (bus *EventBus[T]) doPublishAsync(ctx context.Context, subId string, handler *eventHandler[T], event *Event[T]) {
 	defer bus.wg.Done()
 	if handler.transactional {
 		defer handler.Unlock()
 	}
-	bus.doPublish(ctx, handler, event)
+	if err := bus.doPublish(ctx, handler, event); err != nil {
+		logx.Errorf("async subscriber-[%s] failed to execute topic-[%s]: %s", subId, event.Topic, err.Error())
+	}
 }
diff --git a/server/pkg/eventbus/eventbus_test.go b/server/pkg/eventbus/eventbus_test.go
index 8061e62f..1a0ddaf3 100644
--- a/server/pkg/eventbus/eventbus_test.go
+++ b/server/pkg/eventbus/eventbus_test.go
@@ -9,30 +9,30 @@ import (
 )
 
 func TestSubscribe(t *testing.T) {
-	bus := New()
+	bus := New[any]()
 
-	bus.SubscribeAsync("topic", "sub5", func(ctx context.Context, event *Event) error {
+	bus.SubscribeAsync("topic", "sub5", func(ctx context.Context, event *Event[any]) error {
 		time.Sleep(5 * time.Second)
 		fmt.Printf("%s -> %s -> %d\n", "sub5", event.Topic, event.Val)
 		return nil
 	}, true)
 
-	bus.SubscribeOnce("topic", "sub1", func(ctx context.Context, event *Event) error {
+	bus.SubscribeOnce("topic", "sub1", func(ctx context.Context, event *Event[any]) error {
 		fmt.Printf("%s -> %s -> %d\n", "sub1", event.Topic, event.Val)
 		return nil
 	})
 
-	bus.Subscribe("topic", "sub2", func(ctx context.Context, event *Event) error {
+	bus.Subscribe("topic", "sub2", func(ctx context.Context, event *Event[any]) error {
 		time.Sleep(5 * time.Second)
 		return errors.New("失败。。。。")
 	})
 
-	bus.SubscribeAsync("topic", "sub3", func(ctx context.Context, event *Event) error {
+	bus.SubscribeAsync("topic", "sub3", func(ctx context.Context, event *Event[any]) error {
 		fmt.Printf("%s -> %s -> %d\n", "sub3", event.Topic, event.Val)
 		return nil
 	}, false)
 
-	bus.SubscribeAsync("topic", "sub4", func(ctx context.Context, event *Event) error {
+	bus.SubscribeAsync("topic", "sub4", func(ctx context.Context, event *Event[any]) error {
 		time.Sleep(5 * time.Second)
 		fmt.Printf("%s -> %s -> %d\n", "sub4", event.Topic, event.Val)
 		return nil
diff --git a/server/pkg/global/global.go b/server/pkg/global/global.go
index ae59d0e4..3384e58b 100644
--- a/server/pkg/global/global.go
+++ b/server/pkg/global/global.go
@@ -9,5 +9,5 @@ import (
 var (
 	Db *gorm.DB // gorm
 
-	EventBus eventbus.Bus = eventbus.New()
+	EventBus eventbus.Bus[any] = eventbus.New[any]()
 )
diff --git a/server/pkg/gormx/gormx.go b/server/pkg/gormx/gormx.go
index 73d5631d..32d92f16 100644
--- a/server/pkg/gormx/gormx.go
+++ b/server/pkg/gormx/gormx.go
@@ -39,7 +39,7 @@ func CountByCond(dbModel model.ModelI, cond *model.QueryCond) int64 {
 
 // PageQuery 根据查询条件分页查询数据，若需要伪删除过滤，则自行过滤-调用q.Undeleted()
 // 若未指定查询列，则查询列以toModels字段为准
-func PageQuery[T any](q *Query, pageParam *model.PageParam, toModels T) (*model.PageResult[T], error) {
+func PageQuery[T any](q *Query, pageParam model.PageParam, toModels []T) (*model.PageResult[T], error) {
 	gdb := q.GenGdb()
 	var count int64
 	err := gdb.Count(&count).Error
@@ -47,12 +47,21 @@ func PageQuery[T any](q *Query, pageParam *model.PageParam, toModels T) (*model.
 		return nil, err
 	}
 	if count == 0 {
-		return model.EmptyPageResult[T](), nil
+		return model.NewEmptyPageResult[T](), nil
 	}
 
 	page := pageParam.PageNum
 	pageSize := pageParam.PageSize
-	err = gdb.Limit(pageSize).Offset((page - 1) * pageSize).Find(toModels).Error
+	if page == 0 {
+		page = 1
+	}
+	if pageSize == 0 {
+		pageSize = 100
+	}
+	if pageSize > 2000 {
+		pageSize = 2000
+	}
+	err = gdb.Limit(pageSize).Offset((page - 1) * pageSize).Find(&toModels).Error
 	if err != nil {
 		return nil, err
 	}
@@ -60,7 +69,7 @@ func PageQuery[T any](q *Query, pageParam *model.PageParam, toModels T) (*model.
 }
 
 // PageByCond 根据指定查询条件分页查询数据
-func PageByCond[T any](dbModel model.ModelI, cond *model.QueryCond, pageParam *model.PageParam, toModels T) (*model.PageResult[T], error) {
+func PageByCond[T any](dbModel model.ModelI, cond *model.QueryCond, pageParam model.PageParam, toModels []T) (*model.PageResult[T], error) {
 	return PageQuery(NewQuery(dbModel, cond), pageParam, toModels)
 }
 
diff --git a/server/pkg/model/login_account.go b/server/pkg/model/login_account.go
index f6408cf1..77cd06b8 100644
--- a/server/pkg/model/login_account.go
+++ b/server/pkg/model/login_account.go
@@ -9,3 +9,9 @@ type LoginAccount struct {
 func (la *LoginAccount) GetAesKey() string {
 	return la.Token[:24]
 }
+
+// 系统账号
+var SysAccount = &LoginAccount{
+	Id:       1,
+	Username: "system",
+}
diff --git a/server/pkg/model/model.go b/server/pkg/model/model.go
index 6aef8d8e..a51b6f31 100644
--- a/server/pkg/model/model.go
+++ b/server/pkg/model/model.go
@@ -1,11 +1,7 @@
 package model
 
 import (
-	"database/sql/driver"
-	"encoding/json"
 	"time"
-
-	"github.com/may-fly/cast"
 )
 
 type IdGenType int
@@ -200,73 +196,3 @@ func GetIdByGenType(genType IdGenType) uint64 {
 	}
 	return 0
 }
-
-type Map[K comparable, V any] map[K]V
-
-func (m *Map[K, V]) Scan(value any) error {
-	if v, ok := value.([]byte); ok && len(v) > 0 {
-		return json.Unmarshal(v, m)
-	}
-	return nil
-}
-
-func (m Map[K, V]) Value() (driver.Value, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return json.Marshal(m)
-}
-
-type Slice[T int | uint64 | string | Map[string, any]] []T
-
-func (s *Slice[T]) Scan(value any) error {
-	if v, ok := value.([]byte); ok && len(v) > 0 {
-		return json.Unmarshal(v, s)
-	}
-	return nil
-}
-
-func (s Slice[T]) Value() (driver.Value, error) {
-	if s == nil {
-		return nil, nil
-	}
-	return json.Marshal(s)
-}
-
-// 带有额外其他信息字段的结构体
-type ExtraData struct {
-	Extra Map[string, any] `json:"extra" gorm:"type:varchar(2000)"`
-}
-
-// SetExtraValue 设置额外信息字段值
-func (m *ExtraData) SetExtraValue(key string, val any) {
-	if m.Extra != nil {
-		m.Extra[key] = val
-	} else {
-		m.Extra = Map[string, any]{key: val}
-	}
-}
-
-// GetExtraString 获取额外信息中的string类型字段值
-func (e ExtraData) GetExtraString(key string) string {
-	if e.Extra == nil {
-		return ""
-	}
-	return cast.ToString(e.Extra[key])
-}
-
-// GetExtraInt 获取额外信息中的int类型字段值
-func (e ExtraData) GetExtraInt(key string) int {
-	if e.Extra == nil {
-		return 0
-	}
-	return cast.ToInt(e.Extra[key])
-}
-
-// GetExtraBool 获取额外信息中的bool类型字段值
-func (e ExtraData) GetExtraBool(key string) bool {
-	if e.Extra == nil {
-		return false
-	}
-	return cast.ToBool(e.Extra[key])
-}
diff --git a/server/pkg/model/page.go b/server/pkg/model/page.go
index 78495b35..a37650c0 100644
--- a/server/pkg/model/page.go
+++ b/server/pkg/model/page.go
@@ -1,18 +1,39 @@
 package model
 
+import (
+	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/structx"
+)
+
 // 分页参数
 type PageParam struct {
-	PageNum  int `json:"pageNum"`
-	PageSize int `json:"pageSize"`
+	PageNum  int `json:"pageNum" form:"pageNum" gorm:"-"`
+	PageSize int `json:"pageSize" form:"pageSize" gorm:"-"`
 }
 
 // 分页结果
 type PageResult[T any] struct {
 	Total int64 `json:"total"`
-	List  T     `json:"list"`
+	List  []T   `json:"list"`
 }
 
 // 空分页结果
-func EmptyPageResult[T any]() *PageResult[T] {
+func NewEmptyPageResult[T any]() *PageResult[T] {
 	return &PageResult[T]{Total: 0}
 }
+
+// PageResultConv pageResult转换
+func PageResultConv[F any, T any](pageResult *PageResult[F]) *PageResult[T] {
+	if pageResult == nil {
+		return NewEmptyPageResult[T]()
+	}
+
+	return &PageResult[T]{
+		Total: pageResult.Total,
+		List: collx.ArrayMap(pageResult.List, func(item F) T {
+			t := structx.NewInstance[T]()
+			structx.Copy(t, item)
+			return t
+		}),
+	}
+}
diff --git a/server/pkg/model/type.go b/server/pkg/model/type.go
new file mode 100644
index 00000000..475cac08
--- /dev/null
+++ b/server/pkg/model/type.go
@@ -0,0 +1,89 @@
+package model
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"mayfly-go/pkg/utils/collx"
+)
+
+type Map[K comparable, V any] map[K]V
+
+func (m *Map[K, V]) Scan(value any) error {
+	if v, ok := value.([]byte); ok && len(v) > 0 {
+		return json.Unmarshal(v, m)
+	}
+	return nil
+}
+
+func (m Map[K, V]) Value() (driver.Value, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return json.Marshal(m)
+}
+
+type Slice[T int | uint64 | string | Map[string, any]] []T
+
+func (s *Slice[T]) Scan(value any) error {
+	if v, ok := value.([]byte); ok && len(v) > 0 {
+		return json.Unmarshal(v, s)
+	}
+	return nil
+}
+
+func (s Slice[T]) Value() (driver.Value, error) {
+	if s == nil {
+		return nil, nil
+	}
+	return json.Marshal(s)
+}
+
+// ExtraData 带有额外其他信息字段的结构体
+type ExtraData struct {
+	Extra collx.M `json:"extra" gorm:"type:varchar(2000)"`
+}
+
+// SetExtraValue 设置额外信息字段值
+func (m *ExtraData) SetExtraValue(key string, val any) {
+	if m.Extra != nil {
+		m.Extra[key] = val
+	} else {
+		m.Extra = collx.M{key: val}
+	}
+}
+
+// GetExtraVal 获取额外信息字段值
+func (e ExtraData) GetExtraVal(key string) any {
+	if e.Extra == nil {
+		return nil
+	}
+	return e.Extra[key]
+}
+
+// GetExtraString 获取额外信息中的string类型字段值
+func (e ExtraData) GetExtraString(key string) string {
+	return e.Extra.GetStr(key)
+}
+
+func (e ExtraData) GetExtraStringSlice(key string) []string {
+	return e.Extra.GetStrSlice(key)
+}
+
+// GetExtraInt 获取额外信息中的int类型字段值
+func (e ExtraData) GetExtraInt(key string) int {
+	return e.Extra.GetInt(key)
+}
+
+// GetExtraInt64 获取额外信息中的int64类型字段值
+func (e ExtraData) GetExtraInt64(key string) int64 {
+	return e.Extra.GetInt64(key)
+}
+
+func (e ExtraData) GetExtraFloat32(key string) float32 {
+	return e.Extra.GetFloat32(key)
+}
+
+// GetExtraBool 获取额外信息中的bool类型字段值
+func (e ExtraData) GetExtraBool(key string) bool {
+	return e.Extra.GetBool(key)
+}
diff --git a/server/pkg/req/f.go b/server/pkg/req/f.go
index a913444e..69467f99 100644
--- a/server/pkg/req/f.go
+++ b/server/pkg/req/f.go
@@ -87,8 +87,8 @@ func (wf *wrapperF) QueryIntDefault(qm string, defaultInt int) int {
 }
 
 // 获取分页参数
-func (wf *wrapperF) GetPageParam() *model.PageParam {
-	return &model.PageParam{PageNum: wf.QueryIntDefault("pageNum", 1), PageSize: wf.QueryIntDefault("pageSize", 100)}
+func (wf *wrapperF) GetPageParam() model.PageParam {
+	return model.PageParam{PageNum: wf.QueryIntDefault("pageNum", 1), PageSize: wf.QueryIntDefault("pageSize", 100)}
 }
 
 // 获取路径参数
diff --git a/server/pkg/req/util.go b/server/pkg/req/util.go
index 8de09858..227c34e2 100644
--- a/server/pkg/req/util.go
+++ b/server/pkg/req/util.go
@@ -35,7 +35,7 @@ func BindQuery[T any](rc *Ctx, data T) T {
 }
 
 // 绑定查询字符串到指定结构体，并将分页信息也返回
-func BindQueryAndPage[T any](rc *Ctx, data T) (T, *model.PageParam) {
+func BindQueryAndPage[T any](rc *Ctx, data T) (T, model.PageParam) {
 	if err := rc.BindQuery(data); err != nil {
 		panic(ConvBindValidationError(data, err))
 	} else {
diff --git a/server/pkg/utils/collx/map.go b/server/pkg/utils/collx/map.go
index 2fc8349d..126fe406 100644
--- a/server/pkg/utils/collx/map.go
+++ b/server/pkg/utils/collx/map.go
@@ -1,10 +1,72 @@
 package collx
 
-import "mayfly-go/pkg/utils/anyx"
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"mayfly-go/pkg/utils/anyx"
+
+	"github.com/may-fly/cast"
+)
 
 // M is a shortcut for map[string]any
 type M map[string]any
 
+// Set 设置key对应的值
+func (m *M) Set(key string, val any) {
+	if *m == nil {
+		*m = M{}
+	}
+	(*m)[key] = val
+}
+
+// GetStr 获取key对应的string类型值
+func (m M) GetStr(key string) string {
+	return cast.ToString(m[key])
+}
+
+func (m M) GetStrSlice(key string) []string {
+	return cast.ToStringSlice(m[key])
+}
+
+// GetInt 获取key对应的int类型值
+func (m M) GetInt(key string) int {
+	return cast.ToInt(m[key])
+}
+
+// GetInt64 获取key对应的int64类型值
+func (m M) GetInt64(key string) int64 {
+	return cast.ToInt64(m[key])
+}
+
+func (m M) GetFloat32(key string) float32 {
+	return cast.ToFloat32(m[key])
+}
+
+func (m M) GetFloat64(key string) float64 {
+	return cast.ToFloat64(m[key])
+}
+
+func (m M) GetBool(key string) bool {
+	return cast.ToBool(m[key])
+}
+
+/******************* M db driver *******************/
+func (j *M) Scan(value any) error {
+	if v, ok := value.([]byte); ok && len(v) > 0 {
+		return json.Unmarshal(v, j)
+	}
+	return nil
+}
+
+func (m M) Value() (driver.Value, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return json.Marshal(m)
+}
+
+/******************* map utils *******************/
+
 // 将偶数个元素转为对应的M (map[string]any)
 //
 // 偶数索引为key，奇数为value
diff --git a/server/pkg/utils/jsonx/jsonx.go b/server/pkg/utils/jsonx/jsonx.go
index a6c6fb11..5d1fd170 100644
--- a/server/pkg/utils/jsonx/jsonx.go
+++ b/server/pkg/utils/jsonx/jsonx.go
@@ -3,12 +3,13 @@ package jsonx
 import (
 	"encoding/json"
 	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/utils/collx"
 
 	"github.com/tidwall/gjson"
 )
 
 // json字符串转map
-func ToMap(jsonStr string) (map[string]any, error) {
+func ToMap(jsonStr string) (collx.M, error) {
 	if jsonStr == "" {
 		return map[string]any{}, nil
 	}
@@ -21,7 +22,7 @@ func To[T any](jsonStr string, res T) (T, error) {
 }
 
 // json字节数组转map
-func ToMapByBytes(bytes []byte) (map[string]any, error) {
+func ToMapByBytes(bytes []byte) (collx.M, error) {
 	var res map[string]any
 	err := json.Unmarshal(bytes, &res)
 	return res, err
diff --git a/server/pkg/utils/stringx/template_test.go b/server/pkg/utils/stringx/template_test.go
index 61039ecf..4458c122 100644
--- a/server/pkg/utils/stringx/template_test.go
+++ b/server/pkg/utils/stringx/template_test.go
@@ -5,6 +5,8 @@ import (
 	"mayfly-go/pkg/utils/collx"
 	"strings"
 	"testing"
+
+	"github.com/may-fly/cast"
 )
 
 func TestTemplateParse(t *testing.T) {
@@ -20,6 +22,14 @@ func TestTemplateParse(t *testing.T) {
 		},
 	}
 
+	num1 := 12
+	num2 := 12
+	num3 := 2
+	templ2 := "{{ eq .num1 121 }}"
+	re, err := TemplateParse(templ2, collx.M{"num1": num1, "num2": num2, "num3": num3})
+
+	fmt.Println(err, cast.ToBool(re))
+
 	res, _ := TemplateParse(tmpl, vars)
 	res2 := strings.TrimSpace(res)
 	fmt.Println(res2)
diff --git a/server/pkg/utils/structx/reflect.go b/server/pkg/utils/structx/reflect.go
new file mode 100644
index 00000000..1f7c427b
--- /dev/null
+++ b/server/pkg/utils/structx/reflect.go
@@ -0,0 +1,21 @@
+package structx
+
+import "reflect"
+
+// NewInstance 创建泛型 T 的实例。如果 T 是指针类型，则创建其指向类型的实例并返回指针。
+func NewInstance[T any]() T {
+	var t T
+
+	// 反射判断是否是指针类型，并且是否为 nil
+	if reflect.ValueOf(t).Kind() == reflect.Ptr {
+		// 创建 T 对应的非指针类型的实例，并取其地址作为新的 T
+		t = reflect.New(reflect.TypeOf(t).Elem()).Interface().(T)
+	} else if kind := reflect.TypeOf(t).Kind(); kind == reflect.Array || kind == reflect.Slice {
+		// 如果是数组或切片类型，创建一个新的切片（数组）
+		elemType := reflect.TypeOf(t).Elem()
+		newSlice := reflect.MakeSlice(reflect.SliceOf(elemType), 0, 0)
+		t = newSlice.Interface().(T)
+	}
+
+	return t
+}
diff --git a/server/pkg/ws/client_manager.go b/server/pkg/ws/client_manager.go
index ac6a6fc8..30b45aa0 100644
--- a/server/pkg/ws/client_manager.go
+++ b/server/pkg/ws/client_manager.go
@@ -130,10 +130,10 @@ func (manager *ClientManager) WriteMessage() {
 				cli := manager.GetByUidAndCid(uid, cid)
 				if cli != nil {
 					if err := cli.WriteMsg(msg); err != nil {
-						logx.Warnf("ws消息发送失败[uid=%d, cid=%s]: %s", uid, cid, err.Error())
+						logx.Warnf("ws send message failed - [uid=%d, cid=%s]: %s", uid, cid, err.Error())
 					}
 				} else {
-					logx.Warnf("[uid=%v, cid=%s]的ws连接不存在", uid, cid)
+					logx.Warnf("[uid=%v, cid=%s] ws conn not exist", uid, cid)
 				}
 				continue
 			}
@@ -141,7 +141,7 @@ func (manager *ClientManager) WriteMessage() {
 			// cid为空，则向该用户所有客户端发送该消息
 			for _, cli := range manager.GetByUid(uid) {
 				if err := cli.WriteMsg(msg); err != nil {
-					logx.Warnf("ws消息发送失败[uid=%d, cid=%s]: %s", uid, cli.ClientId, err.Error())
+					logx.Warnf("ws send message failed - [uid=%d, cid=%s]: %s", uid, cli.ClientId, err.Error())
 				}
 			}
 		}
@@ -181,7 +181,7 @@ func (manager *ClientManager) doConnect(client *Client) {
 		manager.doDisconnect(cli)
 	}
 	manager.addUserClient2Map(client)
-	logx.Debugf("WS客户端已连接: uid=%d, cid=%s, usercount=%d", client.UserId, client.ClientId, manager.Count())
+	logx.Debugf("WS client connected: uid=%d, cid=%s, usercount=%d", client.UserId, client.ClientId, manager.Count())
 }
 
 // 处理断开连接
@@ -192,7 +192,7 @@ func (manager *ClientManager) doDisconnect(client *Client) {
 		client.WsConn = nil
 	}
 	manager.delUserClient4Map(client)
-	logx.Debugf("WS客户端已断开: uid=%d, cid=%s, usercount=%d", client.UserId, client.ClientId, Manager.Count())
+	logx.Debugf("WS client disconnected: uid=%d, cid=%s, usercount=%d", client.UserId, client.ClientId, Manager.Count())
 }
 
 func (manager *ClientManager) addUserClient2Map(client *Client) {