From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java
index b7f5780..2957fea 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IPasswordFreeLoginService.java
@@ -3,7 +3,6 @@
 import org.apache.http.auth.AuthenticationException;
 
 import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * 鍏嶅瘑鐧诲綍鏈嶅姟
@@ -20,10 +19,28 @@
 	String getGatewayPort(String serviceId);
 
 	/**
-	 * 鍏嶅瘑鐧诲綍鏂规硶
-	 * @param username 璐﹀彿
-	 * @return
+	 * 鍏嶅瘑鐧诲綍锛屾敼鍙樺綋鍓峸ebservice璇锋眰鐨刪eader
+	 * @param userName 璐﹀彿
+	 * @param servletRequest
+	 * @return boolean
+	 * @throws AuthenticationException
 	 */
-	boolean passwordFreeLogin(String username, ServletRequest request) throws AuthenticationException;
+	boolean pwdFreeLoginByBoolean(String userName, ServletRequest servletRequest) throws AuthenticationException;
+
+	/**
+	 * 鍏嶅瘑鐧诲綍璇锋眰鍙戦��
+	 * @param userName 璐﹀彿
+	 * @return 杩斿洖token
+	 * @throws AuthenticationException
+	 */
+	String passwordFreeLogin(String userName) throws AuthenticationException;
+
+	/**
+	 * 鍗曠偣鐧诲綍
+	 * @param servletRequest
+	 * @return
+	 * @throws Exception
+	 */
+	String ssoFreeLogin(ServletRequest servletRequest) throws Exception;
 
 }

--
Gitblit v1.9.3