From 7efa3319c760236a664b74795a5689e06f88a110 Mon Sep 17 00:00:00 2001 From: handy Date: Mon, 22 Apr 2024 10:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E9=87=8F=E4=BD=BF=E7=94=A8=E5=A4=A7?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/email/core/factory/MailFactory.java | 8 ++++---- .../main/java/org/dromara/sms4j/core/load/SmsLoad.java | 8 ++++---- .../org/dromara/sms4j/core/proxy/SmsProxyFactory.java | 8 ++++---- .../dromara/email/jakarta/core/factory/MailFactory.java | 8 ++++---- .../oa/core/provider/factory/ProviderFactoryHolder.java | 6 +++--- .../java/org/dromara/sms4j/provider/config/SmsBanner.java | 4 ++-- .../sms4j/provider/factory/ProviderFactoryHolder.java | 6 +++--- .../src/main/java/org/dromara/sms4j/unisms/core/Uni.java | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/factory/MailFactory.java b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/factory/MailFactory.java index f76a8b0b..ac745b33 100644 --- a/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/factory/MailFactory.java +++ b/sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/factory/MailFactory.java @@ -17,7 +17,7 @@ import java.util.Map; * 2023/6/8 22:35 **/ public class MailFactory{ - private static final Map configs = new HashMap<>(); + private static final Map CONFIGS = new HashMap<>(); /** * createMailClient @@ -27,7 +27,7 @@ public class MailFactory{ */ public static MailClient createMailClient(Object key){ try { - return MailBuild.build(configs.get(key)); + return MailBuild.build(CONFIGS.get(key)); } catch (MessagingException e) { throw new MailException(e); } @@ -43,7 +43,7 @@ public class MailFactory{ */ public static MailClient createMailClient(Object key, Blacklist blacklist){ try { - return MailBuild.build(configs.get(key),blacklist); + return MailBuild.build(CONFIGS.get(key),blacklist); } catch (MessagingException e) { throw new MailException(e); } @@ -57,7 +57,7 @@ public class MailFactory{ * @author :Wind */ public static void put(Object key, MailSmtpConfig config){ - configs.put(key,config); + CONFIGS.put(key,config); } } diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/load/SmsLoad.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/load/SmsLoad.java index a84d3a8a..9c69d6af 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/load/SmsLoad.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/load/SmsLoad.java @@ -20,7 +20,7 @@ public class SmsLoad { // 服务器列表，每个服务器有一个权重和当前权重 private final List LoadServers = new ArrayList<>(); - private static final SmsLoad smsLoad = new SmsLoad(); + private static final SmsLoad SMS_LOAD = new SmsLoad(); private SmsLoad() { } @@ -100,15 +100,15 @@ public class SmsLoad { public static void starConfig(SmsBlend smsBlend, SupplierConfig supplierConfig) { Map supplierConfigMap = BeanUtil.beanToMap(supplierConfig); Object weight = supplierConfigMap.getOrDefault("weight", 1); - smsLoad.addLoadServer(smsBlend, Integer.parseInt(weight.toString())); + SMS_LOAD.addLoadServer(smsBlend, Integer.parseInt(weight.toString())); } public static void starConfig(SmsBlend smsBlend,Integer weight) { - smsLoad.addLoadServer(smsBlend,weight); + SMS_LOAD.addLoadServer(smsBlend,weight); } public static SmsLoad getBeanLoad() { - return smsLoad; + return SMS_LOAD; } } diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java index 25be0138..6f32c58a 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/proxy/SmsProxyFactory.java @@ -27,10 +27,10 @@ import java.util.stream.Collectors; */ @Slf4j public abstract class SmsProxyFactory { - private static final LinkedList processors = new LinkedList<>(); + private static final LinkedList PROCESSORS = new LinkedList<>(); public static SmsBlend getProxySmsBlend(SmsBlend smsBlend) { - LinkedList ownerProcessors = processors.stream().filter(processor -> !shouldSkipProcess(processor,smsBlend)).collect(Collectors.toCollection(LinkedList::new)); + LinkedList ownerProcessors = PROCESSORS.stream().filter(processor -> !shouldSkipProcess(processor,smsBlend)).collect(Collectors.toCollection(LinkedList::new)); return (SmsBlend) Proxy.newProxyInstance(smsBlend.getClass().getClassLoader(), new Class[]{SmsBlend.class}, new SmsInvocationHandler(smsBlend, ownerProcessors)); } @@ -41,8 +41,8 @@ public abstract class SmsProxyFactory { //校验拦截器是否正确 processorValidate(processor); awareTransfer(processor); - processors.add(processor); - processors.sort(Comparator.comparingInt(Order::getOrder)); + PROCESSORS.add(processor); + PROCESSORS.sort(Comparator.comparingInt(Order::getOrder)); } /* diff --git a/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/factory/MailFactory.java b/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/factory/MailFactory.java index 342738d7..644298d4 100644 --- a/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/factory/MailFactory.java +++ b/sms4j-email-jakarta/sms4j-email-jakarta-core/src/main/java/org/dromara/email/jakarta/core/factory/MailFactory.java @@ -17,7 +17,7 @@ import java.util.Map; * 2023/6/8 22:35 **/ public class MailFactory{ - private static final Map configs = new HashMap<>(); + private static final Map CONFIGS = new HashMap<>(); /** * createMailClient @@ -27,7 +27,7 @@ public class MailFactory{ */ public static MailClient createMailClient(Object key){ try { - return MailBuild.build(configs.get(key)); + return MailBuild.build(CONFIGS.get(key)); } catch (MessagingException e) { throw new MailException(e); } @@ -43,7 +43,7 @@ public class MailFactory{ */ public static MailClient createMailClient(Object key, Blacklist blacklist){ try { - return MailBuild.build(configs.get(key),blacklist); + return MailBuild.build(CONFIGS.get(key),blacklist); } catch (MessagingException e) { throw new MailException(e); } @@ -57,7 +57,7 @@ public class MailFactory{ * @author :Wind */ public static void put(Object key, MailSmtpConfig config){ - configs.put(key,config); + CONFIGS.put(key,config); } } diff --git a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java index ce5b7a61..5c808ad3 100644 --- a/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java +++ b/sms4j-oa-plugin/sms4j-oa-core/src/main/java/org/dromara/oa/core/provider/factory/ProviderFactoryHolder.java @@ -16,13 +16,13 @@ import java.util.concurrent.ConcurrentHashMap; public class ProviderFactoryHolder { - private static final Map> factories = new ConcurrentHashMap<>(); + private static final Map> FACTORIES = new ConcurrentHashMap<>(); public static void registerFactory(OaBaseProviderFactory factory) { if (factory == null) { throw new OaException("注册供应商工厂失败，工厂实例不能为空"); } - factories.put(factory.getSupplier(), factory); + FACTORIES.put(factory.getSupplier(), factory); } public static void registerFactory(List> factoryList) { @@ -38,6 +38,6 @@ public class ProviderFactoryHolder { } public static OaBaseProviderFactory requireForSupplier(String supplier) { - return factories.getOrDefault(supplier, null); + return FACTORIES.getOrDefault(supplier, null); } } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsBanner.java b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsBanner.java index 679a4a48..b6137d39 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsBanner.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsBanner.java @@ -1,7 +1,7 @@ package org.dromara.sms4j.provider.config; public class SmsBanner { - private static final String banner = + private static final String BANNER = " ________ _____ ______ ________ ___ ___ ___ \n" + "|\\ ____\\|\\ _ \\ _ \\|\\ ____\\|\\ \\ |\\ \\ |\\ \\ \n" + "\\ \\ \\___|\\ \\ \\\\\\__\\ \\ \\ \\ \\___|\\ \\ \\\\_\\ \\ \\ \\ \\ \n" + @@ -12,6 +12,6 @@ public class SmsBanner { " \\|_________| \\|_________| \n"; /** 初始化配置文件时打印banner*/ public static void PrintBanner(String version) { - System.out.println(banner+version); + System.out.println(BANNER +version); } } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/factory/ProviderFactoryHolder.java b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/factory/ProviderFactoryHolder.java index ded0af6c..cbc8fffe 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/factory/ProviderFactoryHolder.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/factory/ProviderFactoryHolder.java @@ -17,13 +17,13 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ProviderFactoryHolder { - private static final Map> factories = new ConcurrentHashMap<>(); + private static final Map> FACTORIES = new ConcurrentHashMap<>(); public static void registerFactory(BaseProviderFactory factory) { if(factory == null) { throw new SmsBlendException("注册供应商工厂失败，工厂实例不能为空"); } - factories.put(factory.getSupplier(), factory); + FACTORIES.put(factory.getSupplier(), factory); } public static void registerFactory(List> factoryList) { @@ -39,7 +39,7 @@ public class ProviderFactoryHolder { } public static BaseProviderFactory requireForSupplier(String supplier) { - return factories.getOrDefault(supplier, null); + return FACTORIES.getOrDefault(supplier, null); } } diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java index 235c8125..56026f9b 100644 --- a/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java +++ b/sms4j-provider/src/main/java/org/dromara/sms4j/unisms/core/Uni.java @@ -8,7 +8,7 @@ public class Uni { /** 模仿SDK版本*/ public static final String VERSION = "0.0.4"; - public static final String signingAlgorithm = "hmac-sha256"; + public static final String SIGNING_ALGORITHM = "hmac-sha256"; public static String endpoint = System.getenv().getOrDefault("UNI_ENDPOINT", "https://uni.apistd.com"); public static String accessKeyId = System.getenv("UNI_ACCESS_KEY_ID"); @@ -86,7 +86,7 @@ public class Uni { builder.isSimple(false); } builder.endpoint(Uni.endpoint); - builder.signingAlgorithm(Uni.signingAlgorithm); + builder.signingAlgorithm(Uni.SIGNING_ALGORITHM); builder.setRetryInterval(retryInterval); builder.setMaxRetries(maxRetries); return builder.build();