【feat】 优化ORG连接问题

src/main/java/com/celnet/datadump/config/SalesforceConnect.java

@@ -18,6 +18,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Red
@@ -31,12 +32,14 @@ public class SalesforceConnect {
     @Resource
     private CustomMapper customerMapper;
 
-
     /**
      * 创建连接
      * @return
      */
     public PartnerConnection createConnect()  {
+        int failCount = 0;
+        //重试连接次数
+        while (true){
             try {
                 List<Map<String, Object>> poll = customerMapper.list("code,value","org_config",null);
                 //遍历poll,找出code值为SOURCE_ORG_URL，SOURCE_ORG_USERNAME，SOURCE_ORG_PASSWORD的value值
@@ -64,19 +67,31 @@ public class SalesforceConnect {
                 config.setReadTimeout(60 * 60 * 1000);
                 return new PartnerConnection(config);
             } catch (ConnectionException e) {
-            String message = "源ORG连接配置错误！";
+                failCount ++;
+                log.error("源ORG连接异常！休眠一分钟再次发起重试~~", e);
+                try {
+                    TimeUnit.MINUTES.sleep(1);
+                }catch (InterruptedException ie) {
+                    log.error("休眠异常", ie);
+                }
+                if (failCount > 3) {
+                    String message = "源ORG三次重试连接错误！";
                     String format = String.format("ORG连接异常！, \ncause:\n%s", message);
                     EmailUtil.send("DataDump ERROR", format);
                     log.error("exception message", e);
-            return null;
                 }
             }
+        }
+
+    }
 
     /**
      * 创建Bulk连接
      * @author kris
      */
     public BulkConnection createBulkConnect() {
+        int failCount = 0;
+        while (true){
             try {
                 List<Map<String, Object>> poll = customerMapper.list("code,value","org_config",null);
                 //遍历poll,找出code值为SOURCE_ORG_URL，SOURCE_ORG_USERNAME，SOURCE_ORG_PASSWORD的value值
@@ -92,26 +107,21 @@ public class SalesforceConnect {
                         map.put("password", String.valueOf(map1.get("value")));
                     }
                 }
-//
-//            String username = map.get("username");
-//            ConnectorConfig config = new ConnectorConfig();
-//            config.setUsername(username);
-//            config.setPassword(map.get("password"));
-//            String url = map.get("url");
-//            config.setAuthEndpoint(url);
-//            config.setServiceEndpoint(url);
-//            config.setConnectionTimeout(60 * 60 * 1000);
-//            config.setReadTimeout(60 * 60 * 1000);
-//            PartnerConnection connection = new PartnerConnection(config);
-//            config.setRestEndpoint(url);
-//            config.setSessionId(connection.getSessionHeader().getSessionId());
                 return BulkUtil.getBulkConnection(map.get("username"),map.get("password"),map.get("url"));
             } catch (Exception e) {
-            String message = "源ORG连接配置错误！";
+                failCount ++;
+                log.error("源ORG连接异常！休眠一分钟再次发起重试~~", e);
+                try {
+                    TimeUnit.MINUTES.sleep(1);
+                }catch (InterruptedException ie) {
+                    log.error("休眠异常", ie);
+                }                if (failCount > 3) {
+                    String message = "源ORG三次重试连接错误！";
                     String format = String.format("ORG连接异常！, \ncause:\n%s", message);
                     EmailUtil.send("DataDump ERROR", format);
                     log.error("exception message", e);
-            return null;
+                }
+            }
         }
     }
 

src/main/java/com/celnet/datadump/config/SalesforceTargetConnect.java

@@ -18,6 +18,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
+import java.util.concurrent.TimeUnit;
 
 @Component
 @Slf4j
@@ -31,6 +32,9 @@ public class SalesforceTargetConnect {
      * @return
      */
     public PartnerConnection createConnect()  {
+        int failCount = 0;
+        //重试连接次数
+        while (true){
             try {
                 List<Map<String, Object>> poll = customerMapper.list("code,value","org_config",null);
                 //遍历poll,找出code值为TARGET_ORG_URL，TARGET_ORG_USERNAME，TARGET_ORG_PASSWORD的value值
@@ -60,12 +64,23 @@ public class SalesforceTargetConnect {
                 String orgId = connection.getUserInfo().getOrganizationId();
                 return connection;
             } catch (ConnectionException e) {
-            String message = "目标ORG连接配置错误！";
+                failCount++;
+                log.error("目标ORG连接异常！休眠一分钟再次发起重试~~", e);
+                try {
+                    TimeUnit.MINUTES.sleep(1);
+                }catch (InterruptedException ie) {
+                    log.error("休眠异常", ie);
+                }                if (failCount > 3) {
+                    String message = "目标ORG三次重试连接错误！";
                     String format = String.format("ORG连接异常！, \ncause:\n%s", message);
                     EmailUtil.send("DataDump ERROR", format);
                     log.error("exception message", e);
                     return null;
                 }
+
+            }
+        }
+
     }
 
     /**
@@ -73,6 +88,9 @@ public class SalesforceTargetConnect {
      * @author kris
      */
     public BulkConnection createBulkConnect() {
+        int failCount = 0;
+        while (true){
+            //重试连接次数
             try {
                 List<Map<String, Object>> poll = customerMapper.list("code,value","org_config",null);
                 //遍历poll,找出code值为TARGET_ORG_URL，TARGET_ORG_USERNAME，TARGET_ORG_PASSWORD的value值
@@ -88,28 +106,23 @@ public class SalesforceTargetConnect {
                         map.put("password", (String) map1.get("value"));
                     }
                 }
-
-
-//            String username = ;
-//            ConnectorConfig config = new ConnectorConfig();
-//            config.setUsername(username);
-//            config.setPassword();
-//            String url = ;
-//            config.setAuthEndpoint(url);
-//            config.setServiceEndpoint(url);
-//            config.setConnectionTimeout(60 * 60 * 1000);
-//            config.setReadTimeout(60 * 60 * 1000);
-//            PartnerConnection connection = new PartnerConnection(config);
-//            config.setRestEndpoint(url);
-//            config.setSessionId(connection.getSessionHeader().getSessionId());
                 return BulkUtil.getBulkConnection(map.get("username"),map.get("password"),map.get("url"));
             } catch (Exception e) {
-            String message = "目标ORG连接配置错误！";
+                failCount++;
+                log.error("目标ORG连接异常！休眠一分钟再次发起重试~~", e);
+                try {
+                    TimeUnit.MINUTES.sleep(1);
+                }catch (InterruptedException ie) {
+                    log.error("休眠异常", ie);
+                }                if (failCount > 3) {
+                    String message = "目标ORG三次重试连接错误！";
                     String format = String.format("ORG连接异常！, \ncause:\n%s", message);
                     EmailUtil.send("DataDump ERROR", format);
                     log.error("exception message", e);
                     return null;
                 }
             }
+        }
+    }
 
 }