From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java | 19 ++++++++++++++-----
1 files changed, 14 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
index 8ecb397..c72cb78 100755
--- 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")
@@ -47,7 +53,7 @@
}
JSONObject storeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
- if(!storeInfo.containsKey("storeId")){
+ if (!storeInfo.containsKey("storeId")) {
return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
}
@@ -68,15 +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);
if (!StringUtil.isEmpty(result.getUserId())) {
header.add("user-id", result.getUserId());
- header.add("user-name", result.getUserName());
+ 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;
@@ -112,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