添加UniSms合一短信的基础支持,添加发送群体延迟短信

This commit is contained in:
wind 2023-03-26 17:49:58 +08:00
parent f687ba5870
commit 084b1eda93
8 changed files with 421 additions and 88 deletions

181
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId>
<version>1.0.0</version>
<name>sms_aggregation</name>
<name>sms-aggregation</name>
<packaging>pom</packaging>
<description>sms_aggregation</description>
<url>https://gitee.com/the-wind-is-like-a-song/sms_aggregation</url>
@ -52,6 +52,7 @@
<aliyun.version>2.0.23</aliyun.version>
<json.version>2.0.15</json.version>
<okhttp.version>3.14.9</okhttp.version>
<unisms.version>0.0.4</unisms.version>
</properties>
<dependencyManagement>
@ -101,12 +102,14 @@
<version>${modules.version}</version>
</dependency>
<!--通用模块-->
<dependency>
<groupId>kim.wind</groupId>
<artifactId>sms-aggregation-comm</artifactId>
<version>${modules.version}</version>
</dependency>
<!--api模块-->
<dependency>
<groupId>kim.wind</groupId>
<artifactId>sms-aggregation-api</artifactId>
@ -155,6 +158,13 @@
<scope>provided</scope>
</dependency>
<!--合一短信依赖-->
<dependency>
<groupId>com.apistd.uni</groupId>
<artifactId>uni-sdk</artifactId>
<version>${unisms.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -165,6 +175,7 @@
<optional>true</optional>
</dependency>
<!--配置文件提示-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
@ -186,90 +197,90 @@
<build>
<plugins>
<!-- Source -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Javadoc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<show>private</show>
<nohelp>true</nohelp>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<additionalparam>-Xdoclint:none</additionalparam>
<!-- TODO 临时解决不规范的javadoc生成报错,后面要规范化后把这行去掉 -->
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- GPG -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<!--Compiler -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<fork>true</fork>
<verbose>true</verbose>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<!--Release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugins>
<!-- Source -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Javadoc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<show>private</show>
<nohelp>true</nohelp>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<additionalparam>-Xdoclint:none</additionalparam>
<!-- TODO 临时解决不规范的javadoc生成报错,后面要规范化后把这行去掉 -->
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- GPG -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<!--Compiler -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<fork>true</fork>
<verbose>true</verbose>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<!--Release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</plugins>
</build>
</project>

View File

@ -26,6 +26,13 @@ import java.util.List;
import java.util.TimerTask;
import java.util.concurrent.Executor;
/**
* <p>类名: AlibabaSmsImpl
* <p>说明 阿里云短信实现
*
* @author :Wind
* 2023/3/26 17:16
**/
@EnableConfigurationProperties({AlibabaSmsConfig.class})
@Slf4j
public class AlibabaSmsImpl implements SmsBlend {
@ -132,6 +139,13 @@ public class AlibabaSmsImpl implements SmsBlend {
});
}
@Override
public void sendMessageAsync(String phone, String message) {
pool.execute(() -> {
sendMessage(phone, message);
});
}
@Override
@Restricted
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack) {
@ -141,6 +155,13 @@ public class AlibabaSmsImpl implements SmsBlend {
});
}
@Override
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages) {
pool.execute(()->{
sendMessage(phone,templateId,messages);
});
}
@Override
@Restricted
public void delayedMessage(String phone, String message, Long delayedTime) {
@ -162,4 +183,24 @@ public class AlibabaSmsImpl implements SmsBlend {
}
},delayedTime);
}
@Override
public void delayMassTexting(List<String> phones, String message, Long delayedTime) {
this.delayed.schedule(new TimerTask() {
@Override
public void run() {
massTexting(phones,message);
}
},delayedTime);
}
@Override
public void delayMassTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) {
this.delayed.schedule(new TimerTask() {
@Override
public void run() {
massTexting(phones,templateId,messages);
}
},delayedTime);
}
}

View File

@ -58,6 +58,15 @@ public interface SmsBlend {
void sendMessageAsync(String phone, String message, CallBack callBack);
/**
* <p>说明异步发送短信不关注发送结果
* sendMessageAsync
* @param phone 要发送的号码
* @param message 发送内容
* @author :Wind
*/
void sendMessageAsync(String phone, String message);
/**
* <p>说明异步短信发送使用自定义模板发送短信
* sendMessage
@ -70,7 +79,16 @@ public interface SmsBlend {
void sendMessageAsync(String phone, String templateId, LinkedHashMap<String,String> messages, CallBack callBack);
/**
* <p>说明
* <p>说明异步短信发送使用自定义模板发送短信不关注发送结果
* sendMessageAsync
* @param templateId 模板id
* @param messages key为模板变量名称 value为模板变量值
* @author :Wind
*/
void sendMessageAsync(String phone, String templateId, LinkedHashMap<String,String> messages);
/**
* <p>说明使用固定模板发送延时短信
* delayedMessage
* @param phone 接收短信的手机号
* @param message 要发送的短信
@ -89,4 +107,23 @@ public interface SmsBlend {
* @author :Wind
*/
void delayedMessage(String phone ,String templateId, LinkedHashMap<String,String> messages,Long delayedTime);
/**
* <p>说明群发延迟短信
* delayMassTexting
* @param phones 要群体发送的手机号码
* @author :Wind
*/
void delayMassTexting(List<String> phones, String message,Long delayedTime);
/**
* <p>说明使用自定义模板发送群体延迟短信
* delayMassTexting
* @param phones 要群体发送的手机号码
* @param templateId 模板id
* @param messages key为模板变量名称 value为模板变量值
* @param delayedTime 延迟的时间
* @author :Wind
*/
void delayMassTexting(List<String> phones,String templateId, LinkedHashMap<String, String> messages,Long delayedTime);
}

View File

@ -6,6 +6,13 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* <p>类名: Restricted
* <p>说明 发送短信限制
*
* @author :Wind
* 2023/3/26 17:12
**/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface Restricted {

View File

@ -1,5 +1,6 @@
package kim.wind.sms.starter.config;
import com.example.sms.unisms.service.UniSmsImpl;
import kim.wind.sms.aliyun.service.AlibabaSmsImpl;
import kim.wind.sms.api.SmsBlend;
import kim.wind.sms.comm.delayedTime.DelayedTime;
@ -69,6 +70,10 @@ public class SmsMainConfig {
switch (supplier){
case "alibaba":
smsBlend = new AlibabaSmsImpl();
break;
case "uniSms":
smsBlend = new UniSmsImpl();
break;
}
return smsBlend;
}
@ -79,8 +84,8 @@ public class SmsMainConfig {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(corePoolSize);
executor.setMaxPoolSize(maxPoolSize);
executor.setQueueCapacity(100);
executor.setKeepAliveSeconds(60);
executor.setQueueCapacity(queueCapacity);
executor.setKeepAliveSeconds(keepAliveSeconds);
executor.setThreadNamePrefix(threadNamePrefix);
executor.setWaitForTasksToCompleteOnShutdown(true);
// 线程池对拒绝任务的处理策略,当线程池没有处理能力的时候该策略会直接在 execute 方法的调用线程中运行被拒绝的任务如果执行程序已关闭则会丢弃该任务
@ -103,6 +108,7 @@ public class SmsMainConfig {
return new RedisUtils(redisTemplate);
}
/** 注入一个定时器*/
@Bean
public DelayedTime delayedTime(){
return new DelayedTime();

View File

@ -18,6 +18,20 @@
<dependencies>
<dependency>
<groupId>com.apistd.uni</groupId>
<artifactId>uni-sdk</artifactId>
</dependency>
<dependency>
<groupId>kim.wind</groupId>
<artifactId>sms-aggregation-comm</artifactId>
</dependency>
<dependency>
<groupId>kim.wind</groupId>
<artifactId>sms-aggregation-api</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,38 @@
package com.example.sms.unisms.config;
import com.apistd.uni.Uni;
import lombok.Data;
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.Configuration;
@Configuration
@ConfigurationProperties(prefix = "sms.uni-sms") //指定配置文件注入属性前缀
@Data
@ConditionalOnProperty(prefix = "sms", name = "supplier", havingValue = "uni-sms")
public class UniSmsConfig {
/** 访问键标识*/
private String accessKeyId;
/** 访问键秘钥 简易模式不需要配置*/
private String accessKeySecret;
/** 是否为简易模式*/
private String isSimple = "true";
/** 短信签名*/
private String signature;
/** 模板Id*/
private String templateId;
/** 模板变量名称*/
private String templateName;
/** 自动注入短信配置*/
@Bean
public void buildSms(){
if ("true".equals(isSimple)){
Uni.init(accessKeyId);
}else {
Uni.init(accessKeyId,accessKeySecret);
}
}
}

View File

@ -0,0 +1,179 @@
package com.example.sms.unisms.service;
import com.apistd.uni.UniResponse;
import com.apistd.uni.sms.UniMessage;
import com.apistd.uni.sms.UniSMS;
import com.example.sms.unisms.config.UniSmsConfig;
import kim.wind.sms.api.SmsBlend;
import kim.wind.sms.api.callback.CallBack;
import kim.wind.sms.comm.annotation.Restricted;
import kim.wind.sms.comm.delayedTime.DelayedTime;
import kim.wind.sms.comm.entity.SmsResponse;
import kim.wind.sms.comm.exception.SmsBlendException;
import kim.wind.sms.comm.utils.HTTPUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.TimerTask;
import java.util.concurrent.Executor;
/**
* <p>类名: UniSmsImpl
* <p>说明 uniSms短信实现
*
* @author :Wind
* 2023/3/26 17:10
**/
@EnableConfigurationProperties({UniSmsConfig.class})
@Slf4j
public class UniSmsImpl implements SmsBlend {
@Autowired
private UniSmsConfig config;
@Autowired
@Qualifier("smsExecutor")
private Executor pool;
@Autowired
private DelayedTime delayed;
@Override
@Restricted
public SmsResponse sendMessage(String phone, String message) {
if ("".equals(config.getTemplateId()) && "".equals(config.getTemplateName())){
throw new SmsBlendException("配置文件模板id和模板变量不能为空");
}
LinkedHashMap<String, String>map = new LinkedHashMap<>();
map.put(config.getTemplateName(),message);
return sendMessage(phone, config.getTemplateId(),map);
}
@Override
@Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
UniMessage uniMes = UniSMS.buildMessage().setSignature(config.getSignature()).setTo(phone)
.setTemplateId(templateId)
.setTemplateData(messages);
return getSmsResponse(uniMes);
}
@Override
@Restricted
public SmsResponse massTexting(List<String> phones, String message) {
if ("".equals(config.getTemplateId()) && "".equals(config.getTemplateName())){
throw new SmsBlendException("配置文件模板id和模板变量不能为空");
}
LinkedHashMap<String, String>map = new LinkedHashMap<>();
map.put(config.getTemplateName(),message);
return massTexting(phones, config.getTemplateId(),map);
}
@Override
@Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
if (phones.size()>1000){
throw new SmsBlendException("单次发送超过最大发送上限建议每次群发短信人数低于1000");
}
String[] s = new String[phones.size()];
UniMessage uniMes = UniSMS.buildMessage().setSignature(config.getSignature()).setTo(phones.toArray(s))
.setTemplateId(templateId)
.setTemplateData(messages);
return getSmsResponse(uniMes);
}
@Override
@Restricted
public void sendMessageAsync(String phone, String message, CallBack callBack) {
pool.execute(()->{
SmsResponse smsResponse = sendMessage(phone, message);
callBack.callBack(smsResponse);
});
}
@Override
public void sendMessageAsync(String phone, String message) {
pool.execute(()->{
sendMessage(phone, message);
});
}
@Override
@Restricted
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack) {
pool.execute(()->{
SmsResponse smsResponse = sendMessage(phone,templateId,messages);
callBack.callBack(smsResponse);
});
}
@Override
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages) {
pool.execute(()->{
sendMessage(phone,templateId,messages);
});
}
@Override
@Restricted
public void delayedMessage(String phone, String message, Long delayedTime) {
this.delayed.schedule(new TimerTask() {
@Override
public void run() {
sendMessage(phone,message);
}
},delayedTime);
}
@Override
@Restricted
public void delayedMessage(String phone, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) {
this.delayed.schedule(new TimerTask() {
@Override
public void run() {
sendMessage(phone,templateId,messages);
}
},delayedTime);
}
@Override
public void delayMassTexting(List<String> phones, String message, Long delayedTime) {
this.delayed.schedule(new TimerTask() {
@Override
public void run() {
massTexting(phones,message);
}
},delayedTime);
}
@Override
public void delayMassTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) {
this.delayed.schedule(new TimerTask() {
@Override
public void run() {
massTexting(phones,templateId,messages);
}
},delayedTime);
}
private SmsResponse getSmsResponse(UniMessage uniMes) {
SmsResponse smsResponse = new SmsResponse();
try {
UniResponse send = uniMes.send();
smsResponse.setCode(send.status);
smsResponse.setErrorCode(send.code);
smsResponse.setMessage(send.message);
smsResponse.setBizId(send.requestId);
smsResponse.setData(HTTPUtils.getJSONObject(send));
}catch(Exception e){
smsResponse.setErrMessage(e.getMessage());
}
return smsResponse;
}
}