diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoHandle.java b/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoHandle.java index 20ea5efa..98d19bb6 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoHandle.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoHandle.java @@ -312,7 +312,7 @@ public class SaSsoHandle { String secretkey = req.getParam(ParamName.secretkey); SaSsoUtil.checkSecretkey(secretkey); - stpLogic.logoutByTokenValue(stpLogic.getTokenValueByLoginId(loginId)); + stpLogic.logout(loginId); return SaSsoConsts.OK; } 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 049f7e63..e9a96a44 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -11,6 +11,7 @@ org.springframework.boot spring-boot-starter-parent 2.0.0.RELEASE + diff --git a/sa-token-doc/doc/fun/not-login-scene.md b/sa-token-doc/doc/fun/not-login-scene.md index 9fbf766d..0a371446 100644 --- a/sa-token-doc/doc/fun/not-login-scene.md +++ b/sa-token-doc/doc/fun/not-login-scene.md @@ -23,7 +23,7 @@ ``` java // 全局异常拦截（拦截项目中的NotLoginException异常） @ExceptionHandler(NotLoginException.class) -public AjaxJson handlerNotLoginException(NotLoginException nle, HttpServletRequest request, HttpServletResponse response) +public SaResult handlerNotLoginException(NotLoginException nle) throws Exception { // 打印堆栈，以供调试 @@ -51,7 +51,7 @@ public AjaxJson handlerNotLoginException(NotLoginException nle, HttpServletReque } // 返回给前端 - return AjaxJson.getError(message); + return SaResult.error(message); } ``` diff --git a/sa-token-doc/doc/plugin/alone-redis.md b/sa-token-doc/doc/plugin/alone-redis.md index 647028af..856ce9f8 100644 --- a/sa-token-doc/doc/plugin/alone-redis.md +++ b/sa-token-doc/doc/plugin/alone-redis.md @@ -76,18 +76,18 @@ public class TestController { // 测试Sa-Token缓存 @RequestMapping("login") - public AjaxJson login(@RequestParam(defaultValue="10001") String id) { + public SaResult login(@RequestParam(defaultValue="10001") String id) { System.out.println("--------------- 测试Sa-Token缓存"); StpUtil.login(id); - return AjaxJson.getSuccess(); + return SaResult.ok(); } // 测试业务缓存 @RequestMapping("test") - public AjaxJson test() { + public SaResult test() { System.out.println("--------------- 测试业务缓存"); stringRedisTemplate.opsForValue().set("hello", "Hello World"); - return AjaxJson.getSuccess(); + return SaResult.ok(); } } diff --git a/sa-token-doc/doc/start/webflux-example.md b/sa-token-doc/doc/start/webflux-example.md index 77136c84..6af65459 100644 --- a/sa-token-doc/doc/start/webflux-example.md +++ b/sa-token-doc/doc/start/webflux-example.md @@ -65,7 +65,7 @@ public class SaTokenConfigure { // 指定[异常处理函数]：每次[认证函数]发生异常时执行此函数 .setError(e -> { System.out.println("---------- sa全局异常 "); - return AjaxJson.getError(e.getMessage()); + return SaResult.error(e.getMessage()); }) ; } diff --git a/sa-token-doc/doc/up/global-filter.md b/sa-token-doc/doc/up/global-filter.md index d4d62dc1..1b5b6d6b 100644 --- a/sa-token-doc/doc/up/global-filter.md +++ b/sa-token-doc/doc/up/global-filter.md @@ -51,7 +51,7 @@ public class SaTokenConfigure { // 异常处理函数：每次认证函数发生异常时执行此函数 .setError(e -> { System.out.println("---------- 进入Sa-Token异常处理 -----------"); - return AjaxJson.getError(e.getMessage()); + return SaResult.error(e.getMessage()); }) // 前置函数：在每次认证函数之前执行 diff --git a/sa-token-doc/doc/use/at-check.md b/sa-token-doc/doc/use/at-check.md index 943c7b35..2287102a 100644 --- a/sa-token-doc/doc/use/at-check.md +++ b/sa-token-doc/doc/use/at-check.md @@ -86,8 +86,8 @@ public String add() { // 注解式鉴权：只要具有其中一个权限即可通过校验 @RequestMapping("atJurOr") @SaCheckPermission(value = {"user-add", "user-all", "user-delete"}, mode = SaMode.OR) -public AjaxJson atJurOr() { - return AjaxJson.getSuccessData("用户信息"); +public SaResult atJurOr() { + return SaResult.data("用户信息"); } ``` @@ -103,8 +103,8 @@ mode有两种取值： // 注解式鉴权：只要具有其中一个权限即可通过校验 @RequestMapping("userAdd") @SaCheckPermission(value = "user-add", orRole = "admin") -public AjaxJson userAdd() { - return AjaxJson.getSuccessData("用户信息"); +public SaResult userAdd() { + return SaResult.data("用户信息"); } ``` diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java new file mode 100644 index 00000000..a5dca2f8 --- /dev/null +++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java @@ -0,0 +1,30 @@ +package cn.dev33.satoken.quick; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +import cn.dev33.satoken.quick.config.SaQuickConfig; +import cn.dev33.satoken.quick.web.SaQuickController; + +/** + * Quick-Bean 注入 + * + * @author kong + * + */ +@Configuration +@Import({ SaQuickController.class, SaQuickRegister.class}) +public class SaQuickInject { + + /** + * 注入quick-login 配置 + * + * @param saQuickConfig 配置对象 + */ + @Autowired + public void setSaQuickConfig(SaQuickConfig saQuickConfig) { + SaQuickManager.setConfig(saQuickConfig); + } + +} 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/SaQuickRegister.java similarity index 71% rename from sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickBean.java rename to sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java index f577d72b..337e3ab3 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/SaQuickRegister.java @@ -1,33 +1,28 @@ package cn.dev33.satoken.quick; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.core.annotation.Order; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import cn.dev33.satoken.context.SaHolder; 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; /** - * 自动注入 + * Quick-Bean 注册 * * @author kong * */ @Configuration -@Import({ SaQuickController.class }) -public class SaQuickBean implements WebMvcConfigurer { +public class SaQuickRegister { /** - * quick-login 配置 + * 注册 Quick-Login 配置 * * @return see note */ @@ -38,17 +33,7 @@ public class SaQuickBean implements WebMvcConfigurer { } /** - * 注入quick-login 配置 - * - * @param saQuickConfig 配置对象 - */ - @Autowired - public void setSaQuickConfig(SaQuickConfig saQuickConfig) { - SaQuickManager.setConfig(saQuickConfig); - } - - /** - * 注册 [sa-token全局过滤器] + * 注册 [sa-token全局过滤器] * * @return see note */ diff --git a/sa-token-plugin/sa-token-quick-login/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-quick-login/src/main/resources/META-INF/spring.factories index 11ec6b6e..6c905371 100644 --- a/sa-token-plugin/sa-token-quick-login/src/main/resources/META-INF/spring.factories +++ b/sa-token-plugin/sa-token-quick-login/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.quick.SaQuickBean \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.quick.SaQuickInject \ No newline at end of file