Merge branch 'feature-20200720' into test

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

@@ -237,7 +237,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
             String bindInfoStr = redisTemplate.opsForValue().get(key);
             String bindInfoStr = redisTemplate.opsForValue().get(key);
             if (StrUtil.isBlank(bindInfoStr)) {
             if (StrUtil.isBlank(bindInfoStr)) {
                 log.error("车辆绑定短信验证失败：未发起车辆绑定");
                 log.error("车辆绑定短信验证失败：未发起车辆绑定");
-                return ResultGenerator.fail(StatusCode.BUSINESS_ERROR.getCode(), "已超时");
+                return ResultGenerator.fail(StatusCode.BUSINESS_ERROR.getCode(), "绑定信息不正确");
             }
             }
             ParkBindInfo bindInfo = objectMapper.readValue(bindInfoStr, ParkBindInfo.class);
             ParkBindInfo bindInfo = objectMapper.readValue(bindInfoStr, ParkBindInfo.class);
 
 

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/DrivingLicenseServiceImpl.java

@@ -42,8 +42,8 @@ public class DrivingLicenseServiceImpl implements DrivingLicenseService {
 
 
     @Autowired
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
     private RedisTemplate<String, String> redisTemplate;
-    private static final String REDIS_KEY = "drv:idcard";
-    private static final String REDIS_SMS_KEY = "drv:idcard:sms";
+    private static final String REDIS_KEY = "drv:userId:";
+    private static final String REDIS_SMS_KEY = "drv:idcard:sms:";
     private static final String SMS_CODE = "PARK_DRIVING_LICENSE_IDCARD";
     private static final String SMS_CODE = "PARK_DRIVING_LICENSE_IDCARD";
 
 
     @Override
     @Override