diff --git a/neutrino-proxy-admin/src/api/securityGroup.js b/neutrino-proxy-admin/src/api/securityGroup.js index c9456516..b281922f 100644 --- a/neutrino-proxy-admin/src/api/securityGroup.js +++ b/neutrino-proxy-admin/src/api/securityGroup.js @@ -4,14 +4,14 @@ const baseUri = '/security'; export function fetchGroupList() { return request({ - url: `${baseUri}/group/s`, + url: `${baseUri}/group/list`, method: 'get' }) } export function fetchGroupOne(groupId) { return request({ - url: `${baseUri}/group/getOne?groupId=${groupId}`, + url: `${baseUri}/group/detail?groupId=${groupId}`, method: 'get' }) } @@ -55,7 +55,7 @@ export function disableGroup(groupId) { export function fetchRuleList(groupId) { return request({ - url: `${baseUri}/rule/s?groupId=${groupId}`, + url: `${baseUri}/rule/list?groupId=${groupId}`, method: 'get' }) } @@ -94,4 +94,4 @@ export function disableRule(ruleId) { url: `${baseUri}/rule/disable?ruleId=${ruleId}`, method: 'post' }) -} \ No newline at end of file +} 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 18dc335e..e76d80cc 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 @@ -30,14 +30,14 @@ public class SecurityController { * 获取当前用户权限下的安全组 */ @Get - @Mapping("/group/s") - public List getGroups() { + @Mapping("/group/list") + public List groupList() { List groupDOList = groupService.queryGroupList(); return groupDOList.stream().map(SecurityGroupDO::toRes).collect(Collectors.toList()); } @Get - @Mapping("/group/getOne") + @Mapping("/group/detail") public SecurityGroupRes getGroupOne(Integer groupId) { return groupService.queryGroupOne(groupId).toRes(); } @@ -77,8 +77,8 @@ public class SecurityController { } @Get - @Mapping("/rule/s") - public List getRulesByGroupId(Integer groupId) { + @Mapping("/rule/list") + public List getRuleListByGroupId(Integer groupId) { List ruleDOList = groupService.queryRuleListByGroupId(groupId); return ruleDOList.stream().map(SecurityRuleDO::toRes).collect(Collectors.toList()); }