diff --git a/neutrino-proxy-admin/src/api/securityGroup.js b/neutrino-proxy-admin/src/api/securityGroup.js
index 141c67a2..f6987719 100644
--- a/neutrino-proxy-admin/src/api/securityGroup.js
+++ b/neutrino-proxy-admin/src/api/securityGroup.js
@@ -31,11 +31,11 @@ export function createGroup(data) {
})
}
-export function updateGroup(data) {
+export function updateGroup(query) {
return request({
url: `/security/group/update`,
method: 'post',
- data
+ params: query
})
}
@@ -58,22 +58,6 @@ export function updateGroupEnableStatus(id, enable) {
})
}
-export function enableGroup(query) {
- return request({
- url: '/security/group/enable',
- method: 'post',
- params: query
- })
-}
-
-export function disableGroup(query) {
- return request({
- url: '/security/group/disable',
- method: 'post',
- params: query
- })
-}
-
export function fetchRuleList(query) {
return request({
url: '/security/rule/list',
diff --git a/neutrino-proxy-admin/src/views/system/securityGroup.vue b/neutrino-proxy-admin/src/views/system/securityGroup.vue
index 18c668d2..5afcfed3 100644
--- a/neutrino-proxy-admin/src/views/system/securityGroup.vue
+++ b/neutrino-proxy-admin/src/views/system/securityGroup.vue
@@ -2,6 +2,7 @@
+
@@ -119,34 +120,34 @@
-
{{ scope.row.id }}
-
+
{{ scope.row.licenseName }}
-
+
{{ scope.row.protocal }}
-
+
{{ scope.row.domain }}
-
+
{{ scope.row.serverPort }}
-
+
{{ scope.row.clientIp }}:{{ scope.row.clientPort }}
@@ -156,12 +157,12 @@
{{ scope.row.description }}
-
+
{{ scope.row.enable | statusName }}
-
+
{{$t('table.bind')}}
{{$t('table.unbind')}}
@@ -204,6 +205,7 @@ import LinkPopover from '../../components/Link/linkPopover'
current: 1,
size: 10,
name: undefined,
+ description: undefined,
enable: undefined
},
listLoading: true,
@@ -381,7 +383,7 @@ import LinkPopover from '../../components/Link/linkPopover'
})
},
handleDelete(row) {
- deleteGroup(row.id).then(response => {
+ deleteGroup({groupId: row.id}).then(response => {
if (response.data.code === 0) {
this.$notify({
title: '成功',
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/SecurityController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/SecurityController.java
index 4190a44d..a83d7ccd 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/SecurityController.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/SecurityController.java
@@ -72,6 +72,8 @@ public class SecurityController {
@Post
@Mapping("/group/delete")
public void deleteGroup(Integer groupId) {
+ ParamCheckUtil.checkNotNull(groupId, "groupId");
+
groupService.deleteGroup(groupId);
}
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupListReq.java
index 7c06ee23..e3413a22 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupListReq.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupListReq.java
@@ -1,6 +1,7 @@
package org.dromara.neutrinoproxy.server.controller.req.system;
import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
/**
* @author: wen.y
@@ -9,5 +10,13 @@ import lombok.Data;
@Data
public class SecurityGroupListReq {
private String name;
+ /**
+ * 描述
+ */
+ private String description;
+ /**
+ * 通过类型
+ */
+ private SecurityRulePassTypeEnum defaultPassType;
private Integer enable;
}
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/SecurityGroupService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/SecurityGroupService.java
index 70bb16a0..95f5d9a7 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/SecurityGroupService.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/SecurityGroupService.java
@@ -73,6 +73,10 @@ public class SecurityGroupService {
//描述字段为模糊查询,在应用层处理,否则sqlite不支持
req.setName("%" + req.getName() + "%");
}
+ if (StringUtils.isNotEmpty(req.getDescription())) {
+ //描述字段为模糊查询,在应用层处理,否则sqlite不支持
+ req.setDescription("%" + req.getDescription() + "%");
+ }
Page page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
List list = securityGroupMapper.selectByCondition(page, req);
if (CollectionUtils.isEmpty(list)) {
diff --git a/neutrino-proxy-server/src/main/resources/mapper/SecurityGroupMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/SecurityGroupMapper.xml
index a56561bd..933b85a8 100644
--- a/neutrino-proxy-server/src/main/resources/mapper/SecurityGroupMapper.xml
+++ b/neutrino-proxy-server/src/main/resources/mapper/SecurityGroupMapper.xml
@@ -8,6 +8,12 @@
AND sg.name like #{req.name}
+
+ AND sg.description like #{req.description}
+
+
+ AND sg.default_pass_type like #{req.defaultPassType}
+
AND sg.enable like #{req.enable}