Merge branch 'master-captcha-branch' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CaptchaController.java

@@ -57,9 +57,14 @@ public class CaptchaController {
         captchaBaseParam.setUrlOrPath(ImageUtils.getClickWordBgPath());
         captcha.setFontColorRandom(false);
 		ClickWordCaptchaVO dataVO = (ClickWordCaptchaVO) captcha.create(captchaBaseParam);
+		log.info("获取注册验证码：》》》{}", dataVO.getPointList());
 		if (dataVO.getPointList() != null) {
 			try {
 				String redisLockKey = RedisKey.CAPTCHA_PHONE_PREFIX + phone;
+				String captchaCode = redisTemplate.opsForValue().get(redisLockKey) == null ? "" : redisTemplate.opsForValue().get(redisLockKey).toString();
+				if (StringUtils.isNotBlank(captchaCode)) {
+					redisTemplate.delete(redisLockKey);
+				}
 				Boolean suc = redisTemplate.opsForValue().setIfAbsent(redisLockKey, JSONArray.toJSONString(dataVO.getPointList()));
 				if (suc) {
 					redisTemplate.expire(redisLockKey, 5, TimeUnit.MINUTES);//5分钟内过期