From 45149c4de50d945a27cbc7324ec0699f5b15df14 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 13:57:47 +0800
Subject: [PATCH] 取消空格问题
---
service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 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..b49a681 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
@@ -5,14 +5,14 @@
import com.java110.api.smo.IApiServiceSMO;
import com.java110.api.smo.api.IApiSMO;
import com.java110.core.context.IPageData;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.store.StoreDto;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.utils.constant.CommonConstant;
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;
@@ -20,7 +20,6 @@
import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.Map;
@Service("apiSMOImpl")
@@ -64,8 +63,15 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ //寮�鍙戣�呭拰杩愯惀涓嶆牎楠屽皬鍖�
+ if(StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd) || StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)){
+ return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
+ }
+
String communityId = "";
- if (paramIn != null && paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ if (paramIn != null && paramIn.containsKey("communityId")
+ && !StringUtil.isEmpty(paramIn.getString("communityId"))
+ && !"-1".equals(paramIn.getString("communityId"))) {
communityId = paramIn.getString("communityId");
checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
}
@@ -74,23 +80,34 @@
@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());
- if (!StringUtil.isEmpty(result.getUserName())) {
- header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
- }
+ if (!StringUtil.isEmpty(result.getLoginUserId())) {
+ headers.remove("user-id");
+ headers.remove("user_id");
+ headers.put("user-id", result.getUserId());
+ headers.put("user_id", result.getUserId());
+ headers.put("login-user-id",result.getLoginUserId());
+// if (!StringUtil.isEmpty(result.getUserName())) {
+// headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+// }
}
- header.add("store-id", result.getStoreId());
+
+ if (!StringUtil.isEmpty(result.getStoreId())) {
+ headers.remove("store-id");
+ headers.put("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