diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java index 19801a5..c44f748 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/controller/VerificationCodeController.java @@ -5,6 +5,7 @@ import com.taxi.apipassenger.request.VerificationCodeDTO; import com.taxi.apipassenger.service.VerificationCodeService; import org.springframework.beans.factory.annotation.Autowired; 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.RestController; @@ -20,4 +21,11 @@ public class VerificationCodeController { System.out.println("接受到的手机号码参数:"+passengerPhone); return verificationCodeService.generatorCode(passengerPhone); } + + @PostMapping("/verification-code-check") + public ResponseResult verificationCodeCheck(@RequestBody VerificationCodeDTO verificationCodeDTO){ + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + String verificationCode = verificationCodeDTO.getVerificationCode(); + return verificationCodeService.checkCode(passengerPhone,verificationCode); + } } diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/request/VerificationCodeDTO.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/request/VerificationCodeDTO.java index 9abbcf2..48ec1c4 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/request/VerificationCodeDTO.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/request/VerificationCodeDTO.java @@ -1,14 +1,13 @@ package com.taxi.apipassenger.request; +import lombok.Data; + +@Data public class VerificationCodeDTO { private String passengerPhone; - public String getPassengerPhone() { - return passengerPhone; - } + private String verificationCode; + - public void setPassengerPhone(String passengerPhone) { - this.passengerPhone = passengerPhone; - } } diff --git a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java index 405e16d..e8a0a21 100644 --- a/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java +++ b/online-taxi-public/api-passenger/src/main/java/com/taxi/apipassenger/service/VerificationCodeService.java @@ -1,6 +1,7 @@ package com.taxi.apipassenger.service; import com.internal.dto.ResponseResult; +import com.internal.response.CheckCodeResponse; import com.internal.response.NumberResponse; import com.taxi.apipassenger.remote.ServiceVerificatoncodeClient; import net.sf.json.JSONObject; @@ -34,7 +35,27 @@ public class VerificationCodeService { stringRedisTemplate.opsForValue().set(key,numberCode+"",2, TimeUnit.MINUTES); //通过短信服务商,将对应的验证码发送到手机上。阿里短信服务,腾讯短信通,容联 - + return ResponseResult.success(); } + + /** + * + * @param passenegerPhone + * @param verificationCode + * @return + */ + public ResponseResult checkCode(String passenegerPhone,String verificationCode) { + //一、根据手机号,reids-key规则,查询验证码 + + //二、判断验证码是否正确 + + //三、判断这个手机号是否存在用户,并进行对应的处理 + + //四、颁发令牌 + + CheckCodeResponse checkCodeResponse = new CheckCodeResponse(); + checkCodeResponse.setToken("getToken"); + return ResponseResult.success(checkCodeResponse); + } } diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class index 8c4d44f..4dce8b1 100644 Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/controller/VerificationCodeController.class differ diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class index c688653..133f7d4 100644 Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/request/VerificationCodeDTO.class differ diff --git a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class index dc541ab..62e7600 100644 Binary files a/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class and b/online-taxi-public/api-passenger/target/classes/com/taxi/apipassenger/service/VerificationCodeService.class differ diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/response/CheckCodeResponse.java b/online-taxi-public/internal-common/src/main/java/com/internal/response/CheckCodeResponse.java new file mode 100644 index 0000000..f5d390e --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/response/CheckCodeResponse.java @@ -0,0 +1,12 @@ +package com.internal.response; + +import lombok.Data; +import lombok.Getter; + +@Data +public class CheckCodeResponse { + + + private String token; + +}