From a0044f4e05e1ba70158b8aff66c1514a590ade53 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 06 八月 2021 08:19:45 +0800
Subject: [PATCH] 优化日志报错
---
service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
old mode 100644
new mode 100755
index 9da2711..c72cb78
--- a/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
@@ -12,12 +12,18 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.Map;
@Service("apiSMOImpl")
@@ -30,10 +36,24 @@
private RestTemplate restTemplate;
@Override
+ protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
+
+ if (StringUtil.isEmpty(pd.getUserId())) {
+ return new ResponseEntity<>("鏈寘鍚敤鎴蜂俊鎭�", HttpStatus.BAD_REQUEST);
+ }
+ return super.getStoreInfo(pd, restTemplate);
+ }
+
+ @Override
protected ComponentValidateResult validateStoreStaffCommunityRelationship(IPageData pd, RestTemplate restTemplate) {
// 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
+ }
+
+ JSONObject storeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ if (!storeInfo.containsKey("storeId")) {
return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
}
@@ -54,13 +74,18 @@
}
@Override
- public ResponseEntity<String> doApi(String body, Map<String, String> headers, HttpServletRequest request) {
+ public ResponseEntity<String> doApi(String body, Map<String, String> headers, HttpServletRequest request) throws UnsupportedEncodingException {
HttpHeaders header = new HttpHeaders();
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
- header.add("user-id", result.getUserId());
- header.add("user-name", result.getUserName());
+ if (!StringUtil.isEmpty(result.getUserId())) {
+ header.add("user-id", result.getUserId());
+ if (!StringUtil.isEmpty(result.getUserName())) {
+ header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+ }
+ }
+
header.add("store-id", result.getStoreId());
logger.debug("api璇锋眰澶�" + headers + ";璇锋眰鍐呭锛�" + body);
HttpMethod method = null;
@@ -96,8 +121,8 @@
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("api杩斿洖淇℃伅" + responseEntity);
- return responseEntity;
}
+ return responseEntity;
}
--
Gitblit v1.8.0