From b48cc4f6b0b711c4e408274ff4737cc7a19ed3de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 14:22:05 +0800
Subject: [PATCH] 游湖阿代码
---
service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
index 0a26a26..ef7a61d 100644
--- a/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java
@@ -10,9 +10,8 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -74,23 +73,28 @@
@Override
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);
- 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());
+ headers.remove("user-id");
+ headers.remove("user_id");
+ headers.put("user-id", result.getUserId());
+ headers.put("user_id", result.getUserId());
if (!StringUtil.isEmpty(result.getUserName())) {
- header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+ headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
}
}
- header.add("store-id", result.getStoreId());
+
+ if (!headers.containsKey("user_id")) {
+ headers.put("user_id", "-1");
+ }
+ if (!headers.containsKey("user-id")) {
+ headers.put("user-id", "-1");
+ }
+ headers.put("store-id", result.getStoreId());
ResponseEntity<String> responseEntity = apiServiceSMOImpl.service(body, headers);
return responseEntity;
}
--
Gitblit v1.8.0