diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java index d0cc8694..0d39ff60 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java @@ -16,7 +16,6 @@ package cn.dev33.satoken.solon.dao; import org.noear.redisx.RedisClient; -import org.noear.solon.annotation.Note; import java.util.Properties; @@ -35,4 +34,5 @@ public class SaTokenDaoOfRedis extends SaTokenDaoOfRedisBase64 { public SaTokenDaoOfRedis(RedisClient redisClient) { super(redisClient); } + } \ No newline at end of file diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java index 40df43f3..5a2f2114 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java @@ -157,7 +157,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao { @Override public List searchData(String prefix, String keyword, int start, int size, boolean sortType) { Set keys = redisBucket.keys(prefix + "*" + keyword + "*"); - List list = new ArrayList(keys); + List list = new ArrayList<>(keys); return SaFoxUtil.searchList(list, start, size, sortType); } } \ No newline at end of file diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java index 1c938010..771ddb9c 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java @@ -174,7 +174,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao { @Override public List searchData(String prefix, String keyword, int start, int size, boolean sortType) { Set keys = redisBucket.keys(prefix + "*" + keyword + "*"); - List list = new ArrayList(keys); + List list = new ArrayList<>(keys); return SaFoxUtil.searchList(list, start, size, sortType); } } \ No newline at end of file diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java index f0602095..14fca066 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java @@ -24,9 +24,9 @@ package cn.dev33.satoken.solon.error; public interface SaSolonErrorCode { /** 默认的拦截器异常处理函数 */ - public static final int CODE_20301 = 20301; + int CODE_20301 = 20301; /** 默认的 Filter 异常处理函数 */ - public static final int CODE_20302 = 20302; + int CODE_20302 = 20302; } diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java index e51e71f4..1b811220 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java @@ -34,9 +34,9 @@ import java.util.List; /** * sa-token 基于路由的过滤式鉴权(增加了注解的处理);使用优先级要低些 - * + *

* 对静态文件有处理效果 - * + *

* order: -100 (SaTokenInterceptor 和 SaTokenFilter 二选一;不要同时用) * * @author noear @@ -152,6 +152,7 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名,为 } }); } catch (StopMatchException e) { + // StopMatchException 异常代表:停止匹配,进入Controller } catch (SaTokenException e) { // 1. 获取异常处理策略结果 diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java index 03fefd8c..7b170ac5 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java @@ -34,9 +34,9 @@ import java.util.List; /** * sa-token 基于路由的过滤式鉴权(增加了注解的处理);使用优先级要低些 - * + *

* 对静态文件无处理效果 - * + *

* order: -100 (SaTokenInterceptor 和 SaTokenFilter 二选一;不要同时用) * * @author noear @@ -201,6 +201,7 @@ public class SaTokenInterceptor implements RouterInterceptor { } }); } catch (StopMatchException e) { + // StopMatchException 异常代表:停止匹配,进入Controller } catch (SaTokenException e) { // 1. 获取异常处理策略结果 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 80bf68fb..3de3469a 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 @@ -80,7 +80,7 @@ public class SaRequestForSolon implements SaRequest { @Override public String getUrl() { String currDomain = SaManager.getConfig().getCurrDomain(); - if(SaFoxUtil.isEmpty(currDomain) == false) { + if( ! SaFoxUtil.isEmpty(currDomain)) { return currDomain + this.getRequestPath(); } return ctx.url();