From 40b01aba00112b76caba1989f42919f5fbe49c38 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 17 May 2024 11:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=88=86=E7=A6=BB=E6=A8=A1=E5=BC=8F=E4=B8=8B=20?=
 =?UTF-8?q?=E9=9B=86=E6=88=90=20sso=20=E7=9A=84=20demo=20=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa-token-demo-sso-client-h5/index.html           |  2 +-
 .../sa-token-demo-sso-client-h5/sso-login.html       |  2 +-
 .../src/main/java/com/pj/h5/H5Controller.java        | 12 +++++-------
 sa-token-doc/sso/sso-h5.md                           | 11 ++++-------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html
index 755f0e0e..6f251b54 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html
@@ -15,7 +15,7 @@
 		<script type="text/javascript">
 		
 			// 后端接口地址 
-			var baseUrl = "http://sa-sso-client1.com:9001";
+			var baseUrl = "http://sa-sso-client1.com:9002";
 				
 			// 查询当前会话是否登录 
 			$.ajax({
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html
index 3b18cdd3..a4655f85 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html
@@ -16,7 +16,7 @@
 		<script type="text/javascript">
 		
 			// 后端接口地址 
-			var baseUrl = "http://sa-sso-client1.com:9001";
+			var baseUrl = "http://sa-sso-client1.com:9002";
 			
 			var back = getParam('back', '/');
 			var ticket = getParam('ticket');
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
index 73d7a158..7db1f987 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
@@ -1,5 +1,6 @@
 package com.pj.h5;
 
+import cn.dev33.satoken.sso.model.SaCheckTicketResult;
 import cn.dev33.satoken.sso.processor.SaSsoClientProcessor;
 import cn.dev33.satoken.sso.template.SaSsoUtil;
 import cn.dev33.satoken.stp.StpUtil;
@@ -30,15 +31,12 @@ public class H5Controller {
 		return SaResult.data(serverAuthUrl);
 	}
 	
-	// 根据ticket进行登录 
+	// 根据ticket进行登录
 	@RequestMapping("/sso/doLoginByTicket")
 	public SaResult doLoginByTicket(String ticket) {
-		Object loginId = SaSsoClientProcessor.instance.checkTicket(ticket, "/sso/doLoginByTicket");
-		if(loginId != null) {
-			StpUtil.login(loginId);
-			return SaResult.data(StpUtil.getTokenValue());
-		}
-		return SaResult.error("无效ticket：" + ticket); 
+		SaCheckTicketResult ctr = SaSsoClientProcessor.instance.checkTicket(ticket, "/sso/doLoginByTicket");
+		StpUtil.login(ctr.loginId, ctr.remainSessionTimeout);
+		return SaResult.data(StpUtil.getTokenValue());
 	}
 
 	// 全局异常拦截 
diff --git a/sa-token-doc/sso/sso-h5.md b/sa-token-doc/sso/sso-h5.md
index 021caf6c..1aa5d6ba 100644
--- a/sa-token-doc/sso/sso-h5.md
+++ b/sa-token-doc/sso/sso-h5.md
@@ -27,15 +27,12 @@ public class H5Controller {
 		return SaResult.data(serverAuthUrl);
 	}
 	
-	// 根据ticket进行登录 
+	// 根据ticket进行登录
 	@RequestMapping("/sso/doLoginByTicket")
 	public SaResult doLoginByTicket(String ticket) {
-		Object loginId = SaSsoClientProcessor.instance.checkTicket(ticket, "/sso/doLoginByTicket");
-		if(loginId != null) {
-			StpUtil.login(loginId);
-			return SaResult.data(StpUtil.getTokenValue());
-		}
-		return SaResult.error("无效ticket：" + ticket); 
+		SaCheckTicketResult ctr = SaSsoClientProcessor.instance.checkTicket(ticket, "/sso/doLoginByTicket");
+		StpUtil.login(ctr.loginId, ctr.remainSessionTimeout);
+		return SaResult.data(StpUtil.getTokenValue());
 	}
 
 	// 全局异常拦截