提交 6d8a3814 编写于 作者: rushui.chen's avatar rushui.chen

20191012 修改获取验证码的请求方式

上级 bd33890d
...@@ -52,8 +52,8 @@ public class AccountController extends AccountBaseController { ...@@ -52,8 +52,8 @@ public class AccountController extends AccountBaseController {
@GetMapping("/test") @GetMapping("/test")
public String test() {return "test";} public String test() {return "test";}
@ApiOperation("获取验证码") @ApiOperation("H5端和PC端获取短信验证码")
@GetMapping("/authCode") @PostMapping("/authCode")
public PicaResponse<String> getAuthCode(@ApiParam(value = "手机号", required = true) @RequestParam("mobilePhone") String mobilePhone, public PicaResponse<String> getAuthCode(@ApiParam(value = "手机号", required = true) @RequestParam("mobilePhone") String mobilePhone,
@ApiParam(value = "验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机 4重置密码 5忘记密码") @RequestParam(value = "flag", defaultValue = "0") String flag, @ApiParam(value = "验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机 4重置密码 5忘记密码") @RequestParam(value = "flag", defaultValue = "0") String flag,
@ApiParam(value = "图形验证码token", required = true) @RequestParam("captchaToken") String captchaToken, @ApiParam(value = "图形验证码token", required = true) @RequestParam("captchaToken") String captchaToken,
...@@ -93,8 +93,8 @@ public class AccountController extends AccountBaseController { ...@@ -93,8 +93,8 @@ public class AccountController extends AccountBaseController {
return PicaResponse.toResponse(newToken); return PicaResponse.toResponse(newToken);
} }
@ApiOperation("密码或验证码登录") // @ApiOperation("密码或验证码登录")
@PostMapping("/login") // @PostMapping("/login")
public PicaResponse<String> login(@RequestBody AccountReq req) { public PicaResponse<String> login(@RequestBody AccountReq req) {
this.checkMobilePhone(req.getMobilePhone()); this.checkMobilePhone(req.getMobilePhone());
Account account = accountService.getByMobilePhone(req.getMobilePhone()); //获取账号信息 Account account = accountService.getByMobilePhone(req.getMobilePhone()); //获取账号信息
...@@ -128,8 +128,8 @@ public class AccountController extends AccountBaseController { ...@@ -128,8 +128,8 @@ public class AccountController extends AccountBaseController {
return PicaResponse.toResponse(newToken); return PicaResponse.toResponse(newToken);
} }
@ApiOperation("注册") // @ApiOperation("注册")
@PostMapping("/register") // @PostMapping("/register")
public PicaResponse<String> register(@RequestBody AccountReq req) { public PicaResponse<String> register(@RequestBody AccountReq req) {
this.checkMobilePhone(req.getMobilePhone()); this.checkMobilePhone(req.getMobilePhone());
this.checkAuthCode(req); this.checkAuthCode(req);
...@@ -157,7 +157,7 @@ public class AccountController extends AccountBaseController { ...@@ -157,7 +157,7 @@ public class AccountController extends AccountBaseController {
return PicaResponse.toResponse(newToken); return PicaResponse.toResponse(newToken);
} }
@ApiOperation("登录或注册") @ApiOperation("H5端一键登录功能,无需完善信息")
@PostMapping("/login-register") @PostMapping("/login-register")
public PicaResponse<String> loginRegister(@RequestBody AccountReq req) { public PicaResponse<String> loginRegister(@RequestBody AccountReq req) {
this.checkMobilePhone(req.getMobilePhone()); this.checkMobilePhone(req.getMobilePhone());
......
...@@ -48,7 +48,7 @@ public class AutoCodeController extends AccountBaseController { ...@@ -48,7 +48,7 @@ public class AutoCodeController extends AccountBaseController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ApiOperation("获取短信验证码") @ApiOperation("App端获取短信验证码")
@PostMapping(value = "") @PostMapping(value = "")
public PicaResponse getAuthCode(@RequestBody EncryptEntity entity) throws Exception { public PicaResponse getAuthCode(@RequestBody EncryptEntity entity) throws Exception {
BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class); BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
......
...@@ -75,7 +75,7 @@ public class LoginController extends AccountBaseController { ...@@ -75,7 +75,7 @@ public class LoginController extends AccountBaseController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ApiOperation("一键登录接口") @ApiOperation("PC,App端一键登录接口,需要完善信息")
@PostMapping(value = "/login-register") @PostMapping(value = "/login-register")
public PicaResponse<LoginResult> loginAndRegister(@RequestBody EncryptEntity entity) throws Exception { public PicaResponse<LoginResult> loginAndRegister(@RequestBody EncryptEntity entity) throws Exception {
BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class); BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
......
...@@ -27,7 +27,7 @@ public class RegisterController extends AccountBaseController { ...@@ -27,7 +27,7 @@ public class RegisterController extends AccountBaseController {
@Autowired @Autowired
private AccountUtils accountUtils; private AccountUtils accountUtils;
@ApiOperation("注册接口") @ApiOperation("PC端,移动端注册接口")
@PostMapping(value = "") @PostMapping(value = "")
public PicaResponse<LoginResult> register(@RequestBody EncryptEntity entity) throws Exception { public PicaResponse<LoginResult> register(@RequestBody EncryptEntity entity) throws Exception {
BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class); BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
......
...@@ -18,6 +18,8 @@ import com.pica.cloud.account.account.server.util.AccountUtils; ...@@ -18,6 +18,8 @@ import com.pica.cloud.account.account.server.util.AccountUtils;
import com.pica.cloud.account.account.server.util.ExecutorServiceUtils; import com.pica.cloud.account.account.server.util.ExecutorServiceUtils;
import com.pica.cloud.account.account.server.util.TokenUtils; import com.pica.cloud.account.account.server.util.TokenUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -32,6 +34,8 @@ import java.util.concurrent.ExecutorService; ...@@ -32,6 +34,8 @@ import java.util.concurrent.ExecutorService;
@Service @Service
public class RegisterServiceImpl implements RegisterService { public class RegisterServiceImpl implements RegisterService {
private Logger logger= LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
private AccountInfoDetailMapper accountInfoDetailMapper; private AccountInfoDetailMapper accountInfoDetailMapper;
...@@ -72,6 +76,7 @@ public class RegisterServiceImpl implements RegisterService { ...@@ -72,6 +76,7 @@ public class RegisterServiceImpl implements RegisterService {
String mobile = baseRequest.getMobile(); String mobile = baseRequest.getMobile();
String mobileEncrypt = AESUtil.encryptV0(mobile); String mobileEncrypt = AESUtil.encryptV0(mobile);
AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt); AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
if (accountInfoEntity == null) { if (accountInfoEntity == null) {
Date currentTime = new Date(); Date currentTime = new Date();
int productType = baseRequest.getProductType(); int productType = baseRequest.getProductType();
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册