diff --git a/011-fix-prompt-word.patch b/011-fix-prompt-word.patch new file mode 100644 index 0000000000000000000000000000000000000000..dff4845631d9b8ddd23a30b5ed68980f7039178f --- /dev/null +++ b/011-fix-prompt-word.patch @@ -0,0 +1,66 @@ +From f3f7580d187358748c73522b8580928389c0d836 Mon Sep 17 00:00:00 2001 +From: hugang <18768366022@163.com> +Date: Tue, 11 Jun 2024 19:48:09 +0800 +Subject: [PATCH] Fixed the issue of incorrect password prompt when hot modifying password + +--- + src/vendor/ant-design-pro/utils/request.js | 7 +------ + src/views/leaks/components/CreateRepairTaskDrawer.vue | 6 +++--- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/src/vendor/ant-design-pro/utils/request.js b/src/vendor/ant-design-pro/utils/request.js +index a09fe31..db07b57 100644 +--- a/src/vendor/ant-design-pro/utils/request.js ++++ b/src/vendor/ant-design-pro/utils/request.js +@@ -177,16 +177,11 @@ request.interceptors.response.use((response) => { + description: response.data.message + }); + break; +- case '1000': ++ default: + err = new Error(response.data.message); + err.data = response.data.data; + err.response = response.data; + throw err; +- default: +- notification.error({ +- message: response.data.label, +- description: response.data.message +- }); + } + } + if (response.headers['content-type'] === 'application/octet-stream') { +diff --git a/src/views/leaks/components/CreateRepairTaskDrawer.vue b/src/views/leaks/components/CreateRepairTaskDrawer.vue +index a9023da..51645d5 100644 +--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue ++++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue +@@ -246,7 +246,7 @@ const taskTypsbutton = { + const taskTypsEnum = { + 'cve fix': 'cve修复', + 'repo set': 'repo设置', +- 'cve rollback': '生成回滚任务(当前仅支持热补丁回滚)', ++ 'cve rollback': '回滚任务', + 'hotpatch remove': '热补丁移除' + }; + const hostListTypes = ['byLoading', 'bySelection', 'byOneHost']; +@@ -916,7 +916,7 @@ export default { + info: cveRoobackInfo + }; + if (cveRoobackInfo.length === 0) { +- this.$message.info('请至少选择一个cve下的一台主机进行回滚!'); ++ this.$message.info('请至少选择一个cve下的一台主机进行移除!'); + this.submitLoading = false; + this.submitAndExecuteLoading = false; + break; +@@ -928,7 +928,7 @@ export default { + this.handleExcuteASAP(res.data.task_id, res.data); + } else { + this.visible = false; +- this.handleGenerateSuccess(res.data, 'CVE回滚', 'normal'); ++ this.handleGenerateSuccess(res.data, '热补丁移除', 'normal'); + } + }) + .catch((err) => { +-- +2.43.0.windows.1 + diff --git a/012-file-conf-sync-property-optimize.patch b/012-file-conf-sync-property-optimize.patch new file mode 100644 index 0000000000000000000000000000000000000000..7133cfa304484a088c58308e7271e306d9881afa --- /dev/null +++ b/012-file-conf-sync-property-optimize.patch @@ -0,0 +1,1014 @@ +From 9f948901dcd91cea1d3c1a0137f2149cf47779c7 Mon Sep 17 00:00:00 2001 +From: chonglim +Date: Mon, 19 Feb 2024 14:22:50 +0800 +Subject: [PATCH 06/10] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= + =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E5=89=8D?= + =?UTF-8?q?=E7=AB=AF=E6=94=B9=E9=80=A0=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/api/configuration.js | 35 ++- + src/views/assests/HostGroupManagement.vue | 16 +- + .../TranscationDomainConfigurations.vue | 28 +- + .../configuration/TranscationDomainDetail.vue | 252 +++++------------- + .../TranscationDomainManagement.vue | 6 +- + .../components/AddHostDrawer.vue | 68 ++--- + .../components/AddTranscationDomainModal.vue | 15 +- + .../components/GetDomainStatusDrawer.vue | 56 ++-- + .../components/QueryRealConfsDrawer.vue | 4 +- + 9 files changed, 194 insertions(+), 286 deletions(-) + +diff --git a/src/api/configuration.js b/src/api/configuration.js +index d8f8b73..0f9c5ef 100644 +--- a/src/api/configuration.js ++++ b/src/api/configuration.js +@@ -10,8 +10,10 @@ const api = { + addHost: '/host/addHost', // 添加业务域主机 + domainStatus: '/confs/getDomainStatus', // 获取业务域主机同步状态 + syncConf: '/confs/syncConf', // 获取业务域主机同步状态 ++ batchSyncConf: '/confs/batch/syncConf', // 将当前业务域的配置批量同步到各主机 + queryRealConfs: '/confs/queryRealConfs', // 获取主机当前配置 +- queryExpectedConfs: '/confs/queryExpectedConfs' // 获取主机配置日志 ++ queryExpectedConfs: '/confs/queryExpectedConfs', // 获取主机配置日志 ++ queryHostAndStatus: '/manage/host/sync/status/get' // 获取业务域下的主机及其同步状态 + }; + + export default api; +@@ -48,12 +50,13 @@ export function addHost(domainName, hostInfos, ...parameter) { + }); + } + // 获取业务域主机同步状态 +-export function domainStatus({domainName, ...parameter}) { ++export function domainStatus(domainName, hostIp) { + return request({ + url: api.domainStatus, + method: 'post', + data: { +- domainName ++ domainName: domainName, ++ ip: hostIp + } + }); + } +@@ -100,7 +103,8 @@ export function syncConf(parameter) { + data: { + domainName: parameter.domainName, + syncList: parameter.syncList +- } ++ }, ++ timeout: 900000 + }); + } + // 获取主机当前配置 +@@ -126,3 +130,26 @@ export function queryExpectedConfs(domainName, hostIds, ...parameter) { + } + }); + } ++ ++// 获取业务域下的主机及其同步状态 ++export function queryHostAndStatus(domainName) { ++ return request({ ++ url: api.queryHostAndStatus, ++ method: 'post', ++ data: { ++ domain_name: domainName ++ } ++ }); ++} ++ ++// 将当前业务域的配置批量同步到各主机 ++export function batchSyncConf(domainName, hostIds) { ++ return request({ ++ url: api.batchSyncConf, ++ method: 'put', ++ data: { ++ domainName: domainName, ++ hostIds: hostIds ++ } ++ }); ++} +diff --git a/src/views/assests/HostGroupManagement.vue b/src/views/assests/HostGroupManagement.vue +index 64d622f..e2c40c1 100644 +--- a/src/views/assests/HostGroupManagement.vue ++++ b/src/views/assests/HostGroupManagement.vue +@@ -48,8 +48,7 @@ + @change="handleTableChange" + :loading="tableIsLoading" + :expandIconColumnIndex="0" +- @expend="aleret(1)" +- > ++ @expend="aleret(1)"> + + + + + +@@ -56,68 +37,18 @@ + :data-source="tableData" + :row-selection="rowSelection" + :loading="tableIsLoading" +- :pagination="false" +- > +- +- ++ :pagination="false"> + + 当前配置 + +- + 状态详情 + +- + +- 删除 ++ @confirm="deleteDomainHost(record)"> ++ 删除 + + + +@@ -140,15 +71,11 @@ + title="状态详情" + ref="domainStatusDrawer" + :hasButtonOnBottom="false" +- :bodyStyle="{paddingBottom: '80px'}" +- > ++ :bodyStyle="{paddingBottom: '80px'}"> + + + +@@ -157,7 +84,7 @@ + ++ +diff --git a/src/views/configuration/components/AddTranscationDomainModal.vue b/src/views/configuration/components/AddTranscationDomainModal.vue +index f19557c..2f29133 100644 +--- a/src/views/configuration/components/AddTranscationDomainModal.vue ++++ b/src/views/configuration/components/AddTranscationDomainModal.vue +@@ -1,7 +1,12 @@ +