diff --git a/pom.xml b/pom.xml index d56c084b..424ce174 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ - 1.31.2.temp + 1.31.3.temp 1.8 utf-8 utf-8 @@ -85,8 +85,6 @@ import - - 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 16109947..46e23f7b 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 @@ -15,7 +15,7 @@ public class SaTokenConsts { /** * Sa-Token 当前版本号 */ - public static final String VERSION_NO = "v1.31.2.temp"; + public static final String VERSION_NO = "v1.31.3.temp"; /** * Sa-Token 开源地址 Gitee 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 03b6299c..9c2431e8 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.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml index 40b7680e..004d770f 100644 --- a/sa-token-demo/sa-token-demo-case/pom.xml +++ b/sa-token-demo/sa-token-demo-case/pom.xml @@ -17,7 +17,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml index ec0e7bbe..05bacb44 100644 --- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml @@ -16,7 +16,7 @@ 1.8 3.1.1 - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml index e917fede..e2ab062f 100644 --- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml @@ -16,7 +16,7 @@ 1.8 3.1.1 - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml index 009a8d39..25be7fd5 100644 --- a/sa-token-demo/sa-token-demo-grpc/pom.xml +++ b/sa-token-demo/sa-token-demo-grpc/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 1.18.10 - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index acbf1d01..2deacbb9 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.31.2.temp + 1.31.3.temp 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 5eaf0020..cd648a7d 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.31.2.temp + 1.31.3.temp 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 74f72d5c..9063aed9 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.31.2.temp + 1.31.3.temp 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 f5f09d52..c5209b0c 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -16,7 +16,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 969811b9..0175ee15 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.31.2.temp + 1.31.3.temp 1.10.9 diff --git a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml index 79b7509c..07b90611 100644 --- a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml @@ -17,7 +17,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index 78c76ea4..e69aef31 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.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso-server/pom.xml index d39528c4..018f7bc8 100644 --- a/sa-token-demo/sa-token-demo-sso-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-server/pom.xml @@ -16,7 +16,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso1-client/pom.xml index 4f3b544e..cc941b9b 100644 --- a/sa-token-demo/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1-client/pom.xml @@ -16,7 +16,7 @@ - 1.31.2.temp + 1.31.3.temp 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 814ff540..d1b1ee4d 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.31.2.temp + 1.31.3.temp 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 0fdb4c01..5d465e11 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.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml index dd5d1021..6c440f3a 100644 --- a/sa-token-demo/sa-token-demo-test/pom.xml +++ b/sa-token-demo/sa-token-demo-test/pom.xml @@ -17,7 +17,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml index 064078d4..54c8471c 100644 --- a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml +++ b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml @@ -16,7 +16,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index 04e3e42a..30294d1e 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.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml index 8fda6ff3..2fca5bf3 100644 --- a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml @@ -17,7 +17,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-demo/sa-token-demo-websocket/pom.xml b/sa-token-demo/sa-token-demo-websocket/pom.xml index abed4442..7efd634b 100644 --- a/sa-token-demo/sa-token-demo-websocket/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket/pom.xml @@ -17,7 +17,7 @@ - 1.31.2.temp + 1.31.3.temp diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index ba82b392..db29b894 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -8,11 +8,11 @@ sa-token-dependencies ${revision} pom - Sa-Token Dependencies + sa-token-dependencies Sa-Token Dependencies - 1.31.2.temp + 1.31.3.temp 2.5.12 @@ -340,4 +340,84 @@ + + + org.sonatype.oss + oss-parent + 7 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + UTF-8 + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java index 99552212..c3d3cc33 100644 --- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java +++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java @@ -27,9 +27,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 获取Value,如无返空 - * - * @param key - * @return */ @Override public String get(String key) { @@ -43,10 +40,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 写入Value,并设定存活时间 (单位: 秒) - * - * @param key - * @param value - * @param timeout */ @Override public void set(String key, String value, long timeout) { @@ -67,9 +60,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 修改指定key-value键值对 (过期时间不变) - * - * @param key - * @param value */ @Override public void update(String key, String value) { @@ -83,8 +73,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 删除Value - * - * @param key */ @Override public void delete(String key) { @@ -98,9 +86,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 获取Value的剩余存活时间 (单位: 秒) - * - * @param key - * @return */ @Override public long getTimeout(String key) { @@ -114,9 +99,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 修改Value的剩余存活时间 (单位: 秒) - * - * @param key - * @param timeout */ @Override public void updateTimeout(String key, long timeout) { @@ -141,9 +123,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 获取Object,如无返空 - * - * @param key - * @return */ @Override public Object getObject(String key) { @@ -157,10 +136,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 写入Object,并设定存活时间 (单位: 秒) - * - * @param key - * @param object - * @param timeout */ @Override public void setObject(String key, Object object, long timeout) { @@ -181,9 +156,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 更新Object (过期时间不变) - * - * @param key - * @param object */ @Override public void updateObject(String key, Object object) { @@ -197,8 +169,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 删除Object - * - * @param key */ @Override public void deleteObject(String key) { @@ -222,9 +192,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 修改Object的剩余存活时间 (单位: 秒) - * - * @param key - * @param timeout */ @Override public void updateObjectTimeout(String key, long timeout) { @@ -249,12 +216,6 @@ public class SaTokenDaoRedis implements SaTokenDao { /** * 搜索数据 - * - * @param prefix - * @param keyword - * @param start - * @param size - * @return */ @Override public List searchData(String prefix, String keyword, int start, int size, boolean sortType) {