From e76169864d2b932509ad288766c1364072ce2734 Mon Sep 17 00:00:00 2001 From: noear Date: Mon, 4 Sep 2023 13:29:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Solon=20=E6=A1=86=E6=9E=B6=E5=8D=87?= =?UTF-8?q?=E4=B8=BA=EF=BC=9A2.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-dependencies/pom.xml | 4 +- .../sa-token-solon-plugin/pom.xml | 33 +- .../cn/dev33/satoken/solon/XPluginImp.java | 6 +- .../dao/SaSessionForJacksonCustomized.java | 47 +++ .../dao/SaTokenDaoOfRedissonJackson.java | 291 ++++++++++++++++++ .../solon/oauth2/SaOAuth2AutoConfigure.java | 41 ++- .../satoken/solon/sso/SaSsoAutoConfigure.java | 43 ++- 7 files changed, 409 insertions(+), 56 deletions(-) create mode 100644 sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJacksonCustomized.java create mode 100644 sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index ee1c0588..4262942c 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -23,9 +23,9 @@ 3.1.0 6.0.0 3.0.9.RELEASE - 2.4.0 + 2.5.3 1.4.8 - 3.2.72 + 3.2.79 4.9.17 3.14.4 2.5.0 diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml index 009aa3a9..5d737654 100644 --- a/sa-token-starter/sa-token-solon-plugin/pom.xml +++ b/sa-token-starter/sa-token-solon-plugin/pom.xml @@ -42,17 +42,38 @@ true - - org.noear - snack3 - provided - - + org.noear redisx provided + + org.noear + snack3 + provided + + + + + org.redisson + redisson + provided + + + + + com.fasterxml.jackson.core + jackson-databind + provided + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + provided + + \ No newline at end of file diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java index 1eec299b..c0d260be 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java @@ -35,7 +35,7 @@ import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.temp.SaTempInterface; import org.noear.solon.Solon; -import org.noear.solon.core.AopContext; +import org.noear.solon.core.AppContext; import org.noear.solon.core.Plugin; /** @@ -45,7 +45,7 @@ import org.noear.solon.core.Plugin; public class XPluginImp implements Plugin { @Override - public void start(AopContext context) { + public void start(AppContext context) { // Sa-Token 日志输出 Bean context.getBeanAsync(SaLog.class, bean -> { SaManager.setLog(bean); @@ -60,7 +60,7 @@ public class XPluginImp implements Plugin { }); } - private void beanInitDo(AopContext context) { + private void beanInitDo(AppContext context) { // 注入上下文Bean SaManager.setSaTokenContext(new SaContextForSolon()); diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJacksonCustomized.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJacksonCustomized.java new file mode 100644 index 00000000..86a26973 --- /dev/null +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJacksonCustomized.java @@ -0,0 +1,47 @@ +/* + * Copyright 2020-2099 sa-token.cc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.dev33.satoken.solon.dao; + +import cn.dev33.satoken.session.SaSession; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +/** + * Jackson定制版SaSession，忽略 timeout 等属性的序列化 + * + * @author click33 + * @since 1.34.0 + */ +@JsonIgnoreProperties({"timeout"}) +public class SaSessionForJacksonCustomized extends SaSession { + + /** + * + */ + private static final long serialVersionUID = -7600983549653130681L; + + public SaSessionForJacksonCustomized() { + super(); + } + + /** + * 构建一个Session对象 + * @param id Session的id + */ + public SaSessionForJacksonCustomized(String id) { + super(id); + } + +} diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java new file mode 100644 index 00000000..0eb8eb3e --- /dev/null +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java @@ -0,0 +1,291 @@ +/* + * Copyright 2020-2099 sa-token.cc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.dev33.satoken.solon.dao; + +import cn.dev33.satoken.dao.SaTokenDao; +import cn.dev33.satoken.strategy.SaStrategy; +import cn.dev33.satoken.util.SaFoxUtil; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; +import org.redisson.api.RBatch; +import org.redisson.api.RBucket; +import org.redisson.api.RBucketAsync; +import org.redisson.api.RedissonClient; +import org.redisson.client.codec.Codec; +import org.redisson.codec.JsonJacksonCodec; + +import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * Sa-Token 持久层实现 [ Redisson客户端、Redis存储、Jackson序列化 ] + * + * @author 疯狂的狮子Li + * @author noear + * @since 1.34.0 + */ +public class SaTokenDaoOfRedissonJackson implements SaTokenDao { + + public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; + public static final String DATE_PATTERN = "yyyy-MM-dd"; + public static final String TIME_PATTERN = "HH:mm:ss"; + public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN); + public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_PATTERN); + public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_PATTERN); + + /** + * ObjectMapper 对象 (以 public 作用域暴露出此对象，方便开发者二次更改配置) + * + *

例如： + * 

+	 *      SaTokenDaoRedisJackson redisJackson = (SaTokenDaoRedisJackson) SaManager.getSaTokenDao();
+	 *      redisJackson.objectMapper.xxx = xxx;
+	 *
+ *

+ */ + public final ObjectMapper objectMapper; + + /** + * 序列化方式 + */ + public final Codec codec; + + /** + * redisson 客户端 + */ + public final RedissonClient redissonClient; + + public SaTokenDaoOfRedissonJackson(RedissonClient redissonClient) { + this.objectMapper = new ObjectMapper(); + + this.objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); + + // 配置[忽略未知字段] + this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + + // 配置[时间类型转换] + JavaTimeModule timeModule = new JavaTimeModule(); + // LocalDateTime序列化与反序列化 + timeModule.addSerializer(new LocalDateTimeSerializer(DATE_TIME_FORMATTER)); + timeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DATE_TIME_FORMATTER)); + // LocalDate序列化与反序列化 + timeModule.addSerializer(new LocalDateSerializer(DATE_FORMATTER)); + timeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DATE_FORMATTER)); + // LocalTime序列化与反序列化 + timeModule.addSerializer(new LocalTimeSerializer(TIME_FORMATTER)); + timeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(TIME_FORMATTER)); + this.objectMapper.registerModule(timeModule); + + // 重写 SaSession 生成策略 + SaStrategy.instance.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId); + + + // 开始初始化相关组件 + this.codec = new JsonJacksonCodec(objectMapper); + this.redissonClient = redissonClient; + } + + + /** + * 获取Value，如无返空 + */ + @Override + public String get(String key) { + RBucket rBucket = redissonClient.getBucket(key, codec); + return rBucket.get(); + } + + /** + * 写入Value，并设定存活时间 (单位: 秒) + */ + @Override + public void set(String key, String value, long timeout) { + if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { + return; + } + // 判断是否为永不过期 + if(timeout == SaTokenDao.NEVER_EXPIRE) { + RBucket bucket = redissonClient.getBucket(key, codec); + bucket.set(value); + } else { + RBatch batch = redissonClient.createBatch(); + RBucketAsync bucket = batch.getBucket(key, codec); + bucket.setAsync(value); + bucket.expireAsync(Duration.ofSeconds(timeout)); + batch.execute(); + } + } + + /** + * 修修改指定key-value键值对 (过期时间不变) + */ + @Override + public void update(String key, String value) { + long expire = getTimeout(key); + // -2 = 无此键 + if(expire == SaTokenDao.NOT_VALUE_EXPIRE) { + return; + } + this.set(key, value, expire); + } + + /** + * 删除Value + */ + @Override + public void delete(String key) { + redissonClient.getBucket(key, codec).delete(); + } + + /** + * 获取Value的剩余存活时间 (单位: 秒) + */ + @Override + public long getTimeout(String key) { + RBucket rBucket = redissonClient.getBucket(key, codec); + long timeout = rBucket.remainTimeToLive(); + return timeout < 0 ? timeout : timeout / 1000; + } + + /** + * 修改Value的剩余存活时间 (单位: 秒) + */ + @Override + public void updateTimeout(String key, long timeout) { + // 判断是否想要设置为永久 + if(timeout == SaTokenDao.NEVER_EXPIRE) { + long expire = getTimeout(key); + if(expire == SaTokenDao.NEVER_EXPIRE) { + // 如果其已经被设置为永久，则不作任何处理 + } else { + // 如果尚未被设置为永久，那么再次set一次 + this.set(key, this.get(key), timeout); + } + return; + } + RBucket rBucket = redissonClient.getBucket(key, codec); + rBucket.expire(Duration.ofSeconds(timeout)); + } + + + + /** + * 获取Object，如无返空 + */ + @Override + public Object getObject(String key) { + RBucket rBucket = redissonClient.getBucket(key, codec); + return rBucket.get(); + } + + /** + * 写入Object，并设定存活时间 (单位: 秒) + */ + @Override + public void setObject(String key, Object object, long timeout) { + if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { + return; + } + // 判断是否为永不过期 + if(timeout == SaTokenDao.NEVER_EXPIRE) { + RBucket bucket = redissonClient.getBucket(key, codec); + bucket.set(object); + } else { + RBatch batch = redissonClient.createBatch(); + RBucketAsync bucket = batch.getBucket(key, codec); + bucket.setAsync(object); + bucket.expireAsync(Duration.ofSeconds(timeout)); + batch.execute(); + } + + } + + /** + * 更新Object (过期时间不变) + */ + @Override + public void updateObject(String key, Object object) { + long expire = getObjectTimeout(key); + // -2 = 无此键 + if(expire == SaTokenDao.NOT_VALUE_EXPIRE) { + return; + } + this.setObject(key, object, expire); + } + + /** + * 删除Object + */ + @Override + public void deleteObject(String key) { + redissonClient.getBucket(key, codec).delete(); + } + + /** + * 获取Object的剩余存活时间 (单位: 秒) + */ + @Override + public long getObjectTimeout(String key) { + RBucket rBucket = redissonClient.getBucket(key, codec); + long timeout = rBucket.remainTimeToLive(); + return timeout < 0 ? timeout : timeout / 1000; + } + + /** + * 修改Object的剩余存活时间 (单位: 秒) + */ + @Override + public void updateObjectTimeout(String key, long timeout) { + // 判断是否想要设置为永久 + if(timeout == SaTokenDao.NEVER_EXPIRE) { + long expire = getObjectTimeout(key); + if(expire == SaTokenDao.NEVER_EXPIRE) { + // 如果其已经被设置为永久，则不作任何处理 + } else { + // 如果尚未被设置为永久，那么再次set一次 + this.setObject(key, this.getObject(key), timeout); + } + return; + } + RBucket rBucket = redissonClient.getBucket(key, codec); + rBucket.expire(Duration.ofSeconds(timeout)); + } + + + /** + * 搜索数据 + */ + @Override + public List searchData(String prefix, String keyword, int start, int size, boolean sortType) { + Stream stream = redissonClient.getKeys().getKeysStreamByPattern(prefix + "*" + keyword + "*"); + List list = stream.collect(Collectors.toList()); + return SaFoxUtil.searchList(list, start, size, sortType); + } +} diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java index cdeca069..42c3cc3e 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java @@ -23,14 +23,31 @@ import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Condition; import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Inject; +import org.noear.solon.core.AppContext; +import org.noear.solon.core.bean.InitializingBean; /** * @author noear * @since 2.0 */ + @Condition(onClass = SaOAuth2Manager.class) @Configuration -public class SaOAuth2AutoConfigure { +public class SaOAuth2AutoConfigure implements InitializingBean { + @Inject + private AppContext appContext; + + @Override + public void afterInjection() throws Throwable { + appContext.subBeansOfType(SaOAuth2Template.class, bean -> { + SaOAuth2Util.saOAuth2Template = bean; + }); + + appContext.subBeansOfType(SaOAuth2Config.class, bean -> { + SaOAuth2Manager.setConfig(bean); + }); + } + /** * 获取 OAuth2配置Bean */ @@ -38,24 +55,4 @@ public class SaOAuth2AutoConfigure { public SaOAuth2Config getConfig(@Inject(value = "${sa-token.oauth2}", required = false) SaOAuth2Config oAuth2Config) { return oAuth2Config; } - - /** - * 注入OAuth2配置Bean - * - * @param saOAuth2Config 配置对象 - */ - @Bean - public void setSaOAuth2Config(@Inject(required = false) SaOAuth2Config saOAuth2Config) { - SaOAuth2Manager.setConfig(saOAuth2Config); - } - - /** - * 注入代码模板Bean - * - * @param saOAuth2Template 代码模板Bean - */ - @Bean - public void setSaOAuth2Interface(@Inject(required = false) SaOAuth2Template saOAuth2Template) { - SaOAuth2Util.saOAuth2Template = saOAuth2Template; - } -} +} \ No newline at end of file diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java index 27d439ee..afdb4119 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java @@ -24,14 +24,32 @@ import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Condition; import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Inject; +import org.noear.solon.core.AppContext; +import org.noear.solon.core.bean.InitializingBean; /** * @author noear * @since 2.0 */ + @Condition(onClass = SaSsoManager.class) @Configuration -public class SaSsoAutoConfigure { +public class SaSsoAutoConfigure implements InitializingBean { + @Inject + private AppContext appContext; + + @Override + public void afterInjection() throws Throwable { + appContext.subBeansOfType(SaSsoTemplate.class, bean->{ + SaSsoUtil.ssoTemplate = bean; + SaSsoProcessor.instance.ssoTemplate = bean; + }); + + appContext.subBeansOfType(SaSsoConfig.class, bean->{ + SaSsoManager.setConfig(bean); + }); + } + /** * 获取 SSO 配置Bean * */ @@ -39,25 +57,4 @@ public class SaSsoAutoConfigure { public SaSsoConfig getConfig(@Inject(value = "${sa-token.sso}",required = false) SaSsoConfig ssoConfig) { return ssoConfig; } - - /** - * 注入 Sa-Token-SSO 配置Bean - * - * @param saSsoConfig 配置对象 - */ - @Bean - public void setSaSsoConfig(@Inject(required = false) SaSsoConfig saSsoConfig) { - SaSsoManager.setConfig(saSsoConfig); - } - - /** - * 注入 Sa-Token-SSO 单点登录模块 Bean - * - * @param ssoTemplate saSsoTemplate对象 - */ - @Bean - public void setSaSsoTemplate(@Inject(required = false) SaSsoTemplate ssoTemplate) { - SaSsoUtil.ssoTemplate = ssoTemplate; - SaSsoProcessor.instance.ssoTemplate = ssoTemplate; - } -} +} \ No newline at end of file From ac2d65042c1bfc4f7f79b260c6ae67c3eb97b6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=BD=87?= <2393584716@qq.com> Date: Thu, 7 Sep 2023 10:12:38 +0000 Subject: [PATCH 2/2] update sa-token-doc/start/new-version.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘潇 <2393584716@qq.com> --- sa-token-doc/start/new-version.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sa-token-doc/start/new-version.md b/sa-token-doc/start/new-version.md index 06d470e7..86825fb7 100644 --- a/sa-token-doc/start/new-version.md +++ b/sa-token-doc/start/new-version.md @@ -5,14 +5,14 @@ --- ### 正式版本 -v1.34.0 正式版，可上生产： +v1.35.0.RC 正式版，可上生产： ``` xml cn.dev33 sa-token-spring-boot-starter - 1.34.0 + 1.35.0.RC ```