From 00187403d38705e8b6188feab3d5af61a641e53c Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 19 Apr 2024 17:39:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=91=E9=80=81OA=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E6=B7=BB=E5=8A=A0=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA2=E5=88=86=E9=92=9F=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E5=90=8E=E7=9A=84=E5=BB=B6?= =?UTF-8?q?=E8=BF=9F=E6=97=B6=E9=97=B4=E8=AE=BE=E4=B8=BA10=E5=88=86?= =?UTF-8?q?=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_mq/service/SendDeleteMQService.java | 2 +- .../business_mq/service/SendDoneMQService.java | 2 +- .../wkflow/business_mq/service/SendMQService.java | 2 +- .../service/SendToBeReadMQService.java | 3 ++- .../bat/wkflow/business_oa/utils/OkHttpUtil.java | 15 +++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java index c44ee1d3..785f698a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java @@ -144,7 +144,7 @@ public class SendDeleteMQService { private void restSendDoneTodo(String object, SimpleDateFormat sdf, SendTodoLog sendTodoLog, int againNumNew,String operMesg) throws Exception{ // 发送失败连续持续3次， 如果在失败等待1个小时后重试3次 if(againNumNew < 6){ - Thread.sleep(3000); + Thread.sleep(600000); logger.info("发送失败连续持续"+againNumNew+"次,存入延迟重试队列！！！！！！！！！"); }else { diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java index 59cabdfc..05e02f06 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java @@ -140,7 +140,7 @@ public class SendDoneMQService { private void restSendDoneTodo(NotifyTodoSendContext object, SimpleDateFormat sdf, SendTodoLog sendTodoLog, int againNumNew,String operMesg) throws Exception{ // 发送失败连续持续3次， 如果在失败等待1个小时后重试3次 if(againNumNew < 6){ - Thread.sleep(3000); + Thread.sleep(600000); logger.info("发送失败连续持续"+againNumNew+"次,存入延迟重试队列！！！！！！！！！"); }else { diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java index f6635a85..773e00f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java @@ -175,7 +175,7 @@ public class SendMQService { private void restSendTodo(BusProcessNew object, SimpleDateFormat sdf, SendTodoLog sendTodoLog, int againNumNew,String operMesg) throws Exception{ // 失败次数小于6次，放入失败队列延迟消费 if((againNumNew < 6)){ - Thread.sleep(3000); + Thread.sleep(600000); logger.info("发送失败连续持续"+againNumNew+"次,存入延迟重试队列！！！！！！！！！"); }else { logger.info("发送失败连续持续"+againNumNew+"次！！"); diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendToBeReadMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendToBeReadMQService.java index 439b7652..4cb6ca41 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendToBeReadMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendToBeReadMQService.java @@ -134,7 +134,8 @@ public class SendToBeReadMQService { private void restSendTodo(BusProcessNew object, SimpleDateFormat sdf, SendTodoLog sendTodoLog, int againNumNew, String operMesg) throws Exception { // 失败次数小于6次，放入失败队列延迟消费 if ((againNumNew < 6)) { - Thread.sleep(3000); + // 延迟10分钟 + Thread.sleep(600000); logger.info("发送失败连续持续" + againNumNew + "次,存入延迟重试队列！！！！！！！！！"); } else { logger.info("发送失败连续持续" + againNumNew + "次！！"); diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/utils/OkHttpUtil.java b/src/main/java/com/ydw/bat/wkflow/business_oa/utils/OkHttpUtil.java index 3789a964..557f0647 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/utils/OkHttpUtil.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/utils/OkHttpUtil.java @@ -11,6 +11,7 @@ import java.io.File; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.concurrent.TimeUnit; @Component public class OkHttpUtil { @@ -250,6 +251,10 @@ public class OkHttpUtil { * @return */ public String postForJson(String url, String json, Map headerParams){ + OkHttpClient client = new OkHttpClient.Builder() + .connectTimeout(2, TimeUnit.MINUTES)//设置连接超时时间 + .readTimeout(2, TimeUnit.MINUTES)//设置读取超时时间 + .build(); RequestBody requestBody = FormBody.create(MediaType.parse("application/json; charset=utf-8"), json); String responseBody = ""; Request.Builder requestBuilder = new Request.Builder().url(url); @@ -257,20 +262,14 @@ public class OkHttpUtil { requestBuilder.addHeader(entry.getKey(), entry.getValue()); } Request request = requestBuilder.post(requestBody).build(); - Response response = null; - try { - response = okHttpClient.newCall(request).execute(); + try (Response response = client.newCall(request).execute()) { int status = response.code(); if (status == 200) { return response.body().string(); } } catch (Exception e) { logger.error("okhttp post error >> ex = {}", ExceptionUtils.getStackTrace(e)); - return "okhttp post error >> ex = {} "+ e.getMessage(); - } finally { - if (response != null) { - response.close(); - } + return "okhttp post error >> ex = {} " + e.getMessage(); } return responseBody; }