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

src/main/java/com/jz/dmp/cmdexectool/scheduler/common/task/sql/SqlParameters.java

@@ -198,7 +198,7 @@ public class SqlParameters extends AbstractParameters {
 		String sqlStr = ParameterUtils.columnMappingHandler(columnFieldsObj);
 		
 		Map<String, String> transformMappingSqlModel = new HashMap<String, String>();
-		transformMappingSqlModel.put("source_table_name", "table_view");
+		transformMappingSqlModel.put("source_table_name", "t");
 		transformMappingSqlModel.put("sql", sqlStr);
 		transform = transform + FreeMarkerUtils.freemakerJson(CommConstant.WATERDROP_FTL_TRANSFORM_SQL, transformMappingSqlModel, freeMarkerConfig);
 		
@@ -210,6 +210,7 @@ public class SqlParameters extends AbstractParameters {
 		sinkApiModel.put("method", apiObj.getString("method"));
 		sinkApiModel.put("signType", apiObj.getString("signType"));
 		sinkApiModel.put("authCode", apiObj.getString("authCode"));
+		sinkApiModel.put("salt", apiObj.getString("salt"));
 		sink = FreeMarkerUtils.freemakerJson(CommConstant.WATERDROP_FTL_SINK_API, sinkApiModel, freeMarkerConfig);
 	}
 

src/main/resources/templates/sink_api.ftl

 Api {
+<#if source_table_name??>
+    source_table_name="${source_table_name!}"
+</#if>
 <#if url??>
     url = "${url!}"
 </#if>
@@ -13,6 +16,9 @@ Api {
 </#if>
 <#if authCode??>
     authCode = "${authCode!}"
+</#if>
+<#if salt??>
+    salt = "${salt!}"
 </#if>
     isTest = "false"
 }

src/main/resources/templates/sink_kafka.ftl

 Kafka {
+<#if source_table_name??>
+	source_table_name="${source_table_name!}"
+</#if>
 <#if topic??>
 	# Kafka 主题
 	topic = "${topic!}"