diff --git a/online-taxi-public/.idea/compiler.xml b/online-taxi-public/.idea/compiler.xml index fbd19f2..fa03c76 100644 --- a/online-taxi-public/.idea/compiler.xml +++ b/online-taxi-public/.idea/compiler.xml @@ -2,12 +2,14 @@ + - + + @@ -17,6 +19,7 @@ diff --git a/online-taxi-public/.idea/encodings.xml b/online-taxi-public/.idea/encodings.xml index b7c3c07..e362245 100644 --- a/online-taxi-public/.idea/encodings.xml +++ b/online-taxi-public/.idea/encodings.xml @@ -4,6 +4,7 @@ + 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 8977f9b..36cb800 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,5 +1,6 @@ package com.taxi.apipassenger.service; +import com.internal.contant.CommonStatusEnum; import com.internal.dto.ResponseResult; import com.internal.response.CheckCodeResponse; import com.internal.response.NumberResponse; @@ -19,7 +20,6 @@ public class VerificationCodeService { private ServiceVerificatoncodeClient serviceVerificatoncodeClient; - @Autowired private StringRedisTemplate stringRedisTemplate; @@ -28,11 +28,11 @@ public class VerificationCodeService { System.out.println("调用验证码服务,获取验证码"); ResponseResult responseResult = serviceVerificatoncodeClient.getNumberCode(6); int numberCode = responseResult.getData().getNumberCode(); - System.out.println("访问service-verificationcode服务,获取验证码:" + numberCode ); + System.out.println("访问service-verificationcode服务,获取验证码:" + numberCode); //key,value,过期时间 String key = Utils.getVerificationCodePrefixKey(passenegerPhone); //存入redis - stringRedisTemplate.opsForValue().set(key,numberCode+"",2, TimeUnit.MINUTES); + stringRedisTemplate.opsForValue().set(key, numberCode + "", 2, TimeUnit.MINUTES); //通过短信服务商,将对应的验证码发送到手机上。阿里短信服务,腾讯短信通,容联 @@ -40,22 +40,31 @@ public class VerificationCodeService { } /** - * * @param passenegerPhone * @param verificationCode * @return */ - public ResponseResult checkCode(String passenegerPhone,String verificationCode) { + public ResponseResult checkCode(String passenegerPhone, String verificationCode) { //一、根据手机号,reids-key规则,查询验证码 String key = Utils.getVerificationCodePrefixKey(passenegerPhone); String codeRedis = stringRedisTemplate.opsForValue().get(key); - System.out.println("redis中的code:"+codeRedis); + System.out.println("redis中的code:" + codeRedis); //二、判断验证码是否正确 + if (codeRedis != null && verificationCode != null) { + verificationCode = verificationCode.trim(); + if (!codeRedis.trim().equals(verificationCode)) { + CommonStatusEnum.VERIFICATION_CODE_ERROR.setMessage("验证码输入有误!"); + return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR); + } else { + //三、判断这个手机号是否存在用户,并进行对应的处理 - //三、判断这个手机号是否存在用户,并进行对应的处理 - - //四、颁发令牌 + //四、颁发令牌 + } + } else { + CommonStatusEnum.VERIFICATION_CODE_ERROR.setMessage("验证码错误!"); + return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR); + } CheckCodeResponse checkCodeResponse = new CheckCodeResponse(); checkCodeResponse.setToken("getToken"); 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 fbc0b8f..8f3b50d 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/contant/CommonStatusEnum.java b/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java index ade4e2e..c5088f6 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java @@ -1,8 +1,11 @@ package com.internal.contant; -import lombok.Getter; public enum CommonStatusEnum { + /** + * + */ + VERIFICATION_CODE_ERROR(1099,"验证码错误"), /** * 成功 */ @@ -12,13 +15,29 @@ public enum CommonStatusEnum { */ FAIL(0,"fail"); - @Getter + private int code; - @Getter + private String message; CommonStatusEnum(int code,String message){ this.code = code; this.message = message; } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java b/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java index a25098c..18aef64 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/ResponseResult.java @@ -31,4 +31,11 @@ public class ResponseResult { reponseResult.setData(data); return reponseResult; } + + public static ResponseResult fail(CommonStatusEnum commonStatusEnum){ + ResponseResult reponseResult = new ResponseResult(); + reponseResult.setCode(commonStatusEnum.getCode()); + reponseResult.setMessage(commonStatusEnum.getMessage()); + return reponseResult; + } } 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 index f5d390e..933d9df 100644 --- 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 @@ -1,7 +1,6 @@ package com.internal.response; import lombok.Data; -import lombok.Getter; @Data public class CheckCodeResponse { diff --git a/online-taxi-public/pom.xml b/online-taxi-public/pom.xml index 119d374..90b86f3 100644 --- a/online-taxi-public/pom.xml +++ b/online-taxi-public/pom.xml @@ -18,6 +18,7 @@ api-passenger service-verificationcode internal-common + service-passenger-user diff --git a/online-taxi-public/service-passenger-user/pom.xml b/online-taxi-public/service-passenger-user/pom.xml new file mode 100644 index 0000000..6a45733 --- /dev/null +++ b/online-taxi-public/service-passenger-user/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.taxi + online-taxi-public + 1.0-SNAPSHOT + + + service-passenger-user + + + + org.springframework.boot + spring-boot-starter-web + + + + \ No newline at end of file diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/ServicePassengerUserApplication.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/ServicePassengerUserApplication.java new file mode 100644 index 0000000..ecb058e --- /dev/null +++ b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/ServicePassengerUserApplication.java @@ -0,0 +1,13 @@ +package com.taxi.servicepassengeruser; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + + +@SpringBootApplication +public class ServicePassengerUserApplication { + + public static void main(String[] args) { + SpringApplication.run(ServicePassengerUserApplication.class); + } +} diff --git a/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java new file mode 100644 index 0000000..f9bf6b3 --- /dev/null +++ b/online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java @@ -0,0 +1,15 @@ +package com.taxi.servicepassengeruser.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping("/test") + public String test(){ + + return "success"; + } +} diff --git a/online-taxi-public/service-passenger-user/src/main/resources/application.yaml b/online-taxi-public/service-passenger-user/src/main/resources/application.yaml new file mode 100644 index 0000000..9899989 --- /dev/null +++ b/online-taxi-public/service-passenger-user/src/main/resources/application.yaml @@ -0,0 +1,2 @@ +server: + port: 8083 \ No newline at end of file diff --git a/online-taxi-public/service-passenger-user/target/classes/application.yaml b/online-taxi-public/service-passenger-user/target/classes/application.yaml new file mode 100644 index 0000000..9899989 --- /dev/null +++ b/online-taxi-public/service-passenger-user/target/classes/application.yaml @@ -0,0 +1,2 @@ +server: + port: 8083 \ No newline at end of file