From 449efd9de55ee2c30cb5af01f8b0178961acb41c Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Mon, 1 Nov 2021 18:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96http=20=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/GameLogicService.java | 5 ---- .../config/reportData/DataMessageUtils.java | 13 ---------- .../com/ljsd/jieling/util/http/HttpPool.java | 26 +++++++++++-------- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameLogicService.java b/serverlogic/src/main/java/com/ljsd/GameLogicService.java index 9c53ef050..fdb2bef0f 100644 --- a/serverlogic/src/main/java/com/ljsd/GameLogicService.java +++ b/serverlogic/src/main/java/com/ljsd/GameLogicService.java @@ -4,7 +4,6 @@ import com.google.gson.Gson; import com.ljsd.common.mogodb.util.MongoKeys; import com.ljsd.jieling.config.json.CoreSettings; import com.ljsd.jieling.core.CoreLogic; -import com.ljsd.jieling.db.mongo.AreaManager; import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; @@ -17,7 +16,6 @@ import com.ljsd.jieling.logic.activity.event.ServerOpenEvent; import com.ljsd.jieling.logic.dao.GuilidManager; import com.ljsd.jieling.logic.dao.MailingSystemManager; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.network.server.GlobalidHelper; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.thread.ThreadManager; @@ -25,14 +23,11 @@ import com.ljsd.jieling.thread.task.MongoDataHandlerTask; import com.ljsd.jieling.thrift.pool.ThriftPoolUtils; import com.ljsd.jieling.util.ConfigurableApplicationContextManager; import com.ljsd.jieling.util.KeyGenUtils; -import com.ljsd.jieling.util.SensitivewordFilter; import com.ljsd.jieling.util.http.HttpPool; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URL; - /** * Description: 逻辑服务管理 * Author: zsx diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java index 974ad74f7..4f77279b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/reportData/DataMessageUtils.java @@ -1,23 +1,10 @@ package com.ljsd.jieling.config.reportData; import com.google.gson.Gson; -import com.ljsd.GameApplication; -import com.ljsd.GameLogicService; -import com.ljsd.common.mogodb.util.BlockingUniqueQueue; -import com.ljsd.jieling.ktbeans.KTParam; -import com.ljsd.jieling.ktbeans.KTSendBody; import com.ljsd.jieling.util.http.HttpPool; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.message.BasicNameValuePair; -import util.StringUtil; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.BlockingQueue; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java b/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java index 495d0a099..5d4a5811e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/http/HttpPool.java @@ -36,7 +36,7 @@ public class HttpPool { public static String sendPost(String url, String info,String content_type) { HttpPost httpPost = new HttpPost(url); - HttpResponse httpResponse; + HttpResponse httpResponse = null; int sendTimes = 0; boolean needBack = true; do { @@ -44,17 +44,14 @@ public class HttpPool { StringEntity stringEntity = new StringEntity(info, charset); httpPost.setEntity(stringEntity); httpPost.setConfig(getRequestConfig()); - - httpPost.setHeader("Content-Type",content_type); - + httpPost.setHeader("Content-Type", content_type); httpResponse = httpclient.execute(httpPost); HttpEntity responseEntity = httpResponse.getEntity(); int statusCode = httpResponse.getStatusLine().getStatusCode(); if (statusCode >= 200 && statusCode < 300) { needBack = false; - String result = EntityUtils.toString(responseEntity,"UTF-8"); + String result = EntityUtils.toString(responseEntity, "UTF-8"); LOGGER.debug("Http Send,第" + (sendTimes + 1) + "次调用成功,返回码为:[" + statusCode + "]"); - EntityUtils.consume(responseEntity); return result; // break; } else { @@ -69,15 +66,22 @@ public class HttpPool { } else { LOGGER.debug("Http Send,达到重发最大次数,退出程序!"); } - EntityUtils.consume(responseEntity); } } catch (IOException e) { - LOGGER.error("Http Send error",e); - }finally { - sendTimes ++ ; + LOGGER.error("Http Send error", e); + } finally { + sendTimes++; + if (httpResponse != null) { + HttpEntity responseEntity = httpResponse.getEntity(); + try { + EntityUtils.consume(responseEntity); + } catch (IOException e) { + LOGGER.error("EntityUtils.consume(responseEntity)", e); + } + } } } while (sendTimes < maxSendTimes); - if(needBack){ + if (needBack) { BackErrorLog.info(info); } return null;