From 7b0e7c62dab0061d2aa167b46f8a838f363f579a Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 17 一月 2022 17:02:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 c5f8229..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;
@@ -81,11 +80,20 @@
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
if (!StringUtil.isEmpty(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())) {
headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
}
}
+
+ 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