From d30fe1948dea2055ae07c946ecd691bd5b403cf9 Mon Sep 17 00:00:00 2001 From: topsun Date: Thu, 13 Apr 2023 13:22:52 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=A0=A1=E9=AA=8Credis=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E3=80=81=E5=88=9B=E5=BB=BA=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E7=94=A8=E6=88=B7=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- online-taxi-public/.idea/compiler.xml | 5 +++- online-taxi-public/.idea/encodings.xml | 1 + .../service/VerificationCodeService.java | 27 ++++++++++++------ .../service/VerificationCodeService.class | Bin 3191 -> 3664 bytes .../internal/contant/CommonStatusEnum.java | 25 ++++++++++++++-- .../java/com/internal/dto/ResponseResult.java | 7 +++++ .../internal/response/CheckCodeResponse.java | 1 - online-taxi-public/pom.xml | 1 + .../service-passenger-user/pom.xml | 21 ++++++++++++++ .../ServicePassengerUserApplication.java | 13 +++++++++ .../controller/TestController.java | 15 ++++++++++ .../src/main/resources/application.yaml | 2 ++ .../target/classes/application.yaml | 2 ++ 13 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 online-taxi-public/service-passenger-user/pom.xml create mode 100644 online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/ServicePassengerUserApplication.java create mode 100644 online-taxi-public/service-passenger-user/src/main/java/com/taxi/servicepassengeruser/controller/TestController.java create mode 100644 online-taxi-public/service-passenger-user/src/main/resources/application.yaml create mode 100644 online-taxi-public/service-passenger-user/target/classes/application.yaml 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 fbc0b8fbbafed1b5cd6d4d1c55084652311e83ac..8f3b50daa47b240a6c74b82e4e2d6bd7ef38531c 100644 GIT binary patch delta 1218 zcmZvc+jCP@6vlri$>~W>P8r)lAPy9Bv431lz;BA9&|;}nRrs8EVgINPGmK1t?M4O_u9dPof-*-heu=4T+7Nq zjpfmFG8j+gVwsek2u9PXoSn)A+tbNpIweZx##2ZxtVf> zex<4siU?;Xk`-1H_UKLZ~Zq^6sTPFEddu7or1qAAMjkFw(%0x zjRh9>1UzEpX~`tZzM`sfX@T2ionhHo<=*kH`#seI=c#Gd1A6810xJUg47F#alN+VS z2Fk@Y$>!FuP$EqdX%;0~MT@O6WuJJ1w2>c{$>W5`u$ldADGIo$H1bVN@;5Y*Z3wbi zwx)BSsDxXJ?-ZueBqJ@i@POnxrL~3YPxa^0C7*dkb$qU(Iw48AWCmrs@&9xBJ@7ZS C4f`tq delta 761 zcmZ9ISx*#E5QV>NL8^VL#Nmboj=bSoqe--}D&;0oF=_^pjE0n)V z>4;Fmt|+_N4qMVCvMeTw}qE^T2BnA~kbj|m4|dg(K)ewRZW4s*m2ZSw^p9OYP) z}jAFp0(CD2tdC&mPDTWm1-+dXey~bc~w44gXu;v06z1P9Y*obD7 zOPW&Rip!cYt|-PeSGi^pp9$u9e}mcf7}vdAr>}W}8=46wH8;7XxUIQEMw4KT;;!Z% z_bpI7&^+Xk;<09mCz@%VYM$}jd*hVZ7Kxc)BHtoBI56HlIy@j2UKk70ytJtIa#WsI z94LA}6Z&p@UD4Kt5_wNqTz)Z$#cDZ)B$xTOGW)+fTh6kk#H9B#nwO|t#6vb!Qfuje z!&=r!wy35?w3D9JlUAiSrAspgRVN4-T11(umXx5E(IdTjVHDB9dNyFwM3Rlt4YEl% zMt=d77F2`WIF^vjsLeE*QBuzdEhM=;IZt+H#Rqa`$*uZGL4a>wc~&g*nZo`#R;HZ- zCpR`rQGqj0@mpa8Fbl2l*|lOa#d0xJBid { 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