move set position of connectionTimeout before method connect() invoked

qlangtech · Apr 5, 2023 · 80ea7d4 · 80ea7d4
1 parent 36cf41f
commit 80ea7d4
Show file tree

Hide file tree

Showing 61 changed files with 86 additions and 78 deletions.
diff --git a/cassandrareader/pom.xml b/cassandrareader/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.alibaba.datax</groupId>
 		<artifactId>datax-all</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.1</version>
 	</parent>
 	<artifactId>cassandrareader</artifactId>
 	<name>cassandrareader</name>

diff --git a/cassandrawriter/pom.xml b/cassandrawriter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>cassandrawriter</artifactId>
     <name>cassandrawriter</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/clickhousewriter/pom.xml b/clickhousewriter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/pom.xml b/common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
 
     <artifactId>datax-common</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
 
     <artifactId>datax-core</artifactId>

diff --git a/doriswriter/pom.xml b/doriswriter/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/drdsreader/pom.xml b/drdsreader/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
 
     <artifactId>drdsreader</artifactId>

diff --git a/drdswriter/pom.xml b/drdswriter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
 
     <artifactId>drdswriter</artifactId>

diff --git a/elasticsearchwriter/pom.xml b/elasticsearchwriter/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>elasticsearchwriter</artifactId>
 
     <groupId>com.alibaba.datax</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <properties>
         <jest.version>6.3.1</jest.version>
     </properties>

diff --git a/ftp-common/pom.xml b/ftp-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/ftp-common/src/main/java/com/alibaba/datax/plugin/ftp/common/StandardFtpHelper.java b/ftp-common/src/main/java/com/alibaba/datax/plugin/ftp/common/StandardFtpHelper.java
@@ -31,14 +31,15 @@ public void loginFtpServer(String host, String username, String password, int po
                                String connectMode) {
         ftpClient = new FTPClient();
         try {
+            ftpClient.setConnectTimeout(timeout);
+            ftpClient.setDataTimeout(timeout);
             // 连接
             ftpClient.connect(host, port);
             // 登录
             ftpClient.login(username, password);
             // 不需要写死ftp server的OS TYPE,FTPClient getSystemType()方法会自动识别
             // ftpClient.configure(new FTPClientConfig(FTPClientConfig.SYST_UNIX));
-            ftpClient.setConnectTimeout(timeout);
-            ftpClient.setDataTimeout(timeout);
+
             if ("PASV".equalsIgnoreCase(connectMode)) {
                 ftpClient.enterRemotePassiveMode();
                 ftpClient.enterLocalPassiveMode();

diff --git a/ftpreader/pom.xml b/ftpreader/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.alibaba.datax</groupId>
 		<artifactId>datax-all</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.1</version>
 	</parent>
 	<artifactId>ftpreader</artifactId>
 	<name>ftpreader</name>

diff --git a/ftpwriter/pom.xml b/ftpwriter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.alibaba.datax</groupId>
 		<artifactId>datax-all</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.1</version>
 	</parent>
 	<artifactId>ftpwriter</artifactId>
 	<name>ftpwriter</name>

diff --git a/gdbreader/pom.xml b/gdbreader/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gdbreader</artifactId>
 
     <groupId>com.alibaba.datax</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
 
     <dependencies>
         <dependency>

diff --git a/gdbwriter/pom.xml b/gdbwriter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
 
     <artifactId>gdbwriter</artifactId>

diff --git a/hbase094xreader/pom.xml b/hbase094xreader/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hbase094xreader</artifactId>
     <name>hbase094xreader</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
 
 
     <dependencies>

diff --git a/hbase094xwriter/pom.xml b/hbase094xwriter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hbase094xwriter</artifactId>
     <name>hbase094xwriter</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
 
     <properties>
         <commons-codec.version>1.8</commons-codec.version>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>com.alibaba.datax</groupId>
             <artifactId>datax-common</artifactId>
-            <version>3.7.0</version>
+            <version>3.7.1</version>
         </dependency>
     </dependencies>
 

diff --git a/hbase11xreader/pom.xml b/hbase11xreader/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <artifactId>hbase11xreader</artifactId>
     <name>hbase11xreader</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/hbase11xsqlreader/pom.xml b/hbase11xsqlreader/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <artifactId>hbase11xsqlreader</artifactId>
     <name>hbase11xsqlreader</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/hbase11xsqlwriter/pom.xml b/hbase11xsqlwriter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hbase11xsqlwriter</artifactId>
     <name>hbase11xsqlwriter</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/hbase11xwriter/pom.xml b/hbase11xwriter/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hbase11xwriter</artifactId>
     <name>hbase11xwriter</name>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/hbase20xsqlreader/pom.xml b/hbase20xsqlreader/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hbase20xsqlreader</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.alibaba.datax</groupId>
             <artifactId>plugin-rdbms-util</artifactId>
-            <version>3.7.0</version>
+            <version>3.7.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/hbase20xsqlwriter/pom.xml b/hbase20xsqlwriter/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hbase20xsqlwriter</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/hdfsreader/pom.xml b/hdfsreader/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hdfsreader</artifactId>
     <groupId>com.alibaba.datax</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1</version>
     <packaging>jar</packaging>
     <properties>
         <hive.version>1.1.1</hive.version>

diff --git a/hdfswriter/pom.xml b/hdfswriter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kingbaseesreader/pom.xml b/kingbaseesreader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kingbaseeswriter/pom.xml b/kingbaseeswriter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.alibaba.datax</groupId>
 		<artifactId>datax-all</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.1</version>
 	</parent>
 	<artifactId>kingbaseeswriter</artifactId>
 	<name>kingbaseeswriter</name>

diff --git a/kuduwriter/pom.xml b/kuduwriter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mongodbreader/pom.xml b/mongodbreader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/mongodbwriter/pom.xml b/mongodbwriter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datax-all</artifactId>
         <groupId>com.alibaba.datax</groupId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mongodbwriter</artifactId>

diff --git a/mysqlreader/pom.xml b/mysqlreader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
-        <version>3.7.0</version>
+        <version>3.7.1</version>
     </parent>
     <artifactId>mysqlreader</artifactId>
     <name>mysqlreader</name>

diff --git a/mysqlwriter/pom.xml b/mysqlwriter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.alibaba.datax</groupId>
 		<artifactId>datax-all</artifactId>
-		<version>3.7.0</version>
+		<version>3.7.1</version>
 	</parent>
 	<artifactId>mysqlwriter</artifactId>
 	<name>mysqlwriter</name>