From 9f4066c6422606ea98879dbd7e997a164fb4d4ca Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Thu, 3 Dec 2020 15:22:51 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20sms=20=E5=92=8C=20kafka=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=89=8D=E7=BC=80=E7=AE=80=E5=8C=96=E6=8E=89=20starte?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hccake/starter/kafka/KafkaProperties.java | 9 +++++---- .../com/hccake/starter/sms/SmsAutoConfiguration.java | 4 ++-- .../com/hccake/starter/sms/impl/TencentSenderImpl.java | 5 +++-- .../hccake/starter/sms/impl/TianYiHongSenderImpl.java | 5 +++-- .../com/hccake/starter/sms/properties/SmsProperties.java | 5 +++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ballcat-starters/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java b/ballcat-starters/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java index 1031ea2f..fd1982a3 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java +++ b/ballcat-starters/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java @@ -1,9 +1,6 @@ package com.hccake.starter.kafka; import cn.hutool.core.util.StrUtil; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; import lombok.Data; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; @@ -11,11 +8,15 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.boot.context.properties.ConfigurationProperties; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + /** * @author lingting 2020/7/28 21:15 */ @Data -@ConfigurationProperties(prefix = "ballcat.starter.kafka") +@ConfigurationProperties(prefix = "ballcat.kafka") public class KafkaProperties { /** diff --git a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java index bf818fc8..9f19c3c8 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java +++ b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java @@ -21,14 +21,14 @@ public class SmsAutoConfiguration { @Bean @ConditionalOnMissingBean(SmsSender.class) - @ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TENCENT") + @ConditionalOnProperty(name = "ballcat.sms.type", havingValue = "TENCENT") public SmsSender tencentSmsSender(ObjectMapper om) { return new TencentSenderImpl(properties, om); } @Bean @ConditionalOnMissingBean(SmsSender.class) - @ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TIAN_YI_HONG") + @ConditionalOnProperty(name = "ballcat.sms.type", havingValue = "TIAN_YI_HONG") public SmsSender tianYiHongSmsSender() { return new TianYiHongSenderImpl(properties); } diff --git a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java index 9e8e0cfb..6a405922 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java +++ b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java @@ -16,14 +16,15 @@ import com.tencentcloudapi.common.profile.HttpProfile; import com.tencentcloudapi.sms.v20190711.SmsClient; import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest; import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + import java.util.HashMap; import java.util.Map; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; /** * @author lingting 2020/4/26 10:03 */ -@ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TENCENT") +@ConditionalOnProperty(name = "ballcat.sms.type", havingValue = "TENCENT") public class TencentSenderImpl extends BaseServiceImpl implements SmsSender { private final SmsProperties properties; diff --git a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java index 28d202cf..42702ce2 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java +++ b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java @@ -12,13 +12,14 @@ import com.hccake.starter.sms.enums.TypeEnum; import com.hccake.starter.sms.properties.SmsProperties; import com.hccake.starter.sms.properties.extra.Account; import com.hccake.starter.sms.properties.extra.TianYiHong; -import java.time.LocalDateTime; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import java.time.LocalDateTime; + /** * @author lingting 2020/4/26 10:03 */ -@ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TIAN_YI_HONG") +@ConditionalOnProperty(name = "ballcat.sms.type", havingValue = "TIAN_YI_HONG") public class TianYiHongSenderImpl extends BaseServiceImpl implements SmsSender { private final SmsProperties sp; diff --git a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java index 06fc3409..12370416 100644 --- a/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java +++ b/ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java @@ -4,16 +4,17 @@ import com.hccake.starter.sms.enums.TypeEnum; import com.hccake.starter.sms.properties.extra.Account; import com.hccake.starter.sms.properties.extra.Tencent; import com.hccake.starter.sms.properties.extra.TianYiHong; -import java.util.Map; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; +import java.util.Map; + /** * @author lingting 2020/4/26 9:43 */ @Data -@ConfigurationProperties(prefix = "ballcat.starter.sms") +@ConfigurationProperties(prefix = "ballcat.sms") public class SmsProperties { /**