feat:auth
This commit is contained in:
@@ -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.LoginRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.RefreshRequest;
|
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.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.auth.service.service.XUserService;
|
||||||
import com.xiang.xservice.basic.common.resp.Result;
|
import com.xiang.xservice.basic.common.resp.Result;
|
||||||
import com.xiang.xservice.basic.exception.BusinessException;
|
import com.xiang.xservice.basic.exception.BusinessException;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
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.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController
|
@RestController
|
||||||
@@ -31,7 +21,6 @@ import java.util.Objects;
|
|||||||
public class TokenController {
|
public class TokenController {
|
||||||
|
|
||||||
private final XUserService userService;
|
private final XUserService userService;
|
||||||
private final XMenuService menuService;
|
|
||||||
|
|
||||||
@PostMapping("/public/auth/login")
|
@PostMapping("/public/auth/login")
|
||||||
public Result<LoginResp> login(@RequestBody @NotNull(message = "请求参数不能为空") @Valid LoginRequest request) {
|
public Result<LoginResp> login(@RequestBody @NotNull(message = "请求参数不能为空") @Valid LoginRequest request) {
|
||||||
@@ -47,11 +36,6 @@ public class TokenController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/private/auth/getInfo")
|
|
||||||
public Result<UserDTO> getUserInfo(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) {
|
|
||||||
return Result.data(userService.getUserDetail(request.getUsername()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/publish/auth/refresh")
|
@PostMapping("/publish/auth/refresh")
|
||||||
public Result<LoginResp> refresh(@RequestBody @NotNull(message = "请求参数不能为空") @Valid RefreshRequest request) {
|
public Result<LoginResp> refresh(@RequestBody @NotNull(message = "请求参数不能为空") @Valid RefreshRequest request) {
|
||||||
try {
|
try {
|
||||||
@@ -65,27 +49,4 @@ public class TokenController {
|
|||||||
return Result.error();
|
return Result.error();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/public/user/userRegister")
|
|
||||||
public Result<RegisterResp> 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<List<RouterVo>> getRouter(@RequestParam("userId") Long userId) {
|
|
||||||
return Result.data(menuService.getRouter(userId));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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<Page<UserResp>> getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) {
|
|
||||||
return Result.data(userService.getUserList(request));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/private/user/info/{id}")
|
|
||||||
public Result<UserResp> getUserById(@PathVariable("id") Long id) {
|
|
||||||
return Result.data(userService.getUserInfo(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/private/user/add")
|
|
||||||
public Result<Boolean> 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<Boolean> updateStatus(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserUpdateStatusRequest request) {
|
|
||||||
return Result.data(userService.updateStatus(request.getId(), request.getStatus()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/private/user/update")
|
|
||||||
public Result<Boolean> 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<Boolean> delUser(@RequestBody @Valid @NotEmpty(message = "请求参数不能为空") List<Long> 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<Boolean> resetPwd(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserResetPwdRequest request) {
|
|
||||||
return Result.data(userService.resetPwd(request.getUserId(), request.getPassword()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user