diff --git a/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java b/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java index d5087279e..e49b10ee7 100644 --- a/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java +++ b/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java @@ -7,6 +7,7 @@ package com.iformall.sms; public enum EnumSMSChannel { ALIYUN(11, "ALIYUN"), + ALIYUN_ZDY(12, "ALIYUN_ZDY"), WIWIDE(0,"WIWIDE"); public static EnumSMSChannel getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/sms/SMSFactory.java b/mallinkService/src/main/java/com/iformall/sms/SMSFactory.java index 486a1e73e..65784a11c 100644 --- a/mallinkService/src/main/java/com/iformall/sms/SMSFactory.java +++ b/mallinkService/src/main/java/com/iformall/sms/SMSFactory.java @@ -1,6 +1,7 @@ package com.iformall.sms; import com.iformall.sms.aliyun.AliyunSMS; +import com.iformall.sms.aliyun.bean.AliyunSMSConfig; import com.iformall.sms.wiwide.WiwideUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -11,7 +12,10 @@ import javax.annotation.PostConstruct; public class SMSFactory { @Autowired - private AliyunSMS aliyunSMS; + private AliyunSMSConfig smsConfig; + + @Autowired + private AliyunSMS aliyunSMS ; @Autowired private WiwideUtil wiwide; @@ -26,6 +30,9 @@ public class SMSFactory { private static SMSExcutor getSendExcutor(Integer channel) { if(EnumSMSChannel.ALIYUN.getCode().equals(channel)) { + smsFactory.aliyunSMS.setSmsConfig(smsFactory.smsConfig); + return smsFactory.aliyunSMS; + }else if(EnumSMSChannel.ALIYUN_ZDY.getCode().equals(channel)){ return smsFactory.aliyunSMS; }else{ return smsFactory.wiwide; diff --git a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java index 322caaaa8..34e115312 100644 --- a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java +++ b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java @@ -21,9 +21,12 @@ import java.text.SimpleDateFormat; @Slf4j public class AliyunSMS implements SMSExcutor { - @Autowired private AliyunSMSConfig smsConfig; + public void setSmsConfig(AliyunSMSConfig smsConfig){ + this.smsConfig = smsConfig; + } + @Override public String sendMsg(String secret, String bid, String publickey, String phone, String signature, String msg, String notifyUrl, String verifysms, Integer modelId, String templateParam, String templateCode, String outId) { SMSResult SMSResult = new SMSResult();