diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/RevokeTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/RevokeTokenEndpoint.java index 811978edd..80ddb71ed 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/RevokeTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/RevokeTokenEndpoint.java @@ -25,8 +25,8 @@ import lombok.AllArgsConstructor; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** @@ -44,7 +44,7 @@ public class RevokeTokenEndpoint { * * @param authHeader Authorization */ - @RequestMapping("/oauth/removeToken") + @GetMapping("/oauth/removeToken") public R logout(@RequestHeader(value = "Authorization", required = false) String authHeader) { if (StringUtils.hasText(authHeader)) { String tokenValue = authHeader.replace("Bearer", "").trim(); diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index e50f69f8a..14c5274e5 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -40,7 +40,6 @@ com.baomidou mybatis-plus ${mbp.boot.version} - compile diff --git a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.provides b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.provides index 709c4b9bc..70d8314bb 100644 --- a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.provides +++ b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: mybatis-plus-boot-starter, pigx-common-security +provides: mybatis-plus, pigx-common-security 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 4d0d1d93d..8ca986e8e 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 @@ -68,7 +68,7 @@ public class DictController { * @param params 分页对象 * @return 分页对象 */ - @RequestMapping("/dictPage") + @GetMapping("/dictPage") public Page dictPage(@RequestParam Map params) { params.put(CommonConstant.DEL_FLAG, CommonConstant.STATUS_NORMAL); return sysDictService.selectPage(new Query<>(params), new EntityWrapper<>()); 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 cbb0efd37..47eefb0e9 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 @@ -53,7 +53,7 @@ public class LogController { * @param params 分页对象 * @return 分页对象 */ - @RequestMapping("/logPage") + @GetMapping("/logPage") public Page logPage(@RequestParam Map params) { params.put(CommonConstant.DEL_FLAG, CommonConstant.STATUS_NORMAL); return sysLogService.selectPage(new Query<>(params), new EntityWrapper<>()); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java index ffc040c00..66d9f9ee2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java @@ -63,7 +63,7 @@ public class OauthClientDetailsController { * @param params 分页对象 * @return 分页对象 */ - @RequestMapping("/page") + @GetMapping("/page") public Page page(@RequestParam Map params) { return sysOauthClientDetailsService.selectPage(new Query<>(params), new EntityWrapper<>()); } 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 bb86b9da3..5dff704f1 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 @@ -108,7 +108,7 @@ public class RoleController { * @param params 分页对象 * @return 分页对象 */ - @RequestMapping("/rolePage") + @GetMapping("/rolePage") public Page rolePage(@RequestParam Map params) { params.put(CommonConstant.DEL_FLAG, CommonConstant.STATUS_NORMAL); return sysRoleService.selectwithDeptPage(new Query<>(params), new EntityWrapper<>()); @@ -123,7 +123,7 @@ public class RoleController { */ @PutMapping("/roleMenuUpd") @PreAuthorize("@pms.hasPermission('sys_role_perm')") - public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds",required = false) String menuIds) { + public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { SysRole sysRole = sysRoleService.selectById(roleId); return new R<>(sysRoleMenuService.insertRoleMenus(sysRole.getRoleCode(), roleId, menuIds)); } 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 4f7c13059..667de8afa 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 @@ -149,7 +149,7 @@ public class UserController { * @param params 参数集 * @return 用户集合 */ - @RequestMapping("/userPage") + @GetMapping("/userPage") public Page userPage(@RequestParam Map params) { return userService.selectWithRolePage(new Query(params)); }