-
-
-- {{ countStar(form[formkey]) }}
-+ {{ countStar() }}
- {{ value || ' ' }}
-
-
-@@ -40,9 +40,27 @@ export default {
- formkey: {
- default: '',
- type: String
-+ },
-+ record: {
-+ default: null,
-+ type: Object
- }
- },
- data() {
-+ const validatePassword = (rule, value, callback) => {
-+ if (!this.record.ssh_pkey && (value.length === 0 || value.split(' ').join('').length === 0)) {
-+ callback(new Error('password和ssh_pkey不能都为空!'));
-+ } else {
-+ callback();
-+ }
-+ };
-+ const validateSshpkey = (rule, value, callback) => {
-+ if (!this.record.password && (value.length === 0 || value.split(' ').join('').length === 0)) {
-+ callback(new Error('password和ssh_pkey不能都为空!'));
-+ } else {
-+ callback();
-+ }
-+ };
- const validateUser = (rule, value, callback) => {
- if (value.length === 0 || value.split(' ').join('').length === 0) {
- callback(new Error('ssh_user不能为空!'));
-@@ -90,14 +108,14 @@ export default {
- cb();
- };
- return {
-- value: this.text,
-+ value: this.text === 'undefined' ? '' : this.text,
- editable: false,
- rules: {
- host_ip: [{ required: true, pattern: /^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$/, message: '请输入IP地址在 0.0.0.0~255.255.255.255 区间内', trigger: 'change' }],
- ssh_port: [{required: true, message: '请输入端口'}, {validator: checkSSHPort}],
- ssh_user: [{ validator: validateUser, trigger: 'change' }],
-- password: [{ required: true, message: 'password不能为空', trigger: 'change' }],
-- ssh_pkey: [{ required: true, message: 'ssh_pkey不能为空', trigger: 'change' }],
-+ password: [{ validator: validatePassword, trigger: 'change' }],
-+ ssh_pkey: [{ validator: validateSshpkey, trigger: 'change' }],
- host_name: [{ validator: checkNameInput, trigger: 'change' }],
- host_group_name: [{ required: true, message: 'host_group_name不能为空', trigger: 'change' }],
- management: [{ validator: checkmanagement, trigger: 'change' }]
-@@ -106,11 +124,7 @@ export default {
- },
- methods: {
- countStar(num) {
-- let str = ''
-- for (let i = 0; i < num.length; i++) {
-- str += '*'
-- }
-- return str
-+ return '**********'
- },
- handleChange(e) {
- const value = e.target.value;
-@@ -152,7 +166,7 @@ export default {
- created() {
- },
- beforeDestroy() {
-- document.removeEventListener('mouseup', this.handleClickOutside)
-+ document.removeEventListener('mouseup', this.handleClickOutside);
- },
- mounted() {
- document.addEventListener('mouseup', this.handleClickOutside)
-diff --git a/src/views/assests/components/addMoreHost.vue b/src/views/assests/components/addMoreHost.vue
-index 818ffa6..efc930b 100644
---- a/src/views/assests/components/addMoreHost.vue
-+++ b/src/views/assests/components/addMoreHost.vue
-@@ -31,6 +31,7 @@
-
{
- const arr = Object.keys(item)
-- if (!arr.includes('host_ip') || !arr.includes('ssh_port') || !arr.includes('ssh_user') || !arr.includes('password') || !arr.includes('ssh_pkey') || !arr.includes('host_name') || !arr.includes('host_group_name') || !arr.includes('management')) {
-+ if (!arr.includes('host_ip') || !arr.includes('ssh_port') || !arr.includes('ssh_user') || (!arr.includes('password') && !arr.includes('ssh_pkey')) || !arr.includes('host_name') || !arr.includes('host_group_name') || !arr.includes('management')) {
- this.removeFile(file);
- this.dataAllow = false;
- }
-diff --git a/vue.config.js b/vue.config.js
-index a93ea29..8740425 100644
---- a/vue.config.js
-+++ b/vue.config.js
-@@ -25,10 +25,7 @@ function getGitHash() {
- }
-
- const serverMap = {
-- serverIpBase: 'http://127.0.0.1',
-- serveiIp1: 'http://172.168.115.178',
-- serveiIp2: 'http://172.168.97.229',
-- serveiIp3: 'http://172.168.240.235'
-+ serverIpBase: 'http://127.0.0.1'
- }
-
- // vue.config.js
-@@ -101,8 +98,7 @@ const vueConfig = {
- // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
- proxy: {
- '/api/domain': {
-- // target: serverMap.serverIpBase + ':11114',
-- target: serverMap.serveiIp3 + ':11114',
-+ target: serverMap.serverIpBase + ':11114',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -110,8 +106,7 @@ const vueConfig = {
- }
- },
- '/api/host': {
-- // target: serverMap.serverIpBase + ':11114',
-- target: serverMap.serveiIp3 + ':11114',
-+ target: serverMap.serverIpBase + ':11114',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -119,8 +114,7 @@ const vueConfig = {
- }
- },
- '/api/confs': {
-- // target: serverMap.serverIpBase + ':11114',
-- target: serverMap.serveiIp3 + ':11114',
-+ target: serverMap.serverIpBase + ':11114',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -128,8 +122,7 @@ const vueConfig = {
- }
- },
- '/api/management': {
-- // target: serverMap.serverIpBase + ':11114',
-- target: serverMap.serveiIp3 + ':11114',
-+ target: serverMap.serverIpBase + ':11114',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -137,8 +130,7 @@ const vueConfig = {
- }
- },
- '/api/diag': {
-- // target: serverMap.serverIpBase + ':11113',
-- target: serverMap.serveiIp2 + ':11113',
-+ target: serverMap.serverIpBase + ':11113',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -146,8 +138,7 @@ const vueConfig = {
- }
- },
- '/api/check': {
-- // target: serverMap.serverIpBase + ':11112',
-- target: serverMap.serveiIp2 + ':11112',
-+ target: serverMap.serverIpBase + ':11112',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -155,8 +146,7 @@ const vueConfig = {
- }
- },
- '/api/vulnerability': {
-- // target: serverMap.serverIpBase + ':11116',
-- target: serverMap.serveiIp2 + ':11116',
-+ target: serverMap.serverIpBase + ':11116',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -164,8 +154,7 @@ const vueConfig = {
- }
- },
- '/api/gala-spider': {
-- // target: serverMap.serverIpBase + ':11115',
-- target: serverMap.serveiIp2 + ':11115',
-+ target: serverMap.serverIpBase + ':11115',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
-@@ -173,8 +162,7 @@ const vueConfig = {
- }
- },
- '/api': {
-- // target: serverMap.serverIpBase + ':11111',
-- target: serverMap.serveiIp2 + ':11111',
-+ target: serverMap.serverIpBase + ':11111',
- ws: false,
- changeOrigin: true,
- pathRewrite: {
---
-Gitee
-
diff --git a/0013-Fix-the-issue-of-incorrect-parameter.patch b/0013-Fix-the-issue-of-incorrect-parameter.patch
deleted file mode 100644
index dd86672..0000000
--- a/0013-Fix-the-issue-of-incorrect-parameter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e342c417cf0c7676da5f6ba40625c7350d8cdcea Mon Sep 17 00:00:00 2001
-From: wkl505997900 <2313665567@qq.com>
-Date: Mon, 30 Oct 2023 17:15:24 +0800
-Subject: [PATCH] fix params error issue
-
----
- src/views/assests/components/addMoreHost.vue | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/views/assests/components/addMoreHost.vue b/src/views/assests/components/addMoreHost.vue
-index efc930b..5cad786 100644
---- a/src/views/assests/components/addMoreHost.vue
-+++ b/src/views/assests/components/addMoreHost.vue
-@@ -395,6 +395,12 @@ export default {
- item.management = Boolean(item.management)
- item.password = String(item.password)
- item.ssh_pkey = String(item.ssh_pkey)
-+ if (item.password === 'undefined') {
-+ item.password = ''
-+ }
-+ if (item.ssh_pkey === 'undefined') {
-+ item.ssh_pkey = ''
-+ }
- delete item.key;
- delete item.editable;
- delete item.result;
---
-Gitee
-
diff --git a/0014-add-pam.d-directory-file-analytic-function.patch b/0014-add-pam.d-directory-file-analytic-function.patch
deleted file mode 100644
index 66964ae..0000000
--- a/0014-add-pam.d-directory-file-analytic-function.patch
+++ /dev/null
@@ -1,477 +0,0 @@
-From 6a26eeb0692833c657d92206dc06533a73200011 Mon Sep 17 00:00:00 2001
-From: smjiao
-Date: Tue, 7 Nov 2023 17:24:13 +0800
-Subject: [PATCH] add pam.d directory file analytic function
-
----
- src/api/management.js | 12 +-
- src/vendor/ant-design-pro/utils/request.js | 2 +-
- .../TranscationDomainConfigurations.vue | 54 +++---
- .../components/AddConfigurationDrawer.vue | 171 ++++++++++++++----
- 4 files changed, 176 insertions(+), 63 deletions(-)
-
-diff --git a/src/api/management.js b/src/api/management.js
-index 09f9b4a..15f9ea1 100644
---- a/src/api/management.js
-+++ b/src/api/management.js
-@@ -5,7 +5,8 @@ const api = {
- getManagementConf: '/management/getManagementConf', // 读取业务域配置信息
- queryManageConfChange: '/management/queryManageConfChange', // 读取业务域配置日志信息
- deleteManagementConf: '/management/deleteManagementConf', // 删除业务域配置
-- querySupportedConfs: '/confs/querySupportedConfs' // 查询可供选择的配置文件列表
-+ querySupportedConfs: '/confs/querySupportedConfs', // 查询可供选择的配置文件列表
-+ uploadManagementConf: '/management/uploadManagementConf' // 从本地导入文件 新增/更新配置
- };
-
- export default api;
-@@ -59,3 +60,12 @@ export function querySupportedConfs(parameter) {
- }
- });
- }
-+
-+export function uploadManagementConf(file) {
-+ return request({
-+ url: api.uploadManagementConf,
-+ method: 'post',
-+ data: file,
-+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-+ });
-+}
-diff --git a/src/vendor/ant-design-pro/utils/request.js b/src/vendor/ant-design-pro/utils/request.js
-index c3307ce..c8015c1 100644
---- a/src/vendor/ant-design-pro/utils/request.js
-+++ b/src/vendor/ant-design-pro/utils/request.js
-@@ -83,7 +83,7 @@ request.interceptors.request.use(config => {
- const userName = localStorage.getItem('user_name')
- userName && localStorage.setItem('user_name', userName);
- }
-- if (config.url === '/vulnerability/cve/advisory/upload' || config.url === '/vulnerability/cve/unaffected/upload') {
-+ if (config.url === '/vulnerability/cve/advisory/upload' || config.url === '/vulnerability/cve/unaffected/upload' || config.url === '/management/uploadManagementConf') {
- config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
- } else {
- config.headers['Content-Type'] = 'application/json'
-diff --git a/src/views/configuration/TranscationDomainConfigurations.vue b/src/views/configuration/TranscationDomainConfigurations.vue
-index 7882254..d090493 100644
---- a/src/views/configuration/TranscationDomainConfigurations.vue
-+++ b/src/views/configuration/TranscationDomainConfigurations.vue
-@@ -12,7 +12,7 @@
-
-
{{ `已选择` + selectedRowKeys.length + `项` }}
-
- 批量删除
-
-@@ -33,9 +33,9 @@
-
-
-
-
配置变更日志
-
--
编辑配置
-+
编辑配置
-
-
-
- 删除
-@@ -61,10 +61,10 @@
-
-
-
-
-@@ -81,10 +81,10 @@
-
-
-
-
-@@ -103,8 +103,8 @@
- 变更历史：
-
-
-
- {record.contents}
- },
- {
- key: 'operation',
- title: '操作',
- scopedSlots: {customRender: 'action'},
-- width: 240
-+ width: '30%',
-+ align: 'center'
- }
- ];
- },
-diff --git a/src/views/configuration/components/AddConfigurationDrawer.vue b/src/views/configuration/components/AddConfigurationDrawer.vue
-index d6880de..a6aee2f 100644
---- a/src/views/configuration/components/AddConfigurationDrawer.vue
-+++ b/src/views/configuration/components/AddConfigurationDrawer.vue
-@@ -7,8 +7,8 @@
-
-