-+
-
-
-
-@@ -51,4 +51,8 @@ export default {
- };
-
-
--
-+
-diff --git a/src/views/leaks/LeakTaskList.vue b/src/views/leaks/LeakTaskList.vue
-index cc755aa..168ea83 100644
---- a/src/views/leaks/LeakTaskList.vue
-+++ b/src/views/leaks/LeakTaskList.vue
-@@ -422,7 +422,7 @@ export default {
-
-
-diff --git a/src/views/leaks/components/HostTable.vue b/src/views/leaks/components/HostTable.vue
-index 4387d91..ad4768b 100644
---- a/src/views/leaks/components/HostTable.vue
-+++ b/src/views/leaks/components/HostTable.vue
-@@ -1,5 +1,5 @@
-
--
-+
-
-
-
-
-@@ -50,6 +51,7 @@
- :hostList="hostListAll"
- :repoList="repoListProps"
- @createSuccess="handleTaskCreateSuccess"
-+ @getAllHost="getAllHost"
- />
-
-
-@@ -206,7 +208,7 @@ export default {
- {
- dataIndex: 'cve_num',
- key: 'cve_num',
-- title: 'CVE 个数',
-+ title: '受影响CVE个数',
- sorter: true
- },
- {
-@@ -311,6 +313,18 @@ export default {
- };
- },
- methods: {
-+ getAllHost() {
-+ this.getHostList();
-+ this.getHostGroup();
-+ if (this.standalone) {
-+ // 主机列表页面中要自行获取全量主机和扫描状态
-+ this.getScanStatusAll([]);
-+ this.getHostListAll();
-+ } else {
-+ // 主机详情页面中要自行获取repo列表
-+ this.getRepoList();
-+ }
-+ },
- handleExport() {
- if (this.selectedRowKeys.length !== 0) {
- console.log(this.selectedRowKeys);
-@@ -504,6 +518,9 @@ export default {
- this.selectedRowKeys = [];
- this.selectedRows = [];
- this.getHostList();
-+ if (this.standalone) {
-+ this.getHostListAll();
-+ }
- },
- handleReset() {
- this.pagination = defaultPagination;
-@@ -682,7 +699,7 @@ export default {
- font-size: 16px;
- margin: 0 6px;
- }
--.ant-table-wrapper {
-- overflow: hidden;
-+.hostbox{
-+ overflow: auto;
- }
-
-diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
-index 92d16cd..388e7e0 100644
---- a/src/views/user/Login.vue
-+++ b/src/views/user/Login.vue
-@@ -45,7 +45,7 @@
-
-
-
--
-+
-
-
-
---
-Gitee
-
diff --git a/0004-fix-bug-the-task-report-is-not-displayed.patch b/0004-fix-bug-the-task-report-is-not-displayed.patch
deleted file mode 100644
index 782e2c5..0000000
--- a/0004-fix-bug-the-task-report-is-not-displayed.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9c88fc94b1a0231527ab5af4c72db78a4b3adfc1 Mon Sep 17 00:00:00 2001
-From: wkl505997900 <505997900@qq.com>
-Date: Fri, 23 Dec 2022 15:30:54 +0800
-Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=AC=AC=E5=85=AD=E6=AC=A1?=
- =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- src/views/leaks/LeakTaskDetail.vue | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/views/leaks/LeakTaskDetail.vue b/src/views/leaks/LeakTaskDetail.vue
-index c8f98db..2094efe 100644
---- a/src/views/leaks/LeakTaskDetail.vue
-+++ b/src/views/leaks/LeakTaskDetail.vue
-@@ -445,6 +445,17 @@ export default {
- _this.progressLoading = false;
- });
- },
-+ getVisible(statusMap) {
-+ for (const key in statusMap) {
-+ if (key === 'running') {
-+ if (statusMap[key] === '1') {
-+ return true
-+ } else {
-+ return false
-+ }
-+ }
-+ }
-+ },
- prgressFinishedCheck(statusMap) {
- for (const taskId in statusMap) {
- if (statusMap[taskId]['running']) {
-@@ -571,6 +582,7 @@ export default {
- pageSize: pagination.pageSize,
- total: res.total_count || (res.total_count === 0 ? 0 : pagination.total)
- };
-+ _this.reportvisible = !_this.hostRepostatusCheck(res.result)
- if (_this.hostRepostatusCheck(res.result)) {
- setTimeout(function() {
- _this.getHostList();
---
-Gitee
-
diff --git a/aops-hermes-v1.1.2.tar.gz b/aops-hermes-v1.1.2.tar.gz
deleted file mode 100644
index 969b30e..0000000
Binary files a/aops-hermes-v1.1.2.tar.gz and /dev/null differ
diff --git a/aops-hermes-v1.2.2.tar.gz b/aops-hermes-v1.2.2.tar.gz
new file mode 100644
index 0000000..7bb6c50
Binary files /dev/null and b/aops-hermes-v1.2.2.tar.gz differ
diff --git a/aops-hermes.spec b/aops-hermes.spec
index 0420024..578d196 100644
--- a/aops-hermes.spec
+++ b/aops-hermes.spec
@@ -1,17 +1,13 @@
%define debug_package %{nil}
Name: aops-hermes
-Version: v1.1.2
-Release: 5
+Version: v1.2.2
+Release: 1
Summary: Web for an intelligent diagnose frame
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
Source0: %{name}-%{version}.tar.gz
-Source1: node-modules.tar.gz
-Patch0001: 0001-some-bugfix-for-diana-website.patch
-Patch0002: 0002-bugfix-alarm-number-not-update-synchronously.patch
-Patch0003: 0003-fix-bugs-that-are-found.patch
-Patch0004: 0004-fix-bug-the-task-report-is-not-displayed.patch
+Source1: node_modules.tar.gz
BuildRequires: nodejs node-gyp nodejs-yarn
@@ -23,11 +19,14 @@ Web for an intelligent diagnose frame
%prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version}
%setup -T -D -a 1
%build
+export NODE_OPTIONS=--openssl-legacy-provider
+ls ./.npmrc
+cat ./.npmrc
yarn build
@@ -47,8 +46,55 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
%changelog
-* Sat Dec 24 2022 wenxin - v1.1.2-5
-- Fix the problem that the task report is not displayed after the repo-set task is completed
+* Tue Jul 18 2023 wangkunlong<505997900@qq.com> - v1.2.2-1
+- Solved the problem of nodejs being unable to build successfully in the 23.03 environment on the master branch
+- Modify the front-end tab icon to the openeuler icon
+- Fix the issue of selecting a fixed cold patch for rollback operation, with incorrect prompts in the previous paragraph
+
+* Wed Jun 14 2023 wangkunlong<505997900@qq.com> - v1.2.1-7
+- The host list under cve has been fixed and the hot patch repair column has been changed to support hot patches
+- The CVE list under the host list has-not been fixed and the hot patch support has been changed-to support hot patches
+- Generate support for hot patches in the CVE repair task and add tooltip help text after accepting or not
+
+* Fri Jun 9 2023 wangkunlong<505997900@qq.com> - v1.2.1-6
+- Fix-token-refresh-issue
+- Solve-the-issue-of-unreasonable-layout-in-the-CVE-detail-interface
+- Resolve-the-issue-of-incorrect-task-list-filtering
+
+* Fri Jun 2 2023 wangkunlong<505997900@qq.com> - v1.2.1-5
+- Add host under cve hotpatch Filtering function
+
+* Fri Jun 2 2023 wangkunlong<505997900@qq.com> - v1.2.1-4
+- Add Hot patch Filtering function
+
+* Fri Jun 2 2023 wangkunlong<505997900@qq.com> - v1.2.1-3
+- Add the 'accepted' parameter to the interface for creating cve repair tasks
+- Modify the cve list under the host and the hot patch support in the affected host list under cve to display two fields: hot patch repair and status
+- Modify the display of host status in the host management interface
+
+* Thu Jun 1 2023 wangkunlong<505997900@qq.com> - v1.2.1-2
+- Resolve the issue of abnormal page display when switching host details
+- Resolve the issue of host details and hot patch support column filtering failure
+- Resolve the issue of incorrect filtering conditions in the "Rollback Status" column of the CVE list for task details
+- Resolve the issue of incorrect display of the latest status of the host on the task details pag
+
+* Tue May 23 2023 wangkunlong<505997900@qq.com> - v1.2.1-1
+- Vulnerability Management Part Code Hot Update Function Update
+
+* Fri Apr 28 2023 wangkunlong<505997900@qq.com> - v1.2.0-2
+- Optimize page loading speed
+- Optimize routing
+- Optimize login and exit interface
+- Solve the inconsistency in verifying the host name field between the front and back ends when adding hosts in a single and batch manner
+- Optimize login interface UI display
+- Resolve the display of registration interface icons and text
+- Solve legacy issues with batch adding hosts and editing host interfaces
+- Optimize CVE list refresh logic
+- Add exit interface
+- Optimize Gitee authorization login jump logic
+
+* Mon Apr 17 2023 wangkunlong<505997900@qq.com> - v1.2.0-1
+- add host interfaces, optimize the display effect of some interfaces
* Mon Dec 19 2022 wenxin - v1.1.2-4
- Fix the bugs that are found
@@ -75,4 +121,4 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
- Fix the bug of cve vulnerability management module
* Tue Nov 22 2022 zhuyuncheng - v1.0.0-1
-- Package init
+- Package init
\ No newline at end of file
diff --git a/node-modules.tar.gz b/node_modules.tar.gz
similarity index 75%
rename from node-modules.tar.gz
rename to node_modules.tar.gz
index 4c505ee..0b7a12a 100644
Binary files a/node-modules.tar.gz and b/node_modules.tar.gz differ