Minor fix

WeBankFinTech · Jun 3, 2024 · dcc069f · dcc069f
1 parent 53ac906
commit dcc069f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
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
@@ -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
@@ -126,6 +126,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.jasypt/jasypt -->
+        <dependency>
+            <groupId>org.jasypt</groupId>
+            <artifactId>jasypt</artifactId>
+            <version>${jasypt.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/...c/main/scala/org/apache/linkis/engineconnplugin/datax/config/DataxCoreConfiguration.scala b/...c/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/.../webank/wedatasphere/exchangis/job/server/service/impl/ExchangisJobDsBindServiceImpl.java b/.../webank/wedatasphere/exchangis/job/server/service/impl/ExchangisJobDsBindServiceImpl.java
@@ -32,7 +32,7 @@ public void updateJobDsBind(Long jobId, List<ExchangisJobDsBind> dsBinds) {
     public boolean inUse(Long datasourceId) {
         QueryWrapper<ExchangisJobDsBind> 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
@@ -39,7 +39,7 @@
 	<properties>
 		<revision>1.1.3-webank</revision>
 		<dss.version>1.1.2</dss.version>
-		<linkis.version>1.4.0</linkis.version>
+		<linkis.version>1.5.0-wds</linkis.version>
 		<linkis.datasource.version>1.4.0</linkis.datasource.version>
 		<streamis.version>0.1.0-SNAPSHOT</streamis.version>
 		<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@@ -69,6 +69,7 @@
 		<aspectj.version>1.9.5</aspectj.version>
 		<xstream.version>1.4.19</xstream.version>
 		<jobmanager.version>0.1.0-SNAPSHOT</jobmanager.version>
+		<jasypt.version>1.9.3</jasypt.version>
 	</properties>
 
 	<modules>
@@ -221,10 +222,10 @@
 					<configuration>
 						<source>${jdk.compile.version}</source>
 						<target>${jdk.compile.version}</target>
-<!--						<compilerArguments>-->
-<!--							<verbose/>-->
-<!--							<bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>-->
-<!--						</compilerArguments>-->
+						<!--						<compilerArguments>-->
+						<!--							<verbose/>-->
+						<!--							<bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>-->
+						<!--						</compilerArguments>-->
 					</configuration>
 				</plugin>
 				<plugin>
@@ -236,6 +237,17 @@
 					<groupId>net.alchim31.maven</groupId>
 					<artifactId>scala-maven-plugin</artifactId>
 					<version>${scala-maven-plugin.version}</version>
+<!--					<configuration>-->
+<!--						<scalaVersion>${scala.version}</scalaVersion>-->
+<!--						<recompileMode>incremental</recompileMode>-->
+<!--						<args>-->
+<!--							<arg>-unchecked</arg>-->
+<!--							<arg>-deprecation</arg>-->
+<!--							<arg>-feature</arg>-->
+<!--							<arg>-explaintypes</arg>-->
+<!--&lt;!&ndash;							<arg>-target:jvm-${java.version}</arg>&ndash;&gt;-->
+<!--						</args>-->
+<!--					</configuration>-->
 					<executions>
 						<execution>
 							<id>eclipse-add-source</id>
@@ -265,10 +277,6 @@
 							</goals>
 						</execution>
 					</executions>
-					<configuration>
-						<scalaVersion>${scala.version}</scalaVersion>
-						<recompileMode>incremental</recompileMode>
-					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -302,12 +310,12 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
+		<!--		<plugins>-->
+		<!--			<plugin>-->
+		<!--				<groupId>org.codehaus.mojo</groupId>-->
+		<!--				<artifactId>flatten-maven-plugin</artifactId>-->
+		<!--			</plugin>-->
+		<!--		</plugins>-->
 	</build>
 
 </project>