【修改】将jeecg字样修改为jero（修改完毕）

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java

@@ -0,0 +1,145 @@
+package com.jero.modules.message.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.message.entity.SysMessage;
+import com.jero.modules.message.service.ISysMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 消息
+ * @author: jero-boot
+ * @date: 2019-04-09
+ * @version: V1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys/message/sysMessage")
+public class SysMessageController extends JeroController<SysMessage, ISysMessageService> {
+	@Autowired
+	private ISysMessageService sysMessageService;
+
+	/**
+	 * 分页列表查询
+	 * 
+	 * @param sysMessage
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+		QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap());
+		Page<SysMessage> page = new Page<SysMessage>(pageNo, pageSize);
+		IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper);
+        return Result.ok(pageList);
+	}
+
+	/**
+	 * 添加
+	 * 
+	 * @param sysMessage
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SysMessage sysMessage) {
+		sysMessageService.save(sysMessage);
+		return Result.ok("添加成功！");
+	}
+
+	/**
+	 * 编辑
+	 * 
+	 * @param sysMessage
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody SysMessage sysMessage) {	
+		sysMessageService.updateById(sysMessage);
+        return Result.ok("修改成功!");
+
+	}
+
+	/**
+	 * 通过id删除
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+		sysMessageService.removeById(id);
+        return Result.ok("删除成功!");
+	}
+
+	/**
+	 * 批量删除
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+		this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
+	    return Result.ok("批量删除成功！");
+	}
+
+	/**
+	 * 通过id查询
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+		SysMessage sysMessage = sysMessageService.getById(id);
+		return Result.ok(sysMessage);
+	}
+
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 */
+	@GetMapping(value = "/exportXls")
+	public ModelAndView exportXls(HttpServletRequest request, SysMessage sysMessage) {
+		return super.exportXls(request,sysMessage,SysMessage.class, "推送消息模板");
+	}
+
+	/**
+	 * excel导入
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@PostMapping(value = "/importExcel")
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		return super.importExcel(request, response, SysMessage.class);
+	}
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.message.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.message.entity.MsgParams;
+import com.jero.modules.message.entity.SysMessageTemplate;
+import com.jero.modules.message.service.ISysMessageTemplateService;
+import com.jero.modules.message.util.PushMsgUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 消息模板
+ * @Author: jero-boot
+ * @Sate: 2019-04-09
+ * @Version: V1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys/message/sysMessageTemplate")
+public class SysMessageTemplateController extends JeroController<SysMessageTemplate, ISysMessageTemplateService> {
+	@Autowired
+	private ISysMessageTemplateService sysMessageTemplateService;
+	@Autowired
+	private PushMsgUtil pushMsgUtil;
+
+	/**
+	 * 分页列表查询
+	 * 
+	 * @param sysMessageTemplate
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+		QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap());
+		Page<SysMessageTemplate> page = new Page<SysMessageTemplate>(pageNo, pageSize);
+		IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper);
+        return Result.ok(pageList);
+	}
+
+	/**
+	 * 添加
+	 * 
+	 * @param sysMessageTemplate
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
+		sysMessageTemplateService.save(sysMessageTemplate);
+        return Result.ok("添加成功！");
+	}
+
+	/**
+	 * 编辑
+	 * 
+	 * @param sysMessageTemplate
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
+		sysMessageTemplateService.updateById(sysMessageTemplate);
+        return Result.ok("更新成功！");
+	}
+
+	/**
+	 * 通过id删除
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+		sysMessageTemplateService.removeById(id);
+        return Result.ok("删除成功!");
+	}
+
+	/**
+	 * 批量删除
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+		this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.ok("批量删除成功！");
+	}
+
+	/**
+	 * 通过id查询
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+		SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id);
+        return Result.ok(sysMessageTemplate);
+	}
+
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 */
+	@GetMapping(value = "/exportXls")
+	public ModelAndView exportXls(HttpServletRequest request,SysMessageTemplate sysMessageTemplate) {
+		return super.exportXls(request, sysMessageTemplate, SysMessageTemplate.class,"推送消息模板");
+	}
+
+	/**
+	 * excel导入
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@PostMapping(value = "/importExcel")
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		return super.importExcel(request, response, SysMessageTemplate.class);
+	}
+
+	/**
+	 * 发送消息
+	 */
+	@PostMapping(value = "/sendMsg")
+	public Result<SysMessageTemplate> sendMessage(@RequestBody MsgParams msgParams) {
+		Result<SysMessageTemplate> result = new Result<SysMessageTemplate>();
+		Map<String, String> map = null;
+		try {
+			map = (Map<String, String>) JSON.parse(msgParams.getTestData());
+		} catch (Exception e) {
+			result.error500("解析Json出错！");
+			return result;
+		}
+		boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver());
+		if (is_sendSuccess) {
+			result.success("发送消息任务添加成功！");
+		} else {
+			result.error500("发送消息任务添加失败！");
+		}
+		return result;
+	}
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/MsgParams.java

@@ -0,0 +1,23 @@
+package com.jero.modules.message.entity;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+/**
+ * 发送消息实体
+ */
+@Data
+public class MsgParams implements Serializable  {
+	
+	private static final long serialVersionUID = 1L;
+	/*消息类型*/
+	private String msgType;
+	/*消息接收方*/
+	private String receiver;
+	/*消息模板码*/
+	private String templateCode;
+	/*测试数据*/
+	private String testData;
+	
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessage.java

@@ -0,0 +1,60 @@
+package com.jero.modules.message.entity;
+
+import com.jero.common.aspect.annotation.Dict;
+import com.jero.common.system.base.entity.JeroEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 消息
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_sms")
+public class SysMessage extends JeroEntity {
+	/**推送内容*/
+	@Excel(name = "推送内容", width = 15)
+	private java.lang.String esContent;
+	/**推送所需参数Json格式*/
+	@Excel(name = "推送所需参数Json格式", width = 15)
+	private java.lang.String esParam;
+	/**接收人*/
+	@Excel(name = "接收人", width = 15)
+	private java.lang.String esReceiver;
+	/**推送失败原因*/
+	@Excel(name = "推送失败原因", width = 15)
+	private java.lang.String esResult;
+	/**发送次数*/
+	@Excel(name = "发送次数", width = 15)
+	private java.lang.Integer esSendNum;
+	/**推送状态 0未推送 1推送成功 2推送失败*/
+	@Excel(name = "推送状态 0未推送 1推送成功 2推送失败", width = 15)
+	@Dict(dicCode = "msgSendStatus")
+	private java.lang.String esSendStatus;
+	/**推送时间*/
+	@Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date esSendTime;
+	/**消息标题*/
+	@Excel(name = "消息标题", width = 15)
+	private java.lang.String esTitle;
+	/**推送方式：1短信 2邮件 3微信*/
+	@Excel(name = "推送方式：1短信 2邮件 3微信", width = 15)
+	@Dict(dicCode = "msgType")
+	private java.lang.String esType;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private java.lang.String remark;
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java

@@ -0,0 +1,38 @@
+package com.jero.modules.message.entity;
+
+import com.jero.common.system.base.entity.JeroEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 消息模板
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_sms_template")
+public class SysMessageTemplate extends JeroEntity {
+	/**模板CODE*/
+	@Excel(name = "模板CODE", width = 15)
+	private java.lang.String templateCode;
+	/**模板标题*/
+	@Excel(name = "模板标题", width = 30)
+	private java.lang.String templateName;
+	/**模板内容*/
+	@Excel(name = "模板内容", width = 50)
+	private java.lang.String templateContent;
+	/**模板测试json*/
+	@Excel(name = "模板测试json", width = 15)
+	private java.lang.String templateTestJson;
+	/**模板类型*/
+	@Excel(name = "模板类型", width = 15)
+	private java.lang.String templateType;
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/ISendMsgHandle.java

@@ -0,0 +1,6 @@
+package com.jero.modules.message.handle;
+
+public interface ISendMsgHandle {
+
+	void SendMsg(String es_receiver, String es_title, String es_content);
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/enums/SendMsgStatusEnum.java

@@ -0,0 +1,25 @@
+package com.jero.modules.message.handle.enums;
+
+/**
+ * 推送状态枚举
+ */
+public enum SendMsgStatusEnum {
+
+//推送状态 0未推送 1推送成功 2推送失败
+	WAIT("0"), SUCCESS("1"), FAIL("2");
+
+	private String code;
+
+	private SendMsgStatusEnum(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setStatusCode(String code) {
+		this.code = code;
+	}
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/enums/SendMsgTypeEnum.java

@@ -0,0 +1,51 @@
+package com.jero.modules.message.handle.enums;
+
+import com.jero.common.util.oConvertUtils;
+
+/**
+ * 发送消息类型枚举
+ */
+public enum SendMsgTypeEnum {
+
+//推送方式：1短信 2邮件 3微信
+	SMS("1", "com.jero.modules.message.handle.impl.SmsSendMsgHandle"),
+	EMAIL("2", "com.jero.modules.message.handle.impl.EmailSendMsgHandle"),
+	WX("3","com.jero.modules.message.handle.impl.WxSendMsgHandle");
+
+	private String type;
+
+	private String implClass;
+
+	private SendMsgTypeEnum(String type, String implClass) {
+		this.type = type;
+		this.implClass = implClass;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getImplClass() {
+		return implClass;
+	}
+
+	public void setImplClass(String implClass) {
+		this.implClass = implClass;
+	}
+
+	public static SendMsgTypeEnum getByType(String type) {
+		if (oConvertUtils.isEmpty(type)) {
+			return null;
+		}
+		for (SendMsgTypeEnum val : values()) {
+			if (val.getType().equals(type)) {
+				return val;
+			}
+		}
+		return null;
+	}
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java

@@ -0,0 +1,45 @@
+package com.jero.modules.message.handle.impl;
+
+import com.jero.common.util.SpringContextUtils;
+import com.jero.common.util.oConvertUtils;
+import com.jero.config.StaticConfig;
+import com.jero.modules.message.handle.ISendMsgHandle;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+public class EmailSendMsgHandle implements ISendMsgHandle {
+    static String emailFrom;
+
+    public static void setEmailFrom(String emailFrom) {
+        EmailSendMsgHandle.emailFrom = emailFrom;
+    }
+
+    @Override
+    public void SendMsg(String es_receiver, String es_title, String es_content) {
+        JavaMailSender mailSender = (JavaMailSender) SpringContextUtils.getBean("mailSender");
+        MimeMessage message = mailSender.createMimeMessage();
+        MimeMessageHelper helper = null;
+        //update-begin-author：taoyan date:20200811 for:配置类数据获取
+        if(oConvertUtils.isEmpty(emailFrom)){
+            StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
+            setEmailFrom(staticConfig.getEmailFrom());
+        }
+        //update-end-author：taoyan date:20200811 for:配置类数据获取
+        try {
+            helper = new MimeMessageHelper(message, true);
+            // 设置发送方邮箱地址
+            helper.setFrom(emailFrom);
+            helper.setTo(es_receiver);
+            helper.setSubject(es_title);
+            helper.setText(es_content, true);
+            mailSender.send(message);
+        } catch (MessagingException e) {
+            e.printStackTrace();
+        }
+
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java

@@ -0,0 +1,15 @@
+package com.jero.modules.message.handle.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import com.jero.modules.message.handle.ISendMsgHandle;
+
+@Slf4j
+public class SmsSendMsgHandle implements ISendMsgHandle {
+
+	@Override
+	public void SendMsg(String es_receiver, String es_title, String es_content) {
+		// TODO Auto-generated method stub
+		log.info("发短信");
+	}
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/WxSendMsgHandle.java

@@ -0,0 +1,14 @@
+package com.jero.modules.message.handle.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import com.jero.modules.message.handle.ISendMsgHandle;
+@Slf4j
+public class WxSendMsgHandle implements ISendMsgHandle {
+
+	@Override
+	public void SendMsg(String es_receiver, String es_title, String es_content) {
+		// TODO Auto-generated method stub
+		log.info("发微信消息模板");
+	}
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/job/SendMsgJob.java

@@ -0,0 +1,72 @@
+package com.jero.modules.message.job;
+
+import java.util.List;
+
+import com.jero.common.util.DateUtils;
+import com.jero.modules.message.entity.SysMessage;
+import com.jero.modules.message.handle.ISendMsgHandle;
+import com.jero.modules.message.handle.enums.SendMsgStatusEnum;
+import com.jero.modules.message.handle.enums.SendMsgTypeEnum;
+import com.jero.modules.message.service.ISysMessageService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 发送消息任务
+ */
+
+@Slf4j
+public class SendMsgJob implements Job {
+
+	@Autowired
+	private ISysMessageService sysMessageService;
+
+	@Override
+	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+
+		log.info(String.format(" jero-boot 发送消息任务 SendMsgJob !  时间:" + DateUtils.getTimestamp()));
+
+		// 1.读取消息中心数据，只查询未发送的和发送失败不超过次数的
+		QueryWrapper<SysMessage> queryWrapper = new QueryWrapper<SysMessage>();
+		queryWrapper.eq("es_send_status", SendMsgStatusEnum.WAIT.getCode())
+				.or(i -> i.eq("es_send_status", SendMsgStatusEnum.FAIL.getCode()).lt("es_send_num", 6));
+		List<SysMessage> sysMessages = sysMessageService.list(queryWrapper);
+		System.out.println(sysMessages);
+		// 2.根据不同的类型走不通的发送实现类
+		for (SysMessage sysMessage : sysMessages) {
+			ISendMsgHandle sendMsgHandle = null;
+			try {
+				if (sysMessage.getEsType().equals(SendMsgTypeEnum.EMAIL.getType())) {
+					sendMsgHandle = (ISendMsgHandle) Class.forName(SendMsgTypeEnum.EMAIL.getImplClass()).newInstance();
+				} else if (sysMessage.getEsType().equals(SendMsgTypeEnum.SMS.getType())) {
+					sendMsgHandle = (ISendMsgHandle) Class.forName(SendMsgTypeEnum.SMS.getImplClass()).newInstance();
+				} else if (sysMessage.getEsType().equals(SendMsgTypeEnum.WX.getType())) {
+					sendMsgHandle = (ISendMsgHandle) Class.forName(SendMsgTypeEnum.WX.getImplClass()).newInstance();
+				}
+			} catch (Exception e) {
+				log.error(e.getMessage(),e);
+			}
+			Integer sendNum = sysMessage.getEsSendNum();
+			try {
+				sendMsgHandle.SendMsg(sysMessage.getEsReceiver(), sysMessage.getEsTitle(),
+						sysMessage.getEsContent().toString());
+				// 发送消息成功
+				sysMessage.setEsSendStatus(SendMsgStatusEnum.SUCCESS.getCode());
+			} catch (Exception e) {
+				// 发送消息出现异常
+				sysMessage.setEsSendStatus(SendMsgStatusEnum.FAIL.getCode());
+			}
+			sysMessage.setEsSendNum(++sendNum);
+			// 发送结果回写到数据库
+			sysMessageService.updateById(sysMessage);
+		}
+
+	}
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.message.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.message.entity.SysMessage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 消息
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+public interface SysMessageMapper extends BaseMapper<SysMessage> {
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/SysMessageTemplateMapper.java

@@ -0,0 +1,18 @@
+package com.jero.modules.message.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import com.jero.modules.message.entity.SysMessageTemplate;
+
+import java.util.List;
+
+/**
+ * @Description: 消息模板
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+public interface SysMessageTemplateMapper extends BaseMapper<SysMessageTemplate> {
+    @Select("SELECT * FROM SYS_SMS_TEMPLATE WHERE TEMPLATE_CODE = #{code}")
+    List<SysMessageTemplate> selectByCode(String code);
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/xml/SysMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.message.mapper.SysMessageMapper">
+
+</mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/mapper/xml/SysMessageTemplateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.message.mapper.SysMessageTemplateMapper">
+
+</mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/service/ISysMessageService.java

@@ -0,0 +1,14 @@
+package com.jero.modules.message.service;
+
+import com.jero.common.system.base.service.JeroService;
+import com.jero.modules.message.entity.SysMessage;
+
+/**
+ * @Description: 消息
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+public interface ISysMessageService extends JeroService<SysMessage> {
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/service/ISysMessageTemplateService.java

@@ -0,0 +1,16 @@
+package com.jero.modules.message.service;
+
+import java.util.List;
+
+import com.jero.common.system.base.service.JeroService;
+import com.jero.modules.message.entity.SysMessageTemplate;
+
+/**
+ * @Description: 消息模板
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+public interface ISysMessageTemplateService extends JeroService<SysMessageTemplate> {
+    List<SysMessageTemplate> selectByCode(String code);
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/service/impl/SysMessageServiceImpl.java

@@ -0,0 +1,18 @@
+package com.jero.modules.message.service.impl;
+
+import com.jero.common.system.base.service.impl.JeroServiceImpl;
+import com.jero.modules.message.entity.SysMessage;
+import com.jero.modules.message.mapper.SysMessageMapper;
+import com.jero.modules.message.service.ISysMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 消息
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+@Service
+public class SysMessageServiceImpl extends JeroServiceImpl<SysMessageMapper, SysMessage> implements ISysMessageService {
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/service/impl/SysMessageTemplateServiceImpl.java

@@ -0,0 +1,28 @@
+package com.jero.modules.message.service.impl;
+
+import com.jero.common.system.base.service.impl.JeroServiceImpl;
+import com.jero.modules.message.entity.SysMessageTemplate;
+import com.jero.modules.message.mapper.SysMessageTemplateMapper;
+import com.jero.modules.message.service.ISysMessageTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * @Description: 消息模板
+ * @Author: jero-boot
+ * @Date:  2019-04-09
+ * @Version: V1.0
+ */
+@Service
+public class SysMessageTemplateServiceImpl extends JeroServiceImpl<SysMessageTemplateMapper, SysMessageTemplate> implements ISysMessageTemplateService {
+
+    @Autowired
+    private SysMessageTemplateMapper sysMessageTemplateMapper;
+
+
+    @Override
+    public List<SysMessageTemplate> selectByCode(String code) {
+        return sysMessageTemplateMapper.selectByCode(code);
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/util/PushMsgUtil.java

@@ -0,0 +1,80 @@
+package com.jero.modules.message.util;
+
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import com.jero.modules.message.entity.SysMessage;
+import com.jero.modules.message.entity.SysMessageTemplate;
+import com.jero.modules.message.handle.enums.SendMsgStatusEnum;
+import com.jero.modules.message.service.ISysMessageService;
+import com.jero.modules.message.service.ISysMessageTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 消息生成工具
+ */
+
+@Component
+public class PushMsgUtil {
+
+    @Autowired
+    private ISysMessageService sysMessageService;
+
+    @Autowired
+    private ISysMessageTemplateService sysMessageTemplateService;
+
+    @Autowired
+    private Configuration freemarkerConfig;
+    /**
+     * @param msgType 消息类型 1短信 2邮件 3微信
+     * @param templateCode    消息模板码
+     * @param map     消息参数
+     * @param sentTo  接收消息方
+     */
+    public boolean sendMessage(String msgType, String templateCode, Map<String, String> map, String sentTo) {
+        List<SysMessageTemplate> sysSmsTemplates = sysMessageTemplateService.selectByCode(templateCode);
+        SysMessage sysMessage = new SysMessage();
+        if (sysSmsTemplates.size() > 0) {
+            SysMessageTemplate sysSmsTemplate = sysSmsTemplates.get(0);
+            sysMessage.setEsType(msgType);
+            sysMessage.setEsReceiver(sentTo);
+            //模板标题
+            String title = sysSmsTemplate.getTemplateName();
+            //模板内容
+            String content = sysSmsTemplate.getTemplateContent();
+            StringWriter stringWriter = new StringWriter();
+            Template template = null;
+            try {
+                template = new Template("SysMessageTemplate", content, freemarkerConfig);
+                template.process(map, stringWriter);
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            } catch (TemplateException e) {
+                e.printStackTrace();
+                return false;
+            }
+            content = stringWriter.toString();
+            sysMessage.setEsTitle(title);
+            sysMessage.setEsContent(content);
+            sysMessage.setEsParam(JSONObject.toJSONString(map));
+            sysMessage.setEsSendTime(new Date());
+            sysMessage.setEsSendStatus(SendMsgStatusEnum.WAIT.getCode());
+            sysMessage.setEsSendNum(0);
+            if(sysMessageService.save(sysMessage)) {
+				return true;
+			}
+        }
+        return false;
+    }
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/SocketHandler.java

@@ -0,0 +1,29 @@
+package com.jero.modules.message.websocket;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.jero.boot.starter.redis.listener.JeroRedisListerer;
+import com.jero.common.base.BaseMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 监听消息(采用redis发布订阅方式发送消息)
+ */
+@Component
+public class SocketHandler implements JeroRedisListerer {
+
+    @Autowired
+    private WebSocket webSocket;
+
+    @Override
+    public void onMessage(BaseMap map) {
+        String userId = map.get("userId");
+        String message = map.get("message");
+        if (ObjectUtil.isNotEmpty(userId)) {
+            webSocket.pushMessage(userId, message);
+        } else {
+            webSocket.pushMessage(message);
+        }
+
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/TestSocketController.java

@@ -0,0 +1,48 @@
+package com.jero.modules.message.websocket;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.WebsocketConst;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+
+@RestController
+@RequestMapping("/sys/socketTest")
+public class TestSocketController {
+
+    @Autowired
+    private WebSocket webSocket;
+
+    @PostMapping("/sendAll")
+    public Result<String> sendAll(@RequestBody JSONObject jsonObject) {
+    	Result<String> result = new Result<String>();
+    	String message = jsonObject.getString("message");
+    	JSONObject obj = new JSONObject();
+    	obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
+		obj.put(WebsocketConst.MSG_ID, "M0001");
+		obj.put(WebsocketConst.MSG_TXT, message);
+    	webSocket.sendMessage(obj.toJSONString());
+        result.setResult("群发！");
+        return result;
+    }
+
+    @PostMapping("/sendUser")
+    public Result<String> sendUser(@RequestBody JSONObject jsonObject) {
+    	Result<String> result = new Result<String>();
+    	String userId = jsonObject.getString("userId");
+    	String message = jsonObject.getString("message");
+    	JSONObject obj = new JSONObject();
+    	obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
+    	obj.put(WebsocketConst.MSG_USER_ID, userId);
+		obj.put(WebsocketConst.MSG_ID, "M0001");
+		obj.put(WebsocketConst.MSG_TXT, message);
+        webSocket.sendMessage(userId, obj.toJSONString());
+        result.setResult("单发");
+        return result;
+    }
+
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/WebSocket.java

@@ -0,0 +1,150 @@
+package com.jero.modules.message.websocket;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import javax.annotation.Resource;
+import javax.websocket.OnClose;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+
+import com.jero.boot.starter.redis.client.JeroRedisClient;
+import com.jero.common.base.BaseMap;
+import com.jero.common.constant.WebsocketConst;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Author scott
+ * @Date 2019/11/29 9:41
+ * @Description: 此注解相当于设置访问URL
+ */
+@Component
+@Slf4j
+@ServerEndpoint("/websocket/{userId}") //此注解相当于设置访问URL
+public class WebSocket {
+
+    private Session session;
+
+    private String userId;
+
+    private static final String REDIS_TOPIC_NAME = "socketHandler";
+
+    @Resource
+    private JeroRedisClient jeroRedisClient;
+
+    private static CopyOnWriteArraySet<WebSocket> webSockets = new CopyOnWriteArraySet<>();
+    private static Map<String, Session> sessionPool = new HashMap<String, Session>();
+
+
+    @OnOpen
+    public void onOpen(Session session, @PathParam(value = "userId") String userId) {
+        try {
+            this.session = session;
+            this.userId = userId;
+            webSockets.add(this);
+            sessionPool.put(userId, session);
+            log.info("【websocket消息】有新的连接，总数为:" + webSockets.size());
+        } catch (Exception e) {
+        }
+    }
+
+    @OnClose
+    public void onClose() {
+        try {
+            webSockets.remove(this);
+            sessionPool.remove(this.userId);
+            log.info("【websocket消息】连接断开，总数为:" + webSockets.size());
+        } catch (Exception e) {
+        }
+    }
+
+
+    /**
+     * 服务端推送消息
+     *
+     * @param userId
+     * @param message
+     */
+    public void pushMessage(String userId, String message) {
+        Session session = sessionPool.get(userId);
+        if (session != null && session.isOpen()) {
+            try {
+                log.info("【websocket消息】 单点消息:" + message);
+                session.getAsyncRemote().sendText(message);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 服务器端推送消息
+     */
+    public void pushMessage(String message) {
+        try {
+            webSockets.forEach(ws -> ws.session.getAsyncRemote().sendText(message));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @OnMessage
+    public void onMessage(String message) {
+        //todo 现在有个定时任务刷，应该去掉
+        log.debug("【websocket消息】收到客户端消息:" + message);
+        JSONObject obj = new JSONObject();
+        obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);//业务类型
+        obj.put(WebsocketConst.MSG_TXT, "心跳响应");//消息内容
+        for (WebSocket webSocket : webSockets) {
+            webSocket.pushMessage(message);
+        }
+    }
+
+    /**
+     * 后台发送消息到redis
+     *
+     * @param message
+     */
+    public void sendMessage(String message) {
+        log.info("【websocket消息】广播消息:" + message);
+        BaseMap baseMap = new BaseMap();
+        baseMap.put("userId", "");
+        baseMap.put("message", message);
+        jeroRedisClient.sendMessage(REDIS_TOPIC_NAME, baseMap);
+    }
+
+    /**
+     * 此为单点消息
+     *
+     * @param userId
+     * @param message
+     */
+    public void sendMessage(String userId, String message) {
+        BaseMap baseMap = new BaseMap();
+        baseMap.put("userId", userId);
+        baseMap.put("message", message);
+        jeroRedisClient.sendMessage(REDIS_TOPIC_NAME, baseMap);
+    }
+
+    /**
+     * 此为单点消息(多人)
+     *
+     * @param userIds
+     * @param message
+     */
+    public void sendMessage(String[] userIds, String message) {
+        for (String userId : userIds) {
+            sendMessage(userId, message);
+        }
+    }
+
+}