From 88f99c49fb4f64e024e3317ca87ce98621d11be1 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Thu, 8 May 2025 20:50:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=20SSO=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mvn clean.bat | 3 ++- .../sa-token-demo-sso-server/pom.xml | 6 ++--- .../main/java/com/pj/sso/HomeController.java | 12 ++++----- .../java/com/pj/sso/SsoServerController.java | 9 +++---- .../src/main/resources/application.yml | 8 ++++-- .../sa-token-demo-sso1-client/pom.xml | 8 +++--- .../java/com/pj/sso/SsoClientController.java | 19 +++++++++---- .../src/main/resources/application.yml | 5 +++- .../sa-token-demo-sso2-client/pom.xml | 4 +-- .../src/main/java/com/pj/h5/H5Controller.java | 4 +-- .../src/main/resources/application.yml | 5 +++- .../sa-token-demo-sso3-client-anon/pom.xml | 12 ++++----- .../java/com/pj/sso/SsoClientController.java | 7 ++++- .../sa-token-demo-sso3-client-nosdk/pom.xml | 2 +- .../sa-token-demo-sso3-client/pom.xml | 4 +-- .../satoken/sso/config/SaSsoServerConfig.java | 6 ++--- .../satoken/sso/message/SaSsoMessage.java | 2 +- .../sso/processor/SaSsoClientProcessor.java | 2 +- .../sso/processor/SaSsoServerProcessor.java | 4 +-- .../sso/template/SaSsoClientTemplate.java | 2 +- .../satoken/sso/template/SaSsoClientUtil.java | 6 ++--- .../sso/template/SaSsoServerTemplate.java | 27 +++++++++++++++++-- .../satoken/sso/template/SaSsoServerUtil.java | 12 ++++++++- .../satoken/solon/sso/SaSsoBeanRegister.java | 2 ++ .../satoken/spring/sso/SaSsoBeanRegister.java | 3 +++ 25 files changed, 117 insertions(+), 57 deletions(-) diff --git a/mvn clean.bat b/mvn clean.bat index 8ff63ec5..fd2b3aa4 100644 --- a/mvn clean.bat +++ b/mvn clean.bat @@ -58,8 +58,9 @@ cd sa-token-demo-sso-server & call mvn clean & cd .. cd sa-token-demo-sso1-client & call mvn clean & cd .. cd sa-token-demo-sso2-client & call mvn clean & cd .. cd sa-token-demo-sso3-client & call mvn clean & cd .. -cd sa-token-demo-sso3-client-test2 & call mvn clean & cd .. cd sa-token-demo-sso3-client-nosdk & call mvn clean & cd .. +cd sa-token-demo-sso3-client-resdk & call mvn clean & cd .. +cd sa-token-demo-sso3-client-anon & call mvn clean & cd .. cd .. cd sa-token-demo-sso-for-solon diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml index fbfa451c..64211354 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml @@ -41,10 +41,10 @@ ${sa-token.version} - + cn.dev33 - sa-token-redis-jackson + sa-token-redis-template ${sa-token.version} @@ -58,7 +58,7 @@ spring-boot-starter-thymeleaf - + cn.dev33 sa-token-forest diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/HomeController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/HomeController.java index d5da6a4f..8ff6a307 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/HomeController.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/HomeController.java @@ -12,20 +12,20 @@ import org.springframework.web.bind.annotation.RestController; public class HomeController { // 平台化首页 - @RequestMapping("/home") + @RequestMapping({"/", "/home"}) public Object index() { // 如果未登录，则先去登录 if(!StpUtil.isLogin()) { return SaHolder.getResponse().redirect("/sso/auth"); } - // 拼接各个子系统的地址，格式形如：/sso/auth?redirect=${子系统首页}/sso/login?back=${子系统首页} - String link1 = "/sso/auth?redirect=http://sa-sso-client1.com:9003/sso/login?back=http://sa-sso-client1.com:9003/"; - String link2 = "/sso/auth?redirect=http://sa-sso-client2.com:9003/sso/login?back=http://sa-sso-client2.com:9003/"; - String link3 = "/sso/auth?redirect=http://sa-sso-client3.com:9003/sso/login?back=http://sa-sso-client3.com:9003/"; + // 拼接各个子系统的地址，格式形如：/sso/auth?client=xxx&redirect=${子系统首页}/sso/login?back=${子系统首页} + String link1 = "/sso/auth?client=sso-client3&redirect=http://sa-sso-client1.com:9003/sso/login?back=http://sa-sso-client1.com:9003/"; + String link2 = "/sso/auth?client=sso-client3&redirect=http://sa-sso-client2.com:9003/sso/login?back=http://sa-sso-client2.com:9003/"; + String link3 = "/sso/auth?client=sso-client3&redirect=http://sa-sso-client3.com:9003/sso/login?back=http://sa-sso-client3.com:9003/"; // 组织网页结构返回到前端 - String title = "

SSO 平台首页

"; + String title = "

SSO 平台首页 (平台中心模式)

"; String client1 = "

进入Client1系统

"; String client2 = "

进入Client2系统

"; String client3 = "

进入Client3系统

"; diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java index 548ee096..d5cdaecb 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java @@ -22,7 +22,7 @@ public class SsoServerController { /** * SSO-Server端：处理所有SSO相关请求 - * http://{host}:{port}/sso/auth -- 单点登录授权地址 + * http://{host}:{port}/sso/auth -- 单点登录授权地址 * http://{host}:{port}/sso/doLogin -- 账号密码登录接口，接受参数：name、pwd * http://{host}:{port}/sso/signout -- 单点注销地址（isSlo=true时打开） */ @@ -42,19 +42,18 @@ public class SsoServerController { // 配置：登录处理函数 ssoServerTemplate.strategy.doLoginHandle = (name, pwd) -> { - // 此处仅做模拟登录，真实环境应该查询数据进行登录 + // 此处仅做模拟登录，真实环境应该查询数据库进行登录 if("sa".equals(name) && "123456".equals(pwd)) { String deviceId = SaHolder.getRequest().getParam("deviceId", SaFoxUtil.getRandomString(32)); - StpUtil.login(10001, SaLoginParameter.create().setDeviceId(deviceId)); + StpUtil.login(10001, new SaLoginParameter().setDeviceId(deviceId)); return SaResult.ok("登录成功！").setData(StpUtil.getTokenValue()); } return SaResult.error("登录失败！"); }; - // 添加消息处理器：userinfo (获取用户资料) （用于在模式三下，为 client 端开放拉取数据的接口） + // 添加消息处理器：userinfo (获取用户资料) （用于为 client 端开放拉取数据的接口） ssoServerTemplate.messageHolder.addHandle("userinfo", (ssoTemplate, message) -> { System.out.println("收到消息：" + message); - System.out.println("loginId=" + message.get("loginId")); // 自定义返回结果（模拟） return SaResult.ok() diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml index e8d78141..cbae7ecb 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml @@ -7,7 +7,7 @@ sa-token: # 打印操作日志 is-log: true - # ------- SSO 模式一配置 (非模式一不需要配置) + # SSO 模式一配置 (非模式一不需要配置) # cookie: # # 配置 Cookie 作用域 # domain: stp.com @@ -16,7 +16,7 @@ sa-token: sso-server: # Ticket有效期 (单位: 秒)，默认五分钟 ticket-timeout: 300 - # 主页路由，在不指定 redirect 参数时，默认跳转的地址 + # 主页路由：在 /sso/auth 登录页不指定 redirect 参数时，默认跳转的地址 home-route: /home # 是否启用匿名 client (开启匿名 client 后，允许客户端接入时不提交 client 参数) allow-anon-client: true @@ -26,6 +26,10 @@ sa-token: secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor # 应用列表：配置接入的应用信息 clients: + # 应用 sso-client1：采用模式一对接 (同域、同Redis) + sso-client1: + client: sso-client1 + allow-url: "*" # 应用 sso-client2：采用模式二对接 (跨域、同Redis) sso-client2: client: sso-client2 diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml index b6d701b6..f2b28e2d 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml @@ -34,21 +34,19 @@ ${sa-token.version} - + cn.dev33 sa-token-sso ${sa-token.version} - + cn.dev33 - sa-token-redis-jackson + sa-token-redis-template ${sa-token.version} - - org.apache.commons commons-pool2 diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java index 520e0956..fedf762b 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java @@ -1,12 +1,17 @@ package com.pj.sso; +import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.sso.SaSsoManager; +import cn.dev33.satoken.sso.config.SaSsoClientConfig; import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.util.SaFoxUtil; import cn.dev33.satoken.util.SaResult; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; + /** * Sa-Token-SSO Client端 Controller * @author click33 @@ -16,13 +21,17 @@ public class SsoClientController { // SSO-Client端：首页 @RequestMapping("/") - public String index() { - String authUrl = SaSsoManager.getClientConfig().splicingAuthUrl(); - String signoutUrl = SaSsoManager.getClientConfig().splicingSignoutUrl(); + public String index(HttpServletRequest request) { + String url = SaFoxUtil.encodeUrl( SaFoxUtil.joinParam(SaHolder.getRequest().getUrl(), request.getQueryString()) ); + SaSsoClientConfig cfg = SaSsoManager.getClientConfig(); + String str = "

Sa-Token SSO-Client 应用端 (模式一)

" + "

当前会话是否登录：" + StpUtil.isLogin() + " (" + StpUtil.getLoginId("") + ")

" + - "

登录 " + - "登录 - " + + "单浏览器注销 - " + + "全端注销 " + + "

"; return str; } diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/resources/application.yml index 2bda98df..dca31e4f 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/resources/application.yml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/resources/application.yml @@ -6,10 +6,13 @@ server: sa-token: # SSO-相关配置 sso-client: + # client 标识 + client: sso-client1 # SSO-Server端主机地址 server-url: http://sso.stp.com:9000 - # 配置 Sa-Token 单独使用的Redis连接 (需要引入 sa-token-alone-redis 依赖) （此处需要和 SSO-Server 端连接同一个Redis） + # 配置 Sa-Token 单独使用的Redis连接（此处需要和 SSO-Server 端连接同一个 Redis） + # 注：使用 alone-redis 需要在 pom.xml 引入 sa-token-alone-redis 依赖 alone-redis: # Redis数据库索引 database: 1 diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml index 933e38a9..db39f8dc 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml @@ -41,10 +41,10 @@ ${sa-token.version} - + cn.dev33 - sa-token-redis-jackson + sa-token-redis-template ${sa-token.version} 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 e9a60e6f..eb692567 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 @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class H5Controller { - // 当前是否登录 + // 判断当前是否登录 @RequestMapping("/sso/isLogin") public Object isLogin() { return SaResult.data(StpUtil.isLogin()).set("loginId", StpUtil.getLoginIdDefaultNull()); @@ -31,7 +31,7 @@ public class H5Controller { return SaResult.data(serverAuthUrl); } - // 根据ticket进行登录 + // 根据 ticket 进行登录 @RequestMapping("/sso/doLoginByTicket") public SaResult doLoginByTicket(String ticket) { SaCheckTicketResult ctr = SaSsoClientProcessor.instance.checkTicket(ticket); diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml index d6f4c620..8ee463a6 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml @@ -4,6 +4,9 @@ server: # sa-token配置 sa-token: + # 打印操作日志 + is-log: true + # SSO-相关配置 sso-client: # 应用标识 @@ -17,7 +20,7 @@ sa-token: # 配置 Sa-Token 单独使用的Redis连接（此处需要和 SSO-Server 端连接同一个 Redis） # 注：使用 alone-redis 需要在 pom.xml 引入 sa-token-alone-redis 依赖 - alone-redis: + alone-redis: # Redis数据库索引 database: 1 # Redis服务器地址 diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/pom.xml index 2192f1bf..10062c98 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/pom.xml @@ -40,13 +40,13 @@ sa-token-sso ${sa-token.version} - - + + - cn.dev33 - sa-token-redis-jackson - ${sa-token.version} - + cn.dev33 + sa-token-redis-template + ${sa-token.version} + diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/sso/SsoClientController.java index eae5fd0a..9bf4e442 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/sso/SsoClientController.java +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-anon/src/main/java/com/pj/sso/SsoClientController.java @@ -47,6 +47,8 @@ public class SsoClientController { // 配置SSO相关参数 @Autowired private void configSso(SaSsoClientTemplate ssoClientTemplate) { + // 重写 loginId 与 centerId 转换策略函数，做到本地应用 userId 与认证中心 userId 的互相映射 + // // 将 centerId 转换为 loginId 的函数 // ssoClientTemplate.strategy.convertCenterIdToLoginId = (centerId) -> { // return "Stu" + centerId; @@ -72,7 +74,10 @@ public class SsoClientController { return "尚未登录，无法获取"; } - // 获取本地 loginId 对应的认证中心 centerId + // 原写法：直接调用 StpUtil.getLoginId() 当做 centerId 来提交 + // Object centerId = StpUtil.getLoginId(); + + // 新写法：获取本地 loginId 对应的认证中心 centerId Object centerId = SaSsoClientUtil.getSsoTemplate().strategy.convertLoginIdToCenterId.run(StpUtil.getLoginId()); // 推送消息 diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/pom.xml index c7b4b311..237f332e 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/pom.xml @@ -21,7 +21,7 @@ org.springframework.boot spring-boot-starter-web - + com.dtflys.forest diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml index 7d328d7f..0fd69fa6 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml @@ -41,10 +41,10 @@ ${sa-token.version} - + cn.dev33 - sa-token-redis-jackson + sa-token-redis-template ${sa-token.version} diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/config/SaSsoServerConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/config/SaSsoServerConfig.java index ad95d741..8486a16b 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/config/SaSsoServerConfig.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/config/SaSsoServerConfig.java @@ -48,7 +48,7 @@ public class SaSsoServerConfig implements Serializable { public long ticketTimeout = 60 * 5; /** - * 主页路由：在 /sso/auth 登录后不指定 redirect 参数的情况下默认跳转的路由 + * 主页路由：在 /sso/auth 登录页不指定 redirect 参数时，默认跳转的地址 */ public String homeRoute; @@ -176,14 +176,14 @@ public class SaSsoServerConfig implements Serializable { } /** - * @return 主页路由：在 /sso/auth 登录后不指定 redirect 参数的情况下默认跳转的路由 + * @return 主页路由：在 /sso/auth 登录页不指定 redirect 参数时，默认跳转的地址 */ public String getHomeRoute() { return homeRoute; } /** - * @param homeRoute 主页路由：在 /sso/auth 登录后不指定 redirect 参数的情况下默认跳转的路由 + * @param homeRoute 主页路由：在 /sso/auth 登录页不指定 redirect 参数时，默认跳转的地址 * @return 对象自身 */ public SaSsoServerConfig setHomeRoute(String homeRoute) { diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/message/SaSsoMessage.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/message/SaSsoMessage.java index 2fde8254..568ef07c 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/message/SaSsoMessage.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/message/SaSsoMessage.java @@ -41,7 +41,7 @@ public class SaSsoMessage extends LinkedHashMap implements SaSet /** * KEY：TYPE */ - public static final String MSG_TYPE = "msg_type"; + public static final String MSG_TYPE = "msgType"; public SaSsoMessage() { diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoClientProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoClientProcessor.java index 2f57b9dd..b38db661 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoClientProcessor.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoClientProcessor.java @@ -275,7 +275,7 @@ public class SaSsoClientProcessor { logoutParameter.setDeviceId(stpLogic.getLoginDeviceId()); } Object centerId = ssoClientTemplate.strategy.convertLoginIdToCenterId.run(stpLogic.getLoginId()); - SaSsoMessage message = ssoClientTemplate.buildSloMessage(centerId, logoutParameter); + SaSsoMessage message = ssoClientTemplate.buildSignoutMessage(centerId, logoutParameter); SaResult result = ssoClientTemplate.pushMessageAsSaResult(message); // 如果 sso-server 响应的状态码非200，代表业务失败，将回应的 msg 字段作为异常抛出 diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoServerProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoServerProcessor.java index ac01852a..083d5926 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoServerProcessor.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/processor/SaSsoServerProcessor.java @@ -85,7 +85,7 @@ public class SaSsoServerProcessor { // sso-server：接收推送消息 if(req.isPath(apiName.ssoPushS)) { - return ssoPush(); + return ssoPushS(); } // 默认返回 @@ -199,7 +199,7 @@ public class SaSsoServerProcessor { * * @return 处理结果 */ - public Object ssoPush() { + public Object ssoPushS() { ParamName paramName = ssoServerTemplate.paramName; SaSsoServerConfig ssoServerConfig = ssoServerTemplate.getServerConfig(); diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientTemplate.java index 4fabbf40..12d59981 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientTemplate.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientTemplate.java @@ -212,7 +212,7 @@ public class SaSsoClientTemplate extends SaSsoTemplate { * @param logoutParameter 单点注销 * @return 单点注销URL */ - public SaSsoMessage buildSloMessage(Object loginId, SaLogoutParameter logoutParameter) { + public SaSsoMessage buildSignoutMessage(Object loginId, SaLogoutParameter logoutParameter) { SaSsoMessage message = new SaSsoMessage(); message.setType(SaSsoConsts.MESSAGE_SIGNOUT); message.set(paramName.client, getClient()); diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientUtil.java index b9594569..e8e5db52 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientUtil.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoClientUtil.java @@ -28,7 +28,7 @@ import java.util.Map; * @author click33 * @since 1.38.0 */ -public class SaSsoClientUtil extends SaSsoTemplate { +public class SaSsoClientUtil { private SaSsoClientUtil() { } @@ -120,8 +120,8 @@ public class SaSsoClientUtil extends SaSsoTemplate { * @param logoutParameter 单点注销 * @return 单点注销URL */ - public static SaSsoMessage buildSloMessage(Object loginId, SaLogoutParameter logoutParameter) { - return SaSsoClientProcessor.instance.ssoClientTemplate.buildSloMessage(loginId, logoutParameter); + public static SaSsoMessage buildSignoutMessage(Object loginId, SaLogoutParameter logoutParameter) { + return SaSsoClientProcessor.instance.ssoClientTemplate.buildSignoutMessage(loginId, logoutParameter); } } diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerTemplate.java index e861420f..19b38200 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerTemplate.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerTemplate.java @@ -292,7 +292,7 @@ public class SaSsoServerTemplate extends SaSsoTemplate { */ public SaSsoClientModel getClientNotNull(String client) { if(SaFoxUtil.isEmpty(client)) { - if(getServerConfig().getAllowAnonClient()) { + if(getConfigOfAllowAnonClient()) { return getAnonClient(); } else { throw new SaSsoException("client 标识不可为空"); @@ -307,7 +307,16 @@ public class SaSsoServerTemplate extends SaSsoTemplate { } /** - * 获取匿名 client 信息 + * 获取配置项：是否允许匿名 client 接入 + * + * @return / + */ + public boolean getConfigOfAllowAnonClient() { + return getServerConfig().getAllowAnonClient(); + } + + /** + * 获取匿名 client 配置信息 * * @return / */ @@ -697,8 +706,22 @@ public class SaSsoServerTemplate extends SaSsoTemplate { * @param message / */ public void pushToAllClient(SaSsoMessage message) { + pushToAllClient(message, null); + } + + /** + * 向所有 Client 推送消息，并忽略掉某个 client + * + * @param ignoreClient 要被忽略掉的 client，填 null 代表不忽略 + * @param message / + */ + public void pushToAllClient(SaSsoMessage message, String ignoreClient) { + // TODO 待验证 List needPushClients = getNeedPushClients(); for (SaSsoClientModel client : needPushClients) { + if(ignoreClient != null && ignoreClient.equals(client.getClient())) { + continue; + } strategy.asyncRun.run(() -> pushMessage(client, message)); } } diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerUtil.java index 42f15460..bc9cb86a 100644 --- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerUtil.java +++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/template/SaSsoServerUtil.java @@ -30,7 +30,7 @@ import java.util.List; * @author click33 * @since 1.43.0 */ -public class SaSsoServerUtil extends SaSsoTemplate { +public class SaSsoServerUtil { private SaSsoServerUtil() { } @@ -297,4 +297,14 @@ public class SaSsoServerUtil extends SaSsoTemplate { SaSsoServerProcessor.instance.ssoServerTemplate.pushToAllClient(message); } + /** + * 向所有 Client 推送消息，并忽略掉某个 client + * + * @param ignoreClient 要被忽略掉的 client，填 null 代表不忽略 + * @param message / + */ + public static void pushToAllClient(SaSsoMessage message, String ignoreClient) { + SaSsoServerProcessor.instance.ssoServerTemplate.pushToAllClient(message, ignoreClient); + } + } diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoBeanRegister.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoBeanRegister.java index 2cc828b0..cec1fa61 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoBeanRegister.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoBeanRegister.java @@ -71,6 +71,7 @@ public class SaSsoBeanRegister { * @return / */ @Bean + @Condition(onMissingBean = SaSsoServerTemplate.class) public SaSsoServerTemplate getSaSsoServerTemplate() { return SaSsoServerProcessor.instance.ssoServerTemplate; } @@ -81,6 +82,7 @@ public class SaSsoBeanRegister { * @return / */ @Bean + @Condition(onMissingBean = SaSsoClientTemplate.class) public SaSsoClientTemplate getSaSsoClientTemplate() { return SaSsoClientProcessor.instance.ssoClientTemplate; } diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java index d464f751..2c102df8 100644 --- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java +++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java @@ -23,6 +23,7 @@ import cn.dev33.satoken.sso.processor.SaSsoServerProcessor; import cn.dev33.satoken.sso.template.SaSsoClientTemplate; import cn.dev33.satoken.sso.template.SaSsoServerTemplate; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -61,6 +62,7 @@ public class SaSsoBeanRegister { * @return / */ @Bean + @ConditionalOnMissingBean(SaSsoServerTemplate.class) public SaSsoServerTemplate getSaSsoServerTemplate() { return SaSsoServerProcessor.instance.ssoServerTemplate; } @@ -71,6 +73,7 @@ public class SaSsoBeanRegister { * @return / */ @Bean + @ConditionalOnMissingBean(SaSsoClientTemplate.class) public SaSsoClientTemplate getSaSsoClientTemplate() { return SaSsoClientProcessor.instance.ssoClientTemplate; }