From 03123e40dfda2aca60201e026b40503a5c3ac892 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 11:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
index 5de7e88..1358a63 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
@@ -37,21 +37,17 @@
}
@ApiOperation(value = "激活用户", notes = "激活用户")
- @GetMapping(value = "/activeUser/{id}")
- public Result activeUser(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/activeUser")
+ public Result activeUser(@RequestBody @Valid AdminActiveUserDto adminActiveUserDto) {
+ Long id = adminActiveUserDto.getId();
return iUserService.activeUser(id);
}
@ApiOperation(value = "禁用用户", notes = "禁用用户")
- @GetMapping(value = "/forbiddenUser/{id}")
- public Result forbiddenUser(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/forbiddenUser")
+ public Result forbiddenUser(@RequestBody @Valid AdminForbiddenUserDto adminForbiddenUserDto) {
+ Long id = adminForbiddenUserDto.getId();
return iUserService.forbiddenUser(id);
- }
-
- @ApiOperation(value = "删除用户", notes = "删除用户")
- @GetMapping(value = "/deleteUser/{id}")
- public Result deleteUser(@PathVariable(value = "id") Long id) {
- return iUserService.deleteUser(id);
}
@ApiOperation(value = "查看用户详情", notes = "查看用户详情")
@@ -79,8 +75,9 @@
}
@ApiOperation(value = "重置密码", notes = "重置密码")
- @GetMapping(value = "/resetPassword/{id}")
- public Result resetPassword(@PathVariable(value = "id") Long id) {
+ @PostMapping(value = "/resetPassword")
+ public Result resetPassword(@RequestBody @Valid AdminResetPasswordDto adminResetPasswordDto) {
+ Long id = adminResetPasswordDto.getId();
return iUserService.resetPassword(id);
}
--
Gitblit v1.9.1