From ee93b275a9202dfcaccbb9d264cd79666c88344b Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 19 Jun 2025 11:54:13 +0800
Subject: [PATCH 1/5] =?UTF-8?q?[=E5=85=B3=E8=81=94]#[1445757985456128]?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83db=E9=85=8D=E7=BD=AE=E4=BE=BF=E6=8D=B7?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?=
 =?UTF-8?q?45757985456128?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/deploy/application-config/env.js      |  12 +
 .../config/env/account-edit-dialog.vue        | 547 ++++++++++++++++++
 .../config/env/env-db-config-edit.vue         |   2 +-
 .../env/private-account-edit-dialog.vue       | 264 +++++++++
 4 files changed, 824 insertions(+), 1 deletion(-)
 create mode 100644 src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
 create mode 100644 src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue

diff --git a/src/resources/api/deploy/application-config/env.js b/src/resources/api/deploy/application-config/env.js
index 291974b3..44c74f0a 100644
--- a/src/resources/api/deploy/application-config/env.js
+++ b/src/resources/api/deploy/application-config/env.js
@@ -47,6 +47,18 @@ const env = {
   saveEnvDbResource(params) {
     // 保存环境db资源
     return axios.post('/api/rest/deploy/app/config/env/cientity/save', params);
+  },
+  saveEnvDbPublicAccount(params) {
+    // 保存发布应用配置DB公共账号 
+    return axios.post('/api/rest/deploy/app/config/env/db/publicaccount/save', params);
+  },
+  saveEnvDbPrivateaccount(params) {
+    // 保存发布应用配置DB私有账号 
+    return axios.post('/api/rest/deploy/app/config/env/db/privateaccount/save', params);
+  },
+  deleteEnvDbPrivateaccount(params) {
+    // 删除发布应用配置DB私有账号 
+    return axios.post('/api/rest/deploy/app/config/env/db/privateaccount/delete', params);
   }
 };
 
diff --git a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
new file mode 100644
index 00000000..e66877a2
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
@@ -0,0 +1,547 @@
+<template>
+  <div>
+    <TsDialog v-bind="dialogConfig" @on-close="closeDialog">
+      <Loading :loadingShow="loadingShow" type="fix"></Loading>
+      <div v-if="$AuthUtils.hasRole('RESOURCECENTER_ACCOUNT_MODIFY')" class="action-icon text-right">
+        <span class="tsfont-rotate-right text-tip-active" @click="refreshAccountList"></span>
+        <span class="tsfont-edit text-tip-active pl-md" @click="editAccount"></span>
+      </div>
+      <TsForm
+        ref="form"
+        v-model="settingConfig"
+        :item-list="settingForm"
+        type="type"
+        label-position="right"
+      >
+        <template v-slot:account>
+          <TsFormSelect
+            ref="formSelect"
+            v-model="settingConfig.accountList"
+            v-bind="settingForm.account"
+            @first="gotoAccount"
+            @searchCallback="refreshSuccess()"
+          >
+            <template v-if="validMessage != '' && validMessage == 'validMessage'" v-slot:validMessage>
+              <div>
+                <template>
+                  <div v-for="(value, key, index) in validMessageObj" :key="index" class="form-error-tip">
+                    {{ getItem(value) }}
+                  </div>
+                </template>
+              </div>
+            </template>
+          </TsFormSelect>
+        </template>
+        <template v-slot:privateAccount>
+          <div>
+            <div v-if="privateAccountList && privateAccountList.length > 0" class="bg-op radius-lg padding">
+              <div
+                v-for="(item, index) in privateAccountList"
+                :key="item.id"
+                @mouseenter="mouseenter(item)"
+                @mouseleave="mouseleave(item)"
+              >
+                <TsRow>
+                  <Col span="22" class="text-href">
+                    <div @click="editPrivateAccount(item)">
+                      {{ item.text }}
+                    </div>
+                  </Col>
+                  <Col span="2">
+                    <span v-show="item.isShow" class="tsfont-trash-o cursor" @click="delPrivateAccount(item, index)"></span>
+                  </Col>
+                </TsRow>
+              </div>
+            </div>
+            <div class="text-href tsfont-plus" @click="openPrivateAccount">{{ $t('page.privateaccount') }}</div>
+          </div>
+        </template>
+        <template v-slot:testRunner>
+          <TsFormSelect
+            ref="formSelect"
+            v-model="testRunner"
+            v-bind="settingForm.testRunner"
+            @first="gotoRunner"
+            @searchCallback="refreshSuccess()"
+          ></TsFormSelect>
+     
+        </template>
+        <template v-slot:testResult>
+          <div v-if="connectTestResultList && connectTestResultList.length > 0">
+            <span v-if="hasErrorInfo(connectTestResultList)" class="tsfont-copy text-action mb-xs" @click.stop="handleCopy">{{ $t('page.copyerrorinfo') }}</span>
+            <TsTable
+              :hideAction="false"
+              :showPager="false"
+              :showTotal="false"
+              height="auto"
+              :theadList="theadList"
+              :canExpand="true"
+              :tbodyList="connectTestResultList"
+            >
+              <template v-slot:showInnerTable="{ row }">
+                <span
+                  v-if="row.msgError"
+                  :class="{ 'tsfont-right': !row._expand, 'tsfont-down open': row._expand }"
+                  class="cursor-pointer text-error"
+                  @click.stop="openInnerTable(row)"
+                ></span>
+              </template>
+              <template slot="status" slot-scope="{row}">
+                <span :class="row && (row.exitValue == 0) ? 'text-success' : 'text-error'">{{ getReasonText(row) }}</span>
+              </template>
+              <template slot="accountName" slot-scope="{row}">
+                <span>{{ getConnectResultText(row) }}</span>
+              </template>
+              <template slot="runner" slot-scope="{}">
+                <span>{{ connectTestRunner }}</span>
+              </template>
+              <template v-slot:expand="{ row }">
+                <div v-if="row._expand" class="text-error" style="margin-left: 55px;">{{ row.msgError }}</div>
+              </template>
+            </TsTable>
+          </div>
+        </template>
+      </TsForm>
+      <template v-slot:footer>
+        <Button @click="closeDialog">{{ $t('page.cancel') }}</Button>
+        <Button type="primary" @click="testConnect">{{ $t('page.testconnection') }}</Button>
+        <Button type="primary" @click="saveAccount">{{ $t('page.confirm') }}</Button>
+      </template>
+    </TsDialog>
+    <PrivateAccountEditDialog
+      v-if="isShowNewAccount"
+      :resourceId="resourceId"
+      :accountId="accountId"
+      :accountList="[...privateAccountList, ...publicAccountList]"
+      @close="closePrivateAccount"
+    ></PrivateAccountEditDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    PrivateAccountEditDialog: () => import('./private-account-edit-dialog')
+  },
+  filters: {},
+  props: {
+    resourceId: {
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      testRunner: null,
+      connectTestRunner: null,
+      isShowNewAccount: false,
+      accountId: null,
+      publicAccountList: [], // 公共账号列表
+      privateAccountList: [], // 私有账号列表
+      failureCount: 0, //错误校验信息条数
+      successCount: 0, //成功校验信息条数
+      failureReasonList: [], //失败校验信息详情
+      validMessage: '', //是否显示自定义校验信息
+      validMessageObj: {},
+      connectTestResultList: [], // 连接测试结果列表
+      loadingShow: false,
+      dialogConfig: {
+        type: 'modal',
+        isShow: true,
+        title: this.$t('page.accountsmanage'),
+        maskClose: false,
+        width: 'medium'
+      },
+      theadList: [
+        {
+          title: '',
+          width: 50,
+          key: 'showInnerTable'
+        },
+        {
+          title: this.$t('page.status'),
+          key: 'status'
+        },
+        {
+          title: this.$t('page.account'),
+          key: 'accountName'
+        },
+        {
+          title: this.$t('term.deploy.actuator'),
+          key: 'runner'
+        }
+      ],
+      settingConfig: {
+        accountList: []
+      },
+      settingForm: {
+        id: {
+          type: 'text',
+          name: 'id',
+          isHidden: true
+        },
+        account: {
+          type: 'slot',
+          name: 'account',
+          label: this.$t('page.publicaccount'),
+          transfer: true,
+          multiple: true,
+          firstText: this.$t('dialog.title.addtarget', { target: this.$t('page.account') }),
+          firstLi: this.$AuthUtils.hasRole('RESOURCECENTER_ACCOUNT_MODIFY'),
+          dynamicUrl: '/api/rest/resourcecenter/account/search',
+          rootName: 'tbodyList',
+          dealDataByUrl: this.$utils.getAccountNodeList,
+          needCallback: false,
+          onChange: (val, textlist, nodeList) => {
+            let list = [...nodeList, ...this.privateAccountList];
+            this.publicAccountList = nodeList || [];
+            this.getValidMessage(list);
+          }
+        },
+        privateAccount: {
+          type: 'slot',
+          name: 'privateAccount',
+          label: this.$t('page.privateaccount')
+        },
+        testRunner: {
+          type: 'slot',
+          name: 'testRunner',
+          desc: '如果不指定则会通过ip根据网段匹配执行器组自动分配执行器',
+          label: this.$t('page.test') + this.$t('term.deploy.actuator'),
+          transfer: true,
+          multiple: false,
+          firstText: this.$t('dialog.title.addtarget', { target: this.$t('term.deploy.actuator') }),
+          firstLi: this.$AuthUtils.hasRole('RUNNER_MODIFY'),
+          dynamicUrl: '/api/rest/runner/search',
+          rootName: 'tbodyList',
+          valueName: 'id',
+          textName: 'name',
+          needCallback: false
+        },
+        testResult: {
+          type: 'slot',
+          label: '测试结果',
+          isHidden: true // 默认隐藏，点击【测试连接】之后才显示
+        }
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    if (this.resourceId) {
+      this.getAccountList();
+    }
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    handleCopy() {
+      let errorList = this.connectTestResultList.filter(v => v.exitValue != 0);
+      let errorInfo = errorList.map(v => `${this.getConnectResultText(v)}通过执行器${this.connectTestRunner}测试${this.getReasonText(v)}${v.msgError}`).join('\n');
+      this.$utils.copyText('', errorInfo);
+    },
+    openInnerTable(row) {
+      // 展开收起内嵌表格
+      this.$set(row, '_expand', !row._expand);
+    },
+    getValidMessage(list) {
+      if (list.length == 0) {
+        this.validMessage = '';
+      } else {
+        this.validMessage = 'noValidMessage';
+      }
+      let obj = {};
+      list &&
+        list.forEach(item => {
+          let accountProtocal = item.config.account + '/' + item.config.protocol;
+          if (obj[accountProtocal]) {
+            obj[accountProtocal].push(item.text);
+          } else {
+            obj[accountProtocal] = [item.text];
+          }
+        });
+      this.validMessageObj = obj;
+      Object.keys(obj).forEach(item => {
+        if (obj[item].length > 1) {
+          this.validMessage = 'validMessage';
+        }
+      });
+    },
+    getAccountList() {
+      this.getPublicAccountList();
+      this.getPrivateAccountList();
+    },
+    getPublicAccountList() {
+      if (this.resourceId) {
+        this.$api.cmdb.asset.listAccount({ resourceId: this.resourceId, type: 'public' }).then(res => {
+          // 公有账号列表
+          if (res.Return.length > 0) {
+            this.settingConfig.accountList = [];
+            let publicAccountList = [];
+            res.Return.forEach(item => {
+              if (item.protocol != 'tagent' && item.id) {
+                this.settingConfig.accountList.push(item.id);
+                publicAccountList.push(item);
+              }
+            });
+            this.publicAccountList = this.$utils.getAccountNodeList(publicAccountList);
+          } else {
+            this.settingConfig.accountList = [];
+            this.publicAccountList = [];
+          }
+        });
+      } else {
+        this.settingConfig.accountList = [];
+        this.publicAccountList = [];
+      }
+    },
+    getPrivateAccountList() {
+      if (this.resourceId) {
+        this.$api.cmdb.asset.listAccount({ resourceId: this.resourceId, type: 'private' }).then(res => {
+          // 私有账号列表
+          if (res.Return.length > 0) {
+            this.privateAccountList = [];
+            let privateAccountList = [];
+            res.Return.forEach(item => {
+              if (item.protocol != 'tagent' && item.id) {
+                privateAccountList.push(item);
+              }
+            });
+            this.privateAccountList = this.$utils.getAccountNodeList(privateAccountList);
+          } else {
+            this.privateAccountList = [];
+          }
+        });
+      } else {
+        this.privateAccountList = [];
+      }
+    },
+    validRequired() {
+      let accountIdList = this.getAccountIdList();
+      if (accountIdList && accountIdList.length == 0) {
+        this.$Notice.error({ title: this.$t('page.tip'), desc: this.$t('term.cmdb.publicprivateaccountchooseoneaccountdesc') });
+        this.connectTestResultList = [];
+        this.connectTestRunner = '';
+        this.settingForm.testResult.isHidden = true;
+        return false;
+      }
+      return true;
+    },
+    saveAccount() {
+      let data = {
+        resourceId: this.resourceId,
+        accountIdList: this.getAccountIdList()
+      };
+      this.$api.deploy.env.saveEnvDbPublicAccount(data).then(res => {
+        if (res.Status == 'OK') {
+          this.closeDialog(true);
+          this.handleTipsMessage(res, this.$t('message.savesuccess'));
+        }
+      });
+    },
+    getAccountIdList() {
+      let privateAccountIdList = [];
+      this.privateAccountList &&
+        this.privateAccountList.forEach(item => {
+          if (item.value) {
+            privateAccountIdList.push(item.value);
+          }
+        });
+      return [...this.settingConfig.accountList, ...privateAccountIdList];
+    },
+    handleTipsMessage(res, msg) {
+      if (res.Return) {
+        this.failureCount = res.Return.failureCount;
+        this.successCount = res.Return.successCount;
+      }
+      // 失败，错误提示
+      if (this.failureCount != 0 || (this.failureReasonList && this.failureReasonList.length > 0)) {
+        this.$Notice.error({
+          title: this.$t('page.tip'),
+          duration: 10,
+          render: h => {
+            return h('div', [
+              h('div', { class: 'text-success pb-md' }, [h('span', { class: 'text-success valid-icon tsfont-check-s' }, ''), this.$t('term.cmdb.successfullyboundaccountforassetstarget', { target: this.successCount || 0 })]),
+              h('div', { class: 'text-danger pb-md' }, [h('span', { class: 'valid-icon tsfont-close-s' }, ''), this.$t('term.cmdb.failedtobindaccountforassetstarget', { target: this.failureCount || 0 })]),
+              h(
+                'ul',
+                { class: 'pb-md', style: { lineHeight: '20px', display: this.failureReasonList && this.failureReasonList.length > 0 ? 'block' : 'none' } },
+                this.failureReasonList.map(item => {
+                  return h('li', {}, item || '');
+                })
+              )
+            ]);
+          }
+        });
+      }
+
+      this.$emit('success', msg);
+    },
+    openPrivateAccount() {
+      // 私有账号
+      this.accountId = null;
+      this.isShowNewAccount = true;
+    },
+    delPrivateAccount(row, index) {
+      // 删除私有账号
+      if (row && row.value) {
+        this.$createDialog({
+          title: this.$t('dialog.title.deleteconfirm'),
+          content: this.$t('dialog.content.deleteconfirm', { target: row.text }),
+          btnType: 'error',
+          okText: this.$t('page.delete'),
+          'on-ok': vnode => {
+            this.$api.develop.env.deleteEnvDbPrivateaccount(row.value).then(res => {
+              if (res && res.Status == 'OK') {
+                this.$Message.success(this.$t('message.deletesuccess'));
+                this.privateAccountList.splice(index, 1);
+                vnode.isShow = false;
+              }
+            });
+          }
+        });
+      }
+    },
+    editPrivateAccount(item) {
+      // 编辑私有账号
+      if (item && item.value) {
+        this.accountId = item.value;
+        this.isShowNewAccount = true;
+      }
+    },
+    closePrivateAccount(needRefresh) {
+      this.isShowNewAccount = false;
+      if (needRefresh) {
+        this.getPrivateAccountList();
+      }
+    },
+    closeDialog(needRefresh = false) {
+      this.$emit('close', needRefresh);
+    },
+    gotoAccount() {
+      window.open(HOME + '/cmdb.html#/account-manage?isNewAccountShow=' + true, '_blank');
+    },
+    gotoRunner() {
+      window.open(HOME + '/framework.html#/runnergroup-manage', '_blank');
+    },
+    editAccount() {
+      window.open(HOME + '/cmdb.html#/account-manage', '_blank');
+    },
+    refreshAccountList() {
+      this.$set(this.settingForm.account, 'params', { timeUuid: this.$utils.setUuid() });
+      this.$set(this.settingForm.account, 'needCallback', true);
+    },
+    refreshSuccess() {
+      this.$Message.success(this.$t('message.refreshsuccess'));
+    },
+    testConnect() {
+      // 测试连接
+      if (!this.validRequired()) {
+        return false;
+      }
+      if (this.resourceId) {
+        this.loadingShow = true;
+        this.$api.cmdb.asset
+          .testConnectAccount({ resourceId: this.resourceId, accountIdList: this.getAccountIdList(), runnerId: this.testRunner })
+          .then(res => {
+            if (res && res.Status == 'OK') {
+              this.connectTestRunner = res.Return.runner;
+              this.connectTestResultList = res.Return.result || [];
+              if (this.connectTestResultList && this.connectTestResultList.length > 0) {
+                this.settingForm.testResult.isHidden = false;
+              }
+              if (this.connectTestResultList.every(item => item.exitValue == 0)) {
+                this.$Message.success(this.$t('message.executesuccess'));
+              }
+            }
+          })
+          .finally(() => {
+            this.loadingShow = false;
+          });
+      }
+    },
+    getConnectResultText(item) {
+      let text = '';
+      if (item && item.name) {
+        text = item.name;
+      }
+      if (item && item.username) {
+        text += `(${item.username})`;
+      }
+      if (item && item.protocol) {
+        text += `/${item.protocol}`;
+      }
+      if (item && item.protocolPort) {
+        text += `(${item.protocolPort})`;
+      }
+      return text;
+    },
+    mouseenter(item) {
+      // 鼠标移入
+      this.$set(item, 'isShow', true);
+    },
+    mouseleave(item) {
+      // 鼠标移出
+      this.$set(item, 'isShow', false);
+    }
+  },
+  computed: {
+    getItem() {
+      return function(value) {
+        if (value.length > 1) {
+          return value.join('、') + this.$t('term.cmdb.repeataccount');
+        } else {
+          return;
+        }
+      };
+    },
+    getConnectStatus() {
+      // 获取连接状态
+      return function(value) {
+        let statusObj = {
+          0: 'text-success',
+          1: 'text-danger',
+          2: 'text-danger',
+          3: 'text-danger'
+        };
+        return statusObj[value];
+      };
+    },
+    getReasonText() {
+      // 测试连接，成功失败原因
+      return function(value) {
+        if (value.exitValue == 0) {
+          return this.$t('page.success');
+        } else {
+          return this.$t('page.fail');
+        }
+      };
+    },
+    hasErrorInfo() {
+      return (connectTestResultList) => {
+        return connectTestResultList.some(v => v.exitValue != 0);
+      };
+    }
+  },
+  watch: {}
+};
+</script>
+<style scoped lang="less">
+.showValidMessage {
+  background-color: #f8e3e3;
+}
+.form-error-tip {
+  white-space: normal;
+  text-overflow: ellipsis;
+  word-break: break-all;
+}
+</style>
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
index d32edc88..55eedc7b 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
@@ -90,7 +90,7 @@ export default {
     TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
     DbResourceSettingDialog: () => import('./db-resource-setting-dialog.vue'),
-    AccountEditDialog: () => import('@/views/pages/cmdb/asset/components/account-edit-dialog')
+    AccountEditDialog: () => import('./account-edit-dialog')
   },
   props: {
     id: {
diff --git a/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
new file mode 100644
index 00000000..e3c61a98
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
@@ -0,0 +1,264 @@
+<template>
+  <TsDialog v-bind="dialogConfig" @on-close="closeDialog" @on-ok="savePrivateAccount">
+    <TsForm ref="form" v-model="formValue" :item-list="formConfig">
+    </TsForm>
+  </TsDialog>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsForm: () => import('@/resources/plugins/TsForm/TsForm')
+  },
+  filters: {},
+  props: {
+    accountId: {
+      // 账号id
+      type: Number,
+      default: null
+    },
+    resourceId: {
+      // 资产id
+      type: Number,
+      default: null
+    },
+    accountList: {
+      // 账号列表
+      type: Array,
+      default: function() {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {
+      protocol: '', // 协议
+      formValue: {
+        id: this.accountId,
+        name: '', // 前端拼接：用户名[协议]
+        account: '',
+        passwordPlain: null,
+        protocolId: null,
+        tagIdList: []
+      },
+      dialogConfig: {
+        type: 'modal',
+        isShow: true,
+        title: this.accountId ? '编辑私有账号' : '新增私有账号'
+      },
+      formConfig: {
+        id: {
+          type: 'text',
+          name: 'id',
+          isHidden: true,
+          value: this.accountId
+        },
+        name: {
+          type: 'text',
+          name: 'name',
+          width: '100%',
+          label: '名称',
+          maxlength: 50,
+          isHidden: true
+        },
+        account: {
+          type: 'text',
+          name: 'account',
+          width: '100%',
+          label: '用户名',
+          maxlength: 50,
+          validateList: ['required', {
+            name: 'custom',
+            trigger: 'change',
+            message: '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。',
+            validator: (rule, val) => {
+              return this.validAccountProtocalUnique(val);
+            }
+          }],
+          isHidden: false
+        },
+        passwordPlain: {
+          type: 'password',
+          name: 'passwordPlain',
+          width: '100%',
+          label: '密码'
+        },
+        protocolId: {
+          type: 'select',
+          width: '100%',
+          label: '协议',
+          placeholder: this.$t('form.validate.selectprotocol'),
+          dynamicUrl: '/api/rest/resourcecenter/account/protocol/search',
+          rootName: 'tbodyList',
+          dealDataByUrl: (nodeList) => { return this.dealProtocolIdDataByUrl(nodeList); },
+          name: 'protocolId',
+          errorMessage: '',
+          validateList: ['required', {
+            name: 'custom',
+            trigger: 'change',
+            message: '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。',
+            validator: (rule, protocolId) => {
+              return this.validAccountProtocalUnique();
+            }
+          }],
+          transfer: true,
+          onChangelabel: (label) => {
+            this.protocol = label;
+          },
+          onChange: (val, objectValue) => {
+            this.protocol = objectValue ? objectValue.text : '';
+            if (!this.validAccountProtocalUnique()) {
+              this.$set(this.formConfig['protocolId'], 'errorMessage', '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。');
+            } else {
+              this.$set(this.formConfig['protocolId'], 'errorMessage', '');
+            }
+            if (val == '478184378212353') {
+              // 如果选择为 tagent 的时候，用户名为非必填
+              this.formConfig.account.validateList = [];
+              this.formConfig.account.isHidden = true; // 隐藏账号字段
+            } else {
+              this.formConfig.account.validateList = ['required',
+                {
+                  name: 'custom',
+                  trigger: 'change',
+                  message: '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。',
+                  validator: (rule, val) => {
+                    return this.validAccountProtocalUnique(val);
+                  }
+                }];
+              this.formConfig.account.isHidden = false;
+            }
+          }
+        },
+        tagIdList: {
+          type: 'select',
+          name: 'tagIdList',
+          width: '100%',
+          label: '标签',
+          transfer: true,
+          multiple: true,
+          search: true,
+          allowCreate: true,
+          dynamicUrl: '/api/rest/resourcecenter/tag/list/forselect',
+          rootName: 'tbodyList',
+          textName: 'name',
+          valueName: 'id'
+        }
+      }
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.getAccountInfoById();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getProtocalName(protocalPort) {
+      let protocolName = protocalPort;
+      return protocolName;
+    },
+    validAccountProtocalUnique(account) {
+      // 验证协议和账号唯一
+      let isValid = true;
+      let accountName = '';
+      let accountList = this.$utils.deepClone(this.accountList) || []; // 编辑私有账号时，不验证自身协议和账号唯一
+      accountList = accountList.filter((item) => {
+        return item.value != this.accountId;
+      });
+      if (this.protocol && (account || (this.formValue && this.formValue.account))) {
+        accountName = account || (this.formValue && this.formValue.account);
+        for (let i = 0; i < accountList.length; i++) {
+          if (accountList[i] && accountList[i].config && accountList[i].config.account && (accountList[i].config.account == accountName) && (accountList[i].config.protocol == this.protocol)) {
+            isValid = false;
+          }
+        }
+      }
+      if (isValid) {
+        this.$set(this.formConfig['protocolId'], 'errorMessage', '');
+      }
+      return isValid;
+    },
+    savePrivateAccount() {
+      const form = this.$refs['form'];
+      let formValue = this.$refs.form.getFormValue();
+      if (!form.valid()) {
+        return;
+      }
+      this.$api.cmdb.accountManage
+        .saveAccount({...formValue, type: 'private', resourceId: this.resourceId, name: `${formValue.account}[${this.protocol}]`}) // 私有账号
+        .then(res => {
+          if (res && (res.Status == 'OK')) {
+            this.handleTipsMessage(res.Return);
+          }
+        });
+    },
+    handleTipsMessage(res) {
+      // 失败，错误提示
+      if (res && res.failureReasonList && res.failureReasonList instanceof Array && res.failureReasonList.length > 0) {
+        this.$Notice.error({
+          title: '错误提示',
+          duration: 10,
+          render: h => {
+            return h('div', [
+              h(
+                'ul',
+                { class: 'pb-md'},
+                res.failureReasonList.map(item => {
+                  return h('li', {}, item || '');
+                })
+              ),
+              h('div', {}, '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。')
+            ]);
+          }
+        });
+      } else {
+        this.$Message.success(this.$t('message.savesuccess'));
+        this.closeDialog(true);
+      }
+    },
+    getAccountInfoById() {
+      if (this.accountId) {
+        this.$api.cmdb.accountManage.getAccountById(this.accountId).then(res => {
+          this.tableData = res.Return;
+          for (let key in this.formConfig) {
+            this.$set(this.formValue, [key], this.tableData[key]);
+          }
+          if (this.tableData.tagList && this.tableData.tagList.length > 0) {
+            let idList = [];
+            this.tableData.tagList.forEach(v => {
+              idList.push(v.id);
+            });
+            this.$set(this.formValue, 'tagIdList', idList);
+          }
+        });
+      }
+    },
+    dealProtocolIdDataByUrl(nodeList) {
+      // 处理协议id下拉列表
+      let dataList = [];
+      if (nodeList && nodeList.length > 0) {
+        nodeList.forEach((item) => {
+          dataList.push({
+            text: item.name,
+            value: item.id,
+            _disabled: item.id == '445524809146368'
+          });
+        });
+      }
+      return dataList;
+    },
+    closeDialog(needRefresh) {
+      this.$emit('close', needRefresh);
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
-- 
Gitee


From 13937ddb691df8d541d27a1a382d9a6b22abfde5 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 19 Jun 2025 14:26:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1445757985456128]?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83db=E9=85=8D=E7=BD=AE=E4=BE=BF=E6=8D=B7?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?=
 =?UTF-8?q?45757985456128?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/env/account-edit-dialog.vue        | 20 +++++++++++++-
 .../config/env/env-db-config-edit.vue         |  7 ++++-
 .../env/private-account-edit-dialog.vue       | 26 ++++++++++++++-----
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
index e66877a2..cff97048 100644
--- a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
@@ -110,6 +110,7 @@
     </TsDialog>
     <PrivateAccountEditDialog
       v-if="isShowNewAccount"
+      :params="params"
       :resourceId="resourceId"
       :accountId="accountId"
       :accountList="[...privateAccountList, ...publicAccountList]"
@@ -128,6 +129,10 @@ export default {
   },
   filters: {},
   props: {
+    params: {
+      type: Object,
+      default: () => {}
+    },
     resourceId: {
       type: Number,
       default: null
@@ -337,7 +342,13 @@ export default {
       return true;
     },
     saveAccount() {
+      if (this.$utils.isEmpty(this.params)) {
+        return false;
+      }
       let data = {
+        appSystemId: this.params.appSystemId,
+        appModuleId: this.params.appModuleId,
+        envId: this.params.envId,
         resourceId: this.resourceId,
         accountIdList: this.getAccountIdList()
       };
@@ -400,7 +411,14 @@ export default {
           btnType: 'error',
           okText: this.$t('page.delete'),
           'on-ok': vnode => {
-            this.$api.develop.env.deleteEnvDbPrivateaccount(row.value).then(res => {
+            let data = {
+              appSystemId: this.params.appSystemId,
+              appModuleId: this.params.appModuleId,
+              envId: this.params.envId,
+              resourceId: this.resourceId,
+              id: row.value
+            };
+            this.$api.develop.env.deleteEnvDbPrivateaccount(data).then(res => {
               if (res && res.Status == 'OK') {
                 this.$Message.success(this.$t('message.deletesuccess'));
                 this.privateAccountList.splice(index, 1);
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
index 55eedc7b..db89a953 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
@@ -79,7 +79,12 @@
       :params="params"
       @close="closeDbResourceSettingDialog"
     ></DbResourceSettingDialog>
-    <AccountEditDialog v-if="isShowAccountEditDialog" :resourceId="resourceId" @close="closeAccountEditDialog"></AccountEditDialog>
+    <AccountEditDialog
+      v-if="isShowAccountEditDialog"
+      :params="params"
+      :resourceId="resourceId"
+      @close="closeAccountEditDialog"
+    ></AccountEditDialog>
   </div>
 </template>
 <script>
diff --git a/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
index e3c61a98..cc4baf16 100644
--- a/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
@@ -28,6 +28,10 @@ export default {
       default: function() {
         return [];
       }
+    },
+    params: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -191,13 +195,21 @@ export default {
       if (!form.valid()) {
         return;
       }
-      this.$api.cmdb.accountManage
-        .saveAccount({...formValue, type: 'private', resourceId: this.resourceId, name: `${formValue.account}[${this.protocol}]`}) // 私有账号
-        .then(res => {
-          if (res && (res.Status == 'OK')) {
-            this.handleTipsMessage(res.Return);
-          }
-        });
+      let data = {
+        ...formValue, 
+        appSystemId: this.params.appSystemId,
+        appModuleId: this.params.appModuleId,
+        envId: this.params.envId,
+        type: 'private', 
+        resourceId: this.resourceId,
+        name: `${formValue.account}[${this.protocol}]`
+      };
+      // 私有账号
+      this.$api.deploy.env.saveEnvDbPrivateaccount(data).then(res => {
+        if (res && (res.Status == 'OK')) {
+          this.handleTipsMessage(res.Return);
+        }
+      });
     },
     handleTipsMessage(res) {
       // 失败，错误提示
-- 
Gitee


From 06c51ace84624bf4668a1abe4891becb0d36bb50 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 19 Jun 2025 15:39:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1445757985456128]?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83db=E9=85=8D=E7=BD=AE=E4=BE=BF=E6=8D=B7?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=BC=98=E5=8C=96=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?=
 =?UTF-8?q?45757985456128?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application-config/config/env/account-edit-dialog.vue     | 2 +-
 .../application-config/config/env/env-db-config-edit.vue      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
index cff97048..90a5b984 100644
--- a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
@@ -418,7 +418,7 @@ export default {
               resourceId: this.resourceId,
               id: row.value
             };
-            this.$api.develop.env.deleteEnvDbPrivateaccount(data).then(res => {
+            this.$api.deploy.env.deleteEnvDbPrivateaccount(data).then(res => {
               if (res && res.Status == 'OK') {
                 this.$Message.success(this.$t('message.deletesuccess'));
                 this.privateAccountList.splice(index, 1);
diff --git a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
index db89a953..efc92599 100644
--- a/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-db-config-edit.vue
@@ -18,7 +18,7 @@
             :item-list="formItemList"
           >
             <template v-slot:dbResourceId>
-              <TsFormItem :label="$t('page.database')" :required="true">
+              <TsFormItem :label="$t('page.database')" :required="true" tooltip="数据来自scence_database_ip_port_env_appmodule视图">
                 <div class="flex-start">
                   <TsFormSelect
                     ref="formSelect"
@@ -35,7 +35,7 @@
               </TsFormItem>
             </template>
             <template v-slot:accountId>
-              <TsFormItem :label="$t('page.account')" :required="true">
+              <TsFormItem :label="$t('page.account')" :required="true" tooltip="账号协议是database">
                 <div class="flex-start">
                   <TsFormSelect
                     ref="formSelect"
-- 
Gitee


From f8cc4e6d7e4f38944276e7f0ef32e70af04a7ad3 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 19 Jun 2025 17:34:59 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |  3 ++-
 src/resources/assets/languages/term/zh.json   |  3 ++-
 .../config/env/account-edit-dialog.vue        |  2 +-
 .../env/private-account-edit-dialog.vue       | 22 +++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index e07e426f..d2bcb488 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -2151,7 +2151,8 @@
     "blueset": "Blue green setting",
     "blueSet": "Blue Green",
     "ismodified": "Modified",
-    "presetrunnergroup": "Preset actuator group"
+    "presetrunnergroup": "Preset actuator group",
+    "testrunnerdesc": "If not specified, actuators will be automatically assigned based on IP matching of actuator groups according to network segments"
   },
   "inspect": {
     "alarmprompt": "Alarm Prompt",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 284c789c..018af33f 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -2148,7 +2148,8 @@
     "blueset": "蓝绿设置",
     "blueSet": "蓝绿",
     "ismodified": "已修改",
-    "presetrunnergroup": "预设执行器组"
+    "presetrunnergroup": "预设执行器组",
+    "testrunnerdesc": "如果不指定则会通过ip根据网段匹配执行器组自动分配执行器"
   },
   "inspect": {
     "alarmprompt": "告警提示",
diff --git a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
index 90a5b984..89740103 100644
--- a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
@@ -214,7 +214,7 @@ export default {
         testRunner: {
           type: 'slot',
           name: 'testRunner',
-          desc: '如果不指定则会通过ip根据网段匹配执行器组自动分配执行器',
+          desc: this.$t('term.deploy.testrunnerdesc'),
           label: this.$t('page.test') + this.$t('term.deploy.actuator'),
           transfer: true,
           multiple: false,
diff --git a/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
index cc4baf16..5f21a274 100644
--- a/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/private-account-edit-dialog.vue
@@ -48,7 +48,7 @@ export default {
       dialogConfig: {
         type: 'modal',
         isShow: true,
-        title: this.accountId ? '编辑私有账号' : '新增私有账号'
+        title: this.accountId ? this.$t('dialog.title.edittarget', {'target': this.$t('page.privateaccount')}) : this.$t('page.newtarget', {'target': this.$t('page.privateaccount')})
       },
       formConfig: {
         id: {
@@ -61,7 +61,7 @@ export default {
           type: 'text',
           name: 'name',
           width: '100%',
-          label: '名称',
+          label: this.$t('page.name'),
           maxlength: 50,
           isHidden: true
         },
@@ -69,12 +69,12 @@ export default {
           type: 'text',
           name: 'account',
           width: '100%',
-          label: '用户名',
+          label: this.$t('page.username'),
           maxlength: 50,
           validateList: ['required', {
             name: 'custom',
             trigger: 'change',
-            message: '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。',
+            message: this.$t('term.cmdb.repeataccount'),
             validator: (rule, val) => {
               return this.validAccountProtocalUnique(val);
             }
@@ -85,7 +85,7 @@ export default {
           type: 'password',
           name: 'passwordPlain',
           width: '100%',
-          label: '密码'
+          label: this.$t('page.password')
         },
         protocolId: {
           type: 'select',
@@ -100,7 +100,7 @@ export default {
           validateList: ['required', {
             name: 'custom',
             trigger: 'change',
-            message: '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。',
+            message: this.$t('term.cmdb.repeataccount'),
             validator: (rule, protocolId) => {
               return this.validAccountProtocalUnique();
             }
@@ -112,7 +112,7 @@ export default {
           onChange: (val, objectValue) => {
             this.protocol = objectValue ? objectValue.text : '';
             if (!this.validAccountProtocalUnique()) {
-              this.$set(this.formConfig['protocolId'], 'errorMessage', '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。');
+              this.$set(this.formConfig['protocolId'], 'errorMessage', this.$t('term.cmdb.repeataccount'));
             } else {
               this.$set(this.formConfig['protocolId'], 'errorMessage', '');
             }
@@ -125,7 +125,7 @@ export default {
                 {
                   name: 'custom',
                   trigger: 'change',
-                  message: '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。',
+                  message: this.$t('term.cmdb.repeataccount'),
                   validator: (rule, val) => {
                     return this.validAccountProtocalUnique(val);
                   }
@@ -138,7 +138,7 @@ export default {
           type: 'select',
           name: 'tagIdList',
           width: '100%',
-          label: '标签',
+          label: this.$t('page.tag'),
           transfer: true,
           multiple: true,
           search: true,
@@ -215,7 +215,7 @@ export default {
       // 失败，错误提示
       if (res && res.failureReasonList && res.failureReasonList instanceof Array && res.failureReasonList.length > 0) {
         this.$Notice.error({
-          title: '错误提示',
+          title: this.$t('term.framework.errorinfo'),
           duration: 10,
           render: h => {
             return h('div', [
@@ -226,7 +226,7 @@ export default {
                   return h('li', {}, item || '');
                 })
               ),
-              h('div', {}, '协议相同且用户名相同，同一资产不可绑定多个协议相同且用户名相同的账号。')
+              h('div', {}, this.$t('term.cmdb.repeataccount'))
             ]);
           }
         });
-- 
Gitee


From af02e4d2d26958c60ae228694ccbac84bee9c6a9 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 19 Jun 2025 17:37:29 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application-config/config/env/account-edit-dialog.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
index 89740103..0f1a7e12 100644
--- a/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
+++ b/src/views/pages/deploy/application-config/config/env/account-edit-dialog.vue
@@ -228,7 +228,7 @@ export default {
         },
         testResult: {
           type: 'slot',
-          label: '测试结果',
+          label: this.$t('term.cmdb.testaccount'),
           isHidden: true // 默认隐藏，点击【测试连接】之后才显示
         }
       }
-- 
Gitee