From 01d3e1ad28aa47d23a7cab165e85eb1787023345 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 17 Apr 2024 21:28:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E4=B8=8E=E5=87=AD=E8=AF=81=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=87=B3=E6=A0=87=E7=AD=BE&=E5=85=B6=E4=BB=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=9E=84=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mayfly_go_web/package.json                    |   4 +-
 mayfly_go_web/src/common/commonEnum.ts        |  20 +-
 mayfly_go_web/src/common/config.ts            |   2 +-
 mayfly_go_web/src/common/pattern.ts           |   6 +-
 mayfly_go_web/src/hooks/usePageTable.ts       |   1 +
 mayfly_go_web/src/router/dynamicRouter.ts     |   2 +-
 .../views/ops/component/ResourceAuthCert.vue  |   2 +-
 .../ops/component/ResourceAuthCertEdit.vue    |  14 +-
 .../src/views/ops/component/ResourceTags.vue  |  20 +-
 .../src/views/ops/component/TagTreeSelect.vue |  10 +-
 mayfly_go_web/src/views/ops/component/tag.ts  |  26 ++
 mayfly_go_web/src/views/ops/db/DbEdit.vue     | 142 +++----
 mayfly_go_web/src/views/ops/db/DbList.vue     | 107 ++----
 .../src/views/ops/db/InstanceDbConf.vue       | 171 +++++++++
 .../src/views/ops/db/InstanceEdit.vue         | 121 +++---
 .../src/views/ops/db/InstanceList.vue         |  51 ++-
 mayfly_go_web/src/views/ops/db/SqlExec.vue    |   2 +-
 mayfly_go_web/src/views/ops/db/api.ts         |   2 +-
 .../db/component/sqleditor/DbSqlEditor.vue    |  10 +-
 .../ops/db/component/table/DbTableData.vue    |   5 +-
 .../ops/db/component/table/DbTablesOp.vue     |   2 +-
 .../src/views/ops/machine/MachineEdit.vue     |  37 +-
 .../src/views/ops/mongo/MongoEdit.vue         |  29 +-
 .../src/views/ops/mongo/MongoList.vue         |   2 +-
 .../src/views/ops/redis/RedisEdit.vue         |  29 +-
 .../src/views/ops/tag/AuthCertList.vue        |   3 +-
 .../src/views/ops/tag/TagTreeList.vue         |  17 +-
 mayfly_go_web/src/views/ops/tag/TeamList.vue  |  84 +++--
 .../src/views/system/account/AccountEdit.vue  |  14 +-
 .../src/views/system/config/ConfigEdit.vue    |  10 +-
 .../views/system/resource/ResourceEdit.vue    |  12 +-
 .../src/views/system/role/RoleEdit.vue        |  10 +-
 server/internal/db/api/dashbord.go            |   7 +-
 server/internal/db/api/db.go                  |   8 +-
 server/internal/db/api/db_instance.go         |  41 +-
 server/internal/db/api/form/db.go             |  17 +-
 server/internal/db/api/form/instance.go       |  12 +-
 server/internal/db/api/vo/instance.go         |   1 +
 server/internal/db/application/db.go          |  68 ++--
 .../internal/db/application/db_data_sync.go   |   2 +-
 server/internal/db/application/db_instance.go | 106 +++++-
 server/internal/db/application/db_sql_exec.go |   2 +-
 server/internal/db/application/db_transfer.go |   2 +-
 server/internal/db/dbm/dbi/conn.go            |  25 +-
 server/internal/db/domain/entity/query.go     |  10 +-
 .../db/infrastructure/persistence/instance.go |   3 +-
 server/internal/db/router/instance.go         |   2 +-
 server/internal/machine/api/dashbord.go       |  14 +-
 server/internal/machine/api/form/form.go      |   4 +-
 server/internal/machine/api/machine.go        |  18 +-
 .../internal/machine/application/machine.go   |  83 +++--
 server/internal/mongo/api/form/mongo.go       |   4 +-
 server/internal/mongo/api/mongo.go            |   2 +-
 server/internal/mongo/application/mongo.go    |  30 +-
 server/internal/redis/api/form/redis.go       |   2 +-
 server/internal/redis/api/redis.go            |   7 +-
 server/internal/redis/application/redis.go    |  37 +-
 server/internal/tag/api/form/tag.go           |   9 +
 server/internal/tag/api/tag_tree.go           |  19 +-
 server/internal/tag/api/vo/tag_tree.go        |  42 +--
 .../tag/application/resouce_auth_cert.go      |  84 ++---
 server/internal/tag/application/tag_tree.go   | 350 ++++++++++--------
 server/internal/tag/domain/entity/query.go    |   1 -
 .../tag/domain/entity/resource_auth_cert.go   |  10 -
 server/internal/tag/domain/entity/tag_tree.go |  88 ++++-
 .../infrastructure/persistence/tag_tree.go    |   6 +-
 server/pkg/config/app.go                      |   2 +-
 server/resources/script/sql/v1.8/v1.8.1.sql   | 145 ++++++++
 68 files changed, 1421 insertions(+), 809 deletions(-)
 create mode 100644 mayfly_go_web/src/views/ops/db/InstanceDbConf.vue
 create mode 100644 server/internal/tag/api/form/tag.go
 create mode 100644 server/resources/script/sql/v1.8/v1.8.1.sql

diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index 3c7e538a..a44deb51 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -34,7 +34,7 @@
     "sql-formatter": "^15.0.2",
     "trzsz": "^1.1.5",
     "uuid": "^9.0.1",
-    "vue": "^3.4.21",
+    "vue": "^3.4.23",
     "vue-router": "^4.3.0",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.8.0",
@@ -57,7 +57,7 @@
     "prettier": "^3.2.5",
     "sass": "^1.69.0",
     "typescript": "^5.3.2",
-    "vite": "^5.2.8",
+    "vite": "^5.2.9",
     "vue-eslint-parser": "^9.4.2"
   },
   "browserslist": [
diff --git a/mayfly_go_web/src/common/commonEnum.ts b/mayfly_go_web/src/common/commonEnum.ts
index d450a529..ed948ed6 100644
--- a/mayfly_go_web/src/common/commonEnum.ts
+++ b/mayfly_go_web/src/common/commonEnum.ts
@@ -1,14 +1,24 @@
 import EnumValue from './Enum';
 
+// 资源类型
+export const ResourceTypeEnum = {
+    Machine: EnumValue.of(1, '机器').setExtra({ icon: 'Monitor', iconColor: 'var(--el-color-primary)' }).tagTypeSuccess(),
+    Db: EnumValue.of(2, '数据库实例').setExtra({ icon: 'Coin', iconColor: 'var(--el-color-warning)' }).tagTypeWarning(),
+    Redis: EnumValue.of(3, 'redis').setExtra({ icon: 'iconfont icon-redis', iconColor: 'var(--el-color-danger)' }).tagTypeInfo(),
+    Mongo: EnumValue.of(4, 'mongo').setExtra({ icon: 'iconfont icon-mongo', iconColor: 'var(--el-color-success)' }).tagTypeDanger(),
+};
+
 // 标签关联的资源类型
 export const TagResourceTypeEnum = {
     AuthCert: EnumValue.of(-2, '公共凭证').setExtra({ icon: 'Ticket' }),
     Tag: EnumValue.of(-1, '标签').setExtra({ icon: 'CollectionTag' }),
 
-    Machine: EnumValue.of(1, '机器').setExtra({ icon: 'Monitor' }).tagTypeSuccess(),
-    Db: EnumValue.of(2, '数据库').setExtra({ icon: 'Coin' }).tagTypeWarning(),
-    Redis: EnumValue.of(3, 'redis').setExtra({ icon: 'iconfont icon-redis' }).tagTypeInfo(),
-    Mongo: EnumValue.of(4, 'mongo').setExtra({ icon: 'iconfont icon-mongo' }).tagTypeDanger(),
+    Machine: ResourceTypeEnum.Machine,
+    Db: ResourceTypeEnum.Db,
+    Redis: ResourceTypeEnum.Redis,
+    Mongo: ResourceTypeEnum.Mongo,
 
-    MachineAuthCert: EnumValue.of(11, '机器-授权凭证').setExtra({ icon: 'Ticket' }),
+    MachineAuthCert: EnumValue.of(11, '机器-授权凭证').setExtra({ icon: 'Ticket', iconColor: 'var(--el-color-success)' }),
+    DbAuthCert: EnumValue.of(21, '数据库-授权凭证').setExtra({ icon: 'Ticket', iconColor: 'var(--el-color-success)' }),
+    DbName: EnumValue.of(22, '数据库').setExtra({ icon: 'Coin' }),
 };
diff --git a/mayfly_go_web/src/common/config.ts b/mayfly_go_web/src/common/config.ts
index 21ff8131..312e90e1 100644
--- a/mayfly_go_web/src/common/config.ts
+++ b/mayfly_go_web/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.8.0',
+    version: 'v1.8.1',
 };
 
 export default config;
diff --git a/mayfly_go_web/src/common/pattern.ts b/mayfly_go_web/src/common/pattern.ts
index 274a7763..4b394792 100644
--- a/mayfly_go_web/src/common/pattern.ts
+++ b/mayfly_go_web/src/common/pattern.ts
@@ -1,9 +1,9 @@
 export const AccountUsernamePattern = {
     pattern: /^[a-zA-Z0-9_]{5,20}$/g,
-    message: '只允许输入5-20位大小写字母、数字、下划线',
+    message: '只允许输入5-20位大小写字母、数字、_-.:',
 };
 
 export const ResourceCodePattern = {
-    pattern: /^[a-zA-Z0-9_.:]{1,32}$/g,
-    message: '只允许输入1-32位大小写字母、数字、_.:',
+    pattern: /^[a-zA-Z0-9_\-.:]{1,32}$/g,
+    message: '只允许输入1-32位大小写字母、数字、_-.:',
 };
diff --git a/mayfly_go_web/src/hooks/usePageTable.ts b/mayfly_go_web/src/hooks/usePageTable.ts
index 5ed5083d..beba5b20 100644
--- a/mayfly_go_web/src/hooks/usePageTable.ts
+++ b/mayfly_go_web/src/hooks/usePageTable.ts
@@ -44,6 +44,7 @@ export const usePageTable = (
             }
 
             let res = await api.request(sp);
+            res.list = res.list || [];
             dataCallBack && (res = await dataCallBack(res));
 
             if (pageable) {
diff --git a/mayfly_go_web/src/router/dynamicRouter.ts b/mayfly_go_web/src/router/dynamicRouter.ts
index 3cd43a38..441f6d7b 100644
--- a/mayfly_go_web/src/router/dynamicRouter.ts
+++ b/mayfly_go_web/src/router/dynamicRouter.ts
@@ -159,6 +159,6 @@ export function dynamicImport(dynamicViewsModules: Record<string, Function>, com
         return null;
     }
 
-    console.error(`未匹配到[${component}]组件名对应的组件文件`);
+    console.warn(`未匹配到[${component}]组件名对应的组件文件`);
     return null;
 }
diff --git a/mayfly_go_web/src/views/ops/component/ResourceAuthCert.vue b/mayfly_go_web/src/views/ops/component/ResourceAuthCert.vue
index 58e7eb56..88f13d79 100644
--- a/mayfly_go_web/src/views/ops/component/ResourceAuthCert.vue
+++ b/mayfly_go_web/src/views/ops/component/ResourceAuthCert.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="props.authCerts">
-        <el-select default-first-option value-key="name" style="width: 100%" v-model="selectAuthCert" size="small">
+        <el-select value-key="name" v-model="selectAuthCert" size="small">
             <el-option v-for="item in props.authCerts" :key="item.name" :label="item.username" :value="item">
                 {{ item.username }}
                 <el-divider direction="vertical" border-style="dashed" />
diff --git a/mayfly_go_web/src/views/ops/component/ResourceAuthCertEdit.vue b/mayfly_go_web/src/views/ops/component/ResourceAuthCertEdit.vue
index 1bb3cbbf..de8c2502 100644
--- a/mayfly_go_web/src/views/ops/component/ResourceAuthCertEdit.vue
+++ b/mayfly_go_web/src/views/ops/component/ResourceAuthCertEdit.vue
@@ -112,7 +112,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, toRefs, onMounted, watch, computed } from 'vue';
+import { reactive, ref, toRefs, computed, watch } from 'vue';
 import { AuthCertTypeEnum, AuthCertCiphertextTypeEnum } from '../tag/enums';
 import EnumTag from '@/components/enumtag/EnumTag.vue';
 import { resourceAuthCertApi } from '../tag/api';
@@ -166,6 +166,13 @@ const rules = {
             trigger: ['blur'],
         },
     ],
+    resourceCode: [
+        {
+            required: true,
+            message: '请输入资源编号',
+            trigger: ['change', 'blur'],
+        },
+    ],
 };
 
 const emit = defineEmits(['confirm', 'cancel']);
@@ -184,10 +191,6 @@ const showResourceEdit = computed(() => {
     return state.form.type != AuthCertTypeEnum.Public.value && !props.resourceEdit;
 });
 
-onMounted(() => {
-    setForm(props.authCert);
-});
-
 watch(
     () => props.authCert,
     (val: any) => {
@@ -217,7 +220,6 @@ const changeType = (val: any) => {
 
 const changeCiphertextType = (val: any) => {
     if (val == AuthCertCiphertextTypeEnum.Public.value) {
-        state.form.type = AuthCertTypeEnum.Private.value;
         getPublicAuthCerts();
     }
 };
diff --git a/mayfly_go_web/src/views/ops/component/ResourceTags.vue b/mayfly_go_web/src/views/ops/component/ResourceTags.vue
index 68ff5dc8..d774d03f 100644
--- a/mayfly_go_web/src/views/ops/component/ResourceTags.vue
+++ b/mayfly_go_web/src/views/ops/component/ResourceTags.vue
@@ -1,18 +1,18 @@
 <template>
     <div v-if="props.tags">
-        <el-row v-for="(tag, idx) in props.tags?.slice(0, 1)" :key="idx">
-            <TagInfo :tag-path="tag.tagPath" />
-            <span class="ml3">{{ tag.tagPath }}</span>
+        <el-row v-for="(tagPath, idx) in tagPaths?.slice(0, 1)" :key="idx">
+            <TagInfo :tag-path="tagPath" />
+            <span class="ml3">{{ tagPath }}</span>
 
             <!-- 展示剩余的标签信息 -->
-            <el-popover :show-after="300" v-if="props.tags.length > 1 && idx == 0" placement="top-start" width="230" trigger="hover">
+            <el-popover :show-after="300" v-if="tagPaths?.length > 1 && idx == 0" placement="top-start" width="230" trigger="hover">
                 <template #reference>
                     <SvgIcon class="mt5 ml5" color="var(--el-color-primary)" name="MoreFilled" />
                 </template>
 
-                <el-row v-for="i in props.tags.slice(1)" :key="i">
-                    <TagInfo :tag-path="i.tagPath" />
-                    <span class="ml3">{{ i.tagPath }}</span>
+                <el-row v-for="i in tagPaths.slice(1)" :key="i">
+                    <TagInfo :tag-path="i" />
+                    <span class="ml3">{{ i }}</span>
                 </el-row>
             </el-popover>
         </el-row>
@@ -22,12 +22,18 @@
 <script lang="ts" setup>
 import SvgIcon from '@/components/svgIcon/index.vue';
 import TagInfo from './TagInfo.vue';
+import { computed } from 'vue';
+import { getTagPath } from './tag';
 const props = defineProps({
     tags: {
         type: [Array<any>],
         required: true,
     },
 });
+
+const tagPaths = computed(() => {
+    return props.tags?.map((item) => getTagPath(item.codePath)) as any;
+});
 </script>
 
 <style lang="scss"></style>
diff --git a/mayfly_go_web/src/views/ops/component/TagTreeSelect.vue b/mayfly_go_web/src/views/ops/component/TagTreeSelect.vue
index 846d1f56..10707707 100644
--- a/mayfly_go_web/src/views/ops/component/TagTreeSelect.vue
+++ b/mayfly_go_web/src/views/ops/component/TagTreeSelect.vue
@@ -4,15 +4,14 @@
             v-bind="$attrs"
             v-model="state.selectTags"
             @change="changeTag"
-            style="width: 100%"
             :data="tags"
             placeholder="请选择关联标签"
             :render-after-expand="true"
             :default-expanded-keys="[state.selectTags]"
             show-checkbox
-            node-key="id"
+            node-key="codePath"
             :props="{
-                value: 'id',
+                value: 'codePath',
                 label: 'codePath',
                 children: 'children',
             }"
@@ -35,6 +34,7 @@
 <script lang="ts" setup>
 import { toRefs, reactive, onMounted } from 'vue';
 import { tagApi } from '../tag/api';
+import { getTagPath } from './tag';
 
 //定义事件
 const emit = defineEmits(['update:modelValue', 'changeTag', 'input']);
@@ -47,7 +47,7 @@ const props = defineProps({
 
 const state = reactive({
     tags: [],
-    // 单选则为id，多选为id数组
+    // 单选则为codePath，多选为codePath数组
     selectTags: [] as any,
 });
 
@@ -55,7 +55,7 @@ const { tags } = toRefs(state);
 
 onMounted(async () => {
     if (props.selectTags) {
-        state.selectTags = props.selectTags;
+        state.selectTags = props.selectTags.map((item: any) => getTagPath(item));
     }
 
     state.tags = await tagApi.getTagTrees.request({ type: -1 });
diff --git a/mayfly_go_web/src/views/ops/component/tag.ts b/mayfly_go_web/src/views/ops/component/tag.ts
index d9a74460..a5bc2072 100644
--- a/mayfly_go_web/src/views/ops/component/tag.ts
+++ b/mayfly_go_web/src/views/ops/component/tag.ts
@@ -171,3 +171,29 @@ export function getTagPathSearchItem(resourceType: number) {
         })
     );
 }
+
+/**
+ * 根据codepath获取对应的tagPath
+ * @param codePath codePath tag1/tag2/1|testmachien1/
+ * @returns tagPath tag1/tag2/
+ */
+export function getTagPath(codePath: string) {
+    // 以资源分隔符 "|" 对字符串进行分割
+    let parts = codePath.split('|');
+    if (parts.length < 2) {
+        return codePath;
+    }
+
+    // 从分割后的第一个子串中提取所需部分
+    let substringBeforeNumber = parts[0];
+
+    // 找到最后一个 "/" 的位置
+    let lastSlashIndex = substringBeforeNumber.lastIndexOf('/');
+
+    // 如果找到最后一个 "/" 符号，则截取子串
+    if (lastSlashIndex !== -1) {
+        return substringBeforeNumber.slice(0, lastSlashIndex + 1);
+    }
+
+    return codePath;
+}
diff --git a/mayfly_go_web/src/views/ops/db/DbEdit.vue b/mayfly_go_web/src/views/ops/db/DbEdit.vue
index d4a2ac8f..e8b616d8 100644
--- a/mayfly_go_web/src/views/ops/db/DbEdit.vue
+++ b/mayfly_go_web/src/views/ops/db/DbEdit.vue
@@ -10,46 +10,20 @@
             width="38%"
         >
             <el-form :model="form" ref="dbForm" :rules="rules" label-width="auto">
-                <el-form-item ref="tagSelectRef" prop="tagId" label="标签" required>
-                    <tag-tree-select
-                        @change-tag="
-                            (tagIds) => {
-                                form.tagId = tagIds;
-                                tagSelectRef.validate();
-                            }
-                        "
-                        multiple
-                        :select-tags="form.tagId"
-                        style="width: 100%"
-                    />
+                <el-form-item prop="code" label="编号" required>
+                    <el-input
+                        :disabled="form.id"
+                        v-model.trim="form.code"
+                        placeholder="请输入编号 (大小写字母、数字、_-.:), 不可修改"
+                        auto-complete="off"
+                    ></el-input>
                 </el-form-item>
-
-                <el-form-item prop="instanceId" label="数据库实例" required>
-                    <el-select
-                        :disabled="form.id !== undefined"
-                        remote
-                        :remote-method="getInstances"
-                        @change="changeInstance"
-                        v-model="state.selectInstalce"
-                        value-key="id"
-                        placeholder="请输入实例名称搜索并选择实例"
-                        filterable
-                        clearable
-                        class="w100"
-                    >
-                        <el-option v-for="item in state.instances" :key="item.id" :label="`${item.name}`" :value="item">
-                            {{ item.name }}
-                            <el-divider direction="vertical" border-style="dashed" />
-
-                            {{ item.type }} / {{ item.host }}:{{ item.port }}
-                            <el-divider direction="vertical" border-style="dashed" />
-                            {{ item.username }}
-                        </el-option>
-                    </el-select>
+                <el-form-item prop="name" label="名称" required>
+                    <el-input v-model.trim="form.name" placeholder="请输入数据库别名" auto-complete="off"></el-input>
                 </el-form-item>
 
                 <el-form-item prop="authCertName" label="授权凭证" required>
-                    <el-select @focus="getAuthCerts" @change="changeAuthCert" v-model="form.authCertName" placeholder="请选择授权凭证" filterable>
+                    <el-select @change="changeAuthCert" v-model="form.authCertName" placeholder="请选择授权凭证" filterable>
                         <el-option v-for="item in state.authCerts" :key="item.id" :label="`${item.name}`" :value="item.name">
                             {{ item.name }}
 
@@ -65,13 +39,6 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item prop="code" label="编号" required>
-                    <el-input :disabled="form.id" v-model.trim="form.code" placeholder="请输入编号 (数字字母下划线), 不可修改" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="name" label="别名" required>
-                    <el-input v-model.trim="form.name" placeholder="请输入数据库别名" auto-complete="off"></el-input>
-                </el-form-item>
-
                 <el-form-item prop="database" label="数据库名">
                     <el-select
                         v-model="dbNamesSelected"
@@ -102,7 +69,7 @@
             <template #footer>
                 <div class="dialog-footer">
                     <el-button @click="cancel()">取 消</el-button>
-                    <el-button type="primary" :loading="saveBtnLoading" @click="btnOk">确 定</el-button>
+                    <el-button type="primary" @click="btnOk">确 定</el-button>
                 </div>
             </template>
         </el-dialog>
@@ -110,23 +77,27 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, watch, ref } from 'vue';
+import { toRefs, reactive, watch, ref, watchEffect } from 'vue';
 import { dbApi } from './api';
 import { ElMessage } from 'element-plus';
-import TagTreeSelect from '../component/TagTreeSelect.vue';
+// import TagTreeSelect from '../component/TagTreeSelect.vue';
 import type { CheckboxValueType } from 'element-plus';
 import ProcdefSelectFormItem from '@/views/flow/components/ProcdefSelectFormItem.vue';
 import { DbType } from '@/views/ops/db/dialect';
 import { ResourceCodePattern } from '@/common/pattern';
-import { resourceAuthCertApi } from '../tag/api';
-import { TagResourceTypeEnum } from '@/common/commonEnum';
+
 import EnumTag from '@/components/enumtag/EnumTag.vue';
 import { AuthCertCiphertextTypeEnum } from '../tag/enums';
+import { resourceAuthCertApi } from '../tag/api';
+import { TagResourceTypeEnum } from '@/common/commonEnum';
 
 const props = defineProps({
     visible: {
         type: Boolean,
     },
+    instance: {
+        type: [Boolean, Object],
+    },
     db: {
         type: [Boolean, Object],
     },
@@ -136,7 +107,7 @@ const props = defineProps({
 });
 
 //定义事件
-const emit = defineEmits(['update:visible', 'cancel', 'val-change']);
+const emit = defineEmits(['update:visible', 'cancel', 'val-change', 'confirm']);
 
 const rules = {
     tagId: [
@@ -186,7 +157,7 @@ const checkAllDbNames = ref(false);
 const indeterminateDbNames = ref(false);
 
 const dbForm: any = ref(null);
-const tagSelectRef: any = ref(null);
+// const tagSelectRef: any = ref(null);
 
 const state = reactive({
     dialogVisible: false,
@@ -198,7 +169,7 @@ const state = reactive({
     authCerts: [] as any,
     form: {
         id: null,
-        tagId: [],
+        // tagId: [],
         name: null,
         code: '',
         database: '',
@@ -212,71 +183,53 @@ const state = reactive({
 
 const { dialogVisible, allDatabases, form, dbNamesSelected } = toRefs(state);
 
-const { isFetching: saveBtnLoading, execute: saveDbExec } = dbApi.saveDb.useApi(form);
-
-watch(props, async (newValue: any) => {
-    state.dialogVisible = newValue.visible;
+watchEffect(() => {
+    state.dialogVisible = props.visible;
     if (!state.dialogVisible) {
         return;
     }
-    if (newValue.db) {
-        state.form = { ...newValue.db };
-        state.form.tagId = newValue.db.tags.map((t: any) => t.tagId);
+    const db: any = props.db;
+    if (db.code) {
+        state.form = { ...db };
+        // state.form.tagId = newValue.db.tags.map((t: any) => t.tagId);
         // 将数据库名使用空格切割，获取所有数据库列表
-        state.dbNamesSelected = newValue.db.database.split(' ');
+        state.dbNamesSelected = db.database.split(' ');
     } else {
         state.form = {} as any;
         state.dbNamesSelected = [];
     }
 });
 
-const changeInstance = async () => {
-    state.dbNamesSelected = [];
-    state.form.instanceId = state.selectInstalce.id;
+const changeAuthCert = (val: string) => {
+    getAllDatabase(val);
 };
 
 const getAuthCerts = async () => {
+    const inst: any = props.instance;
     const res = await resourceAuthCertApi.listByQuery.request({
-        resourceCode: state.selectInstalce.code,
+        resourceCode: inst.code,
         resourceType: TagResourceTypeEnum.Db.value,
         pageSize: 100,
     });
     state.authCerts = res.list || [];
 };
 
-const changeAuthCert = (val: string) => {
-    getAllDatabase(val);
-};
-
 const getAllDatabase = async (authCertName: string) => {
-    if (state.form.instanceId > 0) {
-        let dbs = await dbApi.getAllDatabase.request({ instanceId: state.form.instanceId, authCertName });
-        state.allDatabases = dbs;
+    const req = { ...(props.instance as any) };
+    req.authCert = state.authCerts?.find((x: any) => x.name == authCertName);
+    let dbs = await dbApi.getAllDatabase.request(req);
+    state.allDatabases = dbs;
 
-        // 如果是oracle，且没查出数据库列表，则取实例sid
-        let instance = state.instances.find((item: any) => item.id === state.form.instanceId);
-        if (instance && instance.type === DbType.oracle && dbs.length === 0) {
-            state.allDatabases = [instance.sid];
-        }
-    }
-};
-
-const getInstances = async (instanceName: string = '', id = 0) => {
-    if (!id && !instanceName) {
-        state.instances = [];
-        return;
-    }
-    const data = await dbApi.instances.request({ id, name: instanceName });
-    if (data) {
-        state.instances = data.list;
+    // 如果是oracle，且没查出数据库列表，则取实例sid
+    let instance = state.instances.find((item: any) => item.id === state.form.instanceId);
+    if (instance && instance.type === DbType.oracle && dbs.length === 0) {
+        state.allDatabases = [instance.sid];
     }
 };
 
 const open = async () => {
-    if (state.form.instanceId) {
-        // 根据id获取，因为需要回显实例名称
-        await getInstances('', state.form.instanceId);
-        state.selectInstalce = state.instances[0];
+    await getAuthCerts();
+    if (state.form.authCertName) {
         await getAllDatabase(state.form.authCertName);
     }
 };
@@ -288,10 +241,11 @@ const btnOk = async () => {
             return false;
         }
 
-        await saveDbExec();
-        ElMessage.success('保存成功');
-        emit('val-change', state.form);
-        cancel();
+        emit('confirm', state.form);
+        // await saveDbExec();
+        // ElMessage.success('保存成功');
+        // emit('val-change', state.form);
+        // cancel();
     });
 };
 
diff --git a/mayfly_go_web/src/views/ops/db/DbList.vue b/mayfly_go_web/src/views/ops/db/DbList.vue
index 88ecbbee..faebf97b 100644
--- a/mayfly_go_web/src/views/ops/db/DbList.vue
+++ b/mayfly_go_web/src/views/ops/db/DbList.vue
@@ -6,8 +6,6 @@
             :before-query-fn="checkRouteTagPath"
             :search-items="searchItems"
             v-model:query-form="query"
-            :show-selection="true"
-            v-model:selection-data="state.selectionData"
             :columns="columns"
             lazy
         >
@@ -24,11 +22,6 @@
                 </el-select>
             </template>
 
-            <template #tableHeader>
-                <el-button v-auth="perms.saveDb" type="primary" icon="plus" @click="editDb(false)">添加</el-button>
-                <el-button v-auth="perms.delDb" :disabled="selectionData.length < 1" @click="deleteDb()" type="danger" icon="delete">删除</el-button>
-            </template>
-
             <template #type="{ data }">
                 <el-tooltip :content="data.type" placement="top">
                     <SvgIcon :name="getDbDialect(data.type).getInfo().icon" :size="20" />
@@ -39,16 +32,26 @@
                 {{ `${data.host}:${data.port}` }}
             </template>
 
+            <template #database="{ data }">
+                <el-popover placement="bottom" :width="200" trigger="click">
+                    <template #reference>
+                        <el-button @click="state.currentDbs = data.database" type="primary" link>查看库</el-button>
+                    </template>
+                    <el-table :data="filterDbs" size="small">
+                        <el-table-column prop="dbName" label="数据库">
+                            <template #header>
+                                <el-input v-model="state.dbNameSearch" size="small" placeholder="库名: 输入可过滤" clearable />
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-popover>
+            </template>
+
             <template #tagPath="{ data }">
                 <ResourceTags :tags="data.tags" />
             </template>
 
             <template #action="{ data }">
-                <span v-if="actionBtns[perms.saveDb]">
-                    <el-button type="primary" @click="editDb(data)" link>编辑</el-button>
-                    <el-divider direction="vertical" border-style="dashed" />
-                </span>
-
                 <el-button type="primary" @click="onShowSqlExec(data)" link>SQL记录</el-button>
                 <el-divider direction="vertical" border-style="dashed" />
 
@@ -176,7 +179,7 @@
                 <el-descriptions-item :span="2" label="主机">{{ infoDialog.instance?.host }}</el-descriptions-item>
                 <el-descriptions-item :span="1" label="端口">{{ infoDialog.instance?.port }}</el-descriptions-item>
 
-                <el-descriptions-item :span="2" label="用户名">{{ infoDialog.instance?.username }}</el-descriptions-item>
+                <el-descriptions-item :span="2" label="授权凭证">{{ infoDialog.instance.authCertName }}</el-descriptions-item>
                 <el-descriptions-item :span="1" label="类型">
                     <SvgIcon :name="getDbDialect(infoDialog.instance?.type).getInfo().icon" :size="20" />{{ infoDialog.instance?.type }}
                 </el-descriptions-item>
@@ -199,8 +202,7 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, onMounted, reactive, ref, Ref, toRefs } from 'vue';
-import { ElMessage, ElMessageBox } from 'element-plus';
+import { computed, defineAsyncComponent, onMounted, reactive, ref, Ref, toRefs } from 'vue';
 import { dbApi } from './api';
 import config from '@/common/config';
 import { joinClientParams } from '@/common/request';
@@ -224,23 +226,8 @@ import { sleep } from '@/common/utils/loading';
 
 const DbEdit = defineAsyncComponent(() => import('./DbEdit.vue'));
 
-const props = defineProps({
-    lazy: {
-        type: [Boolean],
-        default: false,
-    },
-});
-
-const perms = {
-    base: 'db',
-    saveDb: 'db:save',
-    delDb: 'db:del',
-    backupDb: 'db:backup',
-    restoreDb: 'db:restore',
-};
-
 const searchItems = [
-    getTagPathSearchItem(TagResourceTypeEnum.Db.value),
+    getTagPathSearchItem(TagResourceTypeEnum.DbName.value),
     SearchItem.slot('instanceId', '实例', 'instanceSelect'),
     SearchItem.input('code', '编号'),
 ];
@@ -252,15 +239,21 @@ const columns = ref([
     TableColumn.new('instanceName', '实例名'),
     TableColumn.new('host', 'ip:port').isSlot().setAddWidth(40),
     TableColumn.new('authCertName', '授权凭证'),
+    TableColumn.new('database', '库').isSlot().setMinWidth(80),
     TableColumn.new('flowProcdefKey', '关联流程'),
     TableColumn.new('remark', '备注'),
     TableColumn.new('code', '编号'),
 ]);
 
+const perms = {
+    backupDb: 'db:backup',
+    restoreDb: 'db:restore',
+};
+
 // 该用户拥有的的操作列按钮权限
 // const actionBtns = hasPerms([perms.base, perms.saveDb]);
 const actionBtns = hasPerms(Object.values(perms));
-const actionColumn = TableColumn.new('action', '操作').isSlot().setMinWidth(220).fixedRight().alignCenter();
+const actionColumn = TableColumn.new('action', '操作').isSlot().setMinWidth(180).fixedRight().alignCenter();
 
 const route = useRoute();
 const pageTableRef: Ref<any> = ref(null);
@@ -268,6 +261,8 @@ const state = reactive({
     row: {} as any,
     dbId: 0,
     db: '',
+    currentDbs: '',
+    dbNameSearch: '',
     instances: [] as any,
     /**
      * 选中的数据
@@ -343,16 +338,26 @@ const state = reactive({
     },
 });
 
-const { db, selectionData, query, infoDialog, sqlExecLogDialog, exportDialog, dbEditDialog, dbBackupDialog, dbBackupHistoryDialog, dbRestoreDialog } =
-    toRefs(state);
+const { db, query, infoDialog, sqlExecLogDialog, exportDialog, dbEditDialog, dbBackupDialog, dbBackupHistoryDialog, dbRestoreDialog } = toRefs(state);
 
 onMounted(async () => {
     if (Object.keys(actionBtns).length > 0) {
         columns.value.push(actionColumn);
     }
-    if (!props.lazy) {
-        search();
+    search();
+});
+
+const filterDbs = computed(() => {
+    const dbsStr = state.currentDbs;
+    if (!dbsStr) {
+        return [];
     }
+    const dbs = dbsStr.split(' ').map((db: any) => {
+        return { dbName: db };
+    });
+    return dbs.filter((db: any) => {
+        return db.dbName.includes(state.dbNameSearch);
+    });
 });
 
 const checkRouteTagPath = (query: any) => {
@@ -402,10 +407,6 @@ const handleMoreActionCommand = (commond: any) => {
             showInfo(data);
             return;
         }
-        case 'edit': {
-            editDb(data);
-            return;
-        }
         case 'dumpDb': {
             onDumpDbs(data);
             return;
@@ -425,32 +426,6 @@ const handleMoreActionCommand = (commond: any) => {
     }
 };
 
-const editDb = async (data: any) => {
-    if (!data) {
-        state.dbEditDialog.data = null;
-        state.dbEditDialog.title = '新增数据库资源';
-    } else {
-        state.dbEditDialog.data = data;
-        state.dbEditDialog.title = '修改数据库资源';
-    }
-    state.dbEditDialog.visible = true;
-};
-
-const deleteDb = async () => {
-    try {
-        await ElMessageBox.confirm(`确定删除【${state.selectionData.map((x: any) => x.name).join(', ')}】库?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-        });
-        await dbApi.deleteDb.request({ id: state.selectionData.map((x: any) => x.id).join(',') });
-        ElMessage.success('删除成功');
-        search();
-    } catch (err) {
-        //
-    }
-};
-
 const onShowSqlExec = async (row: any) => {
     state.sqlExecLogDialog.title = `${row.name}`;
     state.sqlExecLogDialog.dbId = row.id;
diff --git a/mayfly_go_web/src/views/ops/db/InstanceDbConf.vue b/mayfly_go_web/src/views/ops/db/InstanceDbConf.vue
new file mode 100644
index 00000000..107af6c4
--- /dev/null
+++ b/mayfly_go_web/src/views/ops/db/InstanceDbConf.vue
@@ -0,0 +1,171 @@
+<template>
+    <div>
+        <el-drawer :title="title" v-model="dialogVisible" :before-close="cancel" :destroy-on-close="true" :close-on-click-modal="false" size="50%">
+            <template #header>
+                <DrawerHeader :header="title" :back="cancel" />
+            </template>
+
+            <el-table :data="state.dbs" stripe>
+                <el-table-column prop="name" label="名称" show-overflow-tooltip min-width="100"> </el-table-column>
+                <el-table-column prop="authCertName" label="授权凭证" min-width="120" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="database" label="库" min-width="80">
+                    <template #default="scope">
+                        <el-popover placement="bottom" :width="200" trigger="click">
+                            <template #reference>
+                                <el-button @click="state.currentDbs = scope.row.database" type="primary" link>查看库</el-button>
+                            </template>
+                            <el-table :data="filterDbs" size="small">
+                                <el-table-column prop="dbName" label="数据库">
+                                    <template #header>
+                                        <el-input v-model="state.dbNameSearch" size="small" placeholder="库名: 输入可过滤" clearable />
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </el-popover>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="120"> </el-table-column>
+                <el-table-column prop="flowProcdefKey" label="关联流程" min-width="120" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="code" label="编号" show-overflow-tooltip min-width="120"> </el-table-column>
+                <el-table-column min-wdith="120px">
+                    <template #header>
+                        操作
+                        <el-button v-auth="perms.saveDb" type="primary" circle size="small" icon="Plus" @click="editDb(null)"> </el-button>
+                    </template>
+                    <template #default="scope">
+                        <el-button v-auth="perms.saveDb" @click="editDb(scope.row)" type="primary" icon="edit" link></el-button>
+                        <el-button class="ml1" v-auth="perms.delDb" type="danger" @click="deleteDb(scope.row)" icon="delete" link></el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <db-edit
+                @confirm="confirmEditDb"
+                @cancel="cancelEditDb"
+                :title="dbEditDialog.title"
+                v-model:visible="dbEditDialog.visible"
+                :instance="props.instance"
+                v-model:db="dbEditDialog.data"
+            ></db-edit>
+        </el-drawer>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, reactive, toRefs, watchEffect } from 'vue';
+import { dbApi } from './api';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
+import DbEdit from './DbEdit.vue';
+
+const props = defineProps({
+    visible: {
+        type: Boolean,
+    },
+    instance: {
+        type: [Object],
+        required: true,
+    },
+    title: {
+        type: String,
+    },
+});
+
+const perms = {
+    base: 'db',
+    saveDb: 'db:save',
+    delDb: 'db:del',
+};
+
+//定义事件
+const emit = defineEmits(['update:visible', 'cancel', 'val-change']);
+
+const state = reactive({
+    dialogVisible: false,
+    dbs: [] as any,
+    currentDbs: '', // 当前数据库名，空格分割库名
+    dbNameSearch: '',
+    dbEditDialog: {
+        visible: false,
+        data: null as any,
+        title: '新增数据库',
+    },
+});
+
+const { dialogVisible, dbEditDialog } = toRefs(state);
+
+watchEffect(() => {
+    state.dialogVisible = props.visible;
+    if (!state.dialogVisible) {
+        return;
+    }
+
+    getDbs();
+});
+
+const filterDbs = computed(() => {
+    const dbsStr = state.currentDbs;
+    if (!dbsStr) {
+        return [];
+    }
+    const dbs = dbsStr.split(' ').map((db: any) => {
+        return { dbName: db };
+    });
+    return dbs.filter((db: any) => {
+        return db.dbName.includes(state.dbNameSearch);
+    });
+});
+
+const cancel = () => {
+    emit('update:visible', false);
+    emit('cancel');
+};
+
+const getDbs = () => {
+    dbApi.dbs.request({ pageSize: 200, instanceId: props.instance.id }).then((res: any) => {
+        state.dbs = res.list || [];
+    });
+};
+
+const editDb = (data: any) => {
+    if (data) {
+        state.dbEditDialog.data = { ...data };
+    } else {
+        state.dbEditDialog.data = {
+            instanceId: props.instance.id,
+        };
+    }
+    state.dbEditDialog.title = data ? '编辑数据库' : '新增数据库';
+    state.dbEditDialog.visible = true;
+};
+
+const deleteDb = async (db: any) => {
+    try {
+        await ElMessageBox.confirm(`确定删除【${db.name}】库?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+        });
+        await dbApi.deleteDb.request({ id: db.id });
+        ElMessage.success('删除成功');
+        getDbs();
+    } catch (err) {
+        //
+    }
+};
+
+const confirmEditDb = async (db: any) => {
+    db.instanceId = props.instance.id;
+    await dbApi.saveDb.request(db);
+    ElMessage.success('保存成功');
+    getDbs();
+    cancelEditDb();
+};
+
+const cancelEditDb = () => {
+    state.dbEditDialog.visible = false;
+    state.dbEditDialog.data = {};
+};
+</script>
+<style lang="scss"></style>
diff --git a/mayfly_go_web/src/views/ops/db/InstanceEdit.vue b/mayfly_go_web/src/views/ops/db/InstanceEdit.vue
index fd2c62b5..b0f293bb 100644
--- a/mayfly_go_web/src/views/ops/db/InstanceEdit.vue
+++ b/mayfly_go_web/src/views/ops/db/InstanceEdit.vue
@@ -7,9 +7,30 @@
 
             <el-form :model="form" ref="dbForm" :rules="rules" label-width="auto">
                 <el-divider content-position="left">基本</el-divider>
-                <el-form-item prop="code" label="编号" required>
-                    <el-input :disabled="form.id" v-model.trim="form.code" placeholder="请输入编号 (数字字母下划线), 不可修改" auto-complete="off"></el-input>
+
+                <el-form-item ref="tagSelectRef" prop="tagCodePaths" label="标签">
+                    <tag-tree-select
+                        multiple
+                        @change-tag="
+                            (paths: any) => {
+                                form.tagCodePaths = paths;
+                                tagSelectRef.validate();
+                            }
+                        "
+                        :select-tags="form.tagCodePaths"
+                        style="width: 100%"
+                    />
                 </el-form-item>
+
+                <el-form-item prop="code" label="编号" required>
+                    <el-input
+                        :disabled="form.id"
+                        v-model.trim="form.code"
+                        placeholder="请输入编号 (大小写字母、数字、_-.:), 不可修改"
+                        auto-complete="off"
+                    ></el-input>
+                </el-form-item>
+
                 <el-form-item prop="name" label="名称" required>
                     <el-input v-model.trim="form.name" placeholder="请输入数据库别名" auto-complete="off"></el-input>
                 </el-form-item>
@@ -34,7 +55,7 @@
 
                 <el-form-item v-if="form.type !== DbType.sqlite" prop="host" label="host" required>
                     <el-col :span="18">
-                        <el-input :disabled="form.id !== undefined" v-model.trim="form.host" placeholder="请输入主机ip" auto-complete="off"></el-input>
+                        <el-input v-model.trim="form.host" placeholder="请输入ip" auto-complete="off"></el-input>
                     </el-col>
                     <el-col style="text-align: center" :span="1">:</el-col>
                     <el-col :span="5">
@@ -87,18 +108,7 @@
 
                 <el-divider content-position="left">其他</el-divider>
                 <el-form-item prop="params" label="连接参数">
-                    <el-input v-model.trim="form.params" placeholder="其他连接参数，形如: key1=value1&key2=value2">
-                        <!-- <template #suffix>
-                                    <el-link
-                                        target="_blank"
-                                        href="https://github.com/go-sql-driver/mysql#parameters"
-                                        :underline="false"
-                                        type="primary"
-                                        class="mr5"
-                                        >参数参考</el-link
-                                    >
-                                </template> -->
-                    </el-input>
+                    <el-input v-model.trim="form.params" placeholder="其他连接参数，形如: key1=value1&key2=value2"> </el-input>
                 </el-form-item>
 
                 <el-form-item prop="sshTunnelMachineId" label="SSH隧道">
@@ -107,17 +117,15 @@
             </el-form>
 
             <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="cancel()">取 消</el-button>
-                    <el-button type="primary" :loading="saveBtnLoading" @click="btnOk">确 定</el-button>
-                </div>
+                <el-button @click="cancel()">取 消</el-button>
+                <el-button type="primary" :loading="saveBtnLoading" @click="btnOk">确 定</el-button>
             </template>
         </el-drawer>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, toRefs, watch } from 'vue';
+import { reactive, ref, toRefs, watchEffect } from 'vue';
 import { dbApi } from './api';
 import { ElMessage } from 'element-plus';
 import SshTunnelSelect from '../component/SshTunnelSelect.vue';
@@ -128,6 +136,8 @@ import { ResourceCodePattern } from '@/common/pattern';
 import { TagResourceTypeEnum } from '@/common/commonEnum';
 import ResourceAuthCertTableEdit from '../component/ResourceAuthCertTableEdit.vue';
 import { AuthCertCiphertextTypeEnum } from '../tag/enums';
+import TagTreeSelect from '../component/TagTreeSelect.vue';
+import { getTagPath } from '../component/tag';
 
 const props = defineProps({
     visible: {
@@ -145,6 +155,13 @@ const props = defineProps({
 const emit = defineEmits(['update:visible', 'cancel', 'val-change']);
 
 const rules = {
+    tagCodePaths: [
+        {
+            required: true,
+            message: '请选择标签',
+            trigger: ['change'],
+        },
+    ],
     code: [
         {
             required: true,
@@ -188,61 +205,63 @@ const rules = {
 };
 
 const dbForm: any = ref(null);
+const tagSelectRef: any = ref(null);
+
+const DefaultForm = {
+    id: null,
+    type: DbType.mysql,
+    code: '',
+    name: null,
+    host: '',
+    port: null,
+    extra: '', // 连接需要的额外参数（json字符串）
+    params: null,
+    remark: '',
+    sshTunnelMachineId: null as any,
+    authCerts: [],
+    tagCodePaths: [],
+};
 
 const state = reactive({
     dialogVisible: false,
     extra: {} as any, // 连接需要的额外参数（json）
-    form: {
-        id: null,
-        type: '',
-        code: '',
-        name: null,
-        host: '',
-        port: null,
-        authCerts: [],
-        extra: '', // 连接需要的额外参数（json字符串）
-        params: null,
-        remark: '',
-        sshTunnelMachineId: null as any,
-    },
+    form: DefaultForm,
     submitForm: {} as any,
 });
 
 const { dialogVisible, form, submitForm } = toRefs(state);
 
-const { isFetching: saveBtnLoading, execute: saveInstanceExec } = dbApi.saveInstance.useApi(submitForm);
+const { isFetching: saveBtnLoading, execute: saveInstanceExec, data: saveInstanceRes } = dbApi.saveInstance.useApi(submitForm);
 const { isFetching: testConnBtnLoading, execute: testConnExec } = dbApi.testConn.useApi(submitForm);
 
-watch(props, (newValue: any) => {
-    state.dialogVisible = newValue.visible;
+watchEffect(() => {
+    state.dialogVisible = props.visible;
     if (!state.dialogVisible) {
         return;
     }
-    if (newValue.data) {
-        state.form = { ...newValue.data };
+    const dbInst: any = props.data;
+    if (dbInst) {
+        state.form = { ...dbInst };
+        state.form.tagCodePaths = dbInst.tags.map((t: any) => t.codePath) || [];
         try {
             state.extra = JSON.parse(state.form.extra);
         } catch (e) {
             state.extra = {};
         }
     } else {
-        state.form = { port: null, type: DbType.mysql } as any;
+        state.form = { ...DefaultForm };
         state.form.authCerts = [];
     }
 });
 
-const changeDbType = (val: string) => {
-    if (!state.form.id) {
-        state.form.port = getDbDialect(val).getInfo().defaultPort as any;
-    }
-    state.extra = {};
-};
-
 const getReqForm = async () => {
-    const reqForm = { ...state.form };
+    const reqForm: any = { ...state.form };
+    reqForm.selectAuthCert = null;
+    reqForm.tags = null;
     if (!state.form.sshTunnelMachineId) {
         reqForm.sshTunnelMachineId = -1;
     }
+    reqForm.tagCodePaths = state.form.tagCodePaths.map((t: any) => getTagPath(t)) as any;
     if (Object.keys(state.extra).length > 0) {
         reqForm.extra = JSON.stringify(state.extra);
     }
@@ -273,6 +292,7 @@ const btnOk = async () => {
         state.submitForm = await getReqForm();
         await saveInstanceExec();
         ElMessage.success('保存成功');
+        state.form.id = saveInstanceRes as any;
         emit('val-change', state.form);
         cancel();
     });
@@ -283,5 +303,12 @@ const cancel = () => {
     emit('cancel');
     state.extra = {};
 };
+
+const changeDbType = (val: string) => {
+    if (!state.form.id) {
+        state.form.port = getDbDialect(val).getInfo().defaultPort as any;
+    }
+    state.extra = {};
+};
 </script>
 <style lang="scss"></style>
diff --git a/mayfly_go_web/src/views/ops/db/InstanceList.vue b/mayfly_go_web/src/views/ops/db/InstanceList.vue
index 4cc4ece0..231003be 100644
--- a/mayfly_go_web/src/views/ops/db/InstanceList.vue
+++ b/mayfly_go_web/src/views/ops/db/InstanceList.vue
@@ -9,6 +9,7 @@
             :show-selection="true"
             v-model:selection-data="state.selectionData"
             :columns="columns"
+            lazy
         >
             <template #tableHeader>
                 <el-button v-auth="perms.saveInstance" type="primary" icon="plus" @click="editInstance(false)">添加</el-button>
@@ -17,6 +18,10 @@
                 >
             </template>
 
+            <template #tagPath="{ data }">
+                <ResourceTags :tags="data.tags" />
+            </template>
+
             <template #authCert="{ data }">
                 <ResourceAuthCert v-model:select-auth-cert="data.selectAuthCert" :auth-certs="data.authCerts" />
             </template>
@@ -30,6 +35,7 @@
             <template #action="{ data }">
                 <el-button @click="showInfo(data)" link>详情</el-button>
                 <el-button v-if="actionBtns[perms.saveInstance]" @click="editInstance(data)" type="primary" link>编辑</el-button>
+                <el-button v-if="actionBtns[perms.saveDb]" @click="editDb(data)" type="primary" link>库配置</el-button>
             </template>
         </page-table>
 
@@ -56,11 +62,13 @@
         </el-dialog>
 
         <instance-edit
-            @val-change="search"
+            @val-change="search()"
             :title="instanceEditDialog.title"
             v-model:visible="instanceEditDialog.visible"
             v-model:data="instanceEditDialog.data"
         ></instance-edit>
+
+        <instance-db-conf :title="dbEditDialog.title" v-model:visible="dbEditDialog.visible" :instance="dbEditDialog.instance" />
     </div>
 </template>
 
@@ -76,17 +84,30 @@ import SvgIcon from '@/components/svgIcon/index.vue';
 import { getDbDialect } from './dialect';
 import { SearchItem } from '@/components/SearchForm';
 import ResourceAuthCert from '../component/ResourceAuthCert.vue';
+import ResourceTags from '../component/ResourceTags.vue';
+import { getTagPathSearchItem } from '../component/tag';
+import { TagResourceTypeEnum } from '@/common/commonEnum';
 
 const InstanceEdit = defineAsyncComponent(() => import('./InstanceEdit.vue'));
+const InstanceDbConf = defineAsyncComponent(() => import('./InstanceDbConf.vue'));
+
+const props = defineProps({
+    lazy: {
+        type: [Boolean],
+        default: false,
+    },
+});
 
 const perms = {
     saveInstance: 'db:instance:save',
     delInstance: 'db:instance:del',
+    saveDb: 'db:save',
 };
 
-const searchItems = [SearchItem.input('code', '编号'), SearchItem.input('name', '名称')];
+const searchItems = [getTagPathSearchItem(TagResourceTypeEnum.Db.value), SearchItem.input('code', '编号'), SearchItem.input('name', '名称')];
 
 const columns = ref([
+    TableColumn.new('tags[0].tagPath', '关联标签').isSlot('tagPath').setAddWidth(20),
     TableColumn.new('name', '名称'),
     TableColumn.new('type', '类型').isSlot().setAddWidth(-15).alignCenter(),
     TableColumn.new('host', 'host:port').setFormatFunc((data: any) => `${data.host}:${data.port}`),
@@ -98,7 +119,7 @@ const columns = ref([
 
 // 该用户拥有的的操作列按钮权限
 const actionBtns = hasPerms(Object.values(perms));
-const actionColumn = TableColumn.new('action', '操作').isSlot().setMinWidth(110).fixedRight().alignCenter();
+const actionColumn = TableColumn.new('action', '操作').isSlot().setMinWidth(180).fixedRight().alignCenter();
 const pageTableRef: Ref<any> = ref(null);
 
 const state = reactive({
@@ -114,6 +135,7 @@ const state = reactive({
      */
     query: {
         name: null,
+        tagPath: '',
         pageNum: 1,
         pageSize: 0,
     },
@@ -126,17 +148,28 @@ const state = reactive({
         data: null as any,
         title: '新增数据库实例',
     },
+    dbEditDialog: {
+        visible: false,
+        instance: null as any,
+        title: '新增数据库实例',
+    },
 });
 
-const { selectionData, query, infoDialog, instanceEditDialog } = toRefs(state);
+const { selectionData, query, infoDialog, instanceEditDialog, dbEditDialog } = toRefs(state);
 
 onMounted(async () => {
     if (Object.keys(actionBtns).length > 0) {
         columns.value.push(actionColumn);
     }
+    if (!props.lazy) {
+        search();
+    }
 });
 
-const search = () => {
+const search = (tagPath: string = '') => {
+    if (tagPath) {
+        state.query.tagPath = tagPath;
+    }
     pageTableRef.value.search();
 };
 
@@ -179,5 +212,13 @@ const deleteInstance = async () => {
         //
     }
 };
+
+const editDb = (data: any) => {
+    state.dbEditDialog.instance = data;
+    state.dbEditDialog.title = `配置 "${data.name}" 数据库`;
+    state.dbEditDialog.visible = true;
+};
+
+defineExpose({ search });
 </script>
 <style lang="scss"></style>
diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index 8ac4387c..c0e6c1b5 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -2,7 +2,7 @@
     <div class="db-sql-exec">
         <Splitpanes class="default-theme">
             <Pane size="20" max-size="30">
-                <tag-tree :resource-type="TagResourceTypeEnum.Db.value" :tag-path-node-type="NodeTypeTagPath" ref="tagTreeRef">
+                <tag-tree :resource-type="TagResourceTypeEnum.DbName.value" :tag-path-node-type="NodeTypeTagPath" ref="tagTreeRef">
                     <template #prefix="{ data }">
                         <span v-if="data.type.value == SqlExecNodeType.DbInst">
                             <el-popover
diff --git a/mayfly_go_web/src/views/ops/db/api.ts b/mayfly_go_web/src/views/ops/db/api.ts
index f4dcb94c..a4db6776 100644
--- a/mayfly_go_web/src/views/ops/db/api.ts
+++ b/mayfly_go_web/src/views/ops/db/api.ts
@@ -39,7 +39,7 @@ export const dbApi = {
 
     instances: Api.newGet('/instances'),
     getInstance: Api.newGet('/instances/{instanceId}'),
-    getAllDatabase: Api.newGet('/instances/{instanceId}/databases'),
+    getAllDatabase: Api.newPost('/instances/databases'),
     getInstanceServerInfo: Api.newGet('/instances/{instanceId}/server-info'),
     testConn: Api.newPost('/instances/test-conn'),
     saveInstance: Api.newPost('/instances'),
diff --git a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
index 45b6897e..775f6fa1 100644
--- a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
+++ b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
@@ -113,7 +113,7 @@
                                 :loading="dt.loading"
                                 :abort-fn="dt.abortFn"
                                 :height="tableDataHeight"
-                                empty-text="tips: select *开头的单表查询或点击表名默认查询的数据,可双击数据在线修改"
+                                :empty-text="state.tableDataEmptyText"
                                 @change-updated-field="changeUpdatedField($event, dt)"
                                 @data-delete="onDeleteData($event, dt)"
                             ></db-table-data>
@@ -221,6 +221,7 @@ const state = reactive({
     activeTab: 1,
     editorHeight: '500',
     tableDataHeight: '250px',
+    tableDataEmptyText: 'tips: select *开头的单表查询或点击表名默认查询的数据,可双击数据在线修改',
 });
 
 const { tableDataHeight } = toRefs(state);
@@ -368,9 +369,8 @@ const onRunSql = async (newTab = false) => {
 
         await execute();
         const colAndData: any = data.value;
-        if (!colAndData.res || colAndData.res.length === 0) {
-            ElMessage.warning('未查询到结果集');
-            return;
+        if (colAndData.res.length == 0) {
+            state.tableDataEmptyText = '查无数据';
         }
 
         // 要实时响应，故需要用索引改变数据才生效
@@ -467,7 +467,7 @@ const formatSql = () => {
         return;
     }
 
-    const formatDialect = getNowDbInst().getDialect().getInfo().formatSqlDialect;
+    const formatDialect: any = getNowDbInst().getDialect().getInfo().formatSqlDialect;
 
     let sql = monacoEditor.getModel()?.getValueInRange(selection);
     // 有选中sql则格式化并替换选中sql, 否则格式化编辑器所有内容
diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue
index 382e1b49..6b25580c 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue
@@ -121,7 +121,7 @@
 
                     <template #empty>
                         <div style="text-align: center">
-                            <el-empty class="h100" :description="state.emptyText" :image-size="100" />
+                            <el-empty class="h100" :description="props.emptyText" :image-size="100" />
                         </div>
                     </template>
                 </el-table-v2>
@@ -342,8 +342,6 @@ const state = reactive({
     columns: [] as any,
     loading: false,
     tableHeight: '600px',
-    emptyText: '',
-
     execTime: 0,
     contextmenu: {
         dropdown: {
@@ -434,7 +432,6 @@ onMounted(async () => {
     console.log('in DbTable mounted');
     state.tableHeight = props.height;
     state.loading = props.loading;
-    state.emptyText = props.emptyText;
 
     state.dbId = props.dbId;
     state.dbType = getNowDbInst().type;
diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue
index 422fdbb1..3cea9c70 100644
--- a/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue
+++ b/mayfly_go_web/src/views/ops/db/component/table/DbTablesOp.vue
@@ -308,7 +308,7 @@ const showCreateDdl = async (row: any) => {
         tableName: row.tableName,
     });
 
-    state.ddlDialog.ddl = sqlFormatter(res, { language: getDbDialect(props.dbType).getInfo().formatSqlDialect });
+    state.ddlDialog.ddl = sqlFormatter(res, { language: getDbDialect(props.dbType).getInfo().formatSqlDialect as any });
     state.ddlDialog.visible = true;
 };
 
diff --git a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
index 898ece7d..9d79e585 100644
--- a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
+++ b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
@@ -7,22 +7,26 @@
 
             <el-form :model="form" ref="machineForm" :rules="rules" label-width="auto">
                 <el-divider content-position="left">基本</el-divider>
-                <el-form-item ref="tagSelectRef" prop="tagId" label="标签">
+                <el-form-item ref="tagSelectRef" prop="tagCodePaths" label="标签">
                     <tag-tree-select
                         multiple
                         @change-tag="
-                            (tagIds) => {
-                                form.tagId = tagIds;
+                            (paths) => {
+                                form.tagCodePaths = paths;
                                 tagSelectRef.validate();
                             }
                         "
-                        :tag-path="form.tagPath"
-                        :select-tags="form.tagId"
+                        :select-tags="form.tagCodePaths"
                         style="width: 100%"
                     />
                 </el-form-item>
                 <el-form-item prop="code" label="编号" required>
-                    <el-input :disabled="form.id" v-model.trim="form.code" placeholder="请输入编号 (数字字母下划线), 不可修改" auto-complete="off"></el-input>
+                    <el-input
+                        :disabled="form.id"
+                        v-model.trim="form.code"
+                        placeholder="请输入编号 (大小写字母、数字、_-.:), 不可修改"
+                        auto-complete="off"
+                    ></el-input>
                 </el-form-item>
                 <el-form-item prop="name" label="名称" required>
                     <el-input v-model.trim="form.name" placeholder="请输入机器别名" auto-complete="off"></el-input>
@@ -78,7 +82,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, toRefs, watch } from 'vue';
+import { reactive, ref, toRefs, watchEffect } from 'vue';
 import { machineApi } from './api';
 import { ElMessage } from 'element-plus';
 import TagTreeSelect from '../component/TagTreeSelect.vue';
@@ -88,6 +92,7 @@ import { MachineProtocolEnum } from './enums';
 import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
 import { ResourceCodePattern } from '@/common/pattern';
 import { TagResourceTypeEnum } from '@/common/commonEnum';
+import { getTagPath } from '../component/tag';
 
 const props = defineProps({
     visible: {
@@ -105,7 +110,7 @@ const props = defineProps({
 const emit = defineEmits(['update:visible', 'cancel', 'val-change']);
 
 const rules = {
-    tagId: [
+    tagCodePaths: [
         {
             required: true,
             message: '请选择标签',
@@ -159,7 +164,7 @@ const defaultForm = {
     protocol: MachineProtocolEnum.Ssh.value,
     name: null,
     authCerts: [],
-    tagId: [],
+    tagCodePaths: [],
     remark: '',
     sshTunnelMachineId: null as any,
     enableRecorder: -1,
@@ -178,16 +183,17 @@ const { dialogVisible, form, submitForm } = toRefs(state);
 const { isFetching: testConnBtnLoading, execute: testConnExec } = machineApi.testConn.useApi(submitForm);
 const { isFetching: saveBtnLoading, execute: saveMachineExec } = machineApi.saveMachine.useApi(submitForm);
 
-watch(props, async (newValue: any) => {
-    state.dialogVisible = newValue.visible;
+watchEffect(() => {
+    state.dialogVisible = props.visible;
     if (!state.dialogVisible) {
         state.form = defaultForm;
         return;
     }
-    if (newValue.machine) {
-        state.form = { ...newValue.machine };
-        state.form.tagId = newValue.machine.tags.map((t: any) => t.tagId);
-        state.form.authCerts = newValue.machine.authCerts || [];
+    const machine: any = props.machine;
+    if (machine) {
+        state.form = { ...machine };
+        state.form.tagCodePaths = machine.tags.map((t: any) => t.codePath);
+        state.form.authCerts = machine.authCerts || [];
     }
 });
 
@@ -230,6 +236,7 @@ const getReqForm = () => {
     if (!state.form.sshTunnelMachineId || state.form.sshTunnelMachineId <= 0) {
         reqForm.sshTunnelMachineId = -1;
     }
+    reqForm.tagCodePaths = state.form.tagCodePaths.map((t: any) => getTagPath(t)) as any;
     return reqForm;
 };
 
diff --git a/mayfly_go_web/src/views/ops/mongo/MongoEdit.vue b/mayfly_go_web/src/views/ops/mongo/MongoEdit.vue
index 42f61546..802b3f3f 100644
--- a/mayfly_go_web/src/views/ops/mongo/MongoEdit.vue
+++ b/mayfly_go_web/src/views/ops/mongo/MongoEdit.vue
@@ -4,16 +4,16 @@
             <el-form :model="form" ref="mongoForm" :rules="rules" label-width="85px">
                 <el-tabs v-model="tabActiveName">
                     <el-tab-pane label="基础信息" name="basic">
-                        <el-form-item ref="tagSelectRef" prop="tagId" label="标签" required>
+                        <el-form-item ref="tagSelectRef" prop="tagCodePaths" label="标签" required>
                             <tag-tree-select
                                 @change-tag="
-                                    (tagIds) => {
-                                        form.tagId = tagIds;
+                                    (tagCodePaths) => {
+                                        form.tagCodePaths = tagCodePaths;
                                         tagSelectRef.validate();
                                     }
                                 "
                                 multiple
-                                :select-tags="form.tagId"
+                                :select-tags="form.tagCodePaths"
                                 style="width: 100%"
                             />
                         </el-form-item>
@@ -21,7 +21,7 @@
                             <el-input
                                 :disabled="form.id"
                                 v-model.trim="form.code"
-                                placeholder="请输入编号 (数字字母下划线), 不可修改"
+                                placeholder="请输入编号 (大小写字母、数字、_-.:), 不可修改"
                                 auto-complete="off"
                             ></el-input>
                         </el-form-item>
@@ -59,12 +59,13 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, watch, ref } from 'vue';
+import { toRefs, reactive, ref, watchEffect } from 'vue';
 import { mongoApi } from './api';
 import { ElMessage } from 'element-plus';
 import TagTreeSelect from '../component/TagTreeSelect.vue';
 import SshTunnelSelect from '../component/SshTunnelSelect.vue';
 import { ResourceCodePattern } from '@/common/pattern';
+import { getTagPath } from '../component/tag';
 
 const props = defineProps({
     visible: {
@@ -82,7 +83,7 @@ const props = defineProps({
 const emit = defineEmits(['update:visible', 'cancel', 'val-change']);
 
 const rules = {
-    tagId: [
+    tagCodePaths: [
         {
             required: true,
             message: '请选择标签',
@@ -129,7 +130,7 @@ const state = reactive({
         name: null,
         uri: null,
         sshTunnelMachineId: null as any,
-        tagId: [],
+        tagCodePaths: [],
     },
     submitForm: {},
 });
@@ -139,15 +140,16 @@ const { dialogVisible, tabActiveName, form, submitForm } = toRefs(state);
 const { isFetching: testConnBtnLoading, execute: testConnExec } = mongoApi.testConn.useApi(submitForm);
 const { isFetching: saveBtnLoading, execute: saveMongoExec } = mongoApi.saveMongo.useApi(submitForm);
 
-watch(props, async (newValue: any) => {
-    state.dialogVisible = newValue.visible;
+watchEffect(() => {
+    state.dialogVisible = props.visible;
     if (!state.dialogVisible) {
         return;
     }
     state.tabActiveName = 'basic';
-    if (newValue.mongo) {
-        state.form = { ...newValue.mongo };
-        state.form.tagId = newValue.mongo.tags.map((t: any) => t.tagId);
+    const mongo: any = props.mongo;
+    if (mongo) {
+        state.form = { ...mongo };
+        state.form.tagCodePaths = mongo.tags.map((t: any) => t.codePath);
     } else {
         state.form = { db: 0 } as any;
     }
@@ -158,6 +160,7 @@ const getReqForm = () => {
     if (!state.form.sshTunnelMachineId || state.form.sshTunnelMachineId <= 0) {
         reqForm.sshTunnelMachineId = -1;
     }
+    reqForm.tagCodePaths = state.form.tagCodePaths.map((t: any) => getTagPath(t)) as any;
     return reqForm;
 };
 
diff --git a/mayfly_go_web/src/views/ops/mongo/MongoList.vue b/mayfly_go_web/src/views/ops/mongo/MongoList.vue
index 6f7c7532..ac4501c9 100644
--- a/mayfly_go_web/src/views/ops/mongo/MongoList.vue
+++ b/mayfly_go_web/src/views/ops/mongo/MongoList.vue
@@ -34,7 +34,7 @@
         <mongo-run-command v-model:visible="usersVisible" :id="state.dbOps.dbId" />
 
         <mongo-edit
-            @val-change="search"
+            @val-change="search()"
             :title="mongoEditDialog.title"
             v-model:visible="mongoEditDialog.visible"
             v-model:mongo="mongoEditDialog.data"
diff --git a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
index f23f848e..001beccf 100644
--- a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
+++ b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
@@ -8,16 +8,16 @@
             <el-form :model="form" ref="redisForm" :rules="rules" label-width="auto">
                 <el-tabs v-model="tabActiveName">
                     <el-tab-pane label="基础信息" name="basic">
-                        <el-form-item ref="tagSelectRef" prop="tagId" label="标签" required>
+                        <el-form-item ref="tagSelectRef" prop="tagCodePaths" label="标签" required>
                             <tag-tree-select
                                 @change-tag="
-                                    (tagIds) => {
-                                        form.tagId = tagIds;
+                                    (tagCodePaths) => {
+                                        form.tagCodePaths = tagCodePaths;
                                         tagSelectRef.validate();
                                     }
                                 "
                                 multiple
-                                :select-tags="form.tagId"
+                                :select-tags="form.tagCodePaths"
                                 style="width: 100%"
                             />
                         </el-form-item>
@@ -25,7 +25,7 @@
                             <el-input
                                 :disabled="form.id"
                                 v-model.trim="form.code"
-                                placeholder="请输入编号 (数字字母下划线), 不可修改"
+                                placeholder="请输入编号 (大小写字母、数字、_-.:), 不可修改"
                                 auto-complete="off"
                             ></el-input>
                         </el-form-item>
@@ -108,7 +108,7 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, watch, ref } from 'vue';
+import { toRefs, reactive, ref, watchEffect } from 'vue';
 import { redisApi } from './api';
 import { ElMessage } from 'element-plus';
 import TagTreeSelect from '../component/TagTreeSelect.vue';
@@ -116,6 +116,7 @@ import SshTunnelSelect from '../component/SshTunnelSelect.vue';
 import ProcdefSelectFormItem from '@/views/flow/components/ProcdefSelectFormItem.vue';
 import { ResourceCodePattern } from '@/common/pattern';
 import DrawerHeader from '@/components/drawer-header/DrawerHeader.vue';
+import { getTagPath } from '../component/tag';
 
 const props = defineProps({
     visible: {
@@ -132,7 +133,7 @@ const props = defineProps({
 const emit = defineEmits(['update:visible', 'val-change', 'cancel']);
 
 const rules = {
-    tagId: [
+    tagCodePaths: [
         {
             required: true,
             message: '请选择标签',
@@ -190,7 +191,7 @@ const state = reactive({
     form: {
         id: null,
         code: '',
-        tagId: [],
+        tagCodePaths: [],
         name: null,
         mode: 'standalone',
         host: '',
@@ -211,15 +212,16 @@ const { dialogVisible, tabActiveName, form, submitForm, dbList } = toRefs(state)
 const { isFetching: testConnBtnLoading, execute: testConnExec } = redisApi.testConn.useApi(submitForm);
 const { isFetching: saveBtnLoading, execute: saveRedisExec } = redisApi.saveRedis.useApi(submitForm);
 
-watch(props, async (newValue: any) => {
-    state.dialogVisible = newValue.visible;
+watchEffect(() => {
+    state.dialogVisible = props.visible;
     if (!state.dialogVisible) {
         return;
     }
     state.tabActiveName = 'basic';
-    if (newValue.redis) {
-        state.form = { ...newValue.redis };
-        state.form.tagId = newValue.redis.tags.map((t: any) => t.tagId);
+    const redis: any = props.redis;
+    if (redis) {
+        state.form = { ...redis };
+        state.form.tagCodePaths = redis.tags.map((t: any) => t.codePath);
         convertDb(state.form.db);
     } else {
         state.form = { db: '0' } as any;
@@ -247,6 +249,7 @@ const getReqForm = async () => {
     if (!state.form.sshTunnelMachineId || state.form.sshTunnelMachineId <= 0) {
         reqForm.sshTunnelMachineId = -1;
     }
+    reqForm.tagCodePaths = state.form.tagCodePaths.map((t: any) => getTagPath(t)) as any;
     return reqForm;
 };
 
diff --git a/mayfly_go_web/src/views/ops/tag/AuthCertList.vue b/mayfly_go_web/src/views/ops/tag/AuthCertList.vue
index 07c9e384..effdd803 100755
--- a/mayfly_go_web/src/views/ops/tag/AuthCertList.vue
+++ b/mayfly_go_web/src/views/ops/tag/AuthCertList.vue
@@ -39,7 +39,7 @@ import PageTable from '@/components/pagetable/PageTable.vue';
 import { TableColumn } from '@/components/pagetable';
 import { SearchItem } from '@/components/SearchForm';
 import { AuthCertCiphertextTypeEnum, AuthCertTypeEnum } from './enums';
-import { TagResourceTypeEnum } from '@/common/commonEnum';
+import { ResourceTypeEnum, TagResourceTypeEnum } from '@/common/commonEnum';
 import ResourceAuthCertEdit from '../component/ResourceAuthCertEdit.vue';
 
 const pageTableRef: Ref<any> = ref(null);
@@ -51,6 +51,7 @@ const state = reactive({
     },
     searchItems: [
         SearchItem.input('name', '凭证名称'),
+        SearchItem.select('resourceType', '资源类型').withEnum(ResourceTypeEnum),
         SearchItem.select('type', '凭证类型').withEnum(AuthCertTypeEnum),
         SearchItem.select('ciphertextType', '密文类型').withEnum(AuthCertCiphertextTypeEnum),
     ],
diff --git a/mayfly_go_web/src/views/ops/tag/TagTreeList.vue b/mayfly_go_web/src/views/ops/tag/TagTreeList.vue
index 641e002f..33d20e1b 100644
--- a/mayfly_go_web/src/views/ops/tag/TagTreeList.vue
+++ b/mayfly_go_web/src/views/ops/tag/TagTreeList.vue
@@ -3,7 +3,7 @@
         <Splitpanes class="default-theme">
             <Pane size="30" min-size="25" max-size="35">
                 <div class="card pd5 mr5">
-                    <el-input v-model="filterTag" clearable placeholder="关键字过滤(右击操作)" style="width: 200px; margin-right: 10px" />
+                    <el-input v-model="filterTag" clearable placeholder="关键字过滤(右击节点操作)" style="width: 200px; margin-right: 10px" />
                     <el-button
                         v-if="useUserInfo().userInfo.username == 'admin'"
                         v-auth="'tag:save'"
@@ -42,7 +42,10 @@
                     >
                         <template #default="{ data }">
                             <span class="custom-tree-node">
-                                <SvgIcon :name="EnumValue.getEnumByValue(TagResourceTypeEnum, data.type)?.extra.icon" />
+                                <SvgIcon
+                                    :name="EnumValue.getEnumByValue(TagResourceTypeEnum, data.type)?.extra.icon"
+                                    :color="EnumValue.getEnumByValue(TagResourceTypeEnum, data.type)?.extra.iconColor"
+                                />
 
                                 <span class="ml5">
                                     {{ data.code }}
@@ -94,7 +97,7 @@
                         </el-tab-pane>
 
                         <el-tab-pane :disabled="currentTag.type != TagResourceTypeEnum.Tag.value" :label="`数据库 (${resourceCount.db || 0})`" :name="DbTag">
-                            <DbList lazy ref="dbListRef" />
+                            <InstanceList lazy ref="dbInstanceListRef" />
                         </el-tab-pane>
 
                         <el-tab-pane
@@ -152,10 +155,10 @@ import { Splitpanes, Pane } from 'splitpanes';
 import MachineList from '../machine/MachineList.vue';
 import RedisList from '../redis/RedisList.vue';
 import MongoList from '../mongo/MongoList.vue';
-import DbList from '../db/DbList.vue';
 import { TagResourceTypeEnum } from '@/common/commonEnum';
 import EnumTag from '@/components/enumtag/EnumTag.vue';
 import EnumValue from '@/common/Enum';
+import InstanceList from '../db/InstanceList.vue';
 
 interface Tree {
     id: number;
@@ -169,7 +172,7 @@ const tagTreeRef: any = ref(null);
 const filterTag = ref('');
 const contextmenuRef = ref();
 const machineListRef: Ref<any> = ref(null);
-const dbListRef: Ref<any> = ref(null);
+const dbInstanceListRef: Ref<any> = ref(null);
 const redisListRef: Ref<any> = ref(null);
 const mongoListRef: Ref<any> = ref(null);
 
@@ -305,7 +308,7 @@ const setNowTabData = () => {
             machineListRef.value.search(tagPath);
             break;
         case DbTag:
-            dbListRef.value.search(tagPath);
+            dbInstanceListRef.value.search(tagPath);
             break;
         case RedisTag:
             redisListRef.value.search(tagPath);
@@ -320,7 +323,7 @@ const setNowTabData = () => {
 
 const filterNode = (value: string, data: Tree) => {
     if (!value) return true;
-    return data.codePath.includes(value) || data.name.includes(value);
+    return data.codePath.toLowerCase().includes(value) || data.name.includes(value);
 };
 
 const search = async () => {
diff --git a/mayfly_go_web/src/views/ops/tag/TeamList.vue b/mayfly_go_web/src/views/ops/tag/TeamList.vue
index 08070f7d..21524788 100755
--- a/mayfly_go_web/src/views/ops/tag/TeamList.vue
+++ b/mayfly_go_web/src/views/ops/tag/TeamList.vue
@@ -48,41 +48,45 @@
                 </el-form-item>
 
                 <el-form-item prop="tag" label="标签">
-                    <el-scrollbar style="height: calc(100vh - 300px); border: 1px solid var(--el-border-color)">
-                        <el-tree
-                            ref="tagTreeRef"
-                            style="width: 100%"
-                            :data="state.tags"
-                            :default-expanded-keys="state.addTeamDialog.form.tags"
-                            :default-checked-keys="state.addTeamDialog.form.tags"
-                            multiple
-                            :render-after-expand="true"
-                            show-checkbox
-                            check-strictly
-                            node-key="id"
-                            :props="{
-                                value: 'id',
-                                label: 'codePath',
-                                children: 'children',
-                                disabled: 'disabled',
-                            }"
-                            @check="tagTreeNodeCheck"
-                        >
-                            <template #default="{ data }">
-                                <span class="custom-tree-node">
-                                    <SvgIcon :name="EnumValue.getEnumByValue(TagResourceTypeEnum, data.type)?.extra.icon" />
+                    <div class="w100" style="border: 1px solid var(--el-border-color)">
+                        <el-input v-model="filterTag" clearable placeholder="输入关键字过滤" size="small" />
+                        <el-scrollbar style="height: calc(100vh - 330px)">
+                            <el-tree
+                                ref="tagTreeRef"
+                                style="width: 100%"
+                                :data="state.tags"
+                                :default-expanded-keys="state.addTeamDialog.form.tags"
+                                :default-checked-keys="state.addTeamDialog.form.tags"
+                                multiple
+                                :render-after-expand="true"
+                                show-checkbox
+                                check-strictly
+                                node-key="id"
+                                :props="{
+                                    value: 'id',
+                                    label: 'codePath',
+                                    children: 'children',
+                                    disabled: 'disabled',
+                                }"
+                                @check="tagTreeNodeCheck"
+                                :filter-node-method="filterNode"
+                            >
+                                <template #default="{ data }">
+                                    <span class="custom-tree-node">
+                                        <SvgIcon :name="EnumValue.getEnumByValue(TagResourceTypeEnum, data.type)?.extra.icon" />
 
-                                    <span class="font13 ml5">
-                                        {{ data.code }}
-                                        <span style="color: #3c8dbc">【</span>
-                                        {{ data.name }}
-                                        <span style="color: #3c8dbc">】</span>
-                                        <el-tag v-if="data.children !== null" size="small">{{ data.children.length }} </el-tag>
+                                        <span class="font13 ml5">
+                                            {{ data.code }}
+                                            <span style="color: #3c8dbc">【</span>
+                                            {{ data.name }}
+                                            <span style="color: #3c8dbc">】</span>
+                                            <el-tag v-if="data.children !== null" size="small">{{ data.children.length }} </el-tag>
+                                        </span>
                                     </span>
-                                </span>
-                            </template>
-                        </el-tree>
-                    </el-scrollbar>
+                                </template>
+                            </el-tree>
+                        </el-scrollbar>
+                    </div>
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -127,7 +131,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, toRefs, reactive, onMounted, Ref } from 'vue';
+import { ref, toRefs, reactive, onMounted, Ref, watch } from 'vue';
 import { tagApi } from './api';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { notBlank } from '@/common/assert';
@@ -143,6 +147,7 @@ const teamForm: any = ref(null);
 const tagTreeRef: any = ref(null);
 const pageTableRef: Ref<any> = ref(null);
 const showMemPageTableRef: Ref<any> = ref(null);
+const filterTag = ref('');
 
 const searchItems = [SearchItem.input('name', '团队名称')];
 const columns = [
@@ -206,6 +211,17 @@ const search = async () => {
     pageTableRef.value.search();
 };
 
+watch(filterTag, (val) => {
+    tagTreeRef.value!.filter(val);
+});
+
+const filterNode = (value: string, data: any) => {
+    if (!value) {
+        return true;
+    }
+    return data.codePath.toLowerCase().includes(value) || data.name.includes(value);
+};
+
 const showSaveTeamDialog = async (data: any) => {
     state.tags = await tagApi.getTagTrees.request(null);
 
diff --git a/mayfly_go_web/src/views/system/account/AccountEdit.vue b/mayfly_go_web/src/views/system/account/AccountEdit.vue
index 4aa573fb..7a54481d 100755
--- a/mayfly_go_web/src/views/system/account/AccountEdit.vue
+++ b/mayfly_go_web/src/views/system/account/AccountEdit.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, watch, ref } from 'vue';
+import { toRefs, reactive, watch, ref, watchEffect } from 'vue';
 import { accountApi } from '../api';
 import { ElMessage } from 'element-plus';
 import { AccountUsernamePattern } from '@/common/pattern';
@@ -101,6 +101,18 @@ watch(props, (newValue: any) => {
     state.dialogVisible = newValue.visible;
 });
 
+watchEffect(() => {
+    const account: any = props.account;
+    if (account) {
+        state.form = { ...account };
+        state.edit = true;
+    } else {
+        state.edit = false;
+        state.form = {} as any;
+    }
+    state.dialogVisible = props.visible;
+});
+
 const btnOk = async () => {
     accountForm.value.validate(async (valid: boolean) => {
         if (!valid) {
diff --git a/mayfly_go_web/src/views/system/config/ConfigEdit.vue b/mayfly_go_web/src/views/system/config/ConfigEdit.vue
index 301f1d30..311173bb 100755
--- a/mayfly_go_web/src/views/system/config/ConfigEdit.vue
+++ b/mayfly_go_web/src/views/system/config/ConfigEdit.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, toRefs, reactive, watch } from 'vue';
+import { ref, toRefs, reactive, watch, watchEffect } from 'vue';
 import { configApi, accountApi } from '../api';
 import { DynamicFormEdit } from '@/components/dynamic-form';
 
@@ -82,14 +82,14 @@ const { dvisible, params, form } = toRefs(state);
 
 const { isFetching: saveBtnLoading, execute: saveConfigExec } = configApi.save.useApi(form);
 
-watch(props, (newValue: any) => {
-    state.dvisible = newValue.visible;
+watchEffect(() => {
+    state.dvisible = props.visible;
     if (!state.dvisible) {
         return;
     }
 
-    if (newValue.data) {
-        state.form = { ...newValue.data };
+    if (props.data) {
+        state.form = { ...(props.data as any) };
         if (state.form.params) {
             state.params = JSON.parse(state.form.params);
         } else {
diff --git a/mayfly_go_web/src/views/system/resource/ResourceEdit.vue b/mayfly_go_web/src/views/system/resource/ResourceEdit.vue
index 6920597b..da7008bc 100644
--- a/mayfly_go_web/src/views/system/resource/ResourceEdit.vue
+++ b/mayfly_go_web/src/views/system/resource/ResourceEdit.vue
@@ -128,7 +128,7 @@
                     </el-col>
                 </el-row>
             </el-form>
-
+            e
             <template #footer>
                 <div>
                     <el-button @click="cancel()">取 消</el-button>
@@ -140,7 +140,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, toRefs, reactive, watch } from 'vue';
+import { ref, toRefs, reactive, watchEffect } from 'vue';
 import { ElMessage } from 'element-plus';
 import { resourceApi } from '../api';
 import { ResourceTypeEnum } from '../enums';
@@ -229,10 +229,10 @@ const { dialogVisible, form, submitForm } = toRefs(state);
 
 const { isFetching: saveBtnLoading, execute: saveResouceExec } = resourceApi.save.useApi(submitForm);
 
-watch(props, (newValue: any) => {
-    state.dialogVisible = newValue.visible;
-    if (newValue.data) {
-        state.form = { ...newValue.data };
+watchEffect(() => {
+    state.dialogVisible = props.visible;
+    if (props.data) {
+        state.form = { ...(props.data as any) };
     } else {
         state.form = {} as any;
     }
diff --git a/mayfly_go_web/src/views/system/role/RoleEdit.vue b/mayfly_go_web/src/views/system/role/RoleEdit.vue
index f8c43689..0f9dad4c 100755
--- a/mayfly_go_web/src/views/system/role/RoleEdit.vue
+++ b/mayfly_go_web/src/views/system/role/RoleEdit.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, toRefs, reactive, watch } from 'vue';
+import { ref, toRefs, reactive, watchEffect } from 'vue';
 import { roleApi } from '../api';
 import { RoleStatusEnum } from '../enums';
 
@@ -63,10 +63,10 @@ const { dvisible, form } = toRefs(state);
 
 const { isFetching: saveBtnLoading, execute: saveRoleExec } = roleApi.save.useApi(form);
 
-watch(props, (newValue: any) => {
-    state.dvisible = newValue.visible;
-    if (newValue.data) {
-        state.form = { ...newValue.data };
+watchEffect(() => {
+    state.dvisible = props.visible;
+    if (props.data) {
+        state.form = { ...(props.data as any) };
     } else {
         state.form = {} as any;
     }
diff --git a/server/internal/db/api/dashbord.go b/server/internal/db/api/dashbord.go
index 331f54f8..e3d356e8 100644
--- a/server/internal/db/api/dashbord.go
+++ b/server/internal/db/api/dashbord.go
@@ -1,9 +1,9 @@
 package api
 
 import (
-	"mayfly-go/internal/common/consts"
 	"mayfly-go/internal/db/application"
 	tagapp "mayfly-go/internal/tag/application"
+	tagentity "mayfly-go/internal/tag/domain/entity"
 	"mayfly-go/pkg/req"
 	"mayfly-go/pkg/utils/collx"
 )
@@ -15,9 +15,10 @@ type Dashbord struct {
 
 func (m *Dashbord) Dashbord(rc *req.Ctx) {
 	accountId := rc.GetLoginAccount().Id
-	dbNum := len(m.TagTreeApp.GetAccountTagCodes(accountId, consts.ResourceTypeDb, ""))
+
+	tagCodePaths := m.TagTreeApp.GetAccountTagCodePaths(accountId, tagentity.TagTypeDbName, "")
 
 	rc.ResData = collx.M{
-		"dbNum": dbNum,
+		"dbNum": len(tagCodePaths),
 	}
 }
diff --git a/server/internal/db/api/db.go b/server/internal/db/api/db.go
index 03852a67..cb3f4359 100644
--- a/server/internal/db/api/db.go
+++ b/server/internal/db/api/db.go
@@ -44,7 +44,7 @@ func (d *Db) Dbs(rc *req.Ctx) {
 	queryCond, page := req.BindQueryAndPage[*entity.DbQuery](rc, new(entity.DbQuery))
 
 	// 不存在可访问标签id，即没有可操作数据
-	codes := d.TagApp.GetAccountTagCodes(rc.GetLoginAccount().Id, consts.ResourceTypeDb, queryCond.TagPath)
+	codes := d.TagApp.GetAccountTagCodes(rc.GetLoginAccount().Id, int8(tagentity.TagTypeDbName), queryCond.TagPath)
 	if len(codes) == 0 {
 		rc.ResData = model.EmptyPageResult[any]()
 		return
@@ -56,7 +56,7 @@ func (d *Db) Dbs(rc *req.Ctx) {
 	biz.ErrIsNil(err)
 
 	// 填充标签信息
-	d.TagApp.FillTagInfo(tagentity.TagType(consts.ResourceTypeDb), collx.ArrayMap(dbvos, func(dbvo *vo.DbListVO) tagentity.ITagResource {
+	d.TagApp.FillTagInfo(tagentity.TagTypeDbName, collx.ArrayMap(dbvos, func(dbvo *vo.DbListVO) tagentity.ITagResource {
 		return dbvo
 	})...)
 
@@ -69,7 +69,7 @@ func (d *Db) Save(rc *req.Ctx) {
 
 	rc.ReqParam = form
 
-	biz.ErrIsNil(d.DbApp.SaveDb(rc.MetaCtx, db, form.TagId...))
+	biz.ErrIsNil(d.DbApp.SaveDb(rc.MetaCtx, db))
 }
 
 func (d *Db) DeleteDb(rc *req.Ctx) {
@@ -81,7 +81,7 @@ func (d *Db) DeleteDb(rc *req.Ctx) {
 	for _, v := range ids {
 		dbId := cast.ToUint64(v)
 		biz.NotBlank(dbId, "存在错误dbId")
-		d.DbApp.Delete(ctx, dbId)
+		biz.ErrIsNil(d.DbApp.Delete(ctx, dbId))
 		// 删除该库的sql执行记录
 		d.DbSqlExecApp.DeleteBy(ctx, &entity.DbSqlExec{DbId: dbId})
 	}
diff --git a/server/internal/db/api/db_instance.go b/server/internal/db/api/db_instance.go
index 626e22c6..afc8f187 100644
--- a/server/internal/db/api/db_instance.go
+++ b/server/internal/db/api/db_instance.go
@@ -10,6 +10,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"
 	"strconv"
@@ -20,6 +21,7 @@ type Instance struct {
 	InstanceApp         application.Instance    `inject:"DbInstanceApp"`
 	DbApp               application.Db          `inject:""`
 	ResourceAuthCertApp tagapp.ResourceAuthCert `inject:""`
+	TagApp              tagapp.TagTree          `inject:"TagTreeApp"`
 }
 
 // Instances 获取数据库实例信息
@@ -27,15 +29,30 @@ type Instance struct {
 func (d *Instance) Instances(rc *req.Ctx) {
 	queryCond, page := req.BindQueryAndPage[*entity.InstanceQuery](rc, new(entity.InstanceQuery))
 
+	tagCodePaths := d.TagApp.GetAccountTagCodePaths(rc.GetLoginAccount().Id, tagentity.TagTypeDbAuthCert, queryCond.TagPath)
+	// 不存在可操作的数据库，即没有可操作数据
+	if len(tagCodePaths) == 0 {
+		rc.ResData = model.EmptyPageResult[any]()
+		return
+	}
+
+	dbInstCodes := tagentity.GetCodeByPath(tagentity.TagTypeDb, tagCodePaths...)
+	queryCond.Codes = dbInstCodes
+
 	var instvos []*vo.InstanceListVO
 	res, err := d.InstanceApp.GetPageList(queryCond, page, &instvos)
 	biz.ErrIsNil(err)
 
 	// 填充授权凭证信息
-	d.ResourceAuthCertApp.FillAuthCert(consts.ResourceTypeDb, collx.ArrayMap(instvos, func(vos *vo.InstanceListVO) tagentity.IAuthCert {
+	d.ResourceAuthCertApp.FillAuthCertByAcNames(tagentity.GetCodeByPath(tagentity.TagTypeDbAuthCert, tagCodePaths...), collx.ArrayMap(instvos, func(vos *vo.InstanceListVO) tagentity.IAuthCert {
 		return vos
 	})...)
 
+	// 填充标签信息
+	d.TagApp.FillTagInfo(tagentity.TagType(consts.ResourceTypeDb), collx.ArrayMap(instvos, func(insvo *vo.InstanceListVO) tagentity.ITagResource {
+		return insvo
+	})...)
+
 	rc.ResData = res
 }
 
@@ -53,10 +70,13 @@ func (d *Instance) SaveInstance(rc *req.Ctx) {
 	instance := req.BindJsonAndCopyTo[*entity.DbInstance](rc, form, new(entity.DbInstance))
 
 	rc.ReqParam = form
-	biz.ErrIsNil(d.InstanceApp.SaveDbInstance(rc.MetaCtx, &application.SaveDbInstanceParam{
-		DbInstance: instance,
-		AuthCerts:  form.AuthCerts,
-	}))
+	id, err := d.InstanceApp.SaveDbInstance(rc.MetaCtx, &application.SaveDbInstanceParam{
+		DbInstance:   instance,
+		AuthCerts:    form.AuthCerts,
+		TagCodePaths: form.TagCodePaths,
+	})
+	biz.ErrIsNil(err)
+	rc.ResData = id
 }
 
 // GetInstance 获取数据库实例密码，由于数据库是加密存储，故提供该接口展示原文密码
@@ -86,14 +106,9 @@ func (d *Instance) DeleteInstance(rc *req.Ctx) {
 
 // 获取数据库实例的所有数据库名
 func (d *Instance) GetDatabaseNames(rc *req.Ctx) {
-	instanceId := getInstanceId(rc)
-	authCertName := rc.Query("authCertName")
-	biz.NotEmpty(authCertName, "授权凭证名不能为空")
-
-	instance, err := d.InstanceApp.GetById(new(entity.DbInstance), instanceId)
-	biz.ErrIsNil(err, "获取数据库实例错误")
-
-	res, err := d.InstanceApp.GetDatabases(instance, authCertName)
+	form := &form.InstanceDbNamesForm{}
+	instance := req.BindJsonAndCopyTo[*entity.DbInstance](rc, form, new(entity.DbInstance))
+	res, err := d.InstanceApp.GetDatabases(instance, form.AuthCert)
 	biz.ErrIsNil(err)
 	rc.ResData = res
 }
diff --git a/server/internal/db/api/form/db.go b/server/internal/db/api/form/db.go
index 2c8e947b..a32053fb 100644
--- a/server/internal/db/api/form/db.go
+++ b/server/internal/db/api/form/db.go
@@ -1,15 +1,14 @@
 package form
 
 type DbForm struct {
-	Id             uint64   `json:"id"`
-	Code           string   `binding:"required" json:"code"`
-	Name           string   `binding:"required" json:"name"`
-	Database       string   `json:"database"`
-	Remark         string   `json:"remark"`
-	TagId          []uint64 `binding:"required" json:"tagId"`
-	InstanceId     uint64   `binding:"required" json:"instanceId"`
-	AuthCertName   string   `json: "authCertName"`
-	FlowProcdefKey string   `json:"flowProcdefKey"`
+	Id             uint64 `json:"id"`
+	Code           string `binding:"required" json:"code"`
+	Name           string `binding:"required" json:"name"`
+	Database       string `json:"database"`
+	Remark         string `json:"remark"`
+	InstanceId     uint64 `binding:"required" json:"instanceId"`
+	AuthCertName   string `json:"authCertName"`
+	FlowProcdefKey string `json:"flowProcdefKey"`
 }
 
 type DbSqlSaveForm struct {
diff --git a/server/internal/db/api/form/instance.go b/server/internal/db/api/form/instance.go
index 254f8828..38d41682 100644
--- a/server/internal/db/api/form/instance.go
+++ b/server/internal/db/api/form/instance.go
@@ -14,5 +14,15 @@ type InstanceForm struct {
 	Remark             string `json:"remark"`
 	SshTunnelMachineId int    `json:"sshTunnelMachineId"`
 
-	AuthCerts []*tagentity.ResourceAuthCert `json:"authCerts" binding:"required"` // 资产授权凭证信息列表
+	AuthCerts    []*tagentity.ResourceAuthCert `json:"authCerts" binding:"required"` // 资产授权凭证信息列表
+	TagCodePaths []string                      `binding:"required" json:"tagCodePaths"`
+}
+
+type InstanceDbNamesForm struct {
+	Type               string                      `binding:"required" json:"type"` // 类型，mysql oracle等
+	Host               string                      `binding:"required" json:"host"`
+	Port               int                         `json:"port"`
+	Params             string                      `json:"params"`
+	SshTunnelMachineId int                         `json:"sshTunnelMachineId"`
+	AuthCert           *tagentity.ResourceAuthCert `json:"authCert" binding:"required"` // 资产授权凭证信息
 }
diff --git a/server/internal/db/api/vo/instance.go b/server/internal/db/api/vo/instance.go
index 7de47aff..9df9bbaa 100644
--- a/server/internal/db/api/vo/instance.go
+++ b/server/internal/db/api/vo/instance.go
@@ -7,6 +7,7 @@ import (
 
 type InstanceListVO struct {
 	tagentity.AuthCerts // 授权凭证信息
+	tagentity.ResourceTags
 
 	Id         *int64     `json:"id"`
 	Code       string     `json:"code"`
diff --git a/server/internal/db/application/db.go b/server/internal/db/application/db.go
index 012e0c4e..55b54fb5 100644
--- a/server/internal/db/application/db.go
+++ b/server/internal/db/application/db.go
@@ -3,7 +3,6 @@ package application
 import (
 	"context"
 	"fmt"
-	"mayfly-go/internal/common/consts"
 	"mayfly-go/internal/db/dbm"
 	"mayfly-go/internal/db/dbm/dbi"
 	"mayfly-go/internal/db/domain/entity"
@@ -28,7 +27,7 @@ type Db interface {
 
 	Count(condition *entity.DbQuery) int64
 
-	SaveDb(ctx context.Context, entity *entity.Db, tagIds ...uint64) error
+	SaveDb(ctx context.Context, entity *entity.Db) error
 
 	// 删除数据库信息
 	Delete(ctx context.Context, id uint64) error
@@ -49,9 +48,10 @@ type Db interface {
 type dbAppImpl struct {
 	base.AppImpl[*entity.Db, repository.Db]
 
-	dbSqlRepo     repository.DbSql `inject:"DbSqlRepo"`
-	dbInstanceApp Instance         `inject:"DbInstanceApp"`
-	tagApp        tagapp.TagTree   `inject:"TagTreeApp"`
+	dbSqlRepo           repository.DbSql        `inject:"DbSqlRepo"`
+	dbInstanceApp       Instance                `inject:"DbInstanceApp"`
+	tagApp              tagapp.TagTree          `inject:"TagTreeApp"`
+	resourceAuthCertApp tagapp.ResourceAuthCert `inject:"ResourceAuthCertApp"`
 }
 
 // 注入DbRepo
@@ -68,11 +68,16 @@ func (d *dbAppImpl) Count(condition *entity.DbQuery) int64 {
 	return d.GetRepo().Count(condition)
 }
 
-func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db, tagIds ...uint64) error {
+func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db) error {
 	// 查找是否存在
 	oldDb := &entity.Db{Name: dbEntity.Name, InstanceId: dbEntity.InstanceId}
-	err := d.GetBy(oldDb)
 
+	authCert, err := d.resourceAuthCertApp.GetAuthCert(dbEntity.AuthCertName)
+	if err != nil {
+		return errorx.NewBiz("授权凭证不存在")
+	}
+
+	err = d.GetBy(oldDb)
 	if dbEntity.Id == 0 {
 		if err == nil {
 			return errorx.NewBiz("该实例下数据库名已存在")
@@ -85,10 +90,15 @@ func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db, tagIds ...u
 		return d.Tx(ctx, func(ctx context.Context) error {
 			return d.Insert(ctx, dbEntity)
 		}, func(ctx context.Context) error {
-			return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-				Code:         dbEntity.Code,
-				Type:         tagentity.TagTypeDb,
-				ParentTagIds: tagIds,
+			// 将库关联至指定数据库授权凭证下
+			return d.tagApp.RelateTagsByCodeAndType(ctx, &tagapp.RelateTagsByCodeAndTypeParam{
+				Tags: []*tagapp.ResourceTag{{
+					Code: dbEntity.Code,
+					Type: tagentity.TagTypeDbName,
+					Name: dbEntity.Name,
+				}},
+				ParentTagCode: authCert.Name,
+				ParentTagType: tagentity.TagTypeDbAuthCert,
 			})
 		})
 	}
@@ -125,11 +135,15 @@ func (d *dbAppImpl) SaveDb(ctx context.Context, dbEntity *entity.Db, tagIds ...u
 	return d.Tx(ctx, func(ctx context.Context) error {
 		return d.UpdateById(ctx, dbEntity)
 	}, func(ctx context.Context) error {
-		return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-			Code:         old.Code,
-			Type:         tagentity.TagTypeDb,
-			ParentTagIds: tagIds,
-		})
+		if old.Name != dbEntity.Name {
+			if err := d.tagApp.UpdateTagName(ctx, tagentity.TagTypeDbName, old.Code, dbEntity.Name); err != nil {
+				return err
+			}
+		}
+		if authCert.Name != old.AuthCertName {
+			return d.tagApp.UpdateParentTagCode(ctx, tagentity.TagTypeDbName, old.Code, authCert.Name, authCert.Username)
+		}
+		return nil
 	})
 }
 
@@ -152,9 +166,9 @@ func (d *dbAppImpl) Delete(ctx context.Context, id uint64) error {
 			// 删除该库下用户保存的所有sql信息
 			return d.dbSqlRepo.DeleteByCond(ctx, &entity.DbSql{DbId: id})
 		}, func(ctx context.Context) error {
-			return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-				Code: db.Code,
-				Type: tagentity.TagTypeDb,
+			return d.tagApp.DeleteTagByParam(ctx, &tagapp.DelResourceTagParam{
+				ResourceCode: db.Code,
+				ResourceType: tagentity.TagTypeDbName,
 			})
 		})
 }
@@ -175,7 +189,7 @@ func (d *dbAppImpl) GetDbConn(dbId uint64, dbName string) (*dbi.DbConn, error) {
 		if err != nil {
 			return nil, err
 		}
-		di.TagPath = d.tagApp.ListTagPathByTypeAndCode(consts.ResourceTypeDb, db.Code)
+		di.TagPath = d.tagApp.ListTagPathByTypeAndCode(int8(tagentity.TagTypeDbName), db.Code)
 		di.Id = db.Id
 
 		if db.FlowProcdefKey != nil {
@@ -264,9 +278,11 @@ func (d *dbAppImpl) DumpDb(ctx context.Context, reqParam *DumpDbReq) error {
 		writer.TryFlush()
 		// 查询表信息，主要是为了查询表注释
 		tbs, err := dbMeta.GetTables(tableName)
-		biz.ErrIsNil(err)
-		if err != nil || tbs == nil || len(tbs) <= 0 {
-			panic(errorx.NewBiz(fmt.Sprintf("获取表信息失败：%s", tableName)))
+		if err != nil {
+			return err
+		}
+		if len(tbs) <= 0 {
+			return errorx.NewBiz(fmt.Sprintf("获取表信息失败：%s", tableName))
 		}
 		tabInfo := dbi.Table{
 			TableName:    tableName,
@@ -293,7 +309,7 @@ func (d *dbAppImpl) DumpDb(ctx context.Context, reqParam *DumpDbReq) error {
 				quoteColNames = append(quoteColNames, dbMeta.QuoteIdentifier(col.ColumnName))
 			}
 
-			_ = dbConn.WalkTableRows(ctx, quoteTableName, func(row map[string]any, _ []*dbi.QueryColumn) error {
+			_, _ = dbConn.WalkTableRows(ctx, quoteTableName, func(row map[string]any, _ []*dbi.QueryColumn) error {
 				rowValues := make([]string, len(columnMap[tableName]))
 				for i, col := range columnMap[tableName] {
 					rowValues[i] = dataHelper.WrapValue(row[col.ColumnName], dataHelper.GetDataType(string(col.DataType)))
@@ -309,7 +325,9 @@ func (d *dbAppImpl) DumpDb(ctx context.Context, reqParam *DumpDbReq) error {
 		}
 
 		indexs, err := dbMeta.GetTableIndex(tableName)
-		biz.ErrIsNil(err)
+		if err != nil {
+			return err
+		}
 
 		if len(indexs) > 0 {
 			// 最后添加索引
diff --git a/server/internal/db/application/db_data_sync.go b/server/internal/db/application/db_data_sync.go
index 824c9c0e..973539c1 100644
--- a/server/internal/db/application/db_data_sync.go
+++ b/server/internal/db/application/db_data_sync.go
@@ -243,7 +243,7 @@ func (app *dataSyncAppImpl) doDataSync(ctx context.Context, sql string, task *en
 		updFieldName = strings.Split(task.UpdField, ".")[1]
 	}
 
-	err = srcConn.WalkQueryRows(context.Background(), sql, func(row map[string]any, columns []*dbi.QueryColumn) error {
+	_, err = srcConn.WalkQueryRows(context.Background(), sql, func(row map[string]any, columns []*dbi.QueryColumn) error {
 		if len(queryColumns) == 0 {
 			queryColumns = columns
 
diff --git a/server/internal/db/application/db_instance.go b/server/internal/db/application/db_instance.go
index 5590cdf2..9ec5f9a8 100644
--- a/server/internal/db/application/db_instance.go
+++ b/server/internal/db/application/db_instance.go
@@ -13,15 +13,18 @@ import (
 	"mayfly-go/pkg/base"
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/errorx"
+	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/structx"
 
 	"gorm.io/gorm"
 )
 
 type SaveDbInstanceParam struct {
-	DbInstance *entity.DbInstance
-	AuthCerts  []*tagentity.ResourceAuthCert
+	DbInstance   *entity.DbInstance
+	AuthCerts    []*tagentity.ResourceAuthCert
+	TagCodePaths []string
 }
 
 type Instance interface {
@@ -34,13 +37,13 @@ type Instance interface {
 
 	TestConn(instanceEntity *entity.DbInstance, authCert *tagentity.ResourceAuthCert) error
 
-	SaveDbInstance(ctx context.Context, instance *SaveDbInstanceParam) error
+	SaveDbInstance(ctx context.Context, instance *SaveDbInstanceParam) (uint64, error)
 
 	// Delete 删除数据库信息
 	Delete(ctx context.Context, id uint64) error
 
 	// GetDatabases 获取数据库实例的所有数据库列表
-	GetDatabases(entity *entity.DbInstance, authCertName string) ([]string, error)
+	GetDatabases(entity *entity.DbInstance, authCert *tagentity.ResourceAuthCert) ([]string, error)
 
 	// ToDbInfo 根据实例与授权凭证返回对应的DbInfo
 	ToDbInfo(instance *entity.DbInstance, authCertName string, database string) (*dbi.DbInfo, error)
@@ -49,6 +52,7 @@ type Instance interface {
 type instanceAppImpl struct {
 	base.AppImpl[*entity.DbInstance, repository.Instance]
 
+	tagApp              tagapp.TagTree          `inject:"TagTreeApp"`
 	resourceAuthCertApp tagapp.ResourceAuthCert `inject:"ResourceAuthCertApp"`
 	dbApp               Db                      `inject:"DbApp"`
 	backupApp           *DbBackupApp            `inject:"DbBackupApp"`
@@ -93,15 +97,16 @@ func (app *instanceAppImpl) TestConn(instanceEntity *entity.DbInstance, authCert
 	return nil
 }
 
-func (app *instanceAppImpl) SaveDbInstance(ctx context.Context, instance *SaveDbInstanceParam) error {
+func (app *instanceAppImpl) SaveDbInstance(ctx context.Context, instance *SaveDbInstanceParam) (uint64, error) {
 	instanceEntity := instance.DbInstance
 	// 默认tcp连接
 	instanceEntity.Network = instanceEntity.GetNetwork()
 	resourceType := consts.ResourceTypeDb
 	authCerts := instance.AuthCerts
+	tagCodePaths := instance.TagCodePaths
 
 	if len(authCerts) == 0 {
-		return errorx.NewBiz("授权凭证信息不能为空")
+		return 0, errorx.NewBiz("授权凭证信息不能为空")
 	}
 
 	// 查找是否存在该库
@@ -114,13 +119,13 @@ func (app *instanceAppImpl) SaveDbInstance(ctx context.Context, instance *SaveDb
 	err := app.GetBy(oldInstance)
 	if instanceEntity.Id == 0 {
 		if err == nil {
-			return errorx.NewBiz("该数据库实例已存在")
+			return 0, errorx.NewBiz("该数据库实例已存在")
 		}
 		if app.CountByCond(&entity.DbInstance{Code: instanceEntity.Code}) > 0 {
-			return errorx.NewBiz("该编码已存在")
+			return 0, errorx.NewBiz("该编码已存在")
 		}
 
-		return app.Tx(ctx, func(ctx context.Context) error {
+		return instanceEntity.Id, app.Tx(ctx, func(ctx context.Context) error {
 			return app.Insert(ctx, instanceEntity)
 		}, func(ctx context.Context) error {
 			return app.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
@@ -128,15 +133,19 @@ func (app *instanceAppImpl) SaveDbInstance(ctx context.Context, instance *SaveDb
 				ResourceType: tagentity.TagType(resourceType),
 				AuthCerts:    authCerts,
 			})
+		}, func(ctx context.Context) error {
+			return app.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
+				ResourceTag:        app.genDbInstanceResourceTag(instanceEntity, authCerts),
+				ParentTagCodePaths: tagCodePaths,
+			})
 		})
-
 	}
 
 	// 如果存在该库，则校验修改的库是否为该库
 	if err == nil && oldInstance.Id != instanceEntity.Id {
-		return errorx.NewBiz("该数据库实例已存在")
+		return 0, errorx.NewBiz("该数据库实例已存在")
 	}
-	return app.Tx(ctx, func(ctx context.Context) error {
+	return oldInstance.Id, app.Tx(ctx, func(ctx context.Context) error {
 		return app.UpdateById(ctx, instanceEntity)
 	}, func(ctx context.Context) error {
 		return app.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
@@ -144,6 +153,16 @@ func (app *instanceAppImpl) SaveDbInstance(ctx context.Context, instance *SaveDb
 			ResourceType: tagentity.TagType(resourceType),
 			AuthCerts:    authCerts,
 		})
+	}, func(ctx context.Context) error {
+		if instanceEntity.Name != oldInstance.Name {
+			if err := app.tagApp.UpdateTagName(ctx, tagentity.TagTypeDb, oldInstance.Code, instanceEntity.Name); err != nil {
+				return err
+			}
+		}
+		return app.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
+			ResourceTag:        app.genDbInstanceResourceTag(instanceEntity, authCerts),
+			ParentTagCodePaths: tagCodePaths,
+		})
 	})
 }
 
@@ -200,16 +219,31 @@ func (app *instanceAppImpl) Delete(ctx context.Context, instanceId uint64) error
 			ResourceCode: instance.Code,
 			ResourceType: tagentity.TagType(consts.ResourceTypeDb),
 		})
+	}, func(ctx context.Context) error {
+		return app.tagApp.DeleteTagByParam(ctx, &tagapp.DelResourceTagParam{
+			ResourceCode: instance.Code,
+			ResourceType: tagentity.TagType(consts.ResourceTypeDb),
+		})
 	})
 }
 
-func (app *instanceAppImpl) GetDatabases(ed *entity.DbInstance, authCertName string) ([]string, error) {
-	ed.Network = ed.GetNetwork()
-	dbi, err := app.ToDbInfo(ed, authCertName, "")
-	if err != nil {
-		return nil, err
+func (app *instanceAppImpl) GetDatabases(ed *entity.DbInstance, authCert *tagentity.ResourceAuthCert) ([]string, error) {
+	if authCert.Id != 0 {
+		// 密文可能被清除，故需要重新获取
+		authCert, _ = app.resourceAuthCertApp.GetAuthCert(authCert.Name)
+	} else {
+		if authCert.CiphertextType == tagentity.AuthCertCiphertextTypePublic {
+			publicAuthCert, err := app.resourceAuthCertApp.GetAuthCert(authCert.Ciphertext)
+			if err != nil {
+				return nil, err
+			}
+			authCert = publicAuthCert
+		}
 	}
 
+	ed.Network = ed.GetNetwork()
+	dbi := app.toDbInfoByAc(ed, authCert, "")
+
 	dbConn, err := dbm.Conn(dbi)
 	if err != nil {
 		return nil, err
@@ -238,3 +272,41 @@ func (app *instanceAppImpl) toDbInfoByAc(instance *entity.DbInstance, ac *tagent
 	di.Password = ac.Ciphertext
 	return di
 }
+
+func (m *instanceAppImpl) genDbInstanceResourceTag(me *entity.DbInstance, authCerts []*tagentity.ResourceAuthCert) *tagapp.ResourceTag {
+	authCertTags := collx.ArrayMap[*tagentity.ResourceAuthCert, *tagapp.ResourceTag](authCerts, func(val *tagentity.ResourceAuthCert) *tagapp.ResourceTag {
+		return &tagapp.ResourceTag{
+			Code: val.Name,
+			Name: val.Username,
+			Type: tagentity.TagTypeDbAuthCert,
+		}
+	})
+
+	var dbs []*entity.Db
+	if err := m.dbApp.ListByCond(&entity.Db{
+		InstanceId: me.Id,
+	}, &dbs); err != nil {
+		logx.Errorf("获取实例关联的数据库失败: %v", err)
+	}
+
+	authCertName2DbTags := make(map[string][]*tagapp.ResourceTag)
+	for _, db := range dbs {
+		authCertName2DbTags[db.AuthCertName] = append(authCertName2DbTags[db.AuthCertName], &tagapp.ResourceTag{
+			Code: db.Code,
+			Name: db.Name,
+			Type: tagentity.TagTypeDbName,
+		})
+	}
+
+	// 将数据库挂至授权凭证下
+	for _, ac := range authCertTags {
+		ac.Children = authCertName2DbTags[ac.Code]
+	}
+
+	return &tagapp.ResourceTag{
+		Code:     me.Code,
+		Type:     tagentity.TagTypeDb,
+		Name:     me.Name,
+		Children: authCertTags,
+	}
+}
diff --git a/server/internal/db/application/db_sql_exec.go b/server/internal/db/application/db_sql_exec.go
index ecc8d891..3a661ced 100644
--- a/server/internal/db/application/db_sql_exec.go
+++ b/server/internal/db/application/db_sql_exec.go
@@ -294,7 +294,7 @@ func (d *dbSqlExecAppImpl) doUpdate(ctx context.Context, update *sqlparser.Updat
 	maxRec := 200
 	nowRec := 0
 	res := make([]map[string]any, 0)
-	err = dbConn.WalkQueryRows(ctx, selectSql, func(row map[string]any, columns []*dbi.QueryColumn) error {
+	_, err = dbConn.WalkQueryRows(ctx, selectSql, func(row map[string]any, columns []*dbi.QueryColumn) error {
 		nowRec++
 		res = append(res, row)
 		if nowRec == maxRec {
diff --git a/server/internal/db/application/db_transfer.go b/server/internal/db/application/db_transfer.go
index a5159756..82156a46 100644
--- a/server/internal/db/application/db_transfer.go
+++ b/server/internal/db/application/db_transfer.go
@@ -277,7 +277,7 @@ func (app *dbTransferAppImpl) transferData(ctx context.Context, logId uint64, ta
 	logExtraKey := fmt.Sprintf("`%s` 当前已迁移数据量: ", tableName)
 
 	// 游标查询源表数据，并批量插入目标表
-	err = srcConn.WalkTableRows(context.Background(), tableName, func(row map[string]any, columns []*dbi.QueryColumn) error {
+	_, err = srcConn.WalkTableRows(context.Background(), tableName, func(row map[string]any, columns []*dbi.QueryColumn) error {
 		total++
 		rawValue := map[string]any{}
 		for _, column := range columns {
diff --git a/server/internal/db/dbm/dbi/conn.go b/server/internal/db/dbm/dbi/conn.go
index 83775af8..fa386922 100644
--- a/server/internal/db/dbm/dbi/conn.go
+++ b/server/internal/db/dbm/dbi/conn.go
@@ -39,12 +39,7 @@ func (d *DbConn) Query(querySql string, args ...any) ([]*QueryColumn, []map[stri
 // 依次返回 列信息数组(顺序)，结果map，错误
 func (d *DbConn) QueryContext(ctx context.Context, querySql string, args ...any) ([]*QueryColumn, []map[string]any, error) {
 	result := make([]map[string]any, 0, 16)
-	var queryColumns []*QueryColumn
-
-	err := d.WalkQueryRows(ctx, querySql, func(row map[string]any, columns []*QueryColumn) error {
-		if len(queryColumns) == 0 {
-			queryColumns = columns
-		}
+	cols, err := d.WalkQueryRows(ctx, querySql, func(row map[string]any, columns []*QueryColumn) error {
 		result = append(result, row)
 		return nil
 	}, args...)
@@ -53,7 +48,7 @@ func (d *DbConn) QueryContext(ctx context.Context, querySql string, args ...any)
 		return nil, nil, wrapSqlError(err)
 	}
 
-	return queryColumns, result, nil
+	return cols, result, nil
 }
 
 // 将查询结果映射至struct，可具体参考sqlx库
@@ -73,12 +68,12 @@ func (d *DbConn) Query2Struct(execSql string, dest any) error {
 }
 
 // WalkQueryRows 游标方式遍历查询结果集, walkFn返回error不为nil, 则跳出遍历并取消查询
-func (d *DbConn) WalkQueryRows(ctx context.Context, querySql string, walkFn WalkQueryRowsFunc, args ...any) error {
+func (d *DbConn) WalkQueryRows(ctx context.Context, querySql string, walkFn WalkQueryRowsFunc, args ...any) ([]*QueryColumn, error) {
 	return walkQueryRows(ctx, d.db, querySql, walkFn, args...)
 }
 
 // WalkTableRows 游标方式遍历指定表的结果集, walkFn返回error不为nil, 则跳出遍历并取消查询
-func (d *DbConn) WalkTableRows(ctx context.Context, tableName string, walkFn WalkQueryRowsFunc) error {
+func (d *DbConn) WalkTableRows(ctx context.Context, tableName string, walkFn WalkQueryRowsFunc) ([]*QueryColumn, error) {
 	return d.WalkQueryRows(ctx, fmt.Sprintf("SELECT * FROM %s", tableName), walkFn)
 }
 
@@ -152,13 +147,13 @@ func (d *DbConn) Close() {
 }
 
 // 游标方式遍历查询rows, walkFn error不为nil, 则跳出遍历
-func walkQueryRows(ctx context.Context, db *sql.DB, selectSql string, walkFn WalkQueryRowsFunc, args ...any) error {
+func walkQueryRows(ctx context.Context, db *sql.DB, selectSql string, walkFn WalkQueryRowsFunc, args ...any) ([]*QueryColumn, error) {
 	cancelCtx, cancelFunc := context.WithCancel(ctx)
 	defer cancelFunc()
 
 	rows, err := db.QueryContext(cancelCtx, selectSql, args...)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	// rows对象一定要close掉，如果出错，不关掉则会很迅速的达到设置最大连接数，
 	// 后面的链接过来直接报错或拒绝，实际上也没有起效果
@@ -166,7 +161,7 @@ func walkQueryRows(ctx context.Context, db *sql.DB, selectSql string, walkFn Wal
 
 	colTypes, err := rows.ColumnTypes()
 	if err != nil {
-		return err
+		return nil, err
 	}
 	lenCols := len(colTypes)
 	// 列名用于前端表头名称按照数据库与查询字段顺序显示
@@ -189,7 +184,7 @@ func walkQueryRows(ctx context.Context, db *sql.DB, selectSql string, walkFn Wal
 	for rows.Next() {
 		// 不Scan也会导致等待，该链接实际处于未工作的状态，然后也会导致连接数迅速达到最大
 		if err := rows.Scan(scans...); err != nil {
-			return err
+			return cols, err
 		}
 		// 每行数据
 		rowData := make(map[string]any, lenCols)
@@ -200,11 +195,11 @@ func walkQueryRows(ctx context.Context, db *sql.DB, selectSql string, walkFn Wal
 		if err = walkFn(rowData, cols); err != nil {
 			logx.ErrorfContext(ctx, "[%s]游标遍历查询结果集出错, 退出遍历: %s", selectSql, err.Error())
 			cancelFunc()
-			return err
+			return cols, err
 		}
 	}
 
-	return nil
+	return cols, nil
 }
 
 // 将查询的值转为对应列类型的实际值，不全部转为字符串
diff --git a/server/internal/db/domain/entity/query.go b/server/internal/db/domain/entity/query.go
index d12625ab..d6013499 100644
--- a/server/internal/db/domain/entity/query.go
+++ b/server/internal/db/domain/entity/query.go
@@ -2,10 +2,12 @@ package entity
 
 // InstanceQuery 数据库实例查询
 type InstanceQuery struct {
-	Id   uint64 `json:"id" form:"id"`
-	Name string `json:"name" form:"name"`
-	Code string `json:"code" form:"code"`
-	Host string `json:"host" form:"host"`
+	Id      uint64 `json:"id" form:"id"`
+	Name    string `json:"name" form:"name"`
+	Code    string `json:"code" form:"code"`
+	Host    string `json:"host" form:"host"`
+	TagPath string `json:"host" form:"tagPath"`
+	Codes   []string
 }
 
 type DataSyncTaskQuery struct {
diff --git a/server/internal/db/infrastructure/persistence/instance.go b/server/internal/db/infrastructure/persistence/instance.go
index 3e3b4a5c..883aa1ed 100644
--- a/server/internal/db/infrastructure/persistence/instance.go
+++ b/server/internal/db/infrastructure/persistence/instance.go
@@ -22,6 +22,7 @@ func (d *instanceRepoImpl) GetInstanceList(condition *entity.InstanceQuery, page
 		Eq("id", condition.Id).
 		Eq("host", condition.Host).
 		Like("name", condition.Name).
-		Like("code", condition.Code)
+		Like("code", condition.Code).
+		In("code", condition.Codes)
 	return gormx.PageQuery(qd, pageParam, toEntity)
 }
diff --git a/server/internal/db/router/instance.go b/server/internal/db/router/instance.go
index 14335262..1656ebf7 100644
--- a/server/internal/db/router/instance.go
+++ b/server/internal/db/router/instance.go
@@ -26,7 +26,7 @@ func InitInstanceRouter(router *gin.RouterGroup) {
 		req.NewGet(":instanceId", d.GetInstance),
 
 		// 获取数据库实例的所有数据库名
-		req.NewGet(":instanceId/databases", d.GetDatabaseNames),
+		req.NewPost("/databases", d.GetDatabaseNames),
 
 		req.NewGet(":instanceId/server-info", d.GetDbServer),
 
diff --git a/server/internal/machine/api/dashbord.go b/server/internal/machine/api/dashbord.go
index 519e4f67..a8bf89a9 100644
--- a/server/internal/machine/api/dashbord.go
+++ b/server/internal/machine/api/dashbord.go
@@ -9,21 +9,17 @@ import (
 )
 
 type Dashbord struct {
-	ResourceAuthCertApp tagapp.ResourceAuthCert `inject:""`
-	MachineApp          application.Machine     `inject:""`
+	TagTreeApp tagapp.TagTree      `inject:""`
+	MachineApp application.Machine `inject:""`
 }
 
 func (m *Dashbord) Dashbord(rc *req.Ctx) {
 	accountId := rc.GetLoginAccount().Id
 
-	machienAuthCerts := m.ResourceAuthCertApp.GetAccountAuthCert(accountId, tagentity.TagTypeMachineAuthCert)
-	machineCodes := collx.ArrayMap(machienAuthCerts, func(ac *tagentity.ResourceAuthCert) string {
-		return ac.ResourceCode
-	})
-
-	machienNum := len(collx.ArrayDeduplicate(machineCodes))
+	tagCodePaths := m.TagTreeApp.GetAccountTagCodePaths(accountId, tagentity.TagTypeMachineAuthCert, "")
+	machineCodes := tagentity.GetCodeByPath(tagentity.TagTypeMachine, tagCodePaths...)
 
 	rc.ResData = collx.M{
-		"machineNum": machienNum,
+		"machineNum": len(machineCodes),
 	}
 }
diff --git a/server/internal/machine/api/form/form.go b/server/internal/machine/api/form/form.go
index 5592465e..5045adb1 100644
--- a/server/internal/machine/api/form/form.go
+++ b/server/internal/machine/api/form/form.go
@@ -10,8 +10,8 @@ type MachineForm struct {
 	Ip       string `json:"ip" binding:"required"`   // IP地址
 	Port     int    `json:"port" binding:"required"` // 端口号
 
-	TagId     []uint64                      `json:"tagId" binding:"required"`
-	AuthCerts []*tagentity.ResourceAuthCert `json:"authCerts" binding:"required"` // 资产授权凭证信息列表
+	TagCodePaths []string                      `json:"tagCodePaths" binding:"required"`
+	AuthCerts    []*tagentity.ResourceAuthCert `json:"authCerts" binding:"required"` // 资产授权凭证信息列表
 
 	Remark             string `json:"remark"`
 	SshTunnelMachineId int    `json:"sshTunnelMachineId"` // ssh隧道机器id
diff --git a/server/internal/machine/api/machine.go b/server/internal/machine/api/machine.go
index 44adb098..45d3d1ce 100644
--- a/server/internal/machine/api/machine.go
+++ b/server/internal/machine/api/machine.go
@@ -42,16 +42,14 @@ type Machine struct {
 func (m *Machine) Machines(rc *req.Ctx) {
 	condition, pageParam := req.BindQueryAndPage(rc, new(entity.MachineQuery))
 
-	authCerts := m.ResourceAuthCertApp.GetAccountAuthCert(rc.GetLoginAccount().Id, tagentity.TagTypeMachineAuthCert, condition.TagPath)
-	// 不存在可操作的授权凭证，即没有可操作数据
-	if len(authCerts) == 0 {
+	tagCodePaths := m.TagApp.GetAccountTagCodePaths(rc.GetLoginAccount().Id, tagentity.TagTypeMachineAuthCert, condition.TagPath)
+	// 不存在可操作的机器-授权凭证标签，即没有可操作数据
+	if len(tagCodePaths) == 0 {
 		rc.ResData = model.EmptyPageResult[any]()
 		return
 	}
 
-	machineCodes := collx.ArrayMap(authCerts, func(ac *tagentity.ResourceAuthCert) string {
-		return ac.ResourceCode
-	})
+	machineCodes := tagentity.GetCodeByPath(tagentity.TagTypeMachine, tagCodePaths...)
 	condition.Codes = collx.ArrayDeduplicate(machineCodes)
 
 	var machinevos []*vo.MachineVO
@@ -68,7 +66,7 @@ func (m *Machine) Machines(rc *req.Ctx) {
 	})...)
 
 	// 填充授权凭证信息
-	m.ResourceAuthCertApp.FillAuthCertByAcs(authCerts, collx.ArrayMap(machinevos, func(mvo *vo.MachineVO) tagentity.IAuthCert {
+	m.ResourceAuthCertApp.FillAuthCertByAcNames(tagentity.GetCodeByPath(tagentity.TagTypeMachineAuthCert, tagCodePaths...), collx.ArrayMap(machinevos, func(mvo *vo.MachineVO) tagentity.IAuthCert {
 		return mvo
 	})...)
 
@@ -99,9 +97,9 @@ func (m *Machine) SaveMachine(rc *req.Ctx) {
 	rc.ReqParam = machineForm
 
 	biz.ErrIsNil(m.MachineApp.SaveMachine(rc.MetaCtx, &application.SaveMachineParam{
-		Machine:   me,
-		TagIds:    machineForm.TagId,
-		AuthCerts: machineForm.AuthCerts,
+		Machine:      me,
+		TagCodePaths: machineForm.TagCodePaths,
+		AuthCerts:    machineForm.AuthCerts,
 	}))
 }
 
diff --git a/server/internal/machine/application/machine.go b/server/internal/machine/application/machine.go
index 49138e88..e73eef64 100644
--- a/server/internal/machine/application/machine.go
+++ b/server/internal/machine/application/machine.go
@@ -17,12 +17,13 @@ import (
 	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/scheduler"
+	"mayfly-go/pkg/utils/collx"
 )
 
 type SaveMachineParam struct {
-	Machine   *entity.Machine
-	TagIds    []uint64
-	AuthCerts []*tagentity.ResourceAuthCert
+	Machine      *entity.Machine
+	TagCodePaths []string
+	AuthCerts    []*tagentity.ResourceAuthCert
 }
 
 type Machine interface {
@@ -81,7 +82,7 @@ func (m *machineAppImpl) GetMachineList(condition *entity.MachineQuery, pagePara
 
 func (m *machineAppImpl) SaveMachine(ctx context.Context, param *SaveMachineParam) error {
 	me := param.Machine
-	tagIds := param.TagIds
+	tagCodePaths := param.TagCodePaths
 	authCerts := param.AuthCerts
 	resourceType := tagentity.TagTypeMachine
 
@@ -107,29 +108,20 @@ func (m *machineAppImpl) SaveMachine(ctx context.Context, param *SaveMachinePara
 		// 新增机器，默认启用状态
 		me.Status = entity.MachineStatusEnable
 
-		if err := m.Tx(ctx, func(ctx context.Context) error {
+		return m.Tx(ctx, func(ctx context.Context) error {
 			return m.Insert(ctx, me)
-		}, func(ctx context.Context) error {
-			return m.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-				Code:         me.Code,
-				Type:         resourceType,
-				ParentTagIds: tagIds,
-			})
 		}, func(ctx context.Context) error {
 			return m.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
 				ResourceCode: me.Code,
 				ResourceType: resourceType,
 				AuthCerts:    authCerts,
 			})
-		}); err != nil {
-			return err
-		}
 
-		// 事务问题，导致可能删除或新增的标签数据不可见，造成数据错误，故单独执行。若万一失败，可授权凭证管理处添加
-		return m.resourceAuthCertApp.RelateAuthCert2ResourceTag(ctx, &tagapp.RelateAuthCertParam{
-			ResourceCode: me.Code,
-			ResourceType: resourceType,
-			AuthCerts:    authCerts,
+		}, func(ctx context.Context) error {
+			return m.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
+				ResourceTag:        m.genMachineResourceTag(me, authCerts),
+				ParentTagCodePaths: tagCodePaths,
+			})
 		})
 	}
 
@@ -146,29 +138,23 @@ func (m *machineAppImpl) SaveMachine(ctx context.Context, param *SaveMachinePara
 	mcm.DeleteCli(me.Id)
 	// 防止误传修改
 	me.Code = ""
-	if err := m.Tx(ctx, func(ctx context.Context) error {
+	return m.Tx(ctx, func(ctx context.Context) error {
 		return m.UpdateById(ctx, me)
 	}, func(ctx context.Context) error {
-		return m.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-			Code:         oldMachine.Code,
-			Type:         resourceType,
-			ParentTagIds: tagIds,
-		})
-	}); err != nil {
-		return err
-	}
-
-	return m.Tx(ctx, func(ctx context.Context) error {
 		return m.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
 			ResourceCode: oldMachine.Code,
 			ResourceType: resourceType,
 			AuthCerts:    authCerts,
 		})
 	}, func(ctx context.Context) error {
-		return m.resourceAuthCertApp.RelateAuthCert2ResourceTag(ctx, &tagapp.RelateAuthCertParam{
-			ResourceCode: oldMachine.Code,
-			ResourceType: resourceType,
-			AuthCerts:    authCerts,
+		if oldMachine.Name != me.Name {
+			if err := m.tagApp.UpdateTagName(ctx, tagentity.TagTypeMachine, oldMachine.Code, me.Name); err != nil {
+				return err
+			}
+		}
+		return m.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
+			ResourceTag:        m.genMachineResourceTag(oldMachine, authCerts),
+			ParentTagCodePaths: tagCodePaths,
 		})
 	})
 }
@@ -230,19 +216,16 @@ func (m *machineAppImpl) Delete(ctx context.Context, id uint64) error {
 			return m.DeleteById(ctx, id)
 		}, func(ctx context.Context) error {
 			return m.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-				Code: machine.Code,
-				Type: resourceType,
+				ResourceTag: &tagapp.ResourceTag{
+					Code: machine.Code,
+					Type: tagentity.TagTypeMachine,
+				},
 			})
 		}, func(ctx context.Context) error {
 			return m.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
 				ResourceCode: machine.Code,
 				ResourceType: resourceType,
 			})
-		}, func(ctx context.Context) error {
-			return m.resourceAuthCertApp.RelateAuthCert2ResourceTag(ctx, &tagapp.RelateAuthCertParam{
-				ResourceCode: machine.Code,
-				ResourceType: resourceType,
-			})
 		})
 }
 
@@ -362,6 +345,7 @@ func (m *machineAppImpl) toMi(me *entity.Machine, authCert *tagentity.ResourceAu
 	mi.EnableRecorder = me.EnableRecorder
 	mi.Protocol = me.Protocol
 
+	mi.AuthCertName = authCert.Name
 	mi.Username = authCert.Username
 	mi.Password = authCert.Ciphertext
 	mi.Passphrase = authCert.GetExtraString(tagentity.ExtraKeyPassphrase)
@@ -377,3 +361,20 @@ func (m *machineAppImpl) toMi(me *entity.Machine, authCert *tagentity.ResourceAu
 	}
 	return mi, nil
 }
+
+func (m *machineAppImpl) genMachineResourceTag(me *entity.Machine, authCerts []*tagentity.ResourceAuthCert) *tagapp.ResourceTag {
+	authCertTags := collx.ArrayMap[*tagentity.ResourceAuthCert, *tagapp.ResourceTag](authCerts, func(val *tagentity.ResourceAuthCert) *tagapp.ResourceTag {
+		return &tagapp.ResourceTag{
+			Code: val.Name,
+			Name: val.Username,
+			Type: tagentity.TagTypeMachineAuthCert,
+		}
+	})
+
+	return &tagapp.ResourceTag{
+		Code:     me.Code,
+		Type:     tagentity.TagTypeMachine,
+		Name:     me.Name,
+		Children: authCertTags,
+	}
+}
diff --git a/server/internal/mongo/api/form/mongo.go b/server/internal/mongo/api/form/mongo.go
index 0ac1ed16..56dee138 100644
--- a/server/internal/mongo/api/form/mongo.go
+++ b/server/internal/mongo/api/form/mongo.go
@@ -2,11 +2,11 @@ package form
 
 type Mongo struct {
 	Id                 uint64   `json:"id"`
-	Code               uint64   `json:"code" binding:"required"`
+	Code               string   `json:"code" binding:"required"`
 	Uri                string   `binding:"required" json:"uri"`
 	SshTunnelMachineId int      `json:"sshTunnelMachineId"` // ssh隧道机器id
 	Name               string   `binding:"required" json:"name"`
-	TagId              []uint64 `binding:"required" json:"tagId"`
+	TagCodePaths       []string `binding:"required" json:"tagCodePaths"`
 }
 
 type MongoCommand struct {
diff --git a/server/internal/mongo/api/mongo.go b/server/internal/mongo/api/mongo.go
index 0bc2c334..e7edc04f 100644
--- a/server/internal/mongo/api/mongo.go
+++ b/server/internal/mongo/api/mongo.go
@@ -67,7 +67,7 @@ func (m *Mongo) Save(rc *req.Ctx) {
 	}(form.Uri)
 	rc.ReqParam = form
 
-	biz.ErrIsNil(m.MongoApp.SaveMongo(rc.MetaCtx, mongo, form.TagId...))
+	biz.ErrIsNil(m.MongoApp.SaveMongo(rc.MetaCtx, mongo, form.TagCodePaths...))
 }
 
 func (m *Mongo) DeleteMongo(rc *req.Ctx) {
diff --git a/server/internal/mongo/application/mongo.go b/server/internal/mongo/application/mongo.go
index 77f9e372..78487453 100644
--- a/server/internal/mongo/application/mongo.go
+++ b/server/internal/mongo/application/mongo.go
@@ -21,7 +21,7 @@ type Mongo interface {
 
 	TestConn(entity *entity.Mongo) error
 
-	SaveMongo(ctx context.Context, entity *entity.Mongo, tagIds ...uint64) error
+	SaveMongo(ctx context.Context, entity *entity.Mongo, tagCodePaths ...string) error
 
 	// 删除数据库信息
 	Delete(ctx context.Context, id uint64) error
@@ -59,10 +59,10 @@ func (d *mongoAppImpl) Delete(ctx context.Context, id uint64) error {
 			return d.DeleteById(ctx, id)
 		},
 		func(ctx context.Context) error {
-			return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
+			return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{ResourceTag: &tagapp.ResourceTag{
 				Type: tagentity.TagTypeMongo,
 				Code: mongoEntity.Code,
-			})
+			}})
 		})
 }
 
@@ -75,7 +75,7 @@ func (d *mongoAppImpl) TestConn(me *entity.Mongo) error {
 	return nil
 }
 
-func (d *mongoAppImpl) SaveMongo(ctx context.Context, m *entity.Mongo, tagIds ...uint64) error {
+func (d *mongoAppImpl) SaveMongo(ctx context.Context, m *entity.Mongo, tagCodePaths ...string) error {
 	oldMongo := &entity.Mongo{Name: m.Name, SshTunnelMachineId: m.SshTunnelMachineId}
 	err := d.GetBy(oldMongo)
 
@@ -91,9 +91,11 @@ func (d *mongoAppImpl) SaveMongo(ctx context.Context, m *entity.Mongo, tagIds ..
 			return d.Insert(ctx, m)
 		}, func(ctx context.Context) error {
 			return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-				Type:         tagentity.TagTypeMongo,
-				Code:         m.Code,
-				ParentTagIds: tagIds,
+				ResourceTag: &tagapp.ResourceTag{
+					Type: tagentity.TagTypeMongo,
+					Code: m.Code,
+				},
+				ParentTagCodePaths: tagCodePaths,
 			})
 		})
 	}
@@ -113,10 +115,18 @@ func (d *mongoAppImpl) SaveMongo(ctx context.Context, m *entity.Mongo, tagIds ..
 	return d.Tx(ctx, func(ctx context.Context) error {
 		return d.UpdateById(ctx, m)
 	}, func(ctx context.Context) error {
+		if oldMongo.Name != m.Name {
+			if err := d.tagApp.UpdateTagName(ctx, tagentity.TagTypeMachine, oldMongo.Code, m.Name); err != nil {
+				return err
+			}
+		}
+
 		return d.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-			Type:         tagentity.TagTypeMongo,
-			Code:         oldMongo.Code,
-			ParentTagIds: tagIds,
+			ResourceTag: &tagapp.ResourceTag{
+				Type: tagentity.TagTypeMongo,
+				Code: oldMongo.Code,
+			},
+			ParentTagCodePaths: tagCodePaths,
 		})
 	})
 }
diff --git a/server/internal/redis/api/form/redis.go b/server/internal/redis/api/form/redis.go
index c0c2b7bc..487b7fc1 100644
--- a/server/internal/redis/api/form/redis.go
+++ b/server/internal/redis/api/form/redis.go
@@ -10,7 +10,7 @@ type Redis struct {
 	Mode               string   `json:"mode"`
 	Db                 string   `json:"db"`
 	SshTunnelMachineId int      `json:"sshTunnelMachineId"` // ssh隧道机器id
-	TagId              []uint64 `binding:"required" json:"tagId"`
+	TagCodePaths       []string `binding:"required" json:"tagCodePaths"`
 	Remark             string   `json:"remark"`
 	FlowProcdefKey     string   `json:"flowProcdefKey"` // 审批流-流程定义key（有值则说明关键操作需要进行审批执行）,使用指针为了方便更新空字符串(取消流程审批)
 }
diff --git a/server/internal/redis/api/redis.go b/server/internal/redis/api/redis.go
index 2f5e86d2..0bea5e12 100644
--- a/server/internal/redis/api/redis.go
+++ b/server/internal/redis/api/redis.go
@@ -55,8 +55,7 @@ func (r *Redis) TestConn(rc *req.Ctx) {
 	redis := req.BindJsonAndCopyTo[*entity.Redis](rc, form, new(entity.Redis))
 
 	biz.ErrIsNil(r.RedisApp.TestConn(&application.SaveRedisParam{
-		Redis:  redis,
-		TagIds: form.TagId,
+		Redis: redis,
 		AuthCert: &tagentity.ResourceAuthCert{
 			Name:           fmt.Sprintf("redis_%s_ac", redis.Code),
 			Username:       form.Username,
@@ -76,8 +75,8 @@ func (r *Redis) Save(rc *req.Ctx) {
 	rc.ReqParam = form
 
 	redisParam := &application.SaveRedisParam{
-		Redis:  redis,
-		TagIds: form.TagId,
+		Redis:        redis,
+		TagCodePaths: form.TagCodePaths,
 		AuthCert: &tagentity.ResourceAuthCert{
 			Name:           fmt.Sprintf("redis_%s_ac", redis.Code),
 			Username:       form.Username,
diff --git a/server/internal/redis/application/redis.go b/server/internal/redis/application/redis.go
index f13a2992..64dbf00a 100644
--- a/server/internal/redis/application/redis.go
+++ b/server/internal/redis/application/redis.go
@@ -24,9 +24,9 @@ import (
 )
 
 type SaveRedisParam struct {
-	Redis    *entity.Redis
-	AuthCert *tagentity.ResourceAuthCert
-	TagIds   []uint64
+	Redis        *entity.Redis
+	AuthCert     *tagentity.ResourceAuthCert
+	TagCodePaths []string
 }
 
 type RunCmdParam struct {
@@ -109,7 +109,7 @@ func (r *redisAppImpl) TestConn(param *SaveRedisParam) error {
 
 func (r *redisAppImpl) SaveRedis(ctx context.Context, param *SaveRedisParam) error {
 	re := param.Redis
-	tagIds := param.TagIds
+	tagCodePaths := param.TagCodePaths
 	// 查找是否存在该库
 	oldRedis := &entity.Redis{
 		Host:               re.Host,
@@ -129,9 +129,12 @@ func (r *redisAppImpl) SaveRedis(ctx context.Context, param *SaveRedisParam) err
 			return r.Insert(ctx, re)
 		}, func(ctx context.Context) error {
 			return r.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-				Type:         tagentity.TagTypeRedis,
-				Code:         re.Code,
-				ParentTagIds: tagIds,
+				ResourceTag: &tagapp.ResourceTag{
+					Type: tagentity.TagTypeRedis,
+					Code: re.Code,
+					Name: re.Name,
+				},
+				ParentTagCodePaths: tagCodePaths,
 			})
 		}, func(ctx context.Context) error {
 			return r.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
@@ -162,10 +165,18 @@ func (r *redisAppImpl) SaveRedis(ctx context.Context, param *SaveRedisParam) err
 	return r.Tx(ctx, func(ctx context.Context) error {
 		return r.UpdateById(ctx, re)
 	}, func(ctx context.Context) error {
+		if oldRedis.Name != re.Name {
+			if err := r.tagApp.UpdateTagName(ctx, tagentity.TagTypeMachine, oldRedis.Code, re.Name); err != nil {
+				return err
+			}
+		}
 		return r.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-			Type:         tagentity.TagTypeRedis,
-			Code:         oldRedis.Code,
-			ParentTagIds: tagIds,
+			ResourceTag: &tagapp.ResourceTag{
+				Type: tagentity.TagTypeRedis,
+				Code: oldRedis.Code,
+				Name: re.Name,
+			},
+			ParentTagCodePaths: tagCodePaths,
 		})
 	}, func(ctx context.Context) error {
 		return r.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
@@ -192,8 +203,10 @@ func (r *redisAppImpl) Delete(ctx context.Context, id uint64) error {
 		return r.DeleteById(ctx, id)
 	}, func(ctx context.Context) error {
 		return r.tagApp.SaveResourceTag(ctx, &tagapp.SaveResourceTagParam{
-			Type: tagentity.TagTypeRedis,
-			Code: re.Code,
+			ResourceTag: &tagapp.ResourceTag{
+				Type: tagentity.TagTypeRedis,
+				Code: re.Code,
+			},
 		})
 	}, func(ctx context.Context) error {
 		return r.resourceAuthCertApp.RelateAuthCert(ctx, &tagapp.RelateAuthCertParam{
diff --git a/server/internal/tag/api/form/tag.go b/server/internal/tag/api/form/tag.go
new file mode 100644
index 00000000..00acddee
--- /dev/null
+++ b/server/internal/tag/api/form/tag.go
@@ -0,0 +1,9 @@
+package form
+
+import "mayfly-go/internal/tag/domain/entity"
+
+type TagTree struct {
+	*entity.TagTree
+
+	Pid uint64 `json:"pid"`
+}
diff --git a/server/internal/tag/api/tag_tree.go b/server/internal/tag/api/tag_tree.go
index 8aa8f5ec..ec0f0d69 100644
--- a/server/internal/tag/api/tag_tree.go
+++ b/server/internal/tag/api/tag_tree.go
@@ -3,6 +3,7 @@ package api
 import (
 	"fmt"
 	"mayfly-go/internal/common/consts"
+	"mayfly-go/internal/tag/api/form"
 	"mayfly-go/internal/tag/api/vo"
 	"mayfly-go/internal/tag/application"
 	"mayfly-go/internal/tag/domain/entity"
@@ -15,8 +16,6 @@ import (
 
 type TagTree struct {
 	TagTreeApp application.TagTree `inject:""`
-
-	ResourceAuthCertApp application.ResourceAuthCert `inject:""`
 }
 
 func (p *TagTree) GetTagTree(rc *req.Ctx) {
@@ -71,12 +70,12 @@ func (p *TagTree) ListByQuery(rc *req.Ctx) {
 }
 
 func (p *TagTree) SaveTagTree(rc *req.Ctx) {
-	tagTree := &entity.TagTree{}
-	req.BindJsonAndValid(rc, tagTree)
+	tagForm := &form.TagTree{}
+	tagTree := req.BindJsonAndCopyTo(rc, tagForm, new(entity.TagTree))
 
 	rc.ReqParam = fmt.Sprintf("tagTreeId: %d, tagName: %s, code: %s", tagTree.Id, tagTree.Name, tagTree.Code)
 
-	biz.ErrIsNil(p.TagTreeApp.Save(rc.MetaCtx, tagTree))
+	biz.ErrIsNil(p.TagTreeApp.SaveTag(rc.MetaCtx, tagForm.Pid, tagTree))
 }
 
 func (p *TagTree) DelTagTree(rc *req.Ctx) {
@@ -103,14 +102,12 @@ func (p *TagTree) CountTagResource(rc *req.Ctx) {
 	tagPath := rc.Query("tagPath")
 	accountId := rc.GetLoginAccount().Id
 
-	machienAuthCerts := p.ResourceAuthCertApp.GetAccountAuthCert(accountId, entity.TagTypeMachineAuthCert, tagPath)
-	machineCodes := collx.ArrayMap(machienAuthCerts, func(ac *entity.ResourceAuthCert) string {
-		return ac.ResourceCode
-	})
+	machineCodes := entity.GetCodeByPath(entity.TagTypeMachine, p.TagTreeApp.GetAccountTagCodePaths(accountId, entity.TagTypeMachineAuthCert, tagPath)...)
+	dbCodes := entity.GetCodeByPath(entity.TagTypeDb, p.TagTreeApp.GetAccountTagCodePaths(accountId, entity.TagTypeDbName, tagPath)...)
 
 	rc.ResData = collx.M{
-		"machine": len(collx.ArrayDeduplicate(machineCodes)),
-		"db":      len(p.TagTreeApp.GetAccountTagCodes(accountId, consts.ResourceTypeDb, tagPath)),
+		"machine": len(machineCodes),
+		"db":      len(dbCodes),
 		"redis":   len(p.TagTreeApp.GetAccountTagCodes(accountId, consts.ResourceTypeRedis, tagPath)),
 		"mongo":   len(p.TagTreeApp.GetAccountTagCodes(accountId, consts.ResourceTypeMongo, tagPath)),
 	}
diff --git a/server/internal/tag/api/vo/tag_tree.go b/server/internal/tag/api/vo/tag_tree.go
index 3b340ac6..07bd0967 100644
--- a/server/internal/tag/api/vo/tag_tree.go
+++ b/server/internal/tag/api/vo/tag_tree.go
@@ -2,38 +2,38 @@ package vo
 
 import (
 	"mayfly-go/internal/tag/domain/entity"
+	"mayfly-go/pkg/utils/collx"
 )
 
 type TagTreeVOS []*entity.TagTree
 
 type TagTreeItem struct {
 	*entity.TagTree
-	Children []TagTreeItem `json:"children"`
+	Children []*TagTreeItem `json:"children"`
 }
 
-func (m *TagTreeVOS) ToTrees(pid uint64) []TagTreeItem {
-	var resourceTree []TagTreeItem
-
-	list := m.findChildren(pid)
-	if len(list) == 0 {
-		return resourceTree
+func (m *TagTreeVOS) ToTrees(pid uint64) []*TagTreeItem {
+	var ttis []*TagTreeItem
+	if len(*m) == 0 {
+		return ttis
 	}
 
-	for _, v := range list {
-		Children := m.ToTrees(v.Id)
-		resourceTree = append(resourceTree, TagTreeItem{v, Children})
-	}
+	ttis = collx.ArrayMap(*m, func(tr *entity.TagTree) *TagTreeItem { return &TagTreeItem{TagTree: tr} })
+	tagMap := collx.ArrayToMap(ttis, func(item *TagTreeItem) string {
+		return item.CodePath
+	})
 
-	return resourceTree
-}
-
-func (m *TagTreeVOS) findChildren(pid uint64) []*entity.TagTree {
-	child := []*entity.TagTree{}
-
-	for _, v := range *m {
-		if v.Pid == pid {
-			child = append(child, v)
+	for _, node := range ttis {
+		// 根节点
+		if node.IsRoot() {
+			continue
+		}
+		parentCodePath := node.GetParentPath(0)
+		parentNode := tagMap[parentCodePath]
+		if parentNode != nil {
+			parentNode.Children = append(parentNode.Children, node)
 		}
 	}
-	return child
+
+	return collx.ArrayFilter(ttis, func(tti *TagTreeItem) bool { return tti.IsRoot() })
 }
diff --git a/server/internal/tag/application/resouce_auth_cert.go b/server/internal/tag/application/resouce_auth_cert.go
index bb780034..3d4ee47a 100644
--- a/server/internal/tag/application/resouce_auth_cert.go
+++ b/server/internal/tag/application/resouce_auth_cert.go
@@ -26,9 +26,6 @@ type ResourceAuthCert interface {
 	// RelateAuthCert 关联资源授权凭证信息
 	RelateAuthCert(ctx context.Context, param *RelateAuthCertParam) error
 
-	// RelateAuthCert2ResourceTag 关联授权凭证标签至指定资源标签下
-	RelateAuthCert2ResourceTag(ctx context.Context, param *RelateAuthCertParam) error
-
 	// SaveAuthCert 保存授权凭证信息
 	SaveAuthCert(ctx context.Context, rac *entity.ResourceAuthCert) error
 
@@ -40,9 +37,6 @@ type ResourceAuthCert interface {
 	// GetResourceAuthCert 获取资源授权凭证，默认获取特权账号，若没有则返回第一个
 	GetResourceAuthCert(resourceType entity.TagType, resourceCode string) (*entity.ResourceAuthCert, error)
 
-	// GetAccountAuthCert 获取账号有权限操作的授权凭证信息
-	GetAccountAuthCert(accountId uint64, authCertTagType entity.TagType, tagPath ...string) []*entity.ResourceAuthCert
-
 	// FillAuthCertByAcs 根据授权凭证列表填充资源的授权凭证信息
 	// @param authCerts 授权凭证列表
 	// @param resources 实现了entity.IAuthCert接口的资源信息
@@ -52,6 +46,9 @@ type ResourceAuthCert interface {
 	// @param resourceType 资源类型
 	// @param resources 实现了entity.IAuthCert接口的资源信息
 	FillAuthCert(resourceType int8, resources ...entity.IAuthCert)
+
+	// FillAuthCertByAcNames 根据授权凭证名称填充资源对应的凭证信息
+	FillAuthCertByAcNames(authCertNames []string, resources ...entity.IAuthCert)
 }
 
 type resourceAuthCertAppImpl struct {
@@ -166,7 +163,7 @@ func (r *resourceAuthCertAppImpl) RelateAuthCert(ctx context.Context, params *Re
 
 			// 如果修改了用户名，且该凭证关联至标签，则需要更新对应的标签名（资源授权凭证类型的标签名为username）
 			if oldAuthCert.Username != unmodifyAc.Username && acTagType != 0 {
-				r.updateAuthCertTagName(ctx, unmodify, acTagType, unmodifyAc.Username)
+				r.tagTreeApp.UpdateTagName(ctx, acTagType, unmodify, unmodifyAc.Username)
 			}
 			logx.DebugfContext(ctx, "RelateAuthCert[%d-%s]-更新授权凭证-[%v]", resourceType, resourceCode, unmodify)
 			if err := r.UpdateById(ctx, unmodifyAc); err != nil {
@@ -178,17 +175,6 @@ func (r *resourceAuthCertAppImpl) RelateAuthCert(ctx context.Context, params *Re
 	return nil
 }
 
-func (r *resourceAuthCertAppImpl) RelateAuthCert2ResourceTag(ctx context.Context, param *RelateAuthCertParam) error {
-	return r.tagTreeApp.RelateTagsByCodeAndType(ctx, &RelateTagsByCodeAndTypeParam{
-		ParentTagCode: param.ResourceCode,
-		ParentTagType: param.ResourceType,
-		TagType:       GetResourceAuthCertTagType(param.ResourceType),
-		Tags: collx.ArrayMap(param.AuthCerts, func(rac *entity.ResourceAuthCert) ITag {
-			return rac
-		}),
-	})
-}
-
 func (r *resourceAuthCertAppImpl) SaveAuthCert(ctx context.Context, rac *entity.ResourceAuthCert) error {
 	if rac.Id == 0 {
 		return r.addAuthCert(ctx, rac)
@@ -258,27 +244,6 @@ func (r *resourceAuthCertAppImpl) GetResourceAuthCert(resourceType entity.TagTyp
 	return r.decryptAuthCert(resourceAuthCerts[0])
 }
 
-func (r *resourceAuthCertAppImpl) GetAccountAuthCert(accountId uint64, authCertTagType entity.TagType, tagPath ...string) []*entity.ResourceAuthCert {
-	// 获取用户有权限操作的授权凭证资源标签
-	tagQuery := &entity.TagTreeQuery{
-		Type:          authCertTagType,
-		CodePathLikes: tagPath,
-	}
-	authCertTags := r.tagTreeApp.GetAccountTags(accountId, tagQuery)
-
-	// 获取所有授权凭证名称
-	authCertNames := collx.ArrayMap(authCertTags, func(tag *entity.TagTree) string {
-		return tag.Code
-	})
-
-	var authCerts []*entity.ResourceAuthCert
-	r.ListByWheres(collx.M{
-		"name in ?": collx.ArrayDeduplicate(authCertNames),
-	}, &authCerts)
-
-	return authCerts
-}
-
 func (r *resourceAuthCertAppImpl) FillAuthCertByAcs(authCerts []*entity.ResourceAuthCert, resources ...entity.IAuthCert) {
 	if len(resources) == 0 || len(authCerts) == 0 {
 		return
@@ -305,6 +270,12 @@ func (r *resourceAuthCertAppImpl) FillAuthCertByAcs(authCerts []*entity.Resource
 	}
 }
 
+func (r *resourceAuthCertAppImpl) FillAuthCertByAcNames(authCertNames []string, resources ...entity.IAuthCert) {
+	var acs []*entity.ResourceAuthCert
+	r.ListByWheres(collx.M{"name in ?": authCertNames}, &acs)
+	r.FillAuthCertByAcs(acs, resources...)
+}
+
 func (r *resourceAuthCertAppImpl) FillAuthCert(resourceType int8, resources ...entity.IAuthCert) {
 	if len(resources) == 0 {
 		return
@@ -336,17 +307,17 @@ func (r *resourceAuthCertAppImpl) addAuthCert(ctx context.Context, rac *entity.R
 	// 资源对应的授权凭证标签类型，若为0则说明该资源不需要关联至资源tagTree
 	authCertTagType := GetResourceAuthCertTagType(entity.TagType(resourceType))
 
-	var resourceTagIds []uint64
+	var resourceTagCodePaths []string
 	// 如果该资源存在对应的授权凭证标签类型，则说明需要关联至tagTree，否则直接从授权凭证库中验证资源编号是否正确即可（一个资源最少有一个授权凭证）
 	if authCertTagType != 0 {
 		// 获取资源编号对应的资源标签信息
 		var resourceTags []*entity.TagTree
 		r.tagTreeApp.ListByCond(&entity.TagTree{Type: entity.TagType(resourceType), Code: resourceCode}, &resourceTags)
-		// 资源标签id（相当于父tag id）
-		resourceTagIds = collx.ArrayMap(resourceTags, func(tag *entity.TagTree) uint64 {
-			return tag.Id
+		// 资源标签tagPath（相当于父tag）
+		resourceTagCodePaths = collx.ArrayMap(resourceTags, func(tag *entity.TagTree) string {
+			return tag.CodePath
 		})
-		if len(resourceTagIds) == 0 {
+		if len(resourceTagCodePaths) == 0 {
 			return errorx.NewBiz("资源标签不存在[%s], 请检查资源编号是否正确", resourceCode)
 		}
 	} else {
@@ -362,13 +333,15 @@ func (r *resourceAuthCertAppImpl) addAuthCert(ctx context.Context, rac *entity.R
 
 	return r.Tx(ctx, func(ctx context.Context) error {
 		// 若存在需要关联到的资源标签，则关联到对应的资源标签下
-		if len(resourceTagIds) > 0 {
-			logx.DebugfContext(ctx, "[%d-%s]-授权凭证标签[%d-%s]关联至所属资源标签下[%v]", resourceType, resourceCode, authCertTagType, rac.Name, resourceTagIds)
+		if len(resourceTagCodePaths) > 0 {
+			logx.DebugfContext(ctx, "[%d-%s]-授权凭证标签[%d-%s]关联至所属资源标签下[%v]", resourceType, resourceCode, authCertTagType, rac.Name, resourceTagCodePaths)
 			return r.tagTreeApp.SaveResourceTag(ctx, &SaveResourceTagParam{
-				Code:         rac.Name,
-				Type:         GetResourceAuthCertTagType(entity.TagType(resourceType)),
-				Name:         rac.Username,
-				ParentTagIds: resourceTagIds,
+				ResourceTag: &ResourceTag{
+					Code: rac.Name,
+					Type: GetResourceAuthCertTagType(entity.TagType(resourceType)),
+					Name: rac.Username,
+				},
+				ParentTagCodePaths: resourceTagCodePaths,
 			})
 		}
 		return nil
@@ -406,7 +379,7 @@ func (r *resourceAuthCertAppImpl) updateAuthCert(ctx context.Context, rac *entit
 		if rac.Username != oldRac.Username && rac.ResourceType == int8(entity.TagTypeMachine) {
 			authCertTagType := GetResourceAuthCertTagType(entity.TagType(oldRac.ResourceType))
 			if authCertTagType != 0 {
-				if err := r.updateAuthCertTagName(ctx, oldRac.Name, authCertTagType, rac.Username); err != nil {
+				if err := r.tagTreeApp.UpdateTagName(ctx, authCertTagType, oldRac.Name, rac.Username); err != nil {
 					return errorx.NewBiz("同步更新授权凭证标签名称失败")
 				}
 			}
@@ -425,11 +398,6 @@ func (r *resourceAuthCertAppImpl) updateAuthCert(ctx context.Context, rac *entit
 	return r.UpdateById(ctx, rac)
 }
 
-// updateAuthCertTagName 同步更新授权凭证的标签名，防止标签展示不一致
-func (r *resourceAuthCertAppImpl) updateAuthCertTagName(ctx context.Context, authCertName string, autyCertTagType entity.TagType, newTagName string) error {
-	return r.tagTreeApp.UpdateByWheres(ctx, &entity.TagTree{Name: newTagName}, collx.M{"code = ?": authCertName, "type = ?": autyCertTagType})
-}
-
 // 解密授权凭证信息
 func (r *resourceAuthCertAppImpl) decryptAuthCert(authCert *entity.ResourceAuthCert) (*entity.ResourceAuthCert, error) {
 	if authCert.CiphertextType == entity.AuthCertCiphertextTypePublic {
@@ -458,6 +426,10 @@ func GetResourceAuthCertTagType(resourceType entity.TagType) entity.TagType {
 		return entity.TagTypeMachineAuthCert
 	}
 
+	if resourceType == entity.TagTypeDb {
+		return entity.TagTypeDbAuthCert
+	}
+
 	// 该资源不存在对应的授权凭证标签，即tag_tree不关联该资源的授权凭证
 	return 0
 }
diff --git a/server/internal/tag/application/tag_tree.go b/server/internal/tag/application/tag_tree.go
index 57a6f31c..97e81860 100644
--- a/server/internal/tag/application/tag_tree.go
+++ b/server/internal/tag/application/tag_tree.go
@@ -14,30 +14,26 @@ import (
 	"strings"
 )
 
-// 标签接口，实现了该接口的结构体默认都可以当成标签树的一种标签
-type ITag interface {
-	// 资源标签code
-	GetCode() string
+// 保存资源标签参数
+type SaveResourceTagParam struct {
+	ParentTagCodePaths []string // 关联标签，空数组则为删除该资源绑定的标签
 
-	// 资源标签名
-	GetName() string
+	ResourceTag *ResourceTag // 资源标签信息
 }
 
-// 保存标签参数
-type SaveResourceTagParam struct {
+type ResourceTag struct {
 	Code string
-	Name string
 	Type entity.TagType
+	Name string
 
-	ParentTagIds []uint64 // 关联标签，空数组则为删除该资源绑定的标签
+	Children []*ResourceTag // 子资源标签
 }
 
 type RelateTagsByCodeAndTypeParam struct {
 	ParentTagCode string         // 父标签编号
 	ParentTagType entity.TagType // 父标签类型
 
-	TagType entity.TagType // 要关联的标签类型
-	Tags    []ITag         // 要关联的标签数组
+	Tags []*ResourceTag // 要关联的标签数组
 }
 
 type DelResourceTagParam struct {
@@ -45,8 +41,6 @@ type DelResourceTagParam struct {
 	ResourceCode string
 	ResourceType entity.TagType
 
-	Pid uint64 //父标签 pid
-
 	// 要删除的子节点类型，若存在值，则为删除资源标签下的指定类型的子标签
 	ChildType entity.TagType
 }
@@ -56,37 +50,46 @@ type TagTree interface {
 
 	ListByQuery(condition *entity.TagTreeQuery, toEntity any)
 
-	Save(ctx context.Context, tt *entity.TagTree) error
+	SaveTag(ctx context.Context, pid uint64, tt *entity.TagTree) error
 
 	Delete(ctx context.Context, id uint64) error
 
-	// 获取指定账号有权限操作的标签列表
+	// GetAccountTags 获取指定账号有权限操作的标签列表
 	// @param accountId 账号id
 	// @param query 查询条件
 	GetAccountTags(accountId uint64, query *entity.TagTreeQuery) []*entity.TagTree
 
-	// 获取指定账号有权限操作的标签codes
+	// GetAccountTagCodes 获取指定账号有权限操作的标签codes
 	GetAccountTagCodes(accountId uint64, resourceType int8, tagPath string) []string
 
+	// GetAccountTagCodePaths 获取指定账号有权限操作的codePaths
+	GetAccountTagCodePaths(accountId uint64, tagType entity.TagType, tagPath string) []string
+
 	// SaveResourceTag 保存资源类型标签
 	SaveResourceTag(ctx context.Context, param *SaveResourceTagParam) error
 
 	// RelateTagsByCodeAndType 将指定标签数组关联至满足指定标签类型和标签code的标签下
 	RelateTagsByCodeAndType(ctx context.Context, param *RelateTagsByCodeAndTypeParam) error
 
+	// UpdateTagName 根据标签类型与code更新对应标签名
+	UpdateTagName(ctx context.Context, tagType entity.TagType, tagCode string, tagName string) error
+
+	// UpdateParentTagCode 更新指定类型标签的所有父标签编号
+	UpdateParentTagCode(ctx context.Context, tagType entity.TagType, tagCode string, newParentCode string, newParentName string) error
+
 	// DeleteTagByParam 删除标签，会删除该标签下所有子标签信息以及团队关联的标签信息
 	DeleteTagByParam(ctx context.Context, param *DelResourceTagParam) error
 
 	// 根据标签类型和标签code获取对应的标签路径列表
 	ListTagPathByTypeAndCode(resourceType int8, resourceCode string) []string
 
-	// 根据账号id获取其可访问标签信息
+	// ListTagByAccountId 根据账号id获取其可访问标签信息
 	ListTagByAccountId(accountId uint64) []string
 
-	// 账号是否有权限访问该标签关联的资源信息
+	// CanAccess 账号是否有权限访问该标签关联的资源信息
 	CanAccess(accountId uint64, tagPath ...string) error
 
-	// 填充资源的标签信息
+	// FillTagInfo 填充资源的标签信息
 	FillTagInfo(resourceTagType entity.TagType, resources ...entity.ITagResource)
 }
 
@@ -101,15 +104,15 @@ func (p *tagTreeAppImpl) InjectTagTreeRepo(tagTreeRepo repository.TagTree) {
 	p.Repo = tagTreeRepo
 }
 
-func (p *tagTreeAppImpl) Save(ctx context.Context, tag *entity.TagTree) error {
+func (p *tagTreeAppImpl) SaveTag(ctx context.Context, pid uint64, tag *entity.TagTree) error {
 	accountId := contextx.GetLoginAccount(ctx).Id
 	// 新建项目树节点信息
 	if tag.Id == 0 {
 		if strings.Contains(tag.Code, entity.CodePathSeparator) {
 			return errorx.NewBiz("标识符不能包含'/'")
 		}
-		if tag.Pid != 0 {
-			parentTag, err := p.GetById(new(entity.TagTree), tag.Pid)
+		if pid != 0 {
+			parentTag, err := p.GetById(new(entity.TagTree), pid)
 			if err != nil {
 				return errorx.NewBiz("父节点不存在")
 			}
@@ -214,129 +217,59 @@ func (p *tagTreeAppImpl) GetAccountTagCodes(accountId uint64, resourceType int8,
 	return collx.MapKeys(code2Resource)
 }
 
+func (p *tagTreeAppImpl) GetAccountTagCodePaths(accountId uint64, tagType entity.TagType, tagPath string) []string {
+	tagResources := p.GetAccountTags(accountId, &entity.TagTreeQuery{Type: tagType, CodePathLikes: []string{tagPath}})
+	// resouce code去重
+	code2Resource := collx.ArrayToMap[*entity.TagTree, string](tagResources, func(val *entity.TagTree) string {
+		return val.CodePath
+	})
+
+	return collx.MapKeys(code2Resource)
+}
+
 func (p *tagTreeAppImpl) SaveResourceTag(ctx context.Context, param *SaveResourceTagParam) error {
-	code := param.Code
-	tagType := entity.TagType(param.Type)
-	name := param.Name
-	tagIds := param.ParentTagIds
+	code := param.ResourceTag.Code
+	tagType := param.ResourceTag.Type
+	parentTagCodePaths := param.ParentTagCodePaths
 
 	if code == "" {
-		return errorx.NewBiz("资源编号不能为空")
+		return errorx.NewBiz("保存资源标签失败: 资源编号不能为空")
 	}
 	if tagType == 0 {
-		return errorx.NewBiz("资源类型不能为空")
+		return errorx.NewBiz("保存资源标签失败:资源类型不能为空")
 	}
 
 	// 如果tagIds为空数组，则为删除该资源标签
-	if len(tagIds) == 0 {
+	if len(parentTagCodePaths) == 0 {
 		return p.DeleteTagByParam(ctx, &DelResourceTagParam{
 			ResourceType: tagType,
 			ResourceCode: code,
 		})
 	}
 
-	if name == "" {
-		name = code
+	// 获取所有关联的子标签
+	var parentTags []*entity.TagTree
+	p.ListByWheres(collx.M{
+		"code_path in ?": parentTagCodePaths,
+	}, &parentTags)
+	if len(parentTags) == 0 || len(parentTags) != len(parentTagCodePaths) {
+		return errorx.NewBiz("保存资源标签失败: 存在错误的关联标签")
 	}
 
+	newTags := p.toTags(parentTags, param.ResourceTag)
+
+	var oldParentTagTree []*entity.TagTree
+	p.ListByCond(&entity.TagTree{Type: tagType, Code: code}, &oldParentTagTree)
+
 	// 该资源对应的旧资源标签信息
-	var oldTagTree []*entity.TagTree
-	p.ListByCond(&entity.TagTree{Type: tagType, Code: code}, &oldTagTree)
-
-	var addTagIds, delTagIds []uint64
-	if len(oldTagTree) == 0 {
-		addTagIds = tagIds
-	} else {
-		oldTagIds := collx.ArrayMap(oldTagTree, func(tag *entity.TagTree) uint64 {
-			return tag.Pid
-		})
-		addTagIds, delTagIds, _ = collx.ArrayCompare[uint64](tagIds, oldTagIds)
-	}
-
-	if len(addTagIds) > 0 {
-		addTagResource := make([]*entity.TagTree, 0)
-		for _, tagId := range addTagIds {
-			tag, err := p.GetById(new(entity.TagTree), tagId)
-			if err != nil {
-				return errorx.NewBiz("存在错误标签id")
-			}
-			addTagResource = append(addTagResource, &entity.TagTree{
-				Pid:      tagId,
-				Code:     code,
-				Type:     tagType,
-				Name:     name,
-				CodePath: fmt.Sprintf("%s%d%s%s%s", tag.CodePath, tagType, entity.CodePathResourceSeparator, code, entity.CodePathSeparator), // tag1/tag2/1|resourceCode1/11|resourceCode2
-			})
-
-		}
-		if err := p.BatchInsert(ctx, addTagResource); err != nil {
-			return err
-		}
-	}
-
-	if len(delTagIds) > 0 {
-		for _, tagId := range delTagIds {
-			if err := p.DeleteTagByParam(ctx, &DelResourceTagParam{
-				ResourceType: tagType,
-				ResourceCode: code,
-				Pid:          tagId,
-			}); err != nil {
-				return err
-			}
-
-		}
-	}
-
-	return nil
-}
-
-func (p *tagTreeAppImpl) RelateTagsByCodeAndType(ctx context.Context, param *RelateTagsByCodeAndTypeParam) error {
-	parentTagCode := param.ParentTagCode
-	parentTagType := param.ParentTagType
-	tagType := param.TagType
-
-	// 如果资源为，则表示清楚关联
-	if len(param.Tags) == 0 {
-		// 删除该资源下的所有指定类型的资源
-		return p.DeleteTagByParam(ctx, &DelResourceTagParam{
-			ResourceCode: parentTagCode,
-			ResourceType: param.ParentTagType,
-			ChildType:    tagType,
-		})
-	}
-
-	// 获取满足指定编号与类型的所有标签信息
-	var parentTags []*entity.TagTree
-	p.ListByCond(&entity.TagTree{Type: parentTagType, Code: parentTagCode}, &parentTags)
-	// 标签id（相当于需要关联的标签数组的父tag id）
-	parentTagIds := collx.ArrayMap(parentTags, func(tag *entity.TagTree) uint64 {
-		return tag.Id
-	})
-
-	if len(parentTagIds) == 0 {
-		return errorx.NewBiz("不存在满足[type=%d, code=%s]的标签", parentTagType, parentTagCode)
-	}
-
 	var oldChildrenTags []*entity.TagTree
-	// 获取该资源的所有旧的该类型的子标签
-	p.ListByQuery(&entity.TagTreeQuery{
-		CodePathLikes: collx.ArrayMap[*entity.TagTree, string](parentTags, func(val *entity.TagTree) string { return val.CodePath }),
-		Type:          tagType,
-	}, &oldChildrenTags)
-
-	// 组合新的授权凭证资源标签
-	newTags := make([]*entity.TagTree, 0)
-	for _, resourceTag := range parentTags {
-		for _, resource := range param.Tags {
-			tagCode := resource.GetCode()
-			newTags = append(newTags, &entity.TagTree{
-				Pid:      resourceTag.Id,
-				Type:     tagType,
-				Code:     tagCode,
-				CodePath: fmt.Sprintf("%s%d%s%s%s", resourceTag.CodePath, tagType, entity.CodePathResourceSeparator, tagCode, entity.CodePathSeparator),
-				Name:     resource.GetName(),
-			})
-		}
+	if len(oldParentTagTree) > 0 {
+		// 获取所有旧的子标签
+		p.ListByQuery(&entity.TagTreeQuery{
+			CodePathLikes: collx.ArrayMap[*entity.TagTree, string](oldParentTagTree, func(val *entity.TagTree) string {
+				return val.CodePath
+			}),
+		}, &oldChildrenTags)
 	}
 
 	// 旧的codePath -> tag
@@ -348,8 +281,7 @@ func (p *tagTreeAppImpl) RelateTagsByCodeAndType(ctx context.Context, param *Rel
 	addCodePaths, delCodePaths, _ = collx.ArrayCompare(collx.MapKeys(newCodePath2Tag), collx.MapKeys(oldCodePath2Tag))
 
 	if len(addCodePaths) > 0 {
-		logx.DebugfContext(ctx, "RelateTags2CodeAndType[%d-%s]-新增标签[%v]", parentTagType, parentTagCode, addCodePaths)
-
+		logx.DebugfContext(ctx, "SaveResourceTag-新增标签[%v]", addCodePaths)
 		addTags := make([]*entity.TagTree, 0)
 		for _, addCodePath := range addCodePaths {
 			addTags = append(addTags, newCodePath2Tag[addCodePath])
@@ -360,19 +292,97 @@ func (p *tagTreeAppImpl) RelateTagsByCodeAndType(ctx context.Context, param *Rel
 	}
 
 	if len(delCodePaths) > 0 {
-		logx.DebugfContext(ctx, "RelateTags2CodeAndType[%d-%s]-删除标签[%v]", parentTagType, parentTagCode, delCodePaths)
+		logx.DebugfContext(ctx, "SaveResourceTag-删除标签[%v]", delCodePaths)
+		// 删除team关联的标签
+		if err := p.tagTreeTeamRepo.DeleteByWheres(ctx, collx.M{"tag_path in ?": delCodePaths}); err != nil {
+			return err
+		}
+		if err := p.DeleteByWheres(ctx, collx.M{"code_path in ?": delCodePaths}); err != nil {
+			return err
+		}
+	}
 
-		for _, delCodePath := range delCodePaths {
-			oldTag := oldCodePath2Tag[delCodePath]
-			if oldTag == nil {
-				continue
-			}
-			if err := p.DeleteTagByParam(ctx, &DelResourceTagParam{
-				Id: oldTag.Id,
-			}); err != nil {
-				return err
+	return nil
+}
+
+func (p *tagTreeAppImpl) RelateTagsByCodeAndType(ctx context.Context, param *RelateTagsByCodeAndTypeParam) error {
+	parentTagCode := param.ParentTagCode
+	parentTagType := param.ParentTagType
+
+	// 获取满足指定编号与类型的所有标签信息
+	var parentTags []*entity.TagTree
+	p.ListByCond(&entity.TagTree{Type: parentTagType, Code: parentTagCode}, &parentTags)
+	// 标签codePaths（相当于需要关联的标签数组的父tag）
+	parentTagCodePaths := collx.ArrayMap(parentTags, func(tag *entity.TagTree) string {
+		return tag.CodePath
+	})
+
+	if len(parentTagCodePaths) == 0 {
+		return errorx.NewBiz("不存在满足[type=%d, code=%s]的标签", parentTagType, parentTagCode)
+	}
+
+	for _, tag := range param.Tags {
+		if err := (p.SaveResourceTag(ctx, &SaveResourceTagParam{
+			ResourceTag:        tag,
+			ParentTagCodePaths: parentTagCodePaths,
+		})); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (p *tagTreeAppImpl) UpdateTagName(ctx context.Context, tagType entity.TagType, tagCode string, tagName string) error {
+	return p.UpdateByWheres(ctx, &entity.TagTree{Name: tagName}, collx.Kvs("code = ?", tagCode, "type = ?", tagType))
+}
+
+func (p *tagTreeAppImpl) UpdateParentTagCode(ctx context.Context, tagType entity.TagType, tagCode string, newParentCode string, newParentName string) error {
+	// 获取资源编号对应的资源标签信息
+	var resourceTags []*entity.TagTree
+	p.ListByCond(&entity.TagTree{Type: tagType, Code: tagCode}, &resourceTags)
+	if len(resourceTags) == 0 {
+		logx.WarnfContext(ctx, "UpdateParentTagCode-[%d-%s]标签信息不存在", tagType, tagCode)
+		return nil
+	}
+
+	// 获取该资源编号对应的所有父资源标签信息
+	var resourceParentTags []*entity.TagTree
+	p.ListByWheres(collx.Kvs("code_path in ?", collx.ArrayMap(resourceTags, func(tag *entity.TagTree) string {
+		return tag.GetParentPath(0)
+	})), &resourceParentTags)
+
+	// 获取该资源编号对应的所有子资源标签信息
+	var resourceChildrenTags []*entity.TagTree
+	p.ListByQuery(&entity.TagTreeQuery{CodePathLikes: collx.ArrayMap(resourceTags, func(tag *entity.TagTree) string {
+		return tag.CodePath
+	})}, &resourceChildrenTags)
+
+	// 更新父标签的codepath
+	for _, tag := range resourceChildrenTags {
+		pathSection := entity.GetTagPathSections(tag.CodePath)
+		for i, ps := range pathSection {
+			if ps.Type == tagType && ps.Code == tagCode {
+				// 将父标签编号修改为对应的新编号
+				pathSection[i-1].Code = newParentCode
 			}
 		}
+		tag.CodePath = pathSection.ToCodePath()
+		p.UpdateById(ctx, tag)
+	}
+
+	// 更新资源标签的code与codePath，貌似这段可以不用，先留着
+	for _, parentTag := range resourceParentTags {
+		pathSection := entity.GetTagPathSections(parentTag.CodePath)
+		pathSection[len(pathSection)-1].Code = newParentCode
+		newCodePath := pathSection.ToCodePath()
+		// 若新的父级标签路径已存在，则不更新该父标签，避免出现重复的标签路径
+		if p.CountByCond(&entity.TagTree{CodePath: newCodePath}) > 0 {
+			continue
+		}
+		parentTag.CodePath = newCodePath
+		parentTag.Code = newParentCode
+		parentTag.Name = newParentName
+		p.UpdateById(ctx, parentTag)
 	}
 
 	return nil
@@ -381,12 +391,12 @@ func (p *tagTreeAppImpl) RelateTagsByCodeAndType(ctx context.Context, param *Rel
 func (p *tagTreeAppImpl) DeleteTagByParam(ctx context.Context, param *DelResourceTagParam) error {
 	// 获取资源编号对应的资源标签信息
 	var resourceTags []*entity.TagTree
-	cond := &entity.TagTree{Type: param.ResourceType, Code: param.ResourceCode, Pid: param.Pid}
+	cond := &entity.TagTree{Type: param.ResourceType, Code: param.ResourceCode}
 	cond.Id = param.Id
 	p.ListByCond(cond, &resourceTags)
 
 	if len(resourceTags) == 0 {
-		logx.DebugfContext(ctx, "TagTreeApp.DeleteResource[%d-%s]不存在可删除的标签", param.ResourceType, param.ResourceCode)
+		logx.DebugfContext(ctx, "TagTreeApp.DeleteTagByParam[%d-%s]不存在可删除的标签", param.ResourceType, param.ResourceCode)
 		return nil
 	}
 
@@ -405,7 +415,7 @@ func (p *tagTreeAppImpl) DeleteTagByParam(ctx context.Context, param *DelResourc
 		childrenTagIds := collx.ArrayMap(childrenTag, func(item *entity.TagTree) uint64 {
 			return item.Id
 		})
-		// 删除所有code_path下的子标签
+		// 删除code_path下的所有子标签
 		if err := p.DeleteByWheres(ctx, collx.M{
 			"id in ?": childrenTagIds,
 		}); err != nil {
@@ -413,7 +423,9 @@ func (p *tagTreeAppImpl) DeleteTagByParam(ctx context.Context, param *DelResourc
 		}
 
 		// 删除team关联的标签
-		return p.tagTreeTeamRepo.DeleteByWheres(ctx, collx.M{"tag_id in ?": childrenTagIds})
+		if err := p.tagTreeTeamRepo.DeleteByWheres(ctx, collx.M{"tag_id in ?": childrenTagIds}); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -464,7 +476,7 @@ func (p *tagTreeAppImpl) FillTagInfo(resourceTagType entity.TagType, resources .
 
 	for _, tr := range tagResources {
 		// 赋值标签信息
-		resourceCode2Resouce[tr.Code].SetTagInfo(entity.ResourceTag{TagId: tr.Pid, TagPath: tr.GetTagPath()})
+		resourceCode2Resouce[tr.Code].SetTagInfo(entity.ResourceTag{CodePath: tr.CodePath})
 	}
 }
 
@@ -478,14 +490,52 @@ func (p *tagTreeAppImpl) Delete(ctx context.Context, id uint64) error {
 		return errorx.NewBiz("您无权删除该标签")
 	}
 
-	if p.CountByCond(&entity.TagTree{Pid: id}) > 0 {
-		return errorx.NewBiz("请先移除该标签关联的资源")
-	}
-
 	return p.Tx(ctx, func(ctx context.Context) error {
-		return p.DeleteById(ctx, id)
+		return p.DeleteTagByParam(ctx, &DelResourceTagParam{
+			Id: id,
+		})
 	}, func(ctx context.Context) error {
 		// 删除该标签关联的团队信息
 		return p.tagTreeTeamRepo.DeleteByCond(ctx, &entity.TagTreeTeam{TagId: id})
 	})
 }
+
+func (p *tagTreeAppImpl) toTags(parentTags []*entity.TagTree, param *ResourceTag) []*entity.TagTree {
+	tags := make([]*entity.TagTree, 0)
+
+	// 递归函数，将标签及其子标签展开为一个扁平数组
+	var flattenTags func(parentTag *entity.TagTree, tag *ResourceTag)
+	flattenTags = func(parentTag *entity.TagTree, resourceTagParam *ResourceTag) {
+		if resourceTagParam == nil {
+			return
+		}
+
+		tagType := resourceTagParam.Type
+		tagCode := resourceTagParam.Code
+		tagName := resourceTagParam.Name
+		if tagName == "" {
+			tagName = tagCode
+		}
+
+		tag := &entity.TagTree{
+			Code:     tagCode,
+			CodePath: fmt.Sprintf("%s%d%s%s%s", parentTag.CodePath, tagType, entity.CodePathResourceSeparator, tagCode, entity.CodePathSeparator), // tag1/tag2/1|resourceCode1/11|resourceCode2/
+			Type:     tagType,
+			Name:     tagName,
+		}
+		// 将当前标签加入数组
+		tags = append(tags, tag)
+
+		// 递归处理子标签
+		for _, child := range resourceTagParam.Children {
+			flattenTags(tag, child)
+		}
+	}
+
+	for _, parentTag := range parentTags {
+		// 开始展开标签
+		flattenTags(parentTag, param)
+	}
+
+	return tags
+}
diff --git a/server/internal/tag/domain/entity/query.go b/server/internal/tag/domain/entity/query.go
index a42feab5..6f85e844 100644
--- a/server/internal/tag/domain/entity/query.go
+++ b/server/internal/tag/domain/entity/query.go
@@ -5,7 +5,6 @@ import "mayfly-go/pkg/model"
 type TagTreeQuery struct {
 	model.Model
 
-	Pid           uint64
 	Type          TagType `json:"type"`
 	Code          string  `json:"code"` // 标识
 	Codes         []string
diff --git a/server/internal/tag/domain/entity/resource_auth_cert.go b/server/internal/tag/domain/entity/resource_auth_cert.go
index 7c6b08cb..6457f679 100644
--- a/server/internal/tag/domain/entity/resource_auth_cert.go
+++ b/server/internal/tag/domain/entity/resource_auth_cert.go
@@ -97,16 +97,6 @@ func (m *ResourceAuthCert) GetExtraString(key string) string {
 	return cast.ToString(m.Extra[key])
 }
 
-// IResourceTag接口 授权凭证名 -> 资源标签code
-func (m *ResourceAuthCert) GetCode() string {
-	return m.Name
-}
-
-// IResourceTag接口 授权凭证用户名 -> 资源标签名
-func (m *ResourceAuthCert) GetName() string {
-	return m.Username
-}
-
 // HasChanged 与指定授权凭证比较是否有变更
 func (m *ResourceAuthCert) HasChanged(rac *ResourceAuthCert) bool {
 	if rac == nil {
diff --git a/server/internal/tag/domain/entity/tag_tree.go b/server/internal/tag/domain/entity/tag_tree.go
index b426ad91..ce10f668 100644
--- a/server/internal/tag/domain/entity/tag_tree.go
+++ b/server/internal/tag/domain/entity/tag_tree.go
@@ -1,19 +1,22 @@
 package entity
 
 import (
+	"fmt"
 	"mayfly-go/internal/common/consts"
 	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
 	"strings"
+
+	"github.com/may-fly/cast"
 )
 
 // 标签树
 type TagTree struct {
 	model.Model
 
-	Pid      uint64  `json:"pid"`
 	Type     TagType `json:"type"`     // 类型： -1.普通标签； 其他值则为对应的资源类型
 	Code     string  `json:"code"`     // 标识编码, 若类型不为-1，则为对应资源编码
-	CodePath string  `json:"codePath"` // 标识路径
+	CodePath string  `json:"codePath"` // 标识路径，tag1/tag2/tagType1|tagCode/tagType2|yyycode/，非普通标签类型段含有标签类型
 	Name     string  `json:"name"`     // 名称
 	Remark   string  `json:"remark"`   // 备注说明
 }
@@ -28,18 +31,22 @@ const (
 
 	TagTypeTag     TagType = -1
 	TagTypeMachine TagType = TagType(consts.ResourceTypeMachine)
-	TagTypeDb      TagType = TagType(consts.ResourceTypeDb)
+	TagTypeDb      TagType = TagType(consts.ResourceTypeDb) // 数据库实例
 	TagTypeRedis   TagType = TagType(consts.ResourceTypeRedis)
 	TagTypeMongo   TagType = TagType(consts.ResourceTypeMongo)
 
 	// ----- （单独声明各个资源的授权凭证类型而不统一使用一个授权凭证类型是为了获取登录账号的授权凭证标签(ResourceAuthCertApp.GetAccountAuthCert)时，避免查出所有资源的授权凭证）
 
 	TagTypeMachineAuthCert TagType = 11 // 机器-授权凭证
+
+	TagTypeDbAuthCert TagType = 21 // 数据库-授权凭证
+	TagTypeDbName     TagType = 22 // 数据库名
 )
 
-// GetRootCode 获取根路径信息
-func (pt *TagTree) GetRootCode() string {
-	return strings.Split(pt.CodePath, CodePathSeparator)[0]
+func (pt *TagTree) IsRoot() bool {
+	// 去除路径两端可能存在的斜杠
+	path := strings.Trim(pt.CodePath, "/")
+	return len(strings.Split(path, "/")) == 1
 }
 
 // GetParentPath 获取父标签路径, 如CodePath = test/test1/test2/  -> index = 0 => test/test1/  index = 1 => test/
@@ -98,13 +105,11 @@ type ITagResource interface {
 
 // 资源关联的标签信息
 type ResourceTag struct {
-	TagId   uint64 `json:"tagId" gorm:"-"`
-	TagPath string `json:"tagPath" gorm:"-"` // 标签路径
+	CodePath string `json:"codePath" gorm:"-"` // 标签路径
 }
 
 func (r *ResourceTag) SetTagInfo(rt ResourceTag) {
-	r.TagId = rt.TagId
-	r.TagPath = rt.TagPath
+	r.CodePath = rt.CodePath
 }
 
 // 资源标签列表
@@ -118,3 +123,66 @@ func (r *ResourceTags) SetTagInfo(rt ResourceTag) {
 	}
 	r.Tags = append(r.Tags, rt)
 }
+
+// GetCodeByPath 从codePaths中提取指定标签类型的所有tagCode并去重
+// 如：codePaths = tag1/tag2/1|xxxcode/11|yyycode/,  tagType = 1 -> xxxcode,  tagType = 11 -> yyycode
+func GetCodeByPath(tagType TagType, codePaths ...string) []string {
+	var codes []string
+	for _, codePath := range codePaths {
+		// tag1/tag2/1|xxxcode/11|yyycode，根据 /tagType|resourceCode进行切割
+		splStrs := strings.Split(codePath, fmt.Sprintf("%s%d%s", CodePathSeparator, tagType, CodePathResourceSeparator))
+		if len(splStrs) < 2 {
+			continue
+		}
+
+		codes = append(codes, strings.Split(splStrs[1], CodePathSeparator)[0])
+	}
+
+	return collx.ArrayDeduplicate[string](codes)
+}
+
+// TagPathSection 标签路径段
+type TagPathSection struct {
+	Type TagType `json:"type"` // 类型： -1.普通标签； 其他值则为对应的资源类型
+	Code string  `json:"code"` // 标识编码, 若类型不为-1，则为对应资源编码
+}
+
+type TagPathSections []*TagPathSection // 标签段数组
+
+// 转为codePath
+func (tps TagPathSections) ToCodePath() string {
+	return strings.Join(collx.ArrayMap(tps, func(tp *TagPathSection) string {
+		if tp.Type == TagTypeTag {
+			return tp.Code
+		}
+		return fmt.Sprintf("%d%s%s", tp.Type, CodePathResourceSeparator, tp.Code)
+	}), CodePathSeparator) + CodePathSeparator
+}
+
+// GetTagPathSections 根据标签路径获取路径段落
+func GetTagPathSections(codePath string) TagPathSections {
+	codePath = strings.TrimSuffix(codePath, CodePathSeparator)
+	var sections TagPathSections
+
+	codes := strings.Split(codePath, CodePathSeparator)
+	for _, code := range codes {
+		typeAndCode := strings.Split(code, CodePathResourceSeparator)
+		var tagType TagType
+		var tagCode string
+
+		if len(typeAndCode) < 2 {
+			tagType = TagTypeTag
+			tagCode = typeAndCode[0]
+		} else {
+			tagType = TagType(cast.ToInt(typeAndCode[0]))
+			tagCode = typeAndCode[1]
+		}
+
+		sections = append(sections, &TagPathSection{
+			Type: tagType,
+			Code: tagCode,
+		})
+	}
+
+	return sections
+}
diff --git a/server/internal/tag/infrastructure/persistence/tag_tree.go b/server/internal/tag/infrastructure/persistence/tag_tree.go
index ca68c701..efdb40dd 100644
--- a/server/internal/tag/infrastructure/persistence/tag_tree.go
+++ b/server/internal/tag/infrastructure/persistence/tag_tree.go
@@ -16,7 +16,7 @@ func newTagTreeRepo() repository.TagTree {
 }
 
 func (p *tagTreeRepoImpl) SelectByCondition(condition *entity.TagTreeQuery, toEntity any, orderBy ...string) {
-	sql := "SELECT DISTINCT(p.id), p.pid, p.type, p.code, p.code_path, p.name, p.remark, p.create_time, p.creator, p.update_time, p.modifier FROM t_tag_tree p WHERE p.is_deleted = 0 "
+	sql := "SELECT DISTINCT(p.id), p.type, p.code, p.code_path, p.name, p.remark, p.create_time, p.creator, p.update_time, p.modifier FROM t_tag_tree p WHERE p.is_deleted = 0 "
 
 	params := make([]any, 0)
 	if condition.Name != "" {
@@ -39,10 +39,6 @@ func (p *tagTreeRepoImpl) SelectByCondition(condition *entity.TagTreeQuery, toEn
 		sql = sql + " AND p.code_path LIKE ?"
 		params = append(params, condition.CodePathLike+"%")
 	}
-	if condition.Pid != 0 {
-		sql = sql + " AND p.pid = ?"
-		params = append(params, condition.Pid)
-	}
 	if condition.Type != 0 {
 		sql = sql + " AND p.type = ?"
 		params = append(params, condition.Type)
diff --git a/server/pkg/config/app.go b/server/pkg/config/app.go
index 45ba9e7f..04e73c21 100644
--- a/server/pkg/config/app.go
+++ b/server/pkg/config/app.go
@@ -4,7 +4,7 @@ import "fmt"
 
 const (
 	AppName = "mayfly-go"
-	Version = "v1.8.0"
+	Version = "v1.8.1"
 )
 
 func GetAppInfo() string {
diff --git a/server/resources/script/sql/v1.8/v1.8.1.sql b/server/resources/script/sql/v1.8/v1.8.1.sql
new file mode 100644
index 00000000..c6230187
--- /dev/null
+++ b/server/resources/script/sql/v1.8/v1.8.1.sql
@@ -0,0 +1,145 @@
+-- 关联数据库实例至标签
+INSERT
+	INTO
+	t_tag_tree (code_path,
+	code,
+	type,
+	NAME,
+	create_time,
+	creator_id,
+	creator,
+	update_time,
+	modifier_id,
+	modifier,
+	is_deleted )
+SELECT
+	DISTINCT t1.newCodePath,
+	t1.tagCode,
+	100,
+	t1.tagName,
+	DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ),
+	1,
+	'admin',
+	DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ),
+	1,
+	'admin',
+	0
+FROM
+	(
+	SELECT
+		ttt.code_path,
+		ttt2.code_path as p_code_path,
+		td.name,
+		td.auth_cert_name,
+		tdi.code tagCode,
+		tdi.name tagName,
+		CONCAT(ttt2.code_path, '2|', tdi.code, '/') newCodePath
+	FROM
+		t_tag_tree ttt
+	JOIN t_db td ON
+		ttt.code = td.code
+		AND ttt.type = 2
+		AND td.is_deleted = 0
+	JOIN t_tag_tree ttt2 ON
+		ttt.pid = ttt2.id
+	JOIN t_db_instance tdi ON
+		tdi.id = td.instance_id) AS t1;
+
+
+-- 关联数据库实例的授权凭证信息至标签
+INSERT
+	INTO
+	t_tag_tree (code_path,
+	code,
+	type,
+	NAME,
+	create_time,
+	creator_id,
+	creator,
+	update_time,
+	modifier_id,
+	modifier,
+	is_deleted )
+SELECT
+	DISTINCT t1.newCodePath,
+	t1.tagCode,
+	21,
+	t1.tagName,
+	DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ),
+	1,
+	'admin',
+	DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ),
+	1,
+	'admin',
+	0
+FROM
+	(
+	SELECT
+		ttt.code_path,
+		ttt2.code_path as p_code_path,
+		td.name,
+		td.auth_cert_name,
+		trac.name tagCode,
+		trac.username tagName,
+		CONCAT(ttt2.code_path, '2|', tdi.code, '/21|', trac.name, '/') as newCodePath
+	FROM
+		t_tag_tree ttt
+	JOIN t_db td ON
+		ttt.code = td.code
+		AND ttt.type = 2
+		AND td.is_deleted = 0
+	JOIN t_tag_tree ttt2 ON
+		ttt.pid = ttt2.id
+	JOIN t_db_instance tdi ON
+		tdi.id = td.instance_id
+	JOIN t_resource_auth_cert trac ON
+		trac.name = td.auth_cert_name
+		AND trac.is_deleted = 0) AS t1;
+
+-- 关联数据库至标签
+INSERT
+	INTO
+	t_tag_tree (code_path,
+	code,
+	type,
+	NAME,
+	create_time,
+	creator_id,
+	creator,
+	update_time,
+	modifier_id,
+	modifier,
+	is_deleted )
+SELECT
+	DISTINCT t1.newCodePath,
+	t1.tagCode,
+	22,
+	t1.name,
+	DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ),
+	1,
+	'admin',
+	DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%s' ),
+	1,
+	'admin',
+	0
+FROM
+	(
+	SELECT
+		ttt.code_path,
+		ttt.code_path as p_code_path,
+		td.name ,
+		td.auth_cert_name,
+		td.code tagCode,
+		td.name tagName,
+		CONCAT(ttt.code_path, '22|', td.code, '/') newCodePath
+	FROM
+		t_tag_tree ttt
+	join t_db td on
+		ttt.code = td.auth_cert_name
+		and ttt.type = 21
+		and td.is_deleted = 0) as t1;
+
+UPDATE t_tag_tree SET is_deleted = 0, delete_time = NOW() WHERE `type` = 2;
+UPDATE t_tag_tree SET `type` = 2 WHERE `type` = 100;
+
+ALTER TABLE t_tag_tree DROP COLUMN pid;