diff --git a/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsUtilTest.java b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsUtilTest.java new file mode 100644 index 00000000..d0bc45ac --- /dev/null +++ b/sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/SmsUtilTest.java @@ -0,0 +1,99 @@ +package org.dromara.sms4j.example; + +import cn.hutool.core.lang.Assert; +import lombok.extern.slf4j.Slf4j; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.comm.utils.SmsUtil; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author handy + */ +@Slf4j +@SpringBootTest +public class SmsUtilTest { + + @Test + public void getRandomString() { + String randomString = SmsUtil.getRandomString(); + log.info(randomString); + Assert.isTrue(randomString.length() == 6); + } + + @Test + public void testGetRandomString() { + String randomString = SmsUtil.getRandomString(4); + log.info(randomString); + Assert.isTrue(randomString.length() == 4); + } + + @Test + public void getRandomInt() { + String randomInt = SmsUtil.getRandomInt(4); + log.info(randomInt); + Assert.isTrue(randomInt.length() == 4); + } + + @Test + public void isEmpty() { + Assert.isTrue(SmsUtil.isEmpty("")); + } + + @Test + public void isNotEmpty() { + Assert.isTrue(SmsUtil.isNotEmpty("not")); + } + + @Test + public void jsonForObject() { + AlibabaConfig alibabaConfig = SmsUtil.jsonForObject("{'templateName':'Test'}", AlibabaConfig.class); + Assert.isTrue(alibabaConfig.getTemplateName().equals("Test")); + } + + @Test + public void copyBean() { + AlibabaConfig alibabaConfig = SmsUtil.jsonForObject("{'templateName':'Test'}", AlibabaConfig.class); + AlibabaConfig alibabaConfig1 = new AlibabaConfig(); + SmsUtil.copyBean(alibabaConfig, alibabaConfig1); + Assert.isTrue(alibabaConfig1.getTemplateName().equals("Test")); + } + + @Test + public void getNewMap() { + SmsUtil.getNewMap(); + } + + @Test + public void listToString() { + List list = new ArrayList<>(); + list.add("12312341234"); + list.add("12312341235"); + String str = SmsUtil.listToString(list); + log.info(str); + Assert.isTrue(str.equals("12312341234,12312341235")); + } + + @Test + public void arrayToString() { + List list = new ArrayList<>(); + list.add("12312341234"); + list.add("12312341235"); + String str = SmsUtil.arrayToString(list); + log.info(str); + Assert.isTrue(str.equals("+8612312341234,+8612312341235")); + } + + @Test + public void listToArray() { + List list = new ArrayList<>(); + list.add("12312341234"); + list.add("12312341235"); + String[] str = SmsUtil.listToArray(list); + Assert.isTrue(str[0].equals("+8612312341234") && str[1].equals("+8612312341235")); + } + +} 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 58eaa710..5b1860d6 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 @@ -16,6 +16,7 @@ import org.dromara.sms4j.starter.utils.SpringUtil; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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 java.util.concurrent.Executor; @@ -35,6 +36,7 @@ public class SmsAutowiredConfig { protected SmsSqlConfig smsSqlConfig(){return BeanFactory.getSmsSqlConfig();} @Bean + @Primary @ConfigurationProperties(prefix = "sms") //指定配置文件注入属性前缀 protected SmsConfig smsConfig(){ return BeanFactory.getSmsConfig(); diff --git a/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories index d8650e19..75d46fab 100644 --- a/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.dromara.sms4j.starter.config.SmsMainConfig,\ - org.dromara.sms4j.config.SmsAutowiredConfig,\ - org.dromara.sms4j.config.SupplierConfig,\ + org.dromara.sms4j.starter.config.SmsAutowiredConfig,\ + org.dromara.sms4j.starter.config.SupplierConfig,\ org.dromara.sms4j.comm.config.SmsConfig,\ org.dromara.sms4j.comm.config.SmsSqlConfig diff --git a/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b3812bbd..048b5e19 100644 --- a/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,5 +1,5 @@ org.dromara.sms4j.starter.config.SmsMainConfig -org.dromara.sms4j.config.SmsAutowiredConfig -org.dromara.sms4j.config.SupplierConfig +org.dromara.sms4j.starter.config.SmsAutowiredConfig +org.dromara.sms4j.starter.config.SupplierConfig org.dromara.sms4j.comm.config.SmsConfig org.dromara.sms4j.comm.config.SmsSqlConfig \ No newline at end of file