|
|
@@ -6,6 +6,8 @@ import com.izouma.nineth.exception.AuthenticationException;
|
|
|
import com.izouma.nineth.security.JwtTokenUtil;
|
|
|
import com.izouma.nineth.security.JwtUser;
|
|
|
import com.izouma.nineth.security.JwtUserFactory;
|
|
|
+import com.izouma.nineth.service.CacheService;
|
|
|
+import com.izouma.nineth.service.CaptchaService;
|
|
|
import com.izouma.nineth.service.UserService;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
@@ -31,6 +33,7 @@ public class AuthenticationController {
|
|
|
private final AuthenticationManager authenticationManager;
|
|
|
private final JwtTokenUtil jwtTokenUtil;
|
|
|
private final UserService userService;
|
|
|
+ private final CaptchaService captchaService;
|
|
|
|
|
|
@PostMapping("/login")
|
|
|
public String loginByUserPwd(String username, String password, Integer expiration) {
|
|
|
@@ -65,7 +68,9 @@ public class AuthenticationController {
|
|
|
|
|
|
@PostMapping("/phoneRegister")
|
|
|
@ApiOperation(value = "手机号密码注册")
|
|
|
- public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor, Long collectionId) {
|
|
|
+ public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
|
|
|
+ Long collectionId, String captcha, String captchaKey) {
|
|
|
+ captchaService.verify(captcha, captchaKey);
|
|
|
User user = userService.phoneRegister(phone, code, password, inviteCode, invitor, collectionId);
|
|
|
return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
|
|
|
}
|