b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔥 移除 xinKuKa 相关代码

Browse Source
This commit is contained in:
b2baccline
2020-10-27 02:13:44 +08:00
parent 4f9ded8b0e
commit c57bc86d5b
13 changed files with 12 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java
View File

@@ -2,8 +2,6 @@ package com.hccake.starter.sms;
import com.hccake.starter.sms.impl.TencentSenderImpl;
import com.hccake.starter.sms.impl.TianYiHongSenderImpl;
import com.hccake.starter.sms.impl.XinKuKaSenderImpl;
import com.hccake.starter.sms.impl.xinkuka.service.XinKuKaSmsSendService;
import com.hccake.starter.sms.properties.SmsProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -21,25 +19,17 @@ public class SmsAutoConfiguration {
private SmsProperties properties;
@Bean
@ConditionalOnMissingBean(com.hccake.starter.sms.SmsSender.class)
@ConditionalOnProperty(name = "sms.type", havingValue = "TENCENT")
public com.hccake.starter.sms.SmsSender<com.hccake.starter.sms.SmsSenderParams, com.hccake.starter.sms.SmsSenderResult> tencentSmsSender() {
@ConditionalOnMissingBean(SmsSender.class)
@ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TENCENT")
public SmsSender<SmsSenderParams, SmsSenderResult> tencentSmsSender() {
return new TencentSenderImpl(properties);
}
@Bean
@ConditionalOnMissingBean(com.hccake.starter.sms.SmsSender.class)
@ConditionalOnProperty(name = "sms.type", havingValue = "TIAN_YI_HONG")
public com.hccake.starter.sms.SmsSender<com.hccake.starter.sms.SmsSenderParams, com.hccake.starter.sms.SmsSenderResult> tianYiHongSmsSender() {
@ConditionalOnMissingBean(SmsSender.class)
@ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TIAN_YI_HONG")
public SmsSender<SmsSenderParams, SmsSenderResult> tianYiHongSmsSender() {
return new TianYiHongSenderImpl(properties);
}
@Bean
@ConditionalOnMissingBean(com.hccake.starter.sms.SmsSender.class)
@ConditionalOnProperty(name = "sms.type", havingValue = "XIN_KU_KA")
public com.hccake.starter.sms.SmsSender<com.hccake.starter.sms.SmsSenderParams, com.hccake.starter.sms.SmsSenderResult> xinKuKaSmsSender(
XinKuKaSmsSendService sendService) {
return new XinKuKaSenderImpl(properties, sendService);
}
}

13
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderResult.java
View File

@@ -126,19 +126,6 @@ public class SmsSenderResult {
return result;
}
@SneakyThrows
public static SmsSenderResult generateXinKuKa(String resp, String req, Set<String> phoneNumbers) {
SmsSenderResult result = new SmsSenderResult();
result.res = resp;
// 没有异常就是成功!
result.success = true;
result.platform = TypeEnum.XIN_KU_KA.name();
result.target = getObjectMapper().writeValueAsString(phoneNumbers);
result.res = resp;
result.req = req;
return result;
}
@SneakyThrows
@Override
public String toString() {

4
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/enums/TypeEnum.java
View File

@@ -9,12 +9,12 @@ public enum TypeEnum {
/**
* 短信发送类型
*/
CUSTOM,
TENCENT,
TIAN_YI_HONG,
XIN_KU_KA,
;
}

2
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/BaseServiceImpl.java
View File

@@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j;
* @author lingting 2020/4/26 13:45
*/
@Slf4j
public class BaseServiceImpl {
public abstract class BaseServiceImpl {
/**
* b 异常返回处理

2
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java
View File

@@ -17,7 +17,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
/**
* @author lingting 2020/4/26 10:03
*/
@ConditionalOnProperty(name = "sms.type", havingValue = "TENCENT")
@ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TENCENT")
public class TencentSenderImpl extends BaseServiceImpl implements SmsSender<SmsSenderParams, SmsSenderResult> {
private final SmsProperties properties;

2
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
/**
* @author lingting 2020/4/26 10:03
*/
@ConditionalOnProperty(name = "sms.type", havingValue = "TIAN_YI_HONG")
@ConditionalOnProperty(name = "ballcat.starter.sms.type", havingValue = "TIAN_YI_HONG")
@RequiredArgsConstructor
public class TianYiHongSenderImpl extends BaseServiceImpl implements SmsSender<SmsSenderParams, SmsSenderResult> {

67
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/XinKuKaSenderImpl.java
View File

@@ -1,67 +0,0 @@
package com.hccake.starter.sms.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.hccake.starter.sms.SmsSender;
import com.hccake.starter.sms.SmsSenderParams;
import com.hccake.starter.sms.SmsSenderResult;
import com.hccake.starter.sms.constant.SmsSendConstants;
import com.hccake.starter.sms.enums.TypeEnum;
import com.hccake.starter.sms.exception.SmsException;
import com.hccake.starter.sms.impl.xinkuka.model.XinKuKaSend;
import com.hccake.starter.sms.impl.xinkuka.service.XinKuKaSmsSendService;
import com.hccake.starter.sms.properties.SmsProperties;
import com.hccake.starter.sms.properties.extra.XinKuKa;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
/**
* @author lingting 2020/5/7 15:25
*/
@ConditionalOnProperty(name = "sms.type", havingValue = "XIN_KU_KA")
@RequiredArgsConstructor
public class XinKuKaSenderImpl extends BaseServiceImpl implements SmsSender<SmsSenderParams, SmsSenderResult> {
private final SmsProperties properties;
private final XinKuKaSmsSendService sendService;
private XinKuKa xinKuKa = null;
@Override
public SmsSenderResult send(SmsSenderParams smsSenderParams) {
if (xinKuKa == null) {
xinKuKa = properties.getXinKuKa();
}
List<XinKuKaSend> list = new ArrayList<>();
XinKuKaSend send;
// 配置发送数据
for (String p : smsSenderParams.getPhoneNumbers()) {
send = new XinKuKaSend();
// 指定发送短信
send.setSmsType(SmsSendConstants.type.sms.getVal());
// 指定号码发送
if (xinKuKa.getMode() == XinKuKa.Mode.number) {
send.setPhoNum(StrUtil.isEmpty(smsSenderParams.getUsePhone()) ? xinKuKa.getNumber()
: smsSenderParams.getUsePhone());
}
send.setSmsNumber(p);
// 不指定端口发送
send.setPortNum(-1);
send.setSmsContent(smsSenderParams.getContent());
send.setSmsState(SmsSendConstants.state.notSend.getVal());
list.add(send);
}
if (sendService.saveBatch(list)) {
return SmsSenderResult.generateXinKuKa("数据已全部入库-当前时间：" + DateUtil.now(), smsSenderParams.toString(),
smsSenderParams.getPhoneNumbers());
}
return errRet(TypeEnum.XIN_KU_KA, smsSenderParams.getPhoneNumbers(), "发送失败!", new SmsException("短信发送失败!"));
}
}

11
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/xinkuka/mapper/SmsSendMapper.java
View File

@@ -1,11 +0,0 @@
package com.hccake.starter.sms.impl.xinkuka.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hccake.starter.sms.impl.xinkuka.model.XinKuKaSend;
/**
* @author lingting 2020/5/6 21:46
*/
public interface SmsSendMapper extends BaseMapper<XinKuKaSend> {
}

54
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/xinkuka/model/XinKuKaSend.java
View File

@@ -1,54 +0,0 @@
package com.hccake.starter.sms.impl.xinkuka.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author lingting 2020/5/6 17:51
*/
@Data
@Accessors(chain = true)
@TableName("sms_send")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "短信发送表")
public class XinKuKaSend extends Model<XinKuKaSend> {
@TableId
private Long id;
@ApiModelProperty("大于0表示指定端口号发送")
@TableField("PortNum")
private Integer portNum;
@ApiModelProperty("接收号码")
@TableField("smsNumber")
private String smsNumber;
@ApiModelProperty("彩信标题，如果发送彩信不能为空")
@TableField("smsSubject")
private String smsSubject;
@ApiModelProperty("发送内容")
@TableField("smsContent")
private String smsContent;
@ApiModelProperty("0:短信 1:彩信")
@TableField("smsType")
private Integer smsType;
@ApiModelProperty("手机号")
@TableField("PhoNum")
private String phoNum;
@ApiModelProperty("状态")
@TableField("smsState")
private Integer smsState;
}

11
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/xinkuka/service/XinKuKaSmsSendService.java
View File

@@ -1,11 +0,0 @@
package com.hccake.starter.sms.impl.xinkuka.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hccake.starter.sms.impl.xinkuka.model.XinKuKaSend;
/**
* @author lingting 2020/5/7 16:51
*/
public interface XinKuKaSmsSendService extends IService<XinKuKaSend> {
}

18
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/xinkuka/service/impl/XinKuKaSmsSendServiceImpl.java
View File

@@ -1,18 +0,0 @@
package com.hccake.starter.sms.impl.xinkuka.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hccake.starter.sms.impl.xinkuka.mapper.SmsSendMapper;
import com.hccake.starter.sms.impl.xinkuka.model.XinKuKaSend;
import com.hccake.starter.sms.impl.xinkuka.service.XinKuKaSmsSendService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
/**
* @author lingting 2020/5/7 16:52
*/
@Service
@ConditionalOnProperty(name = "sms.type", havingValue = "XIN_KU_KA")
public class XinKuKaSmsSendServiceImpl extends ServiceImpl<SmsSendMapper, XinKuKaSend>
implements XinKuKaSmsSendService {
}

9
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java
View File

@@ -4,7 +4,6 @@ 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 com.hccake.starter.sms.properties.extra.XinKuKa;
import java.util.Map;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -20,7 +19,7 @@ public class SmsProperties {
/**
* 类型
*/
private TypeEnum type = TypeEnum.XIN_KU_KA;
private TypeEnum type = TypeEnum.CUSTOM;
/**
* 请求路径
@@ -54,10 +53,4 @@ public class SmsProperties {
@NestedConfigurationProperty
private TianYiHong tianYiHong;
/**
* 新酷卡猫池配置
*/
@NestedConfigurationProperty
private XinKuKa xinKuKa;
}

80
ballcat-starters/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/XinKuKa.java
View File

@@ -1,80 +0,0 @@
package com.hccake.starter.sms.properties.extra;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
/**
* 新酷卡猫池配置
*
* @author lingting 2020/5/6 16:59
*/
@Data
public class XinKuKa {
/**
* 猫池短信发送模式
*/
private Mode mode = Mode.random;
/**
* 指定手机号
*/
private String number;
/**
* 指定端口
*/
private String port;
/**
* 数据库配置
*/
private DataBase dataBase;
@Getter
@AllArgsConstructor
public enum Mode {
/**
* 随机选择可用通道发送
*/
random,
/**
* 匹配指定手机号发送
*/
number,
/**
* 匹配指定端口发送
*/
@Deprecated
port,
;
}
@Data
public static class DataBase {
/**
* 使用哪种数据库
*/
private Kind kind = Kind.mysql;
@Getter
@AllArgsConstructor
public enum Kind {
/**
* 使用mysql 数据库
*/
mysql,
;
}
}
}