Compare commits
No commits in common. "6e92c3025b9271ad646fedcda4c4f7c4946787f4" and "3f2b4143371246cddc2256a4dd13f2c117d7ca9e" have entirely different histories.
6e92c3025b
...
3f2b414337
|
|
@ -18,16 +18,4 @@ public interface ISmsServiceApi {
|
||||||
*/
|
*/
|
||||||
R<String> sendAliSms(String phone, String code, EAliSmsTemplate aliSmsTemplate);
|
R<String> sendAliSms(String phone, String code, EAliSmsTemplate aliSmsTemplate);
|
||||||
|
|
||||||
/**
|
|
||||||
* 发送会员注册短信
|
|
||||||
*
|
|
||||||
* @param phone
|
|
||||||
* @param aliSmsTemplate
|
|
||||||
* @param memberCode
|
|
||||||
* @param loginPwd
|
|
||||||
* @param payPwd
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
R<String> sendMemberRegister(String phone, EAliSmsTemplate aliSmsTemplate, String memberCode, String loginPwd, String payPwd);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@ import com.hzs.system.base.ICurrencyServiceApi;
|
||||||
import com.hzs.system.base.dto.CurrencyDTO;
|
import com.hzs.system.base.dto.CurrencyDTO;
|
||||||
import com.hzs.system.config.IAwardsServiceApi;
|
import com.hzs.system.config.IAwardsServiceApi;
|
||||||
import com.hzs.system.config.IGradeServiceApi;
|
import com.hzs.system.config.IGradeServiceApi;
|
||||||
import com.hzs.third.sms.ISmsServiceApi;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.dubbo.config.annotation.DubboReference;
|
import org.apache.dubbo.config.annotation.DubboReference;
|
||||||
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
||||||
|
|
@ -106,8 +105,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
|
||||||
IMemberServiceApi iMemberServiceApi;
|
IMemberServiceApi iMemberServiceApi;
|
||||||
@DubboReference
|
@DubboReference
|
||||||
IMemberAccountServiceApi iMemberAccountServiceApi;
|
IMemberAccountServiceApi iMemberAccountServiceApi;
|
||||||
@DubboReference
|
|
||||||
ISmsServiceApi iSmsServiceApi;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -525,10 +522,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
|
||||||
throw new RuntimeException("会员注册失败");
|
throw new RuntimeException("会员注册失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 发送会员注册成功短信
|
|
||||||
iSmsServiceApi.sendMemberRegister(newMember.getPhone(), EAliSmsTemplate.MEMBER_REGISTER,
|
|
||||||
newMember.getMemberCode(), newMember.getLoginPassword(), newMember.getPayPassword());
|
|
||||||
this.pushOrderMq(saOrderExt);
|
this.pushOrderMq(saOrderExt);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,6 @@ public enum EAliSmsTemplate {
|
||||||
MEMBER_SMS("SMS_485350565"),
|
MEMBER_SMS("SMS_485350565"),
|
||||||
// MEMBER_SMS("SMS_476795282"),
|
// MEMBER_SMS("SMS_476795282"),
|
||||||
// MEMBER_SMS("SMS_474440238"),
|
// MEMBER_SMS("SMS_474440238"),
|
||||||
/**
|
|
||||||
* 会员注册成功(尊敬的会员,您新注册的会员编号:${memberCode},登录密码:${loginPwd},支付密码:${payPwd},请妥善保管)
|
|
||||||
*/
|
|
||||||
MEMBER_REGISTER("SMS_491370028"),
|
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,19 +29,4 @@ public class SmsServiceProvider implements ISmsServiceApi {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public R<String> sendMemberRegister(String phone, EAliSmsTemplate aliSmsTemplate, String memberCode, String loginPwd, String payPwd) {
|
|
||||||
try {
|
|
||||||
String str = SmsUtil.sendMemberRegister(phone, aliSmsTemplate, memberCode, loginPwd, payPwd);
|
|
||||||
if (null == str) {
|
|
||||||
return R.ok();
|
|
||||||
}
|
|
||||||
log.error("发送会员注册短信失败: {}", str);
|
|
||||||
return R.fail(str);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("发送会员注册短信异常 phone: {}, memberCode: {}", phone, memberCode, e);
|
|
||||||
return R.fail(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -82,45 +82,4 @@ public class SmsUtil implements InitializingBean {
|
||||||
smsConfig = SpringUtils.getBean(SmsConfig.class);
|
smsConfig = SpringUtils.getBean(SmsConfig.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String sendMemberRegister(String phone, EAliSmsTemplate aliSmsTemplate, String memberCode, String loginPwd, String payPwd) {
|
|
||||||
if (StringUtils.isAnyEmpty(phone)) {
|
|
||||||
return "手机号为空";
|
|
||||||
}
|
|
||||||
log.info("注册会员成功,发送手机号:{}, memberCode:{}", phone, memberCode);
|
|
||||||
if (smsConfig.isEnable()) {
|
|
||||||
// 只有当开启发送短信才进行发送
|
|
||||||
try {
|
|
||||||
Map<String, String> templateParam = new HashMap<>();
|
|
||||||
templateParam.put("memberCode", memberCode);
|
|
||||||
templateParam.put("loginPwd", loginPwd);
|
|
||||||
templateParam.put("payPwd", payPwd);
|
|
||||||
|
|
||||||
Client client = new Client(new Config()
|
|
||||||
.setAccessKeyId(smsConfig.getAliAccessKeyId())
|
|
||||||
.setAccessKeySecret(smsConfig.getAliAccessKeySecret())
|
|
||||||
// 短信发送域
|
|
||||||
.setEndpoint(smsConfig.getAliEndpoint()));
|
|
||||||
|
|
||||||
SendSmsRequest sendSmsRequest = new SendSmsRequest()
|
|
||||||
.setPhoneNumbers(phone)
|
|
||||||
// 短信签名
|
|
||||||
.setSignName(smsConfig.getAliSign())
|
|
||||||
// 短信模板
|
|
||||||
.setTemplateCode(aliSmsTemplate.getCode())
|
|
||||||
.setTemplateParam(JSONUtil.toJsonStr(templateParam));
|
|
||||||
|
|
||||||
SendSmsResponse sendSmsResponse = client.sendSms(sendSmsRequest);
|
|
||||||
|
|
||||||
if (Constants.SUCCESS.equals(sendSmsResponse.getStatusCode())) {
|
|
||||||
if ("OK".equals(sendSmsResponse.getBody().getCode())) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
log.error("阿里云短信发送失败: {}", sendSmsResponse.getBody().getMessage());
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue