Merge branch 'master' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-cmdexectool

pom.xml

@@ -557,7 +557,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<mainClass>com.jz.DmpApplication</mainClass>
+					<mainClass>com.jz.dmp.cmdexectool.ApiApplication</mainClass>
 				</configuration>
 				<!--<dependencies>
 					<dependency>

src/main/java/com/jz/dmp/cmdexectool/scheduler/server/entity/TaskExecutionContext.java

@@ -243,6 +243,7 @@ public class TaskExecutionContext implements Serializable {
 		this.setTaskParams(JSONObject.toJSONString(shellParameters));
 		this.setTaskAppId(shellParameters.getTaskAppId());
 		this.setParameters(shellParameters);
+		this.tenantCode = "root";
 	}
     
     public TaskExecutionContext(SqlParameters sqlParameters, DmpProjectConfigInfoDto configInfoDto) {
@@ -251,6 +252,7 @@ public class TaskExecutionContext implements Serializable {
 		this.setTaskParams(JSONObject.toJSONString(sqlParameters));
 		this.setTaskAppId(sqlParameters.getTaskAppId());
 		this.setParameters(sqlParameters);
+		this.tenantCode = "root";
     }
 
     public TaskExecutionContext(FtpParameters ftpParameters, DmpProjectConfigInfoDto configInfoDto) {
@@ -259,6 +261,7 @@ public class TaskExecutionContext implements Serializable {
 		this.setTaskParams(JSONObject.toJSONString(ftpParameters));
 		this.setTaskAppId(ftpParameters.getTaskAppId());
 		this.setParameters(ftpParameters);
+		this.tenantCode = "root";
 	}
 
     public TaskExecutionContext(UnzipfileParameters unzipfileParameters, DmpProjectConfigInfoDto configInfoDto) {
@@ -267,6 +270,7 @@ public class TaskExecutionContext implements Serializable {
 		this.setTaskParams(JSONObject.toJSONString(unzipfileParameters));
 		this.setTaskAppId(unzipfileParameters.getTaskAppId());
 		this.setParameters(unzipfileParameters);
+		this.tenantCode = "root";
 	}
 
 	public TaskExecutionContext(DoctransParameters doctransParameters, DmpProjectConfigInfoDto configInfoDto) {
@@ -275,6 +279,7 @@ public class TaskExecutionContext implements Serializable {
 		this.setTaskParams(JSONObject.toJSONString(doctransParameters));
 		this.setTaskAppId(doctransParameters.getTaskAppId());
 		this.setParameters(doctransParameters);
+		this.tenantCode = "root";
 	}
 
 	public TaskExecutionContext(HdfsParameters hdfsParameters, DmpProjectConfigInfoDto configInfoDto) {
@@ -283,6 +288,7 @@ public class TaskExecutionContext implements Serializable {
 		this.setTaskParams(JSONObject.toJSONString(hdfsParameters));
 		this.setTaskAppId(hdfsParameters.getTaskAppId());
 		this.setParameters(hdfsParameters);
+		this.tenantCode = "root";
 	}
 
     public TaskExecutionContext(SyncParameters syncParameters, DmpProjectConfigInfoDto configInfoDto) {
@@ -291,6 +297,7 @@ public class TaskExecutionContext implements Serializable {
         this.setTaskParams(JSONObject.toJSONString(syncParameters));
         this.setTaskAppId(syncParameters.getTaskAppId());
         this.setParameters(syncParameters);
+        this.tenantCode = "root";
     }
 
 	public int getTaskInstanceId() {

src/main/java/com/jz/dmp/cmdexectool/scheduler/server/worker/task/AbstractCommandExecutor.java

@@ -154,6 +154,7 @@ public abstract class AbstractCommandExecutor {
             command.add(commandFile);
 
             // setting commands
+            logger.info("executor shell command【{}】", command);
             processBuilder.command(command);
             process = processBuilder.start();
         }

src/main/java/com/jz/dmp/cmdexectool/scheduler/server/worker/task/ftp/FtpTask.java

@@ -108,7 +108,7 @@ public class FtpTask extends AbstractTask {
 	 */
 	private String buildCommand() throws Exception {
 		// generate scripts
-		String fileName = String.format("%s/%s_node.%s", taskExecutionContext.getExecutePath(),
+		String fileName = String.format("%s/%s_node2.%s", taskExecutionContext.getExecutePath(),
 				taskExecutionContext.getTaskAppId(), OSUtils.isWindows() ? "bat" : "sh");
 
 		Path path = new File(fileName).toPath();

src/main/resources/application-test.yml

 # 测试环境配置
 server:
-  port: 7181
+  port: 7183
   #contextPath: /resource
 
 management:
-  port: 54001
+  port: 54003
   health:
     mail:
       enabled: false

src/main/resources/templates/sftp_download.ftl

+#!/bin/bash
 # sftp 服务器IP地址
 ip=${ip!}
 # sftp 服务器端口号