From a994ca43d4d88f82ba192e6915cfb3c8e3f1d329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 15 Nov 2018 20:28:31 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=20URI=20=E5=8E=BB=E6=8E=89=E9=A9=BC=E5=B3=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/auth/endpoint/PigxTokenEndpoint.java | 6 ++-- .../admin/api/feign/RemoteTokenService.java | 4 +-- .../admin/api/feign/RemoteUserService.java | 2 +- .../pigx/admin/controller/DictController.java | 32 +++++++++---------- .../pigx/admin/controller/LogController.java | 2 +- .../pigx/admin/controller/MenuController.java | 6 ++-- .../pigx/admin/controller/RoleController.java | 6 ++-- .../pigx/admin/controller/UserController.java | 6 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 636844c00..6ff9420e4 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -76,7 +76,7 @@ public class PigxTokenEndpoint { * * @param authHeader Authorization */ - @GetMapping("/removeToken") + @DeleteMapping("/token") public R logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) { if (StringUtils.hasText(authHeader)) { String tokenValue = authHeader.replace("Bearer", "").trim(); @@ -97,7 +97,7 @@ public class PigxTokenEndpoint { * @param from 内部调用标志 * @return */ - @DeleteMapping("/delToken/{token}") + @DeleteMapping("/token/{token}") public R delToken(@PathVariable("token") String token, @RequestHeader(required = false) String from) { if (StrUtil.isBlank(from)) { return null; @@ -113,7 +113,7 @@ public class PigxTokenEndpoint { * @param from 标志 * @return */ - @PostMapping("/listToken") + @PostMapping("/page") public Page tokenList(@RequestBody Map params, @RequestHeader(required = false) String from) { if (StrUtil.isBlank(from)) { return null; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java index 3f502984a..1feff1305 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java @@ -40,7 +40,7 @@ public interface RemoteTokenService { * @param from 内部调用标志 * @return page */ - @PostMapping("/oauth/listToken") + @PostMapping("/oauth/page") Page selectPage(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM) String from); /** @@ -50,6 +50,6 @@ public interface RemoteTokenService { * @param from 调用标志 * @return */ - @DeleteMapping("/oauth/delToken/{token}") + @DeleteMapping("/oauth/token/{token}") R deleteTokenById(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java index 5ec00a102..526d93777 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java @@ -64,6 +64,6 @@ public interface RemoteUserService { * @param username 用户名 * @return R */ - @GetMapping("/user/ancestorUsers/{username}") + @GetMapping("/user/ancestor/{username}") R> ancestorUsers(@PathVariable("username") String username); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index e45d053be..fe482e83d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -49,8 +49,8 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/dict" ) -@Api(value = "dict",description = "字典管理模块") +@RequestMapping("/dict") +@Api(value = "dict", description = "字典管理模块") public class DictController { private final SysDictService sysDictService; @@ -60,7 +60,7 @@ public class DictController { * @param id ID * @return 字典信息 */ - @GetMapping("/{id}" ) + @GetMapping("/{id}") public SysDict dict(@PathVariable Integer id) { return sysDictService.selectById(id); } @@ -71,7 +71,7 @@ public class DictController { * @param params 分页对象 * @return 分页对象 */ - @GetMapping("/dictPage" ) + @GetMapping("/page") public Page dictPage(@RequestParam Map params) { return sysDictService.selectPage(new Query<>(params), new EntityWrapper<>()); } @@ -82,8 +82,8 @@ public class DictController { * @param type 类型 * @return 同类型字典 */ - @GetMapping("/type/{type}" ) - @Cacheable(value = "dict_details", key = "#type" ) + @GetMapping("/type/{type}") + @Cacheable(value = "dict_details", key = "#type") public List findDictByType(@PathVariable String type) { SysDict condition = new SysDict(); condition.setDelFlag(CommonConstant.STATUS_NORMAL); @@ -97,10 +97,10 @@ public class DictController { * @param sysDict 字典信息 * @return success、false */ - @SysLog("添加字典" ) + @SysLog("添加字典") @PostMapping - @CacheEvict(value = "dict_details", key = "#sysDict.type" ) - @PreAuthorize("@pms.hasPermission('sys_dict_add')" ) + @CacheEvict(value = "dict_details", key = "#sysDict.type") + @PreAuthorize("@pms.hasPermission('sys_dict_add')") public R dict(@Valid @RequestBody SysDict sysDict) { return new R<>(sysDictService.insert(sysDict)); } @@ -112,10 +112,10 @@ public class DictController { * @param type 类型 * @return R */ - @SysLog("删除字典" ) - @DeleteMapping("/{id}/{type}" ) - @CacheEvict(value = "dict_details", key = "#type" ) - @PreAuthorize("@pms.hasPermission('sys_dict_del')" ) + @SysLog("删除字典") + @DeleteMapping("/{id}/{type}") + @CacheEvict(value = "dict_details", key = "#type") + @PreAuthorize("@pms.hasPermission('sys_dict_del')") public R deleteDict(@PathVariable Integer id, @PathVariable String type) { return new R<>(sysDictService.deleteById(id)); } @@ -127,9 +127,9 @@ public class DictController { * @return success/false */ @PutMapping - @SysLog("修改字典" ) - @CacheEvict(value = "dict_details", key = "#sysDict.type" ) - @PreAuthorize("@pms.hasPermission('sys_dict_edit')" ) + @SysLog("修改字典") + @CacheEvict(value = "dict_details", key = "#sysDict.type") + @PreAuthorize("@pms.hasPermission('sys_dict_edit')") public R editDict(@Valid @RequestBody SysDict sysDict) { return new R<>(sysDictService.updateById(sysDict)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java index 60c06eeca..bc0a2e593 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java @@ -57,7 +57,7 @@ public class LogController { * @param params 分页对象 * @return 分页对象 */ - @GetMapping("/logPage") + @GetMapping("/page") public Page logPage(@RequestParam Map params) { return sysLogService.selectPage(new Query<>(params), new EntityWrapper<>()); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index a672978c8..1e7d4ace1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -56,7 +56,7 @@ public class MenuController { * * @return 当前用户的树形菜单 */ - @GetMapping(value = "/userMenu") + @GetMapping public List userMenu() { // 获取符合条件得菜单 Set all = new HashSet<>(); @@ -75,7 +75,7 @@ public class MenuController { * * @return 树形菜单 */ - @GetMapping(value = "/allTree") + @GetMapping(value = "/tree") public List getTree() { SysMenu condition = new SysMenu(); condition.setDelFlag(CommonConstant.STATUS_NORMAL); @@ -88,7 +88,7 @@ public class MenuController { * @param roleId 角色ID * @return 属性集合 */ - @GetMapping("/roleTree/{roleId}") + @GetMapping("/tree/{roleId}") public List roleTree(@PathVariable Integer roleId) { return sysMenuService.findMenuByRoleId(roleId) .stream() diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index b3e30f51e..a2bad0b71 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -95,7 +95,7 @@ public class RoleController { * * @return 角色列表 */ - @GetMapping("/roleList") + @GetMapping("/list") public List roleList() { return sysRoleService.selectList(new EntityWrapper<>()); @@ -107,7 +107,7 @@ public class RoleController { * @param params 分页对象 * @return 分页对象 */ - @GetMapping("/rolePage") + @GetMapping("/page") public Page rolePage(@RequestParam Map params) { return sysRoleService.selectPage(new Query<>(params), new EntityWrapper<>()); } @@ -119,7 +119,7 @@ public class RoleController { * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔 * @return success、false */ - @PutMapping("/roleMenuUpd") + @PutMapping("/upd-menu") @PreAuthorize("@pms.hasPermission('sys_role_perm')") public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { SysRole sysRole = sysRoleService.selectById(roleId); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index 4e45e4f0b..557dd99ef 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -167,7 +167,7 @@ public class UserController { * @param params 参数集 * @return 用户集合 */ - @GetMapping("/userPage") + @GetMapping("/page") public Page userPage(@RequestParam Map params) { return userService.selectWithRolePage(new Query(params)); } @@ -178,7 +178,7 @@ public class UserController { * @param userDto userDto * @return success/false */ - @PutMapping("/editInfo") + @PutMapping("/edit") public R editInfo(@Valid @RequestBody UserDTO userDto) { return userService.updateUserInfo(userDto, SecurityUtils.getUser().getUsername()); } @@ -187,7 +187,7 @@ public class UserController { * @param username 用户名称 * @return */ - @GetMapping("/ancestorUsers/{username}") + @GetMapping("/ancestor/{username}") public R> ancestorUsers(@PathVariable String username) { return new R<>(userService.ancestorUsers(username)); }