Merge remote-tracking branch 'origin/feature-20200720' into feature-20200720

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/DrivingLicenseController.java

@@ -97,7 +97,7 @@ public class DrivingLicenseController {
         if (type == null || Objects.equals(type, 1)) {
             DlImageDO dlImageDO = new DlImageDO();
             dlImageDO.setAddress(RegexUtil.addressMask(drivingLicenseMicRes.getAddress()));
-            dlImageDO.setBelowLicenseNumber(drivingLicenseMicRes.getIdCard());
+            dlImageDO.setBelowLicenseNumber(RegexUtil.idCardMask(drivingLicenseMicRes.getIdCard()));
             dlImageDO.setAvatarFullUrl(fastDfsConfigBean.genBigDataInnerUrl(drivingLicenseMicRes.getAvatar()));
             dlImageDO.setBirthday(drivingLicenseMicRes.getBirthday());
             dlImageDO.setLicenseNumber(RegexUtil.idCardMask(drivingLicenseMicRes.getIdCard()));

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

@@ -42,8 +42,8 @@ public class DrivingLicenseServiceImpl implements DrivingLicenseService {
 
     @Autowired
     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 = "park:extend:drv:userId:";
+    private static final String REDIS_SMS_KEY = "park:extend:drv:sms:";
     private static final String SMS_CODE = "PARK_DRIVING_LICENSE_IDCARD";
 
     @Override