From 0d7357e8640f99342da8e4f131246a04e505088e Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 8 Mar 2019 16:10:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF=E7=BB=84=E4=BB=B6][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=9A=E7=9F=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-dev.yml | 2 +- .../src/main/java/com/iformall/mq/MqBaseConsumer.java | 6 +----- .../src/main/java/com/iformall/domain/po/BaseMsg.java | 2 +- .../src/main/java/com/iformall/domain/po/WxMsgRecord.java | 8 -------- .../main/java/com/iformall/enums/EnumMsgRecordStatus.java | 1 + .../com/iformall/mq/impl/RabbitMqMessageProducer.java | 1 - .../com/iformall/mq/impl/RocketMqMessageProducer.java | 5 ++--- .../iformall/service/impl/SendCallBackSmsServiceImpl.java | 7 +------ .../com/iformall/service/impl/SendEmailServiceImpl.java | 3 --- .../com/iformall/service/impl/SendSmsServiceImpl.java | 3 +-- .../com/iformall/service/impl/WxMsgRecordServiceImpl.java | 4 +--- .../src/main/resources/mapper/WxMsgRecordMapper.xml | 4 +--- 12 files changed, 10 insertions(+), 36 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 46d261d0d..6fafe799f 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -1,6 +1,6 @@ spring: profiles: - include: rocketMQ + include: rabbitMQ # JDBC datasource: url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index 2c2cb48c2..dc32f4ba7 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -9,7 +9,6 @@ import com.iformall.service.impl.SendEmailServiceImpl; import com.iformall.service.impl.SendSmartAppMsgServiceImpl; import com.iformall.service.impl.SendSmsServiceImpl; import com.iformall.utils.JsonUtil; -import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +17,6 @@ import org.springframework.stereotype.Service; /** * 消息消费入口 */ -@Slf4j @Service public class MqBaseConsumer { private final Logger log = LoggerFactory.getLogger(this.getClass()); @@ -35,10 +33,9 @@ public class MqBaseConsumer { public void doMessage(String message) { log.info("received message: {}", message); - BaseMsg baseMsg = null; + try { - log.info("received message: {}", message); baseMsg = (BaseMsg)JsonUtil.readValue(message,BaseMsg.class); if(EnumMsgRecordType.SMS.getCode().equals(baseMsg.getMsgType())){ @@ -54,7 +51,6 @@ public class MqBaseConsumer { baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode()); wxMsgRecordMapper.update(baseMsg); }catch (Exception e){ - e.printStackTrace(); if(null != baseMsg){ baseMsg.setStatusMessage(e.getMessage()); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java index d02961511..cbc92964b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java @@ -18,7 +18,7 @@ public class BaseMsg implements Serializable { //消息状态 0默认1发送成功2消费成功3消费失败 private Integer msgStatus; - //消费结果信息 + //结果信息 private String statusMessage; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgRecord.java index 908bcd293..f1bcc5786 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgRecord.java @@ -45,7 +45,6 @@ public class WxMsgRecord extends BaseMsg { //动态替换内容 private Map dynamicContentMap; - private String dynamicContent; public String getMsgJson() { @@ -65,13 +64,6 @@ public class WxMsgRecord extends BaseMsg { this.dynamicContentMap = dynamicContentMap; } - public String getDynamicContent() { - return dynamicContent; - } - - public void setDynamicContent(String dynamicContent) { - this.dynamicContent = dynamicContent; - } public Long getId() { return id; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java index 8b3080c7c..82fbab4df 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java @@ -8,6 +8,7 @@ public enum EnumMsgRecordStatus { SEND_SUCC(1, "发送成功"), CONSUME_SUCC(2, "消费成功"), CONSUME_FAIL(3, "消费失败"), + ; public static EnumMsgRecordStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java index 2bc59ee8b..ba9bd4874 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -24,7 +24,6 @@ import java.util.UUID; * @Description: RocketMQ消息生产者 */ @Service -@Slf4j @Profile(MQConfig.Impl.RABBIT_MQ) public class RabbitMqMessageProducer implements MqBaseProducer { private final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java index f34de661d..1feb665be 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java @@ -30,7 +30,6 @@ import java.util.UUID; * @Description: RocketMQ消息生产者 */ @Service -@Slf4j @Profile(MQConfig.Impl.ROCKET_MQ) public class RocketMqMessageProducer implements MqBaseProducer { private final Logger log = LoggerFactory.getLogger(this.getClass()); @@ -70,8 +69,8 @@ public class RocketMqMessageProducer implements MqBaseProducer { @Override public void onSuccess(SendResult sendResult) { log.info("Message Producer: Send Message Success {}", sendResult); -// data.setMsgStatus(EnumMsgRecordStatus.SEND_SUCC.getCode()); -// wxMsgRecordMapper.update(data); + data.setMsgStatus(EnumMsgRecordStatus.SEND_SUCC.getCode()); + wxMsgRecordMapper.update(data); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java index 02e4176d8..68c2a38cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java @@ -13,11 +13,8 @@ import com.iformall.service.WxMsgService; import com.iformall.service.WxMsgValidationcodeService; import com.iformall.utils.DateUtils; import com.iformall.utils.WiwideUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; /** @@ -26,7 +23,6 @@ import java.util.List; */ @Service public class SendCallBackSmsServiceImpl implements MsgSendService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMsgConfigMapper wxMsgConfigMapper; @Autowired @@ -116,8 +112,7 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { if (ret.equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode().toString())) { wxMsgService.addMsgCallback(wxMsg, batchNo); } else { - logger.error("SendCallBackSmsServiceImpl 运营商返回失败,wxmsg.id:{},message:{}",id,result); - throw new MallinkException(ErrorCode.MSG_SEND_INTERFACE_ERROR); + throw new MallinkException(1001,"运营商返回失败:"+result); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java index 0358aae50..947972d19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java @@ -44,7 +44,6 @@ public class SendEmailServiceImpl implements MsgSendService { helper.setText(mailMsg.getMsg(), true); sender.send(message); - logger.info("html邮件已经发送。"); }else if(StringUtils.isNotBlank(mailMsg.getFilePath())){ MimeMessage message = sender.createMimeMessage(); String filePath = mailMsg.getFilePath(); @@ -59,7 +58,6 @@ public class SendEmailServiceImpl implements MsgSendService { helper.addAttachment(fileName, file); sender.send(message); - logger.info("带附件的邮件已经发送。"); }else if(StringUtils.isNotBlank(mailMsg.getRscI()) && StringUtils.isNotBlank(mailMsg.getRscPath())){ MimeMessage message = sender.createMimeMessage(); MimeMessageHelper helper = new MimeMessageHelper(message, true); @@ -72,7 +70,6 @@ public class SendEmailServiceImpl implements MsgSendService { helper.addInline(mailMsg.getRscI(), res); sender.send(message); - logger.info("嵌入静态资源的邮件已经发送。"); }else{ SimpleMailMessage message = new SimpleMailMessage(); message.setFrom(from); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SendSmsServiceImpl.java index 2b120b0d3..c969201f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SendSmsServiceImpl.java @@ -98,9 +98,8 @@ public class SendSmsServiceImpl implements MsgSendService { } wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); wxMsgValidationcodeService.addMsgCallback(wxMsgValidationcode,batchNo); - logger.error("短信运营商返回成功,手机号:{}",phone); }else{ - logger.error("短信运营商返回失败,手机号:{},返回信息:{}",phone,result); + throw new MallinkException(1001,"运营商返回失败:"+result); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 2072a79d6..9b7004e86 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -23,9 +23,7 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { data.setUuid(UUID.randomUUID().toString()); if(data instanceof WxMsgRecord){ WxMsgRecord msgRecord = (WxMsgRecord)data; - if(msgRecord.getDynamicContentMap() != null && msgRecord.getDynamicContentMap().size() > 0) { - msgRecord.setDynamicContent(JsonUtil.obj2Json(msgRecord.getDynamicContentMap())); - } + msgRecord.setMsgJson(JsonUtil.obj2Json(data)); wxMsgRecordMapper.insertSelective(msgRecord); }else if(data instanceof WxMsg || data instanceof MailMsg){ WxMsgRecord msgRecord = new WxMsgRecord(); diff --git a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml index 9f0e34fcb..bbd23ccea 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml @@ -22,7 +22,6 @@ - @@ -30,7 +29,7 @@ id,tenant_id,domain,msg_type,msg,send_time,model_id,sender,sender_user_id,sender_user_name,receiver,receiver_user_id, - receiver_user_name,msg_status,status_message,createtime,updatetime,uuid,signature,model_type,dynamic_content,msg_json + receiver_user_name,msg_status,status_message,createtime,updatetime,uuid,signature,model_type,msg_json @@ -70,7 +69,6 @@ ,status_message = #{statusMessage} and uuid = #{uuid} - and id = #{id}