From 14d7f0df63340ede75458c0e91b902376ef4dd64 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 11:26:32 +0800
Subject: [PATCH] 1、优化代码；2、修改长级测试中发现的bug；3、通信中间件配置文件配置项修改
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
index 5a422e2..e07ad00 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
@@ -1,7 +1,9 @@
package com.dy.rtuMw.web.webRequest;
+import com.dy.common.contant.Constant;
import com.dy.common.mw.protocol.Command;
-import com.dy.rtuMw.web.comResult.WebResponseVo;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.rtuMw.server.ServerProperties;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +18,7 @@
/**
* @Author: liurunyu
* @Date: 2024/11/11 16:29
- * @Description
+ * @Description 閫氫俊涓棿浠跺澶栧彂鍑虹殑web璇锋眰
*/
@Component()
public class WebRequestDeal {
@@ -30,6 +32,11 @@
this.restTemplate = restTemplate ;
}
+ /**
+ * 澶勭悊涓棿浠朵富鍔ㄥ彂璧风殑web璇锋眰
+ * @param webUrl
+ * @param obj
+ */
public void deal(String webUrl, Object obj) {
if (webUrl != null
&& !webUrl.trim().equals("")
@@ -40,11 +47,12 @@
restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8));
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
+ headers.set(Constant.UserTokenKeyInHeader, ServerProperties.orgTag);
HttpEntity<?> httpEntity = new HttpEntity<>(obj, headers);
- ResponseEntity<WebResponseVo> response = null;
+ ResponseEntity<BaseResponse> response = null;
try {
// 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
- response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, WebResponseVo.class);
+ response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
} catch (Exception e) {
log.error("web璁块棶璇锋眰鍙戠敓寮傚父", e);
}
--
Gitblit v1.8.0