From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..e9fa90b 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
@@ -12,7 +12,6 @@
import org.slf4j.Logger;
import org.slf4j.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