From 09a2b97879cc645d55b4cc277594f28a1d7de629 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 19 五月 2021 12:29:33 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/context/PageData.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/context/PageData.java b/java110-core/src/main/java/com/java110/core/context/PageData.java
index 7c4ba4b..eaaf352 100755
--- a/java110-core/src/main/java/com/java110/core/context/PageData.java
+++ b/java110-core/src/main/java/com/java110/core/context/PageData.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.utils.util.DateUtil;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
@@ -50,6 +51,7 @@
private String apiUrl;
private HttpMethod method;
+ private Map<String, Object> headers;
/**
* 浠樻鏂筰d
@@ -190,7 +192,8 @@
componentMethod,
url,
sessionId,
- "");
+ "",
+ null);
}
@Override
@@ -221,7 +224,6 @@
this.setEndTime(endTime);
return this;
}
-
public IPageData builder(String userId,
String userName,
String token,
@@ -231,6 +233,30 @@
String url,
String sessionId,
String appId)
+ throws IllegalArgumentException {
+ return builder(userId,
+ userName,
+ token,
+ reqData,
+ componentCode,
+ componentMethod,
+ url,
+ sessionId,
+ appId,
+ null);
+ }
+
+
+ public IPageData builder(String userId,
+ String userName,
+ String token,
+ String reqData,
+ String componentCode,
+ String componentMethod,
+ String url,
+ String sessionId,
+ String appId,
+ Map<String, Object> headers)
throws IllegalArgumentException {
this.setComponentCode(componentCode);
this.setComponentMethod(componentMethod);
@@ -242,6 +268,7 @@
this.setUrl(url);
this.setSessionId(sessionId);
this.setAppId(appId);
+ this.setHeaders(headers);
return this;
}
@@ -279,6 +306,15 @@
return method;
}
+ @Override
+ public Map<String, Object> getHeaders() {
+ return null;
+ }
+
+ public void setHeaders(Map<String, Object> headers) {
+ this.headers = headers;
+ }
+
public void setMethod(HttpMethod method) {
this.method = method;
}
--
Gitblit v1.8.0