Merge remote-tracking branches 'remotes/origin/developer' and 'remotes/origin/test' into myth-test

byit-mybatis-plugin/pom.xml

@@ -33,8 +33,6 @@
         </dependency>
     </dependencies>
 
-
-
 	<build>
 		<plugins>
 			<plugin>
@@ -45,15 +43,4 @@
 		</plugins>
 	</build>
 
-	<distributionManagement>
-		<repository>
-			<id>releases</id>
-			<url>http://10.0.120.2/repository/maven-releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>snapshots</id>
-			<url>http://10.0.120.2/repository/maven-snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
-
 </project>

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

@@ -520,7 +520,9 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         RunRecording runRecording = runRecordingMapper.findRunRecordingByFlowIdAndRunId(flow.getFlowId(), runInfo.getRunId());
         ValidationUtil.dataNotNull(runRecording, "查无此运行记录");
         //TODO  这里应该查询的是版本表 与版本号挂钩
-        NodeVersion nodeVersion = nodeVersionMapper.findNodeByNodeNameAndVersionNameAndFlowId(runInfo.getNodeName(), runRecording.getFlowVersionName(), runRecording.getFlowId());
+        //NodeVersion nodeVersion = nodeVersionMapper.findNodeByNodeNameAndVersionNameAndFlowId(runInfo.getNodeName(), runRecording.getFlowVersionName(), runRecording.getFlowId());
+        JobTaskRunLogWithBLOBs byRunIdAndFlowAndNode = jobTaskRunLogMapper.findByRunIdAndFlowAndNode(runRecording.getRunId(), runRecording.getFlowName(), runInfo.getNodeName());
+        NodeVersion nodeVersion = nodeVersionMapper.findNodeByNodeNameAndVersionNameAndFlowId(runInfo.getNodeName(), byRunIdAndFlowAndNode.getVersionName(), byRunIdAndFlowAndNode.getFlowId());
 //        //Node node = nodeMapper.getByNameAndFlow(runInfo.getNodeName(), flow.getFlowId());
 //        ValidationUtil.dataNotNull(node, runInfo.getNodeName() + "节点不存在");
 

byit-myth-core/myth-executor-core/pom.xml

@@ -55,8 +55,6 @@
 
     </dependencies>
 
-
-
     <build>
         <plugins>
             <!--<plugin>

byit-myth-executor/myth-executor-plugin/pom.xml

@@ -60,7 +60,6 @@
 
 
 
-
 <!--    <build>-->
 <!--        <finalName>${project.artifactId}</finalName>-->
 <!--        <plugins>-->

byit-plugin-core/byit-plugin-rpc-common/pom.xml

@@ -76,5 +76,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
\ No newline at end of file

byit-plugin-core/byit-plugin-rpc-common/src/main/java/com/byit/task/annotations/TaskClient.java

 package com.byit.task.annotations;
 
-import com.byit.enums.CallMethodEnum;
 import com.byit.rpc.remoting.invoker.route.LoadBalance;
 
 import java.lang.annotation.*;
@@ -30,6 +29,4 @@ public @interface TaskClient {
      * @return
      */
     long timeout() default -1;
-
-    CallMethodEnum callMethodEnum() default CallMethodEnum.ASYNCHRONOUS;
 }

byit-plugin-core/myth-plugin-rpc-client/pom.xml

@@ -31,5 +31,4 @@
         </dependency>
     </dependencies>
 
-
 </project>
\ No newline at end of file

byit-plugin-core/plugin-spring-boot-starter/pom.xml

@@ -35,6 +35,4 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
-
 </project>
\ No newline at end of file

byit-plugin-core/pom.xml

@@ -20,5 +20,4 @@
 
 
 
-
 </project>
\ No newline at end of file