Przeglądaj źródła

[营销分析][添加][卡营销列表]

release_toaliyun_real
luozukai 7 lat temu
rodzic
commit
6e92478d68
6 zmienionych plików z 31 dodań i 5 usunięć
  1. +20
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
  2. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java

+ 20
- 2
mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java Wyświetl plik

@@ -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 = "<!DOCTYPEhtml><html><head><metacharset=\"utf-8\"><metaname=\"viewport\"content=\"width=device-width,initial-scale=1.0\"><metahttp-equiv=\"Content-Type\"content=\"text/html; charset=utf-8\"/><metaname=\"viewport\"content=\"initial-scale=1.0, user-scalable=no\"/><metaname=\"renderer\"content=\"webkit\"><metahttp-equiv=\"X-UA-Compatible\"content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script>document.documentElement.style.fontSize=document.documentElement.clientWidth/7.5+'px';</script></head><body><divid=\"box\"><headerstyle=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><imgstyle=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\"src=\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/changrong-logo.png\"/></header><content><divstyle=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 56px;margin-left: 55px;\">审批通过通知</div><divstyle=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;margin-top: 36px;\">编号<span>123231232323</span>的合同已经审批通过,请登录,<ahref=\"http://mall.youlane.cn\">长融后台</a>跟进后续工作</div></content></div></body></html>";
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");


+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java Wyświetl plik

@@ -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({


+ 3
- 0
mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java Wyświetl plik

@@ -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));


+ 1
- 0
mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java Wyświetl plik

@@ -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);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java Wyświetl plik

@@ -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);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java Wyświetl plik

@@ -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);


Ładowanie…
Anuluj
Zapisz