From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
index 9fc2d0b..b2cf5c2 100644
--- a/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
+++ b/springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java
@@ -38,7 +38,6 @@
     private static final String URL_API = "";
 
 
-
     @Autowired
     private WechatAuthProperties wechatAuthProperties;
 
@@ -95,9 +94,6 @@
 
         headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
 
-        if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
-            headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
-        }
         if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
             headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
 
@@ -385,7 +381,7 @@
         Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
 
         ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
-        logger.debug("鏌ヨ鍟嗘埛淇℃伅 getStoreInfo 锛歿}",resultVo.toString());
+        logger.debug("鏌ヨ鍟嗘埛淇℃伅 getStoreInfo 锛歿}", resultVo.toString());
         return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
     }
 

--
Gitblit v1.8.0