From 8d0d2ac5db499a72cc029c6c5ced1d4f82c2c4d1 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期一, 06 九月 2021 16:46:12 +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 | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 1f1de8c..a00da38 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,11 +12,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-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.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -78,10 +74,18 @@
HttpHeaders header = new HttpHeaders();
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+ for (String key : headers.keySet()
+ ) {
+ header.add(key, headers.get(key));
+ }
+
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
if (!StringUtil.isEmpty(result.getUserId())) {
+ header.remove("user-id");
header.add("user-id", result.getUserId());
- header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+ if (!StringUtil.isEmpty(result.getUserName())) {
+ header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+ }
}
header.add("store-id", result.getStoreId());
@@ -102,11 +106,6 @@
throw new IllegalArgumentException("涓嶆敮鎸佺殑璇锋眰鏂瑰紡" + headers.get(CommonConstant.HTTP_METHOD));
}
-
- for (String key : headers.keySet()
- ) {
- header.add(key, headers.get(key));
- }
HttpEntity<String> httpEntity = new HttpEntity<String>(body, header);
logger.debug("璇锋眰鍚庣url" + url);
--
Gitblit v1.8.0