cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复优惠卷问题 修复售后订单问题

Browse Source
This commit is contained in:
徐唯轩
2023-11-15 09:38:42 +08:00
parent 406fa693b9
commit 1597f5aaa0
20 changed files with 147 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-framework/yshop-spring-boot-starter-biz-sms/src/main/java/co/yixiang/yshop/framework/sms/core/client/impl/SmsClientFactoryImpl.java
View File

@ -3,15 +3,11 @@ package co.yixiang.yshop.framework.sms.core.client.impl;
import co.yixiang.yshop.framework.sms.core.client.SmsClient;
import co.yixiang.yshop.framework.sms.core.client.SmsClientFactory;
import co.yixiang.yshop.framework.sms.core.client.impl.aliyun.AliyunSmsClient;
import co.yixiang.yshop.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient;
import co.yixiang.yshop.framework.sms.core.client.impl.tencent.TencentSmsClient;
import co.yixiang.yshop.framework.sms.core.enums.SmsChannelEnum;
import co.yixiang.yshop.framework.sms.core.property.SmsChannelProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.validation.annotation.Validated;
@ -41,6 +37,9 @@ public class SmsClientFactoryImpl implements SmsClientFactory {
@Value("${yshop.sms-code.api-secret}")
private String apiSecret = "iVP7EsjX309epI7MqsScziGhcrEHiT";
@Value("${yshop.sms-code.signature}")
private String signature = "中科鑫智";
/**
* 短信客户端 Map
* key：渠道编码，使用 {@link SmsChannelProperties#getCode()} ()}
@ -55,7 +54,7 @@ public class SmsClientFactoryImpl implements SmsClientFactory {
Arrays.stream(SmsChannelEnum.values()).forEach(channel -> {
// 创建一个空的 SmsChannelProperties 对象
SmsChannelProperties properties = new SmsChannelProperties().setCode(channel.getCode())
.setApiKey(apiKey).setApiSecret(apiSecret);
.setApiKey(apiKey).setApiSecret(apiSecret).setSignature(signature);
// 创建 Sms 客户端
AbstractSmsClient smsClient = createSmsClient(properties);
channelCodeClients.put(channel.getCode(), smsClient);

2
yshop-framework/yshop-spring-boot-starter-biz-sms/src/main/java/co/yixiang/yshop/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java
View File

@ -27,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import java.time.LocalDateTime;
import java.util.List;
@ -60,6 +61,7 @@ public class AliyunSmsClient extends AbstractSmsClient {
super(properties, new AliyunSmsCodeMapping());
Assert.notEmpty(properties.getApiKey(), "apiKey 不能为空");
Assert.notEmpty(properties.getApiSecret(), "apiSecret 不能为空");
Assert.notEmpty(properties.getSignature(), "短信签名 不能为空");
}
@Override