From 1644a1c5f3aa20ecdb6415d50a4e55839c0a51fb Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Mon, 16 Aug 2021 15:55:34 +0800 Subject: [PATCH 0001/1853] =?UTF-8?q?SSO=E6=96=87=E6=A1=A3=E9=87=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0API=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/pj/sso/SsoClientController.java | 7 ++++++- .../main/java/com/pj/sso/SsoServerController.java | 8 +++++++- .../main/java/com/pj/sso/SsoClientController.java | 7 ++++++- .../main/java/com/pj/sso/SsoServerController.java | 8 +++++++- sa-token-doc/doc/more/common-action.md | 4 ++-- sa-token-doc/doc/sso/sso-type2.md | 15 +++++++++++++-- .../java/cn/dev33/satoken/quick/SaQuickBean.java | 5 ++--- 7 files changed, 43 insertions(+), 11 deletions(-) diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java index 612de5538..90a892c74 100644 --- a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java +++ b/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java @@ -15,7 +15,12 @@ @RestController public class SsoClientController { - // SSO-Client端：首页 + /* + * SSO-Client端：处理所有SSO相关请求 + * http://{host}:{port}/sso/login -- Client端登录地址，接受参数：back=登录后的跳转地址 + * http://{host}:{port}/sso/logout -- Client端单点注销地址（isSlo=true时打开），接受参数：back=注销后的跳转地址 + * http://{host}:{port}/sso/logoutCall -- Client端单点注销回调地址（isSlo=true时打开），此接口为框架回调，开发者无需关心 + */ @RequestMapping("/") public String index() { String str = "

Sa-Token SSO-Client 应用端

" + diff --git a/sa-token-demo/sa-token-demo-sso2-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso2-server/src/main/java/com/pj/sso/SsoServerController.java index d211abc2a..4d23369a8 100644 --- a/sa-token-demo/sa-token-demo-sso2-server/src/main/java/com/pj/sso/SsoServerController.java +++ b/sa-token-demo/sa-token-demo-sso2-server/src/main/java/com/pj/sso/SsoServerController.java @@ -19,7 +19,13 @@ @RestController public class SsoServerController { - // SSO-Server端：处理所有SSO相关请求 + /* + * SSO-Server端：处理所有SSO相关请求 + * http://{host}:{port}/sso/auth -- 单点登录授权地址，接受参数：redirect=授权重定向地址 + * http://{host}:{port}/sso/doLogin -- 账号密码登录接口，接受参数：name、pwd + * http://{host}:{port}/sso/checkTicket -- Ticket校验接口（isHttp=true时打开），接受参数：ticket=ticket码、ssoLogoutCall=单点注销回调地址 [可选] + * http://{host}:{port}/sso/logout -- 单点注销地址（isSlo=true时打开），接受参数：loginId=账号id、secretkey=接口调用秘钥 + */ @RequestMapping("/sso/*") public Object ssoRequest() { return SaSsoHandle.serverRequest(); diff --git a/sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java index 82e4c39ab..a41ea3e48 100644 --- a/sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java +++ b/sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java @@ -30,7 +30,12 @@ public String index() { return str; } - // SSO-Client端：处理所有SSO相关请求 + /* + * SSO-Client端：处理所有SSO相关请求 + * http://{host}:{port}/sso/login -- Client端登录地址，接受参数：back=登录后的跳转地址 + * http://{host}:{port}/sso/logout -- Client端单点注销地址（isSlo=true时打开），接受参数：back=注销后的跳转地址 + * http://{host}:{port}/sso/logoutCall -- Client端单点注销回调地址（isSlo=true时打开），此接口为框架回调，开发者无需关心 + */ @RequestMapping("/sso/*") public Object ssoRequest() { return SaSsoHandle.clientRequest(); diff --git a/sa-token-demo/sa-token-demo-sso3-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso3-server/src/main/java/com/pj/sso/SsoServerController.java index b6acac110..cd1e47001 100644 --- a/sa-token-demo/sa-token-demo-sso3-server/src/main/java/com/pj/sso/SsoServerController.java +++ b/sa-token-demo/sa-token-demo-sso3-server/src/main/java/com/pj/sso/SsoServerController.java @@ -22,7 +22,13 @@ @RestController public class SsoServerController { - // SSO-Server端：处理所有SSO相关请求 + /* + * SSO-Server端：处理所有SSO相关请求 + * http://{host}:{port}/sso/auth -- 单点登录授权地址，接受参数：redirect=授权重定向地址 + * http://{host}:{port}/sso/doLogin -- 账号密码登录接口，接受参数：name、pwd + * http://{host}:{port}/sso/checkTicket -- Ticket校验接口（isHttp=true时打开），接受参数：ticket=ticket码、ssoLogoutCall=单点注销回调地址 [可选] + * http://{host}:{port}/sso/logout -- 单点注销地址（isSlo=true时打开），接受参数：loginId=账号id、secretkey=接口调用秘钥 + */ @RequestMapping("/sso/*") public Object ssoRequest() { return SaSsoHandle.serverRequest(); diff --git a/sa-token-doc/doc/more/common-action.md b/sa-token-doc/doc/more/common-action.md index 90e3d2cf4..2e7299ad2 100644 --- a/sa-token-doc/doc/more/common-action.md +++ b/sa-token-doc/doc/more/common-action.md @@ -77,8 +77,8 @@ SaManager.setConfig(config); ### SpringMVCUtil SpringMVC操作的工具类，位于包：`sa-token-spring-boot-starter` ``` java -SpringMVCUtil.getRequest(); // 获取当前会话的 request -SpringMVCUtil.getResponse(); // 获取当前会话的 response +SpringMVCUtil.getRequest(); // 获取本次请求的 request 对象 +SpringMVCUtil.getResponse(); // 获取本次请求的 response 对象 ``` diff --git a/sa-token-doc/doc/sso/sso-type2.md b/sa-token-doc/doc/sso/sso-type2.md index 74522ab3e..757b87e47 100644 --- a/sa-token-doc/doc/sso/sso-type2.md +++ b/sa-token-doc/doc/sso/sso-type2.md @@ -72,7 +72,13 @@ @RestController public class SsoServerController { - // SSO-Server端：处理所有SSO相关请求 + /* + * SSO-Server端：处理所有SSO相关请求 + * http://{host}:{port}/sso/auth -- 单点登录授权地址，接受参数：redirect=授权重定向地址 + * http://{host}:{port}/sso/doLogin -- 账号密码登录接口，接受参数：name、pwd + * http://{host}:{port}/sso/checkTicket -- Ticket校验接口（isHttp=true时打开），接受参数：ticket=ticket码、ssoLogoutCall=单点注销回调地址 [可选] + * http://{host}:{port}/sso/logout -- 单点注销地址（isSlo=true时打开），接受参数：loginId=账号id、secretkey=接口调用秘钥 + */ @RequestMapping("/sso/*") public Object ssoRequest() { return SaSsoHandle.serverRequest(); @@ -189,7 +195,12 @@ public class SaSsoServerApplication { @RestController public class SsoClientController { - // SSO-Client端：首页 + /* + * SSO-Client端：处理所有SSO相关请求 + * http://{host}:{port}/sso/login -- Client端登录地址，接受参数：back=登录后的跳转地址 + * http://{host}:{port}/sso/logout -- Client端单点注销地址（isSlo=true时打开），接受参数：back=注销后的跳转地址 + * http://{host}:{port}/sso/logoutCall -- Client端单点注销回调地址（isSlo=true时打开），此接口为框架回调，开发者无需关心 + */ @RequestMapping("/") public String index() { String str = "

Sa-Token SSO-Client 应用端

" + diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickBean.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickBean.java index 6055e238a..f577d72b6 100644 --- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickBean.java +++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickBean.java @@ -9,10 +9,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import cn.dev33.satoken.context.SaHolder; -import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.filter.SaServletFilter; import cn.dev33.satoken.quick.config.SaQuickConfig; import cn.dev33.satoken.quick.web.SaQuickController; +import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.util.SaTokenConsts; @@ -65,8 +65,7 @@ public SaServletFilter getSaServletFilter() { // 未登录时直接转发到login.html页面 if (SaQuickManager.getConfig().getAuth() && StpUtil.isLogin() == false) { SaHolder.getRequest().forward("/saLogin"); - // 抛出异常，不再继续执行 - throw NotLoginException.newInstance(StpUtil.getLoginType(), ""); + SaRouter.back(); } }). From 798a5548f93219a7ebb397fb93c96bb35ea298b5 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Mon, 16 Aug 2021 19:20:44 +0800 Subject: [PATCH 0002/1853] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E7=A6=BB=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=8E=A5=E5=85=A5SSO?= =?UTF-8?q?=E7=9A=84=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sa-token-demo-sso2-client-h5/index.html | 39 +++++++ .../sso-login.html | 91 +++++++++++++++ .../src/main/java/com/pj/h5/CorsFilter.java | 61 ++++++++++ .../src/main/java/com/pj/h5/H5Controller.java | 50 ++++++++ .../src/main/resources/application.yml | 3 +- sa-token-doc/doc/sso/sso-cd.md | 107 +++++++++++++++++- sa-token-doc/doc/sso/sso-type3.md | 2 +- .../sa-token-solon-plugin/pom.xml | 2 +- .../solon/model/SaRequestForSolon.java | 5 + 9 files changed, 356 insertions(+), 4 deletions(-) create mode 100644 sa-token-demo/sa-token-demo-sso2-client-h5/index.html create mode 100644 sa-token-demo/sa-token-demo-sso2-client-h5/sso-login.html create mode 100644 sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java create mode 100644 sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java diff --git a/sa-token-demo/sa-token-demo-sso2-client-h5/index.html b/sa-token-demo/sa-token-demo-sso2-client-h5/index.html new file mode 100644 index 000000000..127a57d89 --- /dev/null +++ b/sa-token-demo/sa-token-demo-sso2-client-h5/index.html @@ -0,0 +1,39 @@ + + + + + Sa-Token-SSO-Client端-测试页（前后端分离版） + + +

Sa-Token SSO-Client 应用端（前后端分离版）

+

当前是否登录：

+

+ 登录 + 注销 +

+ + + + diff --git a/sa-token-demo/sa-token-demo-sso2-client-h5/sso-login.html b/sa-token-demo/sa-token-demo-sso2-client-h5/sso-login.html new file mode 100644 index 000000000..590929243 --- /dev/null +++ b/sa-token-demo/sa-token-demo-sso2-client-h5/sso-login.html @@ -0,0 +1,91 @@ + + + + + Sa-Token-SSO-Client端-登录页 + + + +
+ +
+ + + + + + diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java new file mode 100644 index 000000000..02590e5ad --- /dev/null +++ b/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java @@ -0,0 +1,61 @@ +package com.pj.h5; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +/** + * 跨域过滤器 + * @author kong + */ +@Component +@Order(-200) +public class CorsFilter implements Filter { + + static final String OPTIONS = "OPTIONS"; + + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) + throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest) req; + HttpServletResponse response = (HttpServletResponse) res; + + // 允许指定域访问跨域资源 + response.setHeader("Access-Control-Allow-Origin", "*"); + // 允许所有请求方式 + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + // 有效时间 + response.setHeader("Access-Control-Max-Age", "3600"); + // 允许的header参数 + response.setHeader("Access-Control-Allow-Headers", "x-requested-with,satoken"); + + // 如果是预检请求，直接返回 + if (OPTIONS.equals(request.getMethod())) { + System.out.println("=======================浏览器发来了OPTIONS预检请求=========="); + response.getWriter().print(""); + return; + } + + // System.out.println("*********************************过滤器被使用**************************"); + chain.doFilter(req, res); + } + + @Override + public void init(FilterConfig filterConfig) { + } + + @Override + public void destroy() { + } + +} diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java new file mode 100644 index 000000000..8fe645b3f --- /dev/null +++ b/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java @@ -0,0 +1,50 @@ +package com.pj.h5; + +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.dev33.satoken.sso.SaSsoUtil; +import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.util.SaResult; + +/** + * 前后台分离架构下集成SSO所需的代码 + * @author kong + * + */ +@RestController +public class H5Controller { + + // 当前是否登录 + @RequestMapping("/isLogin") + public Object isLogin() { + return SaResult.data(StpUtil.isLogin()); + } + + // 返回SSO认证中心登录地址 + @RequestMapping("/getSsoAuthUrl") + public SaResult getSsoAuthUrl(String clientLoginUrl) { + String serverAuthUrl = SaSsoUtil.buildServerAuthUrl(clientLoginUrl, ""); + return SaResult.data(serverAuthUrl); + } + + // 根据ticket进行登录 + @RequestMapping("/doLoginByTicket") + public SaResult doLoginByTicket(String ticket) { + Object loginId = SaSsoUtil.checkTicket(ticket); + if(loginId != null) { + StpUtil.login(loginId); + return SaResult.data(StpUtil.getTokenValue()); + } + return SaResult.error("无效ticket：" + ticket); + } + + // 全局异常拦截 + @ExceptionHandler + public SaResult handlerException(Exception e) { + e.printStackTrace(); + return SaResult.error(e.getMessage()); + } + +} diff --git a/sa-token-demo/sa-token-demo-sso2-server/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso2-server/src/main/resources/application.yml index c8b23222c..672a5d0b2 100644 --- a/sa-token-demo/sa-token-demo-sso2-server/src/main/resources/application.yml +++ b/sa-token-demo/sa-token-demo-sso2-server/src/main/resources/application.yml @@ -9,7 +9,8 @@ sa-token: # Ticket有效期 (单位: 秒)，默认五分钟 ticket-timeout: 300 # 所有允许的授权回调地址 - allow-url: http://sa-sso-client1.com:9001/sso/login, http://sa-sso-client2.com:9001/sso/login, http://sa-sso-client3.com:9001/sso/login + # allow-url: http://sa-sso-client1.com:9001/sso/login, http://sa-sso-client2.com:9001/sso/login, http://sa-sso-client3.com:9001/sso/login + allow-url: "*" spring: # Redis配置 diff --git a/sa-token-doc/doc/sso/sso-cd.md b/sa-token-doc/doc/sso/sso-cd.md index 878cc3e86..e950031d9 100644 --- a/sa-token-doc/doc/sso/sso-cd.md +++ b/sa-token-doc/doc/sso/sso-cd.md @@ -118,7 +118,112 @@ public SaResult ss(String name, String pwd) { 答：直接在前端更改点击按钮时 Ajax 的请求地址即可 -### 三、常见疑问 +### 三、前后端分离架构下的整合方案 + +如果我们已有的系统是前后端分离模式，我们显然不能为了接入SSO而改造系统的基础架构，官方仓库的示例采用的是前后端一体方案，要将其改造为前后台分离架构模式非常简单 + +以`sa-token-demo-sso2-client`为例： + +##### 3.1、新建`H5Controller`开放接口 +``` java +/** + * 前后台分离架构下集成SSO所需的代码 + */ +@RestController +public class H5Controller { + + // 当前是否登录 + @RequestMapping("/isLogin") + public Object isLogin() { + return SaResult.data(StpUtil.isLogin()); + } + + // 返回SSO认证中心登录地址 + @RequestMapping("/getSsoAuthUrl") + public SaResult getSsoAuthUrl(String clientLoginUrl) { + String serverAuthUrl = SaSsoUtil.buildServerAuthUrl(clientLoginUrl, ""); + return SaResult.data(serverAuthUrl); + } + + // 根据ticket进行登录 + @RequestMapping("/doLoginByTicket") + public SaResult doLoginByTicket(String ticket) { + Object loginId = SaSsoUtil.checkTicket(ticket); + if(loginId != null) { + StpUtil.login(loginId); + return SaResult.data(StpUtil.getTokenValue()); + } + return SaResult.error("无效ticket：" + ticket); + } + + // 全局异常拦截 + @ExceptionHandler + public SaResult handlerException(Exception e) { + e.printStackTrace(); + return SaResult.error(e.getMessage()); + } + +} +``` + +##### 3.2、增加跨域过滤器`CorsFilter.java` +源码详见：[CorsFilter.java](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java)， +将其复制到项目中即可 + +##### 3.3、新建前端项目 +任意文件夹新建前端项目：`sa-token-demo-sso2-client-h5`，在根目录添加测试文件：`index.html` +``` xml + + + + + Sa-Token-SSO-Client端-测试页（前后端分离版） + + +

Sa-Token SSO-Client 应用端（前后端分离版）

+

当前是否登录：

+

+ 登录 + 注销 +

+ + + + +``` + +##### 3.4、添加登录处理文件`sso-login.html` +源码详见：[sso-login.html](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso2-client-h5/sso-login.html)， +将其复制到项目中即可，与`index.html`一样放在根目录下 + + +##### 3.5、测试 +先启动Server服务端与Client服务端，再随便找个能预览html的工具打开前端项目（比如[HBuilderX](https://www.dcloud.io/hbuilderx.html)），测试流程与一体版一致 + + +### 四、常见疑问 ##### 问：在模式一与模式二中，Client端 必须通过 Alone-Redis 插件来访问Redis吗？ diff --git a/sa-token-doc/doc/sso/sso-type3.md b/sa-token-doc/doc/sso/sso-type3.md index a97af5fd6..15a810a47 100644 --- a/sa-token-doc/doc/sso/sso-type3.md +++ b/sa-token-doc/doc/sso/sso-type3.md @@ -116,7 +116,7 @@ public Object myinfo() { } ``` -访问测试：[http://sa-sso-client2.com:9001/sso/myinfo](http://sa-sso-client2.com:9001/sso/myinfo) +访问测试：[http://sa-sso-client1.com:9001/sso/myinfo](http://sa-sso-client1.com:9001/sso/myinfo) diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml index 98fe5e493..a2eb342eb 100644 --- a/sa-token-starter/sa-token-solon-plugin/pom.xml +++ b/sa-token-starter/sa-token-solon-plugin/pom.xml @@ -19,7 +19,7 @@ org.noear solon - 1.5.17 + 1.5.24 diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java index 183e5ed88..2a491cf1f 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java @@ -51,4 +51,9 @@ public String getMethod() { return ctx.method(); } + public Object forward(String path) { + ctx.forward(path); + return null; + } + } From 66639eda83b143647e9ec40400f638c921c88656 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Mon, 16 Aug 2021 23:03:24 +0800 Subject: [PATCH 0003/1853] =?UTF-8?q?v1.25.0=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pom.xml | 4 +-- sa-token-core/pom.xml | 2 +- .../cn/dev33/satoken/config/SaSsoConfig.java | 3 +- .../satoken/context/model/SaRequest.java | 2 +- .../exception/IdTokenInvalidException.java | 1 + .../cn/dev33/satoken/id/SaIdTemplate.java | 2 +- .../cn/dev33/satoken/util/SaTokenConsts.java | 2 +- .../sa-token-demo-alone-redis/pom.xml | 2 +- sa-token-demo/sa-token-demo-jwt/pom.xml | 2 +- .../sa-token-demo-oauth2-client/pom.xml | 2 +- .../sa-token-demo-oauth2-server/pom.xml | 2 +- .../sa-token-demo-quick-login/pom.xml | 2 +- sa-token-demo/sa-token-demo-solon/pom.xml | 2 +- .../sa-token-demo-springboot/pom.xml | 2 +- sa-token-demo/sa-token-demo-sso1/pom.xml | 2 +- .../sa-token-demo-sso2-client/pom.xml | 2 +- .../sa-token-demo-sso2-server/pom.xml | 2 +- .../sa-token-demo-sso3-client/pom.xml | 2 +- .../sa-token-demo-sso3-server/pom.xml | 2 +- sa-token-demo/sa-token-demo-webflux/pom.xml | 2 +- sa-token-doc/doc/README.md | 2 +- sa-token-doc/doc/index.html | 3 +- sa-token-doc/doc/more/update-log.md | 20 +++++++++++++ sa-token-doc/doc/sso/sso-cd.md | 30 +++++++++---------- sa-token-doc/index.html | 2 +- sa-token-plugin/pom.xml | 2 +- sa-token-plugin/sa-token-alone-redis/pom.xml | 2 +- .../sa-token-dao-redis-jackson/pom.xml | 2 +- sa-token-plugin/sa-token-dao-redis/pom.xml | 2 +- sa-token-plugin/sa-token-oauth2/pom.xml | 2 +- sa-token-plugin/sa-token-quick-login/pom.xml | 2 +- sa-token-plugin/sa-token-spring-aop/pom.xml | 2 +- sa-token-plugin/sa-token-temp-jwt/pom.xml | 2 +- sa-token-starter/pom.xml | 2 +- .../pom.xml | 2 +- sa-token-starter/sa-token-servlet/pom.xml | 2 +- .../sa-token-solon-plugin/pom.xml | 2 +- .../solon/model/SaRequestForSolon.java | 1 + .../sa-token-spring-boot-starter/pom.xml | 2 +- 40 files changed, 76 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 3172f242b..c309b82e2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.24.0

+

Sa-Token v1.25.0

这可能是史上功能最全的 Java 权限认证框架！

diff --git a/pom.xml b/pom.xml index a045ae8e4..5ed7a58a3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.dev33 sa-token-parent pom - 1.24.0 + 1.25.0 sa-token @@ -36,7 +36,7 @@ - 1.24.0 + 1.25.0 1.8 utf-8 utf-8 diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index 09b250f5e..16c764a08 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -7,7 +7,7 @@ cn.dev33 sa-token-parent - 1.24.0 + 1.25.0 jar diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java index 1937dafc3..32132b4f0 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java @@ -133,6 +133,7 @@ public String getCheckTicketUrl() { /** * @param checkTicketUrl SSO-Server端Ticket校验地址 + * @return 对象自身 */ public SaSsoConfig setCheckTicketUrl(String checkTicketUrl) { this.checkTicketUrl = checkTicketUrl; @@ -294,7 +295,7 @@ public SaSsoConfig setDoLoginHandle(BiFunction doLoginHa } /** - * @param SSO-Client端：自定义校验Ticket返回值的处理逻辑 （每次从认证中心获取校验Ticket的结果后调用） + * @param ticketResultHandle SSO-Client端：自定义校验Ticket返回值的处理逻辑 （每次从认证中心获取校验Ticket的结果后调用） * @return 对象自身 */ public SaSsoConfig setTicketResultHandle(BiFunction ticketResultHandle) { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java index 9d3a8b7eb..1a0a5eea9 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java @@ -136,7 +136,7 @@ public default boolean isAjax() { /** * 转发请求 - * @param url 转发地址 + * @param path 转发地址 * @return 任意值 */ public default Object forward(String path) { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java index 4a6e94f37..dd8aa087a 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java @@ -14,6 +14,7 @@ public class IdTokenInvalidException extends SaTokenException { /** * 一个异常：代表提供的 Id-Token 无效 + * @param message 异常描述 */ public IdTokenInvalidException(String message) { super(message); diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/id/SaIdTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/id/SaIdTemplate.java index 9381bdb84..2b0ebf135 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/id/SaIdTemplate.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/id/SaIdTemplate.java @@ -91,7 +91,7 @@ public String refreshToken() { /** * 保存Id-Token - * @param token + * @param token token */ public void saveToken(String token) { if(SaFoxUtil.isEmpty(token)) { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java index 5ec6c6204..0d1a7d4a6 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java @@ -13,7 +13,7 @@ public class SaTokenConsts { /** * Sa-Token 当前版本号 */ - public static final String VERSION_NO = "v1.24.1"; + public static final String VERSION_NO = "v1.25.0"; /** * Sa-Token 开源地址 diff --git a/sa-token-demo/sa-token-demo-alone-redis/pom.xml b/sa-token-demo/sa-token-demo-alone-redis/pom.xml index 4add5011c..5fe17cdce 100644 --- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index 5677ce5a8..1a265a685 100644 --- a/sa-token-demo/sa-token-demo-jwt/pom.xml +++ b/sa-token-demo/sa-token-demo-jwt/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml index 7050a7bf9..99c7c8a0a 100644 --- a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml index 98b0b10f9..83135003b 100644 --- a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-quick-login/pom.xml b/sa-token-demo/sa-token-demo-quick-login/pom.xml index 546564967..2b6c95fc9 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -15,7 +15,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 41f39ab6d..a681ac30d 100644 --- a/sa-token-demo/sa-token-demo-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-solon/pom.xml @@ -9,7 +9,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index 9bd1e4ef0..8a0892259 100644 --- a/sa-token-demo/sa-token-demo-springboot/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot/pom.xml @@ -17,7 +17,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-sso1/pom.xml b/sa-token-demo/sa-token-demo-sso1/pom.xml index 45ae1eccb..e6086c4fa 100644 --- a/sa-token-demo/sa-token-demo-sso1/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso2-client/pom.xml index e443fdd39..baffc690c 100644 --- a/sa-token-demo/sa-token-demo-sso2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso2-client/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-sso2-server/pom.xml b/sa-token-demo/sa-token-demo-sso2-server/pom.xml index e70aad7a1..5a9106763 100644 --- a/sa-token-demo/sa-token-demo-sso2-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso2-server/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso3-client/pom.xml index 4c84d6bde..c5e1daf7e 100644 --- a/sa-token-demo/sa-token-demo-sso3-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso3-client/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-sso3-server/pom.xml b/sa-token-demo/sa-token-demo-sso3-server/pom.xml index cbef4ecfd..2cbf6e687 100644 --- a/sa-token-demo/sa-token-demo-sso3-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso3-server/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index 0a59be1ff..30619daab 100644 --- a/sa-token-demo/sa-token-demo-webflux/pom.xml +++ b/sa-token-demo/sa-token-demo-webflux/pom.xml @@ -16,7 +16,7 @@ - 1.24.0 + 1.25.0 diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md index c90340524..39b897795 100644 --- a/sa-token-doc/doc/README.md +++ b/sa-token-doc/doc/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.24.0

+

Sa-Token v1.25.0

这可能是史上功能最全的 Java 权限认证框架！

diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html index 169f2a6ce..761001c03 100644 --- a/sa-token-doc/doc/index.html +++ b/sa-token-doc/doc/index.html @@ -22,6 +22,7 @@

Sa-Token