diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java index 4b0b27fb2..c692cc263 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java @@ -6,15 +6,13 @@ import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO; import cn.iocoder.mall.user.service.api.UserService; import cn.iocoder.mall.user.service.api.bo.UserPageBO; import cn.iocoder.mall.user.service.api.dto.UserPageDTO; +import cn.iocoder.mall.user.service.api.dto.UserUpdateDTO; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/admins/user") @@ -26,7 +24,7 @@ public class AdminsUserController { // 分页 @GetMapping("/page") - @ApiOperation(value = "管理员分页") + @ApiOperation(value = "用户分页") @ApiImplicitParams({ @ApiImplicitParam(name = "nickname", value = "昵称,模糊匹配", example = "小王"), @ApiImplicitParam(name = "pageNo", value = "页码,从 0 开始", example = "0"), @@ -35,7 +33,6 @@ public class AdminsUserController { public CommonResult page(@RequestParam(value = "nickname", required = false) String nickname, @RequestParam(value = "pageNo", defaultValue = "0") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { - // 创建 UserPageDTO UserPageDTO userPageDTO = new UserPageDTO().setNickname(nickname).setPageNo(pageNo).setPageSize(pageSize); // 查询分页 CommonResult result = userService.getUserPage(userPageDTO); @@ -43,8 +40,30 @@ public class AdminsUserController { return UserConvert.INSTANCE.convert(result); } - // 更新用户信息 + @PostMapping("/update") + @ApiOperation(value = "更新用户基本信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "用户编号", required = true, example = "1"), + @ApiImplicitParam(name = "nickname", value = "昵称", required = true, example = "小王"), + @ApiImplicitParam(name = "avatar", value = "头像", required = true, example = "http://www.iocoder.cn/xxx.jpg"), + }) + public CommonResult update(@RequestParam("id") Integer id, + @RequestParam("nickname") String nickname, + @RequestParam("avatar") String avatar) { + UserUpdateDTO userUpdateDTO = new UserUpdateDTO().setId(id).setNickname(nickname).setNickname(nickname).setAvatar(avatar); + // 更新 + return userService.updateUser(userUpdateDTO); + } - // 开启禁用 + @PostMapping("/update_status") + @ApiOperation(value = "更新用户状态") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "用户编号", required = true, example = "1"), + @ApiImplicitParam(name = "status", value = "状态。1 - 开启;2 - 禁用", required = true, example = "1"), + }) + public CommonResult updateStatus(@RequestParam("id") Integer id, + @RequestParam("status") Integer status) { + return userService.updateUserStatus(id, status); + } } \ No newline at end of file diff --git a/user/user-application/src/main/resources/application.yaml b/user/user-application/src/main/resources/application.yaml index bc897a3f1..557069933 100644 --- a/user/user-application/src/main/resources/application.yaml +++ b/user/user-application/src/main/resources/application.yaml @@ -4,4 +4,6 @@ spring: # server server: - port: 8082 \ No newline at end of file + port: 18082 + servlet: + context-path: /user-api/ \ No newline at end of file diff --git a/user/user-service-impl/src/main/resources/config/application.yaml b/user/user-service-impl/src/main/resources/config/application.yaml index f012f56d8..0c167aaed 100644 --- a/user/user-service-impl/src/main/resources/config/application.yaml +++ b/user/user-service-impl/src/main/resources/config/application.yaml @@ -6,12 +6,6 @@ spring: username: root password: ${MALL_MYSQL_PASSWORD} -# server -server: - port: 18082 - servlet: - context-path: /user-api/ - # mybatis mybatis: config-location: classpath:mybatis-config.xml