!186 优化导入依赖

Merge pull request !186 from handy/dev-3.0.x

sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtils.java

@@ -10,7 +10,12 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Predicate;
 

sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/utils/HtmlUtil.java

@@ -2,7 +2,11 @@ package org.dromara.email.jakarta.comm.utils;
 
 import org.dromara.email.jakarta.comm.errors.MailException;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;

sms4j-email-jakarta/sms4j-email-jakarta-comm/src/main/java/org/dromara/email/jakarta/comm/utils/ZipUtils.java

@@ -11,7 +11,11 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.nio.channels.*;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.Pipe;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.zip.ZipEntry;

sms4j-javase-plugin/src/main/java/org/dromara/sms4j/javase/config/SEInitializer.java

@@ -18,6 +18,7 @@ import org.dromara.sms4j.api.universal.SupplierConfig;
 import org.dromara.sms4j.api.verify.PhoneVerify;
 import org.dromara.sms4j.baidu.config.BaiduFactory;
 import org.dromara.sms4j.budingyun.config.BudingV2Factory;
+import org.dromara.sms4j.chuanglan.config.ChuangLanFactory;
 import org.dromara.sms4j.cloopen.config.CloopenFactory;
 import org.dromara.sms4j.comm.constant.Constant;
 import org.dromara.sms4j.comm.exception.SmsBlendException;
@@ -36,7 +37,6 @@ import org.dromara.sms4j.emay.config.EmayFactory;
 import org.dromara.sms4j.huawei.config.HuaweiFactory;
 import org.dromara.sms4j.javase.util.YamlUtils;
 import org.dromara.sms4j.jdcloud.config.JdCloudFactory;
-import org.dromara.sms4j.chuanglan.config.ChuangLanFactory;
 import org.dromara.sms4j.jg.config.JgFactory;
 import org.dromara.sms4j.lianlu.config.LianLuFactory;
 import org.dromara.sms4j.luosimao.config.LuoSiMaoFactory;
@@ -145,9 +145,7 @@ public class SEInitializer {
             //如果手机号校验器存在实现，则注册手机号校验器
             ServiceLoader<PhoneVerify> loader = ServiceLoader.load(PhoneVerify.class);
             if (loader.iterator().hasNext()) {
-                loader.forEach(f -> {
+                loader.forEach(f -> SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f)));
-                    SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f));
-                });
             } else {
                 SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(null));
             }
@@ -218,9 +216,7 @@ public class SEInitializer {
         //如果手机号校验器存在实现，则注册手机号校验器
         ServiceLoader<PhoneVerify> loader = ServiceLoader.load(PhoneVerify.class);
         if (loader.iterator().hasNext()) {
-            loader.forEach(f -> {
+            loader.forEach(f -> SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f)));
-                SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f));
-            });
         } else {
             SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(null));
         }

sms4j-provider/src/main/java/org/dromara/sms4j/baidu/config/BaiduFactory.java

@@ -2,8 +2,8 @@ package org.dromara.sms4j.baidu.config;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.dromara.sms4j.comm.constant.SupplierConstant;
 import org.dromara.sms4j.baidu.service.BaiduSmsImpl;
+import org.dromara.sms4j.comm.constant.SupplierConstant;
 import org.dromara.sms4j.provider.factory.AbstractProviderFactory;
 
 /**

sms4j-provider/src/main/java/org/dromara/sms4j/baidu/service/BaiduSmsImpl.java

@@ -6,12 +6,12 @@ import cn.hutool.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.api.utils.SmsRespUtils;
+import org.dromara.sms4j.baidu.config.BaiduConfig;
+import org.dromara.sms4j.baidu.utils.BaiduUtils;
 import org.dromara.sms4j.comm.constant.SupplierConstant;
 import org.dromara.sms4j.comm.delayedTime.DelayedTime;
 import org.dromara.sms4j.comm.exception.SmsBlendException;
 import org.dromara.sms4j.comm.utils.SmsUtils;
-import org.dromara.sms4j.baidu.config.BaiduConfig;
-import org.dromara.sms4j.baidu.utils.BaiduUtils;
 import org.dromara.sms4j.provider.service.AbstractSmsBlend;
 
 import java.util.LinkedHashMap;

sms4j-provider/src/main/java/org/dromara/sms4j/baidu/utils/BaiduUtils.java

@@ -12,7 +12,10 @@ import org.dromara.sms4j.comm.constant.Constant;
 import org.dromara.sms4j.comm.utils.SmsDateUtils;
 
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @Slf4j
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

sms4j-provider/src/main/java/org/dromara/sms4j/danmi/service/DanMiSmsImpl.java

@@ -2,7 +2,6 @@ package org.dromara.sms4j.danmi.service;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.api.utils.SmsRespUtils;
@@ -17,7 +16,6 @@ import org.dromara.sms4j.provider.service.AbstractSmsBlend;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.Executor;
 
 /**

sms4j-provider/src/main/java/org/dromara/sms4j/jg/util/JgUtils.java

@@ -9,7 +9,12 @@ import org.dromara.sms4j.comm.utils.SmsUtils;
 import org.dromara.sms4j.jg.config.JgConfig;
 
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

sms4j-provider/src/main/java/org/dromara/sms4j/luosimao/service/LuoSiMaoSmsImpl.java

@@ -13,7 +13,11 @@ import org.dromara.sms4j.luosimao.config.LuoSiMaoConfig;
 import org.dromara.sms4j.luosimao.utils.LuoSiMaoUtils;
 import org.dromara.sms4j.provider.service.AbstractSmsBlend;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.Executor;
 
 /**

sms4j-provider/src/main/java/org/dromara/sms4j/submail/service/SubMailSmsImpl.java

@@ -17,7 +17,10 @@ import org.dromara.sms4j.provider.service.AbstractSmsBlend;
 import org.dromara.sms4j.submail.config.SubMailConfig;
 import org.dromara.sms4j.submail.utils.SubMailUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.concurrent.Executor;
 
 /**

sms4j-solon-plugin-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java

@@ -22,7 +22,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.noear.solon.test.SolonJUnit5Extension;
 import org.noear.solon.test.SolonTest;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @ExtendWith(SolonJUnit5Extension.class)

sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsBlendsInitializer.java

@@ -10,6 +10,7 @@ import org.dromara.sms4j.api.universal.SupplierConfig;
 import org.dromara.sms4j.api.verify.PhoneVerify;
 import org.dromara.sms4j.baidu.config.BaiduFactory;
 import org.dromara.sms4j.budingyun.config.BudingV2Factory;
+import org.dromara.sms4j.chuanglan.config.ChuangLanFactory;
 import org.dromara.sms4j.cloopen.config.CloopenFactory;
 import org.dromara.sms4j.comm.constant.Constant;
 import org.dromara.sms4j.comm.utils.SmsUtils;
@@ -26,7 +27,6 @@ import org.dromara.sms4j.dingzhong.config.DingZhongFactory;
 import org.dromara.sms4j.emay.config.EmayFactory;
 import org.dromara.sms4j.huawei.config.HuaweiFactory;
 import org.dromara.sms4j.jdcloud.config.JdCloudFactory;
-import org.dromara.sms4j.chuanglan.config.ChuangLanFactory;
 import org.dromara.sms4j.jg.config.JgFactory;
 import org.dromara.sms4j.lianlu.config.LianLuFactory;
 import org.dromara.sms4j.luosimao.config.LuoSiMaoFactory;
@@ -85,9 +85,7 @@ public class SmsBlendsInitializer {
         //如果手机号校验器存在实现，则注册手机号校验器
         ServiceLoader<PhoneVerify> loader = ServiceLoader.load(PhoneVerify.class);
         if (loader.iterator().hasNext()) {
-            loader.forEach(f -> {
+            loader.forEach(f -> SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f)));
-                SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f));
-            });
         } else {
             SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(null));
         }

sms4j-spring-boot-example/src/test/java/org/dromara/sms4j/example/Sms4jTest.java

@@ -21,7 +21,12 @@ import org.dromara.sms4j.luosimao.service.LuoSiMaoSmsImpl;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @SpringBootTest

sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsBlendsInitializer.java

@@ -79,9 +79,7 @@ public class SmsBlendsInitializer {
         //如果手机号校验器存在实现，则注册手机号校验器（暂不可用）
         ServiceLoader<PhoneVerify> loader = ServiceLoader.load(PhoneVerify.class);
         if (loader.iterator().hasNext()) {
-            loader.forEach(f -> {
+            loader.forEach(f -> SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f)));
-                SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(f));
-            });
         } else {
             SmsProxyFactory.addPreProcessor(new CoreMethodParamValidateProcessor(null));
         }