diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
index b6526d4ea..7cfcb683d 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
@@ -7,9 +7,9 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.MallUserInfoVo;
-import com.iformall.enums.EnumMallUserStatus;
-import com.iformall.enums.EnumMsgModel;
+import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
+import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*;
import com.iformall.shiro.UserSession;
import com.iformall.shiro.UseriFormallToken;
@@ -66,6 +66,24 @@ public class HomeController extends BaseController {
@Autowired
private WxMsgValidationcodeService wxMsgValidationcodeService;
+ @Autowired
+ private MqBaseProducer mqBaseProducer;
+
+ @ApiOperation("发送邮件")
+ @GetMapping("test")
+ public ResultData test() throws Exception {
+ String msg = "
富茂审批邮件审批通过通知编号123231232323的合同已经审批通过,请登录,长融后台跟进后续工作";
+ MailMsg mailMsg = new MailMsg();
+ mailMsg.setHtml(true);
+ mailMsg.setFrom("luozukai1988@126.com");
+ mailMsg.setTo(new String[]{"luozukai@iformall.com"});
+ mailMsg.setSubject("富茂测试邮件");
+ mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode());
+ mailMsg.setMsg(msg);
+ mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
+ return new ResultData();
+ }
+
@GetMapping("/captcha.jpg")
public void captcha(HttpServletResponse response)throws ServletException, IOException {
logger.debug("[" + getIpAddr() + "] HomeController::captcha");
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
index 515aba748..b7d374d5b 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
@@ -2,8 +2,10 @@ package com.iformall.controller;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
+import com.iformall.domain.po.MailMsg;
import com.iformall.domain.po.WxCoupon;
import com.iformall.enums.*;
+import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxCouponService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.Api;
@@ -14,7 +16,10 @@ import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.web.bind.annotation.*;
+
+import javax.mail.internet.MimeMessage;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -27,7 +32,6 @@ public class WxCouponController extends BaseController {
@Autowired
private WxCouponService wxCouponService;
-
@ApiOperation("分页列表接口")
@GetMapping("listCoupon")
@ApiImplicitParams({
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 948134008..5dddd82bd 100644
--- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
+++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
@@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
+import java.util.UUID;
+
/**
* @Auther: Stormeye
* @Date: 2019-01-31
@@ -34,6 +36,7 @@ public class RabbitMqMessageProducer implements MqBaseProducer {
@Override
public void sendMessage(BaseMsg data, String topic, String tags, String keys) {
try {
+ data.setUuid(UUID.randomUUID().toString());
wxMsgRecordService.save(data);
rabbitTemplate.convertAndSend(topic, JsonUtil.obj2Json(data));
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 13db5f4f4..63e328acb 100644
--- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
+++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
@@ -59,6 +59,7 @@ public class RocketMqMessageProducer implements MqBaseProducer {
@Override
public void sendMessage(BaseMsg data, String topic, String tags, String keys) {
try {
+ data.setUuid(UUID.randomUUID().toString());
wxMsgRecordService.save(data);
byte[] messageBody = JsonUtil.obj2Json(data).getBytes(RemotingHelper.DEFAULT_CHARSET);
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 947972d19..940bf533a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java
@@ -35,7 +35,7 @@ public class SendEmailServiceImpl implements MsgSendService {
public void send(BaseMsg baseMsg) throws Exception{
MailMsg mailMsg = (MailMsg)baseMsg;
- if(mailMsg.isHtml()){
+ if(mailMsg.isHtml()){ //html邮件
MimeMessage message = sender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(message, true);
helper.setFrom(from);
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 72e3f21e1..d5860967a 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
@@ -29,7 +29,7 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService {
}
msgRecord.setMsgType(data.getMsgType());
- msgRecord.setUuid(UUID.randomUUID().toString());
+ msgRecord.setUuid(data.getUuid());
msgRecord.setMsgJson(JsonUtil.obj2Json(data));
msgRecord.setId(idWorker.nextId());
wxMsgRecordMapper.save(msgRecord);