diff --git a/exchangis-dao/src/main/java/com/webank/wedatasphere/exchangis/common/AuditLogUtils.java b/exchangis-dao/src/main/java/com/webank/wedatasphere/exchangis/common/AuditLogUtils.java index f42908668..e79ee6bb5 100644 --- a/exchangis-dao/src/main/java/com/webank/wedatasphere/exchangis/common/AuditLogUtils.java +++ b/exchangis-dao/src/main/java/com/webank/wedatasphere/exchangis/common/AuditLogUtils.java @@ -31,7 +31,7 @@ public static void printLog(String user, String proxyUser, TargetTypeEnum target //String detailInfo=new Gson().toJson(params); String detailInfo=params.toString(); LOGGER.info("[{}],[{}],[{}],[{}],[{}],[{}],[{}],[{}],[{}]", - new Date(),user, "proxyUser is: " + proxyUser, "Exchangis-1.1.2", targetType.getName(), + new Date(),user, "proxyUser is: " + proxyUser, "Exchangis-1.1.3", targetType.getName(), targetId,targetName,operateType.getName(), detailInfo); } diff --git a/exchangis-engines/engineconn-plugins/datax/pom.xml b/exchangis-engines/engineconn-plugins/datax/pom.xml index b7eab874b..824e0cfb1 100644 --- a/exchangis-engines/engineconn-plugins/datax/pom.xml +++ b/exchangis-engines/engineconn-plugins/datax/pom.xml @@ -126,6 +126,12 @@ + + + org.jasypt + jasypt + ${jasypt.version} + diff --git a/exchangis-engines/engineconn-plugins/datax/src/main/scala/org/apache/linkis/engineconnplugin/datax/config/DataxCoreConfiguration.scala b/exchangis-engines/engineconn-plugins/datax/src/main/scala/org/apache/linkis/engineconnplugin/datax/config/DataxCoreConfiguration.scala index 01907434f..29aa81749 100644 --- a/exchangis-engines/engineconn-plugins/datax/src/main/scala/org/apache/linkis/engineconnplugin/datax/config/DataxCoreConfiguration.scala +++ b/exchangis-engines/engineconn-plugins/datax/src/main/scala/org/apache/linkis/engineconnplugin/datax/config/DataxCoreConfiguration.scala @@ -91,7 +91,7 @@ object DataxCoreConfiguration { /** * Stream channel class */ - val CORE_TRANSPORT_STREAM_CHANNEL_CLASS: CommonVars[String] = CommonVars(CoreConstant.DATAX_CORE_TRANSPORT_STREAM_CHANNEL_CLASS, "com.webank.wedatasphere.exchangis.datax.core.transport.channel.memory.MemoryStreamChannel") + val CORE_TRANSPORT_STREAM_CHANNEL_CLASS: CommonVars[String] = CommonVars(CoreConstant.DATAX_CORE_TRANSPORT_STREAM_CHANNEL_CLASS, "com.alibaba.datax.core.transport.channel.memory.MemoryStreamChannel") /** * Block size of stream channel diff --git a/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/ExchangisJobDsBindServiceImpl.java b/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/ExchangisJobDsBindServiceImpl.java index 1987366f4..c3b99702d 100644 --- a/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/ExchangisJobDsBindServiceImpl.java +++ b/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/ExchangisJobDsBindServiceImpl.java @@ -32,7 +32,7 @@ public void updateJobDsBind(Long jobId, List dsBinds) { public boolean inUse(Long datasourceId) { QueryWrapper condition = new QueryWrapper<>(); condition.eq("source_ds_id", datasourceId).or().eq("sink_ds_id", datasourceId); - int count = Optional.ofNullable(this.dsBindMapper.selectCount(condition)).orElse(0); + Integer count = Optional.ofNullable(this.dsBindMapper.selectCount(condition)).orElse(0); return count > 0; } } diff --git a/pom.xml b/pom.xml index cb0be09cd..f51255da1 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 1.1.3-webank 1.1.2 - 1.4.0 + 1.5.0-wds 1.4.0 0.1.0-SNAPSHOT 1.3.0 @@ -69,6 +69,7 @@ 1.9.5 1.4.19 0.1.0-SNAPSHOT + 1.9.3 @@ -221,10 +222,10 @@ ${jdk.compile.version} ${jdk.compile.version} - - - - + + + + @@ -236,6 +237,17 @@ net.alchim31.maven scala-maven-plugin ${scala-maven-plugin.version} + + + + + + + + + + + eclipse-add-source @@ -265,10 +277,6 @@ - - ${scala.version} - incremental - org.apache.maven.plugins @@ -302,12 +310,12 @@ - - - org.codehaus.mojo - flatten-maven-plugin - - + + + + + +