From 4ca481ea568cb4b01612adc5c168ecf9e8b7a1c4 Mon Sep 17 00:00:00 2001
From: hugang <18768366022@163.com>
Date: Mon, 8 Jul 2024 15:27:17 +0800
Subject: [PATCH] fixed the incorrect password prompt when hot modifying
password
---
011-fix-prompt-word.patch | 29 ++++++++++++-----------------
aops-hermes.spec | 5 ++++-
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/011-fix-prompt-word.patch b/011-fix-prompt-word.patch
index a56c0bc..dff4845 100644
--- a/011-fix-prompt-word.patch
+++ b/011-fix-prompt-word.patch
@@ -1,12 +1,7 @@
-From dae976daf452aeb851350c5c1315027872c1a399 Mon Sep 17 00:00:00 2001
+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] =?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
+Subject: [PATCH] Fixed the issue of incorrect password prompt when hot modifying password
---
src/vendor/ant-design-pro/utils/request.js | 7 +------
@@ -36,18 +31,9 @@ index a09fe31..db07b57 100644
}
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
+index a9023da..51645d5 100644
--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue
+++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue
-@@ -204,7 +204,7 @@
- {{ jumpModalTitle || '成功' }}
-
- 点击跳转到{{ item.fix_way }}{{ taskType === 'cve fix' ? '修复' : '移除' }}任务页面点击跳转到 {{taskTypsEnum[taskType]}}任务页面
-
-
@@ -246,7 +246,7 @@ const taskTypsbutton = {
const taskTypsEnum = {
'cve fix': 'cve修复',
@@ -66,6 +52,15 @@ index a9023da..6074199 100644
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/aops-hermes.spec b/aops-hermes.spec
index b339e01..f4fcfd8 100644
--- a/aops-hermes.spec
+++ b/aops-hermes.spec
@@ -2,7 +2,7 @@
Name: aops-hermes
Version: v1.4.0
-Release: 8
+Release: 9
Summary: Web for an intelligent diagnose frame
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
@@ -54,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-9
+- Fixed the issue of incorrect password prompt when hot modifying password
+
* Tue Jun 11 2024 Hu gang<18768366022@163.com> - v1.4.0-8
- Modify password interface prompt word modification
--
Gitee