From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/api/impl/ApiSMOImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/api/impl/ApiSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/api/impl/ApiSMOImpl.java
index dfa2879..d2479e6 100644
--- a/springboot/src/main/java/com/java110/boot/smo/api/impl/ApiSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/api/impl/ApiSMOImpl.java
@@ -7,7 +7,7 @@
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.store.StoreDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.store.IStoreV1InnerServiceSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.Map;
@Service("apiSMOImpl")
@@ -56,6 +55,7 @@
}
JSONObject storeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ //todo 璇存槑鏄笟涓荤洿鎺ヨ繑鍥�
if (!storeInfo.containsKey("storeId")) {
return new ComponentValidateResult("", "", "", pd.getUserId(), pd.getUserName());
}
@@ -69,7 +69,7 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
//寮�鍙戣�呭拰杩愯惀涓嶆牎楠屽皬鍖�
- if(StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd) || StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)){
+ if (StoreDto.STORE_TYPE_ADMIN.equals(storeTypeCd) || StoreDto.STORE_TYPE_DEV.equals(storeTypeCd)) {
return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
}
@@ -88,19 +88,17 @@
IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
-
+ //todo 鏍￠獙鍛樺伐鏃� 鏄惁鏈夎闂皬鍖虹殑鏉冮檺
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ //todo 濡傛灉 鐧诲綍鐢ㄦ埛涓嶄负绌� 鍒欏皢 鍓嶆浼犻�掔殑user-id 閲嶅啓
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"));
-// }
+ headers.put("login-user-id", result.getLoginUserId());
}
-
+ // todo 濡傛灉 鍟嗘埛涓嶄负绌哄垯 鍟嗘埛ID鍐欏叆鍙ご淇℃伅涓� 杩欓噷鐨勫晢鎴稩D 鍙互鏄墿涓欼D 鎴栬�呭晢瀹禝D
if (!StringUtil.isEmpty(result.getStoreId())) {
headers.remove("store-id");
headers.put("store-id", result.getStoreId());
@@ -113,6 +111,7 @@
headers.put("user-id", "-1");
}
headers.put("store-id", result.getStoreId());
+ // todo 搴旂敤鏄惁鏈夋帴鍙ｆ潈闄愭牎楠�
ResponseEntity<String> responseEntity = apiServiceSMOImpl.service(body, headers);
return responseEntity;
}
--
Gitblit v1.8.0