Merge remote-tracking branch 'origin/developer' into developer

byit-myth-executor/myth-executor-server/src/main/java/com/byit/config/RedisConfig.java

@@ -11,9 +11,9 @@ public class RedisConfig {
 
     @Bean
     StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory){
-        StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
-        stringRedisTemplate.setConnectionFactory(connectionFactory);
-        stringRedisTemplate.setDefaultSerializer(new StringRedisSerializer());
-        return stringRedisTemplate;
+//        StringRedisTemplate stringRedisTemplate = new StringRedisTemplate();
+//        stringRedisTemplate.setConnectionFactory(connectionFactory);
+//        stringRedisTemplate.setDefaultSerializer(new StringRedisSerializer());
+        return new StringRedisTemplate(connectionFactory);
     }
 }

byit-myth-executor/myth-executor-server/src/main/resources/application-dev.yml

@@ -28,4 +28,4 @@ spring:
       max-wait: 1
       max-idle: 8
       min-idle: 0
-    timeout: 0
+    timeout: 60000