diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java index a7dc4ef..c51e07a 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java @@ -2,28 +2,18 @@ package com.xiang.xservice.auth.server.controller; import com.xiang.xservice.auth.api.dto.req.LoginRequest; import com.xiang.xservice.auth.api.dto.req.RefreshRequest; -import com.xiang.xservice.auth.api.dto.req.RegisterRequest; -import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest; import com.xiang.xservice.auth.api.dto.resp.LoginResp; -import com.xiang.xservice.auth.api.dto.resp.RegisterResp; -import com.xiang.xservice.auth.api.dto.resp.RouterVo; -import com.xiang.xservice.auth.api.dto.resp.UserDTO; -import com.xiang.xservice.auth.service.service.XMenuService; import com.xiang.xservice.auth.service.service.XUserService; import com.xiang.xservice.basic.common.resp.Result; import com.xiang.xservice.basic.exception.BusinessException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Objects; @Slf4j @RestController @@ -31,7 +21,6 @@ import java.util.Objects; public class TokenController { private final XUserService userService; - private final XMenuService menuService; @PostMapping("/public/auth/login") public Result login(@RequestBody @NotNull(message = "请求参数不能为空") @Valid LoginRequest request) { @@ -47,11 +36,6 @@ public class TokenController { } } - @PostMapping("/private/auth/getInfo") - public Result getUserInfo(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) { - return Result.data(userService.getUserDetail(request.getUsername())); - } - @PostMapping("/publish/auth/refresh") public Result refresh(@RequestBody @NotNull(message = "请求参数不能为空") @Valid RefreshRequest request) { try { @@ -65,27 +49,4 @@ public class TokenController { return Result.error(); } } - - @PostMapping("/public/user/userRegister") - public Result register(@RequestBody @Valid @NotNull(message = "请求参数不能为空") RegisterRequest request) { - try { - RegisterResp registerResp = userService.userRegister(request); - if (Objects.nonNull(registerResp)) { - return Result.data(registerResp); - } - } catch (BusinessException e) { - log.error("【用户注册】用户注册失败:{}", e.getMessage(), e); - return Result.error(e.getMessage()); - } catch (Exception e) { - log.error("【用户注册】用户注册失败:{}", e.getMessage(), e); - } - return Result.error("操作失败"); - } - - - - @GetMapping("/private/menu/getRouter") - public Result> getRouter(@RequestParam("userId") Long userId) { - return Result.data(menuService.getRouter(userId)); - } } diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java deleted file mode 100644 index a22a1e0..0000000 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/UserController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.xiang.xservice.auth.server.controller; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest; -import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest; -import com.xiang.xservice.auth.api.dto.req.user.UserResetPwdRequest; -import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest; -import com.xiang.xservice.auth.api.dto.req.user.UserUpdateStatusRequest; -import com.xiang.xservice.auth.api.dto.resp.UserResp; -import com.xiang.xservice.auth.service.service.XUserService; -import com.xiang.xservice.basic.common.resp.Result; -import com.xiang.xservice.basic.exception.BusinessException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.List; - -@Slf4j -@RestController -@RequiredArgsConstructor -public class UserController { - - private final XUserService userService; - - @PostMapping("/private/user/list") - public Result> getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) { - return Result.data(userService.getUserList(request)); - } - - @GetMapping("/private/user/info/{id}") - public Result getUserById(@PathVariable("id") Long id) { - return Result.data(userService.getUserInfo(id)); - } - - @PostMapping("/private/user/add") - public Result addUser(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserAddRequest request) { - try { - return Result.data(userService.addUser(request)); - } catch (BusinessException e) { - log.error("用户新增异常,请求:{}", JSON.toJSONString(request), e); - return Result.error(e.getMessage()); - } catch (Exception e) { - log.error("用户新增异常,请求:{}", JSON.toJSONString(request), e); - } - return Result.error(); - } - @PostMapping("/private/user/updateStatus") - public Result updateStatus(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserUpdateStatusRequest request) { - return Result.data(userService.updateStatus(request.getId(), request.getStatus())); - } - - @PostMapping("/private/user/update") - public Result updateUser(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserUpdateRequest request) { - try { - return Result.data(userService.updateUser(request)); - } catch (BusinessException e) { - log.error("用户编辑异常,请求:{}", JSON.toJSONString(request), e); - return Result.error(e.getMessage()); - } catch (Exception e) { - log.error("用户编辑异常,请求:{}", JSON.toJSONString(request), e); - } - return Result.error(); - } - - @PostMapping("/private/user/del") - public Result delUser(@RequestBody @Valid @NotEmpty(message = "请求参数不能为空") List ids) { - try { - return Result.data(userService.delUser(ids)); - } catch (BusinessException e) { - log.error("用户删除异常,请求:{}", JSON.toJSONString(ids), e); - return Result.error(e.getMessage()); - } catch (Exception e) { - log.error("用户删除异常,请求:{}", JSON.toJSONString(ids), e); - } - return Result.error(); - } - - @PostMapping("/private/user/resetUserPwd") - public Result resetPwd(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserResetPwdRequest request) { - return Result.data(userService.resetPwd(request.getUserId(), request.getPassword())); - } - - -}