修改redis注入时机

This commit is contained in:
wind 2023-06-30 11:06:30 +08:00
parent bb95f1ca9f
commit 75ebfd64ea
4 changed files with 8 additions and 2 deletions

View File

@ -9,7 +9,7 @@ package org.dromara.sms4j.comm.constant;
**/ **/
public abstract class Constant { public abstract class Constant {
/** 项目版本号*/ /** 项目版本号*/
public static final String VERSION = "V 2.1.0"; public static final String VERSION = "V 2.2.1";
/** /**
* 用于格式化鉴权头域,"Authorization"参数赋值 * 用于格式化鉴权头域,"Authorization"参数赋值

View File

@ -15,11 +15,14 @@ import org.dromara.sms4j.starter.utils.ConfigUtil;
import org.dromara.sms4j.starter.utils.SmsRedisUtils; import org.dromara.sms4j.starter.utils.SmsRedisUtils;
import org.dromara.sms4j.starter.utils.SmsSpringUtil; import org.dromara.sms4j.starter.utils.SmsSpringUtil;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import javax.annotation.PostConstruct;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Objects; import java.util.Objects;
@ -81,6 +84,7 @@ public class SmsAutowiredConfig {
return new SupplierSqlConfig(); return new SupplierSqlConfig();
} }
@PostConstruct
void init(){ void init(){
/* 如果配置中启用了redis则注入redis工具*/ /* 如果配置中启用了redis则注入redis工具*/
if (BeanFactory.getSmsConfig().getRedisCache()){ if (BeanFactory.getSmsConfig().getRedisCache()){

View File

@ -16,7 +16,7 @@ public class SmsMainConfig {
} }
/** 主要配置注入 确保springUtil注入后再注入*/ /** 主要配置注入 确保springUtil注入后再注入*/
@Bean(initMethod = "init") @Bean
public SmsAutowiredConfig smsAutowiredConfig(SmsSpringUtil smsSpringUtil){ public SmsAutowiredConfig smsAutowiredConfig(SmsSpringUtil smsSpringUtil){
return new SmsAutowiredConfig(smsSpringUtil); return new SmsAutowiredConfig(smsSpringUtil);
} }

View File

@ -3,6 +3,8 @@ package org.dromara.sms4j.starter.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.universal.SmsRedisUtil; import org.dromara.sms4j.api.universal.SmsRedisUtil;
import org.springframework.beans.factory.annotation.Autowired; 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.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;