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

byit-myth-admin/pom.xml

@@ -55,7 +55,8 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <artifactId>spring-boot-starter-redis</artifactId>
+            <version>1.3.2.RELEASE</version>
         </dependency>
     </dependencies>
 

byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java

 package com.byit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.byit.dto.plugin.RunLog;
 import com.byit.dto.plugin.RunNode;
 import com.byit.enums.NodePropertyEnum;
@@ -11,7 +10,6 @@ import com.byit.service.ApiNodeService;
 import com.byit.utils.ValidationUtil;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -19,7 +17,6 @@ import javax.annotation.Resource;
  * @author guo_m
  */
 @Service
-@Transactional(rollbackFor = Exception.class)
 public class ApiNodeServiceImpl implements ApiNodeService {
 
     @Resource

byit-myth-admin/src/main/resources/application-dev.yml

@@ -19,12 +19,6 @@ spring:
       host: 10.0.120.206
       port: 6379
       password:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-      timeout: 60000
 
 mybatis:
   mapper-locations: /mapper/*.xml

byit-myth-admin/src/main/resources/application-local.yml

@@ -19,12 +19,6 @@ spring:
     host: 10.0.120.218
     port: 6379
     password:
-    pool:
-      max-active: 8
-      max-wait: -1
-      max-idle: 8
-      min-idle: 0
-    timeout: 60000
 
 mybatis:
   mapper-locations: /mapper/*.xml

byit-myth-admin/src/main/resources/application-pro.yml

@@ -19,12 +19,6 @@ spring:
       host: ${Redis_IP}
       port: ${Redis_port}
       password:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-      timeout: 60000
 
 mybatis:
   mapper-locations: /mapper/*.xml

byit-myth-admin/src/main/resources/application-test.yml

@@ -19,12 +19,7 @@ spring:
     host: ${Redis_IP}
     port: ${Redis_port}
     password:
-    pool:
-      max-active: 8
-      max-wait: -1
-      max-idle: 8
-      min-idle: 0
-    timeout: 60000
+
     
 mybatis:
   mapper-locations: /mapper/*.xml

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

@@ -23,9 +23,4 @@ spring:
     host: 10.0.120.206
     port: 6379
     password:
-    pool:
-      max-active: 8
-      max-wait: -1
-      max-idle: 8
-      min-idle: 0
-    timeout: 60000
+

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

@@ -23,9 +23,4 @@ spring:
     host: 10.0.120.218
     port: 6379
     password:
-    pool:
-      max-active: 8
-      max-wait: -1
-      max-idle: 8
-      min-idle: 0
-    timeout: 0
+

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

@@ -24,9 +24,3 @@ spring:
     host: ${Redis_IP}
     port: ${Redis_port}
     password:
-    pool:
-      max-active: 8
-      max-wait: -1
-      max-idle: 8
-      min-idle: 0
-    timeout: 0
\ No newline at end of file

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

@@ -24,9 +24,3 @@ spring:
     host: ${Redis_IP}
     port: ${Redis_port}
     password:
-    pool:
-      max-active: 8
-      max-wait: -1
-      max-idle: 8
-      min-idle: 0
-    timeout: 0
\ No newline at end of file