From 1a21d93cbf6af597b328df1f7815cc7e7c8ef573 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 24 八月 2023 17:45:19 +0800
Subject: [PATCH] 优化代码
---
java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java | 74 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 38 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 e1e36fc..11cf12b 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,19 +1,24 @@
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.transactionOutLog.TransactionOutLogDto;
+import com.java110.dto.log.TransactionOutLogDto;
import com.java110.intf.common.ITransactionOutLogV1ServiceSMO;
-import com.java110.po.transactionOutLog.TransactionOutLogPo;
+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;
@@ -68,49 +73,42 @@
} else {
tmpResponseEntity = new ResponseEntity(errMsg, HttpStatus.BAD_REQUEST);
}
- saveLog(url, method.name(), requestEntity, tmpResponseEntity, DateUtil.getCurrentDate().getTime() - startTime.getTime());
+ LogFactory.saveOutLog(url, "POST", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null,
+ requestEntity != null ? requestEntity.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 = "";
- private void saveLog(String url, String method, HttpEntity<?> requestEntity, ResponseEntity<String> responseEntity, long costTime) {
-
- String logServiceCode = MappingCache.getValue(MappingCache.CALL_OUT_LOG);
-
- if("off".equals(logServiceCode.toLowerCase())){
- return;
- }
-
-
-
- ITransactionOutLogV1ServiceSMO transactionOutLogV1InnerServiceSMO = null;
-
+ ResponseEntity<T> responseEntity = null;
+ ResponseEntity tmpResponseEntity = null;
+ Date startTime = DateUtil.getCurrentDate();
try {
- transactionOutLogV1InnerServiceSMO
- = ApplicationContextFactory.getBean(ITransactionOutLogV1ServiceSMO.class.getName(), ITransactionOutLogV1ServiceSMO.class);
- }catch (Exception e){
- transactionOutLogV1InnerServiceSMO
- = ApplicationContextFactory.getBean("transactionOutLogV1InnerServiceSMOImpl",ITransactionOutLogV1ServiceSMO.class);
+ 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);
}
- if(transactionOutLogV1InnerServiceSMO == null){
- transactionOutLogV1InnerServiceSMO
- = ApplicationContextFactory.getBean("transactionOutLogV1InnerServiceSMOImpl",ITransactionOutLogV1ServiceSMO.class);
- }
-
- TransactionOutLogPo transactionOutLogPo = new TransactionOutLogPo();
-
- transactionOutLogPo.setCostTime(costTime + "");
- transactionOutLogPo.setLogId(GenerateCodeFactory.getGeneratorId("11"));
- transactionOutLogPo.setRequestHeader(requestEntity.getHeaders() == null ? "" : requestEntity.getHeaders().toSingleValueMap().toString());
- transactionOutLogPo.setRequestMessage(requestEntity.getBody() == null ? "" : requestEntity.getBody().toString());
- transactionOutLogPo.setRequestMethod(method);
- transactionOutLogPo.setRequestUrl(url);
- transactionOutLogPo.setResponseHeader(responseEntity.getHeaders() == null ? "" : responseEntity.getHeaders().toSingleValueMap().toString());
- transactionOutLogPo.setResponseMessage(responseEntity.getBody() == null ? "": responseEntity.getBody().toString());
- transactionOutLogPo.setState(responseEntity.getStatusCode() == HttpStatus.OK ? TransactionOutLogDto.STATE_S:TransactionOutLogDto.STATE_F);
-
- transactionOutLogV1InnerServiceSMO.saveTransactionOutLog(transactionOutLogPo);
+ return responseEntity;
}
+
}
--
Gitblit v1.8.0