From cd03583dab6a9e1a1c660f0fe96ea7cf5b5eca46 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Mon, 25 Aug 2025 11:11:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3server=20sdk=E5=8F=8D?= =?UTF-8?q?=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=B3=84=E6=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wildfirechat/sdk/ChannelServiceApi.java | 10 +++-- .../main/java/cn/wildfirechat/sdk/Main.java | 11 ++++- .../cn/wildfirechat/sdk/RobotService.java | 9 ++++- .../sdk/utilities/AdminHttpUtils.java | 40 ++++++++++--------- .../sdk/utilities/ChannelHttpUtils.java | 9 ++++- .../sdk/utilities/RobotHttpUtils.java | 14 ++++++- 6 files changed, 66 insertions(+), 27 deletions(-) diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java b/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java index 16e141b0..b4fd2ce3 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java @@ -9,12 +9,14 @@ import cn.wildfirechat.sdk.utilities.ChannelHttpUtils; import com.google.gson.Gson; import org.apache.commons.codec.digest.DigestUtils; +import java.io.Closeable; +import java.io.IOException; import java.util.List; import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Channel; //仅专业版支持，社区版不支持 -public class ChannelServiceApi { +public class ChannelServiceApi implements Closeable { private final ChannelHttpUtils channelHttpUtils; public ChannelServiceApi(String imurl, String channelId, String secret) { @@ -66,7 +68,6 @@ public class ChannelServiceApi { return channelHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class); } - //仅专业版支持 public IMResult recallMessage(long messageUid) throws Exception { String path = APIPath.Channel_Msg_Recall; RecallMessageData messageData = new RecallMessageData(); @@ -74,7 +75,6 @@ public class ChannelServiceApi { return channelHttpUtils.httpJsonPost(path, messageData, String.class); } - //仅专业版支持 public IMResult republishMessage(long messageUid, List targets) throws Exception { String path = APIPath.Channel_Msg_Republish; RepublishChannelMessageData messageData = new RepublishChannelMessageData(); @@ -131,4 +131,8 @@ public class ChannelServiceApi { return configData; } + @Override + public void close() throws IOException { + channelHttpUtils.close(); + } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java index 50df5a90..9858690c 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java @@ -21,7 +21,7 @@ import static cn.wildfirechat.proto.ProtoConstants.ChannelState.*; import static cn.wildfirechat.proto.ProtoConstants.SystemSettingType.Group_Max_Member_Count; public class Main { - private static boolean commercialServer = false; + private static boolean commercialServer = true; private static boolean advanceVoip = false; private static boolean robotMomentsEnabled = false; private static boolean momentsEnabled = false; @@ -1413,6 +1413,7 @@ public class Main { System.exit(-1); } + //使用完需要释放 RobotService robotService = new RobotService(IMUrl, robotId, robotSecret); //*********************************************** @@ -1812,6 +1813,9 @@ public class Main { System.exit(-1); } } + + //使用完需要释放 + robotService.close(); } //***测试频道API功能，仅专业版支持*** @@ -1882,7 +1886,7 @@ public class Main { } - //2. 初始化api，注意端口是80，不是18080 + //2. 初始化api，注意端口是80，不是18080 //使用完需要释放 ChannelServiceApi channelServiceApi = new ChannelServiceApi(IMUrl, channelId, secret); @@ -2038,6 +2042,9 @@ public class Main { } OutputApplicationConfigData config = channelServiceApi.getApplicationSignature(); System.out.println(config); + + //使用完需要释放 + channelServiceApi.close(); } static void testSensitiveApi() throws Exception { List words = Arrays.asList("a","b","c"); diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/RobotService.java b/sdk/src/main/java/cn/wildfirechat/sdk/RobotService.java index cea200e0..91abc61a 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/RobotService.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/RobotService.java @@ -8,11 +8,13 @@ import cn.wildfirechat.sdk.model.IMResult; import cn.wildfirechat.sdk.utilities.RobotHttpUtils; import org.apache.commons.codec.digest.DigestUtils; +import java.io.Closeable; +import java.io.IOException; import java.util.List; import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Robot; -public class RobotService { +public class RobotService implements Closeable { private final RobotHttpUtils robotHttpUtils; public RobotService(String url, String robotId, String robotSecret) { @@ -423,4 +425,9 @@ public class RobotService { requestPojo.rl = removeList; return robotHttpUtils.httpJsonPost(path, requestPojo, Void.class); } + + @Override + public void close() throws IOException { + robotHttpUtils.close(); + } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java index ce194bd6..38a2299d 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java @@ -41,28 +41,30 @@ public class AdminHttpUtils extends JsonUtils { init(url, secret, 15000); } - public static void init(String url, String secret, int timeout) { + public static synchronized void init(String url, String secret, int timeout) { adminUrl = url.trim(); adminSecret = secret.trim(); - PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(); - cm.setValidateAfterInactivity(1000); - int connectTimeout = 15000; // 连接超时时间 - int connectionRequestTimeout = 3000; // 从连接池获取连接的超时时间 - RequestConfig requestConfig = RequestConfig.custom() - .setConnectTimeout(connectTimeout) - .setSocketTimeout(timeout) - .setConnectionRequestTimeout(connectionRequestTimeout) - .build(); + if(httpClient == null) { + PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(); + cm.setValidateAfterInactivity(1000); + int connectTimeout = 15000; // 连接超时时间 + int connectionRequestTimeout = 3000; // 从连接池获取连接的超时时间 + RequestConfig requestConfig = RequestConfig.custom() + .setConnectTimeout(connectTimeout) + .setSocketTimeout(timeout) + .setConnectionRequestTimeout(connectionRequestTimeout) + .build(); - httpClient = HttpClients.custom() - .setDefaultRequestConfig(requestConfig) - .setConnectionManager(cm) - .evictExpiredConnections() - .evictIdleConnections(60L, TimeUnit.SECONDS) - .setRetryHandler(DefaultHttpRequestRetryHandler.INSTANCE) - .setMaxConnTotal(100) - .setMaxConnPerRoute(50) - .build(); + httpClient = HttpClients.custom() + .setDefaultRequestConfig(requestConfig) + .setConnectionManager(cm) + .evictExpiredConnections() + .evictIdleConnections(60L, TimeUnit.SECONDS) + .setRetryHandler(DefaultHttpRequestRetryHandler.INSTANCE) + .setMaxConnTotal(100) + .setMaxConnPerRoute(50) + .build(); + } } public static IMResult httpGet(String path, Class clazz) throws Exception { diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java index 3e2b5220..98c5dea0 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java @@ -20,6 +20,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedReader; +import java.io.Closeable; +import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.Type; import java.net.MalformedURLException; @@ -28,7 +30,7 @@ import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; -public class ChannelHttpUtils extends JsonUtils { +public class ChannelHttpUtils extends JsonUtils implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(ChannelHttpUtils.class); public static final Gson gson = new GsonBuilder().disableHtmlEscaping().create(); @@ -156,4 +158,9 @@ public class ChannelHttpUtils extends JsonUtils { public String getChannelSecret() { return channelSecret; } + + @Override + public void close() throws IOException { + httpClient.close(); + } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java index 99039756..f8cf3b35 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java @@ -3,29 +3,35 @@ package cn.wildfirechat.sdk.utilities; import cn.wildfirechat.sdk.model.IMResult; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import ikidou.reflect.TypeBuilder; import io.netty.util.internal.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedReader; +import java.io.Closeable; +import java.io.IOException; import java.io.InputStreamReader; +import java.lang.reflect.Type; import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; -public class RobotHttpUtils extends JsonUtils { +public class RobotHttpUtils extends JsonUtils implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(RobotHttpUtils.class); public static final Gson gson = new GsonBuilder().disableHtmlEscaping().create(); @@ -78,6 +84,7 @@ public class RobotHttpUtils extends JsonUtils { .build(); } + public IMResult httpJsonPost(String path, Object object, Class clazz) throws Exception{ if (isNullOrEmpty(url) || isNullOrEmpty(path)) { LOG.error("Not init IM SDK correctly. Do you forget init it?"); @@ -154,4 +161,9 @@ public class RobotHttpUtils extends JsonUtils { public String getRobotSecret() { return robotSecret; } + + @Override + public void close() throws IOException { + httpClient.close(); + } }