From 3d85fd7de42ead48fd50a99ee3d5d29bbd403b3c Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: 星期一, 23 十一月 2020 10:48:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 service-front/src/main/java/com/java110/front/smo/ownerLogin/IOwnerAppLoginSMO.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/ownerLogin/IOwnerAppLoginSMO.java b/service-front/src/main/java/com/java110/front/smo/ownerLogin/IOwnerAppLoginSMO.java
index 5232709..fe84c55 100644
--- a/service-front/src/main/java/com/java110/front/smo/ownerLogin/IOwnerAppLoginSMO.java
+++ b/service-front/src/main/java/com/java110/front/smo/ownerLogin/IOwnerAppLoginSMO.java
@@ -24,13 +24,22 @@
     ResponseEntity<String> doLogin(IPageData pd) throws SMOException;
 
     /**
+     * 鏍规嵁key 鐧诲綍
+     *
+     * @param pd 椤甸潰鏁版嵁灏佽
+     * @return ResponseEntity 瀵硅薄鏁版嵁
+     * @throws SMOException 涓氬姟浠g爜灞�
+     */
+    ResponseEntity<String> doLoginByKey(IPageData pd) throws SMOException;
+
+    /**
      * 鑾峰彇access_token
      *
      * @param pd
      * @return
      * @throws SMOException
      */
-    ResponseEntity<String> getPageAccessToken(IPageData pd) throws SMOException;
+    ResponseEntity<String> getPageAccessToken(IPageData pd,HttpServletRequest request) throws SMOException;
 
 
     /**
@@ -40,5 +49,7 @@
      * @return
      * @throws SMOException
      */
-    ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl, HttpServletRequest request, HttpServletResponse response) throws SMOException;
+    ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl, String errorUrl,
+                                        String loginFlag,
+                                        HttpServletRequest request, HttpServletResponse response) throws SMOException;
 }

--
Gitblit v1.8.0