From a2092c35522b640eea55aa1554fe22b72e91a282 Mon Sep 17 00:00:00 2001 From: hyunfa <1598047833@qq.com> Date: Fri, 16 Aug 2024 17:46:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20--story=3D119198632=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=8B=A5=E5=B9=B2=E9=85=8D=E7=BD=AE=E9=A1=B9=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20#=20Reviewed,=20transaction=20id:=2015639?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/strategy-table.vue | 44 +++++++-------- .../components/common/strategy-template.vue | 55 ++++++++++--------- frontend/src/i18n/en.js | 2 +- frontend/src/i18n/zh.js | 2 +- frontend/src/store/modules/agent.ts | 2 +- frontend/src/store/modules/cloud.ts | 2 +- frontend/src/views/agent/agent-list.vue | 18 +++--- .../views/agent/agent-setup/agent-import.vue | 2 +- .../views/agent/agent-setup/agent-setup.vue | 2 +- .../views/agent/components/create-excel.ts | 4 +- .../src/views/agent/config/editTableConfig.ts | 26 ++++----- .../views/agent/config/importTableConfig.js | 26 ++++----- .../views/agent/config/setupTableConfig.ts | 28 +++++----- .../cloud-manager-add/cloud-manager-setup.vue | 2 +- .../cloud-detail-table.vue | 8 +-- .../components/sideslider-content-edit.vue | 6 +- .../src/views/cloud/config/netTableConfig.ts | 24 ++++---- .../views/cloud/config/proxy-detail-config.js | 14 ++--- 18 files changed, 135 insertions(+), 132 deletions(-) diff --git a/frontend/src/components/common/strategy-table.vue b/frontend/src/components/common/strategy-table.vue index 981769ea2..efcfbafb9 100644 --- a/frontend/src/components/common/strategy-table.vue +++ b/frontend/src/components/common/strategy-table.vue @@ -310,7 +310,7 @@ export default class StrategyTable extends Vue { }, { source: 'Agent', - targetAdress: 'Proxy(GSE_agent)', + targetAdress: 'Proxy(gse_agent)', protocol: 'TCP', portKey: 'io_port', use: this.$t('任务服务端口'), @@ -321,7 +321,7 @@ export default class StrategyTable extends Vue { }, { source: 'Agent', - targetAdress: 'Proxy(GSE_transit)', + targetAdress: 'Proxy(gse_data)', protocol: 'TCP', portKey: 'data_port', use: this.$t('数据上报端口'), @@ -332,7 +332,7 @@ export default class StrategyTable extends Vue { }, { source: 'Agent', - targetAdress: 'Proxy(GSE_btsvr)', + targetAdress: 'Proxy(gse_file)', protocol: 'TCP', portKey: 'file_svr_port', use: this.$t('BT传输'), @@ -343,7 +343,7 @@ export default class StrategyTable extends Vue { }, { source: 'Agent', - targetAdress: 'Proxy(GSE_btsvr)', + targetAdress: 'Proxy(gse_file)', protocol: 'TCP,UDP', portKey: 'bt_port', use: this.$t('BT传输'), @@ -354,7 +354,7 @@ export default class StrategyTable extends Vue { }, { source: 'Agent', - targetAdress: 'Proxy(GSE_btsvr)', + targetAdress: 'Proxy(gse_file)', protocol: 'UDP', portKey: 'tracker_port', use: this.$t('BT传输'), @@ -364,7 +364,7 @@ export default class StrategyTable extends Vue { targetKey: 'proxy', }, { - source: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', targetAdress: 'Agent', protocol: 'TCP,UDP', portKey: 'bt_range', @@ -396,7 +396,7 @@ export default class StrategyTable extends Vue { ], Proxy: [ { - source: 'Proxy(GSE_agent)', + source: 'Proxy(gse_agent)', targetAdress: 'GSE_task', protocol: 'TCP', portKey: 'io_port', @@ -407,7 +407,7 @@ export default class StrategyTable extends Vue { targetKey: 'taskserver', }, { - source: 'Proxy(GSE_transit)', + source: 'Proxy(gse_data)', targetAdress: 'GSE_data', protocol: 'TCP', portKey: 'data_port', @@ -418,7 +418,7 @@ export default class StrategyTable extends Vue { targetKey: 'dataserver', }, { - source: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', targetAdress: 'GSE_btsvr', protocol: 'TCP', portKey: 'btsvr_thrift_port', @@ -429,7 +429,7 @@ export default class StrategyTable extends Vue { targetKey: 'btfileserver', }, { - source: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', targetAdress: 'GSE_btsvr', protocol: 'TCP,UDP', portKey: 'bt_port', @@ -440,7 +440,7 @@ export default class StrategyTable extends Vue { targetKey: 'btfileserver', }, { - source: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', targetAdress: 'GSE_btsvr', protocol: 'UDP', portKey: 'tracker_port', @@ -452,7 +452,7 @@ export default class StrategyTable extends Vue { }, { source: 'GSE_btsvr', - targetAdress: 'Proxy(GSE_btsvr)', + targetAdress: 'Proxy(gse_file)', protocol: 'TCP', portKey: 'btsvr_thrift_port', use: this.$t('BT传输'), @@ -463,7 +463,7 @@ export default class StrategyTable extends Vue { }, { source: 'GSE_btsvr', - targetAdress: 'Proxy(GSE_btsvr)', + targetAdress: 'Proxy(gse_file)', protocol: 'TCP,UDP', portKey: 'bt_port', use: this.$t('BT传输'), @@ -474,7 +474,7 @@ export default class StrategyTable extends Vue { }, { source: 'GSE_btsvr', - targetAdress: 'Proxy(GSE_btsvr)', + targetAdress: 'Proxy(gse_file)', protocol: 'UDP', portKey: 'tracker_port', use: this.$t('BT传输'), @@ -484,8 +484,8 @@ export default class StrategyTable extends Vue { targetKey: 'agent', }, { - source: 'Proxy(GSE_btsvr)', - targetAdress: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', + targetAdress: 'Proxy(gse_file)', protocol: 'TCP', portKey: 'btsvr_thrift_port', use: `${this.$t('BT传输')}${this.$t('同一子网')}`, @@ -495,8 +495,8 @@ export default class StrategyTable extends Vue { targetKey: 'agent', }, { - source: 'Proxy(GSE_btsvr)', - targetAdress: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', + targetAdress: 'Proxy(gse_file)', protocol: 'TCP,UDP', portKey: 'bt_port', use: `${this.$t('BT传输')}${this.$t('同一子网')}`, @@ -506,8 +506,8 @@ export default class StrategyTable extends Vue { targetKey: 'agent', }, { - source: 'Proxy(GSE_btsvr)', - targetAdress: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', + targetAdress: 'Proxy(gse_file)', protocol: 'UDP', portKey: 'tracker_port', use: `${this.$t('BT传输')}${this.$t('同一子网')}`, @@ -517,7 +517,7 @@ export default class StrategyTable extends Vue { targetKey: 'agent', }, { - source: 'Proxy(GSE_agent)', + source: 'Proxy(gse_file)', targetAdress: '', protocol: '', port: this.$t('监听随机端口'), @@ -526,7 +526,7 @@ export default class StrategyTable extends Vue { sourceKey: 'agent', }, { - source: 'Proxy(GSE_btsvr)', + source: 'Proxy(gse_file)', targetAdress: '', protocol: '', port: this.$t('监听随机端口'), diff --git a/frontend/src/components/common/strategy-template.vue b/frontend/src/components/common/strategy-template.vue index 996143482..6dd1aa20d 100644 --- a/frontend/src/components/common/strategy-template.vue +++ b/frontend/src/components/common/strategy-template.vue @@ -6,33 +6,33 @@ :key="`operation${index}`"> {{ `${ index + 1 }. ${ item }` }}

-
- -
- {{ `${ cloudArea.bk_cloud_name } - ${ cloudArea.ap_name }` }} -
-
- - -
- -
-
- +
+
+
@@ -61,6 +61,7 @@ export default class StrategyTemplate extends Vue { private cloudAreaList: any[] = []; private get tipList() { + if (this.hostType === 'Proxy') { return [ this.$t('Agent安装Tip1'), @@ -152,6 +153,8 @@ export default class StrategyTemplate extends Vue { }, arr); return arr; }, []); + console.log("🚀 ~ StrategyTemplate ~ this.cloudAreaList=Object.values ~ this.cloudAreaList:", this.cloudAreaList) + } /** * 手风琴模式 diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js index b0b9004b6..c9eb086a6 100644 --- a/frontend/src/i18n/en.js +++ b/frontend/src/i18n/en.js @@ -692,7 +692,7 @@ export default { Agent安装Tip2: 'When using non-root installation on Linux system, it is required to sudo execute /tmp/setup_agent.sh script without secret', Agent安装Tip3: 'Directly connected to the proxy: ensure that it can communicate with the following ports of the BlueKing server, you can use telnet to confirm whether the port is reachable', Proxy安装Tip1: 'When using non-root installation on Linux / Unix system , it is required to sudo execute the /tmp/setup_agent.sh script without secret', - Proxy安装Tip2: 'Directly connected to the Agent: ensure that it can communicate with the following ports of the BlueKing server. You can use telnet to confirm whether the port is reachable', + Proxy安装Tip2: 'Directly connect to the Agent: Ensure full bidirectional communication with the BlueKing server. If there are policy restrictions, you can add a control area to manage it', agent数量: '({num} in total)', 请将操作指令中的数据替换再执行: 'Please replace the {0} {1} {2} in the installation instruction with {3} before executing.', 等待手动操作查看: 'Wait for manual operation to view {0}', diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js index f427f2cbe..6a1b0f2b0 100644 --- a/frontend/src/i18n/zh.js +++ b/frontend/src/i18n/zh.js @@ -692,7 +692,7 @@ export default { Agent安装Tip2: 'Linux 系统使用非 root 安装时，要求可以免密sudo执行/tmp/setup_agent.sh 脚本', Agent安装Tip3: '直连 Proxy 端：保证与蓝鲸服务端以下端口互通， 可使用telnet来确认端口是否可通', Proxy安装Tip1: 'Linux/Unix 系统使用非 root 安装时，要求可以免密sudo执行/tmp/setup_agent.sh 脚本', - Proxy安装Tip2: '直连 Agent 端：保证与蓝鲸服务端以下端口互通，可使用telnet来确认端口是否可通', + Proxy安装Tip2: '直连Agent端：保证与蓝鲸服务端双向全通，若存在策略限制，可新增管控区域来管理', agent数量: '(共 {num} 个)', 请将操作指令中的数据替换再执行: '请将操作指令中的 {0} {1} {2} 替换成 {3} 再执行。', 等待手动操作查看: '等待手动操作，查看 {0}', diff --git a/frontend/src/store/modules/agent.ts b/frontend/src/store/modules/agent.ts index b6bde675e..54b6fd388 100644 --- a/frontend/src/store/modules/agent.ts +++ b/frontend/src/store/modules/agent.ts @@ -68,7 +68,7 @@ export default class AgentStore extends VuexModule { job_result: item.job_result ? item.job_result : {} as any, topology: item.topology && item.topology.length ? item.topology : [], bt_speed_limit: btSpeedLimit || '', - peer_exchange_switch_for_agent: !!peerExchangeSwitchForAgent || false, + peer_exchange_switch_for_agent: false, }; }); return data; diff --git a/frontend/src/store/modules/cloud.ts b/frontend/src/store/modules/cloud.ts index 5676c1823..fda128c89 100644 --- a/frontend/src/store/modules/cloud.ts +++ b/frontend/src/store/modules/cloud.ts @@ -155,7 +155,7 @@ export default class CloudStore extends VuexModule { status: item.status ? item.status.toLowerCase() : '', bt_speed_limit, data_path, - peer_exchange_switch_for_agent: !!peer_exchange_switch_for_agent, + peer_exchange_switch_for_agent: false, ...extraOther, }; }); diff --git a/frontend/src/views/agent/agent-list.vue b/frontend/src/views/agent/agent-list.vue index d77794703..f8a159717 100644 --- a/frontend/src/views/agent/agent-list.vue +++ b/frontend/src/views/agent/agent-list.vue @@ -363,7 +363,7 @@ {{ row.is_manual ? $t('手动') : $t('远程') }} - - + --> - - + --> { if (paramKey.includes(item)) { - obj[item] = item === 'peer_exchange_switch_for_agent' ? row[item] + 0 : row[item]; + obj[item] = item === 'peer_exchange_switch_for_agent' ? 0 : row[item]; } if (paramExtraKey.includes(item) && row[item]) { obj[item] = row[item]; diff --git a/frontend/src/views/cloud/components/sideslider-content-edit.vue b/frontend/src/views/cloud/components/sideslider-content-edit.vue index f1a83ac9b..d0e004d9a 100644 --- a/frontend/src/views/cloud/components/sideslider-content-edit.vue +++ b/frontend/src/views/cloud/components/sideslider-content-edit.vue @@ -73,13 +73,13 @@ :rules="rules.path"> - + @@ -196,7 +196,7 @@ export default class SidesliderContentEdit extends Vue { if (this.proxyData.bt_speed_limit) { params.bt_speed_limit = this.proxyData.bt_speed_limit; } - params.peer_exchange_switch_for_agent = Number(this.proxyData.peer_exchange_switch_for_agent || false); + params.peer_exchange_switch_for_agent = 0; const result = await CloudStore.updateHost(params); if (result) { this.$bkMessage({ diff --git a/frontend/src/views/cloud/config/netTableConfig.ts b/frontend/src/views/cloud/config/netTableConfig.ts index bcfc1934c..c2fcf1853 100644 --- a/frontend/src/views/cloud/config/netTableConfig.ts +++ b/frontend/src/views/cloud/config/netTableConfig.ts @@ -176,18 +176,18 @@ const config: ISetupHead[] = [ row[config.prop] = `/${osDirReplace(row[config.prop])}`; }, }, - { - label: 'BT节点探测', - prop: 'peer_exchange_switch_for_agent', - tips: 'BT节点探测提示', - type: 'switcher', - default: getDefaultConfig(defaultOsType, 'peer_exchange_switch_for_agent', false), - required: false, - show: true, - width: 115, - manualProp: true, - parentProp: 'trans_info', - }, + // { + // label: 'BT节点探测', + // prop: 'peer_exchange_switch_for_agent', + // tips: 'BT节点探测提示', + // type: 'switcher', + // default: getDefaultConfig(defaultOsType, 'peer_exchange_switch_for_agent', false), + // required: false, + // show: true, + // width: 115, + // manualProp: true, + // parentProp: 'trans_info', + // }, { label: '传输限速Unit', prop: 'bt_speed_limit', diff --git a/frontend/src/views/cloud/config/proxy-detail-config.js b/frontend/src/views/cloud/config/proxy-detail-config.js index 1c99d7f77..d2c2526e8 100644 --- a/frontend/src/views/cloud/config/proxy-detail-config.js +++ b/frontend/src/views/cloud/config/proxy-detail-config.js @@ -54,13 +54,13 @@ const config = [ type: 'auth', readonly: true, }, - { - prop: 'peer_exchange_switch_for_agent', - label: window.i18n.t('BT节点探测'), - tips: window.i18n.t('BT节点探测提示'), - type: 'tag-switch', - readonly: true, - }, + // { + // prop: 'peer_exchange_switch_for_agent', + // label: window.i18n.t('BT节点探测'), + // tips: window.i18n.t('BT节点探测提示'), + // type: 'tag-switch', + // readonly: true, + // }, { prop: 'bt_speed_limit', label: window.i18n.t('传输限速'),