From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +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 | 70 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 5 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
old mode 100644
new mode 100755
index 895bf20..c72cb78
--- 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
@@ -1,18 +1,29 @@
package com.java110.front.smo.api.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.front.smo.api.IApiSMO;
import com.java110.core.component.BaseComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.front.smo.api.IApiSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+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.stereotype.Service;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.Map;
@Service("apiSMOImpl")
@@ -25,8 +36,57 @@
private RestTemplate restTemplate;
@Override
- public ResponseEntity<String> doApi(String body, Map<String, String> headers) {
+ protected ResponseEntity<String> getStoreInfo(IPageData pd, RestTemplate restTemplate) {
+ if (StringUtil.isEmpty(pd.getUserId())) {
+ return new ResponseEntity<>("鏈寘鍚敤鎴蜂俊鎭�", HttpStatus.BAD_REQUEST);
+ }
+ return super.getStoreInfo(pd, restTemplate);
+ }
+
+ @Override
+ protected ComponentValidateResult validateStoreStaffCommunityRelationship(IPageData pd, RestTemplate restTemplate) {
+ // 鏍￠獙 鍛樺伐鍜屽晢鎴锋槸鍚︽湁鍏崇郴
+ ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
+ }
+
+ JSONObject storeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ if (!storeInfo.containsKey("storeId")) {
+ return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
+ }
+
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+ String communityId = "";
+ if (paramIn != null && paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
+ communityId = paramIn.getString("communityId");
+ checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ }
+ return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
+ }
+
+ @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);
+
+ ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ if (!StringUtil.isEmpty(result.getUserId())) {
+ header.add("user-id", result.getUserId());
+ if (!StringUtil.isEmpty(result.getUserName())) {
+ header.add("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
+ }
+ }
+
+ header.add("store-id", result.getStoreId());
logger.debug("api璇锋眰澶�" + headers + ";璇锋眰鍐呭锛�" + body);
HttpMethod method = null;
String url = ServiceConstant.SERVICE_API_URL + "/api/" + headers.get(CommonConstant.HTTP_SERVICE);
@@ -44,7 +104,7 @@
throw new IllegalArgumentException("涓嶆敮鎸佺殑璇锋眰鏂瑰紡" + headers.get(CommonConstant.HTTP_METHOD));
}
- HttpHeaders header = new HttpHeaders();
+
for (String key : headers.keySet()
) {
header.add(key, headers.get(key));
@@ -61,8 +121,8 @@
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
logger.debug("api杩斿洖淇℃伅" + responseEntity);
- return responseEntity;
}
+ return responseEntity;
}
--
Gitblit v1.8.0