From 75ebfd64ead1bf8031e8b3ec8bb65b1dfb02cd48 Mon Sep 17 00:00:00 2001 From: wind Date: Fri, 30 Jun 2023 11:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/sms4j/comm/constant/Constant.java | 2 +- .../org/dromara/sms4j/starter/config/SmsAutowiredConfig.java | 4 ++++ .../java/org/dromara/sms4j/starter/config/SmsMainConfig.java | 2 +- .../java/org/dromara/sms4j/starter/utils/SmsRedisUtils.java | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java index ca558701..0d6f6055 100644 --- a/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java +++ b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java @@ -9,7 +9,7 @@ package org.dromara.sms4j.comm.constant; **/ public abstract class Constant { /** 项目版本号*/ - public static final String VERSION = "V 2.1.0"; + public static final String VERSION = "V 2.2.1"; /** * 用于格式化鉴权头域,给"Authorization"参数赋值 diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java index b8208b83..556e8ebc 100644 --- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java +++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java @@ -15,11 +15,14 @@ import org.dromara.sms4j.starter.utils.ConfigUtil; import org.dromara.sms4j.starter.utils.SmsRedisUtils; import org.dromara.sms4j.starter.utils.SmsSpringUtil; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.core.env.Environment; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import javax.annotation.PostConstruct; import javax.sql.DataSource; import java.sql.SQLException; import java.util.Objects; @@ -81,6 +84,7 @@ public class SmsAutowiredConfig { return new SupplierSqlConfig(); } + @PostConstruct void init(){ /* 如果配置中启用了redis,则注入redis工具*/ if (BeanFactory.getSmsConfig().getRedisCache()){ diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java index 3ea81889..6ca51354 100644 --- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java +++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java @@ -16,7 +16,7 @@ public class SmsMainConfig { } /** 主要配置注入 确保springUtil注入后再注入*/ - @Bean(initMethod = "init") + @Bean public SmsAutowiredConfig smsAutowiredConfig(SmsSpringUtil smsSpringUtil){ return new SmsAutowiredConfig(smsSpringUtil); } diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SmsRedisUtils.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SmsRedisUtils.java index 8a1ed4e6..97366509 100644 --- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SmsRedisUtils.java +++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SmsRedisUtils.java @@ -3,6 +3,8 @@ package org.dromara.sms4j.starter.utils; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.universal.SmsRedisUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;