|
|
|
@ -6,7 +6,6 @@ import com.unilife.model.dto.LoginDTO;
|
|
|
|
|
import com.unilife.model.dto.LoginEmailDTO;
|
|
|
|
|
import com.unilife.model.dto.RegisterDTO;
|
|
|
|
|
import com.unilife.model.vo.LoginVO;
|
|
|
|
|
import com.unilife.model.vo.RegisterVO;
|
|
|
|
|
import com.unilife.service.UserService;
|
|
|
|
|
import com.unilife.utils.BaseContext;
|
|
|
|
|
import com.unilife.utils.JwtUtil;
|
|
|
|
@ -14,14 +13,12 @@ import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
import java.time.Duration;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Api(tags = "用户管理")
|
|
|
|
@ -34,19 +31,17 @@ public class UserController {
|
|
|
|
|
private UserService userService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private JwtUtil jwtUtil;
|
|
|
|
|
@Autowired
|
|
|
|
|
private StringRedisTemplate stringRedisTemplate;
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "用户注册")
|
|
|
|
|
@PostMapping("register")
|
|
|
|
|
public Result register(@RequestBody RegisterDTO registerDTO, HttpServletRequest request) {
|
|
|
|
|
public Result<?> register(@RequestBody RegisterDTO registerDTO, HttpServletRequest request) {
|
|
|
|
|
return userService.register(registerDTO,request);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "用户登录")
|
|
|
|
|
@PostMapping("login")
|
|
|
|
|
public Result login(@RequestBody LoginDTO loginDTO,HttpServletRequest request) {
|
|
|
|
|
Result login = userService.login(loginDTO,request);
|
|
|
|
|
public Result<?> login(@RequestBody LoginDTO loginDTO,HttpServletRequest request) {
|
|
|
|
|
Result<?> login = userService.login(loginDTO,request);
|
|
|
|
|
//登陆成功后生成jwt令牌
|
|
|
|
|
LoginVO vo=(LoginVO) login.getData();
|
|
|
|
|
if (vo == null) {
|
|
|
|
@ -63,7 +58,7 @@ public class UserController {
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "获取邮箱验证码")
|
|
|
|
|
@PostMapping("code")
|
|
|
|
|
public Result getCode(@RequestBody EmailDTO emailDto,HttpServletRequest request) {
|
|
|
|
|
public Result<?> getCode(@RequestBody EmailDTO emailDto,HttpServletRequest request) {
|
|
|
|
|
String email=emailDto.getEmail();
|
|
|
|
|
log.debug("收到的原始邮箱: {}", email);
|
|
|
|
|
return userService.sendVerificationCode(email,request);
|
|
|
|
@ -71,7 +66,7 @@ public class UserController {
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "邮箱验证码登录")
|
|
|
|
|
@PostMapping("login/code")
|
|
|
|
|
public Result loginWithEmailCode(@RequestBody LoginEmailDTO loginEmailDTO,HttpServletRequest request) {
|
|
|
|
|
public Result<?> loginWithEmailCode(@RequestBody LoginEmailDTO loginEmailDTO,HttpServletRequest request) {
|
|
|
|
|
return userService.loginWithEmail(loginEmailDTO,request);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|