feat(#proxy) : 1.2.1 release version

Author: mike.wq

app-stream-api/src/main/java/com/dingtalk/open/app/api/OpenDingTalkStreamClient.java

@@ -81,7 +81,7 @@ private EndPointConnection openConnection(DingTalkCredential credential, Set<Sub
         request.setUa(UserAgent.getUserAgent().getUa());
         request.setSubscriptions(subscriptions);
         request.setLocalIp(IpUtils.getLocalIP());
-        OpenConnectionResponse response = openApiClient.openConnection(request, proxy);
+        OpenConnectionResponse response = openApiClient.openConnection(request);
         return new EndPointConnection(credential.getClientId(), response.getEndpoint(), response.getTicket(), proxy);
     }
 

app-stream-api/src/main/java/com/dingtalk/open/app/api/open/HttpOpenApiClient.java

@@ -18,15 +18,18 @@ class HttpOpenApiClient implements OpenApiClient {
 
     private final String host;
 
+    private final Proxy proxy;
+
     private final int timeout;
 
-    public HttpOpenApiClient(String host, int timeout) {
+    public HttpOpenApiClient(String host, int timeout, Proxy proxy) {
         this.host = host;
         this.timeout = timeout;
+        this.proxy = proxy;
     }
 
     @Override
-    public OpenConnectionResponse openConnection(OpenConnectionRequest request, Proxy proxy) throws Exception {
+    public OpenConnectionResponse openConnection(OpenConnectionRequest request) throws Exception {
         URL url =  new URL(host + "/v1.0/gateway/connections/open");
 
         HttpURLConnection connection;

app-stream-api/src/main/java/com/dingtalk/open/app/api/open/OpenApiClient.java

@@ -1,7 +1,5 @@
 package com.dingtalk.open.app.api.open;
 
-import java.net.Proxy;
-
 /**
  * @author feiyin
  * @date 2023/2/9
@@ -14,7 +12,7 @@ public interface OpenApiClient {
      * @return
      * @throws Exception
      */
-    OpenConnectionResponse openConnection(OpenConnectionRequest request, Proxy proxy) throws Exception;
+    OpenConnectionResponse openConnection(OpenConnectionRequest request) throws Exception;
 
 
 }

app-stream-api/src/main/java/com/dingtalk/open/app/api/open/OpenApiClientBuilder.java

@@ -1,5 +1,7 @@
 package com.dingtalk.open.app.api.open;
 
+import java.net.Proxy;
+
 /**
  * @author feiyin
  * @date 2023/3/1
@@ -16,6 +18,8 @@ public static OpenApiClientBuilder create() {
 
     public String host;
 
+    private Proxy proxy;
+
     private int timeout = 3000;
 
     public OpenApiClientBuilder setHost(String host) {
@@ -28,7 +32,12 @@ public OpenApiClientBuilder setTimeout(int timeout) {
         return this;
     }
 
+    public OpenApiClientBuilder setProxy(Proxy proxy) {
+        this.proxy = proxy;
+        return this;
+    }
+
     public OpenApiClient build() {
-        return new HttpOpenApiClient(host, timeout);
+        return new HttpOpenApiClient(host, timeout, proxy);
     }
 }

app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/AppServiceListener.java

@@ -29,7 +29,7 @@ public void receive(Context context) {
             try {
                 commandDispatcher.execute(context);
             } catch (Exception e) {
-                LOGGER.error("[DingTalk] dispatch command failed", e);
+                LOGGER.error("[DingTalk] dispatch command failed, {}", e);
             }
         });
     }

app-stream-network/app-stream-network-core/src/main/java/com/dingtalk/open/app/stream/network/core/Connector.java

@@ -69,7 +69,7 @@ private static void ensureActive() {
             }
             INIT = true;
         } catch (Exception e) {
-            LOGGER.error("[DingTalk] client init transport failed", e);
+            LOGGER.error("[DingTalk] client init transport failed, {}", e);
         } finally {
             INIT_LOCK.unlock();
         }

app-stream-network/app-stream-network-core/src/main/java/com/dingtalk/open/app/stream/network/core/DefaultSessionPool.java

@@ -8,7 +8,6 @@
 import com.dingtalk.open.app.stream.protocol.system.SystemTopic;
 import io.netty.util.concurrent.DefaultThreadFactory;
 
-import java.net.Proxy;
 import java.util.Map;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -178,7 +177,7 @@ public void run() {
                     }
                 }
             } catch (Throwable e) {
-                LOGGER.error("[DingTalk] establish connection failed", e);
+                LOGGER.error("[DingTalk] establish connection failed, {}", e);
             }
         }
     }
@@ -202,7 +201,7 @@ public T run(Callable<T> callable) throws Exception {
                 try {
                     return callable.call();
                 } catch (Exception e) {
-                    LOGGER.error("[DingTalk] retrievable executor execute failed", e);
+                    LOGGER.error("[DingTalk] retrievable executor execute failed, {}", e);
                     if (count.get() <= 0) {
                         throw e;
                     }