diff --git a/011-fix-prompt-word.patch b/011-fix-prompt-word.patch new file mode 100644 index 0000000..a56c0bc --- /dev/null +++ b/011-fix-prompt-word.patch @@ -0,0 +1,71 @@ +From dae976daf452aeb851350c5c1315027872c1a399 Mon Sep 17 00:00:00 2001 +From: hugang <18768366022@163.com> +Date: Tue, 11 Jun 2024 19:48:09 +0800 +Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= + =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=AF=86?= + =?UTF-8?q?=E7=A0=81=E6=97=B6=E6=8F=90=E7=A4=BA=E8=AF=8D=E9=94=99=E8=AF=AF?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + 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..6074199 100644 +--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue ++++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue +@@ -204,7 +204,7 @@ +
+ 点击跳转到{{ item.fix_way }}{{ taskType === 'cve fix' ? '修复' : '移除' }}任务页面点击跳转到 {{taskTypsEnum[taskType]}}任务页面 +
++@@ -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; +-- +2.43.0.windows.1 + diff --git a/aops-hermes.spec b/aops-hermes.spec index 9f13fc3..b339e01 100644 --- a/aops-hermes.spec +++ b/aops-hermes.spec @@ -2,7 +2,7 @@ Name: aops-hermes Version: v1.4.0 -Release: 7 +Release: 8 Summary: Web for an intelligent diagnose frame License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -18,6 +18,7 @@ Patch007: 007-host-info-and-generate-task.patch Patch008: 008-fix-diagnosis.patch Patch009: 009-fix-hot-patch-prompts-are-only-executed-if-executed.patch Patch010: 010-modify-the-task-description-copy-of-the-create-hot-patch-removal-task.patch +Patch011: 011-fix-prompt-word.patch BuildRequires: nodejs node-gyp nodejs-yarn @@ -53,6 +54,9 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/ %changelog +* Tue Jun 11 2024 Hu gang<18768366022@163.com> - v1.4.0-8 +- Modify password interface prompt word modification + * Wed Jan 17 2024 Hu gang<18768366022@163.com> - v1.4.0-7 - Modify the task description copy of the create hot patch removal task - remove create rollback button in cve detail,add hotpatch button in cve detail