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 f0a1e9b..2dfa861 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/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; } /**