From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java |   74 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java b/java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java
index ad3c8ba..1fa8d8b 100644
--- a/java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java
@@ -1,16 +1,31 @@
 package com.java110.core.client;
 
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.factory.LogFactory;
 import com.java110.core.log.LoggerFactory;
+import com.java110.dto.log.TransactionOutLogDto;
+import com.java110.intf.common.ITransactionOutLogV1ServiceSMO;
+import com.java110.po.log.TransactionOutLogPo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ExceptionUtil;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.lang.Nullable;
+import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestClientException;
 
+import java.util.Date;
+
 /**
- *
  * 璇ョ被鍙璐熻矗璋冪敤澶栭儴璧勬簮
- *
  *
  * @author wux
  * @create 2019-02-02 涓嬪崍8:28
@@ -38,11 +53,60 @@
     public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
                                           HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) throws RestClientException {
 
-        logger.debug("璇锋眰淇℃伅锛歶rl:{},method:{},request:{},uriVariables:{}", url, method, requestEntity, uriVariables);
-        ResponseEntity<T> responseEntity = super.exchange(url, method, requestEntity, responseType, uriVariables);
-        logger.debug("杩斿洖淇℃伅锛歳esponseEntity:{}", responseEntity);
+        String errMsg = "";
 
+        ResponseEntity<T> responseEntity = null;
+        ResponseEntity tmpResponseEntity = null;
+        Date startTime = DateUtil.getCurrentDate();
+        try {
+            logger.debug("璇锋眰淇℃伅锛歶rl:{},method:{},request:{},uriVariables:{}", url, method, requestEntity, uriVariables);
+            responseEntity = super.exchange(url, method, requestEntity, responseType, uriVariables);
+            logger.debug("杩斿洖淇℃伅锛歳esponseEntity:{}", responseEntity);
+
+        } catch (HttpStatusCodeException e) {
+            errMsg = ExceptionUtil.getStackTrace(e);
+            throw e;
+        } finally {
+
+            if (responseEntity != null) {
+                tmpResponseEntity = new ResponseEntity(responseEntity.getBody(), responseEntity.getStatusCode());
+            } else {
+                tmpResponseEntity = new ResponseEntity(errMsg, HttpStatus.BAD_REQUEST);
+            }
+            LogFactory.saveOutLog(url, "POST", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null, tmpResponseEntity.getBody().toString(), tmpResponseEntity);
+
+        }
         return responseEntity;
     }
 
+    @Override
+    public <T> ResponseEntity<T> postForEntity(String url, @Nullable Object request,
+                                               Class<T> responseType, Object... uriVariables) throws RestClientException {
+        String errMsg = "";
+
+        ResponseEntity<T> responseEntity = null;
+        ResponseEntity tmpResponseEntity = null;
+        Date startTime = DateUtil.getCurrentDate();
+        try {
+            logger.debug("璇锋眰淇℃伅锛歶rl:{},method:{},request:{},uriVariables:{}", url, "POST", request, uriVariables);
+            responseEntity = super.postForEntity(url, request, responseType, uriVariables);
+            logger.debug("杩斿洖淇℃伅锛歳esponseEntity:{}", responseEntity);
+        } catch (HttpStatusCodeException e) {
+            errMsg = ExceptionUtil.getStackTrace(e);
+            throw e;
+        } finally {
+
+            if (responseEntity != null) {
+                tmpResponseEntity = new ResponseEntity(responseEntity.getBody(), responseEntity.getStatusCode());
+            } else {
+                tmpResponseEntity = new ResponseEntity(errMsg, HttpStatus.BAD_REQUEST);
+            }
+          //  saveLog(url, "POST", null, tmpResponseEntity, DateUtil.getCurrentDate().getTime() - startTime.getTime());
+
+            LogFactory.saveOutLog(url, "POST", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null, request.toString(), tmpResponseEntity);
+        }
+        return responseEntity;
+    }
+
+
 }

--
Gitblit v1.8.0