From 7fec52991abac770c0e6c2f58e60b65815a158a4 Mon Sep 17 00:00:00 2001 From: topsun Date: Thu, 4 May 2023 21:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=20api-driver=E5=8F=91=E9=80=81=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E5=AE=8C=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/VerficationCodeService.java | 11 +++++++++-- .../service/VerificationCodeService.java | 7 +++++-- .../service/VerificationCodeService.class | Bin 4250 -> 4322 bytes .../internal/util/ApiPassengerConstant.java | 2 +- .../com/internal/util/RedisPrefixUtils.java | 5 +++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java index 656b48d..a2c2b84 100644 --- a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java @@ -2,9 +2,11 @@ package com.taxi.apidriver.service; import com.internal.contant.CommonStatusEnum; import com.internal.contant.DriverCarConstant; +import com.internal.contant.IdentityConstant; import com.internal.dto.ResponseResult; import com.internal.response.DriverUserExistsResponse; import com.internal.response.NumberResponse; +import com.internal.util.RedisPrefixUtils; import com.taxi.apidriver.remote.ServiceDriverUserClient; import com.taxi.apidriver.remote.ServiceVerificationcodeClient; import lombok.extern.slf4j.Slf4j; @@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.util.concurrent.TimeUnit; + @Service @Slf4j @@ -42,10 +46,13 @@ public class VerficationCodeService { ResponseResult numberResponse = serviceVerificationcodeClient.getVerificationCode(6); int numberCode = numberResponse.getData().getNumberCode(); log.info("验证码"+numberCode); - //调用三方，获取验证码 + //调用三方，获取验证码,第三方，阿里服务，腾讯，华信 //存入redis -// stringRedisTemplate.opsForValue().set(key, numberCode + "", 5, TimeUnit.MINUTES); + String numberCodeKey = RedisPrefixUtils.getVerificationCodePrefixKey(driverPhone, + IdentityConstant.DRIVER_IDENTITY); + stringRedisTemplate.opsForValue().set(numberCodeKey, numberCode + "", + 5, TimeUnit.MINUTES); return ResponseResult.success(); } } 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 9e30bc9..5af4d25 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.alibaba.nacos.client.identify.IdentifyConstants; import com.internal.contant.CommonStatusEnum; import com.internal.contant.IdentityConstant; import com.internal.contant.TokenConstant; @@ -39,7 +40,8 @@ public class VerificationCodeService { int numberCode = responseResult.getData().getNumberCode(); System.out.println("访问service-verificationcode服务，获取验证码：" + numberCode); //key,value,过期时间 - String key = RedisPrefixUtils.getVerificationCodePrefixKey(passenegerPhone); + String key = RedisPrefixUtils.getVerificationCodePrefixKey(passenegerPhone, + IdentityConstant.PASSENGER_IDENTITY); //存入redis stringRedisTemplate.opsForValue().set(key, numberCode + "", 5, TimeUnit.MINUTES); @@ -55,7 +57,8 @@ public class VerificationCodeService { */ public ResponseResult checkCode(String passenegerPhone, String verificationCode) { //一、根据手机号，reids-key规则，查询验证码 - String key = RedisPrefixUtils.getVerificationCodePrefixKey(passenegerPhone); + String key = RedisPrefixUtils.getVerificationCodePrefixKey(passenegerPhone + ,IdentityConstant.PASSENGER_IDENTITY); String codeRedis = stringRedisTemplate.opsForValue().get(key); System.out.println("redis中的code:" + codeRedis); 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 f0a1e9b39849c870556f5e646d82ab288d07bd00..2dfa861d092a5f449de0d5610dca9b23c91d13dd 100644 GIT binary patch delta 1212 zcmZXS+jkRH6vlrunaNBh2Z|xOh|*%A6zIi>phBnx#3Bf#D$vC=#8?Udp+*seuuP&%L5L59v+=82lSfJ@Sui%hlgAS zJPtCbxkDa@@Lh&&>7XAw!oxfgWrV}JVm3<02#-39x*YLX%3~UiMtGbjT%Pn~J*M-X za>#kq(W&9MuAGnZG|zZE%X2#6d6yFoFF3q7^>fTJMuT6ip6CtS=a|jf#^M*lPa4uA5>)?1$u)A|-cvEqPw-ghcHCWj}S({Ho5aa#?KC9k8T_G59@$|vDV>j#XFo+V(Ik`?<(HoeFGdmP<+To4j(Jd z^NHe9K2vlGAOU^33;%kR*6q8H^`Ea#c&=RJ( z5S$M;SAVNF*Rjr_sFsnb&UFv@^k@25cNcLi`;09soDxwd&VFqKWTxO%7E(%LX393p0n@F_C*5D>u zrJH8|E{Xbf3!7RVF{OG-VYq z=QYJd)PjUn5mm%WSU(Z?Rc@}PT}Nx0iY%KTR^aMbZIR`&mRK=4N1Yh5GG!<1#v=97 zU{%7NWwl9{Zq`_0O)8uSmuQ&OOv(9|DPvWPYNblPTV&8y5+Y%p2yYS1TSav{Z8`Rd z;9gOc5nY4q;t02sXD=t{WK5jWPVNwThUId)TRhFnPi$w8plHA3?)bdBI@TdZn!*_? rTN;wa$E2z@_YUDG%)jV$xKrNxhO)a6v+Qn%oSM>G<6W07>pu7g5va{O delta 1162 zcmZXT>sM4&7{-6+%sI1X&TKDDtaQ8)BsdP3T`+Yt(3H{&B83FHM^>nL&D6|JRCp-} z^-vU9*~Ln%xY=RIma9*G=tKWQt!3dS{{maRdxoWJ)qHr~z2E!u>@$Cs^q2U*{qyrh zpo(#i3L4`y@mP#a9?i7G$@D z$)lYuF}AwW+x*-(+ju#_c6OLvJI!gAV)yzOdpu_Gih;dxUS(g5{hrtZChs-HL61@z z4ZLnTA4>2BzQ>z%n1r`tysdag(K-Bk(y?|2e>g3PDwZe?YmRUyszld9Op#P7d?87i)%%=ML^vjA%wVulPw5GG?aaMoU$#ZI`D{Iz^*B@n*-* z$df??+fc*ecDY5xE*5K>HvjVpm;d-8au>k_?~$s-Vud7bW(;dM-)5T(dQk3q?wNhrb=&cYM^^+_XjgzwZ zm04M51bdQEa<;HZIR#1~PRhB&hRRF$^_3xW>P%#goaXkE9ARFvIOJBbIZB2uP%4t# zmUUBZMaX;^QkHVZDYw~V2Fm0G*=Q=7BRym)7v89p#R^hYGfmD}5o3is&q{gm8o8|! zTO@LgGJEo(Mr80I>htnGA~hQO8m)>${ay26D3 diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/util/ApiPassengerConstant.java b/online-taxi-public/internal-common/src/main/java/com/internal/util/ApiPassengerConstant.java index 5931592..459ad04 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/util/ApiPassengerConstant.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/util/ApiPassengerConstant.java @@ -2,6 +2,6 @@ package com.internal.util; public class ApiPassengerConstant { //乘客验证码的前缀 - public final static String verificationCodePrefix = "passenger-verificatioin-code-"; + public final static String verificationCodePrefix = "verificatioin-code-"; public final static String TOKEN_PREFIX = "token-"; } diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/util/RedisPrefixUtils.java b/online-taxi-public/internal-common/src/main/java/com/internal/util/RedisPrefixUtils.java index 76630ac..1ee23a3 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/util/RedisPrefixUtils.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/util/RedisPrefixUtils.java @@ -2,8 +2,9 @@ package com.internal.util; public class RedisPrefixUtils { - public static String getVerificationCodePrefixKey(String passenegerPhone) { - return ApiPassengerConstant.verificationCodePrefix + passenegerPhone; + public static String getVerificationCodePrefixKey(String passenegerPhone + ,String identity) { + return ApiPassengerConstant.verificationCodePrefix + identity +"-"+ passenegerPhone; } /**