diff --git a/pom.xml b/pom.xml
index 0937f747..2ac3bf7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
sms4j-api
sms4j-provider
sms4j-core
- sms4j-autoimmit
sms4j-spring-boot-starter
sms4j-solon-plugin
sms4j-spring-boot-example
@@ -86,12 +85,6 @@
${revision}
-
- org.dromara.sms4j
- sms4j-autoimmit
- ${revision}
-
-
org.dromara.sms4j
@@ -127,13 +120,6 @@
${forest.version}
-
-
- org.springframework.boot
- spring-boot-starter-aop
- ${spring.boot.version}
-
-
org.springframework.boot
diff --git a/sms4j-autoimmit/pom.xml b/sms4j-autoimmit/pom.xml
deleted file mode 100644
index fcae4c18..00000000
--- a/sms4j-autoimmit/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- 4.0.0
-
- org.dromara.sms4j
- sms4j
- ${revision}
- ../pom.xml
-
-
- sms4j-autoimmit
-
- sms4j-autoimmit
- sms4j-autoimmit
-
-
-
-
- org.springframework.boot
- spring-boot-starter-aop
-
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
-
- org.dromara.sms4j
- sms4j-core
-
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- ${spring.boot.version}
- true
-
-
-
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/package-info.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/package-info.java
deleted file mode 100644
index 80d90056..00000000
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Spring Boot自动装配配置
- * @author :Wind
-*/
-package org.dromara.sms4j.autoimmit;
\ No newline at end of file
diff --git a/sms4j-spring-boot-starter/pom.xml b/sms4j-spring-boot-starter/pom.xml
index 3cc53857..95148891 100644
--- a/sms4j-spring-boot-starter/pom.xml
+++ b/sms4j-spring-boot-starter/pom.xml
@@ -16,20 +16,27 @@
sms4j-spring-boot-starter
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
org.dromara.sms4j
- sms4j-autoimmit
+ sms4j-core
+
+
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ ${spring.boot.version}
+ true
org.springframework.boot
spring-boot-starter
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/RestrictedProcessImpl.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/RestrictedProcessImpl.java
similarity index 94%
rename from sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/RestrictedProcessImpl.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/RestrictedProcessImpl.java
index 5710de66..2ff9a815 100644
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/RestrictedProcessImpl.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/RestrictedProcessImpl.java
@@ -1,12 +1,12 @@
-package org.dromara.sms4j.autoimmit.aop;
+package org.dromara.sms4j.starter.aop;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.smsProxy.RestrictedProcess;
-import org.dromara.sms4j.autoimmit.utils.RedisUtils;
-import org.dromara.sms4j.autoimmit.utils.SpringUtil;
import org.dromara.sms4j.comm.config.SmsConfig;
import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms4j.comm.utils.SmsUtil;
+import org.dromara.sms4j.starter.utils.RedisUtils;
+import org.dromara.sms4j.starter.utils.SpringUtil;
import java.util.Objects;
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java
similarity index 84%
rename from sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java
index 7625abff..58eaa710 100644
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsAutowiredConfig.java
@@ -1,11 +1,7 @@
-package org.dromara.sms4j.autoimmit.config;
+package org.dromara.sms4j.starter.config;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sms4j.api.smsProxy.SmsInvocationHandler;
-import org.dromara.sms4j.autoimmit.aop.RestrictedProcessImpl;
-import org.dromara.sms4j.autoimmit.utils.ConfigUtil;
-import org.dromara.sms4j.autoimmit.utils.RedisUtils;
-import org.dromara.sms4j.autoimmit.utils.SpringUtil;
import org.dromara.sms4j.comm.config.SmsBanner;
import org.dromara.sms4j.comm.config.SmsConfig;
import org.dromara.sms4j.comm.config.SmsSqlConfig;
@@ -13,6 +9,10 @@ import org.dromara.sms4j.comm.constant.Constant;
import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms4j.comm.factory.BeanFactory;
import org.dromara.sms4j.core.SupplierSqlConfig;
+import org.dromara.sms4j.starter.aop.RestrictedProcessImpl;
+import org.dromara.sms4j.starter.utils.ConfigUtil;
+import org.dromara.sms4j.starter.utils.RedisUtils;
+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;
@@ -78,11 +78,6 @@ public class SmsAutowiredConfig {
SmsInvocationHandler.setRestrictedProcess(new RestrictedProcessImpl());
log.debug("The redis cache is enabled for sms4j");
}
- /* 如果启用了短信限制,则注入AOP组件*/
-// if (BeanFactory.getSmsConfig().getRestricted()){
-// springUtil.createBean(AopAdvice.class);
-// log.debug("SMS restriction is enabled");
-// }
//打印banner
if (BeanFactory.getSmsConfig().getIsPrint()){
SmsBanner.PrintBanner(Constant.VERSION);
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 216f81af..6c0432ba 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
@@ -1,15 +1,12 @@
package org.dromara.sms4j.starter.config;
import lombok.Data;
-import org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig;
-import org.dromara.sms4j.autoimmit.utils.SpringUtil;
+import org.dromara.sms4j.starter.utils.SpringUtil;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
@Configuration
-@EnableAsync
@Data
public class SmsMainConfig {
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java
similarity index 98%
rename from sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java
index 0ae91749..ab1c56dd 100644
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SupplierConfig.java
@@ -1,4 +1,4 @@
-package org.dromara.sms4j.autoimmit.config;
+package org.dromara.sms4j.starter.config;
import org.dromara.sms4j.aliyun.config.AlibabaConfig;
import org.dromara.sms4j.cloopen.config.CloopenConfig;
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/ConfigUtil.java
similarity index 92%
rename from sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/ConfigUtil.java
index 4e58876a..55cabbf2 100644
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/ConfigUtil.java
@@ -1,4 +1,4 @@
-package org.dromara.sms4j.autoimmit.utils;
+package org.dromara.sms4j.starter.utils;
import org.springframework.core.env.Environment;
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/RedisUtils.java
similarity index 98%
rename from sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/RedisUtils.java
index aa8e1a26..e5ae4b54 100644
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/RedisUtils.java
@@ -1,4 +1,4 @@
-package org.dromara.sms4j.autoimmit.utils;
+package org.dromara.sms4j.starter.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,11 +8,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.TimeUnit;
diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SpringUtil.java
similarity index 98%
rename from sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java
rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SpringUtil.java
index fc199c2d..28fc6809 100644
--- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/utils/SpringUtil.java
@@ -1,4 +1,4 @@
-package org.dromara.sms4j.autoimmit.utils;
+package org.dromara.sms4j.starter.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
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 5a6c4d6a..d8650e19 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,4 +1,6 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.dromara.sms4j.starter.config.SmsMainConfig,\
- org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig,\
- org.dromara.sms4j.autoimmit.config.SupplierConfig
+ org.dromara.sms4j.config.SmsAutowiredConfig,\
+ org.dromara.sms4j.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 e4020a36..b3812bbd 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,3 +1,5 @@
org.dromara.sms4j.starter.config.SmsMainConfig
-org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig
-org.dromara.sms4j.autoimmit.config.SupplierConfig
\ No newline at end of file
+org.dromara.sms4j.config.SmsAutowiredConfig
+org.dromara.sms4j.config.SupplierConfig
+org.dromara.sms4j.comm.config.SmsConfig
+org.dromara.sms4j.comm.config.SmsSqlConfig
\ No newline at end of file