Merge branch 'fix/0506' into develop-new

cooleshow-common/src/main/java/com/yonge/cooleshow/common/redis/config/RedisConfig.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 @Configuration
 public class RedisConfig {
 
-	/*@Value("${spring.redis.host}")
+	@Value("${spring.redis.host}")
 	private String host;
 	
 	@Value("${spring.redis.port}")
@@ -55,9 +55,9 @@ public class RedisConfig {
 		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
 		redisTemplate.setConnectionFactory(jedisConnectionFactory);
 		return redisTemplate;
-	}*/
+	}
 
-	@Bean
+	/*@Bean
 	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
 		// 定义redis模板
 		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
@@ -71,6 +71,6 @@ public class RedisConfig {
 		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
 		redisTemplate.afterPropertiesSet();
 		return redisTemplate;
-	}
+	}*/
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SmsCodeServiceImpl.java

@@ -84,7 +84,7 @@ public class SmsCodeServiceImpl implements SmsCodeService {
         String configValue = sysConfigService.findConfigValue(SysConfigConstant.SMS_SEND_VERIFY);
         if((StringUtils.isNotEmpty(configValue) && "1".equals(configValue)) || StringUtils.isNotBlank(code)) {
             if (StringUtils.isEmpty(mobile) || StringUtils.isEmpty(code)) {
-                throw new BizException("图形验证码错误");
+                throw new BizException("你所使用的不是最新版本，请更新后使用");
             }
             String redisKey = MessageTypeEnum.KAPTCHA_SESSION_KEY + mobile;
             if (redisTemplate.hasKey(redisKey)) {