From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 java110-core/src/main/java/com/java110/core/context/IPageData.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/context/IPageData.java b/java110-core/src/main/java/com/java110/core/context/IPageData.java
index 93bdaba..0cc5b37 100644
--- a/java110-core/src/main/java/com/java110/core/context/IPageData.java
+++ b/java110-core/src/main/java/com/java110/core/context/IPageData.java
@@ -16,6 +16,14 @@
      String getUserId();
 
     /**
+     * 鑾峰彇鐢ㄦ埛ID
+     * @return 鐢ㄦ埛ID
+     */
+    String getUserName();
+
+     String getAppId();
+
+    /**
      * 鑾峰彇浜ゆ槗娴佹按
      * @return 浜ゆ槗娴佹按
      */
@@ -91,11 +99,29 @@
      * @param componentCode 缁勪欢缂栫爜
      * @param componentMethod 缁勪欢鏂规硶
      * @param url 璇锋眰url
-     * @param sessionId 鍥炶瘽ID
+     * @param sessionId 浼氳瘽ID
      * @return IPageData瀵硅薄
      * @throws IllegalArgumentException 鍙傛暟閿欒寮傚父
      */
-     IPageData builder(String userId, String token, String reqData, String componentCode, String componentMethod, String url, String sessionId)
+     IPageData builder(String userId,
+                       String userName,
+                       String token,
+                       String reqData,
+                       String componentCode,
+                       String componentMethod,
+                       String url,
+                       String sessionId,
+                       String appId)
+            throws IllegalArgumentException;
+
+    IPageData builder(String userId,
+                      String userName,
+                      String token,
+                      String reqData,
+                      String componentCode,
+                      String componentMethod,
+                      String url,
+                      String sessionId)
             throws IllegalArgumentException;
 
 }

--
Gitblit v1.8.0