From 1b846799f4dea60b0b4d5a79fbf10c67842c63d8 Mon Sep 17 00:00:00 2001
From: Hu Gang <18768366022@163.com>
Date: Thu, 18 Jul 2024 19:35:17 +0800
Subject: [PATCH] Fixed the issue of incorrect password prompt when hot
(cherry picked from commit 0774aca2a11add7564ad7483f2cdc5685b18c969)
---
015-incorrect-password-prompt.patch | 35 +++++++++++++++++++++++++++++
aops-hermes.spec | 6 ++++-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 015-incorrect-password-prompt.patch
diff --git a/015-incorrect-password-prompt.patch b/015-incorrect-password-prompt.patch
new file mode 100644
index 0000000..4661d82
--- /dev/null
+++ b/015-incorrect-password-prompt.patch
@@ -0,0 +1,35 @@
+From 753afbe9f0e2202146415fc7d00f127289475112 Mon Sep 17 00:00:00 2001
+From: Hu Gang <18768366022@163.com>
+Date: Thu, 18 Jul 2024 19:32:15 +0800
+Subject: [PATCH] Fixed the issue of incorrect password prompt when hot
+ modifying password
+
+---
+ src/views/leaks/components/CreateRepairTaskDrawer.vue | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/views/leaks/components/CreateRepairTaskDrawer.vue b/src/views/leaks/components/CreateRepairTaskDrawer.vue
+index 6074199..51645d5 100644
+--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue
++++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue
+@@ -204,7 +204,7 @@
+ {{ jumpModalTitle || '成功' }}
+
+ 点击跳转到 {{taskTypsEnum[taskType]}}任务页面点击跳转到{{ item.fix_way }}{{ taskType === 'cve fix' ? '修复' : '移除' }}任务页面
+
+
+@@ -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.33.0
+
diff --git a/aops-hermes.spec b/aops-hermes.spec
index 9600130..466d424 100644
--- a/aops-hermes.spec
+++ b/aops-hermes.spec
@@ -2,7 +2,7 @@
Name: aops-hermes
Version: v1.4.0
-Release: 10
+Release: 11
Summary: Web for an intelligent diagnose frame
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
@@ -22,6 +22,7 @@ Patch011: 011-fix-prompt-word.patch
Patch012: 012-file-conf-sync-property-optimize.patch
Patch013: 013-optimize-conf-trace-request-and-response.patch
Patch014: 014-add-conf-trace-info-function.patch
+Patch015: 015-incorrect-password-prompt.patch
BuildRequires: nodejs node-gyp nodejs-yarn
Requires: nginx
@@ -57,6 +58,9 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
%changelog
+* Thu Jul 018 2024 Hu gang - v1.4.0-11
+- Fixed incorrect password prompt when hot modifying password
+
* Mon Jul 01 2024 smjiao - v1.4.0-10
- conf sync optimize and add file trace interface
--
Gitee