diff --git a/sa-token-doc/sso/sso-custom-login.md b/sa-token-doc/sso/sso-custom-login.md index 22118142..c01b95a9 100644 --- a/sa-token-doc/sso/sso-custom-login.md +++ b/sa-token-doc/sso/sso-custom-login.md @@ -138,7 +138,7 @@ sa-token.sso-client.client=sso-client-shop -然后在 `sso-server` 的 `configSso` 方法里 `notLoginView` 函数中根据 client 值,返回不同的登录视图 +然后在 `sso-server` 里为每个系统开发不同的登录页,并在 `configSso` 方法里 `notLoginView` 函数中根据 client 值,返回不同的登录视图: ``` java // 配置SSO相关参数 diff --git a/sa-token-doc/sso/sso-home-jump.md b/sa-token-doc/sso/sso-home-jump.md index a8c6e405..87b24cc3 100644 --- a/sa-token-doc/sso/sso-home-jump.md +++ b/sa-token-doc/sso/sso-home-jump.md @@ -75,7 +75,7 @@ public Object ssoRequest() { if(req.isPath("/sso/auth") && req.hasParam("redirect") == false && StpUtil.isLogin()) { return SaHolder.getResponse().redirect("/home"); } - return SaSsoServerProcessor.instance.serverDister(); + return SaSsoServerProcessor.instance.dister(); } ``` diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java index ee334337..5b1ccb13 100644 --- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java +++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java @@ -15,17 +15,17 @@ */ package cn.dev33.satoken.quick; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; - import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.filter.SaServletFilter; import cn.dev33.satoken.quick.config.SaQuickConfig; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.util.SaFoxUtil; import cn.dev33.satoken.util.SaTokenConsts; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; /** * Quick Login 相关 Bean 注册 @@ -66,13 +66,13 @@ public class SaQuickRegister { .addInclude("/**") // 排除掉登录相关接口,不需要鉴权的 - .addExclude("/favicon.ico", "/saLogin", "/doLogin", "/sa-res/**"). + .addExclude("/favicon.ico", "/saLogin", "/doLogin", "/sa-res/**") // 认证函数: 每次请求执行 - setAuth(obj -> { + .setAuth(obj -> { SaRouter - .match(SaQuickManager.getConfig().getInclude().split(",")) - .notMatch(SaQuickManager.getConfig().getExclude().split(",")) + .match(SaFoxUtil.convertStringToList(SaQuickManager.getConfig().getInclude())) + .notMatch(SaFoxUtil.convertStringToList(SaQuickManager.getConfig().getExclude())) .check(r -> { // 未登录时直接转发到login.html页面 if (SaQuickManager.getConfig().getAuth() && ! StpUtil.isLogin()) {