From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/DefaultAbstractComponentSMO.java | 12 +++---------
1 files changed, 3 insertions(+), 9 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 a7c3750..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());
@@ -155,10 +151,8 @@
headers.put(CommonConstant.HTTP_USER_ID, "-1");
}
- headers.put(CommonConstant.USER_ID, "-1");
-
- if (!headers.containsKey(CommonConstant.HTTP_USER_ID)) {
- headers.put(CommonConstant.HTTP_USER_ID, "-1");
+ if (!headers.containsKey(CommonConstant.USER_ID)) {
+ headers.put(CommonConstant.USER_ID, "-1");
}
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -387,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