From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四
---
service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
index 4572f51..f6a1c2d 100644
--- a/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
+++ b/service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java
@@ -3,10 +3,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.properties.WechatAuthProperties;
+import com.java110.api.smo.IApiServiceSMO;
+import com.java110.api.smo.IGetCommunityStoreInfoSMO;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.app.AppDto;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.store.StoreDto;
import com.java110.dto.user.UserDto;
@@ -21,7 +24,6 @@
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -89,8 +91,12 @@
headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
- headers.put(CommonConstant.HTTP_APP_ID, AppDto.WEB_APP_ID);
- headers.put(CommonConstant.APP_ID, AppDto.WEB_APP_ID);
+ if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
+ headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
+ }
+ if (!headers.containsKey(CommonConstant.APP_ID)) {
+ headers.put(CommonConstant.APP_ID, pd.getAppId());
+ }
if (!headers.containsKey(CommonConstant.HTTP_TRANSACTION_ID)) {
headers.put(CommonConstant.HTTP_TRANSACTION_ID, GenerateCodeFactory.getUUID());
@@ -98,22 +104,20 @@
if (!headers.containsKey(CommonConstant.HTTP_REQ_TIME)) {
headers.put(CommonConstant.HTTP_REQ_TIME, DateUtil.getNowDefault());
}
- if (!headers.containsKey(CommonConstant.HTTP_SIGN)) {
- headers.put(CommonConstant.HTTP_SIGN, "");
- }
if (url.indexOf("?") > -1) {
url = url.substring(0, url.indexOf("?"));
}
headers.put(CommonConstant.HTTP_SERVICE, url);
headers.put(CommonConstant.HTTP_METHOD, CommonConstant.getHttpMethodStr(httpMethod));
-
if (HttpMethod.GET == httpMethod) {
initUrlParam(JSONObject.parseObject(param), headers);
- }
- if (HttpMethod.GET == httpMethod) {
headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url + mapToUrlParam(JSONObject.parseObject(param)));
+ } else {
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url);
}
+ AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
+
try {
responseEntity = apiServiceSMOImpl.service(param, headers);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
@@ -151,9 +155,6 @@
if (!headers.containsKey(CommonConstant.HTTP_REQ_TIME)) {
headers.put(CommonConstant.HTTP_REQ_TIME, DateUtil.getNowDefault());
}
- if (!headers.containsKey(CommonConstant.HTTP_SIGN)) {
- headers.put(CommonConstant.HTTP_SIGN, "");
- }
if (url.indexOf("?") > -1) {
url = url.substring(0, url.indexOf("?"));
@@ -166,7 +167,11 @@
}
if (HttpMethod.GET == httpMethod) {
headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url + mapToUrlParam(JSONObject.parseObject(param)));
+ }else {
+ headers.put("REQUEST_URL", "http://127.0.0.1:8008/" + url);
}
+ AuthenticationFactory.createSign(headers, httpMethod, headers.get("REQUEST_URL"), param);
+
try {
responseEntity = apiServiceSMOImpl.service(param, headers);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
--
Gitblit v1.8.0