From a8d78bf321dab845132fe9ce2a612cb813e51063 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 11 三月 2025 20:02:20 +0800
Subject: [PATCH] 優化代碼
---
java110-core/src/main/java/com/java110/core/client/RestTemplate.java | 7 +++++++
java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java | 31 ++++++++++++++++++++++++++++++-
service-job/src/main/java/com/java110/job/msgNotify/WechatTemplateImpl.java | 3 ++-
3 files changed, 39 insertions(+), 2 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 49f9bdc..a107fb3 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
@@ -82,6 +82,7 @@
return responseEntity;
}
+
@Override
public <T> ResponseEntity<T> postForEntity(String url, @Nullable Object request,
Class<T> responseType, Object... uriVariables) throws RestClientException {
@@ -112,6 +113,34 @@
}
@Override
+ public <T> ResponseEntity<T> getForEntity(String url, 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:{},uriVariables:{}", url, "POST", uriVariables);
+ responseEntity = super.getForEntity(url, 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, "GET", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null, "", tmpResponseEntity);
+ }
+ return responseEntity;
+ }
+
+ @Override
public <T> T getForObject(String url, Class<T> responseType, Object... uriVariables) throws RestClientException {
String errMsg = "";
T resMsg;
@@ -126,7 +155,7 @@
} finally {
ResponseEntity tmpResponseEntity = new ResponseEntity(errMsg, HttpStatus.OK);
// saveLog(url, "POST", null, tmpResponseEntity, DateUtil.getCurrentDate().getTime() - startTime.getTime());
- LogFactory.saveOutLog(url, "POST", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null, "", tmpResponseEntity);
+ LogFactory.saveOutLog(url, "GET", DateUtil.getCurrentDate().getTime() - startTime.getTime(), null, "", tmpResponseEntity);
}
return resMsg;
}
diff --git a/java110-core/src/main/java/com/java110/core/client/RestTemplate.java b/java110-core/src/main/java/com/java110/core/client/RestTemplate.java
index c9d7325..a4a89d2 100755
--- a/java110-core/src/main/java/com/java110/core/client/RestTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/RestTemplate.java
@@ -57,6 +57,13 @@
return responseEntity;
}
+ public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Object... uriVariables) throws RestClientException {
+ logger.debug("璇锋眰淇℃伅锛歶rl:{},method:GET,uriVariables:{}", url, uriVariables);
+ ResponseEntity<T> responseEntity = super.getForEntity(url, responseType, uriVariables);
+ logger.debug("杩斿洖淇℃伅锛歳esponseEntity:{}", responseEntity);
+ return responseEntity;
+ }
+
@Override
public <T> T getForObject(String url, Class<T> responseType, Object... uriVariables) throws RestClientException {
diff --git a/service-job/src/main/java/com/java110/job/msgNotify/WechatTemplateImpl.java b/service-job/src/main/java/com/java110/job/msgNotify/WechatTemplateImpl.java
index 06598a2..f2782e4 100644
--- a/service-job/src/main/java/com/java110/job/msgNotify/WechatTemplateImpl.java
+++ b/service-job/src/main/java/com/java110/job/msgNotify/WechatTemplateImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.OutRestTemplate;
import com.java110.core.factory.WechatFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.wechat.SmallWeChatDto;
@@ -278,7 +279,7 @@
smallWeChatDto.setObjId(communityId);
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
- if (smallWeChatDtos == null || smallWeChatDtos.size() < 1) {
+ if (ListUtil.isNull(smallWeChatDtos)) {
String appIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId");
String appSecretCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret");
String mchIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId");
--
Gitblit v1.8.0