!54 update to 23.09 rc3
From: @wkl505997900 Reviewed-by: @zhu-yuncheng Signed-off-by: @zhu-yuncheng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
f223a46c59
@ -1,136 +0,0 @@
|
|||||||
From 6c76855ede6ab96aa26bc4b2cdf1aa57ccafc38f Mon Sep 17 00:00:00 2001
|
|
||||||
From: wkl505997900 <2313665567@qq.com>
|
|
||||||
Date: Fri, 28 Jul 2023 14:36:11 +0800
|
|
||||||
Subject: [PATCH] Fix-host-issues-and-batch-upload-host-issues
|
|
||||||
|
|
||||||
---
|
|
||||||
.npmrc | 1 -
|
|
||||||
src/views/assests/HostManagement.vue | 3 +++
|
|
||||||
src/views/assests/components/addMoreHost.vue | 1 +
|
|
||||||
src/views/leaks/components/CvesTable.vue | 7 +++----
|
|
||||||
vue.config.js | 10 +++++-----
|
|
||||||
5 files changed, 12 insertions(+), 10 deletions(-)
|
|
||||||
delete mode 100644 .npmrc
|
|
||||||
|
|
||||||
diff --git a/.npmrc b/.npmrc
|
|
||||||
deleted file mode 100644
|
|
||||||
index 03450f7..0000000
|
|
||||||
--- a/.npmrc
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1 +0,0 @@
|
|
||||||
-node-options="--openssl-legacy-provider"
|
|
||||||
\ No newline at end of file
|
|
||||||
diff --git a/src/views/assests/HostManagement.vue b/src/views/assests/HostManagement.vue
|
|
||||||
index 5e7d1f9..6a02e80 100644
|
|
||||||
--- a/src/views/assests/HostManagement.vue
|
|
||||||
+++ b/src/views/assests/HostManagement.vue
|
|
||||||
@@ -332,7 +332,10 @@ export default {
|
|
||||||
} else {
|
|
||||||
this.$message.success('删除成功');
|
|
||||||
}
|
|
||||||
+ _this.pagination.current = 1
|
|
||||||
+ // 删除主机后重置当前分页为第一页
|
|
||||||
_this.getHostList();
|
|
||||||
+ // 重新请求主机列表
|
|
||||||
if (isBash) {
|
|
||||||
_this.selectedRowKeys = [];
|
|
||||||
_this.selectedRowsAll = [];
|
|
||||||
diff --git a/src/views/assests/components/addMoreHost.vue b/src/views/assests/components/addMoreHost.vue
|
|
||||||
index 4cd9a65..717a7e8 100644
|
|
||||||
--- a/src/views/assests/components/addMoreHost.vue
|
|
||||||
+++ b/src/views/assests/components/addMoreHost.vue
|
|
||||||
@@ -367,6 +367,7 @@ export default {
|
|
||||||
tableParams.forEach((item) => {
|
|
||||||
this.$set(item, 'host_name', String(item.host_name))
|
|
||||||
item.management = Boolean(item.management)
|
|
||||||
+ item.password = String(item.password)
|
|
||||||
delete item.key;
|
|
||||||
delete item.editable;
|
|
||||||
delete item.result;
|
|
||||||
diff --git a/src/views/leaks/components/CvesTable.vue b/src/views/leaks/components/CvesTable.vue
|
|
||||||
index b29b03f..84c22c1 100644
|
|
||||||
--- a/src/views/leaks/components/CvesTable.vue
|
|
||||||
+++ b/src/views/leaks/components/CvesTable.vue
|
|
||||||
@@ -102,7 +102,7 @@
|
|
||||||
rowKey="cve_id"
|
|
||||||
:columns="standalone ? tableColumnsStandalone : tableColumns"
|
|
||||||
:data-source="standalone ? tableData : inputList"
|
|
||||||
- :pagination="pagination.total === 0 ? false : pagination"
|
|
||||||
+ :pagination="pagination.total === 0 ? false : (!standalone ? (paginationTotal === 0 ? false : pagination) : pagination)"
|
|
||||||
:rowSelection="rowSelection"
|
|
||||||
:expandIconAsCell="false"
|
|
||||||
:expandIconColumnIndex="1"
|
|
||||||
@@ -562,11 +562,11 @@ export default {
|
|
||||||
})
|
|
||||||
.then(function (res) {
|
|
||||||
_this.cveAllList = res.data.result || [];
|
|
||||||
- this.$emit('updataCveAllList', res.data.result || [])
|
|
||||||
+ _this.$emit('updataCveAllList', res.data.result || [])
|
|
||||||
// _this.cveAllListProp = res.data.result || [];
|
|
||||||
})
|
|
||||||
.catch(function (err) {
|
|
||||||
- _this.$message.error(err.response.message);
|
|
||||||
+ _this.$message.error(err.response);
|
|
||||||
})
|
|
||||||
.finally(function () {
|
|
||||||
_this.cveAllIsLoading = false;
|
|
||||||
@@ -621,7 +621,6 @@ export default {
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
- console.log(this.inputList)
|
|
||||||
setTimeout(() => {
|
|
||||||
this.getCvesAll();
|
|
||||||
}, 500);
|
|
||||||
diff --git a/vue.config.js b/vue.config.js
|
|
||||||
index de4986a..db861b6 100644
|
|
||||||
--- a/vue.config.js
|
|
||||||
+++ b/vue.config.js
|
|
||||||
@@ -137,7 +137,7 @@ const vueConfig = {
|
|
||||||
},
|
|
||||||
'/api/diag': {
|
|
||||||
// target: serverMap.serverIpBase + ':11113',
|
|
||||||
- target: serverMap.serveiIp1 + ':11113',
|
|
||||||
+ target: serverMap.serveiIp2 + ':11113',
|
|
||||||
ws: false,
|
|
||||||
changeOrigin: true,
|
|
||||||
pathRewrite: {
|
|
||||||
@@ -146,7 +146,7 @@ const vueConfig = {
|
|
||||||
},
|
|
||||||
'/api/check': {
|
|
||||||
// target: serverMap.serverIpBase + ':11112',
|
|
||||||
- target: serverMap.serveiIp1 + ':11112',
|
|
||||||
+ target: serverMap.serveiIp2 + ':11112',
|
|
||||||
ws: false,
|
|
||||||
changeOrigin: true,
|
|
||||||
pathRewrite: {
|
|
||||||
@@ -155,7 +155,7 @@ const vueConfig = {
|
|
||||||
},
|
|
||||||
'/api/vulnerability': {
|
|
||||||
// target: serverMap.serverIpBase + ':11116',
|
|
||||||
- target: serverMap.serveiIp1 + ':11116',
|
|
||||||
+ target: serverMap.serveiIp2 + ':11116',
|
|
||||||
ws: false,
|
|
||||||
changeOrigin: true,
|
|
||||||
pathRewrite: {
|
|
||||||
@@ -164,7 +164,7 @@ const vueConfig = {
|
|
||||||
},
|
|
||||||
'/api/gala-spider': {
|
|
||||||
// target: serverMap.serverIpBase + ':11115',
|
|
||||||
- target: serverMap.serveiIp1 + ':11115',
|
|
||||||
+ target: serverMap.serveiIp2 + ':11115',
|
|
||||||
ws: false,
|
|
||||||
changeOrigin: true,
|
|
||||||
pathRewrite: {
|
|
||||||
@@ -173,7 +173,7 @@ const vueConfig = {
|
|
||||||
},
|
|
||||||
'/api': {
|
|
||||||
// target: serverMap.serverIpBase + ':11111',
|
|
||||||
- target: serverMap.serveiIp1 + ':11111',
|
|
||||||
+ target: serverMap.serveiIp2 + ':11111',
|
|
||||||
ws: false,
|
|
||||||
changeOrigin: true,
|
|
||||||
pathRewrite: {
|
|
||||||
--
|
|
||||||
Gitee
|
|
||||||
|
|
||||||
1
QARobot
Submodule
1
QARobot
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit bf32eff4343dce0828194c7ac8896aa70d9331d1
|
||||||
Binary file not shown.
BIN
aops-hermes-v1.3.0.tar.gz
Normal file
BIN
aops-hermes-v1.3.0.tar.gz
Normal file
Binary file not shown.
@ -1,14 +1,13 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
Name: aops-hermes
|
Name: aops-hermes
|
||||||
Version: v1.2.2
|
Version: v1.3.0
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Web for an intelligent diagnose frame
|
Summary: Web for an intelligent diagnose frame
|
||||||
License: MulanPSL2
|
License: MulanPSL2
|
||||||
URL: https://gitee.com/openeuler/%{name}
|
URL: https://gitee.com/openeuler/%{name}
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Source1: node_modules.tar.gz
|
Source1: node_modules.tar.gz
|
||||||
Patch0001: 0001-Fix-host-issues-and-batch-upload-host-issues.patch
|
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: nodejs node-gyp nodejs-yarn
|
BuildRequires: nodejs node-gyp nodejs-yarn
|
||||||
@ -20,7 +19,7 @@ Web for an intelligent diagnose frame
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version}
|
||||||
%setup -T -D -a 1
|
%setup -T -D -a 1
|
||||||
|
|
||||||
|
|
||||||
@ -45,6 +44,9 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 5 2023 wangkunlong<505997900@qq.com> - v1.3.0-1
|
||||||
|
- Updata to 23.09 rc3
|
||||||
|
|
||||||
* Fri Jul 28 2023 wangkunlong<505997900@qq.com> - v1.2.2-2
|
* Fri Jul 28 2023 wangkunlong<505997900@qq.com> - v1.2.2-2
|
||||||
- Fixed an issue where deleting some hosts after bulk uploading resulted in incorrect display of the current host list
|
- Fixed an issue where deleting some hosts after bulk uploading resulted in incorrect display of the current host list
|
||||||
- Fix an issue where a batch upload host failed due to field restrictions
|
- Fix an issue where a batch upload host failed due to field restrictions
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user