From 61c47eb78d003465b418d0e6b5b0727e311ca1fa Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 11:27:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0code=E5=85=A5=E5=BA=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/msg/WxMsgRecord.java | 3 +- .../impl/WxMsgValidationcodeServiceImpl.java | 52 +------------------ .../service/msg/impl/SendSmsServiceImpl.java | 3 ++ 3 files changed, 5 insertions(+), 53 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 07119578c..bc5f9c8cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -1,12 +1,11 @@ package com.iformall.domain.po.msg; -import com.iformall.domain.po.msg.BaseMsg; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index be0ba10a4..5ef1b6348 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -86,38 +86,8 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); if(wxmsgvalidationcodelist.size()>0) return new ResultData(ErrorCode.MSG_REPEAT_SEND.getCode(),ErrorCode.MSG_REPEAT_SEND.getMessage()); - //2、根据tenantid查询出商场名称作为签名 - /*WxMall wxMall = new WxMall(); - wxMall.setTenantId(wxMsgValidationcode.getTenantId()); - List wxmallist = wxMallMapper.findList(wxMall);*/ - - //3、从短信配置中查询密钥 bid 等信息 -// WxMsgConfig wxMsgConfig = new WxMsgConfig(); -// wxMsgConfig.setTenantId(wxMsgValidationcode.getTenantId()); -// List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); -// if (wxMsgConfigs.size() == 0) new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); -// wxMsgConfig = wxMsgConfigs.get(0); -// -// WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); -// wxMsgValidationcodeModel.setTenantId(wxMsgConfig.getTenantId()); -// wxMsgValidationcodeModel.setType(EnumMsgModel.VALIDATION_CODE.getCode()); -// wxMsgValidationcodeModel = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel).get(0); -// wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); -// -// String secret = wxMsgConfig.getSecret(); -// String bid = wxMsgConfig.getBid(); -// String publickey = wxMsgConfig.getPublickey(); -// //验证码 + //验证码 int code = (int) ((Math.random() * 9 + 1) * 100000); -// String phone = wxMsgValidationcode.getPhone(); -// String signature = wxMsgValidationcode.getSignature(); -// //内容 -// String msg = wxMsgValidationcodeModel.getContent().replace("{s6}", String.valueOf(code)); -// wxMsgValidationcode.setCode(String.valueOf(code)); -// wxMsgValidationcode.setMsg(msg); -// String notifyUrl = wxMsgConfig.getNotifyurl(); -// Integer modelId = wxMsgValidationcodeModel.getModelId(); - //给发起人发送驳回消息 Map msgReplaceMap = new HashedMap(); @@ -130,26 +100,6 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); return new ResultData(Result.SUCCESS,"发送成功"); - -// String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString(), modelId); -// JSONObject jsonObjectResult = JSONObject.parseObject(result); -// String ret = jsonObjectResult.get("ret").toString(); -// String batchNo = jsonObjectResult.get("data").toString(); -// if (ret.equals("1")) { -// final IdWorker idWorker = IdWorker.get(); -// wxMsgValidationcode.setId(idWorker.nextId()); -// long currentTime = System.currentTimeMillis() ; -// Date createtime=new Date(currentTime); -// Integer minutes = wxMsgValidationcodeModel.getMinutes(); -// currentTime +=minutes*60*1000; -// Date expiredate=new Date(currentTime); -// wxMsgValidationcode.setExpiretime(expiredate); -// wxMsgValidationcode.setCreatetime(createtime); -// wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); -// addMsgCallback(wxMsgValidationcode,batchNo); -// return new ResultData(Result.SUCCESS,"发送成功"); -// } -// return new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index aeedeba93..336e46f8a 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -81,6 +81,9 @@ public class SendSmsServiceImpl implements MsgSendService { msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); } wxMsgValidationcode.setMsg(msg); + if(record.getDynamicContentMap() !=null) { + wxMsgValidationcode.setCode(record.getDynamicContentMap().get("s6")); + } String notifyUrl = wxMsgConfig.getNotifyurl(); Integer modelId = wxMsgValidationcodeModel.getModelId();