From 3b42b7061000c66eea944bdc22b9f8ca2ec50fa0 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Wed, 23 Mar 2022 20:59:46 +0800
Subject: [PATCH 01/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mail/SystemMailAccountController.java     | 95 +++++++++++++++++++
 .../admin/mail/SystemMailLogController.java   | 20 ++++
 .../mail/SystemMailTempleController.java      | 20 ++++
 .../vo/account/SystemMailAccountBaseVO.java   | 26 +++++
 .../mail/SystemMailAccountConvert.java        | 25 +++++
 .../dataobject/mail/SystemMailAccountDO.java  | 54 +++++++++++
 .../dal/dataobject/mail/SystemMailLogDO.java  | 61 ++++++++++++
 .../dataobject/mail/SystemMailTempleDO.java   | 54 +++++++++++
 .../mysql/mail/SystemMailAccountMapper.java   | 28 ++++++
 .../dal/mysql/mail/SystemMailLogMapper.java   | 16 ++++
 .../mysql/mail/SystemMailTempleMapper.java    | 16 ++++
 .../mail/SystemMailAccountService.java        | 31 ++++++
 .../service/mail/SystemMailLogService.java    | 14 +++
 .../service/mail/SystemMailTempleService.java | 13 +++
 .../impl/SystemMailAccountServiceImpl.java    | 63 ++++++++++++
 .../mail/impl/SystemMailLogServiceImpl.java   | 18 ++++
 .../impl/SystemMailTempleServiceImpl.java     | 18 ++++
 17 files changed, 572 insertions(+)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
new file mode 100644
index 0000000000..d6ba85dcd2
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO;
+import cn.iocoder.yudao.module.system.convert.mail.SystemMailAccountConvert;
+import cn.iocoder.yudao.module.system.convert.sms.SmsChannelConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
+import cn.iocoder.yudao.module.system.service.mail.SystemMailAccountService;
+import cn.iocoder.yudao.module.system.service.sms.SmsChannelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import java.util.Comparator;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Api(tags = "管理后台 - 邮件模板")
+@RestController
+@RequestMapping("/system-mail-account")
+public class SystemMailAccountController {
+    @Resource
+    private SystemMailAccountService systemMailAccountService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建邮箱账号")
+    @PreAuthorize("@ss.hasPermission('system:system-mail-account:create')")
+    public CommonResult<Long> createMailAccount(@Valid @RequestBody SystemMailAccountBaseVO baseVO) {
+        return success(systemMailAccountService.create(baseVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("修改邮箱账号")
+    @PreAuthorize("@ss.hasPermission('system:system-mail-account:update')")
+    public CommonResult<Boolean> updateMailAccount(@Valid @RequestBody SystemMailAccountBaseVO baseVO) {
+        systemMailAccountService.update(baseVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除邮箱账号")
+    @PreAuthorize("@ss.hasPermission('system:system-mail-account:delete')")
+    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestBody SystemMailAccountBaseVO baseVO) {
+        systemMailAccountService.delete(baseVO);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得邮箱账号")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:system-mail-account:get')")
+    public CommonResult<SystemMailAccountBaseVO> getMailAccount(@RequestParam("id") Long id) {
+        SystemMailAccountDO systemMailAccountDO = systemMailAccountService.getMailAccount(id);
+        return success(SystemMailAccountConvert.INSTANCE.convert(systemMailAccountDO));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得邮箱账号分页")
+    @PreAuthorize("@ss.hasPermission('system:system-mail-account:query')")
+    public CommonResult<PageResult<SystemMailAccountBaseVO>> getSmsChannelPage(@Valid PageParam pageParam) {
+        PageResult<SystemMailAccountDO> pageResult = systemMailAccountService.getMailAccountPage(pageParam);
+        return success(SystemMailAccountConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/list-all-simple")
+    @ApiOperation(value = "获得邮箱账号精简列表")
+    public CommonResult<List<SystemMailAccountBaseVO>> getSimpleSmsChannels() {
+        List<SystemMailAccountDO> list = systemMailAccountService.getMailAccountList();
+        // 排序后，返回给前端
+        list.sort(Comparator.comparing(SystemMailAccountDO::getId));
+        return success(SystemMailAccountConvert.INSTANCE.convertList02(list));
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java
new file mode 100644
index 0000000000..710e3f4d32
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@RestController
+@RequestMapping("/system-mail-log")
+public class SystemMailLogController {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java
new file mode 100644
index 0000000000..7b76958d18
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@RestController
+@RequestMapping("/system-mail-temple")
+public class SystemMailTempleController {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
new file mode 100644
index 0000000000..4f74da0c86
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SystemMailAccountBaseVO {
+    @ApiModelProperty(value = "来源" , required = true , example = "yudaoyuanma")
+    private String from;
+
+    @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
+    private String username;
+
+    @ApiModelProperty(value = "密码" , required = true , example = "123456")
+    private String password;
+
+    @ApiModelProperty(value = "网站" , required = true , example = "www.iocoder.cn")
+    private String host;
+
+    @ApiModelProperty(value = "端口" , required = true , example = "80")
+    private String port;
+
+    @ApiModelProperty(value = "是否开启ssl" , required = true , example = "2")
+    private Integer sslEnable;
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java
new file mode 100644
index 0000000000..465bff31ff
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.convert.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface SystemMailAccountConvert {
+    SystemMailAccountConvert INSTANCE = Mappers.getMapper(SystemMailAccountConvert.class);
+
+    SystemMailAccountDO convert (SystemMailAccountBaseVO systemMailAccountBaseVO);
+
+    SystemMailAccountBaseVO convert (SystemMailAccountDO systemMailAccountDO);
+
+    PageResult<SystemMailAccountBaseVO>  convertPage(PageResult<SystemMailAccountDO> pageResult);
+
+    List<SystemMailAccountBaseVO> convertList02(List<SystemMailAccountDO> list);
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java
new file mode 100644
index 0000000000..c5d90dfd19
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.mail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SystemMailAccount对象", description="")
+@TableName(value = "system_mail_account", autoResultMap = true)
+public class SystemMailAccountDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private Long id;
+
+    @TableField("from")
+    private String from;
+
+    @TableField("username")
+    private String username;
+
+    @TableField("password")
+    private String password;
+
+    @TableField("host")
+    private String host;
+
+    @TableField("port")
+    private String port;
+
+    @TableField("sslEnable")
+    private Integer sslEnable;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java
new file mode 100644
index 0000000000..b909e0c373
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java
@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.mail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.sql.Timestamp;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SystemMailLog对象", description="")
+public class SystemMailLogDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private Long id;
+
+    @TableField("account_code")
+    private String accountCode;
+
+    @TableField("from")
+    private String from;
+
+    @TableField("temple_code")
+    private String templeCode;
+
+    @TableField("title")
+    private String title;
+
+    @TableField("content")
+    private String content;
+
+    @TableField("to")
+    private String to;
+
+    @TableField("sendTime")
+    private Timestamp sendTime;
+
+    @TableField("sendStatus")
+    private String sendStatus;
+
+    @TableField("sendResult")
+    private String sendResult;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java
new file mode 100644
index 0000000000..3a13d1b4b0
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.mail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SystemMailTemple对象", description="")
+public class SystemMailTempleDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private Long id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("code")
+    private String code;
+
+    @TableField("username")
+    private String username;
+
+    @TableField("title")
+    private String title;
+
+    @TableField("content")
+    private String content;
+
+    @TableField("status")
+    private String status;
+
+    @TableField("remark")
+    private String remark;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
new file mode 100644
index 0000000000..576c23bdd7
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Mapper
+public interface SystemMailAccountMapper extends BaseMapperX<SystemMailAccountDO> {
+
+    default PageResult<SystemMailAccountDO> selectPage(PageParam pageParam) {
+        return selectPage(pageParam, new QueryWrapperX<SystemMailAccountDO>());
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java
new file mode 100644
index 0000000000..7432fdde3e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailLogDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface SystemMailLogMapper extends BaseMapper<SystemMailLogDO> {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java
new file mode 100644
index 0000000000..0460cc7b22
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailTempleDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface SystemMailTempleMapper extends BaseMapper<SystemMailTempleDO> {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
new file mode 100644
index 0000000000..38f787131d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface SystemMailAccountService  {
+
+    Long create(SystemMailAccountBaseVO baseVO);
+
+    String update(SystemMailAccountBaseVO baseVO);
+
+    String delete(SystemMailAccountBaseVO baseVO);
+
+    SystemMailAccountDO getMailAccount(Long id);
+
+    PageResult<SystemMailAccountDO> getMailAccountPage(PageParam pageParam);
+
+    List<SystemMailAccountDO> getMailAccountList();
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java
new file mode 100644
index 0000000000..ff5043878b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface SystemMailLogService  {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java
new file mode 100644
index 0000000000..507b64b9ad
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface SystemMailTempleService {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
new file mode 100644
index 0000000000..b50ca35b59
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
@@ -0,0 +1,63 @@
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
+import cn.iocoder.yudao.module.system.convert.mail.SystemMailAccountConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.SystemMailAccountMapper;
+import cn.iocoder.yudao.module.system.service.mail.SystemMailAccountService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class SystemMailAccountServiceImpl  implements SystemMailAccountService {
+    @Resource
+    SystemMailAccountMapper systemMailAccountMapper;
+    @Override
+    public Long create(SystemMailAccountBaseVO baseVO) {
+        SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
+        systemMailAccountMapper.insert(systemMailAccountDO);
+        return systemMailAccountDO.getId();
+    }
+
+    @Override
+    public String update(SystemMailAccountBaseVO baseVO) {
+        SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
+        systemMailAccountMapper.updateById(systemMailAccountDO);
+        return null;
+    }
+
+    @Override
+    public String delete(SystemMailAccountBaseVO baseVO) {
+        SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
+        systemMailAccountMapper.deleteById(systemMailAccountDO);
+        return null;
+    }
+
+    @Override
+    public SystemMailAccountDO getMailAccount(Long id) {
+        return systemMailAccountMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<SystemMailAccountDO> getMailAccountPage(PageParam pageParam) {
+        return systemMailAccountMapper.selectPage(pageParam);
+    }
+
+    @Override
+    public List<SystemMailAccountDO> getMailAccountList() {
+        return systemMailAccountMapper.selectList();
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java
new file mode 100644
index 0000000000..4b17a3e21d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+
+import cn.iocoder.yudao.module.system.service.mail.SystemMailLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class SystemMailLogServiceImpl  implements SystemMailLogService {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java
new file mode 100644
index 0000000000..e59cb01ba1
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+
+import cn.iocoder.yudao.module.system.service.mail.SystemMailTempleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class SystemMailTempleServiceImpl  implements SystemMailTempleService {
+
+}

From 50f7af00e9249108f8113e4ffd3e480c9651dfa9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 23 Mar 2022 21:17:31 +0800
Subject: [PATCH 02/67] =?UTF-8?q?code=20review=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/SystemMailAccountController.java | 17 ++++++++---------
 .../vo/account/SystemMailAccountBaseVO.java     |  5 ++++-
 .../dal/mysql/mail/SystemMailAccountMapper.java |  4 +---
 .../service/mail/SystemMailAccountService.java  |  2 ++
 .../mail/impl/SystemMailAccountServiceImpl.java | 12 +++++++++++-
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
index d6ba85dcd2..c625b7cda8 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
@@ -5,16 +5,9 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO;
 import cn.iocoder.yudao.module.system.convert.mail.SystemMailAccountConvert;
-import cn.iocoder.yudao.module.system.convert.sms.SmsChannelConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
 import cn.iocoder.yudao.module.system.service.mail.SystemMailAccountService;
-import cn.iocoder.yudao.module.system.service.sms.SmsChannelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -23,12 +16,12 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
 import java.util.Comparator;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
+// TODO @ジョイイ：使用 Swagger 注解，不用写这个注释啦
 /**
  * <p>
  *  前端控制器
@@ -39,11 +32,13 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  */
 @Api(tags = "管理后台 - 邮件模板")
 @RestController
-@RequestMapping("/system-mail-account")
+@RequestMapping("/system-mail-account") // TODO @ジョイイ：/system/mail-account
 public class SystemMailAccountController {
     @Resource
     private SystemMailAccountService systemMailAccountService;
 
+    // TODO @ジョイイ：最好，VO 分拆下，参考下别的模块
+
     @PostMapping("/create")
     @ApiOperation("创建邮箱账号")
     @PreAuthorize("@ss.hasPermission('system:system-mail-account:create')")
@@ -59,6 +54,8 @@ public class SystemMailAccountController {
         return success(true);
     }
 
+    // TODO @ジョイイ：删除，编号即可
+
     @DeleteMapping("/delete")
     @ApiOperation("删除邮箱账号")
     @PreAuthorize("@ss.hasPermission('system:system-mail-account:delete')")
@@ -76,6 +73,8 @@ public class SystemMailAccountController {
         return success(SystemMailAccountConvert.INSTANCE.convert(systemMailAccountDO));
     }
 
+    // TODO @ジョイイ：分页的查询条件
+
     @GetMapping("/page")
     @ApiOperation("获得邮箱账号分页")
     @PreAuthorize("@ss.hasPermission('system:system-mail-account:query')")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
index 4f74da0c86..07352140c3 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+// TODO @ジョイイ：System 去掉哈
 @Data
 public class SystemMailAccountBaseVO {
+
+    // TODO @ジョイイ：example 写的不太对，这个应该是邮箱；
     @ApiModelProperty(value = "来源" , required = true , example = "yudaoyuanma")
     private String from;
 
@@ -21,6 +23,7 @@ public class SystemMailAccountBaseVO {
     @ApiModelProperty(value = "端口" , required = true , example = "80")
     private String port;
 
+    // TODO @ジョイイ：Boolean
     @ApiModelProperty(value = "是否开启ssl" , required = true , example = "2")
     private Integer sslEnable;
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
index 576c23bdd7..d4855c1b29 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
@@ -4,12 +4,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
 import org.apache.ibatis.annotations.Mapper;
 
-
+// TODO @ジョイイ： Mapper 一般不用注释，因为用途不大
 /**
  * <p>
  *  Mapper 接口
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
index 38f787131d..b7ffbfa417 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
 
 import java.util.List;
 
+// TODO @ジョイイ：类注释，应该是 邮箱账号 Service 接口
+
 /**
  * <p>
  *  服务类
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
index b50ca35b59..e1ef51267f 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 
+// TODO @ジョイイ：类注释，应该是 邮箱账号 Service 实现类
+
 /**
  * <p>
  *  服务实现类
@@ -22,24 +24,32 @@ import java.util.List;
  */
 @Service
 public class SystemMailAccountServiceImpl  implements SystemMailAccountService {
+    // TODO @ジョイイ： private
     @Resource
-    SystemMailAccountMapper systemMailAccountMapper;
+    SystemMailAccountMapper systemMailAccountMapper;  // TODO @ジョイイ： 变量，和方法要空一行
     @Override
     public Long create(SystemMailAccountBaseVO baseVO) {
+        // TODO @ジョイイ： username 要校验唯一
         SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
         systemMailAccountMapper.insert(systemMailAccountDO);
         return systemMailAccountDO.getId();
     }
 
+    // TODO @ジョイイ： 不用返回值，void 即可
     @Override
     public String update(SystemMailAccountBaseVO baseVO) {
+        // TODO @ジョイイ： username 要校验唯一
+        // TODO @ジョイイ： 校验是否存在
         SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
         systemMailAccountMapper.updateById(systemMailAccountDO);
         return null;
     }
 
+    // TODO @ジョイイ： 不用返回值，void 即可
+
     @Override
     public String delete(SystemMailAccountBaseVO baseVO) {
+        // TODO @ジョイイ： 校验是否存在
         SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
         systemMailAccountMapper.deleteById(systemMailAccountDO);
         return null;

From 54ad304514ee4944be688dab7aa814167e1aa2aa Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Fri, 25 Mar 2022 02:59:51 +0800
Subject: [PATCH 03/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20TODO=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |   5 +
 .../admin/mail/MailAccountController.java     |  85 ++++++++++++
 ...Controller.java => MailLogController.java} |  40 +++---
 ...troller.java => MailTempleController.java} |  40 +++---
 .../mail/SystemMailAccountController.java     |  94 --------------
 ...ountBaseVO.java => MailAccountBaseVO.java} |   9 +-
 .../vo/account/MailAccountCreateReqVO.java    |   8 ++
 .../mail/vo/account/MailAccountPageReqVO.java |  26 ++++
 .../vo/account/MailAccountUpdateReqVO.java    |   8 ++
 .../convert/mail/MailAccountConvert.java      |  22 ++++
 .../mail/SystemMailAccountConvert.java        |  25 ----
 ...mMailAccountDO.java => MailAccountDO.java} | 100 +++++++-------
 .../{SystemMailLogDO.java => MailLogDO.java}  | 122 +++++++++---------
 ...temMailTempleDO.java => MailTempleDO.java} | 108 ++++++++--------
 .../dal/mysql/mail/MailAccountMapper.java     |  23 ++++
 ...mMailLogMapper.java => MailLogMapper.java} |  32 ++---
 ...empleMapper.java => MailTempleMapper.java} |  32 ++---
 .../mysql/mail/SystemMailAccountMapper.java   |  26 ----
 .../service/mail/MailAccountService.java      |  33 +++++
 ...ailLogService.java => MailLogService.java} |  28 ++--
 ...pleService.java => MailTempleService.java} |  26 ++--
 .../mail/SystemMailAccountService.java        |  33 -----
 .../mail/impl/MailAccountServiceImpl.java     |  99 ++++++++++++++
 ...rviceImpl.java => MailLogServiceImpl.java} |  36 +++---
 ...ceImpl.java => MailTempleServiceImpl.java} |  36 +++---
 .../impl/SystemMailAccountServiceImpl.java    |  73 -----------
 26 files changed, 608 insertions(+), 561 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/{SystemMailLogController.java => MailLogController.java} (85%)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/{SystemMailTempleController.java => MailTempleController.java} (84%)
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/{SystemMailAccountBaseVO.java => MailAccountBaseVO.java} (69%)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/{SystemMailAccountDO.java => MailAccountDO.java} (75%)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/{SystemMailLogDO.java => MailLogDO.java} (88%)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/{SystemMailTempleDO.java => MailTempleDO.java} (86%)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/{SystemMailLogMapper.java => MailLogMapper.java} (55%)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/{SystemMailTempleMapper.java => MailTempleMapper.java} (53%)
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/{SystemMailLogService.java => MailLogService.java} (71%)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/{SystemMailTempleService.java => MailTempleService.java} (71%)
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/{SystemMailLogServiceImpl.java => MailLogServiceImpl.java} (56%)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/{SystemMailTempleServiceImpl.java => MailTempleServiceImpl.java} (54%)
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 6b44615ce4..0cdab761cb 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -119,4 +119,9 @@ public interface ErrorCodeConstants {
     ErrorCode SOCIAL_USER_UNBIND_NOT_SELF = new ErrorCode(1002018001, "社交解绑失败，非当前用户绑定");
     ErrorCode SOCIAL_USER_NOT_FOUND = new ErrorCode(1002018002, "社交授权失败，找不到对应的用户");
 
+    // ========== 邮箱账号 1002019000 ==========
+    ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002019000, "邮箱账号不存在");
+    ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002019000, "邮箱账号存在");
+
+
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
new file mode 100644
index 0000000000..5cace63780
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Comparator;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+
+@Api(tags = "管理后台 - 邮件模板")
+@RestController
+@RequestMapping("/system/mail-account")
+public class MailAccountController {
+    @Resource
+    private MailAccountService mailAccountService;
+
+
+    @PostMapping("/create")
+    @ApiOperation("创建邮箱账号")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:create')")
+    public CommonResult<Long> createMailAccount(@Valid @RequestBody MailAccountCreateReqVO createReqVO) {
+        return success(mailAccountService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("修改邮箱账号")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:update')")
+    public CommonResult<Boolean> updateMailAccount(@Valid @RequestBody MailAccountUpdateReqVO updateReqVO) {
+        mailAccountService.update(updateReqVO);
+        return success(true);
+    }
+
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除邮箱账号")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:delete')")
+    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestBody Long id) {
+        mailAccountService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得邮箱账号")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:mail-account:get')")
+    public CommonResult<MailAccountBaseVO> getMailAccount(@RequestParam("id") Long id) {
+        MailAccountDO mailAccountDO = mailAccountService.getMailAccount(id);
+        return success(MailAccountConvert.INSTANCE.convert(mailAccountDO));
+    }
+
+
+    @GetMapping("/page")
+    @ApiOperation("获得邮箱账号分页")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:query')")
+    public CommonResult<PageResult<MailAccountBaseVO>> getSmsChannelPage(@Valid MailAccountPageReqVO pageReqVO) {
+        PageResult<MailAccountDO> pageResult = mailAccountService.getMailAccountPage(pageReqVO);
+        return success(MailAccountConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/list-all-simple")
+    @ApiOperation(value = "获得邮箱账号精简列表")
+    public CommonResult<List<MailAccountBaseVO>> getSimpleSmsChannels() {
+        List<MailAccountDO> list = mailAccountService.getMailAccountList();
+        // 排序后，返回给前端
+        list.sort(Comparator.comparing(MailAccountDO::getId));
+        return success(MailAccountConvert.INSTANCE.convertList02(list));
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
similarity index 85%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
index 710e3f4d32..2bc87c6ac9 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailLogController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
@@ -1,20 +1,20 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@RestController
-@RequestMapping("/system-mail-log")
-public class SystemMailLogController {
-
-}
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@RestController
+@RequestMapping("/system-mail-log")
+public class MailLogController {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java
similarity index 84%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java
index 7b76958d18..7a4151fbed 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailTempleController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java
@@ -1,20 +1,20 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@RestController
-@RequestMapping("/system-mail-temple")
-public class SystemMailTempleController {
-
-}
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@RestController
+@RequestMapping("/system-mail-temple")
+public class MailTempleController {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
deleted file mode 100644
index c625b7cda8..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/SystemMailAccountController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail;
-
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
-import cn.iocoder.yudao.module.system.convert.mail.SystemMailAccountConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-import cn.iocoder.yudao.module.system.service.mail.SystemMailAccountService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-// TODO @ジョイイ：使用 Swagger 注解，不用写这个注释啦
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Api(tags = "管理后台 - 邮件模板")
-@RestController
-@RequestMapping("/system-mail-account") // TODO @ジョイイ：/system/mail-account
-public class SystemMailAccountController {
-    @Resource
-    private SystemMailAccountService systemMailAccountService;
-
-    // TODO @ジョイイ：最好，VO 分拆下，参考下别的模块
-
-    @PostMapping("/create")
-    @ApiOperation("创建邮箱账号")
-    @PreAuthorize("@ss.hasPermission('system:system-mail-account:create')")
-    public CommonResult<Long> createMailAccount(@Valid @RequestBody SystemMailAccountBaseVO baseVO) {
-        return success(systemMailAccountService.create(baseVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("修改邮箱账号")
-    @PreAuthorize("@ss.hasPermission('system:system-mail-account:update')")
-    public CommonResult<Boolean> updateMailAccount(@Valid @RequestBody SystemMailAccountBaseVO baseVO) {
-        systemMailAccountService.update(baseVO);
-        return success(true);
-    }
-
-    // TODO @ジョイイ：删除，编号即可
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除邮箱账号")
-    @PreAuthorize("@ss.hasPermission('system:system-mail-account:delete')")
-    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestBody SystemMailAccountBaseVO baseVO) {
-        systemMailAccountService.delete(baseVO);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @ApiOperation("获得邮箱账号")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('system:system-mail-account:get')")
-    public CommonResult<SystemMailAccountBaseVO> getMailAccount(@RequestParam("id") Long id) {
-        SystemMailAccountDO systemMailAccountDO = systemMailAccountService.getMailAccount(id);
-        return success(SystemMailAccountConvert.INSTANCE.convert(systemMailAccountDO));
-    }
-
-    // TODO @ジョイイ：分页的查询条件
-
-    @GetMapping("/page")
-    @ApiOperation("获得邮箱账号分页")
-    @PreAuthorize("@ss.hasPermission('system:system-mail-account:query')")
-    public CommonResult<PageResult<SystemMailAccountBaseVO>> getSmsChannelPage(@Valid PageParam pageParam) {
-        PageResult<SystemMailAccountDO> pageResult = systemMailAccountService.getMailAccountPage(pageParam);
-        return success(SystemMailAccountConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/list-all-simple")
-    @ApiOperation(value = "获得邮箱账号精简列表")
-    public CommonResult<List<SystemMailAccountBaseVO>> getSimpleSmsChannels() {
-        List<SystemMailAccountDO> list = systemMailAccountService.getMailAccountList();
-        // 排序后，返回给前端
-        list.sort(Comparator.comparing(SystemMailAccountDO::getId));
-        return success(SystemMailAccountConvert.INSTANCE.convertList02(list));
-    }
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
similarity index 69%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 07352140c3..7b65a08768 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/SystemMailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -3,12 +3,10 @@ package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-// TODO @ジョイイ：System 去掉哈
 @Data
-public class SystemMailAccountBaseVO {
+public class MailAccountBaseVO {
 
-    // TODO @ジョイイ：example 写的不太对，这个应该是邮箱；
-    @ApiModelProperty(value = "来源" , required = true , example = "yudaoyuanma")
+    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     private String from;
 
     @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
@@ -23,7 +21,6 @@ public class SystemMailAccountBaseVO {
     @ApiModelProperty(value = "端口" , required = true , example = "80")
     private String port;
 
-    // TODO @ジョイイ：Boolean
     @ApiModelProperty(value = "是否开启ssl" , required = true , example = "2")
-    private Integer sslEnable;
+    private Boolean sslEnable;
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
new file mode 100644
index 0000000000..b07801ceed
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
@@ -0,0 +1,8 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
+
+import lombok.Data;
+
+@Data
+public class MailAccountCreateReqVO extends MailAccountBaseVO{
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
new file mode 100644
index 0000000000..6ddbc2ae6f
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MailAccountPageReqVO extends PageParam {
+    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
+    private String from;
+
+    @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
+    private String username;
+
+    @ApiModelProperty(value = "密码" , required = true , example = "123456")
+    private String password;
+
+    @ApiModelProperty(value = "网站" , required = true , example = "www.iocoder.cn")
+    private String host;
+
+    @ApiModelProperty(value = "端口" , required = true , example = "80")
+    private String port;
+
+    @ApiModelProperty(value = "是否开启ssl" , required = true , example = "2")
+    private Boolean sslEnable;
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
new file mode 100644
index 0000000000..9482ce474e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
@@ -0,0 +1,8 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
+
+import lombok.Data;
+
+@Data
+public class MailAccountUpdateReqVO extends MailAccountBaseVO{
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
new file mode 100644
index 0000000000..a288dd84a1
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.system.convert.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface MailAccountConvert {
+    MailAccountConvert INSTANCE = Mappers.getMapper(MailAccountConvert.class);
+
+    MailAccountDO convert (MailAccountBaseVO mailAccountBaseVO);
+
+    MailAccountBaseVO convert (MailAccountDO mailAccountDO);
+
+    PageResult<MailAccountBaseVO>  convertPage(PageResult<MailAccountDO> pageResult);
+
+    List<MailAccountBaseVO> convertList02(List<MailAccountDO> list);
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java
deleted file mode 100644
index 465bff31ff..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/SystemMailAccountConvert.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.system.convert.mail;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface SystemMailAccountConvert {
-    SystemMailAccountConvert INSTANCE = Mappers.getMapper(SystemMailAccountConvert.class);
-
-    SystemMailAccountDO convert (SystemMailAccountBaseVO systemMailAccountBaseVO);
-
-    SystemMailAccountBaseVO convert (SystemMailAccountDO systemMailAccountDO);
-
-    PageResult<SystemMailAccountBaseVO>  convertPage(PageResult<SystemMailAccountDO> pageResult);
-
-    List<SystemMailAccountBaseVO> convertList02(List<SystemMailAccountDO> list);
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
similarity index 75%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index c5d90dfd19..195bc0bb0c 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -1,54 +1,46 @@
-package cn.iocoder.yudao.module.system.dal.dataobject.mail;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SystemMailAccount对象", description="")
-@TableName(value = "system_mail_account", autoResultMap = true)
-public class SystemMailAccountDO extends BaseDO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @TableId
-    private Long id;
-
-    @TableField("from")
-    private String from;
-
-    @TableField("username")
-    private String username;
-
-    @TableField("password")
-    private String password;
-
-    @TableField("host")
-    private String host;
-
-    @TableField("port")
-    private String port;
-
-    @TableField("sslEnable")
-    private Integer sslEnable;
-
-
-}
+package cn.iocoder.yudao.module.system.dal.dataobject.mail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="MailAccount对象", description="")
+@TableName(value = "system_mail_account", autoResultMap = true)
+public class MailAccountDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private Long id;
+
+    @TableField("from")
+    private String from;
+
+    @TableField("username")
+    private String username;
+
+    @TableField("password")
+    private String password;
+
+    @TableField("host")
+    private String host;
+
+    @TableField("port")
+    private String port;
+
+    @TableField("sslEnable")
+    private Boolean sslEnable;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
similarity index 88%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index b909e0c373..0d435a8c36 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailLogDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -1,61 +1,61 @@
-package cn.iocoder.yudao.module.system.dal.dataobject.mail;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.sql.Timestamp;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SystemMailLog对象", description="")
-public class SystemMailLogDO extends BaseDO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @TableId
-    private Long id;
-
-    @TableField("account_code")
-    private String accountCode;
-
-    @TableField("from")
-    private String from;
-
-    @TableField("temple_code")
-    private String templeCode;
-
-    @TableField("title")
-    private String title;
-
-    @TableField("content")
-    private String content;
-
-    @TableField("to")
-    private String to;
-
-    @TableField("sendTime")
-    private Timestamp sendTime;
-
-    @TableField("sendStatus")
-    private String sendStatus;
-
-    @TableField("sendResult")
-    private String sendResult;
-
-
-}
+package cn.iocoder.yudao.module.system.dal.dataobject.mail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.sql.Timestamp;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SystemMailLog对象", description="")
+public class MailLogDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private Long id;
+
+    @TableField("account_code")
+    private String accountCode;
+
+    @TableField("from")
+    private String from;
+
+    @TableField("temple_code")
+    private String templeCode;
+
+    @TableField("title")
+    private String title;
+
+    @TableField("content")
+    private String content;
+
+    @TableField("to")
+    private String to;
+
+    @TableField("sendTime")
+    private Timestamp sendTime;
+
+    @TableField("sendStatus")
+    private String sendStatus;
+
+    @TableField("sendResult")
+    private String sendResult;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTempleDO.java
similarity index 86%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTempleDO.java
index 3a13d1b4b0..c48de644d1 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/SystemMailTempleDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTempleDO.java
@@ -1,54 +1,54 @@
-package cn.iocoder.yudao.module.system.dal.dataobject.mail;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SystemMailTemple对象", description="")
-public class SystemMailTempleDO extends BaseDO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @TableId
-    private Long id;
-
-    @TableField("name")
-    private String name;
-
-    @TableField("code")
-    private String code;
-
-    @TableField("username")
-    private String username;
-
-    @TableField("title")
-    private String title;
-
-    @TableField("content")
-    private String content;
-
-    @TableField("status")
-    private String status;
-
-    @TableField("remark")
-    private String remark;
-
-
-}
+package cn.iocoder.yudao.module.system.dal.dataobject.mail;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 邮箱账号
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SystemMailTemple对象", description="")
+public class MailTempleDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId
+    private Long id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("code")
+    private String code;
+
+    @TableField("username")
+    private String username;
+
+    @TableField("title")
+    private String title;
+
+    @TableField("content")
+    private String content;
+
+    @TableField("status")
+    private String status;
+
+    @TableField("remark")
+    private String remark;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
new file mode 100644
index 0000000000..f7e06862f8
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
+
+    default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) {
+        return selectPage(pageReqVO, new QueryWrapperX<MailAccountDO>()
+                .likeIfPresent("form" , pageReqVO.getFrom())
+                .likeIfPresent("host" , pageReqVO.getHost())
+                .likeIfPresent("username" , pageReqVO.getUsername())
+                .eqIfPresent("password" , pageReqVO.getPassword())
+                .eqIfPresent("port" , pageReqVO.getPort())
+        );
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
similarity index 55%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
index 7432fdde3e..2f6912812e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailLogMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
@@ -1,16 +1,16 @@
-package cn.iocoder.yudao.module.system.dal.mysql.mail;
-
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailLogDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface SystemMailLogMapper extends BaseMapper<SystemMailLogDO> {
-
-}
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailLogMapper extends BaseMapper<MailLogDO> {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java
similarity index 53%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java
index 0460cc7b22..0264ca301c 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailTempleMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java
@@ -1,16 +1,16 @@
-package cn.iocoder.yudao.module.system.dal.mysql.mail;
-
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailTempleDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface SystemMailTempleMapper extends BaseMapper<SystemMailTempleDO> {
-
-}
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTempleDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailTempleMapper extends BaseMapper<MailTempleDO> {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
deleted file mode 100644
index d4855c1b29..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/SystemMailAccountMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.mail;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-import org.apache.ibatis.annotations.Mapper;
-
-// TODO @ジョイイ： Mapper 一般不用注释，因为用途不大
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Mapper
-public interface SystemMailAccountMapper extends BaseMapperX<SystemMailAccountDO> {
-
-    default PageResult<SystemMailAccountDO> selectPage(PageParam pageParam) {
-        return selectPage(pageParam, new QueryWrapperX<SystemMailAccountDO>());
-    }
-
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
new file mode 100644
index 0000000000..759263a40c
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ *  邮箱账号 Service 接口
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailAccountService {
+
+    Long create(MailAccountCreateReqVO createReqVO);
+
+    void update(MailAccountUpdateReqVO updateReqVO);
+
+    void delete(Long id);
+
+    MailAccountDO getMailAccount(Long id);
+
+    PageResult<MailAccountDO> getMailAccountPage(MailAccountPageReqVO pageReqVO);
+
+    List<MailAccountDO> getMailAccountList();
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
similarity index 71%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index ff5043878b..d5442936f9 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailLogService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.system.service.mail;
-
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface SystemMailLogService  {
-
-}
+package cn.iocoder.yudao.module.system.service.mail;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailLogService {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java
similarity index 71%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java
index 507b64b9ad..3c14626f94 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailTempleService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java
@@ -1,13 +1,13 @@
-package cn.iocoder.yudao.module.system.service.mail;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface SystemMailTempleService {
-
-}
+package cn.iocoder.yudao.module.system.service.mail;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailTempleService {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
deleted file mode 100644
index b7ffbfa417..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/SystemMailAccountService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.system.service.mail;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-
-import java.util.List;
-
-// TODO @ジョイイ：类注释，应该是 邮箱账号 Service 接口
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface SystemMailAccountService  {
-
-    Long create(SystemMailAccountBaseVO baseVO);
-
-    String update(SystemMailAccountBaseVO baseVO);
-
-    String delete(SystemMailAccountBaseVO baseVO);
-
-    SystemMailAccountDO getMailAccount(Long id);
-
-    PageResult<SystemMailAccountDO> getMailAccountPage(PageParam pageParam);
-
-    List<SystemMailAccountDO> getMailAccountList();
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
new file mode 100644
index 0000000000..11625a7bc9
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
+import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS;
+
+
+/**
+ * <p>
+ *  邮箱账号 Service 实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class MailAccountServiceImpl implements MailAccountService {
+
+    @Resource
+    private MailAccountMapper mailAccountMapper;
+
+    @Override
+    public Long create(MailAccountCreateReqVO createReqVO) {
+        // username 要校验唯一
+        Map<String , String> map = new HashMap<>();
+        map.put("username" , createReqVO.getUsername());
+        this.validateMailAccountOnly(map);
+        MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(createReqVO);
+        mailAccountMapper.insert(mailAccountDO);
+        return mailAccountDO.getId();
+    }
+
+    @Override
+    public void update(MailAccountUpdateReqVO updateReqVO) {
+        // username 要校验唯一
+        Map<String , String> map = new HashMap<>();
+        map.put("username" , updateReqVO.getUsername());
+        this.validateMailAccountOnly(map);
+        MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
+        // 校验是否存在
+        this.validateMailAccountExists(mailAccountDO.getId());
+        mailAccountMapper.updateById(mailAccountDO);
+    }
+
+
+    @Override
+    public void delete(Long id) {
+        // 校验是否存在
+        this.validateMailAccountExists(id);
+        mailAccountMapper.deleteById(id);
+    }
+
+    @Override
+    public MailAccountDO getMailAccount(Long id) {
+        return mailAccountMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<MailAccountDO> getMailAccountPage(MailAccountPageReqVO pageReqVO) {
+        return mailAccountMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<MailAccountDO> getMailAccountList() {
+        return mailAccountMapper.selectList();
+    }
+
+    private void validateMailAccountExists(Long id) {
+        if (mailAccountMapper.selectById(id) == null) {
+            throw exception(MAIL_ACCOUNT_NOT_EXISTS);
+        }
+    }
+
+    private void validateMailAccountOnly(Map params){
+        QueryWrapper queryWrapper = new QueryWrapper<MailAccountDO>();
+        params.forEach((k , v)->{
+            queryWrapper.like(k , v);
+        });
+        if (mailAccountMapper.selectOne(queryWrapper) != null) {
+            throw exception(MAIL_ACCOUNT_EXISTS);
+        }
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
similarity index 56%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index 4b17a3e21d..af2ff6694e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -1,18 +1,18 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
-
-
-import cn.iocoder.yudao.module.system.service.mail.SystemMailLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Service
-public class SystemMailLogServiceImpl  implements SystemMailLogService {
-
-}
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+
+import cn.iocoder.yudao.module.system.service.mail.MailLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class MailLogServiceImpl implements MailLogService {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java
similarity index 54%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java
index e59cb01ba1..be83bccc8c 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailTempleServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java
@@ -1,18 +1,18 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
-
-
-import cn.iocoder.yudao.module.system.service.mail.SystemMailTempleService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Service
-public class SystemMailTempleServiceImpl  implements SystemMailTempleService {
-
-}
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+
+import cn.iocoder.yudao.module.system.service.mail.MailTempleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class MailTempleServiceImpl implements MailTempleService {
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
deleted file mode 100644
index e1ef51267f..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/SystemMailAccountServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.SystemMailAccountBaseVO;
-import cn.iocoder.yudao.module.system.convert.mail.SystemMailAccountConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.SystemMailAccountDO;
-import cn.iocoder.yudao.module.system.dal.mysql.mail.SystemMailAccountMapper;
-import cn.iocoder.yudao.module.system.service.mail.SystemMailAccountService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-// TODO @ジョイイ：类注释，应该是 邮箱账号 Service 实现类
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Service
-public class SystemMailAccountServiceImpl  implements SystemMailAccountService {
-    // TODO @ジョイイ： private
-    @Resource
-    SystemMailAccountMapper systemMailAccountMapper;  // TODO @ジョイイ： 变量，和方法要空一行
-    @Override
-    public Long create(SystemMailAccountBaseVO baseVO) {
-        // TODO @ジョイイ： username 要校验唯一
-        SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
-        systemMailAccountMapper.insert(systemMailAccountDO);
-        return systemMailAccountDO.getId();
-    }
-
-    // TODO @ジョイイ： 不用返回值，void 即可
-    @Override
-    public String update(SystemMailAccountBaseVO baseVO) {
-        // TODO @ジョイイ： username 要校验唯一
-        // TODO @ジョイイ： 校验是否存在
-        SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
-        systemMailAccountMapper.updateById(systemMailAccountDO);
-        return null;
-    }
-
-    // TODO @ジョイイ： 不用返回值，void 即可
-
-    @Override
-    public String delete(SystemMailAccountBaseVO baseVO) {
-        // TODO @ジョイイ： 校验是否存在
-        SystemMailAccountDO systemMailAccountDO = SystemMailAccountConvert.INSTANCE.convert(baseVO);
-        systemMailAccountMapper.deleteById(systemMailAccountDO);
-        return null;
-    }
-
-    @Override
-    public SystemMailAccountDO getMailAccount(Long id) {
-        return systemMailAccountMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<SystemMailAccountDO> getMailAccountPage(PageParam pageParam) {
-        return systemMailAccountMapper.selectPage(pageParam);
-    }
-
-    @Override
-    public List<SystemMailAccountDO> getMailAccountList() {
-        return systemMailAccountMapper.selectList();
-    }
-
-}

From de10aa6ab2b43e7b26e2390320d5f076ec602973 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Sat, 26 Mar 2022 04:34:11 +0800
Subject: [PATCH 04/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailLogController.java         | 43 +++++++++++++++++-
 .../admin/mail/vo/log/MailLogBaseVO.java      | 42 +++++++++++++++++
 .../admin/mail/vo/log/MailLogExcelVO.java     | 37 +++++++++++++++
 .../admin/mail/vo/log/MailLogExportReqVO.java |  4 ++
 .../admin/mail/vo/log/MailLogPageReqVO.java   | 40 +++++++++++++++++
 .../admin/mail/vo/log/MailLogRespVO.java      |  4 ++
 .../system/convert/mail/MailLogConvert.java   | 19 ++++++++
 .../system/dal/dataobject/mail/MailLogDO.java |  5 ++-
 .../system/dal/mysql/mail/MailLogMapper.java  | 45 ++++++++++++++-----
 .../system/service/mail/MailLogService.java   | 10 +++++
 .../service/mail/impl/MailLogServiceImpl.java | 21 ++++++++-
 11 files changed, 256 insertions(+), 14 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
index 2bc87c6ac9..6615448d35 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
@@ -1,20 +1,59 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail;
 
 
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.*;
+import cn.iocoder.yudao.module.system.convert.mail.MailLogConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import cn.iocoder.yudao.module.system.service.mail.MailLogService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
 /**
  * <p>
- *  前端控制器
+ *  邮箱日志功能
  * </p>
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 @RestController
-@RequestMapping("/system-mail-log")
+@RequestMapping("/system/mail-log")
 public class MailLogController {
+    @Autowired
+    private MailLogService mailLogService;
 
+    @GetMapping("/page")
+    @ApiOperation("获得邮箱日志分页")
+    @PreAuthorize("@ss.hasPermission('system:mail-log:query')")
+    public CommonResult<PageResult<MailLogRespVO>> getMailLogPage(@Valid MailLogPageReqVO pageVO) {
+        PageResult<MailLogDO> pageResult = mailLogService.getMailLogPage(pageVO);
+        return success(MailLogConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @ApiOperation("导出邮箱日志Excel")
+    @PreAuthorize("@ss.hasPermission('system:mail-log:export')")
+    public void exportMailLogExcel(@Valid MailLogExportReqVO exportReqVO ,
+                                   HttpServletResponse response) throws IOException {
+        List<MailLogDO> list = mailLogService.getMailLogList(exportReqVO);
+        // 导出 Excel
+        List<MailLogExcelVO> datas = MailLogConvert.INSTANCE.convertList(list);
+        ExcelUtils.write(response, "邮箱日志.xls", "数据", MailLogExcelVO.class, datas);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
new file mode 100644
index 0000000000..80b6e8828e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Timestamp;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+public class MailLogBaseVO {
+
+    @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
+    private String from;
+
+    @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
+    private String templeId;
+
+    @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
+    private String templeCode;
+
+    @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
+    private String title;
+
+    @ApiModelProperty(value = "内容" , required = false , example = "遇到源码")
+    private String content;
+
+    @ApiModelProperty(value = "收件人" , required = false , example = "yudaoyuanma@456.com")
+    private String to;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "发送时间" , required = false , example = "2022-03-26 03:45:20")
+    private Timestamp sendTime;
+
+    @ApiModelProperty(value = "发送状态" , required = false , example = "1")
+    private Boolean sendStatus;
+
+    @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
+    private String sendResult;
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
new file mode 100644
index 0000000000..e6eee9f192
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Timestamp;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+public class MailLogExcelVO {
+
+    @ExcelProperty(value = "邮箱" )
+    private String from;
+
+    @ExcelProperty(value = "模版编号" )
+    private String templeCode;
+
+    @ExcelProperty(value = "标题")
+    private String title;
+
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    @ExcelProperty(value = "收件人" )
+    private String to;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ExcelProperty(value = "发送时间" )
+    private Timestamp sendTime;
+
+    @ExcelProperty(value = "发送状态")
+    private Boolean sendStatus;
+
+    @ExcelProperty(value = "发送结果")
+    private String sendResult;
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
new file mode 100644
index 0000000000..0c86969807
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
+
+public class MailLogExportReqVO extends MailLogPageReqVO{
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
new file mode 100644
index 0000000000..a12953af41
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Timestamp;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+@Data
+public class MailLogPageReqVO extends PageParam {
+    @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
+    private String from;
+
+    @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
+    private String templeId;
+
+    @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
+    private String templeCode;
+
+    @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
+    private String title;
+
+    @ApiModelProperty(value = "内容" , required = false , example = "遇到源码")
+    private String content;
+
+    @ApiModelProperty(value = "收件人" , required = false , example = "yudaoyuanma@456.com")
+    private String to;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "发送时间" , required = false , example = "2022-03-26 03:45:20")
+    private Timestamp sendTime;
+
+    @ApiModelProperty(value = "发送状态" , required = false , example = "1")
+    private Boolean sendStatus;
+
+    @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
+    private String sendResult;
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
new file mode 100644
index 0000000000..9bbf35179a
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
+
+public class MailLogRespVO extends MailLogBaseVO {
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
new file mode 100644
index 0000000000..4175508866
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.convert.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface MailLogConvert {
+    MailLogConvert INSTANCE = Mappers.getMapper(MailLogConvert.class);
+
+    PageResult<MailLogRespVO> convertPage(PageResult<MailLogDO> pageResult);
+
+    List<MailLogExcelVO> convertList(List<MailLogDO> list);
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 0d435a8c36..ae3d603da8 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -36,6 +36,9 @@ public class MailLogDO extends BaseDO implements Serializable {
     @TableField("from")
     private String from;
 
+    @TableField("temple_id")
+    private String templeId;
+
     @TableField("temple_code")
     private String templeCode;
 
@@ -52,7 +55,7 @@ public class MailLogDO extends BaseDO implements Serializable {
     private Timestamp sendTime;
 
     @TableField("sendStatus")
-    private String sendStatus;
+    private Boolean sendStatus;
 
     @TableField("sendResult")
     private String sendResult;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
index 2f6912812e..51be490190 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
@@ -1,16 +1,41 @@
 package cn.iocoder.yudao.module.system.dal.mysql.mail;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface MailLogMapper extends BaseMapper<MailLogDO> {
+import java.util.List;
 
+public interface MailLogMapper extends BaseMapperX<MailLogDO> {
+
+    default PageResult<MailLogDO> selectPage(MailLogPageReqVO pageVO){
+        return selectPage(pageVO , new QueryWrapperX<MailLogDO>()
+                .eqIfPresent("from", pageVO.getFrom())
+                .eqIfPresent("templeCode", pageVO.getTempleCode())
+                .likeIfPresent("title" , pageVO.getTitle())
+                .likeIfPresent("content" , pageVO.getContent())
+                .eqIfPresent("to", pageVO.getTo())
+                .eqIfPresent("sendTime" , pageVO.getSendTime())
+                .eqIfPresent("sendStatus" , pageVO.getSendStatus())
+                .eqIfPresent("sendResult" , pageVO.getSendResult())
+                .orderByDesc("sendTime")
+        );
+    };
+
+    default List<MailLogDO> selectList(MailLogExportReqVO exportReqVO){
+        return selectList(new QueryWrapperX<MailLogDO>()
+                .eqIfPresent("from", exportReqVO.getFrom())
+                .eqIfPresent("templeCode", exportReqVO.getTempleCode())
+                .likeIfPresent("title" , exportReqVO.getTitle())
+                .likeIfPresent("content" , exportReqVO.getContent())
+                .eqIfPresent("to", exportReqVO.getTo())
+                .eqIfPresent("sendTime" , exportReqVO.getSendTime())
+                .eqIfPresent("sendStatus" , exportReqVO.getSendStatus())
+                .eqIfPresent("sendResult" , exportReqVO.getSendResult())
+                .orderByDesc("sendTime")
+        );
+    };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index d5442936f9..79d38730d6 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -1,6 +1,13 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -11,4 +18,7 @@ package cn.iocoder.yudao.module.system.service.mail;
  */
 public interface MailLogService {
 
+    PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO);
+
+    List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index af2ff6694e..2daeeab3e8 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -1,12 +1,20 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
- *  服务实现类
+ *  邮箱日志实现类
  * </p>
  *
  * @author wangjingyi
@@ -14,5 +22,16 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MailLogServiceImpl implements MailLogService {
+    @Autowired
+    MailLogMapper mailLogMapper;
 
+    @Override
+    public PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO) {
+        return mailLogMapper.selectPage(pageVO);
+    }
+
+    @Override
+    public List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO) {
+        return mailLogMapper.selectList(exportReqVO);
+    }
 }

From 132c8b0e84d7741d3990f10cdc012cb1a490b9b7 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Sat, 26 Mar 2022 06:26:36 +0800
Subject: [PATCH 05/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9mapstruct=20=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |  5 +-
 .../admin/mail/MailAccountController.java     |  7 +-
 .../admin/mail/MailLogController.java         | 13 +--
 .../admin/mail/MailTemplateController.java    | 82 +++++++++++++++++
 .../admin/mail/MailTempleController.java      | 20 ----
 .../admin/mail/vo/log/MailLogBaseVO.java      |  4 +-
 .../admin/mail/vo/log/MailLogExcelVO.java     |  2 +
 .../admin/mail/vo/log/MailLogPageReqVO.java   |  5 +-
 .../admin/mail/vo/log/MailLogRespVO.java      | 39 +++++++-
 .../mail/vo/template/MailTemplateBaseVO.java  | 31 +++++++
 .../vo/template/MailTemplateCreateReqVO.java  | 10 ++
 .../vo/template/MailTemplatePageReqVO.java    | 32 +++++++
 .../vo/template/MailTemplateUpdateReqVO.java  |  7 ++
 .../convert/mail/MailTemplateConvert.java     | 26 ++++++
 .../system/dal/dataobject/mail/MailLogDO.java | 12 +--
 ...{MailTempleDO.java => MailTemplateDO.java} |  6 +-
 .../system/dal/mysql/mail/MailLogMapper.java  |  7 +-
 .../dal/mysql/mail/MailTemplateMapper.java    | 25 +++++
 .../dal/mysql/mail/MailTempleMapper.java      | 16 ----
 .../service/mail/MailTemplateService.java     | 33 +++++++
 .../service/mail/MailTempleService.java       | 13 ---
 .../mail/impl/MailTemplateServiceImpl.java    | 92 +++++++++++++++++++
 .../mail/impl/MailTempleServiceImpl.java      | 18 ----
 23 files changed, 405 insertions(+), 100 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/{MailTempleDO.java => MailTemplateDO.java} (88%)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 0cdab761cb..7def300428 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -121,7 +121,10 @@ public interface ErrorCodeConstants {
 
     // ========== 邮箱账号 1002019000 ==========
     ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002019000, "邮箱账号不存在");
-    ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002019000, "邮箱账号存在");
+    ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002019001, "邮箱账号存在");
 
+    // ========== 邮箱账号 1002020000 ==========
+    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002020000 , "邮箱模版不存在");
+    ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002020001, "邮箱账号存在");
 
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 5cace63780..9b62bf2332 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -24,14 +24,13 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 
-@Api(tags = "管理后台 - 邮件模板")
+@Api(tags = "管理后台 - 邮件账号")
 @RestController
 @RequestMapping("/system/mail-account")
 public class MailAccountController {
     @Resource
     private MailAccountService mailAccountService;
 
-
     @PostMapping("/create")
     @ApiOperation("创建邮箱账号")
     @PreAuthorize("@ss.hasPermission('system:mail-account:create')")
@@ -69,14 +68,14 @@ public class MailAccountController {
     @GetMapping("/page")
     @ApiOperation("获得邮箱账号分页")
     @PreAuthorize("@ss.hasPermission('system:mail-account:query')")
-    public CommonResult<PageResult<MailAccountBaseVO>> getSmsChannelPage(@Valid MailAccountPageReqVO pageReqVO) {
+    public CommonResult<PageResult<MailAccountBaseVO>> getMailAccountPage(@Valid MailAccountPageReqVO pageReqVO) {
         PageResult<MailAccountDO> pageResult = mailAccountService.getMailAccountPage(pageReqVO);
         return success(MailAccountConvert.INSTANCE.convertPage(pageResult));
     }
 
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获得邮箱账号精简列表")
-    public CommonResult<List<MailAccountBaseVO>> getSimpleSmsChannels() {
+    public CommonResult<List<MailAccountBaseVO>> getSimpleMailAccountList() {
         List<MailAccountDO> list = mailAccountService.getMailAccountList();
         // 排序后，返回给前端
         list.sort(Comparator.comparing(MailAccountDO::getId));
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
index 6615448d35..f6375f290a 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
@@ -8,14 +8,13 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.*;
 import cn.iocoder.yudao.module.system.convert.mail.MailLogConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
@@ -24,14 +23,8 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-/**
- * <p>
- *  邮箱日志功能
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
+
+@Api(tags = "管理后台 - 邮件日志")
 @RestController
 @RequestMapping("/system/mail-log")
 public class MailLogController {
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
new file mode 100644
index 0000000000..988882d839
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import java.util.Comparator;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "管理后台 - 邮件模版")
+@RestController
+@RequestMapping("/system/mail-template")
+public class MailTemplateController {
+    @Autowired
+    MailTemplateService mailTempleService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建邮箱模版")
+    @PreAuthorize("@ss.hasPermission('system:mail-template:create')")
+    public CommonResult<Long> createMailTemplate(@Valid @RequestBody MailTemplateCreateReqVO createReqVO){
+        return success(mailTempleService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("修改邮箱模版")
+    @PreAuthorize("@ss.hasPermission('system:mail-template:update')")
+    public CommonResult<Boolean> updateMailTemplate(@Valid @RequestBody MailTemplateUpdateReqVO updateReqVO){
+        mailTempleService.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除邮箱模版")
+    @PreAuthorize("@ss.hasPermission('system:mail-template:delete')")
+    public CommonResult<Boolean> deleteMailTemplate(@Valid @RequestBody Long id) {
+        mailTempleService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得邮箱模版")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:mail-template:get')")
+    public CommonResult<MailTemplateBaseVO> getMailTemplate(@RequestParam("id") Long id) {
+        MailTemplateDO mailTemplateDO = mailTempleService.getMailTemplate(id);
+        return success(MailTemplateConvert.INSTANCE.convert(mailTemplateDO));
+    }
+
+
+    @GetMapping("/page")
+    @ApiOperation("获得邮箱模版分页")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:query')")
+    public CommonResult<PageResult<MailTemplateBaseVO>> getMailTemplatePage(@Valid MailTemplatePageReqVO pageReqVO) {
+        PageResult<MailTemplateDO> pageResult = mailTempleService.getMailTemplatePage(pageReqVO);
+        return success(MailTemplateConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/list-all-simple")
+    @ApiOperation(value = "获得邮箱模版精简列表")
+    public CommonResult<List<MailTemplateBaseVO>> getSimpleTemplateList() {
+        List<MailTemplateDO> list = mailTempleService.getMailTemplateList();
+        // 排序后，返回给前端
+        list.sort(Comparator.comparing(MailTemplateDO::getId));
+        return success(MailTemplateConvert.INSTANCE.convertList02(list));
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java
deleted file mode 100644
index 7a4151fbed..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTempleController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@RestController
-@RequestMapping("/system-mail-temple")
-public class MailTempleController {
-
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
index 80b6e8828e..eec39193c5 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
@@ -15,10 +15,10 @@ public class MailLogBaseVO {
     private String from;
 
     @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
-    private String templeId;
+    private String templateId;
 
     @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
-    private String templeCode;
+    private String templateCode;
 
     @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
     private String title;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
index e6eee9f192..03d439f334 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
@@ -1,12 +1,14 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Timestamp;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
+@Data
 public class MailLogExcelVO {
 
     @ExcelProperty(value = "邮箱" )
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
index a12953af41..7ed4419b78 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -8,16 +8,17 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.sql.Timestamp;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Data
 public class MailLogPageReqVO extends PageParam {
     @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
     private String from;
 
     @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
-    private String templeId;
+    private String templateId;
 
     @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
-    private String templeCode;
+    private String templateCode;
 
     @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
     private String title;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
index 9bbf35179a..c3c5a2fdd4 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
@@ -1,4 +1,41 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
-public class MailLogRespVO extends MailLogBaseVO {
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Timestamp;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+@Data
+public class MailLogRespVO {
+
+    @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
+    private String from;
+
+    @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
+    private String templateId;
+
+    @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
+    private String templateCode;
+
+    @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
+    private String title;
+
+    @ApiModelProperty(value = "内容" , required = false , example = "遇到源码")
+    private String content;
+
+    @ApiModelProperty(value = "收件人" , required = false , example = "yudaoyuanma@456.com")
+    private String to;
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "发送时间" , required = false , example = "2022-03-26 03:45:20")
+    private Timestamp sendTime;
+
+    @ApiModelProperty(value = "发送状态" , required = false , example = "1")
+    private Boolean sendStatus;
+
+    @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
+    private String sendResult;
+
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
new file mode 100644
index 0000000000..b0577b44e0
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MailTemplateBaseVO {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("标识")
+    private String code;
+
+    @ApiModelProperty("发件人")
+    private String username;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("内容")
+    private String content;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
new file mode 100644
index 0000000000..e18c39026e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MailTemplateCreateReqVO extends MailTemplateBaseVO{
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
new file mode 100644
index 0000000000..5725febd01
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MailTemplatePageReqVO extends PageParam {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("标识")
+    private String code;
+
+    @ApiModelProperty("发件人")
+    private String username;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("内容")
+    private String content;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
new file mode 100644
index 0000000000..ed0d882bbd
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
@@ -0,0 +1,7 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+import lombok.Data;
+
+@Data
+public class MailTemplateUpdateReqVO extends MailTemplateBaseVO{
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
new file mode 100644
index 0000000000..3f4693bcb0
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.convert.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvertImpl;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface MailTemplateConvert {
+    MailTemplateConvert INSTANCE = Mappers.getMapper(MailTemplateConvert.class);
+
+    MailTemplateDO convert(MailTemplateBaseVO baseVO);
+
+    MailTemplateBaseVO convert(MailTemplateDO mailTemplateDO);
+
+    PageResult<MailTemplateBaseVO> convertPage(PageResult<MailTemplateDO> pageResult);
+
+    List<MailTemplateBaseVO> convertList02(List<MailTemplateDO> list);
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index ae3d603da8..8183174a1f 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -1,20 +1,18 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.sql.Timestamp;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ * 邮箱日志
  * </p>
  *
  * @author wangjingyi
@@ -36,11 +34,11 @@ public class MailLogDO extends BaseDO implements Serializable {
     @TableField("from")
     private String from;
 
-    @TableField("temple_id")
-    private String templeId;
+    @TableField("template_id")
+    private String templateId;
 
-    @TableField("temple_code")
-    private String templeCode;
+    @TableField("template_code")
+    private String templateCode;
 
     @TableField("title")
     private String title;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTempleDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
similarity index 88%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTempleDO.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index c48de644d1..e2d5a6d8cb 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTempleDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -13,7 +13,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 邮箱账号
+ * 邮箱模版
  * </p>
  *
  * @author wangjingyi
@@ -22,8 +22,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="SystemMailTemple对象", description="")
-public class MailTempleDO extends BaseDO implements Serializable {
+@ApiModel(value="SystemMailTemplate对象", description="")
+public class MailTemplateDO extends BaseDO implements Serializable {
 
     private static final long serialVersionUID = 1L;
     @TableId
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
index 51be490190..a8b8ccf61b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
@@ -6,15 +6,16 @@ import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-
+@Mapper
 public interface MailLogMapper extends BaseMapperX<MailLogDO> {
 
     default PageResult<MailLogDO> selectPage(MailLogPageReqVO pageVO){
         return selectPage(pageVO , new QueryWrapperX<MailLogDO>()
                 .eqIfPresent("from", pageVO.getFrom())
-                .eqIfPresent("templeCode", pageVO.getTempleCode())
+                .eqIfPresent("templeCode", pageVO.getTemplateCode())
                 .likeIfPresent("title" , pageVO.getTitle())
                 .likeIfPresent("content" , pageVO.getContent())
                 .eqIfPresent("to", pageVO.getTo())
@@ -28,7 +29,7 @@ public interface MailLogMapper extends BaseMapperX<MailLogDO> {
     default List<MailLogDO> selectList(MailLogExportReqVO exportReqVO){
         return selectList(new QueryWrapperX<MailLogDO>()
                 .eqIfPresent("from", exportReqVO.getFrom())
-                .eqIfPresent("templeCode", exportReqVO.getTempleCode())
+                .eqIfPresent("templeCode", exportReqVO.getTemplateCode())
                 .likeIfPresent("title" , exportReqVO.getTitle())
                 .likeIfPresent("content" , exportReqVO.getContent())
                 .eqIfPresent("to", exportReqVO.getTo())
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
new file mode 100644
index 0000000000..06e76d9ab7
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.dal.mysql.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
+
+    default PageResult<MailTemplateDO> selectPage(MailTemplatePageReqVO pageReqVO){
+        return selectPage(pageReqVO , new QueryWrapperX<MailTemplateDO>()
+                .likeIfPresent("name" , pageReqVO.getName())
+                .likeIfPresent("username" , pageReqVO.getUsername())
+                .likeIfPresent("title" , pageReqVO.getTitle())
+                .likeIfPresent("content" , pageReqVO.getContent())
+                .eqIfPresent("status" , pageReqVO.getStatus())
+                .likeIfPresent("remark" , pageReqVO.getRemark())
+        );
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java
deleted file mode 100644
index 0264ca301c..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTempleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.mail;
-
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTempleDO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface MailTempleMapper extends BaseMapper<MailTempleDO> {
-
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
new file mode 100644
index 0000000000..3aaf72a48b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailTemplateService {
+
+    Long create(MailTemplateCreateReqVO createReqVO);
+
+    void update(MailTemplateUpdateReqVO updateReqVO);
+
+    void delete(Long id);
+
+    MailTemplateDO getMailTemplate(Long id);
+
+    PageResult<MailTemplateDO> getMailTemplatePage(MailTemplatePageReqVO pageReqVO);
+
+    List<MailTemplateDO> getMailTemplateList();
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java
deleted file mode 100644
index 3c14626f94..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTempleService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.iocoder.yudao.module.system.service.mail;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-public interface MailTempleService {
-
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
new file mode 100644
index 0000000000..377bbd6584
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -0,0 +1,92 @@
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+
+/**
+ * <p>
+ *  邮箱模版 服务实现类
+ * </p>
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+public class MailTemplateServiceImpl implements MailTemplateService {
+    @Resource
+    private MailTemplateMapper mailTemplateMapper;
+
+    @Override
+    public Long create(MailTemplateCreateReqVO createReqVO) {
+        // name 要校验唯一
+        Map<String , String> map = new HashMap<>();
+        map.put("name" , createReqVO.getName());
+        this.validateMailTemplateOnly(map);
+        MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
+        mailTemplateMapper.insert(mailTemplateDO);
+        return mailTemplateDO.getId();
+    }
+
+    @Override
+    public void update(MailTemplateUpdateReqVO updateReqVO) {
+        // username 要校验唯一
+        Map<String , String> map = new HashMap<>();
+        map.put("username" , updateReqVO.getUsername());
+        this.validateMailTemplateOnly(map);
+        MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
+        // 校验是否存在
+        this.validateMailTemplateExists(mailTemplateDO.getId());
+        mailTemplateMapper.updateById(mailTemplateDO);
+    }
+    @Override
+    public void delete(Long id) {
+        // 校验是否存在
+        this.validateMailTemplateExists(id);
+        mailTemplateMapper.deleteById(id);
+    }
+
+    @Override
+    public MailTemplateDO getMailTemplate(Long id) {return mailTemplateMapper.selectById(id);}
+
+    @Override
+    public PageResult<MailTemplateDO> getMailTemplatePage(MailTemplatePageReqVO pageReqVO) {
+        return mailTemplateMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<MailTemplateDO> getMailTemplateList() {return mailTemplateMapper.selectList();}
+
+    private void validateMailTemplateExists(Long id) {
+        if (mailTemplateMapper.selectById(id) == null) {
+            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
+        }
+    }
+
+    private void validateMailTemplateOnly(Map params){
+        QueryWrapper queryWrapper = new QueryWrapper<MailTemplateDO>();
+        params.forEach((k , v)->{
+            queryWrapper.like(k , v);
+        });
+        if (mailTemplateMapper.selectOne(queryWrapper) != null) {
+            throw exception(MAIL_TEMPLATE_EXISTS);
+        }
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java
deleted file mode 100644
index be83bccc8c..0000000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTempleServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
-
-
-import cn.iocoder.yudao.module.system.service.mail.MailTempleService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Service
-public class MailTempleServiceImpl implements MailTempleService {
-
-}

From bd86b89ea53226071a07a0e821d2ad00bea8e028 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Sat, 26 Mar 2022 07:50:58 +0800
Subject: [PATCH 06/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=20FI?=
 =?UTF-8?q?XME=E9=83=A8=E5=88=86=E9=9C=80=E8=A6=81=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailAccountController.java     |  8 ++++
 .../admin/mail/vo/send/MailSendVO.java        | 26 +++++++++++++
 .../dal/dataobject/mail/MailAccountDO.java    |  4 +-
 .../service/mail/MailAccountService.java      |  3 ++
 .../mail/impl/MailAccountServiceImpl.java     | 37 +++++++++++++++++++
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 9b62bf2332..33469e3c23 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccou
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailSendVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
@@ -81,4 +82,11 @@ public class MailAccountController {
         list.sort(Comparator.comparing(MailAccountDO::getId));
         return success(MailAccountConvert.INSTANCE.convertList02(list));
     }
+    @PostMapping("/send")
+    @ApiOperation("发送邮件")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:send')")
+    public CommonResult<Boolean> sendMail(MailSendVO mailSendVO){
+        mailAccountService.sendMail(mailSendVO);
+        return success(true);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
new file mode 100644
index 0000000000..41d9d03b48
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.send;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class MailSendVO {
+
+    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
+    private String from;
+
+    @ApiModelProperty(value = "标题"  , example = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容"  , example = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "收件人" , required = true , example = "yudaoyuanma@123.com")
+    private List<String> tos;
+
+    @ApiModelProperty(value = "附件"  , example = "附件编码")
+    private List<String> fileIds;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index 195bc0bb0c..2147af7fe4 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="MailAccount对象", description="")
+@ApiModel(value="MailAccount对象", description="邮箱账号")
 @TableName(value = "system_mail_account", autoResultMap = true)
 public class MailAccountDO extends BaseDO implements Serializable {
 
@@ -37,7 +37,7 @@ public class MailAccountDO extends BaseDO implements Serializable {
     private String host;
 
     @TableField("port")
-    private String port;
+    private Integer port;
 
     @TableField("sslEnable")
     private Boolean sslEnable;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 759263a40c..3cc0acb023 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailSendVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 
 import java.util.List;
@@ -30,4 +31,6 @@ public interface MailAccountService {
     PageResult<MailAccountDO> getMailAccountPage(MailAccountPageReqVO pageReqVO);
 
     List<MailAccountDO> getMailAccountList();
+
+    void sendMail(MailSendVO mailSendVO);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 11625a7bc9..98aa646c7f 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -1,12 +1,17 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
+import cn.hutool.extra.mail.MailAccount;
+import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailSendVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
@@ -35,6 +40,9 @@ public class MailAccountServiceImpl implements MailAccountService {
     @Resource
     private MailAccountMapper mailAccountMapper;
 
+    @Resource
+    private MailTemplateMapper mailTemplateMapper;
+
     @Override
     public Long create(MailAccountCreateReqVO createReqVO) {
         // username 要校验唯一
@@ -81,6 +89,35 @@ public class MailAccountServiceImpl implements MailAccountService {
         return mailAccountMapper.selectList();
     }
 
+    @Override
+    public void sendMail(MailSendVO mailSendVO) {
+        // FIXME 查询模版信息 查询模版多条时 使用规则是什么
+        List<MailTemplateDO> mailTemplateDOList =  mailTemplateMapper.selectList(
+                "username",mailSendVO.getFrom()
+        );
+        //查询账号信息
+        MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
+                "from",mailSendVO.getFrom()
+        );
+        // FIXME 模版和邮件内容合成方式未知
+        String content = mailSendVO.getContent();
+        String templateContent = "";
+        // 后续功能 TODO ：附件查询
+        //List<String> fileIds = mailSendVO.getFileIds();
+
+        //装载账号信息
+        MailAccount account = new MailAccount();
+        account.setHost(mailAccountDO.getHost());
+        account.setPort(mailAccountDO.getPort());
+        account.setAuth(true);
+        account.setFrom(mailAccountDO.getFrom());
+        account.setUser(mailAccountDO.getUsername());
+        account.setPass(mailAccountDO.getPassword());
+        account.setSslEnable(mailAccountDO.getSslEnable());
+        //发送
+        MailUtil.send(account , mailSendVO.getTos() , mailSendVO.getTitle() , mailSendVO.getContent() , false);
+    }
+
     private void validateMailAccountExists(Long id) {
         if (mailAccountMapper.selectById(id) == null) {
             throw exception(MAIL_ACCOUNT_NOT_EXISTS);

From e4326036f86657685bc357eefa1de3525c4a4def Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Sat, 26 Mar 2022 08:06:32 +0800
Subject: [PATCH 07/67] =?UTF-8?q?fix=20=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=20=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF=E8=A3=85?=
 =?UTF-8?q?=E8=BD=BD=20=E5=9C=A8convert=E4=B8=AD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/convert/mail/MailAccountConvert.java      | 12 ++++++++++++
 .../service/mail/impl/MailAccountServiceImpl.java    | 10 ++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index a288dd84a1..fe768efbdd 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.convert.mail;
 
+import cn.hutool.extra.mail.MailAccount;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
@@ -19,4 +20,15 @@ public interface MailAccountConvert {
     PageResult<MailAccountBaseVO>  convertPage(PageResult<MailAccountDO> pageResult);
 
     List<MailAccountBaseVO> convertList02(List<MailAccountDO> list);
+
+    default MailAccount convertAccount(MailAccountDO mailAccountDO){
+        return new MailAccount()
+                .setHost(mailAccountDO.getHost())
+                .setPort(mailAccountDO.getPort())
+                .setAuth(true)
+                .setFrom(mailAccountDO.getFrom())
+                .setUser(mailAccountDO.getUsername())
+                .setPass(mailAccountDO.getPassword())
+                .setSslEnable(mailAccountDO.getSslEnable());
+    };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 98aa646c7f..0c0d86eba4 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -106,14 +106,8 @@ public class MailAccountServiceImpl implements MailAccountService {
         //List<String> fileIds = mailSendVO.getFileIds();
 
         //装载账号信息
-        MailAccount account = new MailAccount();
-        account.setHost(mailAccountDO.getHost());
-        account.setPort(mailAccountDO.getPort());
-        account.setAuth(true);
-        account.setFrom(mailAccountDO.getFrom());
-        account.setUser(mailAccountDO.getUsername());
-        account.setPass(mailAccountDO.getPassword());
-        account.setSslEnable(mailAccountDO.getSslEnable());
+        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
+
         //发送
         MailUtil.send(account , mailSendVO.getTos() , mailSendVO.getTitle() , mailSendVO.getContent() , false);
     }

From 017d6e5e4e62779488e8307500f5b8fdf6fce8a3 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Sat, 26 Mar 2022 08:19:36 +0800
Subject: [PATCH 08/67] =?UTF-8?q?fix=20=E9=82=AE=E4=BB=B6=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E6=A8=A1=E5=9D=97=20=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=20=E9=82=AE=E7=AE=B1=E8=B4=A6=E5=8F=B7=20->=20?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iocoder/yudao/module/system/enums/ErrorCodeConstants.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 7def300428..8520cb1155 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -123,8 +123,8 @@ public interface ErrorCodeConstants {
     ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002019000, "邮箱账号不存在");
     ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002019001, "邮箱账号存在");
 
-    // ========== 邮箱账号 1002020000 ==========
+    // ========== 邮箱模版 1002020000 ==========
     ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002020000 , "邮箱模版不存在");
-    ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002020001, "邮箱账号存在");
+    ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002020001, "邮箱模版存在");
 
 }

From 082c209c87feb9e193fa3811e7d1757b1428717b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 27 Mar 2022 12:01:20 +0800
Subject: [PATCH 09/67] =?UTF-8?q?code=20review=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=9A=84=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/mail/MailAccountController.java      | 8 ++++----
 .../admin/mail/vo/account/MailAccountCreateReqVO.java     | 4 ++--
 .../admin/mail/vo/account/MailAccountUpdateReqVO.java     | 2 ++
 .../system/controller/admin/mail/vo/send/MailSendVO.java  | 2 +-
 .../module/system/service/mail/MailAccountService.java    | 4 ++--
 .../system/service/mail/impl/MailAccountServiceImpl.java  | 7 +++++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 33469e3c23..0fb95087a0 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -30,7 +30,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/system/mail-account")
 public class MailAccountController {
     @Resource
-    private MailAccountService mailAccountService;
+    private MailAccountService mailAccountService; // TODO @wangjingyi：属性和类名，中间要空一行
 
     @PostMapping("/create")
     @ApiOperation("创建邮箱账号")
@@ -50,7 +50,7 @@ public class MailAccountController {
 
     @DeleteMapping("/delete")
     @ApiOperation("删除邮箱账号")
-    @PreAuthorize("@ss.hasPermission('system:mail-account:delete')")
+    @PreAuthorize("@ss.hasPermission('system:mail-account:delete')") // TODO @wangjingyi：id 应该是 @RequestParam。另外，id 的 swagger 注解，要写下
     public CommonResult<Boolean> deleteMailAccount(@Valid @RequestBody Long id) {
         mailAccountService.delete(id);
         return success(true);
@@ -63,7 +63,7 @@ public class MailAccountController {
     public CommonResult<MailAccountBaseVO> getMailAccount(@RequestParam("id") Long id) {
         MailAccountDO mailAccountDO = mailAccountService.getMailAccount(id);
         return success(MailAccountConvert.INSTANCE.convert(mailAccountDO));
-    }
+    } // TODO wangjingyi：方法与方法之间，只空一行
 
 
     @GetMapping("/page")
@@ -82,7 +82,7 @@ public class MailAccountController {
         list.sort(Comparator.comparing(MailAccountDO::getId));
         return success(MailAccountConvert.INSTANCE.convertList02(list));
     }
-    @PostMapping("/send")
+    @PostMapping("/send") // TODO wangjingyi：方法与方法之间，空一行
     @ApiOperation("发送邮件")
     @PreAuthorize("@ss.hasPermission('system:mail-account:send')")
     public CommonResult<Boolean> sendMail(MailSendVO mailSendVO){
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
index b07801ceed..9dc6819620 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
 import lombok.Data;
 
-@Data
-public class MailAccountCreateReqVO extends MailAccountBaseVO{
+@Data // TODO @wangjingyi：swagger 注解
+public class MailAccountCreateReqVO extends MailAccountBaseVO{ // TODO @wangjingyi：要空格再 {
 
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
index 9482ce474e..925e7cd44e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
@@ -5,4 +5,6 @@ import lombok.Data;
 @Data
 public class MailAccountUpdateReqVO extends MailAccountBaseVO{
 
+    // TODO @wangjingyi：更新的话，是不是要有个 id？？？
+
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
index 41d9d03b48..4d1bd9a5fa 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
@@ -5,7 +5,7 @@ import lombok.Data;
 
 import java.util.List;
 @Data
-public class MailSendVO {
+public class MailSendVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
 
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     private String from;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 3cc0acb023..464c432050 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -13,12 +13,12 @@ import java.util.List;
 /**
  * <p>
  *  邮箱账号 Service 接口
- * </p>
+ * </p>  // TODO wangjingyi：不用 <p></p> 标签；
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
-public interface MailAccountService {
+public interface MailAccountService { // TODO wangjingyi：方法的注释
 
     Long create(MailAccountCreateReqVO createReqVO);
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 0c0d86eba4..c4610222ad 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -62,7 +62,7 @@ public class MailAccountServiceImpl implements MailAccountService {
         this.validateMailAccountOnly(map);
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
-        this.validateMailAccountExists(mailAccountDO.getId());
+        this.validateMailAccountExists(mailAccountDO.getId()); // TODO wangjingyi：没有传递 id 噢
         mailAccountMapper.updateById(mailAccountDO);
     }
 
@@ -92,6 +92,7 @@ public class MailAccountServiceImpl implements MailAccountService {
     @Override
     public void sendMail(MailSendVO mailSendVO) {
         // FIXME 查询模版信息 查询模版多条时 使用规则是什么
+        // 回复：选择某一条模板，进行发送邮件。
         List<MailTemplateDO> mailTemplateDOList =  mailTemplateMapper.selectList(
                 "username",mailSendVO.getFrom()
         );
@@ -100,6 +101,7 @@ public class MailAccountServiceImpl implements MailAccountService {
                 "from",mailSendVO.getFrom()
         );
         // FIXME 模版和邮件内容合成方式未知
+        // 回复：参考短信的方式，通过 {name} {mobile} 这样的占位符。搜 formatSmsTemplateContent 方法
         String content = mailSendVO.getContent();
         String templateContent = "";
         // 后续功能 TODO ：附件查询
@@ -119,9 +121,10 @@ public class MailAccountServiceImpl implements MailAccountService {
     }
 
     private void validateMailAccountOnly(Map params){
+        // TODO wangjingyi：Service 里，不允许出现 MyBatis 操作。而是 Mapper 提供对应查询方法
         QueryWrapper queryWrapper = new QueryWrapper<MailAccountDO>();
         params.forEach((k , v)->{
-            queryWrapper.like(k , v);
+            queryWrapper.like(k , v); // TODO wangjingyi：账号，应该是 equlas，不能是 like
         });
         if (mailAccountMapper.selectOne(queryWrapper) != null) {
             throw exception(MAIL_ACCOUNT_EXISTS);

From 1a120cd07c8cb1bfa71c6cce6c9dc27c2c6b8b4d Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Wed, 30 Mar 2022 14:17:53 +0800
Subject: [PATCH 10/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mail/vo/send/{MailSendVO.java => MailReqVO.java} | 12 +++++++++++-
 .../system/convert/mail/MailAccountConvert.java      | 11 +++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 rename yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/{MailSendVO.java => MailReqVO.java} (60%)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
similarity index 60%
rename from yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
rename to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
index 4d1bd9a5fa..0bd9d5d22e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
@@ -1,13 +1,18 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.send;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
+
+@ApiModel("管理后台 - 邮件发送 Req VO")
 @Data
-public class MailSendVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
+public class MailReqVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
 
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
+    @NotNull(message = "邮箱账号不能为空")
     private String from;
 
     @ApiModelProperty(value = "标题"  , example = "标题")
@@ -16,7 +21,12 @@ public class MailSendVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
     @ApiModelProperty(value = "内容"  , example = "内容")
     private String content;
 
+    @ApiModelProperty(value = "邮箱模版id" , example = "1024")
+    @NotNull(message = "邮箱模版id不能为空")
+    private Integer templateId;
+
     @ApiModelProperty(value = "收件人" , required = true , example = "yudaoyuanma@123.com")
+    @NotNull(message = "收件人不能为空")
     private List<String> tos;
 
     @ApiModelProperty(value = "附件"  , example = "附件编码")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index fe768efbdd..8dbfbc58d9 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -7,7 +7,9 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MailAccountConvert {
@@ -31,4 +33,13 @@ public interface MailAccountConvert {
                 .setPass(mailAccountDO.getPassword())
                 .setSslEnable(mailAccountDO.getSslEnable());
     };
+
+    default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
+        Map<String , String> map = new HashMap<>();
+        map.put("from" , mailAccountDO.getFrom());
+        map.put("username" , mailAccountDO.getUsername());
+        map.put("content" , content);
+        return map;
+    };
+
 }

From f349fbf84a03c5926e9bd9ebeafef5699377836c Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Wed, 30 Mar 2022 14:20:32 +0800
Subject: [PATCH 11/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97swagg?=
 =?UTF-8?q?er=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailAccountController.java     | 20 +++++-----
 .../mail/vo/account/MailAccountBaseVO.java    |  3 +-
 .../vo/account/MailAccountCreateReqVO.java    | 10 ++++-
 .../mail/vo/account/MailAccountPageReqVO.java |  6 +++
 .../vo/account/MailAccountUpdateReqVO.java    | 15 ++++++-
 .../admin/mail/vo/log/MailLogBaseVO.java      |  4 ++
 .../admin/mail/vo/log/MailLogExcelVO.java     |  2 +
 .../admin/mail/vo/log/MailLogExportReqVO.java |  7 +++-
 .../admin/mail/vo/log/MailLogPageReqVO.java   |  6 +++
 .../admin/mail/vo/log/MailLogRespVO.java      |  3 ++
 .../mail/vo/template/MailTemplateBaseVO.java  |  2 +
 .../vo/template/MailTemplateCreateReqVO.java  |  9 ++++-
 .../vo/template/MailTemplatePageReqVO.java    |  6 +++
 .../vo/template/MailTemplateUpdateReqVO.java  | 15 ++++++-
 .../service/mail/MailAccountService.java      | 40 ++++++++++++++++---
 .../system/service/mail/MailLogService.java   | 15 +++++--
 .../service/mail/MailTemplateService.java     | 33 ++++++++++++---
 .../service/mail/impl/MailLogServiceImpl.java |  3 +-
 .../mail/impl/MailTemplateServiceImpl.java    |  4 +-
 19 files changed, 166 insertions(+), 37 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 0fb95087a0..2d2eb959b5 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccou
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailSendVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
@@ -29,8 +29,9 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/system/mail-account")
 public class MailAccountController {
+
     @Resource
-    private MailAccountService mailAccountService; // TODO @wangjingyi：属性和类名，中间要空一行
+    private MailAccountService mailAccountService;
 
     @PostMapping("/create")
     @ApiOperation("创建邮箱账号")
@@ -50,8 +51,9 @@ public class MailAccountController {
 
     @DeleteMapping("/delete")
     @ApiOperation("删除邮箱账号")
-    @PreAuthorize("@ss.hasPermission('system:mail-account:delete')") // TODO @wangjingyi：id 应该是 @RequestParam。另外，id 的 swagger 注解，要写下
-    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestBody Long id) {
+    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:mail-account:delete')")
+    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestParam Long id) {
         mailAccountService.delete(id);
         return success(true);
     }
@@ -63,8 +65,7 @@ public class MailAccountController {
     public CommonResult<MailAccountBaseVO> getMailAccount(@RequestParam("id") Long id) {
         MailAccountDO mailAccountDO = mailAccountService.getMailAccount(id);
         return success(MailAccountConvert.INSTANCE.convert(mailAccountDO));
-    } // TODO wangjingyi：方法与方法之间，只空一行
-
+    }
 
     @GetMapping("/page")
     @ApiOperation("获得邮箱账号分页")
@@ -82,11 +83,12 @@ public class MailAccountController {
         list.sort(Comparator.comparing(MailAccountDO::getId));
         return success(MailAccountConvert.INSTANCE.convertList02(list));
     }
-    @PostMapping("/send") // TODO wangjingyi：方法与方法之间，空一行
+
+    @PostMapping("/send")
     @ApiOperation("发送邮件")
     @PreAuthorize("@ss.hasPermission('system:mail-account:send')")
-    public CommonResult<Boolean> sendMail(MailSendVO mailSendVO){
-        mailAccountService.sendMail(mailSendVO);
+    public CommonResult<Boolean> sendMail(MailReqVO mailReqVO){
+        mailAccountService.sendMail(mailReqVO);
         return success(true);
     }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 7b65a08768..49400316b6 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -1,8 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel("管理后台 - 邮箱账号基类 Base VO")
 @Data
 public class MailAccountBaseVO {
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
index 9dc6819620..8585e9d75c 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
@@ -1,8 +1,14 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-@Data // TODO @wangjingyi：swagger 注解
-public class MailAccountCreateReqVO extends MailAccountBaseVO{ // TODO @wangjingyi：要空格再 {
+@ApiModel("管理后台 - 邮箱账号创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailAccountCreateReqVO extends MailAccountBaseVO {
 
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
index 6ddbc2ae6f..520f319982 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
@@ -1,10 +1,16 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
+@ApiModel("管理后台 - 邮箱账号分页 Request VO")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class MailAccountPageReqVO extends PageParam {
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     private String from;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
index 925e7cd44e..43a13ad18b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
@@ -1,10 +1,21 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
+import javax.validation.constraints.NotNull;
+
+@ApiModel("管理后台 - 邮箱账号修改 Request VO")
 @Data
-public class MailAccountUpdateReqVO extends MailAccountBaseVO{
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailAccountUpdateReqVO extends MailAccountBaseVO {
 
-    // TODO @wangjingyi：更新的话，是不是要有个 id？？？
+    @ApiModelProperty(value = "编号", required = true, example = "1024")
+    @NotNull(message = "编号不能为空")
+    private Long id;
 
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
index eec39193c5..04679c7f03 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
@@ -2,13 +2,17 @@ package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Timestamp;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
+@ApiModel("管理后台 - 邮箱日志基类 Base VO")
+@Data
 public class MailLogBaseVO {
 
     @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
index 03d439f334..442a101a30 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -8,6 +9,7 @@ import java.sql.Timestamp;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
+@ApiModel("管理后台 - 邮箱日志导出 Request VO")
 @Data
 public class MailLogExcelVO {
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
index 0c86969807..7f737ae4bf 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
@@ -1,4 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
-public class MailLogExportReqVO extends MailLogPageReqVO{
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel("管理后台 - 邮箱日志导出 Request VO")
+@Data
+public class MailLogExportReqVO extends MailLogPageReqVO {
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
index 7ed4419b78..9928a77469 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -1,15 +1,21 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Timestamp;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
+@ApiModel("管理后台 - 邮箱日志分页 Request VO")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class MailLogPageReqVO extends PageParam {
     @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
     private String from;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
index c3c5a2fdd4..af8e81698d 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -7,6 +8,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.sql.Timestamp;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 邮箱日志返回 Request VO")
 @Data
 public class MailLogRespVO {
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
index b0577b44e0..b718e29187 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
@@ -1,8 +1,10 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+@ApiModel("管理后台 - 邮箱模版基类 Base VO")
 @Data
 public class MailTemplateBaseVO {
     @ApiModelProperty("主键")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
index e18c39026e..2311cb087b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
@@ -1,10 +1,15 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
+@ApiModel("管理后台 - 邮箱模版创建 Request VO")
 @Data
-public class MailTemplateCreateReqVO extends MailTemplateBaseVO{
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailTemplateCreateReqVO extends MailTemplateBaseVO {
 
 
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
index 5725febd01..398e6ac03b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
@@ -1,10 +1,16 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
+@ApiModel("管理后台 - 邮箱模版分页 Request VO")
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class MailTemplatePageReqVO extends PageParam {
     @ApiModelProperty("主键")
     private Long id;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
index ed0d882bbd..82d9997bee 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
@@ -1,7 +1,20 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
+import javax.validation.constraints.NotNull;
+
+@ApiModel("管理后台 - 邮箱模版修改 Request VO")
 @Data
-public class MailTemplateUpdateReqVO extends MailTemplateBaseVO{
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailTemplateUpdateReqVO extends MailTemplateBaseVO {
+
+    @ApiModelProperty(value = "编号", required = true, example = "1024")
+    @NotNull(message = "编号不能为空")
+    private Long id;
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 464c432050..5b8a07b34a 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -4,33 +4,61 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailSendVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 
 import java.util.List;
 
 
 /**
- * <p>
  *  邮箱账号 Service 接口
- * </p>  // TODO wangjingyi：不用 <p></p> 标签；
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
-public interface MailAccountService { // TODO wangjingyi：方法的注释
-
+public interface MailAccountService {
+    /**
+     * 创建邮箱账号
+     * @param createReqVO
+     * @return
+     */
     Long create(MailAccountCreateReqVO createReqVO);
 
+    /**
+     * 修改邮箱账号
+     * @param updateReqVO
+     */
     void update(MailAccountUpdateReqVO updateReqVO);
 
+    /**
+     * 删除邮箱账号
+     * @param id
+     */
     void delete(Long id);
 
+    /**
+     * 获取邮箱账号信息
+     * @param id
+     * @return
+     */
     MailAccountDO getMailAccount(Long id);
 
+    /**
+     * 获取邮箱账号分页信息
+     * @param pageReqVO
+     * @return
+     */
     PageResult<MailAccountDO> getMailAccountPage(MailAccountPageReqVO pageReqVO);
 
+    /**
+     * 获取邮箱数组信息
+     * @return
+     */
     List<MailAccountDO> getMailAccountList();
 
-    void sendMail(MailSendVO mailSendVO);
+    /**
+     * 发送邮件
+     * @param mailReqVO
+     */
+    void sendMail(MailReqVO mailReqVO);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index 79d38730d6..fa195259bf 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -9,16 +9,23 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ *  邮箱日志服务类
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 public interface MailLogService {
-
+    /**
+     * 邮箱日志分页
+     * @param pageVO
+     * @return
+     */
     PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO);
 
+    /**
+     * 邮箱日志数组信息
+     * @param exportReqVO
+     * @return
+     */
     List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 3aaf72a48b..da68a43d06 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -4,30 +4,53 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 
 import java.util.List;
 
 /**
- * <p>
- *  服务类
- * </p>
+ *  邮箱模版服务类
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 public interface MailTemplateService {
-
+    /**
+     * 邮箱模版创建
+     * @param createReqVO
+     * @return
+     */
     Long create(MailTemplateCreateReqVO createReqVO);
 
+    /**
+     * 邮箱模版修改
+     * @param updateReqVO
+     */
     void update(MailTemplateUpdateReqVO updateReqVO);
 
+    /**
+     * 邮箱模版删除
+     * @param id
+     */
     void delete(Long id);
 
+    /**
+     * 获取邮箱模版
+     * @param id
+     * @return
+     */
     MailTemplateDO getMailTemplate(Long id);
 
+    /**
+     * 获取邮箱模版分页
+     * @param pageReqVO
+     * @return
+     */
     PageResult<MailTemplateDO> getMailTemplatePage(MailTemplatePageReqVO pageReqVO);
 
+    /**
+     * 获取邮箱模板数组
+     * @return
+     */
     List<MailTemplateDO> getMailTemplateList();
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index 2daeeab3e8..7e4950f6d3 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -13,15 +13,14 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * <p>
  *  邮箱日志实现类
- * </p>
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 @Service
 public class MailLogServiceImpl implements MailLogService {
+
     @Autowired
     MailLogMapper mailLogMapper;
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 377bbd6584..92db1d83cb 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -22,15 +22,14 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
- * <p>
  *  邮箱模版 服务实现类
- * </p>
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 @Service
 public class MailTemplateServiceImpl implements MailTemplateService {
+
     @Resource
     private MailTemplateMapper mailTemplateMapper;
 
@@ -56,6 +55,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         this.validateMailTemplateExists(mailTemplateDO.getId());
         mailTemplateMapper.updateById(mailTemplateDO);
     }
+
     @Override
     public void delete(Long id) {
         // 校验是否存在

From 1bf1d3ee6a4125d7efd23be8ce1e6513fcae9ef5 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Wed, 30 Mar 2022 14:21:03 +0800
Subject: [PATCH 12/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/mail/MailAccountMapper.java     | 13 +++++++
 .../mail/impl/MailAccountServiceImpl.java     | 35 +++++++------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index f7e06862f8..effeed1b9e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -5,8 +5,14 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_EXISTS;
+
 @Mapper
 public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
 
@@ -20,4 +26,11 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
         );
     }
 
+    default MailAccountDO selectByParams(Map params){
+        QueryWrapperX queryWrapperX = new QueryWrapperX<MailAccountDO>();
+        params.forEach((k , v)->{
+            queryWrapperX.eqIfPresent((String) k, v);
+        });
+        return this.selectOne(queryWrapperX);
+    };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index c4610222ad..8c8900dcfd 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -1,19 +1,19 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.mail.MailAccount;
 import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailSendVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,9 +27,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOU
 
 
 /**
- * <p>
  *  邮箱账号 Service 实现类
- * </p>
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -66,7 +64,6 @@ public class MailAccountServiceImpl implements MailAccountService {
         mailAccountMapper.updateById(mailAccountDO);
     }
 
-
     @Override
     public void delete(Long id) {
         // 校验是否存在
@@ -90,20 +87,16 @@ public class MailAccountServiceImpl implements MailAccountService {
     }
 
     @Override
-    public void sendMail(MailSendVO mailSendVO) {
-        // FIXME 查询模版信息 查询模版多条时 使用规则是什么
-        // 回复：选择某一条模板，进行发送邮件。
-        List<MailTemplateDO> mailTemplateDOList =  mailTemplateMapper.selectList(
-                "username",mailSendVO.getFrom()
-        );
+    public void sendMail(MailReqVO mailReqVO) {
+        MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectById(mailReqVO.getTemplateId());
         //查询账号信息
         MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
-                "from",mailSendVO.getFrom()
+                "from", mailReqVO.getFrom()
         );
-        // FIXME 模版和邮件内容合成方式未知
-        // 回复：参考短信的方式，通过 {name} {mobile} 这样的占位符。搜 formatSmsTemplateContent 方法
-        String content = mailSendVO.getContent();
-        String templateContent = "";
+        String content = mailReqVO.getContent();
+        Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
+        content = StrUtil.format(mailTemplateDO.getContent(), params);
+
         // 后续功能 TODO ：附件查询
         //List<String> fileIds = mailSendVO.getFileIds();
 
@@ -111,7 +104,7 @@ public class MailAccountServiceImpl implements MailAccountService {
         MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
 
         //发送
-        MailUtil.send(account , mailSendVO.getTos() , mailSendVO.getTitle() , mailSendVO.getContent() , false);
+        MailUtil.send(account , mailReqVO.getTos() , mailReqVO.getTitle() , content , false);
     }
 
     private void validateMailAccountExists(Long id) {
@@ -121,12 +114,8 @@ public class MailAccountServiceImpl implements MailAccountService {
     }
 
     private void validateMailAccountOnly(Map params){
-        // TODO wangjingyi：Service 里，不允许出现 MyBatis 操作。而是 Mapper 提供对应查询方法
-        QueryWrapper queryWrapper = new QueryWrapper<MailAccountDO>();
-        params.forEach((k , v)->{
-            queryWrapper.like(k , v); // TODO wangjingyi：账号，应该是 equlas，不能是 like
-        });
-        if (mailAccountMapper.selectOne(queryWrapper) != null) {
+        MailAccountDO mailAccountDO = mailAccountMapper.selectByParams(params);
+        if (mailAccountDO != null) {
             throw exception(MAIL_ACCOUNT_EXISTS);
         }
     }

From 7d9a6cb2ef1c49afdff4166782be4174d8137053 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 30 Mar 2022 21:46:54 +0800
Subject: [PATCH 13/67] =?UTF-8?q?code=20review=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailAccountController.java         |  5 ++---
 .../admin/mail/MailTemplateController.java        |  3 +--
 .../system/dal/dataobject/mail/MailAccountDO.java | 15 +++++++--------
 .../system/dal/mysql/mail/MailAccountMapper.java  |  7 ++-----
 .../system/service/mail/MailAccountService.java   |  7 +++++--
 .../system/service/mail/MailTemplateService.java  |  3 +++
 .../service/mail/impl/MailAccountServiceImpl.java |  7 ++++---
 .../mail/impl/MailTemplateServiceImpl.java        | 11 ++++++-----
 8 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 2d2eb959b5..660ea4ab46 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -48,12 +48,11 @@ public class MailAccountController {
         return success(true);
     }
 
-
     @DeleteMapping("/delete")
     @ApiOperation("删除邮箱账号")
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-account:delete')")
-    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestParam Long id) {
+    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestParam Long id) { // TODO @wangjingyi：不需要 @Valid 这里。了解下 Validator
         mailAccountService.delete(id);
         return success(true);
     }
@@ -87,7 +86,7 @@ public class MailAccountController {
     @PostMapping("/send")
     @ApiOperation("发送邮件")
     @PreAuthorize("@ss.hasPermission('system:mail-account:send')")
-    public CommonResult<Boolean> sendMail(MailReqVO mailReqVO){
+    public CommonResult<Boolean> sendMail(MailReqVO mailReqVO){ // TODO @wangjingyi：应该是测试短信模板，做到 MailTemplateController 里。参考下短信那的做法哈
         mailAccountService.sendMail(mailReqVO);
         return success(true);
     }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
index 988882d839..258dc38566 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -28,7 +28,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/system/mail-template")
 public class MailTemplateController {
     @Autowired
-    MailTemplateService mailTempleService;
+    MailTemplateService mailTempleService; // TODO @wangjingyi：private；和上面要空一行；
 
     @PostMapping("/create")
     @ApiOperation("创建邮箱模版")
@@ -62,7 +62,6 @@ public class MailTemplateController {
         return success(MailTemplateConvert.INSTANCE.convert(mailTemplateDO));
     }
 
-
     @GetMapping("/page")
     @ApiOperation("获得邮箱模版分页")
     @PreAuthorize("@ss.hasPermission('system:mail-account:query')")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index 2147af7fe4..a7db818609 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -1,26 +1,25 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="MailAccount对象", description="邮箱账号")
-@TableName(value = "system_mail_account", autoResultMap = true)
+@ApiModel(value="MailAccount对象", description="邮箱账号") // TODO @wangjingyi：不需要 swagger 注解
+@TableName(value = "system_mail_account", autoResultMap = true) // TODO @wangjingyi：这个放在最上面，关键字段
 public class MailAccountDO extends BaseDO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    // TODO @wangjingyi：每个字段的注释；字段名，如果一直，不用 @TableField
+
     @TableId
     private Long id;
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index effeed1b9e..6785e33ec3 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -5,14 +5,10 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Map;
 
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_EXISTS;
-
 @Mapper
 public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
 
@@ -26,11 +22,12 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
         );
     }
 
+    // TODO @wangjingyi：不要提供这样的泛的方法，而是明确的查询方法
     default MailAccountDO selectByParams(Map params){
         QueryWrapperX queryWrapperX = new QueryWrapperX<MailAccountDO>();
         params.forEach((k , v)->{
             queryWrapperX.eqIfPresent((String) k, v);
         });
-        return this.selectOne(queryWrapperX);
+        return this.selecOne(queryWrapperX);
     };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 5b8a07b34a..572aa3ffb7 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -11,14 +11,17 @@ import java.util.List;
 
 
 /**
- *  邮箱账号 Service 接口
+ * 邮箱账号 Service 接口
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 public interface MailAccountService {
+
+    // TODO @wangjingyi：注释，完整；参数校验还是要做的；
+
     /**
-     * 创建邮箱账号
+     * 创建邮箱账号 // TODO @wangjingyi：方法描述，和参数要空行
      * @param createReqVO
      * @return
      */
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index da68a43d06..98fe87ef9e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -15,6 +15,9 @@ import java.util.List;
  * @since 2022-03-21
  */
 public interface MailTemplateService {
+
+    // TODO @wangjingyi：注释，完整；参数校验还是要做的；
+
     /**
      * 邮箱模版创建
      * @param createReqVO
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 8c8900dcfd..4cb5ed0e26 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -33,6 +33,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOU
  * @since 2022-03-21
  */
 @Service
+// TODO @wangjingyi：需要 @Validated 注解，开启参数校验
 public class MailAccountServiceImpl implements MailAccountService {
 
     @Resource
@@ -54,13 +55,13 @@ public class MailAccountServiceImpl implements MailAccountService {
 
     @Override
     public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一
+        // username 要校验唯一 TODO @wangjingyi：不要用 map 参数
         Map<String , String> map = new HashMap<>();
         map.put("username" , updateReqVO.getUsername());
-        this.validateMailAccountOnly(map);
+        this.validateMailAccountOnly(map); // TODO @wangjingyi：如果 username 是自己用呢，要排除下自己呀
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
-        this.validateMailAccountExists(mailAccountDO.getId()); // TODO wangjingyi：没有传递 id 噢
+        this.validateMailAccountExists(mailAccountDO.getId());
         mailAccountMapper.updateById(mailAccountDO);
     }
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 92db1d83cb..9fd80bdfe1 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemp
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
@@ -19,15 +18,17 @@ import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS;
 
 /**
- *  邮箱模版 服务实现类
+ * 邮箱模版 服务实现类
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 @Service
+// TODO @wangjingyi：需要 @Validated 注解，开启参数校验
 public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Resource
@@ -37,7 +38,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     public Long create(MailTemplateCreateReqVO createReqVO) {
         // name 要校验唯一
         Map<String , String> map = new HashMap<>();
-        map.put("name" , createReqVO.getName());
+        map.put("name" , createReqVO.getName()); // TODO @wangjingyi：模板名重复没关系的；code 不能重复
         this.validateMailTemplateOnly(map);
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
         mailTemplateMapper.insert(mailTemplateDO);
@@ -48,7 +49,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     public void update(MailTemplateUpdateReqVO updateReqVO) {
         // username 要校验唯一
         Map<String , String> map = new HashMap<>();
-        map.put("username" , updateReqVO.getUsername());
+        map.put("username" , updateReqVO.getUsername());  // TODO @wangjingyi：模板名重复没关系的；code 不能重复
         this.validateMailTemplateOnly(map);
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在

From e1d79b5ea948afe1d8c5b7524061824fe0996f84 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Thu, 31 Mar 2022 18:00:03 +0800
Subject: [PATCH 14/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=E3=80=81=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=B3=9B=E5=9E=8B=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailAccountController.java     |  9 +--
 .../admin/mail/MailLogController.java         |  1 +
 .../admin/mail/MailTemplateController.java    | 14 ++++-
 .../mail/vo/account/MailAccountBaseVO.java    |  4 ++
 .../admin/mail/vo/send/MailReqVO.java         |  2 +-
 .../mail/vo/template/MailTemplateBaseVO.java  |  3 +
 .../dal/dataobject/mail/MailAccountDO.java    | 33 +++++++----
 .../system/dal/dataobject/mail/MailLogDO.java | 49 +++++++++++-----
 .../dal/dataobject/mail/MailTemplateDO.java   | 37 ++++++++----
 .../dal/mysql/mail/MailAccountMapper.java     |  9 +--
 .../dal/mysql/mail/MailTemplateMapper.java    |  3 +
 .../service/mail/MailAccountService.java      | 34 +++++------
 .../service/mail/MailTemplateService.java     | 36 +++++++-----
 .../mail/impl/MailAccountServiceImpl.java     | 38 +++----------
 .../service/mail/impl/MailLogServiceImpl.java |  2 +
 .../mail/impl/MailTemplateServiceImpl.java    | 57 +++++++++++++------
 16 files changed, 204 insertions(+), 127 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 660ea4ab46..c16c7a60ba 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -52,7 +52,7 @@ public class MailAccountController {
     @ApiOperation("删除邮箱账号")
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-account:delete')")
-    public CommonResult<Boolean> deleteMailAccount(@Valid @RequestParam Long id) { // TODO @wangjingyi：不需要 @Valid 这里。了解下 Validator
+    public CommonResult<Boolean> deleteMailAccount(@RequestParam Long id) {
         mailAccountService.delete(id);
         return success(true);
     }
@@ -83,11 +83,4 @@ public class MailAccountController {
         return success(MailAccountConvert.INSTANCE.convertList02(list));
     }
 
-    @PostMapping("/send")
-    @ApiOperation("发送邮件")
-    @PreAuthorize("@ss.hasPermission('system:mail-account:send')")
-    public CommonResult<Boolean> sendMail(MailReqVO mailReqVO){ // TODO @wangjingyi：应该是测试短信模板，做到 MailTemplateController 里。参考下短信那的做法哈
-        mailAccountService.sendMail(mailReqVO);
-        return success(true);
-    }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
index f6375f290a..1cad6a02ab 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
@@ -28,6 +28,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/system/mail-log")
 public class MailLogController {
+
     @Autowired
     private MailLogService mailLogService;
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
index 258dc38566..cffd7f980d 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
@@ -27,8 +28,9 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/system/mail-template")
 public class MailTemplateController {
+
     @Autowired
-    MailTemplateService mailTempleService; // TODO @wangjingyi：private；和上面要空一行；
+    MailTemplateService mailTempleService;
 
     @PostMapping("/create")
     @ApiOperation("创建邮箱模版")
@@ -64,7 +66,7 @@ public class MailTemplateController {
 
     @GetMapping("/page")
     @ApiOperation("获得邮箱模版分页")
-    @PreAuthorize("@ss.hasPermission('system:mail-account:query')")
+    @PreAuthorize("@ss.hasPermission('system:mail-template:query')")
     public CommonResult<PageResult<MailTemplateBaseVO>> getMailTemplatePage(@Valid MailTemplatePageReqVO pageReqVO) {
         PageResult<MailTemplateDO> pageResult = mailTempleService.getMailTemplatePage(pageReqVO);
         return success(MailTemplateConvert.INSTANCE.convertPage(pageResult));
@@ -78,4 +80,12 @@ public class MailTemplateController {
         list.sort(Comparator.comparing(MailTemplateDO::getId));
         return success(MailTemplateConvert.INSTANCE.convertList02(list));
     }
+
+    @PostMapping("/send")
+    @ApiOperation("发送邮件")
+    @PreAuthorize("@ss.hasPermission('system:mail-template:send')")
+    public CommonResult<Boolean> sendMail(@Valid @RequestBody MailReqVO mailReqVO){
+        mailTempleService.sendMail(mailReqVO);
+        return success(true);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 49400316b6..870d06e48b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -3,6 +3,9 @@ package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
 @ApiModel("管理后台 - 邮箱账号基类 Base VO")
 @Data
 public class MailAccountBaseVO {
@@ -11,6 +14,7 @@ public class MailAccountBaseVO {
     private String from;
 
     @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
+    @NotNull(message = "用户名必填")
     private String username;
 
     @ApiModelProperty(value = "密码" , required = true , example = "123456")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
index 0bd9d5d22e..de75cddc9a 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 @ApiModel("管理后台 - 邮件发送 Req VO")
 @Data
-public class MailReqVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
+public class MailReqVO {
 
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     @NotNull(message = "邮箱账号不能为空")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
index b718e29187..074ed69d2a 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @ApiModel("管理后台 - 邮箱模版基类 Base VO")
 @Data
 public class MailTemplateBaseVO {
@@ -14,6 +16,7 @@ public class MailTemplateBaseVO {
     private String name;
 
     @ApiModelProperty("标识")
+    @NotNull(message = "邮箱模版code不能为空")
     private String code;
 
     @ApiModelProperty("发件人")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index a7db818609..0d603cb99d 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -11,34 +11,45 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 
+@TableName(value = "system_mail_account", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="MailAccount对象", description="邮箱账号") // TODO @wangjingyi：不需要 swagger 注解
-@TableName(value = "system_mail_account", autoResultMap = true) // TODO @wangjingyi：这个放在最上面，关键字段
 public class MailAccountDO extends BaseDO implements Serializable {
 
-    // TODO @wangjingyi：每个字段的注释；字段名，如果一直，不用 @TableField
-
-    @TableId
+    /**
+     * 主键
+     */
     private Long id;
 
-    @TableField("from")
+    /**
+     * 邮箱
+     */
     private String from;
 
-    @TableField("username")
+    /**
+     * 用户名
+     */
     private String username;
 
-    @TableField("password")
+    /**
+     * 密码
+     */
     private String password;
 
-    @TableField("host")
+    /**
+     * 主机
+     */
     private String host;
 
-    @TableField("port")
+    /**
+     * 端口
+     */
     private Integer port;
 
-    @TableField("sslEnable")
+    /**
+     * 是否开启ssl
+     */
     private Boolean sslEnable;
 
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 8183174a1f..4fc0c0a5cc 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -5,6 +5,8 @@ import java.sql.Timestamp;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,44 +20,65 @@ import lombok.experimental.Accessors;
  * @author wangjingyi
  * @since 2022-03-21
  */
+@TableName(value = "system_mail_log", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="SystemMailLog对象", description="")
 public class MailLogDO extends BaseDO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-    @TableId
+    /**
+     * 主键
+     */
     private Long id;
 
-    @TableField("account_code")
+    /**
+     * 邮箱账号编号
+     */
     private String accountCode;
 
-    @TableField("from")
+    /**
+     * 邮箱账号
+     */
     private String from;
 
-    @TableField("template_id")
+    /**
+     * 模版主键
+     */
     private String templateId;
 
-    @TableField("template_code")
+    /**
+     * 模版编号
+     */
     private String templateCode;
 
-    @TableField("title")
+    /**
+     * 标题
+     */
     private String title;
 
-    @TableField("content")
+    /**
+     * 内容
+     */
     private String content;
 
-    @TableField("to")
+    /**
+     * 收件人
+     */
     private String to;
 
-    @TableField("sendTime")
+    /**
+     * 发送时间
+     */
     private Timestamp sendTime;
 
-    @TableField("sendStatus")
+    /**
+     * 发送状态
+     */
     private Boolean sendStatus;
 
-    @TableField("sendResult")
+    /**
+     * 发送结果
+     */
     private String sendResult;
 
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index e2d5a6d8cb..83ebb533d9 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,35 +21,50 @@ import lombok.experimental.Accessors;
  * @author wangjingyi
  * @since 2022-03-21
  */
+@TableName(value = "system_mail_template", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ApiModel(value="SystemMailTemplate对象", description="")
 public class MailTemplateDO extends BaseDO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-    @TableId
+    /**
+     * 主键
+     */
     private Long id;
 
-    @TableField("name")
+    /**
+     * 模版名称
+     */
     private String name;
 
-    @TableField("code")
+    /**
+     * 模版编号
+     */
     private String code;
 
-    @TableField("username")
+    /**
+     * 用户名
+     */
     private String username;
 
-    @TableField("title")
+    /**
+     * 标题
+     */
     private String title;
 
-    @TableField("content")
+    /**
+     * 内容
+     */
     private String content;
 
-    @TableField("status")
+    /**
+     * 状态
+     */
     private String status;
 
-    @TableField("remark")
+    /**
+     * 备注
+     */
     private String remark;
 
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index 6785e33ec3..d0a43e6796 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -22,12 +22,9 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
         );
     }
 
-    // TODO @wangjingyi：不要提供这样的泛的方法，而是明确的查询方法
-    default MailAccountDO selectByParams(Map params){
+    default MailAccountDO selectByUserName(String userName){
         QueryWrapperX queryWrapperX = new QueryWrapperX<MailAccountDO>();
-        params.forEach((k , v)->{
-            queryWrapperX.eqIfPresent((String) k, v);
-        });
-        return this.selecOne(queryWrapperX);
+        queryWrapperX.eqIfPresent("username", userName);
+        return this.selectOne(queryWrapperX);
     };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
index 06e76d9ab7..635a2bf907 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -22,4 +22,7 @@ public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
         );
     }
 
+    default MailTemplateDO selectOneByCode(String code){
+        return selectOne("code" , code);
+    };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 572aa3ffb7..9792c6cc5e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccou
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 
+import javax.validation.Valid;
 import java.util.List;
 
 
@@ -22,46 +23,47 @@ public interface MailAccountService {
 
     /**
      * 创建邮箱账号 // TODO @wangjingyi：方法描述，和参数要空行
-     * @param createReqVO
-     * @return
+     *
+     * @param createReqVO 邮箱账号信息
+     * @return 编号
      */
-    Long create(MailAccountCreateReqVO createReqVO);
+    Long create(@Valid MailAccountCreateReqVO createReqVO);
 
     /**
      * 修改邮箱账号
-     * @param updateReqVO
+     *
+     * @param updateReqVO 邮箱账号信息
      */
-    void update(MailAccountUpdateReqVO updateReqVO);
+    void update(@Valid MailAccountUpdateReqVO updateReqVO);
 
     /**
      * 删除邮箱账号
-     * @param id
+     *
+     * @param id 编号
      */
     void delete(Long id);
 
     /**
      * 获取邮箱账号信息
-     * @param id
-     * @return
+     *
+     * @param id 编号
+     * @return 邮箱账号信息
      */
     MailAccountDO getMailAccount(Long id);
 
     /**
      * 获取邮箱账号分页信息
-     * @param pageReqVO
-     * @return
+     *
+     * @param pageReqVO 邮箱账号分页参数
+     * @return 邮箱账号分页信息
      */
     PageResult<MailAccountDO> getMailAccountPage(MailAccountPageReqVO pageReqVO);
 
     /**
      * 获取邮箱数组信息
-     * @return
+     *
+     * @return 邮箱账号信息数组
      */
     List<MailAccountDO> getMailAccountList();
 
-    /**
-     * 发送邮件
-     * @param mailReqVO
-     */
-    void sendMail(MailReqVO mailReqVO);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 98fe87ef9e..1511309eb9 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -16,44 +18,52 @@ import java.util.List;
  */
 public interface MailTemplateService {
 
-    // TODO @wangjingyi：注释，完整；参数校验还是要做的；
-
     /**
      * 邮箱模版创建
-     * @param createReqVO
-     * @return
+     * @param createReqVO 邮箱信息
+     * @return 编号
      */
-    Long create(MailTemplateCreateReqVO createReqVO);
+    Long create(@Valid MailTemplateCreateReqVO createReqVO);
 
     /**
      * 邮箱模版修改
-     * @param updateReqVO
+     * @param updateReqVO 邮箱信息
      */
-    void update(MailTemplateUpdateReqVO updateReqVO);
+    void update(@Valid MailTemplateUpdateReqVO updateReqVO);
 
     /**
      * 邮箱模版删除
-     * @param id
+     * @param id 编号
      */
     void delete(Long id);
 
     /**
      * 获取邮箱模版
-     * @param id
-     * @return
+     *
+     * @param id 编号
+     * @return 邮件模版
      */
     MailTemplateDO getMailTemplate(Long id);
 
     /**
      * 获取邮箱模版分页
-     * @param pageReqVO
-     * @return
+     *
+     * @param pageReqVO 模版信息
+     * @return 邮箱模版分页信息
      */
     PageResult<MailTemplateDO> getMailTemplatePage(MailTemplatePageReqVO pageReqVO);
 
     /**
      * 获取邮箱模板数组
-     * @return
+     *
+     * @return 模版数组
      */
     List<MailTemplateDO> getMailTemplateList();
+
+    /**
+     * 发送邮件
+     *
+     * @param mailReqVO 邮件发送信息
+     */
+    void sendMail(MailReqVO mailReqVO);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 4cb5ed0e26..fa2f8879ee 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -33,7 +34,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOU
  * @since 2022-03-21
  */
 @Service
-// TODO @wangjingyi：需要 @Validated 注解，开启参数校验
+@Validated
 public class MailAccountServiceImpl implements MailAccountService {
 
     @Resource
@@ -45,9 +46,7 @@ public class MailAccountServiceImpl implements MailAccountService {
     @Override
     public Long create(MailAccountCreateReqVO createReqVO) {
         // username 要校验唯一
-        Map<String , String> map = new HashMap<>();
-        map.put("username" , createReqVO.getUsername());
-        this.validateMailAccountOnly(map);
+        this.validateMailAccountOnlyByUserName(createReqVO.getUsername());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(createReqVO);
         mailAccountMapper.insert(mailAccountDO);
         return mailAccountDO.getId();
@@ -55,10 +54,8 @@ public class MailAccountServiceImpl implements MailAccountService {
 
     @Override
     public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一 TODO @wangjingyi：不要用 map 参数
-        Map<String , String> map = new HashMap<>();
-        map.put("username" , updateReqVO.getUsername());
-        this.validateMailAccountOnly(map); // TODO @wangjingyi：如果 username 是自己用呢，要排除下自己呀
+        // username 要校验唯一
+        this.validateMailAccountOnlyByUserName(updateReqVO.getUsername());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
         this.validateMailAccountExists(mailAccountDO.getId());
@@ -87,35 +84,14 @@ public class MailAccountServiceImpl implements MailAccountService {
         return mailAccountMapper.selectList();
     }
 
-    @Override
-    public void sendMail(MailReqVO mailReqVO) {
-        MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectById(mailReqVO.getTemplateId());
-        //查询账号信息
-        MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
-                "from", mailReqVO.getFrom()
-        );
-        String content = mailReqVO.getContent();
-        Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
-        content = StrUtil.format(mailTemplateDO.getContent(), params);
-
-        // 后续功能 TODO ：附件查询
-        //List<String> fileIds = mailSendVO.getFileIds();
-
-        //装载账号信息
-        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
-
-        //发送
-        MailUtil.send(account , mailReqVO.getTos() , mailReqVO.getTitle() , content , false);
-    }
-
     private void validateMailAccountExists(Long id) {
         if (mailAccountMapper.selectById(id) == null) {
             throw exception(MAIL_ACCOUNT_NOT_EXISTS);
         }
     }
 
-    private void validateMailAccountOnly(Map params){
-        MailAccountDO mailAccountDO = mailAccountMapper.selectByParams(params);
+    private void validateMailAccountOnlyByUserName(String userName){
+        MailAccountDO mailAccountDO = mailAccountMapper.selectByUserName(userName);
         if (mailAccountDO != null) {
             throw exception(MAIL_ACCOUNT_EXISTS);
         }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index 7e4950f6d3..c6b492498b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
 
 import java.util.List;
 
@@ -19,6 +20,7 @@ import java.util.List;
  * @since 2022-03-21
  */
 @Service
+@Validated
 public class MailLogServiceImpl implements MailLogService {
 
     @Autowired
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 9fd80bdfe1..7ce118303d 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -1,18 +1,28 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.mail.MailAccount;
+import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
+import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,29 +38,27 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPL
  * @since 2022-03-21
  */
 @Service
-// TODO @wangjingyi：需要 @Validated 注解，开启参数校验
+@Validated
 public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Resource
     private MailTemplateMapper mailTemplateMapper;
+    @Resource
+    private MailAccountMapper mailAccountMapper;
 
     @Override
     public Long create(MailTemplateCreateReqVO createReqVO) {
-        // name 要校验唯一
-        Map<String , String> map = new HashMap<>();
-        map.put("name" , createReqVO.getName()); // TODO @wangjingyi：模板名重复没关系的；code 不能重复
-        this.validateMailTemplateOnly(map);
+        // code 要校验唯一
+        this.validateMailTemplateOnlyByCode(createReqVO.getCode());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
         mailTemplateMapper.insert(mailTemplateDO);
         return mailTemplateDO.getId();
     }
 
     @Override
-    public void update(MailTemplateUpdateReqVO updateReqVO) {
-        // username 要校验唯一
-        Map<String , String> map = new HashMap<>();
-        map.put("username" , updateReqVO.getUsername());  // TODO @wangjingyi：模板名重复没关系的；code 不能重复
-        this.validateMailTemplateOnly(map);
+    public void update(@Valid MailTemplateUpdateReqVO updateReqVO) {
+        // code 要校验唯一
+        this.validateMailTemplateOnlyByCode(updateReqVO.getCode());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
         this.validateMailTemplateExists(mailTemplateDO.getId());
@@ -75,18 +83,35 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Override
     public List<MailTemplateDO> getMailTemplateList() {return mailTemplateMapper.selectList();}
 
+    @Override
+    public void sendMail(MailReqVO mailReqVO) {
+        MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectById(mailReqVO.getTemplateId());
+        //查询账号信息
+        MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
+                "from", mailReqVO.getFrom()
+        );
+        String content = mailReqVO.getContent();
+        Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
+        content = StrUtil.format(mailTemplateDO.getContent(), params);
+
+        // 后续功能 TODO ：附件查询
+        //List<String> fileIds = mailSendVO.getFileIds();
+
+        //装载账号信息
+        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
+
+        //发送
+        MailUtil.send(account , mailReqVO.getTos() , mailReqVO.getTitle() , content , false);
+    }
+
     private void validateMailTemplateExists(Long id) {
         if (mailTemplateMapper.selectById(id) == null) {
             throw exception(MAIL_TEMPLATE_NOT_EXISTS);
         }
     }
 
-    private void validateMailTemplateOnly(Map params){
-        QueryWrapper queryWrapper = new QueryWrapper<MailTemplateDO>();
-        params.forEach((k , v)->{
-            queryWrapper.like(k , v);
-        });
-        if (mailTemplateMapper.selectOne(queryWrapper) != null) {
+    private void validateMailTemplateOnlyByCode(String code){
+        if (mailTemplateMapper.selectOneByCode(code) != null) {
             throw exception(MAIL_TEMPLATE_EXISTS);
         }
     }

From d1812761db1e7a485c32f1bc6be051a6f3ca1d02 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 31 Mar 2022 21:40:10 +0800
Subject: [PATCH 15/67] =?UTF-8?q?code=20review=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=20second?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mail/vo/account/MailAccountBaseVO.java    |  2 +-
 .../admin/mail/vo/send/MailReqVO.java         |  2 +-
 .../mail/vo/template/MailTemplateBaseVO.java  |  2 +-
 .../dal/dataobject/mail/MailAccountDO.java    | 25 +++++++----------
 .../system/dal/dataobject/mail/MailLogDO.java | 17 +++++-------
 .../dal/dataobject/mail/MailTemplateDO.java   | 27 +++++--------------
 .../dal/mysql/mail/MailAccountMapper.java     |  5 ++--
 .../dal/mysql/mail/MailTemplateMapper.java    |  1 +
 .../service/mail/MailAccountService.java      |  5 +---
 .../service/mail/MailTemplateService.java     |  3 +++
 .../mail/impl/MailAccountServiceImpl.java     | 10 ++-----
 .../mail/impl/MailTemplateServiceImpl.java    |  6 ++---
 12 files changed, 36 insertions(+), 69 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 870d06e48b..67cf9ba3a3 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 @ApiModel("管理后台 - 邮箱账号基类 Base VO")
 @Data
-public class MailAccountBaseVO {
+public class MailAccountBaseVO { // TODO @wangjingqi：1）, 不用空格；2）from、username、password、host、sslEnable 都要参数校验，非空；3）username 要 Email 格式；port Integer；
 
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     private String from;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
index de75cddc9a..4ce06a718f 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 @ApiModel("管理后台 - 邮件发送 Req VO")
 @Data
-public class MailReqVO {
+public class MailReqVO { // TODO @wangjingqi：1）, 不用空格；2）应该只要传递 templateCode、参数就好，title、from、content、附件应该都是参数里的
 
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     @NotNull(message = "邮箱账号不能为空")
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
index 074ed69d2a..e3c9797ab7 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 @ApiModel("管理后台 - 邮箱模版基类 Base VO")
 @Data
-public class MailTemplateBaseVO {
+public class MailTemplateBaseVO {  // TODO @wangjingqi：1）swagger 注解不完善；2）id、name、code、username、title、content、status 是不是要参数校验呀
     @ApiModelProperty("主键")
     private Long id;
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index 0d603cb99d..d285adec5b 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -1,56 +1,49 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 
+/**
+ * 邮箱账号
+ * 配置发送邮箱的账号
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
 @TableName(value = "system_mail_account", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class MailAccountDO extends BaseDO implements Serializable {
+public class MailAccountDO extends BaseDO {
 
     /**
      * 主键
      */
     private Long id;
-
     /**
      * 邮箱
      */
     private String from;
-
     /**
      * 用户名
      */
     private String username;
-
     /**
      * 密码
      */
     private String password;
-
     /**
      * 主机
      */
     private String host;
-
     /**
      * 端口
      */
     private Integer port;
-
     /**
-     * 是否开启ssl
+     * 是否开启 SSL
      */
     private Boolean sslEnable;
 
-
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 4fc0c0a5cc..f6b9e689c4 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -1,21 +1,16 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import java.sql.Timestamp;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
- * <p>
  * 邮箱日志
- * </p>
+ * 记录每一次邮件的发送
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -23,7 +18,6 @@ import lombok.experimental.Accessors;
 @TableName(value = "system_mail_log", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 public class MailLogDO extends BaseDO implements Serializable {
 
     /**
@@ -31,11 +25,13 @@ public class MailLogDO extends BaseDO implements Serializable {
      */
     private Long id;
 
+    // TODO @wangjingyi：accountId
     /**
      * 邮箱账号编号
      */
     private String accountCode;
 
+    // TODO @wangjingyi：如果是冗余字段，记得 @ 下；
     /**
      * 邮箱账号
      */
@@ -74,6 +70,7 @@ public class MailLogDO extends BaseDO implements Serializable {
     /**
      * 发送状态
      */
+    // TODO @wangjingyi：四个状态，参考短信模块
     private Boolean sendStatus;
 
     /**
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index 83ebb533d9..b86e39e95e 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -1,22 +1,13 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 邮箱模版
- * </p>
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -24,48 +15,42 @@ import lombok.experimental.Accessors;
 @TableName(value = "system_mail_template", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class MailTemplateDO extends BaseDO implements Serializable {
+public class MailTemplateDO extends BaseDO {
 
     /**
      * 主键
      */
     private Long id;
-
     /**
      * 模版名称
      */
     private String name;
-
     /**
      * 模版编号
      */
     private String code;
-
+    // TODO @wangjingyi：应该使用 accountId 呀
     /**
      * 用户名
      */
     private String username;
-
     /**
      * 标题
      */
     private String title;
-
     /**
      * 内容
      */
     private String content;
-
     /**
      * 状态
+     *
+     * 枚举 {@link CommonStatusEnum}
      */
-    private String status;
-
+    private String status; // TODO @wangjingyi：Integer
     /**
      * 备注
      */
     private String remark;
 
-
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index d0a43e6796..8697b21514 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -7,8 +7,6 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccou
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Map;
-
 @Mapper
 public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
 
@@ -23,7 +21,8 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
     }
 
     default MailAccountDO selectByUserName(String userName){
-        QueryWrapperX queryWrapperX = new QueryWrapperX<MailAccountDO>();
+        // TODO @wangjingyi：selectOne 有封装的方法；然后，编码一定要学会使用泛型呀。例如说 QueryWrapperX<MailAccountDO> queryWrapperX = new QueryWrapperX<>();
+        QueryWrapperX<MailAccountDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX.eqIfPresent("username", userName);
         return this.selectOne(queryWrapperX);
     };
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
index 635a2bf907..d65887e54a 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -23,6 +23,7 @@ public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
     }
 
     default MailTemplateDO selectOneByCode(String code){
+        // TODO @wangjingyi：优先使用 lambada 查询
         return selectOne("code" , code);
     };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 9792c6cc5e..c1289154f8 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 
 import javax.validation.Valid;
@@ -19,10 +18,8 @@ import java.util.List;
  */
 public interface MailAccountService {
 
-    // TODO @wangjingyi：注释，完整；参数校验还是要做的；
-
     /**
-     * 创建邮箱账号 // TODO @wangjingyi：方法描述，和参数要空行
+     * 创建邮箱账号
      *
      * @param createReqVO 邮箱账号信息
      * @return 编号
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 1511309eb9..1071eae5d2 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -20,6 +20,7 @@ public interface MailTemplateService {
 
     /**
      * 邮箱模版创建
+     *
      * @param createReqVO 邮箱信息
      * @return 编号
      */
@@ -27,12 +28,14 @@ public interface MailTemplateService {
 
     /**
      * 邮箱模版修改
+     *
      * @param updateReqVO 邮箱信息
      */
     void update(@Valid MailTemplateUpdateReqVO updateReqVO);
 
     /**
      * 邮箱模版删除
+     *
      * @param id 编号
      */
     void delete(Long id);
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index fa2f8879ee..aa1fb1d467 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -1,16 +1,11 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.mail.MailAccount;
-import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
@@ -18,9 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_EXISTS;
@@ -54,7 +47,7 @@ public class MailAccountServiceImpl implements MailAccountService {
 
     @Override
     public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一
+        // username 要校验唯一 // TODO @wangjingyi：更新的就是自己，username 这样写，会重复呀。
         this.validateMailAccountOnlyByUserName(updateReqVO.getUsername());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
@@ -64,6 +57,7 @@ public class MailAccountServiceImpl implements MailAccountService {
 
     @Override
     public void delete(Long id) {
+        // TODO @wangjingyi：删除时，要判断是否有使用的模板
         // 校验是否存在
         this.validateMailAccountExists(id);
         mailAccountMapper.deleteById(id);
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 7ce118303d..2bd74ac4cc 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -15,15 +15,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
-import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +55,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Override
     public void update(@Valid MailTemplateUpdateReqVO updateReqVO) {
         // code 要校验唯一
-        this.validateMailTemplateOnlyByCode(updateReqVO.getCode());
+        this.validateMailTemplateOnlyByCode(updateReqVO.getCode()); // TODO @wangjingyi：code 这样写，修改自己会有问题
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
         this.validateMailTemplateExists(mailTemplateDO.getId());
@@ -85,6 +82,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Override
     public void sendMail(MailReqVO mailReqVO) {
+        // TODO @@wangjingyi：发送的时候，参考下短信；
         MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectById(mailReqVO.getTemplateId());
         //查询账号信息
         MailAccountDO mailAccountDO = mailAccountMapper.selectOne(

From d7305739d3fcef6efe25c12d33c02b903c181308 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Sat, 30 Apr 2022 21:31:55 +0800
Subject: [PATCH 16/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-framework/pom.xml                       |   1 +
 .../pom.xml                                   |  65 +++++++++++
 .../config/YudaoMailAutoConfiguration.java    |  21 ++++
 .../mail/core/client/MailClient.java          |  23 ++++
 .../mail/core/client/MailClientFactory.java   |   5 +
 .../mail/core/client/MailCodeMapping.java     |  17 +++
 .../mail/core/client/MailCommonResult.java    |  68 +++++++++++
 .../core/client/dto/MailReceiveRespDTO.java   |  48 ++++++++
 .../mail/core/client/dto/MailSendRespDTO.java |  18 +++
 .../core/client/dto/MailTemplateRespDTO.java  |  31 +++++
 .../core/client/impl/AbstractMailClient.java  |  14 +++
 .../client/impl/MailClientFactoryImpl.java    |  39 +++++++
 .../client/impl/hutool/HutoolMailClient.java  |  29 +++++
 .../impl/hutool/HutoolMailCodeMapping.java    |  20 ++++
 .../mail/core/enums/MailChannelEnum.java      |  32 ++++++
 .../MailFrameworkErrorCodeConstants.java      |  47 ++++++++
 .../enums/MailTemplateAuditStatusEnum.java    |  21 ++++
 .../core/property/MailChannelProperties.java  |  52 +++++++++
 .../module/system/api/mail/MailSendApi.java   |   4 +
 .../system/api/mail/dto/MailSendReqDTO.java   |  38 +++++++
 .../system/enums/ErrorCodeConstants.java      |   1 +
 .../system/enums/mail/MailSendStatusEnum.java |  24 ++++
 .../yudao-module-system-impl/pom.xml          |   5 +
 .../system/api/mail/MailSendApiImpl.java      |  14 +++
 .../mail/vo/account/MailAccountBaseVO.java    |  22 ++--
 .../admin/mail/vo/log/MailLogExcelVO.java     |   5 +-
 .../admin/mail/vo/log/MailLogRespVO.java      |   2 +-
 .../admin/mail/vo/send/MailReqVO.java         |  14 ++-
 .../mail/vo/template/MailTemplateBaseVO.java  |  12 +-
 .../vo/template/MailTemplatePageReqVO.java    |   2 +-
 .../system/dal/dataobject/mail/MailLogDO.java |  22 ++--
 .../dal/dataobject/mail/MailTemplateDO.java   |   9 +-
 .../dal/mysql/mail/MailAccountMapper.java     |   7 +-
 .../dal/mysql/mail/MailTemplateMapper.java    |  15 ++-
 .../mq/consumer/mail/MailSendConsumer.java    |   8 +-
 .../mq/message/mail/MailSendMessage.java      |  26 +++--
 .../system/mq/producer/mail/MailProducer.java |  65 +++++++++++
 .../system/service/mail/MailLogService.java   |  16 +++
 .../system/service/mail/MailSendService.java  |  41 +++++++
 .../service/mail/MailTemplateService.java     |  17 +++
 .../mail/impl/MailAccountServiceImpl.java     |  20 +++-
 .../service/mail/impl/MailLogServiceImpl.java |  42 +++++++
 .../mail/impl/MailSendServiceImpl.java        | 107 ++++++++++++++++++
 .../mail/impl/MailTemplateServiceImpl.java    |  55 ++++++++-
 44 files changed, 1085 insertions(+), 59 deletions(-)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java

diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index 73bb614cd7..42c887c561 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -30,6 +30,7 @@
         <module>yudao-spring-boot-starter-biz-operatelog</module>
         <module>yudao-spring-boot-starter-biz-dict</module>
         <module>yudao-spring-boot-starter-biz-sms</module>
+        <module>yudao-spring-boot-starter-biz-mail</module>
         <module>yudao-spring-boot-starter-activiti</module>
         <module>yudao-spring-boot-starter-biz-pay</module>
         <module>yudao-spring-boot-starter-biz-weixin</module>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml
new file mode 100644
index 0000000000..8cca217789
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-framework</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-spring-boot-starter-biz-mail</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+
+        <!-- Spring 核心 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>io.opentracing</groupId>
+            <artifactId>opentracing-util</artifactId> <!-- aliyun 短信需要，进行链路追踪 -->
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <optional>true</optional> <!-- 设置为可选，因为使用到 @VisibleForTesting 用于单元测试 -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java
new file mode 100644
index 0000000000..c83b1e5f1e
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.mail.config;
+
+import cn.iocoder.yudao.framework.mail.core.client.MailClientFactory;
+import cn.iocoder.yudao.framework.mail.core.client.impl.MailClientFactoryImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 邮箱配置类
+ *
+ * @author 芋道源码
+ */
+@Configuration
+public class YudaoMailAutoConfiguration {
+
+    @Bean
+    public MailClientFactory mailClientFactory() {
+        return new MailClientFactoryImpl();
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java
new file mode 100644
index 0000000000..a17260410a
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.framework.mail.core.client;
+
+import java.util.List;
+
+/**
+ * 邮件客户端，用于对接各邮箱平台的 SDK，实现邮件发送等功能
+ *
+ * @author wangjingyi
+ * @date 2021/4/19 19:21
+ */
+public interface MailClient {
+
+    /**
+     * 发送邮件
+     *
+     * @param from 邮箱账号
+     * @param content 内容
+     * @param title 标题
+     * @param tos 收件人
+     * @return 邮件发送结果
+     */
+    String sendMail(String from, String content, String title, List<String> tos);
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java
new file mode 100644
index 0000000000..3244dfe761
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java
@@ -0,0 +1,5 @@
+package cn.iocoder.yudao.framework.mail.core.client;
+
+public interface MailClientFactory {
+    MailClient getMailClient();
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java
new file mode 100644
index 0000000000..c33b4be3e3
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.framework.mail.core.client;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.mail.core.enums.MailFrameworkErrorCodeConstants;
+
+import java.util.function.Function;
+
+/**
+ * 将 API 的错误码，转换为通用的错误码
+ *
+ * @see MailCommonResult
+ * @see MailFrameworkErrorCodeConstants
+ *
+ * @author 芋道源码
+ */
+public interface MailCodeMapping extends Function<String, ErrorCode> {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java
new file mode 100644
index 0000000000..a53a3b9897
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java
@@ -0,0 +1,68 @@
+package cn.iocoder.yudao.framework.mail.core.client;
+
+import cn.hutool.core.exceptions.ExceptionUtil;
+import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import cn.iocoder.yudao.framework.mail.core.enums.MailFrameworkErrorCodeConstants;
+
+/**
+ * 短信的 CommonResult 拓展类
+ *
+ * 考虑到不同的平台，返回的 code 和 msg 是不同的，所以统一额外返回 {@link #apiCode} 和 {@link #apiMsg} 字段
+ *
+ * 另外，一些短信平台（例如说阿里云、腾讯云）会返回一个请求编号，用于排查请求失败的问题，我们设置到 {@link #apiRequestId} 字段
+ *
+ * @author 芋道源码
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailCommonResult<T> extends CommonResult<T> {
+
+    /**
+     * API 返回错误码
+     *
+     * 由于第三方的错误码可能是字符串，所以使用 String 类型
+     */
+    private String apiCode;
+    /**
+     * API 返回提示
+     */
+    private String apiMsg;
+
+    /**
+     * API 请求编号
+     */
+    private String apiRequestId;
+
+    private MailCommonResult() {
+    }
+
+    public static <T> MailCommonResult<T> build(String apiCode, String apiMsg, String apiRequestId,
+                                                T data, MailCodeMapping codeMapping) {
+        Assert.notNull(codeMapping, "参数 codeMapping 不能为空");
+        MailCommonResult<T> result = new MailCommonResult<T>().setApiCode(apiCode).setApiMsg(apiMsg).setApiRequestId(apiRequestId);
+        result.setData(data);
+        // 翻译错误码
+        if (codeMapping != null) {
+            ErrorCode errorCode = codeMapping.apply(apiCode);
+            if (errorCode == null) {
+                errorCode = MailFrameworkErrorCodeConstants.MAIL_UNKNOWN;
+            }
+            result.setCode(errorCode.getCode()).setMsg(errorCode.getMsg());
+        }
+        return result;
+    }
+
+    public static <T> MailCommonResult<T> error(Throwable ex) {
+        MailCommonResult<T> result = new MailCommonResult<>();
+        result.setCode(MailFrameworkErrorCodeConstants.EXCEPTION.getCode());
+        result.setMsg(ExceptionUtil.getRootCauseMessage(ex));
+        return result;
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java
new file mode 100644
index 0000000000..11f27f58a6
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.framework.mail.core.client.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 消息接收 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class MailReceiveRespDTO {
+
+    /**
+     * 是否接收成功
+     */
+    private Boolean success;
+    /**
+     * API 接收结果的编码
+     */
+    private String errorCode;
+    /**
+     * API 接收结果的说明
+     */
+    private String errorMsg;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 用户接收时间
+     */
+    private Date receiveTime;
+
+    /**
+     * 短信 API 发送返回的序号
+     */
+    private String serialNo;
+    /**
+     * 短信日志编号
+     *
+     * 对应 SysSmsLogDO 的编号
+     */
+    private Long logId;
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java
new file mode 100644
index 0000000000..b4a94a6347
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.framework.mail.core.client.dto;
+
+import lombok.Data;
+
+/**
+ * 短信发送 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class MailSendRespDTO {
+
+    /**
+     * 短信 API 发送返回的序号
+     */
+    private String serialNo;
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java
new file mode 100644
index 0000000000..14bdeacd89
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.framework.mail.core.client.dto;
+
+import lombok.Data;
+
+/**
+ * 短信模板 Response DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class MailTemplateRespDTO {
+
+    /**
+     * 模板编号
+     */
+    private String id;
+    /**
+     * 短信内容
+     */
+    private String content;
+    /**
+     * 审核状态
+     *
+     */
+    private Integer auditStatus;
+    /**
+     * 审核未通过的理由
+     */
+    private String auditReason;
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java
new file mode 100644
index 0000000000..097c8e095f
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.framework.mail.core.client.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import cn.iocoder.yudao.framework.mail.core.client.MailClient;
+
+/**
+ * 短信客户端的抽象类，提供模板方法，减少子类的冗余代码
+ *
+ * @author zzf
+ * @date 2021/2/1 9:28
+ */
+@Slf4j
+public abstract class AbstractMailClient implements MailClient {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java
new file mode 100644
index 0000000000..9923bd3df4
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.framework.mail.core.client.impl;
+
+import cn.iocoder.yudao.framework.mail.core.client.MailClient;
+import cn.iocoder.yudao.framework.mail.core.client.impl.hutool.HutoolMailClient;
+import lombok.extern.slf4j.Slf4j;
+import cn.iocoder.yudao.framework.mail.core.client.MailClientFactory;
+import cn.iocoder.yudao.framework.mail.core.enums.MailChannelEnum;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.Arrays;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+@Validated
+@Slf4j
+public class MailClientFactoryImpl implements MailClientFactory {
+
+    private final ConcurrentMap<String, AbstractMailClient> channelCodeClients = new ConcurrentHashMap<>();
+
+    public MailClientFactoryImpl (){
+        Arrays.stream(MailChannelEnum.values()).forEach(mailChannelEnum -> {
+            AbstractMailClient abstractMailClient = createMailClient(mailChannelEnum);
+            channelCodeClients.put(mailChannelEnum.getCode() , abstractMailClient);
+        });
+    }
+
+    private AbstractMailClient createMailClient(MailChannelEnum mailChannelEnum) {
+        switch (mailChannelEnum){
+            case HUTOOL: return new HutoolMailClient();
+        }
+        // 创建失败，错误日志 + 抛出异常
+        log.error("[createMailClient][配置({}) 找不到合适的客户端实现]" , mailChannelEnum);
+        throw new IllegalArgumentException(String.format("配置(%s) 找不到合适的客户端实现", mailChannelEnum));
+    }
+
+    @Override
+    public MailClient getMailClient() {
+        return channelCodeClients.get("HUTOOL");
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java
new file mode 100644
index 0000000000..457ad7e370
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.framework.mail.core.client.impl.hutool;
+
+import cn.hutool.extra.mail.MailUtil;
+import cn.iocoder.yudao.framework.mail.core.client.impl.AbstractMailClient;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+
+/**
+ * 邮件客户端实现
+ *
+ * @author wangjingyi
+ * @date 2021/4/25 14:25
+ */
+@Slf4j
+public class HutoolMailClient extends AbstractMailClient {
+
+    @Override
+    public String sendMail(String from, String content, String title, List<String> tos) {
+        try{
+            return MailUtil.send(from , title , content , false , null);
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return "";
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java
new file mode 100644
index 0000000000..711d369502
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.framework.mail.core.client.impl.hutool;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.mail.core.client.MailCodeMapping;
+
+/**
+ * 阿里云的 SmsCodeMapping 实现类
+ *
+ * 参见 https://help.aliyun.com/document_detail/101346.htm 文档
+ *
+ * @author 芋道源码
+ */
+public class HutoolMailCodeMapping implements MailCodeMapping {
+
+    @Override
+    public ErrorCode apply(String apiCode) {
+        return null;
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java
new file mode 100644
index 0000000000..51d2f1fcae
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.framework.mail.core.enums;
+
+import cn.hutool.core.util.ArrayUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 短信渠道枚举
+ *
+ * @author zzf
+ * @date 2021/1/25 10:56
+ */
+@Getter
+@AllArgsConstructor
+public enum MailChannelEnum {
+    HUTOOL("HUTOOL" , "HUTOOL"),
+    ;
+
+    /**
+     * 编码
+     */
+    private final String code;
+    /**
+     * 名字
+     */
+    private final String name;
+
+    public static MailChannelEnum getByCode(String code) {
+        return ArrayUtil.firstMatch(o -> o.getCode().equals(code), values());
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java
new file mode 100644
index 0000000000..e5ef74cf33
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.framework.mail.core.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * 短信框架的错误码枚举
+ *
+ * 短信框架，使用 2-001-000-000 段
+ *
+ * @author 芋道源码
+ */
+public interface MailFrameworkErrorCodeConstants {
+
+    ErrorCode MAIL_UNKNOWN = new ErrorCode(2001000000, "未知错误，需要解析");
+
+    // ========== 权限 / 限流等相关 2001000100 ==========
+
+    ErrorCode SMS_PERMISSION_DENY = new ErrorCode(2001000100, "没有发送短信的权限");
+    // 云片：可以配置 IP 白名单，只有在白名单中才可以发送短信
+    ErrorCode SMS_IP_DENY = new ErrorCode(2001000100, "IP 不允许发送短信");
+
+    // 阿里云：将短信发送频率限制在正常的业务限流范围内。默认短信验证码：使用同一签名，对同一个手机号验证码，支持 1 条 / 分钟，5 条 / 小时，累计 10 条 / 天。
+    ErrorCode SMS_SEND_BUSINESS_LIMIT_CONTROL = new ErrorCode(2001000102, "指定手机的发送限流");
+    // 阿里云：已经达到您在控制台设置的短信日发送量限额值。在国内消息设置 > 安全设置，修改发送总量阈值。
+    ErrorCode SMS_SEND_DAY_LIMIT_CONTROL = new ErrorCode(2001000103, "每天的发送限流");
+
+    ErrorCode SMS_SEND_CONTENT_INVALID = new ErrorCode(2001000104, "短信内容有敏感词");
+
+    // ========== 模板相关 2001000200 ==========
+    ErrorCode SMS_TEMPLATE_INVALID = new ErrorCode(2001000200, "短信模板不合法"); // 包括短信模板不存在
+    ErrorCode SMS_TEMPLATE_PARAM_ERROR = new ErrorCode(2001000201, "模板参数不正确");
+
+    // ========== 签名相关 2001000300 ==========
+    ErrorCode SMS_SIGN_INVALID = new ErrorCode(2001000300, "短信签名不可用");
+
+    // ========== 账户相关 2001000400 ==========
+    ErrorCode SMS_ACCOUNT_MONEY_NOT_ENOUGH = new ErrorCode(2001000400, "账户余额不足");
+    ErrorCode SMS_ACCOUNT_INVALID = new ErrorCode(2001000401, "apiKey 不存在");
+
+    // ========== 其它相关 2001000900 开头 ==========
+    ErrorCode SMS_API_PARAM_ERROR = new ErrorCode(2001000900, "请求参数缺失");
+    ErrorCode SMS_MOBILE_INVALID = new ErrorCode(2001000901, "手机格式不正确");
+    ErrorCode SMS_MOBILE_BLACK = new ErrorCode(2001000902, "手机号在黑名单中");
+
+    ErrorCode EXCEPTION = new ErrorCode(2001000999, "调用异常");
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java
new file mode 100644
index 0000000000..95c3c31a3e
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.mail.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 短信模板的审核状态枚举
+ *
+ * @author 芋道源码
+ */
+@AllArgsConstructor
+@Getter
+public enum MailTemplateAuditStatusEnum {
+
+    CHECKING(1),
+    SUCCESS(2),
+    FAIL(3);
+
+    private final Integer status;
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java
new file mode 100644
index 0000000000..1f19ac12bd
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.framework.mail.core.property;
+
+import lombok.Data;
+import cn.iocoder.yudao.framework.mail.core.enums.MailChannelEnum;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 短信渠道配置类
+ *
+ * @author zzf
+ * @date 2021/1/25 17:01
+ */
+@Data
+@Validated
+public class MailChannelProperties {
+
+    /**
+     * 渠道编号
+     */
+    @NotNull(message = "短信渠道 ID 不能为空")
+    private Long id;
+    /**
+     * 短信签名
+     */
+    @NotEmpty(message = "短信签名不能为空")
+    private String signature;
+    /**
+     * 渠道编码
+     *
+     * 枚举 {@link MailChannelEnum}
+     */
+    @NotEmpty(message = "渠道编码不能为空")
+    private String code;
+    /**
+     * 短信 API 的账号
+     */
+    @NotEmpty(message = "短信 API 的账号不能为空")
+    private String apiKey;
+    /**
+     * 短信 API 的秘钥
+     */
+    @NotEmpty(message = "短信 API 的秘钥不能为空")
+    private String apiSecret;
+    /**
+     * 短信发送回调 URL
+     */
+    private String callbackUrl;
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
new file mode 100644
index 0000000000..2ffe0d7cb7
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.system.api.mail;
+
+public interface MailSendApi {
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
new file mode 100644
index 0000000000..a3b0f2e354
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.system.api.mail.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel("管理后台 - 邮件发送 Req VO")
+@Data
+public class MailSendReqDTO { // TODO @wangjingqi：1）, 不用空格；2）应该只要传递 templateCode、参数就好，title、from、content、附件应该都是参数里的
+
+    @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
+    @NotNull(message = "邮箱账号不能为空")
+    @Email(message = "邮箱账号格式错误")
+    private String from;
+
+    @ApiModelProperty(value = "标题",example = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容",example = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "邮箱模版id",example = "1024")
+    @NotNull(message = "邮箱模版id不能为空")
+    private Integer templateId;
+
+    @ApiModelProperty(value = "收件人",required = true,example = "yudaoyuanma@123.com")
+    @NotNull(message = "收件人不能为空")
+    private List<String> tos;
+
+    @ApiModelProperty(value = "附件",example = "附件编码")
+    private List<String> fileIds;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 8520cb1155..07322ccd72 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -126,5 +126,6 @@ public interface ErrorCodeConstants {
     // ========== 邮箱模版 1002020000 ==========
     ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002020000 , "邮箱模版不存在");
     ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002020001, "邮箱模版存在");
+    ErrorCode MAIL_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002020002, "存在关联邮箱模版");
 
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
new file mode 100644
index 0000000000..8936ea9c79
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.enums.mail;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 邮件的发送状态枚举
+ *
+ * @author wangjingyi
+ * @date 2022/4/10 13:39
+ */
+@Getter
+@AllArgsConstructor
+public enum MailSendStatusEnum {
+
+    INIT(0), // 初始化
+    SUCCESS(10), // 发送成功
+    FAILURE(20), // 发送失败
+    IGNORE(30), // 忽略，即不发送
+    ;
+
+    private final int status;
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/pom.xml b/yudao-module-system/yudao-module-system-impl/pom.xml
index b297830b5a..65dc74d03e 100644
--- a/yudao-module-system/yudao-module-system-impl/pom.xml
+++ b/yudao-module-system/yudao-module-system-impl/pom.xml
@@ -47,6 +47,10 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-mail</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
@@ -102,6 +106,7 @@
             <artifactId>yudao-spring-boot-starter-excel</artifactId>
         </dependency>
 
+
     </dependencies>
 
 </project>
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
new file mode 100644
index 0000000000..cce0ed3883
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.system.api.mail;
+
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * 邮件发送 API 接口
+ *
+ * @author wangjingyi
+ */
+@Service
+@Validated
+public class MailSendApiImpl implements MailSendApi{
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 67cf9ba3a3..d8650b52e8 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -4,28 +4,34 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 
 @ApiModel("管理后台 - 邮箱账号基类 Base VO")
 @Data
-public class MailAccountBaseVO { // TODO @wangjingqi：1）, 不用空格；2）from、username、password、host、sslEnable 都要参数校验，非空；3）username 要 Email 格式；port Integer；
+public class MailAccountBaseVO {
 
-    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
+    @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
+    @NotNull(message = "邮箱必填")
     private String from;
 
-    @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
+    @ApiModelProperty(value = "用户名",required = true,example = "yudao")
     @NotNull(message = "用户名必填")
+    @Email(message = "必须是Email格式")
     private String username;
 
-    @ApiModelProperty(value = "密码" , required = true , example = "123456")
+    @ApiModelProperty(value = "密码",required = true,example = "123456")
+    @NotNull(message = "密码必填")
     private String password;
 
-    @ApiModelProperty(value = "网站" , required = true , example = "www.iocoder.cn")
+    @ApiModelProperty(value = "网站",required = true,example = "www.iocoder.cn")
+    @NotNull(message = "网站必填")
     private String host;
 
-    @ApiModelProperty(value = "端口" , required = true , example = "80")
-    private String port;
+    @ApiModelProperty(value = "端口",required = true,example = "80")
+    private Integer port;
 
-    @ApiModelProperty(value = "是否开启ssl" , required = true , example = "2")
+    @ApiModelProperty(value = "是否开启ssl",required = true,example = "2")
+    @NotNull(message = "是否开启ssl必填")
     private Boolean sslEnable;
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
index 442a101a30..d341ce6789 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Timestamp;
+import java.util.Date;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -30,10 +31,10 @@ public class MailLogExcelVO {
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ExcelProperty(value = "发送时间" )
-    private Timestamp sendTime;
+    private Date sendTime;
 
     @ExcelProperty(value = "发送状态")
-    private Boolean sendStatus;
+    private Integer sendStatus;
 
     @ExcelProperty(value = "发送结果")
     private String sendResult;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
index af8e81698d..024e075f44 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
@@ -36,7 +36,7 @@ public class MailLogRespVO {
     private Timestamp sendTime;
 
     @ApiModelProperty(value = "发送状态" , required = false , example = "1")
-    private Boolean sendStatus;
+    private Integer sendStatus;
 
     @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
     private String sendResult;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
index 4ce06a718f..65142ee3fa 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -11,25 +12,26 @@ import java.util.List;
 @Data
 public class MailReqVO { // TODO @wangjingqi：1）, 不用空格；2）应该只要传递 templateCode、参数就好，title、from、content、附件应该都是参数里的
 
-    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
+    @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
     @NotNull(message = "邮箱账号不能为空")
+    @Email(message = "邮箱账号格式错误")
     private String from;
 
-    @ApiModelProperty(value = "标题"  , example = "标题")
+    @ApiModelProperty(value = "标题",example = "标题")
     private String title;
 
-    @ApiModelProperty(value = "内容"  , example = "内容")
+    @ApiModelProperty(value = "内容",example = "内容")
     private String content;
 
-    @ApiModelProperty(value = "邮箱模版id" , example = "1024")
+    @ApiModelProperty(value = "邮箱模版id",example = "1024")
     @NotNull(message = "邮箱模版id不能为空")
     private Integer templateId;
 
-    @ApiModelProperty(value = "收件人" , required = true , example = "yudaoyuanma@123.com")
+    @ApiModelProperty(value = "收件人",required = true,example = "yudaoyuanma@123.com")
     @NotNull(message = "收件人不能为空")
     private List<String> tos;
 
-    @ApiModelProperty(value = "附件"  , example = "附件编码")
+    @ApiModelProperty(value = "附件",example = "附件编码")
     private List<String> fileIds;
 
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
index e3c9797ab7..1e44336aac 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
@@ -4,15 +4,18 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 
 @ApiModel("管理后台 - 邮箱模版基类 Base VO")
 @Data
-public class MailTemplateBaseVO {  // TODO @wangjingqi：1）swagger 注解不完善；2）id、name、code、username、title、content、status 是不是要参数校验呀
+public class MailTemplateBaseVO {
     @ApiModelProperty("主键")
+    @NotNull(message = "主键不能为空")
     private Long id;
 
     @ApiModelProperty("名称")
+    @NotNull(message = "名称不能为空")
     private String name;
 
     @ApiModelProperty("标识")
@@ -20,16 +23,21 @@ public class MailTemplateBaseVO {  // TODO @wangjingqi：1）swagger 注解不
     private String code;
 
     @ApiModelProperty("发件人")
+    @NotNull(message = "发件人不能为空")
+    @Email(message = "发件人格式有误")
     private String username;
 
     @ApiModelProperty("标题")
+    @NotNull(message = "标题不能为空")
     private String title;
 
     @ApiModelProperty("内容")
+    @NotNull(message = "内容不能为空")
     private String content;
 
     @ApiModelProperty("状态")
-    private String status;
+    @NotNull(message = "状态不能为空")
+    private Integer status;
 
     @ApiModelProperty("备注")
     private String remark;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
index 398e6ac03b..a48c5a91af 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
@@ -31,7 +31,7 @@ public class MailTemplatePageReqVO extends PageParam {
     private String content;
 
     @ApiModelProperty("状态")
-    private String status;
+    private Integer status;
 
     @ApiModelProperty("备注")
     private String remark;
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index f6b9e689c4..7454d2acb3 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -1,12 +1,12 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
+import java.util.Date;
 
 /**
  * 邮箱日志
@@ -18,6 +18,10 @@ import java.sql.Timestamp;
 @TableName(value = "system_mail_log", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class MailLogDO extends BaseDO implements Serializable {
 
     /**
@@ -29,7 +33,7 @@ public class MailLogDO extends BaseDO implements Serializable {
     /**
      * 邮箱账号编号
      */
-    private String accountCode;
+    private Long accountId;
 
     // TODO @wangjingyi：如果是冗余字段，记得 @ 下；
     /**
@@ -40,7 +44,7 @@ public class MailLogDO extends BaseDO implements Serializable {
     /**
      * 模版主键
      */
-    private String templateId;
+    private Long templateId;
 
     /**
      * 模版编号
@@ -65,16 +69,18 @@ public class MailLogDO extends BaseDO implements Serializable {
     /**
      * 发送时间
      */
-    private Timestamp sendTime;
+    private Date sendTime;
 
     /**
      * 发送状态
+     *
+     * 枚举 {@link MailSendStatusEnum}
      */
-    // TODO @wangjingyi：四个状态，参考短信模块
-    private Boolean sendStatus;
+    private Integer sendStatus;
 
     /**
      * 发送结果
+     *
      */
     private String sendResult;
 
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index b86e39e95e..96f9ba4ab0 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 邮箱模版
  *
@@ -29,11 +31,10 @@ public class MailTemplateDO extends BaseDO {
      * 模版编号
      */
     private String code;
-    // TODO @wangjingyi：应该使用 accountId 呀
     /**
-     * 用户名
+     * 邮箱账号主键
      */
-    private String username;
+    private Long accountId;
     /**
      * 标题
      */
@@ -47,7 +48,7 @@ public class MailTemplateDO extends BaseDO {
      *
      * 枚举 {@link CommonStatusEnum}
      */
-    private String status; // TODO @wangjingyi：Integer
+    private Integer status;
     /**
      * 备注
      */
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index 8697b21514..651f5c75fd 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -21,9 +22,7 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
     }
 
     default MailAccountDO selectByUserName(String userName){
-        // TODO @wangjingyi：selectOne 有封装的方法；然后，编码一定要学会使用泛型呀。例如说 QueryWrapperX<MailAccountDO> queryWrapperX = new QueryWrapperX<>();
-        QueryWrapperX<MailAccountDO> queryWrapperX = new QueryWrapperX<>();
-        queryWrapperX.eqIfPresent("username", userName);
-        return this.selectOne(queryWrapperX);
+        return selectOne(new QueryWrapperX<MailAccountDO>()
+                .eqIfPresent("username" , userName));
     };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
index d65887e54a..a5cbf0b2a3 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -6,6 +6,9 @@ import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
 
 
 @Mapper
@@ -23,7 +26,15 @@ public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
     }
 
     default MailTemplateDO selectOneByCode(String code){
-        // TODO @wangjingyi：优先使用 lambada 查询
-        return selectOne("code" , code);
+        return selectOne(new QueryWrapperX<MailTemplateDO>()
+                .eqIfPresent("code" , code));
+    };
+
+    @Select("SELECT id FROM system_mail_template WHERE update_time > #{maxUpdateTime} LIMIT 1")
+    Long selectByMaxUpdateTime(Date maxUpdateTime);
+
+    default MailTemplateDO selectOneByAccountId(Long accountId){
+        return selectOne(new QueryWrapperX<MailTemplateDO>()
+                .eqIfPresent("account_id" , accountId));
     };
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
index 4b02f760ea..978ea59973 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
@@ -2,17 +2,23 @@ package cn.iocoder.yudao.module.system.mq.consumer.mail;
 
 import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessageListener;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-// TODO 芋艿：这个暂未实现
+import javax.annotation.Resource;
+
+
 @Component
 @Slf4j
 public class MailSendConsumer extends AbstractStreamMessageListener<MailSendMessage> {
 
+    @Resource
+    private MailSendService mailSendService;
     @Override
     public void onMessage(MailSendMessage message) {
         log.info("[onMessage][消息内容({})]", message);
+        mailSendService.doSendMail(message);
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
index aee02c76e9..275a458250 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,29 +17,34 @@ import java.util.Map;
 @EqualsAndHashCode(callSuper = true)
 public class MailSendMessage extends AbstractStreamMessage {
 
+    /**
+     * 日志id
+     */
+    @NotNull(message = "邮箱日志id不能为空")
+    private Long logId;
     /**
      * 邮箱地址
      */
     @NotNull(message = "邮箱地址不能为空")
-    private String address;
+    private String from;
     /**
-     * 短信模板编号
+     * 邮箱模板编号
      */
-    @NotNull(message = "短信模板编号不能为空")
+    @NotNull(message = "邮箱模板编号不能为空")
     private String templateCode;
     /**
-     * 短信模板参数
+     * 收件人
      */
-    private Map<String, Object> templateParams;
-
+    @NotNull(message = "收件人不能为空")
+    private List<String> tos;
     /**
-     * 用户编号，允许空
+     * 标题
      */
-    private Integer userId;
+    private String title;
     /**
-     * 用户类型，允许空
+     * 内容
      */
-    private Integer userType;
+    private String content;
 
     @Override
     public String getStreamKey() {
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
new file mode 100644
index 0000000000..ed82c24a4d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.system.mq.producer.mail;
+
+import cn.iocoder.yudao.framework.common.core.KeyValue;
+import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+import cn.iocoder.yudao.module.system.mq.message.sms.SmsChannelRefreshMessage;
+import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage;
+import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * Mail 邮件相关消息的 Producer
+ *
+ * @author wangjingyi
+ * @date 2021/4/19 13:33
+ */
+@Slf4j
+@Component
+public class MailProducer {
+
+    @Resource
+    private RedisMQTemplate redisMQTemplate;
+
+    /**
+     * 发送 {@link SmsChannelRefreshMessage} 消息
+     */
+    public void sendMailChannelRefreshMessage() {
+        SmsChannelRefreshMessage message = new SmsChannelRefreshMessage();
+        redisMQTemplate.send(message);
+    }
+
+    /**
+     * 发送 {@link SmsTemplateRefreshMessage} 消息
+     */
+    public void sendMailTemplateRefreshMessage() {
+        SmsTemplateRefreshMessage message = new SmsTemplateRefreshMessage();
+        redisMQTemplate.send(message);
+    }
+
+    /**
+     * 发送 {@link MailSendMessage} 消息
+     *
+     * @param mailAccountDO 邮箱账号信息
+     * @param mailTemplateDO 邮箱模版信息
+     * @param content 内容
+     * @param tos 收件人
+     * @param title 标题
+     */
+    public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) {
+        MailSendMessage message = new MailSendMessage();
+        message.setContent(content);
+        message.setFrom(mailAccountDO.getFrom());
+        message.setTemplateCode(mailTemplateDO.getCode());
+        message.setTitle(title);
+        message.setTos(tos);
+        message.setLogId(sendLogId);
+        redisMQTemplate.send(message);
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index fa195259bf..0a5d25ba2c 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -4,7 +4,9 @@ package cn.iocoder.yudao.module.system.service.mail;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 
 import java.util.List;
 
@@ -28,4 +30,18 @@ public interface MailLogService {
      * @return
      */
     List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO);
+
+    /**
+     * 创建邮箱日志
+     * @param mailAccountDO 邮箱账号信息
+     * @param mailTemplateDO 模版信息
+     * @param from 邮箱
+     * @param content 内容
+     * @param tos 收件人
+     * @param title 标题
+     * @param isSend 是否发送成功
+     */
+    Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String from, String content, List<String> tos, String title, Boolean isSend);
+
+    Long updateSmsSendResult(Long logId, String result);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
new file mode 100644
index 0000000000..31f6a3f3e7
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  邮箱模版服务类
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+public interface MailSendService {
+
+    /**
+     * 发送邮件
+     *
+     * @param templateCode 邮件模版编码
+     * @param from 邮箱
+     * @param content 内容
+     * @param tos 收件人
+     * @param title 标题
+     */
+    void sendMail(String templateCode, String from , String content , List<String> tos , String title);
+
+    /**
+     * 执行真正的邮件发送
+     * 注意，该方法仅仅提供给 MQ Consumer 使用
+     *
+     * @param message 邮件
+     */
+    void doSendMail(MailSendMessage message);
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 1071eae5d2..b8101f0af7 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  *  邮箱模版服务类
@@ -18,6 +19,7 @@ import java.util.List;
  */
 public interface MailTemplateService {
 
+    void initLocalCache();
     /**
      * 邮箱模版创建
      *
@@ -62,6 +64,13 @@ public interface MailTemplateService {
      * @return 模版数组
      */
     List<MailTemplateDO> getMailTemplateList();
+    /**
+     *从缓存中获取邮箱模版
+     *
+     * @param code 模板编码
+     * @return 邮箱模板
+     */
+    MailTemplateDO getMailTemplateByCodeFromCache(String code);
 
     /**
      * 发送邮件
@@ -69,4 +78,12 @@ public interface MailTemplateService {
      * @param mailReqVO 邮件发送信息
      */
     void sendMail(MailReqVO mailReqVO);
+
+    /**
+     * 邮件模版内容合成
+     * @param content 邮箱模版
+     * @param params 合成参数
+     * @return
+     */
+    String formateMailTemplateContent(String content, Map<String, String> params);
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index aa1fb1d467..36ca05213f 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccou
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
@@ -16,8 +17,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_EXISTS;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 
 /**
@@ -47,8 +47,8 @@ public class MailAccountServiceImpl implements MailAccountService {
 
     @Override
     public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一 // TODO @wangjingyi：更新的就是自己，username 这样写，会重复呀。
-        this.validateMailAccountOnlyByUserName(updateReqVO.getUsername());
+        // username 要校验唯一
+        this.validateMailAccountExists(updateReqVO.getId());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
         this.validateMailAccountExists(mailAccountDO.getId());
@@ -57,9 +57,10 @@ public class MailAccountServiceImpl implements MailAccountService {
 
     @Override
     public void delete(Long id) {
-        // TODO @wangjingyi：删除时，要判断是否有使用的模板
-        // 校验是否存在
+        // 校验是否存在账号
         this.validateMailAccountExists(id);
+        // 校验是否存在关联模版
+        this.validateMailTemplateByAccountId(id);
         mailAccountMapper.deleteById(id);
     }
 
@@ -90,4 +91,11 @@ public class MailAccountServiceImpl implements MailAccountService {
             throw exception(MAIL_ACCOUNT_EXISTS);
         }
     }
+
+    private void validateMailTemplateByAccountId(Long accountId){
+        MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectOneByAccountId(accountId);
+        if (mailTemplateDO != null) {
+            throw exception(MAIL_RELATE_TEMPLATE_EXISTS);
+        }
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index c6b492498b..bdceb0d727 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -4,14 +4,21 @@ package cn.iocoder.yudao.module.system.service.mail.impl;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
+import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
+import cn.iocoder.yudao.module.system.enums.sms.SmsSendStatusEnum;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  *  邮箱日志实现类
@@ -35,4 +42,39 @@ public class MailLogServiceImpl implements MailLogService {
     public List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO) {
         return mailLogMapper.selectList(exportReqVO);
     }
+
+    @Override
+    public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) {
+        MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
+        logDOBuilder.from(mailAccountDO.getFrom());
+        logDOBuilder.accountId(mailAccountDO.getId());
+        logDOBuilder.content(content);
+        logDOBuilder.title(title);
+        logDOBuilder.templateCode(mailTemplateDO.getCode());
+        logDOBuilder.templateId(mailTemplateDO.getId());
+        logDOBuilder.to(tos.toString());
+        logDOBuilder.sendTime(new Date());
+        logDOBuilder.sendStatus(Objects.equals(isSend, true) ? MailSendStatusEnum.INIT.getStatus()
+                : MailSendStatusEnum.IGNORE.getStatus());
+
+        MailLogDO mailLogDO = logDOBuilder.build();
+        mailLogMapper.insert(mailLogDO);
+        return mailLogDO.getId();
+    }
+
+    @Override
+    public Long updateSmsSendResult(Long logId, String result) {
+        MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
+        logDOBuilder.id(logId);
+        logDOBuilder.sendResult(result);
+        MailLogDO mailLogDO = logDOBuilder.build();
+        mailLogMapper.updateById(mailLogDO);
+        return logId;
+    }
+
+    public Long create(){
+        MailLogDO mailLogDO = new MailLogDO();
+        mailLogMapper.insert(mailLogDO);
+        return mailLogDO.getId();
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
new file mode 100644
index 0000000000..61e428048d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
@@ -0,0 +1,107 @@
+package cn.iocoder.yudao.module.system.service.mail.impl;
+
+
+import cn.hutool.extra.mail.MailAccount;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
+import cn.iocoder.yudao.module.system.service.mail.MailLogService;
+import cn.iocoder.yudao.module.system.service.mail.MailSendService;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import cn.iocoder.yudao.framework.mail.core.client.MailClientFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import cn.iocoder.yudao.framework.mail.core.client.MailClient;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS;
+
+/**
+ * 邮箱模版 服务实现类
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+@Validated
+@Slf4j
+public class MailSendServiceImpl implements MailSendService {
+
+    @Resource
+    private MailTemplateMapper mailTemplateMapper;
+    @Resource
+    private MailAccountMapper mailAccountMapper;
+    @Resource
+    private MailTemplateService mailTemplateService;
+    @Resource
+    private MailLogService mailLogService;
+    @Resource
+    private MailClientFactory mailClientFactory;
+    @Resource
+    private MailProducer mailProducer;
+
+
+    @Override
+    public void sendMail(String templateCode, String from , String content , List<String> tos , String title) {
+        // TODO @@wangjingyi：发送的时候，参考下短信；
+        MailTemplateDO mailTemplateDO =  this.checkMailTemplateValid(templateCode);
+        // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志
+        Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(mailTemplateDO.getStatus());
+        //查询账号信息
+        MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
+                "from", from
+        );
+        Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
+        content = mailTemplateService.formateMailTemplateContent(mailTemplateDO.getContent(), params);
+        Long sendLogId = mailLogService.createMailLog(mailAccountDO , mailTemplateDO , from , content , tos , title , isSend);
+
+        // 后续功能 TODO ：附件查询
+        //List<String> fileIds = mailSendVO.getFileIds();
+
+        //装载账号信息
+        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
+
+        // 发送 MQ 消息，异步执行发送短信
+        if (isSend) {
+            mailProducer.sendMailSendMessage(mailAccountDO , mailTemplateDO ,content , tos , title , sendLogId);
+        }
+    }
+
+    @Override
+    public void doSendMail(MailSendMessage message) {
+        MailClient mailClient = mailClientFactory.getMailClient();
+        String result = mailClient.sendMail(message.getFrom() , message.getContent() , message.getTitle() , message.getTos());
+        mailLogService.updateSmsSendResult(message.getLogId() , result);
+    }
+
+    private MailTemplateDO checkMailTemplateValid(String templateCode) {
+        MailTemplateDO mailTemplateDO = mailTemplateService.getMailTemplateByCodeFromCache(templateCode);
+        if (mailTemplateDO == null){
+            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
+        }
+        return mailTemplateDO;
+    }
+
+    private void validateMailTemplateExists(Long id) {
+        if (mailTemplateMapper.selectById(id) == null) {
+            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
+        }
+    }
+
+    private void validateMailTemplateOnlyByCode(String code){
+        if (mailTemplateMapper.selectOneByCode(code) != null) {
+            throw exception(MAIL_TEMPLATE_EXISTS);
+        }
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 2bd74ac4cc..e1d2121863 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.mail.MailAccount;
 import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
@@ -13,14 +15,18 @@ import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +42,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPL
  */
 @Service
 @Validated
+@Slf4j
 public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Resource
@@ -43,6 +50,38 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Resource
     private MailAccountMapper mailAccountMapper;
 
+    private volatile List<MailTemplateDO> mailTemplateDOList;
+
+    /**
+     * 邮件模板缓存
+     * key：邮箱模板编码 {@link MailTemplateDO#getCode()}
+     *
+     * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
+     */
+    private volatile Map<String, MailTemplateDO> mailTemplateCache;
+
+    private volatile Date maxUpdateTime;
+
+    @Override
+    @PostConstruct
+    public void initLocalCache() {
+        if(maxUpdateTime == null){
+            mailTemplateDOList = mailTemplateMapper.selectList();
+        }else{
+            if(mailTemplateMapper.selectByMaxUpdateTime(maxUpdateTime)<=0){
+                return;
+            }
+        }
+        if (CollUtil.isEmpty(mailTemplateDOList)) {
+            return;
+        }
+
+        // 写入缓存
+        mailTemplateCache = CollectionUtils.convertMap(mailTemplateDOList, MailTemplateDO::getCode);
+        maxUpdateTime = CollectionUtils.getMaxValue(mailTemplateDOList, MailTemplateDO::getUpdateTime);
+        log.info("[initLocalCache][初始化 mailTemplate 数量为 {}]", mailTemplateDOList.size());
+    }
+
     @Override
     public Long create(MailTemplateCreateReqVO createReqVO) {
         // code 要校验唯一
@@ -54,11 +93,9 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Override
     public void update(@Valid MailTemplateUpdateReqVO updateReqVO) {
-        // code 要校验唯一
-        this.validateMailTemplateOnlyByCode(updateReqVO.getCode()); // TODO @wangjingyi：code 这样写，修改自己会有问题
-        MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
-        this.validateMailTemplateExists(mailTemplateDO.getId());
+        this.validateMailTemplateExists(updateReqVO.getId());
+        MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         mailTemplateMapper.updateById(mailTemplateDO);
     }
 
@@ -80,6 +117,11 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Override
     public List<MailTemplateDO> getMailTemplateList() {return mailTemplateMapper.selectList();}
 
+    @Override
+    public MailTemplateDO getMailTemplateByCodeFromCache(String code) {
+        return mailTemplateCache.get(code);
+    }
+
     @Override
     public void sendMail(MailReqVO mailReqVO) {
         // TODO @@wangjingyi：发送的时候，参考下短信；
@@ -102,6 +144,11 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         MailUtil.send(account , mailReqVO.getTos() , mailReqVO.getTitle() , content , false);
     }
 
+    @Override
+    public String formateMailTemplateContent(String content, Map<String, String> params) {
+        return StrUtil.format(content, params);
+    }
+
     private void validateMailTemplateExists(Long id) {
         if (mailTemplateMapper.selectById(id) == null) {
             throw exception(MAIL_TEMPLATE_NOT_EXISTS);

From 0b0e37a3d50f05b6518acdaed2f761a81f9bfd17 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 2 May 2022 23:21:45 +0800
Subject: [PATCH 17/67] =?UTF-8?q?code=20review=20=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailAccountController.java     |  6 +++++-
 .../admin/mail/MailTemplateController.java    |  3 +++
 .../mail/vo/account/MailAccountPageReqVO.java |  1 +
 .../service/mail/MailAccountService.java      |  1 -
 .../system/service/mail/MailLogService.java   | 19 ++++++++++-------
 .../service/mail/MailTemplateService.java     |  1 +
 .../mail/impl/MailAccountServiceImpl.java     | 21 ++++++++++++-------
 .../service/mail/impl/MailLogServiceImpl.java |  3 ++-
 .../mail/impl/MailSendServiceImpl.java        |  2 +-
 .../mail/impl/MailTemplateServiceImpl.java    |  6 ++++++
 10 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index c16c7a60ba..864c106d63 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -24,7 +24,6 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-
 @Api(tags = "管理后台 - 邮件账号")
 @RestController
 @RequestMapping("/system/mail-account")
@@ -57,6 +56,9 @@ public class MailAccountController {
         return success(true);
     }
 
+    // TODO @wangjingyi：getMailAccount 和 getMailAccountPage 这两个接口，定义一个对应的 Resp 类哈，参考别的模块。主要不要返回 password 字段。
+    // 一个可以的做法，是 MailAccountBaseVO 不返回 password，然后 MailAccountCreateReqVO、MailAccountUpdateReqVO 添加这个字段
+
     @GetMapping("/get")
     @ApiOperation("获得邮箱账号")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@@ -74,6 +76,8 @@ public class MailAccountController {
         return success(MailAccountConvert.INSTANCE.convertPage(pageResult));
     }
 
+    // TODO @wangjingyi：getSimpleMailAccountList 单独定义一个类，只返回精简的信息，id，from 即可。像密码之类都是敏感信息，不应该返回
+
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获得邮箱账号精简列表")
     public CommonResult<List<MailAccountBaseVO>> getSimpleMailAccountList() {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
index cffd7f980d..f75c8daadd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -29,6 +29,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/system/mail-template")
 public class MailTemplateController {
 
+    // TODO @wangjingyi：private
     @Autowired
     MailTemplateService mailTempleService;
 
@@ -55,6 +56,8 @@ public class MailTemplateController {
         return success(true);
     }
 
+    // TODO @wangjingyi：下面几个 VO 也参考我在 account 给的建议
+
     @GetMapping("/get")
     @ApiOperation("获得邮箱模版")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
index 520f319982..2ae2ad1624 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
@@ -12,6 +12,7 @@ import lombok.ToString;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MailAccountPageReqVO extends PageParam {
+
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
     private String from;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index c1289154f8..e8937d9730 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -9,7 +9,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import javax.validation.Valid;
 import java.util.List;
 
-
 /**
  * 邮箱账号 Service 接口
  *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index 0a5d25ba2c..f5d4174111 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
@@ -11,14 +10,16 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import java.util.List;
 
 /**
- *  邮箱日志服务类
+ * 邮箱日志服务类
  *
  * @author wangjingyi
  * @since 2022-03-21
  */
 public interface MailLogService {
+
     /**
      * 邮箱日志分页
+     *
      * @param pageVO
      * @return
      */
@@ -26,6 +27,7 @@ public interface MailLogService {
 
     /**
      * 邮箱日志数组信息
+     *
      * @param exportReqVO
      * @return
      */
@@ -33,13 +35,14 @@ public interface MailLogService {
 
     /**
      * 创建邮箱日志
-     * @param mailAccountDO 邮箱账号信息
+     *
+     * @param mailAccountDO  邮箱账号信息
      * @param mailTemplateDO 模版信息
-     * @param from 邮箱
-     * @param content 内容
-     * @param tos 收件人
-     * @param title 标题
-     * @param isSend 是否发送成功
+     * @param from           邮箱
+     * @param content        内容
+     * @param tos            收件人
+     * @param title          标题
+     * @param isSend         是否发送成功
      */
     Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String from, String content, List<String> tos, String title, Boolean isSend);
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index b8101f0af7..99b8fafeff 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -20,6 +20,7 @@ import java.util.Map;
 public interface MailTemplateService {
 
     void initLocalCache();
+
     /**
      * 邮箱模版创建
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 36ca05213f..06945127cf 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -21,7 +21,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 
 /**
- *  邮箱账号 Service 实现类
+ * 邮箱账号 Service 实现类
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -39,28 +39,34 @@ public class MailAccountServiceImpl implements MailAccountService {
     @Override
     public Long create(MailAccountCreateReqVO createReqVO) {
         // username 要校验唯一
-        this.validateMailAccountOnlyByUserName(createReqVO.getUsername());
+        validateMailAccountOnlyByUserName(createReqVO.getUsername());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(createReqVO);
         mailAccountMapper.insert(mailAccountDO);
+
+        // 更新
         return mailAccountDO.getId();
     }
 
     @Override
     public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一
-        this.validateMailAccountExists(updateReqVO.getId());
+        // username 要校验唯一 TODO @wangjingyi：校验唯一的时候，需要排除掉自己
+        validateMailAccountExists(updateReqVO.getId());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
-        this.validateMailAccountExists(mailAccountDO.getId());
+        validateMailAccountExists(mailAccountDO.getId());
+
+        // 更新
         mailAccountMapper.updateById(mailAccountDO);
     }
 
     @Override
     public void delete(Long id) {
         // 校验是否存在账号
-        this.validateMailAccountExists(id);
+        validateMailAccountExists(id);
         // 校验是否存在关联模版
-        this.validateMailTemplateByAccountId(id);
+        validateMailTemplateByAccountId(id);
+
+        // 删除
         mailAccountMapper.deleteById(id);
     }
 
@@ -95,6 +101,7 @@ public class MailAccountServiceImpl implements MailAccountService {
     private void validateMailTemplateByAccountId(Long accountId){
         MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectOneByAccountId(accountId);
         if (mailTemplateDO != null) {
+            // TODO wangjingyi：MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS
             throw exception(MAIL_RELATE_TEMPLATE_EXISTS);
         }
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index bdceb0d727..7c1b277da0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
@@ -62,6 +61,7 @@ public class MailLogServiceImpl implements MailLogService {
         return mailLogDO.getId();
     }
 
+    // TODO @wangjingyi：不需要返回 id 呀
     @Override
     public Long updateSmsSendResult(Long logId, String result) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
@@ -72,6 +72,7 @@ public class MailLogServiceImpl implements MailLogService {
         return logId;
     }
 
+    // TODO @wangjingyi：无用的方法，需要进行删除
     public Long create(){
         MailLogDO mailLogDO = new MailLogDO();
         mailLogMapper.insert(mailLogDO);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
index 61e428048d..f2146f0270 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
-
 import cn.hutool.extra.mail.MailAccount;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
@@ -80,6 +79,7 @@ public class MailSendServiceImpl implements MailSendService {
 
     @Override
     public void doSendMail(MailSendMessage message) {
+        // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的
         MailClient mailClient = mailClientFactory.getMailClient();
         String result = mailClient.sendMail(message.getFrom() , message.getContent() , message.getTitle() , message.getTos());
         mailLogService.updateSmsSendResult(message.getLogId() , result);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index e1d2121863..f3d85841ef 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -62,6 +62,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     private volatile Date maxUpdateTime;
 
+    // TODO @wangjingyi：参考下别的模块的 initLocalCache 的实现
     @Override
     @PostConstruct
     public void initLocalCache() {
@@ -85,9 +86,11 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Override
     public Long create(MailTemplateCreateReqVO createReqVO) {
         // code 要校验唯一
+        // TODO @wangjingyi：参考下我在 account 给的唯一校验的说明。
         this.validateMailTemplateOnlyByCode(createReqVO.getCode());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
         mailTemplateMapper.insert(mailTemplateDO);
+        // TODO @wangjingyi：mq 更新
         return mailTemplateDO.getId();
     }
 
@@ -97,6 +100,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         this.validateMailTemplateExists(updateReqVO.getId());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         mailTemplateMapper.updateById(mailTemplateDO);
+        // TODO @wangjingyi：mq 更新
     }
 
     @Override
@@ -104,6 +108,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         // 校验是否存在
         this.validateMailTemplateExists(id);
         mailTemplateMapper.deleteById(id);
+        // TODO @wangjingyi：mq 更新
     }
 
     @Override
@@ -144,6 +149,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         MailUtil.send(account , mailReqVO.getTos() , mailReqVO.getTitle() , content , false);
     }
 
+    // TODO @@wangjingyi：单词拼写错误
     @Override
     public String formateMailTemplateContent(String content, Map<String, String> params) {
         return StrUtil.format(content, params);

From ea92b8412173b0ef0c65e30e9cbebcd56e029ed6 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Wed, 4 May 2022 22:31:12 +0800
Subject: [PATCH 18/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4mail-module?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-framework/pom.xml                       |  1 -
 .../pom.xml                                   | 65 ------------------
 .../config/YudaoMailAutoConfiguration.java    | 21 ------
 .../mail/core/client/MailClient.java          | 23 -------
 .../mail/core/client/MailClientFactory.java   |  5 --
 .../mail/core/client/MailCodeMapping.java     | 17 -----
 .../mail/core/client/MailCommonResult.java    | 68 -------------------
 .../core/client/dto/MailReceiveRespDTO.java   | 48 -------------
 .../mail/core/client/dto/MailSendRespDTO.java | 18 -----
 .../core/client/dto/MailTemplateRespDTO.java  | 31 ---------
 .../core/client/impl/AbstractMailClient.java  | 14 ----
 .../client/impl/MailClientFactoryImpl.java    | 39 -----------
 .../client/impl/hutool/HutoolMailClient.java  | 29 --------
 .../impl/hutool/HutoolMailCodeMapping.java    | 20 ------
 .../mail/core/enums/MailChannelEnum.java      | 32 ---------
 .../MailFrameworkErrorCodeConstants.java      | 47 -------------
 .../enums/MailTemplateAuditStatusEnum.java    | 21 ------
 .../core/property/MailChannelProperties.java  | 52 --------------
 .../system/enums/ErrorCodeConstants.java      | 18 +++--
 .../yudao-module-system-biz/pom.xml           |  4 --
 .../convert/mail/MailTemplateConvert.java     |  4 --
 .../mail/impl/MailSendServiceImpl.java        | 10 +--
 22 files changed, 14 insertions(+), 573 deletions(-)
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java

diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index 42c887c561..73bb614cd7 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -30,7 +30,6 @@
         <module>yudao-spring-boot-starter-biz-operatelog</module>
         <module>yudao-spring-boot-starter-biz-dict</module>
         <module>yudao-spring-boot-starter-biz-sms</module>
-        <module>yudao-spring-boot-starter-biz-mail</module>
         <module>yudao-spring-boot-starter-activiti</module>
         <module>yudao-spring-boot-starter-biz-pay</module>
         <module>yudao-spring-boot-starter-biz-weixin</module>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml
deleted file mode 100644
index 8cca217789..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>cn.iocoder.boot</groupId>
-        <artifactId>yudao-framework</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-spring-boot-starter-biz-mail</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-common</artifactId>
-        </dependency>
-
-        <!-- Spring 核心 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- 监控相关 -->
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-util</artifactId> <!-- aliyun 短信需要，进行链路追踪 -->
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <optional>true</optional> <!-- 设置为可选，因为使用到 @VisibleForTesting 用于单元测试 -->
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java
deleted file mode 100644
index c83b1e5f1e..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/config/YudaoMailAutoConfiguration.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.mail.config;
-
-import cn.iocoder.yudao.framework.mail.core.client.MailClientFactory;
-import cn.iocoder.yudao.framework.mail.core.client.impl.MailClientFactoryImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 邮箱配置类
- *
- * @author 芋道源码
- */
-@Configuration
-public class YudaoMailAutoConfiguration {
-
-    @Bean
-    public MailClientFactory mailClientFactory() {
-        return new MailClientFactoryImpl();
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java
deleted file mode 100644
index a17260410a..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClient.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client;
-
-import java.util.List;
-
-/**
- * 邮件客户端，用于对接各邮箱平台的 SDK，实现邮件发送等功能
- *
- * @author wangjingyi
- * @date 2021/4/19 19:21
- */
-public interface MailClient {
-
-    /**
-     * 发送邮件
-     *
-     * @param from 邮箱账号
-     * @param content 内容
-     * @param title 标题
-     * @param tos 收件人
-     * @return 邮件发送结果
-     */
-    String sendMail(String from, String content, String title, List<String> tos);
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java
deleted file mode 100644
index 3244dfe761..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailClientFactory.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client;
-
-public interface MailClientFactory {
-    MailClient getMailClient();
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java
deleted file mode 100644
index c33b4be3e3..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCodeMapping.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.mail.core.enums.MailFrameworkErrorCodeConstants;
-
-import java.util.function.Function;
-
-/**
- * 将 API 的错误码，转换为通用的错误码
- *
- * @see MailCommonResult
- * @see MailFrameworkErrorCodeConstants
- *
- * @author 芋道源码
- */
-public interface MailCodeMapping extends Function<String, ErrorCode> {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java
deleted file mode 100644
index a53a3b9897..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/MailCommonResult.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client;
-
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import cn.iocoder.yudao.framework.mail.core.enums.MailFrameworkErrorCodeConstants;
-
-/**
- * 短信的 CommonResult 拓展类
- *
- * 考虑到不同的平台，返回的 code 和 msg 是不同的，所以统一额外返回 {@link #apiCode} 和 {@link #apiMsg} 字段
- *
- * 另外，一些短信平台（例如说阿里云、腾讯云）会返回一个请求编号，用于排查请求失败的问题，我们设置到 {@link #apiRequestId} 字段
- *
- * @author 芋道源码
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class MailCommonResult<T> extends CommonResult<T> {
-
-    /**
-     * API 返回错误码
-     *
-     * 由于第三方的错误码可能是字符串，所以使用 String 类型
-     */
-    private String apiCode;
-    /**
-     * API 返回提示
-     */
-    private String apiMsg;
-
-    /**
-     * API 请求编号
-     */
-    private String apiRequestId;
-
-    private MailCommonResult() {
-    }
-
-    public static <T> MailCommonResult<T> build(String apiCode, String apiMsg, String apiRequestId,
-                                                T data, MailCodeMapping codeMapping) {
-        Assert.notNull(codeMapping, "参数 codeMapping 不能为空");
-        MailCommonResult<T> result = new MailCommonResult<T>().setApiCode(apiCode).setApiMsg(apiMsg).setApiRequestId(apiRequestId);
-        result.setData(data);
-        // 翻译错误码
-        if (codeMapping != null) {
-            ErrorCode errorCode = codeMapping.apply(apiCode);
-            if (errorCode == null) {
-                errorCode = MailFrameworkErrorCodeConstants.MAIL_UNKNOWN;
-            }
-            result.setCode(errorCode.getCode()).setMsg(errorCode.getMsg());
-        }
-        return result;
-    }
-
-    public static <T> MailCommonResult<T> error(Throwable ex) {
-        MailCommonResult<T> result = new MailCommonResult<>();
-        result.setCode(MailFrameworkErrorCodeConstants.EXCEPTION.getCode());
-        result.setMsg(ExceptionUtil.getRootCauseMessage(ex));
-        return result;
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java
deleted file mode 100644
index 11f27f58a6..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailReceiveRespDTO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 消息接收 Response DTO
- *
- * @author 芋道源码
- */
-@Data
-public class MailReceiveRespDTO {
-
-    /**
-     * 是否接收成功
-     */
-    private Boolean success;
-    /**
-     * API 接收结果的编码
-     */
-    private String errorCode;
-    /**
-     * API 接收结果的说明
-     */
-    private String errorMsg;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-    /**
-     * 用户接收时间
-     */
-    private Date receiveTime;
-
-    /**
-     * 短信 API 发送返回的序号
-     */
-    private String serialNo;
-    /**
-     * 短信日志编号
-     *
-     * 对应 SysSmsLogDO 的编号
-     */
-    private Long logId;
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java
deleted file mode 100644
index b4a94a6347..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailSendRespDTO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.dto;
-
-import lombok.Data;
-
-/**
- * 短信发送 Response DTO
- *
- * @author 芋道源码
- */
-@Data
-public class MailSendRespDTO {
-
-    /**
-     * 短信 API 发送返回的序号
-     */
-    private String serialNo;
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java
deleted file mode 100644
index 14bdeacd89..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/dto/MailTemplateRespDTO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.dto;
-
-import lombok.Data;
-
-/**
- * 短信模板 Response DTO
- *
- * @author 芋道源码
- */
-@Data
-public class MailTemplateRespDTO {
-
-    /**
-     * 模板编号
-     */
-    private String id;
-    /**
-     * 短信内容
-     */
-    private String content;
-    /**
-     * 审核状态
-     *
-     */
-    private Integer auditStatus;
-    /**
-     * 审核未通过的理由
-     */
-    private String auditReason;
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java
deleted file mode 100644
index 097c8e095f..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/AbstractMailClient.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import cn.iocoder.yudao.framework.mail.core.client.MailClient;
-
-/**
- * 短信客户端的抽象类，提供模板方法，减少子类的冗余代码
- *
- * @author zzf
- * @date 2021/2/1 9:28
- */
-@Slf4j
-public abstract class AbstractMailClient implements MailClient {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java
deleted file mode 100644
index 9923bd3df4..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/MailClientFactoryImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.impl;
-
-import cn.iocoder.yudao.framework.mail.core.client.MailClient;
-import cn.iocoder.yudao.framework.mail.core.client.impl.hutool.HutoolMailClient;
-import lombok.extern.slf4j.Slf4j;
-import cn.iocoder.yudao.framework.mail.core.client.MailClientFactory;
-import cn.iocoder.yudao.framework.mail.core.enums.MailChannelEnum;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.Arrays;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-@Validated
-@Slf4j
-public class MailClientFactoryImpl implements MailClientFactory {
-
-    private final ConcurrentMap<String, AbstractMailClient> channelCodeClients = new ConcurrentHashMap<>();
-
-    public MailClientFactoryImpl (){
-        Arrays.stream(MailChannelEnum.values()).forEach(mailChannelEnum -> {
-            AbstractMailClient abstractMailClient = createMailClient(mailChannelEnum);
-            channelCodeClients.put(mailChannelEnum.getCode() , abstractMailClient);
-        });
-    }
-
-    private AbstractMailClient createMailClient(MailChannelEnum mailChannelEnum) {
-        switch (mailChannelEnum){
-            case HUTOOL: return new HutoolMailClient();
-        }
-        // 创建失败，错误日志 + 抛出异常
-        log.error("[createMailClient][配置({}) 找不到合适的客户端实现]" , mailChannelEnum);
-        throw new IllegalArgumentException(String.format("配置(%s) 找不到合适的客户端实现", mailChannelEnum));
-    }
-
-    @Override
-    public MailClient getMailClient() {
-        return channelCodeClients.get("HUTOOL");
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java
deleted file mode 100644
index 457ad7e370..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.impl.hutool;
-
-import cn.hutool.extra.mail.MailUtil;
-import cn.iocoder.yudao.framework.mail.core.client.impl.AbstractMailClient;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-
-
-/**
- * 邮件客户端实现
- *
- * @author wangjingyi
- * @date 2021/4/25 14:25
- */
-@Slf4j
-public class HutoolMailClient extends AbstractMailClient {
-
-    @Override
-    public String sendMail(String from, String content, String title, List<String> tos) {
-        try{
-            return MailUtil.send(from , title , content , false , null);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-        return "";
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java
deleted file mode 100644
index 711d369502..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/client/impl/hutool/HutoolMailCodeMapping.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.client.impl.hutool;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.mail.core.client.MailCodeMapping;
-
-/**
- * 阿里云的 SmsCodeMapping 实现类
- *
- * 参见 https://help.aliyun.com/document_detail/101346.htm 文档
- *
- * @author 芋道源码
- */
-public class HutoolMailCodeMapping implements MailCodeMapping {
-
-    @Override
-    public ErrorCode apply(String apiCode) {
-        return null;
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java
deleted file mode 100644
index 51d2f1fcae..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailChannelEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.enums;
-
-import cn.hutool.core.util.ArrayUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 短信渠道枚举
- *
- * @author zzf
- * @date 2021/1/25 10:56
- */
-@Getter
-@AllArgsConstructor
-public enum MailChannelEnum {
-    HUTOOL("HUTOOL" , "HUTOOL"),
-    ;
-
-    /**
-     * 编码
-     */
-    private final String code;
-    /**
-     * 名字
-     */
-    private final String name;
-
-    public static MailChannelEnum getByCode(String code) {
-        return ArrayUtil.firstMatch(o -> o.getCode().equals(code), values());
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java
deleted file mode 100644
index e5ef74cf33..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailFrameworkErrorCodeConstants.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.enums;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-
-/**
- * 短信框架的错误码枚举
- *
- * 短信框架，使用 2-001-000-000 段
- *
- * @author 芋道源码
- */
-public interface MailFrameworkErrorCodeConstants {
-
-    ErrorCode MAIL_UNKNOWN = new ErrorCode(2001000000, "未知错误，需要解析");
-
-    // ========== 权限 / 限流等相关 2001000100 ==========
-
-    ErrorCode SMS_PERMISSION_DENY = new ErrorCode(2001000100, "没有发送短信的权限");
-    // 云片：可以配置 IP 白名单，只有在白名单中才可以发送短信
-    ErrorCode SMS_IP_DENY = new ErrorCode(2001000100, "IP 不允许发送短信");
-
-    // 阿里云：将短信发送频率限制在正常的业务限流范围内。默认短信验证码：使用同一签名，对同一个手机号验证码，支持 1 条 / 分钟，5 条 / 小时，累计 10 条 / 天。
-    ErrorCode SMS_SEND_BUSINESS_LIMIT_CONTROL = new ErrorCode(2001000102, "指定手机的发送限流");
-    // 阿里云：已经达到您在控制台设置的短信日发送量限额值。在国内消息设置 > 安全设置，修改发送总量阈值。
-    ErrorCode SMS_SEND_DAY_LIMIT_CONTROL = new ErrorCode(2001000103, "每天的发送限流");
-
-    ErrorCode SMS_SEND_CONTENT_INVALID = new ErrorCode(2001000104, "短信内容有敏感词");
-
-    // ========== 模板相关 2001000200 ==========
-    ErrorCode SMS_TEMPLATE_INVALID = new ErrorCode(2001000200, "短信模板不合法"); // 包括短信模板不存在
-    ErrorCode SMS_TEMPLATE_PARAM_ERROR = new ErrorCode(2001000201, "模板参数不正确");
-
-    // ========== 签名相关 2001000300 ==========
-    ErrorCode SMS_SIGN_INVALID = new ErrorCode(2001000300, "短信签名不可用");
-
-    // ========== 账户相关 2001000400 ==========
-    ErrorCode SMS_ACCOUNT_MONEY_NOT_ENOUGH = new ErrorCode(2001000400, "账户余额不足");
-    ErrorCode SMS_ACCOUNT_INVALID = new ErrorCode(2001000401, "apiKey 不存在");
-
-    // ========== 其它相关 2001000900 开头 ==========
-    ErrorCode SMS_API_PARAM_ERROR = new ErrorCode(2001000900, "请求参数缺失");
-    ErrorCode SMS_MOBILE_INVALID = new ErrorCode(2001000901, "手机格式不正确");
-    ErrorCode SMS_MOBILE_BLACK = new ErrorCode(2001000902, "手机号在黑名单中");
-
-    ErrorCode EXCEPTION = new ErrorCode(2001000999, "调用异常");
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java
deleted file mode 100644
index 95c3c31a3e..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/enums/MailTemplateAuditStatusEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 短信模板的审核状态枚举
- *
- * @author 芋道源码
- */
-@AllArgsConstructor
-@Getter
-public enum MailTemplateAuditStatusEnum {
-
-    CHECKING(1),
-    SUCCESS(2),
-    FAIL(3);
-
-    private final Integer status;
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java b/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java
deleted file mode 100644
index 1f19ac12bd..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-mail/src/main/java/cn/iocoder/yudao/framework/mail/core/property/MailChannelProperties.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.framework.mail.core.property;
-
-import lombok.Data;
-import cn.iocoder.yudao.framework.mail.core.enums.MailChannelEnum;
-import org.springframework.validation.annotation.Validated;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-/**
- * 短信渠道配置类
- *
- * @author zzf
- * @date 2021/1/25 17:01
- */
-@Data
-@Validated
-public class MailChannelProperties {
-
-    /**
-     * 渠道编号
-     */
-    @NotNull(message = "短信渠道 ID 不能为空")
-    private Long id;
-    /**
-     * 短信签名
-     */
-    @NotEmpty(message = "短信签名不能为空")
-    private String signature;
-    /**
-     * 渠道编码
-     *
-     * 枚举 {@link MailChannelEnum}
-     */
-    @NotEmpty(message = "渠道编码不能为空")
-    private String code;
-    /**
-     * 短信 API 的账号
-     */
-    @NotEmpty(message = "短信 API 的账号不能为空")
-    private String apiKey;
-    /**
-     * 短信 API 的秘钥
-     */
-    @NotEmpty(message = "短信 API 的秘钥不能为空")
-    private String apiSecret;
-    /**
-     * 短信发送回调 URL
-     */
-    private String callbackUrl;
-
-}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 07322ccd72..d514345dab 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -119,13 +119,17 @@ public interface ErrorCodeConstants {
     ErrorCode SOCIAL_USER_UNBIND_NOT_SELF = new ErrorCode(1002018001, "社交解绑失败，非当前用户绑定");
     ErrorCode SOCIAL_USER_NOT_FOUND = new ErrorCode(1002018002, "社交授权失败，找不到对应的用户");
 
-    // ========== 邮箱账号 1002019000 ==========
-    ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002019000, "邮箱账号不存在");
-    ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002019001, "邮箱账号存在");
+    // ========== 系统铭感词 1002019000 =========
+    ErrorCode SENSITIVE_WORD_NOT_EXISTS = new ErrorCode(1002019000, "系统敏感词在所有标签中都不存在");
+    ErrorCode SENSITIVE_WORD_EXISTS = new ErrorCode(1002019001, "系统敏感词已在标签中存在");
 
-    // ========== 邮箱模版 1002020000 ==========
-    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002020000 , "邮箱模版不存在");
-    ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002020001, "邮箱模版存在");
-    ErrorCode MAIL_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002020002, "存在关联邮箱模版");
+    // ========== 邮箱账号 1002020000 ==========
+    ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002020000, "邮箱账号不存在");
+    ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002020001, "邮箱账号存在");
+
+    // ========== 邮箱模版 1002021000 ==========
+    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000 , "邮箱模版不存在");
+    ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002021001, "邮箱模版存在");
+    ErrorCode MAIL_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002021002, "存在关联邮箱模版");
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
index 2240f3b955..e23ba8ab86 100644
--- a/yudao-module-system/yudao-module-system-biz/pom.xml
+++ b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -42,10 +42,6 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-mail</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
index 3f4693bcb0..35c6c0a9bc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
@@ -1,11 +1,7 @@
 package cn.iocoder.yudao.module.system.convert.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
-import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvertImpl;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
index f2146f0270..bc4b496f1e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
@@ -13,10 +13,8 @@ import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import lombok.extern.slf4j.Slf4j;
-import cn.iocoder.yudao.framework.mail.core.client.MailClientFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
-import cn.iocoder.yudao.framework.mail.core.client.MailClient;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -46,8 +44,6 @@ public class MailSendServiceImpl implements MailSendService {
     @Resource
     private MailLogService mailLogService;
     @Resource
-    private MailClientFactory mailClientFactory;
-    @Resource
     private MailProducer mailProducer;
 
 
@@ -80,9 +76,9 @@ public class MailSendServiceImpl implements MailSendService {
     @Override
     public void doSendMail(MailSendMessage message) {
         // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的
-        MailClient mailClient = mailClientFactory.getMailClient();
-        String result = mailClient.sendMail(message.getFrom() , message.getContent() , message.getTitle() , message.getTos());
-        mailLogService.updateSmsSendResult(message.getLogId() , result);
+        //MailClient mailClient = mailClientFactory.getMailClient();
+        //String result = mailClient.sendMail(message.getFrom() , message.getContent() , message.getTitle() , message.getTos());
+        //mailLogService.updateSmsSendResult(message.getLogId() , result);
     }
 
     private MailTemplateDO checkMailTemplateValid(String templateCode) {

From 8bc5254e308ab0d774635f0629bc508f58c8041a Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Thu, 5 May 2022 03:06:00 +0800
Subject: [PATCH 19/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E8=B4=A6=E5=8F=B7=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=20=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |  2 +-
 .../admin/mail/MailAccountController.java     |  4 +-
 .../admin/mail/MailTemplateController.java    | 25 ++---
 .../mail/vo/account/MailAccountBaseVO.java    |  4 -
 .../vo/account/MailAccountCreateReqVO.java    |  6 ++
 .../vo/account/MailAccountUpdateReqVO.java    |  3 +
 .../mail/vo/template/MailTemplateRespVO.java  |  4 +
 .../convert/mail/MailAccountConvert.java      |  3 +-
 .../convert/mail/MailTemplateConvert.java     |  7 +-
 .../dal/mysql/mail/MailAccountMapper.java     | 17 ++++
 .../dal/mysql/mail/MailTemplateMapper.java    |  2 +-
 .../mail/MailTemplateRefreshConsumer.java     | 29 ++++++
 .../mail/MailAccountRefreshMessage.java       | 19 ++++
 .../mq/message/mail/MailSendMessage.java      | 24 +++++
 .../mail/MailTemplateRefreshMessage.java      | 19 ++++
 .../system/mq/producer/mail/MailProducer.java | 19 ++--
 .../service/mail/MailAccountService.java      |  5 +
 .../system/service/mail/MailLogService.java   |  8 +-
 .../service/mail/MailTemplateService.java     | 12 +--
 .../mail/impl/MailAccountServiceImpl.java     | 86 +++++++++++++---
 .../service/mail/impl/MailLogServiceImpl.java | 13 +--
 .../mail/impl/MailSendServiceImpl.java        | 41 +++++---
 .../mail/impl/MailTemplateServiceImpl.java    | 98 +++++++++----------
 23 files changed, 318 insertions(+), 132 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index d514345dab..32ba7181eb 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -130,6 +130,6 @@ public interface ErrorCodeConstants {
     // ========== 邮箱模版 1002021000 ==========
     ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000 , "邮箱模版不存在");
     ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002021001, "邮箱模版存在");
-    ErrorCode MAIL_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002021002, "存在关联邮箱模版");
+    ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002021002, "存在关联邮箱模版");
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 864c106d63..17a305c481 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -57,7 +57,7 @@ public class MailAccountController {
     }
 
     // TODO @wangjingyi：getMailAccount 和 getMailAccountPage 这两个接口，定义一个对应的 Resp 类哈，参考别的模块。主要不要返回 password 字段。
-    // 一个可以的做法，是 MailAccountBaseVO 不返回 password，然后 MailAccountCreateReqVO、MailAccountUpdateReqVO 添加这个字段
+    // 一个可以的做法，是 MailAccountBaseVO 不返回 password，然后 MailAccountCreateReqVO、MailAccountUpdateReqVO 添加这个字段 DONE
 
     @GetMapping("/get")
     @ApiOperation("获得邮箱账号")
@@ -76,7 +76,7 @@ public class MailAccountController {
         return success(MailAccountConvert.INSTANCE.convertPage(pageResult));
     }
 
-    // TODO @wangjingyi：getSimpleMailAccountList 单独定义一个类，只返回精简的信息，id，from 即可。像密码之类都是敏感信息，不应该返回
+    // TODO @wangjingyi：getSimpleMailAccountList 单独定义一个类，只返回精简的信息，id，from 即可。像密码之类都是敏感信息，不应该返回 DONE
 
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获得邮箱账号精简列表")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
index f75c8daadd..2fae6164b8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -3,10 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.*;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
@@ -29,9 +26,9 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/system/mail-template")
 public class MailTemplateController {
 
-    // TODO @wangjingyi：private
+    // TODO @wangjingyi：private DONE
     @Autowired
-    MailTemplateService mailTempleService;
+    private MailTemplateService mailTempleService;
 
     @PostMapping("/create")
     @ApiOperation("创建邮箱模版")
@@ -56,13 +53,13 @@ public class MailTemplateController {
         return success(true);
     }
 
-    // TODO @wangjingyi：下面几个 VO 也参考我在 account 给的建议
+    // TODO @wangjingyi：下面几个 VO 也参考我在 account 给的建议 DONE RespVO中需要BaseVO 中哪些字段
 
     @GetMapping("/get")
     @ApiOperation("获得邮箱模版")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-template:get')")
-    public CommonResult<MailTemplateBaseVO> getMailTemplate(@RequestParam("id") Long id) {
+    public CommonResult<MailTemplateRespVO> getMailTemplate(@RequestParam("id") Long id) {
         MailTemplateDO mailTemplateDO = mailTempleService.getMailTemplate(id);
         return success(MailTemplateConvert.INSTANCE.convert(mailTemplateDO));
     }
@@ -70,25 +67,17 @@ public class MailTemplateController {
     @GetMapping("/page")
     @ApiOperation("获得邮箱模版分页")
     @PreAuthorize("@ss.hasPermission('system:mail-template:query')")
-    public CommonResult<PageResult<MailTemplateBaseVO>> getMailTemplatePage(@Valid MailTemplatePageReqVO pageReqVO) {
+    public CommonResult<PageResult<MailTemplateRespVO>> getMailTemplatePage(@Valid MailTemplatePageReqVO pageReqVO) {
         PageResult<MailTemplateDO> pageResult = mailTempleService.getMailTemplatePage(pageReqVO);
         return success(MailTemplateConvert.INSTANCE.convertPage(pageResult));
     }
 
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获得邮箱模版精简列表")
-    public CommonResult<List<MailTemplateBaseVO>> getSimpleTemplateList() {
+    public CommonResult<List<MailTemplateRespVO>> getSimpleTemplateList() {
         List<MailTemplateDO> list = mailTempleService.getMailTemplateList();
         // 排序后，返回给前端
         list.sort(Comparator.comparing(MailTemplateDO::getId));
         return success(MailTemplateConvert.INSTANCE.convertList02(list));
     }
-
-    @PostMapping("/send")
-    @ApiOperation("发送邮件")
-    @PreAuthorize("@ss.hasPermission('system:mail-template:send')")
-    public CommonResult<Boolean> sendMail(@Valid @RequestBody MailReqVO mailReqVO){
-        mailTempleService.sendMail(mailReqVO);
-        return success(true);
-    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index d8650b52e8..b785b74cc0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -20,10 +20,6 @@ public class MailAccountBaseVO {
     @Email(message = "必须是Email格式")
     private String username;
 
-    @ApiModelProperty(value = "密码",required = true,example = "123456")
-    @NotNull(message = "密码必填")
-    private String password;
-
     @ApiModelProperty(value = "网站",required = true,example = "www.iocoder.cn")
     @NotNull(message = "网站必填")
     private String host;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
index 8585e9d75c..476a3077aa 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
@@ -1,14 +1,20 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import javax.validation.constraints.NotNull;
+
 @ApiModel("管理后台 - 邮箱账号创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MailAccountCreateReqVO extends MailAccountBaseVO {
 
+    @ApiModelProperty(value = "密码",required = true,example = "123456")
+    @NotNull(message = "密码必填")
+    private String password;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
index 43a13ad18b..4544e95b55 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
@@ -18,4 +18,7 @@ public class MailAccountUpdateReqVO extends MailAccountBaseVO {
     @NotNull(message = "编号不能为空")
     private Long id;
 
+    @ApiModelProperty(value = "密码",required = true,example = "123456")
+    @NotNull(message = "密码必填")
+    private String password;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java
new file mode 100644
index 0000000000..33683b1c58
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java
@@ -0,0 +1,4 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+public class MailTemplateRespVO extends MailTemplateBaseVO{
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index 8dbfbc58d9..f2228e1702 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -4,6 +4,7 @@ import cn.hutool.extra.mail.MailAccount;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -23,7 +24,7 @@ public interface MailAccountConvert {
 
     List<MailAccountBaseVO> convertList02(List<MailAccountDO> list);
 
-    default MailAccount convertAccount(MailAccountDO mailAccountDO){
+    default MailAccount convertAccount(MailSendMessage mailAccountDO){
         return new MailAccount()
                 .setHost(mailAccountDO.getHost())
                 .setPort(mailAccountDO.getPort())
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
index 35c6c0a9bc..87fd8efe7a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.convert.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -14,9 +15,9 @@ public interface MailTemplateConvert {
 
     MailTemplateDO convert(MailTemplateBaseVO baseVO);
 
-    MailTemplateBaseVO convert(MailTemplateDO mailTemplateDO);
+    MailTemplateRespVO convert(MailTemplateDO mailTemplateDO);
 
-    PageResult<MailTemplateBaseVO> convertPage(PageResult<MailTemplateDO> pageResult);
+    PageResult<MailTemplateRespVO> convertPage(PageResult<MailTemplateDO> pageResult);
 
-    List<MailTemplateBaseVO> convertList02(List<MailTemplateDO> list);
+    List<MailTemplateRespVO> convertList02(List<MailTemplateDO> list);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index 651f5c75fd..420b24eeb2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -7,6 +7,9 @@ import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccou
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
 
 @Mapper
 public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
@@ -25,4 +28,18 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
         return selectOne(new QueryWrapperX<MailAccountDO>()
                 .eqIfPresent("username" , userName));
     };
+
+    default MailAccountDO selectByUserNameAndId(String userName,Long id){
+        return selectOne(new QueryWrapperX<MailAccountDO>()
+                .eqIfPresent("username" , userName)
+                .neIfPresent("id" , id));
+    };
+
+    default MailAccountDO selectOneByFrom(String from){
+        return selectOne(new QueryWrapperX<MailAccountDO>()
+                .eqIfPresent("from" , from));
+    };
+
+    @Select("SELECT COUNT(*) FROM system_mail_account WHERE update_time > #{maxUpdateTime}")
+    Long selectCountByUpdateTimeGt(Date maxUpdateTime);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
index a5cbf0b2a3..d7d1cd73c9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -30,7 +30,7 @@ public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
                 .eqIfPresent("code" , code));
     };
 
-    @Select("SELECT id FROM system_mail_template WHERE update_time > #{maxUpdateTime} LIMIT 1")
+    @Select("SELECT COUNT(*) FROM system_mail_template WHERE update_time > #{maxUpdateTime} LIMIT 1")
     Long selectByMaxUpdateTime(Date maxUpdateTime);
 
     default MailTemplateDO selectOneByAccountId(Long accountId){
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
new file mode 100644
index 0000000000..b4eac0165e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.mq.consumer.mail;
+
+import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage;
+import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 针对 {@link MailTemplateRefreshMessage} 的消费者
+ *
+ * @author wangjingyi
+ */
+@Component
+@Slf4j
+public class MailTemplateRefreshConsumer extends AbstractChannelMessageListener<MailTemplateRefreshMessage> {
+
+    @Resource
+    private MailTemplateService mailTemplateService;
+
+    @Override
+    public void onMessage(MailTemplateRefreshMessage message) {
+        log.info("[onMessage][收到 MailTemplate 刷新信息]");
+        mailTemplateService.initLocalCache();
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
new file mode 100644
index 0000000000..d5eafb04d9
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.mq.message.mail;
+
+import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *  邮箱账号的数据刷新 Message
+ *
+ * @author wangjingyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MailAccountRefreshMessage extends AbstractChannelMessage {
+    @Override
+    public String getChannel() {
+        return "system.mail-account.refresh";
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
index 275a458250..3df7c6dcff 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
@@ -27,6 +27,16 @@ public class MailSendMessage extends AbstractStreamMessage {
      */
     @NotNull(message = "邮箱地址不能为空")
     private String from;
+    /**
+     * 用户名
+     */
+    @NotNull(message = "用户名不能为空")
+    private String username;
+    /**
+     * 密码
+     */
+    @NotNull(message = "密码不能为空")
+    private String password;
     /**
      * 邮箱模板编号
      */
@@ -45,6 +55,20 @@ public class MailSendMessage extends AbstractStreamMessage {
      * 内容
      */
     private String content;
+    /**
+     * 主机
+     */
+    @NotNull(message = "host不能为空")
+    private String host;
+    /**
+     * 端口
+     */
+    @NotNull(message = "端口号不能为空")
+    private Integer port;
+    /**
+     * 是否开启 SSL
+     */
+    private Boolean sslEnable;
 
     @Override
     public String getStreamKey() {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java
new file mode 100644
index 0000000000..476411ca1b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.mq.message.mail;
+
+import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *  邮箱模板的数据刷新 Message
+ *
+ * @author wangjingyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MailTemplateRefreshMessage extends AbstractChannelMessage {
+    @Override
+    public String getChannel() {
+        return "system.mail-template.refresh";
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index ed82c24a4d..db8bbebf64 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -4,7 +4,9 @@ import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage;
 import cn.iocoder.yudao.module.system.mq.message.sms.SmsChannelRefreshMessage;
 import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage;
 import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage;
@@ -28,18 +30,18 @@ public class MailProducer {
     private RedisMQTemplate redisMQTemplate;
 
     /**
-     * 发送 {@link SmsChannelRefreshMessage} 消息
+     * 发送 {@link MailTemplateRefreshMessage} 消息
      */
-    public void sendMailChannelRefreshMessage() {
-        SmsChannelRefreshMessage message = new SmsChannelRefreshMessage();
+    public void sendMailTemplateRefreshMessage() {
+        MailTemplateRefreshMessage message = new MailTemplateRefreshMessage();
         redisMQTemplate.send(message);
     }
 
     /**
-     * 发送 {@link SmsTemplateRefreshMessage} 消息
+     * 发送 {@link MailTemplateRefreshMessage} 消息
      */
-    public void sendMailTemplateRefreshMessage() {
-        SmsTemplateRefreshMessage message = new SmsTemplateRefreshMessage();
+    public void sendMailAccountRefreshMessage() {
+        MailAccountRefreshMessage message = new MailAccountRefreshMessage();
         redisMQTemplate.send(message);
     }
 
@@ -56,6 +58,11 @@ public class MailProducer {
         MailSendMessage message = new MailSendMessage();
         message.setContent(content);
         message.setFrom(mailAccountDO.getFrom());
+        message.setHost(mailAccountDO.getHost());
+        message.setPort(mailAccountDO.getPort());
+        message.setPassword(mailAccountDO.getPassword());
+        message.setUsername(mailAccountDO.getUsername());
+        message.setSslEnable(mailAccountDO.getSslEnable());
         message.setTemplateCode(mailTemplateDO.getCode());
         message.setTitle(title);
         message.setTos(tos);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index e8937d9730..fe0615f4f9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -17,6 +17,11 @@ import java.util.List;
  */
 public interface MailAccountService {
 
+    /**
+     * 初始化邮箱账号的本地缓存
+     */
+    void initLocalCache();
+
     /**
      * 创建邮箱账号
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index f5d4174111..da35012e25 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -46,5 +46,11 @@ public interface MailLogService {
      */
     Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String from, String content, List<String> tos, String title, Boolean isSend);
 
-    Long updateSmsSendResult(Long logId, String result);
+    /**
+     * 更新邮件发送结果
+     *
+     * @param logId          发送日志Id
+     * @param result         发送结果 默认返回messageId
+     */
+    void updateMailSendResult(Long logId, String result);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 99b8fafeff..873d337f4a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -19,6 +19,9 @@ import java.util.Map;
  */
 public interface MailTemplateService {
 
+    /**
+     * 初始化邮箱模版的本地缓存
+     */
     void initLocalCache();
 
     /**
@@ -73,18 +76,11 @@ public interface MailTemplateService {
      */
     MailTemplateDO getMailTemplateByCodeFromCache(String code);
 
-    /**
-     * 发送邮件
-     *
-     * @param mailReqVO 邮件发送信息
-     */
-    void sendMail(MailReqVO mailReqVO);
-
     /**
      * 邮件模版内容合成
      * @param content 邮箱模版
      * @param params 合成参数
      * @return
      */
-    String formateMailTemplateContent(String content, Map<String, String> params);
+    String formatMailTemplateContent(String content, Map<String, String> params);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 06945127cf..3ae44693ba 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -1,20 +1,28 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
@@ -28,6 +36,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
+@Slf4j
 public class MailAccountServiceImpl implements MailAccountService {
 
     @Resource
@@ -36,26 +45,71 @@ public class MailAccountServiceImpl implements MailAccountService {
     @Resource
     private MailTemplateMapper mailTemplateMapper;
 
+    @Resource
+    private MailProducer mailProducer;
+
+    /**
+     * 邮箱账号缓存
+     * key：邮箱账号编码 {@link MailAccountDO#getId()}
+     *
+     * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
+     */
+    private volatile Map<Long, MailAccountDO> mailAccountCache;
+
+    /**
+     * 缓存菜单的最大更新时间，用于后续的增量轮询，判断是否有更新
+     */
+    private volatile Date maxUpdateTime;
+
+    @Override
+    @PostConstruct
+    public void initLocalCache() {
+        List<MailAccountDO> mailAccountDOList = this.loadMailAccountIfUpdate(maxUpdateTime);
+        if (CollUtil.isEmpty(mailAccountDOList)) {
+            return;
+        }
+
+        // 写入缓存
+        mailAccountCache = CollectionUtils.convertMap(mailAccountDOList, MailAccountDO::getId);
+        maxUpdateTime = CollectionUtils.getMaxValue(mailAccountDOList, MailAccountDO::getUpdateTime);
+        log.info("[initLocalCache][初始化 MailAccount 数量为 {}]", mailAccountDOList.size());
+    }
+
+    private List<MailAccountDO> loadMailAccountIfUpdate(Date maxUpdateTime) {
+        //第一步 判断是否需要更新
+        if(null == maxUpdateTime){ // 如果更新时间为空，说明 DB 一定有新数据
+            log.info("[loadMailAccountIfUpdate][首次加载全量账号信息]");
+        }else{ // 判断数据库中是否有更新的账号信息
+            if (mailAccountMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
+                return null;
+            }
+            log.info("[loadMailAccountIfUpdate][增量加载全量账号信息]");
+        }
+        return mailAccountMapper.selectList();
+    }
+
     @Override
     public Long create(MailAccountCreateReqVO createReqVO) {
         // username 要校验唯一
-        validateMailAccountOnlyByUserName(createReqVO.getUsername());
+        this.validateMailAccountOnlyByUserName(createReqVO.getUsername());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(createReqVO);
         mailAccountMapper.insert(mailAccountDO);
 
         // 更新
+        mailProducer.sendMailAccountRefreshMessage();
         return mailAccountDO.getId();
     }
 
     @Override
     public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一 TODO @wangjingyi：校验唯一的时候，需要排除掉自己
-        validateMailAccountExists(updateReqVO.getId());
+        // username 要校验唯一 TODO @wangjingyi：校验唯一的时候，需要排除掉自己 DONE
+        this.validateMailAccountOnlyByUserNameAndId(updateReqVO.getUsername(),updateReqVO.getId());
         MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
         // 校验是否存在
         validateMailAccountExists(mailAccountDO.getId());
 
         // 更新
+        mailProducer.sendMailAccountRefreshMessage();
         mailAccountMapper.updateById(mailAccountDO);
     }
 
@@ -65,9 +119,10 @@ public class MailAccountServiceImpl implements MailAccountService {
         validateMailAccountExists(id);
         // 校验是否存在关联模版
         validateMailTemplateByAccountId(id);
-
         // 删除
         mailAccountMapper.deleteById(id);
+        // 更新
+        mailProducer.sendMailAccountRefreshMessage();
     }
 
     @Override
@@ -92,17 +147,26 @@ public class MailAccountServiceImpl implements MailAccountService {
     }
 
     private void validateMailAccountOnlyByUserName(String userName){
-        MailAccountDO mailAccountDO = mailAccountMapper.selectByUserName(userName);
-        if (mailAccountDO != null) {
-            throw exception(MAIL_ACCOUNT_EXISTS);
-        }
+        mailAccountCache.forEach((key,value)->{
+            if(value.getUsername().equals(userName)){
+                throw exception(MAIL_ACCOUNT_EXISTS);
+            }
+        });
+    }
+    private void validateMailAccountOnlyByUserNameAndId(String userName,Long id){
+        mailAccountCache.forEach((key , value)->{
+            if (value.getUsername().equals(userName)){
+                if (!key.equals(id)){
+                    throw exception(MAIL_ACCOUNT_EXISTS);
+                }
+            }
+        });
     }
-
     private void validateMailTemplateByAccountId(Long accountId){
         MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectOneByAccountId(accountId);
         if (mailTemplateDO != null) {
-            // TODO wangjingyi：MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS
-            throw exception(MAIL_RELATE_TEMPLATE_EXISTS);
+            // TODO wangjingyi：MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS DONE
+            throw exception(MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS);
         }
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index 7c1b277da0..76a7198aba 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -8,13 +8,11 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
 import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
-import cn.iocoder.yudao.module.system.enums.sms.SmsSendStatusEnum;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -61,21 +59,14 @@ public class MailLogServiceImpl implements MailLogService {
         return mailLogDO.getId();
     }
 
-    // TODO @wangjingyi：不需要返回 id 呀
+    // TODO @wangjingyi：不需要返回 id 呀 DONE
     @Override
-    public Long updateSmsSendResult(Long logId, String result) {
+    public void updateMailSendResult(Long logId, String result) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
         logDOBuilder.id(logId);
         logDOBuilder.sendResult(result);
         MailLogDO mailLogDO = logDOBuilder.build();
         mailLogMapper.updateById(mailLogDO);
-        return logId;
     }
 
-    // TODO @wangjingyi：无用的方法，需要进行删除
-    public Long create(){
-        MailLogDO mailLogDO = new MailLogDO();
-        mailLogMapper.insert(mailLogDO);
-        return mailLogDO.getId();
-    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
index bc4b496f1e..6b0cccd832 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
 import cn.hutool.extra.mail.MailAccount;
+import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
@@ -21,8 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_EXISTS;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 邮箱模版 服务实现类
@@ -49,36 +49,47 @@ public class MailSendServiceImpl implements MailSendService {
 
     @Override
     public void sendMail(String templateCode, String from , String content , List<String> tos , String title) {
-        // TODO @@wangjingyi：发送的时候，参考下短信；
+        // TODO @@wangjingyi：发送的时候，参考下短信；DONE
+        //校验邮箱模版是否合法
         MailTemplateDO mailTemplateDO =  this.checkMailTemplateValid(templateCode);
         // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志
         Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(mailTemplateDO.getStatus());
-        //查询账号信息
-        MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
-                "from", from
-        );
+        //校验账号信息是否合法
+        MailAccountDO mailAccountDO = this.checkMailAccountValid(from);
         Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
-        content = mailTemplateService.formateMailTemplateContent(mailTemplateDO.getContent(), params);
+        content = mailTemplateService.formatMailTemplateContent(mailTemplateDO.getContent(), params);
         Long sendLogId = mailLogService.createMailLog(mailAccountDO , mailTemplateDO , from , content , tos , title , isSend);
 
         // 后续功能 TODO ：附件查询
         //List<String> fileIds = mailSendVO.getFileIds();
 
-        //装载账号信息
-        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
-
         // 发送 MQ 消息，异步执行发送短信
         if (isSend) {
             mailProducer.sendMailSendMessage(mailAccountDO , mailTemplateDO ,content , tos , title , sendLogId);
         }
     }
 
+    private MailAccountDO checkMailAccountValid(String from) {
+        MailAccountDO mailAccountDO = mailAccountMapper.selectOneByFrom(from);
+        if(null == mailAccountDO){
+            throw exception(MAIL_ACCOUNT_NOT_EXISTS);
+        }
+        return mailAccountDO;
+    }
+
     @Override
     public void doSendMail(MailSendMessage message) {
-        // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的
-        //MailClient mailClient = mailClientFactory.getMailClient();
-        //String result = mailClient.sendMail(message.getFrom() , message.getContent() , message.getTitle() , message.getTos());
-        //mailLogService.updateSmsSendResult(message.getLogId() , result);
+        // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的 DONE
+        //装载账号信息
+        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(message);
+        //发送邮件
+        try{
+            String messageId = MailUtil.send(account,message.getTos(),message.getTitle(),message.getContent(),false,null);
+            mailLogService.updateMailSendResult(message.getLogId() , messageId);
+        }catch (Exception e){
+            mailLogService.updateMailSendResult(message.getLogId() , e.getMessage());
+        }
+
     }
 
     private MailTemplateDO checkMailTemplateValid(String templateCode) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index f3d85841ef..89a0b43eae 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -48,59 +49,53 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Resource
     private MailTemplateMapper mailTemplateMapper;
     @Resource
-    private MailAccountMapper mailAccountMapper;
-
-    private volatile List<MailTemplateDO> mailTemplateDOList;
+    private MailProducer mailProducer;
 
     /**
      * 邮件模板缓存
-     * key：邮箱模板编码 {@link MailTemplateDO#getCode()}
+     * key：邮箱模板编码 {@link MailTemplateDO#getId()}
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
-    private volatile Map<String, MailTemplateDO> mailTemplateCache;
+    private volatile Map<Long, MailTemplateDO> mailTemplateCache;
 
     private volatile Date maxUpdateTime;
 
-    // TODO @wangjingyi：参考下别的模块的 initLocalCache 的实现
+    // TODO @wangjingyi：参考下别的模块的 initLocalCache 的实现 DONE
     @Override
     @PostConstruct
     public void initLocalCache() {
-        if(maxUpdateTime == null){
-            mailTemplateDOList = mailTemplateMapper.selectList();
-        }else{
-            if(mailTemplateMapper.selectByMaxUpdateTime(maxUpdateTime)<=0){
-                return;
-            }
-        }
+        List<MailTemplateDO> mailTemplateDOList = this.loadMailTemplateIfUpdate(maxUpdateTime);
         if (CollUtil.isEmpty(mailTemplateDOList)) {
             return;
         }
 
         // 写入缓存
-        mailTemplateCache = CollectionUtils.convertMap(mailTemplateDOList, MailTemplateDO::getCode);
+        mailTemplateCache = CollectionUtils.convertMap(mailTemplateDOList, MailTemplateDO::getId);
         maxUpdateTime = CollectionUtils.getMaxValue(mailTemplateDOList, MailTemplateDO::getUpdateTime);
         log.info("[initLocalCache][初始化 mailTemplate 数量为 {}]", mailTemplateDOList.size());
     }
 
     @Override
     public Long create(MailTemplateCreateReqVO createReqVO) {
-        // code 要校验唯一
-        // TODO @wangjingyi：参考下我在 account 给的唯一校验的说明。
-        this.validateMailTemplateOnlyByCode(createReqVO.getCode());
+        //要校验存在
+        this.validateMailTemplateExists(createReqVO.getId());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
         mailTemplateMapper.insert(mailTemplateDO);
-        // TODO @wangjingyi：mq 更新
+        // TODO @wangjingyi：mq 更新 DONE
+        mailProducer.sendMailTemplateRefreshMessage();
         return mailTemplateDO.getId();
     }
 
     @Override
     public void update(@Valid MailTemplateUpdateReqVO updateReqVO) {
-        // 校验是否存在
-        this.validateMailTemplateExists(updateReqVO.getId());
+        // 校验是否唯一
+        // TODO @wangjingyi：参考下我在 account 给的唯一校验的说明。
+        this.validateMailTemplateOnlyByCode(updateReqVO.getId(),updateReqVO.getCode());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         mailTemplateMapper.updateById(mailTemplateDO);
-        // TODO @wangjingyi：mq 更新
+        // TODO @wangjingyi：mq 更新 DONE
+        mailProducer.sendMailTemplateRefreshMessage();
     }
 
     @Override
@@ -108,7 +103,8 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         // 校验是否存在
         this.validateMailTemplateExists(id);
         mailTemplateMapper.deleteById(id);
-        // TODO @wangjingyi：mq 更新
+        // TODO @wangjingyi：mq 更新 DONE
+        mailProducer.sendMailTemplateRefreshMessage();
     }
 
     @Override
@@ -127,43 +123,45 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         return mailTemplateCache.get(code);
     }
 
+    // TODO @@wangjingyi：单词拼写错误 DONE
     @Override
-    public void sendMail(MailReqVO mailReqVO) {
-        // TODO @@wangjingyi：发送的时候，参考下短信；
-        MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectById(mailReqVO.getTemplateId());
-        //查询账号信息
-        MailAccountDO mailAccountDO = mailAccountMapper.selectOne(
-                "from", mailReqVO.getFrom()
-        );
-        String content = mailReqVO.getContent();
-        Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
-        content = StrUtil.format(mailTemplateDO.getContent(), params);
-
-        // 后续功能 TODO ：附件查询
-        //List<String> fileIds = mailSendVO.getFileIds();
-
-        //装载账号信息
-        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(mailAccountDO);
-
-        //发送
-        MailUtil.send(account , mailReqVO.getTos() , mailReqVO.getTitle() , content , false);
-    }
-
-    // TODO @@wangjingyi：单词拼写错误
-    @Override
-    public String formateMailTemplateContent(String content, Map<String, String> params) {
+    public String formatMailTemplateContent(String content, Map<String, String> params) {
         return StrUtil.format(content, params);
     }
 
     private void validateMailTemplateExists(Long id) {
-        if (mailTemplateMapper.selectById(id) == null) {
+        if (mailTemplateCache.get(id) == null) {
             throw exception(MAIL_TEMPLATE_NOT_EXISTS);
         }
     }
 
-    private void validateMailTemplateOnlyByCode(String code){
-        if (mailTemplateMapper.selectOneByCode(code) != null) {
-            throw exception(MAIL_TEMPLATE_EXISTS);
+    private void validateMailTemplateOnlyByCode(Long id ,String code){
+        mailTemplateCache.forEach((key,value)->{
+            if (value.getCode().equals(code)){
+                if (!key.equals(id)){
+                    throw exception(MAIL_TEMPLATE_EXISTS);
+                }
+            }
+        });
+    }
+    /**
+     * 如果邮件模板发生变化，从数据库中获取最新的全量邮件模板。
+     * 如果未发生变化，则返回空
+     *
+     * @param maxUpdateTime 当前邮件模板的最大更新时间
+     * @return 邮件模板列表
+     */
+    private List<MailTemplateDO> loadMailTemplateIfUpdate(Date maxUpdateTime) {
+        // 第一步，判断是否要更新。
+        if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据
+            log.info("[loadMailTemplateIfUpdate][首次加载全量邮件模板]");
+        } else { // 判断数据库中是否有更新的邮件模板
+            if (mailTemplateMapper.selectByMaxUpdateTime(maxUpdateTime) == 0) {
+                return null;
+            }
+            log.info("[loadSmsTemplateIfUpdate][增量加载全量邮件模板]");
         }
+        // 第二步，如果有更新，则从数据库加载所有邮件模板
+        return mailTemplateMapper.selectList();
     }
 }

From 8d6a4d40a08a6f265a848d412ad53c3278578f39 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Thu, 5 May 2022 04:36:32 +0800
Subject: [PATCH 20/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20bu?=
 =?UTF-8?q?g=20-=E4=BF=AE=E6=94=B9=E4=BF=9D=E7=95=99=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/system/dal/dataobject/mail/MailAccountDO.java  | 2 ++
 .../yudao/module/system/dal/mysql/mail/MailAccountMapper.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index d285adec5b..7b17104ec1 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +25,7 @@ public class MailAccountDO extends BaseDO {
     /**
      * 邮箱
      */
+    @TableField("`from`")
     private String from;
     /**
      * 用户名
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index 420b24eeb2..e869ecf227 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -16,7 +16,7 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
 
     default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) {
         return selectPage(pageReqVO, new QueryWrapperX<MailAccountDO>()
-                .likeIfPresent("form" , pageReqVO.getFrom())
+                .likeIfPresent("from" , pageReqVO.getFrom())
                 .likeIfPresent("host" , pageReqVO.getHost())
                 .likeIfPresent("username" , pageReqVO.getUsername())
                 .eqIfPresent("password" , pageReqVO.getPassword())

From c3335ba2cacf436b14da2dbe95994fd29b7dc514 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Thu, 5 May 2022 18:41:11 +0800
Subject: [PATCH 21/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20bu?=
 =?UTF-8?q?g=20-=E4=BF=AE=E6=94=B9=E4=BF=9D=E7=95=99=E5=AD=97=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/vo/account/MailAccountBaseVO.java       |  4 ++--
 .../admin/mail/vo/account/MailAccountPageReqVO.java    |  2 +-
 .../system/dal/dataobject/mail/MailAccountDO.java      |  3 +--
 .../system/dal/mysql/mail/MailAccountMapper.java       | 10 +++++-----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index b785b74cc0..8e392d4766 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -13,11 +13,11 @@ public class MailAccountBaseVO {
 
     @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
     @NotNull(message = "邮箱必填")
-    private String from;
+    @Email(message = "必须是Email格式")
+    private String fromAddress;
 
     @ApiModelProperty(value = "用户名",required = true,example = "yudao")
     @NotNull(message = "用户名必填")
-    @Email(message = "必须是Email格式")
     private String username;
 
     @ApiModelProperty(value = "网站",required = true,example = "www.iocoder.cn")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
index 2ae2ad1624..327c8465de 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
@@ -14,7 +14,7 @@ import lombok.ToString;
 public class MailAccountPageReqVO extends PageParam {
 
     @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
-    private String from;
+    private String fromAddress;
 
     @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
     private String username;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index 7b17104ec1..910440df7a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -25,8 +25,7 @@ public class MailAccountDO extends BaseDO {
     /**
      * 邮箱
      */
-    @TableField("`from`")
-    private String from;
+    private String fromAddress;
     /**
      * 用户名
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index e869ecf227..1e4f263acd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -16,7 +16,7 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
 
     default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) {
         return selectPage(pageReqVO, new QueryWrapperX<MailAccountDO>()
-                .likeIfPresent("from" , pageReqVO.getFrom())
+                .likeIfPresent("from_address" , pageReqVO.getFromAddress())
                 .likeIfPresent("host" , pageReqVO.getHost())
                 .likeIfPresent("username" , pageReqVO.getUsername())
                 .eqIfPresent("password" , pageReqVO.getPassword())
@@ -27,18 +27,18 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
     default MailAccountDO selectByUserName(String userName){
         return selectOne(new QueryWrapperX<MailAccountDO>()
                 .eqIfPresent("username" , userName));
-    };
+    }
 
     default MailAccountDO selectByUserNameAndId(String userName,Long id){
         return selectOne(new QueryWrapperX<MailAccountDO>()
                 .eqIfPresent("username" , userName)
                 .neIfPresent("id" , id));
-    };
+    }
 
     default MailAccountDO selectOneByFrom(String from){
         return selectOne(new QueryWrapperX<MailAccountDO>()
-                .eqIfPresent("from" , from));
-    };
+                .eqIfPresent("from_address" , from));
+    }
 
     @Select("SELECT COUNT(*) FROM system_mail_account WHERE update_time > #{maxUpdateTime}")
     Long selectCountByUpdateTimeGt(Date maxUpdateTime);

From 63983bbab3d48b22847c22a589f51dc520795f11 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Thu, 5 May 2022 18:52:34 +0800
Subject: [PATCH 22/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20bu?=
 =?UTF-8?q?g=20-=E4=BF=AE=E6=94=B9=E4=BF=9D=E7=95=99=E5=AD=97=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/convert/mail/MailAccountConvert.java    | 8 ++++----
 .../module/system/dal/dataobject/mail/MailLogDO.java      | 2 +-
 .../module/system/mq/message/mail/MailSendMessage.java    | 2 +-
 .../module/system/mq/producer/mail/MailProducer.java      | 2 +-
 .../system/service/mail/impl/MailLogServiceImpl.java      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index f2228e1702..b60ac088ff 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -29,18 +29,18 @@ public interface MailAccountConvert {
                 .setHost(mailAccountDO.getHost())
                 .setPort(mailAccountDO.getPort())
                 .setAuth(true)
-                .setFrom(mailAccountDO.getFrom())
+                .setFrom(mailAccountDO.getFromAddress())
                 .setUser(mailAccountDO.getUsername())
                 .setPass(mailAccountDO.getPassword())
                 .setSslEnable(mailAccountDO.getSslEnable());
-    };
+    }
 
     default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
         Map<String , String> map = new HashMap<>();
-        map.put("from" , mailAccountDO.getFrom());
+        map.put("from_address" , mailAccountDO.getFromAddress());
         map.put("username" , mailAccountDO.getUsername());
         map.put("content" , content);
         return map;
-    };
+    }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 7454d2acb3..97cc51f4ca 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -39,7 +39,7 @@ public class MailLogDO extends BaseDO implements Serializable {
     /**
      * 邮箱账号
      */
-    private String from;
+    private String fromAddress;
 
     /**
      * 模版主键
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
index 3df7c6dcff..fd1d68f6f1 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
@@ -26,7 +26,7 @@ public class MailSendMessage extends AbstractStreamMessage {
      * 邮箱地址
      */
     @NotNull(message = "邮箱地址不能为空")
-    private String from;
+    private String fromAddress;
     /**
      * 用户名
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index db8bbebf64..3b6745c26b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -57,7 +57,7 @@ public class MailProducer {
     public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) {
         MailSendMessage message = new MailSendMessage();
         message.setContent(content);
-        message.setFrom(mailAccountDO.getFrom());
+        message.setFromAddress(mailAccountDO.getFromAddress());
         message.setHost(mailAccountDO.getHost());
         message.setPort(mailAccountDO.getPort());
         message.setPassword(mailAccountDO.getPassword());
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index 76a7198aba..e251cc82ed 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -43,7 +43,7 @@ public class MailLogServiceImpl implements MailLogService {
     @Override
     public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.from(mailAccountDO.getFrom());
+        logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
         logDOBuilder.accountId(mailAccountDO.getId());
         logDOBuilder.content(content);
         logDOBuilder.title(title);

From 1464f7d399de68de75a6fb84aef8b58783982a16 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 17 May 2022 20:07:50 +0800
Subject: [PATCH 23/67] =?UTF-8?q?code=20review=20=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9E=E7=8E=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/test/TestDemoServiceImpl.java     |  2 +-
 .../system/enums/ErrorCodeConstants.java      |  2 +-
 .../admin/mail/vo/log/MailLogPageReqVO.java   |  3 ++
 .../admin/mail/vo/send/MailReqVO.java         |  1 -
 .../convert/mail/MailTemplateConvert.java     |  2 ++
 .../system/dal/dataobject/mail/MailLogDO.java |  1 -
 .../system/service/mail/MailLogService.java   | 29 +++++++--------
 .../service/mail/MailTemplateService.java     |  8 +++--
 .../service/mail/impl/MailLogServiceImpl.java | 36 ++++++++++++-------
 .../mail/impl/MailTemplateServiceImpl.java    | 16 +++------
 10 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java
index 92153b0226..731a29cccf 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java
@@ -79,7 +79,7 @@ public class TestDemoServiceImpl implements TestDemoService {
 
     @Override
     public PageResult<TestDemoDO> getTestDemoPage(TestDemoPageReqVO pageReqVO) {
-//        testDemoMapper.selectList2();
+        testDemoMapper.selectList2();
         return testDemoMapper.selectPage(pageReqVO);
     }
 
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 32ba7181eb..cb6db27e1d 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -128,7 +128,7 @@ public interface ErrorCodeConstants {
     ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002020001, "邮箱账号存在");
 
     // ========== 邮箱模版 1002021000 ==========
-    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000 , "邮箱模版不存在");
+    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000, "邮箱模版不存在");
     ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002021001, "邮箱模版存在");
     ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002021002, "存在关联邮箱模版");
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
index 9928a77469..67f91735b1 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -17,6 +17,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MailLogPageReqVO extends PageParam {
+
+    // TODO @wangjingyi：required 为 false 时，它是默认值，所以不用谢
+
     @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
     private String from;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
index 65142ee3fa..560c3bf424 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
@@ -34,5 +34,4 @@ public class MailReqVO { // TODO @wangjingqi：1）, 不用空格；2）应该
     @ApiModelProperty(value = "附件",example = "附件编码")
     private List<String> fileIds;
 
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
index 87fd8efe7a..46a25b9e2a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
@@ -11,6 +11,7 @@ import java.util.List;
 
 @Mapper
 public interface MailTemplateConvert {
+
     MailTemplateConvert INSTANCE = Mappers.getMapper(MailTemplateConvert.class);
 
     MailTemplateDO convert(MailTemplateBaseVO baseVO);
@@ -20,4 +21,5 @@ public interface MailTemplateConvert {
     PageResult<MailTemplateRespVO> convertPage(PageResult<MailTemplateDO> pageResult);
 
     List<MailTemplateRespVO> convertList02(List<MailTemplateDO> list);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 97cc51f4ca..2472cd95fa 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -80,7 +80,6 @@ public class MailLogDO extends BaseDO implements Serializable {
 
     /**
      * 发送结果
-     *
      */
     private String sendResult;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index da35012e25..98a445c8ae 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -20,37 +20,38 @@ public interface MailLogService {
     /**
      * 邮箱日志分页
      *
-     * @param pageVO
-     * @return
+     * @param pageVO 分页参数
+     * @return 分页结果
      */
     PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO);
 
     /**
      * 邮箱日志数组信息
      *
-     * @param exportReqVO
-     * @return
+     * @param exportReqVO 导出筛选请求
+     * @return 导出的日志数据
      */
     List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO);
 
     /**
      * 创建邮箱日志
      *
-     * @param mailAccountDO  邮箱账号信息
-     * @param mailTemplateDO 模版信息
-     * @param from           邮箱
-     * @param content        内容
-     * @param tos            收件人
-     * @param title          标题
-     * @param isSend         是否发送成功
+     * @param mailAccountDO 邮箱账号信息
+     * @param template      模版信息
+     * @param from          邮箱
+     * @param content       内容
+     * @param tos           收件人
+     * @param title         标题
+     * @param isSend        是否发送成功
      */
-    Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String from, String content, List<String> tos, String title, Boolean isSend);
+    Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO template, String from, String content, List<String> tos, String title, Boolean isSend);
 
     /**
      * 更新邮件发送结果
      *
-     * @param logId          发送日志Id
-     * @param result         发送结果 默认返回messageId
+     * @param logId  发送日志Id
+     * @param result 发送结果 默认返回messageId
      */
     void updateMailSendResult(Long logId, String result);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 873d337f4a..16d65b4f9c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
@@ -68,8 +67,9 @@ public interface MailTemplateService {
      * @return 模版数组
      */
     List<MailTemplateDO> getMailTemplateList();
+
     /**
-     *从缓存中获取邮箱模版
+     * 从缓存中获取邮箱模版
      *
      * @param code 模板编码
      * @return 邮箱模板
@@ -78,9 +78,11 @@ public interface MailTemplateService {
 
     /**
      * 邮件模版内容合成
+     *
      * @param content 邮箱模版
      * @param params 合成参数
-     * @return
+     * @return 格式化后的内容
      */
     String formatMailTemplateContent(String content, Map<String, String> params);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index e251cc82ed..afc7dcb938 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -27,6 +27,7 @@ import java.util.Objects;
 @Validated
 public class MailLogServiceImpl implements MailLogService {
 
+    // TODO @wangjingyi：private，然后使用 @Resource
     @Autowired
     MailLogMapper mailLogMapper;
 
@@ -41,25 +42,34 @@ public class MailLogServiceImpl implements MailLogService {
     }
 
     @Override
-    public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) {
+    public Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO template, String from, String content, List<String> tos, String title, Boolean isSend) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
-        logDOBuilder.accountId(mailAccountDO.getId());
-        logDOBuilder.content(content);
-        logDOBuilder.title(title);
-        logDOBuilder.templateCode(mailTemplateDO.getCode());
-        logDOBuilder.templateId(mailTemplateDO.getId());
-        logDOBuilder.to(tos.toString());
-        logDOBuilder.sendTime(new Date());
+        // TODO @wangjingyi：使用 builder 的时候，不用每个 set 是一行。
+        // 根据是否要发送，设置状态
         logDOBuilder.sendStatus(Objects.equals(isSend, true) ? MailSendStatusEnum.INIT.getStatus()
                 : MailSendStatusEnum.IGNORE.getStatus());
+        // 设置邮箱相关字段
+        // TODO @wangjingyi：userId、userType
+        logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
+        logDOBuilder.accountId(mailAccountDO.getId());
+        // TODO @wangjingyi：每个接收人一条日志。发送多个人，就调用多次，业务方。因为某个邮箱有问题，会导致所有都发送失败。
+        logDOBuilder.to(tos.toString());
+        // 设置模板相关字段
+        // TODO @wangjingyi：可以参考下 sms 短信的逻辑，templateContent、templateParams
+        logDOBuilder.templateId(template.getId());
+        logDOBuilder.templateCode(template.getCode());
+        logDOBuilder.title(title);
+        logDOBuilder.content(content);
+        // TODO @wangjingyi：有结果的时候，才是 sendTime 哈
+        logDOBuilder.sendTime(new Date());
 
-        MailLogDO mailLogDO = logDOBuilder.build();
-        mailLogMapper.insert(mailLogDO);
-        return mailLogDO.getId();
+        // 插入数据库
+        MailLogDO logDO = logDOBuilder.build();
+        mailLogMapper.insert(logDO);
+        return logDO.getId();
     }
 
-    // TODO @wangjingyi：不需要返回 id 呀 DONE
+    // TODO @wangjingyi：还是加几个字段哈，日志上。sendStatus，成功、失败；messageId 消息标号。sendException 记录发送的异常。这样界面才好筛选邮件的发送结果。
     @Override
     public void updateMailSendResult(Long logId, String result) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 89a0b43eae..9f8315458c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -3,20 +3,13 @@ package cn.iocoder.yudao.module.system.service.mail.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.mail.MailAccount;
-import cn.hutool.extra.mail.MailUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
-import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
-import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
@@ -36,7 +29,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPL
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS;
 
 /**
- * 邮箱模版 服务实现类
+ * 邮箱模版 Service 实现类
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -48,6 +41,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Resource
     private MailTemplateMapper mailTemplateMapper;
+
     @Resource
     private MailProducer mailProducer;
 
@@ -61,7 +55,6 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     private volatile Date maxUpdateTime;
 
-    // TODO @wangjingyi：参考下别的模块的 initLocalCache 的实现 DONE
     @Override
     @PostConstruct
     public void initLocalCache() {
@@ -78,8 +71,8 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     @Override
     public Long create(MailTemplateCreateReqVO createReqVO) {
-        //要校验存在
-        this.validateMailTemplateExists(createReqVO.getId());
+        // 要校验存在
+        validateMailTemplateExists(createReqVO.getId());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
         mailTemplateMapper.insert(mailTemplateDO);
         // TODO @wangjingyi：mq 更新 DONE
@@ -123,7 +116,6 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         return mailTemplateCache.get(code);
     }
 
-    // TODO @@wangjingyi：单词拼写错误 DONE
     @Override
     public String formatMailTemplateContent(String content, Map<String, String> params) {
         return StrUtil.format(content, params);

From 0ddb50be579f87bafe1c577e485646b1c56994f7 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Mon, 11 Jul 2022 15:02:06 +0800
Subject: [PATCH 24/67] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E7=A0=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/mail/dto/MailSendReqDTO.java   | 26 +++++-----
 .../system/enums/ErrorCodeConstants.java      |  1 +
 .../enums/mail/MailLogUserTypeEnum.java       | 22 ++++++++
 .../admin/mail/vo/log/MailLogPageReqVO.java   |  4 +-
 .../system/dal/dataobject/mail/MailLogDO.java | 45 +++++++++++------
 .../dal/dataobject/mail/MailTemplateDO.java   |  9 +++-
 .../mail/MailTemplateRefreshConsumer.java     |  1 -
 .../mq/message/mail/MailSendMessage.java      |  7 ++-
 .../system/mq/producer/mail/MailProducer.java | 33 ++++++------
 .../system/service/mail/MailLogService.java   | 20 ++++++--
 .../system/service/mail/MailSendService.java  |  8 +--
 .../service/mail/impl/MailLogServiceImpl.java | 49 +++++++++++-------
 .../mail/impl/MailSendServiceImpl.java        | 50 ++++++++++---------
 .../mail/impl/MailTemplateServiceImpl.java    |  2 +-
 14 files changed, 175 insertions(+), 102 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
index a3b0f2e354..caa69678c2 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
@@ -7,32 +7,32 @@ import lombok.Data;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Map;
 
 @ApiModel("管理后台 - 邮件发送 Req VO")
 @Data
 public class MailSendReqDTO { // TODO @wangjingqi：1）, 不用空格；2）应该只要传递 templateCode、参数就好，title、from、content、附件应该都是参数里的
 
-    @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
-    @NotNull(message = "邮箱账号不能为空")
-    @Email(message = "邮箱账号格式错误")
-    private String from;
+    @ApiModelProperty(value = "用户编码",required = true)
+    @NotNull(message = "用户编码不能为空")
+    private String userId;
 
-    @ApiModelProperty(value = "标题",example = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "内容",example = "内容")
-    private String content;
+    @ApiModelProperty(value = "用户类型",required = true)
+    @NotNull(message = "用户类型不能为空")
+    private String userType;
 
     @ApiModelProperty(value = "邮箱模版id",example = "1024")
-    @NotNull(message = "邮箱模版id不能为空")
-    private Integer templateId;
+    @NotNull(message = "邮箱模版编码不能为空")
+    private Integer templateCode;
+
+    @ApiModelProperty(value = "邮箱参数")
+    @NotNull(message = "模版参数不能为空")
+    private Map<String,Object> templateParams;
 
     @ApiModelProperty(value = "收件人",required = true,example = "yudaoyuanma@123.com")
     @NotNull(message = "收件人不能为空")
     private List<String> tos;
 
-    @ApiModelProperty(value = "附件",example = "附件编码")
-    private List<String> fileIds;
 
 
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index cb6db27e1d..4147383ae5 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -131,5 +131,6 @@ public interface ErrorCodeConstants {
     ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000, "邮箱模版不存在");
     ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002021001, "邮箱模版存在");
     ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002021002, "存在关联邮箱模版");
+    ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002021003, "模板参数({})缺失");
 
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java
new file mode 100644
index 0000000000..4154c9bc1c
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.system.enums.mail;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 邮件日志用户类型
+ *
+ * @author wangjingyi
+ */
+@Getter
+@AllArgsConstructor
+public enum MailLogUserTypeEnum {
+
+    COMMON (10),
+    VIP (20);
+
+    /**
+     * 类型
+     */
+    private final int userType;
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
index 67f91735b1..680fe6d1f6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -18,9 +18,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class MailLogPageReqVO extends PageParam {
 
-    // TODO @wangjingyi：required 为 false 时，它是默认值，所以不用谢
+    // TODO @wangjingyi：required 为 false 时，它是默认值，所以不用谢 DONE
 
-    @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
+    @ApiModelProperty(value = "邮箱" , example = "yudaoyuanma@123.com")
     private String from;
 
     @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 2472cd95fa..d4b0e5f811 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -1,12 +1,16 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.system.enums.mail.MailLogUserTypeEnum;
 import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * 邮箱日志
@@ -29,15 +33,29 @@ public class MailLogDO extends BaseDO implements Serializable {
      */
     private Long id;
 
+    /**
+     * 用户编码
+     */
+    private Long userId;
+
+    /**
+     * 用户类型
+     *
+     * 冗余 {@link MailLogUserTypeEnum#getUserType}
+     */
+    private Integer userType;
+
     // TODO @wangjingyi：accountId
     /**
      * 邮箱账号编号
      */
     private Long accountId;
 
-    // TODO @wangjingyi：如果是冗余字段，记得 @ 下；
+    // TODO @wangjingyi：如果是冗余字段，记得 @ 下；DONE
     /**
      * 邮箱账号
+     *
+     * 冗余 {@link MailAccountDO}
      */
     private String fromAddress;
 
@@ -47,30 +65,22 @@ public class MailLogDO extends BaseDO implements Serializable {
     private Long templateId;
 
     /**
-     * 模版编号
+     * 模版内容
      */
-    private String templateCode;
+    private String templateContent;
 
     /**
-     * 标题
+     * 基于 {@link MailTemplateDO#getParams()} 输入后的参数
      */
-    private String title;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 收件人
-     */
-    private String to;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Map<String,Object> templateParams;
 
     /**
      * 发送时间
      */
     private Date sendTime;
 
+    //=========接收相关字段=========
     /**
      * 发送状态
      *
@@ -83,5 +93,10 @@ public class MailLogDO extends BaseDO implements Serializable {
      */
     private String sendResult;
 
+    /**
+     *  消息ID
+     */
+    private String messageId;
+
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index 96f9ba4ab0..c4708657f5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -2,11 +2,13 @@ package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 邮箱模版
@@ -43,6 +45,11 @@ public class MailTemplateDO extends BaseDO {
      * 内容
      */
     private String content;
+    /**
+     * 参数数组(自动根据内容生成)
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> params;
     /**
      * 状态
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
index b4eac0165e..199b147c80 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.mq.consumer.mail;
 
 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage;
-import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
index fd1d68f6f1..6e8c46668e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.mq.message.mail;
 
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,7 +47,7 @@ public class MailSendMessage extends AbstractStreamMessage {
      * 收件人
      */
     @NotNull(message = "收件人不能为空")
-    private List<String> tos;
+    private String to;
     /**
      * 标题
      */
@@ -69,6 +70,10 @@ public class MailSendMessage extends AbstractStreamMessage {
      * 是否开启 SSL
      */
     private Boolean sslEnable;
+    /**
+     * 邮箱模板参数
+     */
+    private List<KeyValue<String, Object>> templateParams;
 
     @Override
     public String getStreamKey() {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index 3b6745c26b..50c5055123 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -7,9 +7,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage;
-import cn.iocoder.yudao.module.system.mq.message.sms.SmsChannelRefreshMessage;
-import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage;
-import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -48,25 +45,27 @@ public class MailProducer {
     /**
      * 发送 {@link MailSendMessage} 消息
      *
+     * @param sendLogId 发送日志编码
      * @param mailAccountDO 邮箱账号信息
      * @param mailTemplateDO 邮箱模版信息
      * @param content 内容
-     * @param tos 收件人
-     * @param title 标题
+     * @param templateParams 邮箱模版参数
+     * @param to 收件人
      */
-    public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) {
+    public void sendMailSendMessage(Long sendLogId,MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content,List<KeyValue<String, Object>> templateParams,String to) {
         MailSendMessage message = new MailSendMessage();
-        message.setContent(content);
-        message.setFromAddress(mailAccountDO.getFromAddress());
-        message.setHost(mailAccountDO.getHost());
-        message.setPort(mailAccountDO.getPort());
-        message.setPassword(mailAccountDO.getPassword());
-        message.setUsername(mailAccountDO.getUsername());
-        message.setSslEnable(mailAccountDO.getSslEnable());
-        message.setTemplateCode(mailTemplateDO.getCode());
-        message.setTitle(title);
-        message.setTos(tos);
-        message.setLogId(sendLogId);
+        message.setContent(content)
+        .setFromAddress(mailAccountDO.getFromAddress())
+        .setHost(mailAccountDO.getHost())
+        .setPort(mailAccountDO.getPort())
+        .setPassword(mailAccountDO.getPassword())
+        .setUsername(mailAccountDO.getUsername())
+        .setSslEnable(mailAccountDO.getSslEnable())
+        .setTemplateCode(mailTemplateDO.getCode())
+        .setTitle(mailTemplateDO.getTitle())
+        .setTo(to)
+        .setLogId(sendLogId)
+        .setTemplateParams(templateParams);
         redisMQTemplate.send(message);
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index 98a445c8ae..6b04f7a74f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 邮箱日志服务类
@@ -36,15 +37,16 @@ public interface MailLogService {
     /**
      * 创建邮箱日志
      *
+     * @param userId 用户编码
+     * @param userType 用户类型
+     * @param to 收件人
      * @param mailAccountDO 邮箱账号信息
      * @param template      模版信息
-     * @param from          邮箱
-     * @param content       内容
-     * @param tos           收件人
-     * @param title         标题
+     * @param templateContent 模版内容
+     * @param templateParams 模版参数
      * @param isSend        是否发送成功
      */
-    Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO template, String from, String content, List<String> tos, String title, Boolean isSend);
+    Long createMailLog(Long userId,Integer userType,String to,MailAccountDO mailAccountDO, MailTemplateDO template , String templateContent, Map<String, Object> templateParams, Boolean isSend);
 
     /**
      * 更新邮件发送结果
@@ -54,4 +56,12 @@ public interface MailLogService {
      */
     void updateMailSendResult(Long logId, String result);
 
+    /**
+     * 更新邮件发送结果
+     *
+     * @param logId  发送日志Id
+     * @param exception 发送结果
+     */
+    void updateFailMailSendResult(Long logId, String exception);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
index 31f6a3f3e7..615b34fcf9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
@@ -26,10 +26,12 @@ public interface MailSendService {
      * @param templateCode 邮件模版编码
      * @param from 邮箱
      * @param content 内容
-     * @param tos 收件人
-     * @param title 标题
+     * @param templateParams 模版参数
+     * @param to 收件人
+     * @param userId 用户编码
+     * @param userType 用户类型
      */
-    void sendMail(String templateCode, String from , String content , List<String> tos , String title);
+    void sendMail(Long userId, Integer userType, String templateCode, String from,String to, String content, Map<String, Object> templateParams);
 
     /**
      * 执行真正的邮件发送
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index afc7dcb938..a7bf04fc76 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -13,8 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -27,9 +29,9 @@ import java.util.Objects;
 @Validated
 public class MailLogServiceImpl implements MailLogService {
 
-    // TODO @wangjingyi：private，然后使用 @Resource
-    @Autowired
-    MailLogMapper mailLogMapper;
+    // TODO @wangjingyi：private，然后使用 @Resource DONE
+    @Resource
+    private MailLogMapper mailLogMapper;
 
     @Override
     public PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO) {
@@ -42,26 +44,29 @@ public class MailLogServiceImpl implements MailLogService {
     }
 
     @Override
-    public Long createMailLog(MailAccountDO mailAccountDO, MailTemplateDO template, String from, String content, List<String> tos, String title, Boolean isSend) {
+    public Long createMailLog(Long userId,Integer userType,String to,MailAccountDO mailAccountDO, MailTemplateDO template , String templateContent, Map<String, Object> templateParams, Boolean isSend) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        // TODO @wangjingyi：使用 builder 的时候，不用每个 set 是一行。
+        // TODO @wangjingyi：使用 builder 的时候，不用每个 set 是一行。DONE
         // 根据是否要发送，设置状态
         logDOBuilder.sendStatus(Objects.equals(isSend, true) ? MailSendStatusEnum.INIT.getStatus()
-                : MailSendStatusEnum.IGNORE.getStatus());
-        // 设置邮箱相关字段
-        // TODO @wangjingyi：userId、userType
+                : MailSendStatusEnum.IGNORE.getStatus())
+                // 设置邮箱相关字段
+                .fromAddress(mailAccountDO.getFromAddress())
+                .accountId(mailAccountDO.getId())
+                // TODO @wangjingyi：userId、userType
+                //用户信息
+                .userId(userId).userType(userType)
+                //模版信息
+                .templateId(template.getId()).templateParams(templateParams).templateContent(templateContent);
+
+
         logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
         logDOBuilder.accountId(mailAccountDO.getId());
-        // TODO @wangjingyi：每个接收人一条日志。发送多个人，就调用多次，业务方。因为某个邮箱有问题，会导致所有都发送失败。
-        logDOBuilder.to(tos.toString());
+        // TODO @wangjingyi：每个接收人一条日志。发送多个人，就调用多次，业务方。因为某个邮箱有问题，会导致所有都发送失败。 DONE
         // 设置模板相关字段
         // TODO @wangjingyi：可以参考下 sms 短信的逻辑，templateContent、templateParams
-        logDOBuilder.templateId(template.getId());
-        logDOBuilder.templateCode(template.getCode());
-        logDOBuilder.title(title);
-        logDOBuilder.content(content);
-        // TODO @wangjingyi：有结果的时候，才是 sendTime 哈
-        logDOBuilder.sendTime(new Date());
+        // TODO @wangjingyi：有结果的时候，才是 sendTime 哈 DONE
+        //logDOBuilder.sendTime(new Date());
 
         // 插入数据库
         MailLogDO logDO = logDOBuilder.build();
@@ -69,14 +74,20 @@ public class MailLogServiceImpl implements MailLogService {
         return logDO.getId();
     }
 
-    // TODO @wangjingyi：还是加几个字段哈，日志上。sendStatus，成功、失败；messageId 消息标号。sendException 记录发送的异常。这样界面才好筛选邮件的发送结果。
+    // TODO @wangjingyi：还是加几个字段哈，日志上。sendStatus，成功、失败；messageId 消息标号。sendException 记录发送的异常。这样界面才好筛选邮件的发送结果。DONE
     @Override
     public void updateMailSendResult(Long logId, String result) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.id(logId);
-        logDOBuilder.sendResult(result);
+        logDOBuilder.id(logId).sendTime(new Date()).sendResult(result).messageId(result).sendStatus(MailSendStatusEnum.SUCCESS.getStatus());
         MailLogDO mailLogDO = logDOBuilder.build();
         mailLogMapper.updateById(mailLogDO);
     }
 
+    @Override
+    public void updateFailMailSendResult(Long logId, String exception) {
+        MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
+        logDOBuilder.id(logId).sendTime(new Date()).sendResult(exception).sendStatus(MailSendStatusEnum.FAILURE.getStatus());
+        MailLogDO mailLogDO = logDOBuilder.build();
+        mailLogMapper.updateById(mailLogDO);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
index 6b0cccd832..9a9e9fe50c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
@@ -2,17 +2,18 @@ package cn.iocoder.yudao.module.system.service.mail.impl;
 
 import cn.hutool.extra.mail.MailAccount;
 import cn.hutool.extra.mail.MailUtil;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
-import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -20,6 +21,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
@@ -34,9 +36,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Validated
 @Slf4j
 public class MailSendServiceImpl implements MailSendService {
-
-    @Resource
-    private MailTemplateMapper mailTemplateMapper;
+    
     @Resource
     private MailAccountMapper mailAccountMapper;
     @Resource
@@ -48,7 +48,7 @@ public class MailSendServiceImpl implements MailSendService {
 
 
     @Override
-    public void sendMail(String templateCode, String from , String content , List<String> tos , String title) {
+    public void sendMail(Long userId, Integer userType, String templateCode, String from,String to, String content, Map<String, Object> templateParams) {
         // TODO @@wangjingyi：发送的时候，参考下短信；DONE
         //校验邮箱模版是否合法
         MailTemplateDO mailTemplateDO =  this.checkMailTemplateValid(templateCode);
@@ -58,14 +58,11 @@ public class MailSendServiceImpl implements MailSendService {
         MailAccountDO mailAccountDO = this.checkMailAccountValid(from);
         Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
         content = mailTemplateService.formatMailTemplateContent(mailTemplateDO.getContent(), params);
-        Long sendLogId = mailLogService.createMailLog(mailAccountDO , mailTemplateDO , from , content , tos , title , isSend);
-
-        // 后续功能 TODO ：附件查询
-        //List<String> fileIds = mailSendVO.getFileIds();
-
+        Long sendLogId = mailLogService.createMailLog(userId,userType,to,mailAccountDO , mailTemplateDO , content,  templateParams,  isSend);
+        List<KeyValue<String,Object>> newTemplateParams = buildTemplateParams(mailTemplateDO,templateParams);
         // 发送 MQ 消息，异步执行发送短信
         if (isSend) {
-            mailProducer.sendMailSendMessage(mailAccountDO , mailTemplateDO ,content , tos , title , sendLogId);
+            mailProducer.sendMailSendMessage(sendLogId,mailAccountDO , mailTemplateDO ,content, newTemplateParams,to);
         }
     }
 
@@ -84,10 +81,10 @@ public class MailSendServiceImpl implements MailSendService {
         MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(message);
         //发送邮件
         try{
-            String messageId = MailUtil.send(account,message.getTos(),message.getTitle(),message.getContent(),false,null);
+            String messageId = MailUtil.send(account,message.getTo(),message.getTitle(),message.getContent(),false,null);
             mailLogService.updateMailSendResult(message.getLogId() , messageId);
         }catch (Exception e){
-            mailLogService.updateMailSendResult(message.getLogId() , e.getMessage());
+            mailLogService.updateFailMailSendResult(message.getLogId() , e.getMessage());
         }
 
     }
@@ -99,16 +96,21 @@ public class MailSendServiceImpl implements MailSendService {
         }
         return mailTemplateDO;
     }
-
-    private void validateMailTemplateExists(Long id) {
-        if (mailTemplateMapper.selectById(id) == null) {
-            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
-        }
-    }
-
-    private void validateMailTemplateOnlyByCode(String code){
-        if (mailTemplateMapper.selectOneByCode(code) != null) {
-            throw exception(MAIL_TEMPLATE_EXISTS);
-        }
+    /**
+     * 将参数模板，处理成有序的 KeyValue 数组
+     *
+     * @param template 邮箱模板
+     * @param templateParams 原始参数
+     * @return 处理后的参数
+     */
+    @VisibleForTesting
+    public List<KeyValue<String, Object>> buildTemplateParams(MailTemplateDO template, Map<String, Object> templateParams) {
+        return template.getParams().stream().map(key -> {
+            Object value = templateParams.get(key);
+            if (value == null) {
+                throw exception(MAIL_SEND_TEMPLATE_PARAM_MISS, key);
+            }
+            return new KeyValue<>(key, value);
+        }).collect(Collectors.toList());
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 9f8315458c..3fcac8b9e5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -83,7 +83,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     @Override
     public void update(@Valid MailTemplateUpdateReqVO updateReqVO) {
         // 校验是否唯一
-        // TODO @wangjingyi：参考下我在 account 给的唯一校验的说明。
+        // TODO @wangjingyi：参考下我在 account 给的唯一校验的说明。DONE
         this.validateMailTemplateOnlyByCode(updateReqVO.getId(),updateReqVO.getCode());
         MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
         mailTemplateMapper.updateById(mailTemplateDO);

From bb78a58029db52df14b3812300b07c144a5d0b48 Mon Sep 17 00:00:00 2001
From: xrcoder <53924337@qq.com>
Date: Sat, 6 Aug 2022 09:08:38 +0800
Subject: [PATCH 25/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86=EF=BC=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=9A=E4=B9=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/notify/NotifyMessageSendApi.java      | 34 +++++++
 .../dto/NotifySendSingleToUserReqDTO.java     | 33 +++++++
 .../system/enums/ErrorCodeConstants.java      |  6 ++
 .../enums/notify/NotifyReadStatusEnum.java    | 22 +++++
 .../api/notify/NotifyMessageSendApiImpl.java  | 39 ++++++++
 .../admin/notify/NotifyMessageController.java | 73 ++++++++++++++
 .../notify/NotifyTemplateController.java      | 99 +++++++++++++++++++
 .../notify/UserNotifyMessageController.java   | 83 ++++++++++++++++
 .../vo/message/NotifyMessageBaseVO.java       | 40 ++++++++
 .../vo/message/NotifyMessageCreateReqVO.java  | 15 +++
 .../vo/message/NotifyMessagePageReqVO.java    | 27 +++++
 .../vo/message/NotifyMessageRespVO.java       | 19 ++++
 .../vo/message/NotifyMessageUpdateReqVO.java  | 20 ++++
 .../vo/template/NotifyTemplateBaseVO.java     | 34 +++++++
 .../template/NotifyTemplateCreateReqVO.java   | 12 +++
 .../vo/template/NotifyTemplateExcelVO.java    | 42 ++++++++
 .../template/NotifyTemplateExportReqVO.java   | 28 ++++++
 .../vo/template/NotifyTemplatePageReqVO.java  | 30 ++++++
 .../vo/template/NotifyTemplateRespVO.java     | 19 ++++
 .../template/NotifyTemplateUpdateReqVO.java   | 17 ++++
 .../convert/notify/NotifyMessageConvert.java  | 34 +++++++
 .../convert/notify/NotifyTemplateConvert.java | 37 +++++++
 .../dataobject/notify/NotifyMessageDO.java    | 59 +++++++++++
 .../dataobject/notify/NotifyTemplateDO.java   | 55 +++++++++++
 .../dal/mysql/notify/NotifyMessageMapper.java | 25 +++++
 .../mysql/notify/NotifyTemplateMapper.java    | 39 ++++++++
 .../service/notify/NotifyMessageService.java  | 65 ++++++++++++
 .../notify/NotifyMessageServiceImpl.java      | 78 +++++++++++++++
 .../service/notify/NotifyTemplateService.java | 74 ++++++++++++++
 .../notify/NotifyTemplateServiceImpl.java     | 86 ++++++++++++++++
 30 files changed, 1244 insertions(+)
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
new file mode 100644
index 0000000000..b5885e7ef9
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.system.api.notify;
+
+import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+
+import javax.validation.Valid;
+
+/**
+ * 站内信发送 API 接口
+ *
+ * @author xrcoder
+ */
+public interface NotifyMessageSendApi {
+
+    /**
+     * 发送单条站内信给 Admin 用户
+     * <p>
+     * 在 mobile 为空时，使用 userId 加载对应 Admin 的手机号
+     *
+     * @param reqDTO 发送请求
+     * @return 发送消息ID
+     */
+    Long sendSingleMessageToAdmin(@Valid NotifySendSingleToUserReqDTO reqDTO);
+
+    /**
+     * 发送单条站内信给 Member 用户
+     * <p>
+     * 在 mobile 为空时，使用 userId 加载对应 Member 的手机号
+     *
+     * @param reqDTO 发送请求
+     * @return 发送消息ID
+     */
+    Long sendSingleMessageToMember(@Valid NotifySendSingleToUserReqDTO reqDTO);
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java
new file mode 100644
index 0000000000..502d3eb306
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.api.notify.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+/**
+ * 站内信发送给 Admin 或者 Member 用户
+ *
+ * @author xrcoder
+ */
+@Data
+public class NotifySendSingleToUserReqDTO {
+
+    /**
+     * 用户编号
+     */
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
+    /**
+     * 站内信模板编号
+     */
+    @NotEmpty(message = "站内信模板编号不能为空")
+    private String templateCode;
+
+    /**
+     * 站内信模板参数
+     */
+    private Map<String, Object> templateParams;
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 2f39519a3d..321599f002 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -142,4 +142,10 @@ public interface ErrorCodeConstants {
     ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
     ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022000, "code 已过期");
 
+    // ========== 站内信模版 1002023000 ==========
+    ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002023000, "站内信模版不存在");
+
+    // ========== 站内信 1002024000 ==========
+    ErrorCode NOTIFY_MESSAGE_NOT_EXISTS = new ErrorCode(1002024000, "站内信不存在");
+
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java
new file mode 100644
index 0000000000..f0af060daa
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.system.enums.notify;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 站内信阅读状态枚举类
+ *
+ * @author xrcoder
+ */
+@Getter
+@AllArgsConstructor
+public enum NotifyReadStatusEnum {
+
+    UNREAD(0),
+    READ(1);
+
+    /**
+     * 类型
+     */
+    private final Integer status;
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java
new file mode 100644
index 0000000000..6861ff8c5e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.system.api.notify;
+
+import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 站内信发送 API 接口
+ *
+ * @author xrcoder
+ */
+@Service
+public class NotifyMessageSendApiImpl implements NotifyMessageSendApi {
+
+    /**
+     * 发送单条站内信给 Admin 用户
+     * <p>
+     * 在 mobile 为空时，使用 userId 加载对应 Admin 的手机号
+     *
+     * @param reqDTO 发送请求
+     * @return 发送消息ID
+     */
+    @Override
+    public Long sendSingleMessageToAdmin(NotifySendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    /**
+     * 发送单条站内信给 Member 用户
+     * <p>
+     * 在 mobile 为空时，使用 userId 加载对应 Member 的手机号
+     *
+     * @param reqDTO 发送请求
+     * @return 发送消息ID
+     */
+    @Override
+    public Long sendSingleMessageToMember(NotifySendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
new file mode 100644
index 0000000000..0f52903772
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "管理后台 - 站内信")
+@RestController
+@RequestMapping("/system/notify-message")
+@Validated
+public class NotifyMessageController {
+
+    @Resource
+    private NotifyMessageService notifyMessageService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建站内信")
+    @PreAuthorize("@ss.hasPermission('system:notify-message:create')")
+    public CommonResult<Long> createNotifyMessage(@Valid @RequestBody NotifyMessageCreateReqVO createReqVO) {
+        return success(notifyMessageService.createNotifyMessage(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("更新站内信")
+    @PreAuthorize("@ss.hasPermission('system:notify-message:update')")
+    public CommonResult<Boolean> updateNotifyMessage(@Valid @RequestBody NotifyMessageUpdateReqVO updateReqVO) {
+        notifyMessageService.updateNotifyMessage(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除站内信")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:notify-message:delete')")
+    public CommonResult<Boolean> deleteNotifyMessage(@RequestParam("id") Long id) {
+        notifyMessageService.deleteNotifyMessage(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得站内信")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
+    public CommonResult<NotifyMessageRespVO> getNotifyMessage(@RequestParam("id") Long id) {
+        NotifyMessageDO notifyMessage = notifyMessageService.getNotifyMessage(id);
+        return success(NotifyMessageConvert.INSTANCE.convert(notifyMessage));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得站内信分页")
+    @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
+    public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
+        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
+        return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
new file mode 100644
index 0000000000..fe7f8a1a25
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.*;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+@Api(tags = "管理后台 - 站内信模版")
+@RestController
+@RequestMapping("/system/notify-template")
+@Validated
+public class NotifyTemplateController {
+
+    @Resource
+    private NotifyTemplateService notifyTemplateService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建站内信模版")
+    @PreAuthorize("@ss.hasPermission('system:notify-template:create')")
+    public CommonResult<Long> createNotifyTemplate(@Valid @RequestBody NotifyTemplateCreateReqVO createReqVO) {
+        return success(notifyTemplateService.createNotifyTemplate(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation("更新站内信模版")
+    @PreAuthorize("@ss.hasPermission('system:notify-template:update')")
+    public CommonResult<Boolean> updateNotifyTemplate(@Valid @RequestBody NotifyTemplateUpdateReqVO updateReqVO) {
+        notifyTemplateService.updateNotifyTemplate(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @ApiOperation("删除站内信模版")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:notify-template:delete')")
+    public CommonResult<Boolean> deleteNotifyTemplate(@RequestParam("id") Long id) {
+        notifyTemplateService.deleteNotifyTemplate(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @ApiOperation("获得站内信模版")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
+    public CommonResult<NotifyTemplateRespVO> getNotifyTemplate(@RequestParam("id") Long id) {
+        NotifyTemplateDO notifyTemplate = notifyTemplateService.getNotifyTemplate(id);
+        return success(NotifyTemplateConvert.INSTANCE.convert(notifyTemplate));
+    }
+
+    @GetMapping("/list")
+    @ApiOperation("获得站内信模版列表")
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
+    public CommonResult<List<NotifyTemplateRespVO>> getNotifyTemplateList(@RequestParam("ids") Collection<Long> ids) {
+        List<NotifyTemplateDO> list = notifyTemplateService.getNotifyTemplateList(ids);
+        return success(NotifyTemplateConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得站内信模版分页")
+    @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
+    public CommonResult<PageResult<NotifyTemplateRespVO>> getNotifyTemplatePage(@Valid NotifyTemplatePageReqVO pageVO) {
+        PageResult<NotifyTemplateDO> pageResult = notifyTemplateService.getNotifyTemplatePage(pageVO);
+        return success(NotifyTemplateConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/export-excel")
+    @ApiOperation("导出站内信模版 Excel")
+    @PreAuthorize("@ss.hasPermission('system:notify-template:export')")
+    @OperateLog(type = EXPORT)
+    public void exportNotifyTemplateExcel(@Valid NotifyTemplateExportReqVO exportReqVO,
+                                          HttpServletResponse response) throws IOException {
+        List<NotifyTemplateDO> list = notifyTemplateService.getNotifyTemplateList(exportReqVO);
+        // 导出 Excel
+        List<NotifyTemplateExcelVO> datas = NotifyTemplateConvert.INSTANCE.convertList02(list);
+        ExcelUtils.write(response, "站内信模版.xls", "数据", NotifyTemplateExcelVO.class, datas);
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
new file mode 100644
index 0000000000..c74291d585
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
@@ -0,0 +1,83 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 管理后台 - 站内信-消息中心
+ *
+ * @author xrcoder
+ */
+@Api(tags = "管理后台 - 站内信-消息中心")
+@RestController
+@RequestMapping("/system/user/notify-message")
+@Validated
+public class UserNotifyMessageController {
+
+    @Resource
+    private NotifyMessageService notifyMessageService;
+
+
+    @GetMapping("/page")
+    @ApiOperation("获得站内信分页")
+    public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
+        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
+        return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @GetMapping("/latest/list")
+    @ApiOperation("获得最新10站内信列表")
+    public CommonResult<List<NotifyMessageRespVO>> getNotifyLatestMessageList() {
+        return success(Collections.emptyList());
+    }
+
+    @GetMapping("/unread/count")
+    @ApiOperation("获得未读站内信数量")
+    public CommonResult<Long> getUnreadNotifyMessageCount() {
+        return success(1L);
+    }
+
+    @GetMapping("/read")
+    @ApiOperation("获得站内信")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    public CommonResult<NotifyMessageRespVO> readNotifyMessage(@RequestParam("id") Long id) {
+        NotifyMessageDO notifyMessage = notifyMessageService.getNotifyMessage(id);
+        // TODO 记录消息已读。
+        return success(NotifyMessageConvert.INSTANCE.convert(notifyMessage));
+    }
+
+    @GetMapping("/read/list")
+    @ApiOperation("批量标记已读")
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+        return success(Boolean.TRUE);
+    }
+
+    @GetMapping("/read/all")
+    @ApiOperation("所有未读消息标记已读")
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+        return success(Boolean.TRUE);
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
new file mode 100644
index 0000000000..b19480e715
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+* 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class NotifyMessageBaseVO {
+
+    @ApiModelProperty(value = "用户编号", required = true)
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户类型", required = true)
+    @NotNull(message = "用户类型不能为空")
+    private Integer userType;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容", required = true)
+    @NotNull(message = "内容不能为空")
+    private String content;
+
+    @ApiModelProperty(value = "是否已读 0-未读  1-已读")
+    private Boolean readStatus;
+
+    @ApiModelProperty(value = "阅读时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date readTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java
new file mode 100644
index 0000000000..61a0e56669
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
+
+import lombok.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 站内信创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyMessageCreateReqVO extends NotifyMessageBaseVO {
+
+    @ApiModelProperty(value = "站内信模版编号")
+    private Long templateId;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
new file mode 100644
index 0000000000..8331d1b5fe
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 站内信分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyMessagePageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "是否已读 0-未读  1-已读")
+    private Boolean readStatus;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
new file mode 100644
index 0000000000..530b368c11
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 站内信 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyMessageRespVO extends NotifyMessageBaseVO {
+
+    @ApiModelProperty(value = "ID", required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java
new file mode 100644
index 0000000000..3576cca9f3
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
+
+import lombok.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@ApiModel("管理后台 - 站内信更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyMessageUpdateReqVO extends NotifyMessageBaseVO {
+
+    @ApiModelProperty(value = "ID", required = true)
+    @NotNull(message = "ID不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "站内信模版编号")
+    private Long templateId;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
new file mode 100644
index 0000000000..371239455c
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+/**
+* 站内信模版 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
+@Data
+public class NotifyTemplateBaseVO {
+
+    @ApiModelProperty(value = "模版编码", required = true)
+    @NotNull(message = "模版编码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "模版标题", required = true)
+    @NotNull(message = "模版标题不能为空")
+    private String title;
+
+    @ApiModelProperty(value = "模版内容", required = true)
+    @NotNull(message = "模版内容不能为空")
+    private String content;
+
+    @ApiModelProperty(value = "状态：1-启用 0-禁用", required = true)
+    @NotNull(message = "状态：1-启用 0-禁用不能为空")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
new file mode 100644
index 0000000000..e39a2774a2
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 站内信模版创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyTemplateCreateReqVO extends NotifyTemplateBaseVO {
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
new file mode 100644
index 0000000000..e0402da8ce
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+
+
+/**
+ * 站内信模版 Excel VO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class NotifyTemplateExcelVO {
+
+    @ExcelProperty("ID")
+    private Long id;
+
+    @ExcelProperty("模版编码")
+    private String code;
+
+    @ExcelProperty("模版标题")
+    private String title;
+
+    @ExcelProperty("模版内容")
+    private String content;
+
+    @ExcelProperty(value = "状态：1-启用 0-禁用", converter = DictConvert.class)
+    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String status;
+
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @ExcelProperty("创建时间")
+    private Date createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
new file mode 100644
index 0000000000..a9f8877e22
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel(value = "管理后台 - 站内信模版 Excel 导出 Request VO", description = "参数和 NotifyTemplatePageReqVO 是一致的")
+@Data
+public class NotifyTemplateExportReqVO {
+
+    @ApiModelProperty(value = "模版编码")
+    private String code;
+
+    @ApiModelProperty(value = "模版标题")
+    private String title;
+
+    @ApiModelProperty(value = "状态：1-启用 0-禁用")
+    private String status;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
new file mode 100644
index 0000000000..7a8145b677
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 站内信模版分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyTemplatePageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "模版编码")
+    private String code;
+
+    @ApiModelProperty(value = "模版标题")
+    private String title;
+
+    @ApiModelProperty(value = "状态：1-启用 0-禁用")
+    private String status;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
new file mode 100644
index 0000000000..52dd3656e2
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.annotations.*;
+
+@ApiModel("管理后台 - 站内信模版 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyTemplateRespVO extends NotifyTemplateBaseVO {
+
+    @ApiModelProperty(value = "ID", required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java
new file mode 100644
index 0000000000..267159447b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import lombok.*;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
+
+@ApiModel("管理后台 - 站内信模版更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyTemplateUpdateReqVO extends NotifyTemplateBaseVO {
+
+    @ApiModelProperty(value = "ID", required = true)
+    @NotNull(message = "ID不能为空")
+    private Long id;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
new file mode 100644
index 0000000000..b5bce25d43
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.system.convert.notify;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+
+/**
+ * 站内信 Convert
+ *
+ * @author xrcoder
+ */
+@Mapper
+public interface NotifyMessageConvert {
+
+    NotifyMessageConvert INSTANCE = Mappers.getMapper(NotifyMessageConvert.class);
+
+    NotifyMessageDO convert(NotifyMessageCreateReqVO bean);
+
+    NotifyMessageDO convert(NotifyMessageUpdateReqVO bean);
+
+    NotifyMessageRespVO convert(NotifyMessageDO bean);
+
+    List<NotifyMessageRespVO> convertList(List<NotifyMessageDO> list);
+
+    PageResult<NotifyMessageRespVO> convertPage(PageResult<NotifyMessageDO> page);
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java
new file mode 100644
index 0000000000..8d58067b9f
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.system.convert.notify;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+
+/**
+ * 站内信模版 Convert
+ *
+ * @author xrcoder
+ */
+@Mapper
+public interface NotifyTemplateConvert {
+
+    NotifyTemplateConvert INSTANCE = Mappers.getMapper(NotifyTemplateConvert.class);
+
+    NotifyTemplateDO convert(NotifyTemplateCreateReqVO bean);
+
+    NotifyTemplateDO convert(NotifyTemplateUpdateReqVO bean);
+
+    NotifyTemplateRespVO convert(NotifyTemplateDO bean);
+
+    List<NotifyTemplateRespVO> convertList(List<NotifyTemplateDO> list);
+
+    PageResult<NotifyTemplateRespVO> convertPage(PageResult<NotifyTemplateDO> page);
+
+    List<NotifyTemplateExcelVO> convertList02(List<NotifyTemplateDO> list);
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
new file mode 100644
index 0000000000..c826c9d106
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.notify;
+
+import lombok.*;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 站内信 DO
+ *
+ * @author xrcoder
+ */
+@TableName("system_notify_message")
+@KeySequence("system_notify_message_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class NotifyMessageDO extends BaseDO {
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 站内信模版编号
+     */
+    private Long templateId;
+    /**
+     * 用户编号
+     */
+    private Long userId;
+    /**
+     * 用户类型
+     */
+    private Integer userType;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 是否已读 0-未读  1-已读
+     *
+     * 枚举 {@link TODO system_notify_message_read_status 对应的类}
+     */
+    private Boolean readStatus;
+    /**
+     * 阅读时间
+     */
+    private Date readTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
new file mode 100644
index 0000000000..aa7cce11e1
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.notify;
+
+import lombok.*;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 站内信模版 DO
+ *
+ * @author xrcoder
+ */
+@TableName("system_notify_template")
+@KeySequence("system_notify_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class NotifyTemplateDO extends BaseDO {
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 模版编码
+     */
+    private String code;
+    /**
+     * 模版标题
+     */
+    private String title;
+    /**
+     * 模版内容
+     */
+    private String content;
+    /**
+     * 参数数组
+     */
+    private String params;
+    /**
+     * 状态：1-启用 0-禁用
+     *
+     * 枚举 {@link TODO common_status 对应的类}
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String remarks;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
new file mode 100644
index 0000000000..2a7293d107
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.dal.mysql.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 站内信 Mapper
+ *
+ * @author xrcoder
+ */
+@Mapper
+public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
+
+    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
+                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
+                .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(NotifyMessageDO::getId));
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
new file mode 100644
index 0000000000..115055b097
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.system.dal.mysql.notify;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 站内信模版 Mapper
+ *
+ * @author xrcoder
+ */
+@Mapper
+public interface NotifyTemplateMapper extends BaseMapperX<NotifyTemplateDO> {
+
+    default PageResult<NotifyTemplateDO> selectPage(NotifyTemplatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<NotifyTemplateDO>()
+                .eqIfPresent(NotifyTemplateDO::getCode, reqVO.getCode())
+                .eqIfPresent(NotifyTemplateDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(NotifyTemplateDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(NotifyTemplateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(NotifyTemplateDO::getId));
+    }
+
+    default List<NotifyTemplateDO> selectList(NotifyTemplateExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<NotifyTemplateDO>()
+                .eqIfPresent(NotifyTemplateDO::getCode, reqVO.getCode())
+                .eqIfPresent(NotifyTemplateDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(NotifyTemplateDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(NotifyTemplateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(NotifyTemplateDO::getId));
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
new file mode 100644
index 0000000000..42b4f05ead
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import java.util.*;
+import javax.validation.*;
+
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 站内信 Service 接口
+ *
+ * @author xrcoder
+ */
+public interface NotifyMessageService {
+
+    /**
+     * 创建站内信
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createNotifyMessage(@Valid NotifyMessageCreateReqVO createReqVO);
+
+    /**
+     * 更新站内信
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateNotifyMessage(@Valid NotifyMessageUpdateReqVO updateReqVO);
+
+    /**
+     * 删除站内信
+     *
+     * @param id 编号
+     */
+    void deleteNotifyMessage(Long id);
+
+    /**
+     * 获得站内信
+     *
+     * @param id 编号
+     * @return 站内信
+     */
+    NotifyMessageDO getNotifyMessage(Long id);
+
+    /**
+     * 获得站内信列表
+     *
+     * @param ids 编号
+     * @return 站内信列表
+     */
+    List<NotifyMessageDO> getNotifyMessageList(Collection<Long> ids);
+
+    /**
+     * 获得站内信分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 站内信分页
+     */
+    PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
new file mode 100644
index 0000000000..25a6f94a6f
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -0,0 +1,78 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_MESSAGE_NOT_EXISTS;
+
+/**
+ * 站内信 Service 实现类
+ *
+ * @author xrcoder
+ */
+@Service
+@Validated
+public class NotifyMessageServiceImpl implements NotifyMessageService {
+
+    @Resource
+    private NotifyMessageMapper notifyMessageMapper;
+
+    @Override
+    public Long createNotifyMessage(NotifyMessageCreateReqVO createReqVO) {
+        // 插入
+        NotifyMessageDO notifyMessage = NotifyMessageConvert.INSTANCE.convert(createReqVO);
+        notifyMessageMapper.insert(notifyMessage);
+        // 返回
+        return notifyMessage.getId();
+    }
+
+    @Override
+    public void updateNotifyMessage(NotifyMessageUpdateReqVO updateReqVO) {
+        // 校验存在
+        this.validateNotifyMessageExists(updateReqVO.getId());
+        // 更新
+        NotifyMessageDO updateObj = NotifyMessageConvert.INSTANCE.convert(updateReqVO);
+        notifyMessageMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteNotifyMessage(Long id) {
+        // 校验存在
+        this.validateNotifyMessageExists(id);
+        // 删除
+        notifyMessageMapper.deleteById(id);
+    }
+
+    private void validateNotifyMessageExists(Long id) {
+        if (notifyMessageMapper.selectById(id) == null) {
+            throw exception(NOTIFY_MESSAGE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public NotifyMessageDO getNotifyMessage(Long id) {
+        return notifyMessageMapper.selectById(id);
+    }
+
+    @Override
+    public List<NotifyMessageDO> getNotifyMessageList(Collection<Long> ids) {
+        return notifyMessageMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
+        return notifyMessageMapper.selectPage(pageReqVO);
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
new file mode 100644
index 0000000000..744d5585eb
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import java.util.*;
+import javax.validation.*;
+
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 站内信模版 Service 接口
+ *
+ * @author xrcoder
+ */
+public interface NotifyTemplateService {
+
+    /**
+     * 创建站内信模版
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createNotifyTemplate(@Valid NotifyTemplateCreateReqVO createReqVO);
+
+    /**
+     * 更新站内信模版
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateNotifyTemplate(@Valid NotifyTemplateUpdateReqVO updateReqVO);
+
+    /**
+     * 删除站内信模版
+     *
+     * @param id 编号
+     */
+    void deleteNotifyTemplate(Long id);
+
+    /**
+     * 获得站内信模版
+     *
+     * @param id 编号
+     * @return 站内信模版
+     */
+    NotifyTemplateDO getNotifyTemplate(Long id);
+
+    /**
+     * 获得站内信模版列表
+     *
+     * @param ids 编号
+     * @return 站内信模版列表
+     */
+    List<NotifyTemplateDO> getNotifyTemplateList(Collection<Long> ids);
+
+    /**
+     * 获得站内信模版分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 站内信模版分页
+     */
+    PageResult<NotifyTemplateDO> getNotifyTemplatePage(NotifyTemplatePageReqVO pageReqVO);
+
+    /**
+     * 获得站内信模版列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 站内信模版列表
+     */
+    List<NotifyTemplateDO> getNotifyTemplateList(NotifyTemplateExportReqVO exportReqVO);
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
new file mode 100644
index 0000000000..eb43af802c
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+
+/**
+ * 站内信模版 Service 实现类
+ *
+ * @author xrcoder
+ */
+@Service
+@Validated
+public class NotifyTemplateServiceImpl implements NotifyTemplateService {
+
+    @Resource
+    private NotifyTemplateMapper notifyTemplateMapper;
+
+    @Override
+    public Long createNotifyTemplate(NotifyTemplateCreateReqVO createReqVO) {
+        // 插入
+        NotifyTemplateDO notifyTemplate = NotifyTemplateConvert.INSTANCE.convert(createReqVO);
+        notifyTemplateMapper.insert(notifyTemplate);
+        // 返回
+        return notifyTemplate.getId();
+    }
+
+    @Override
+    public void updateNotifyTemplate(NotifyTemplateUpdateReqVO updateReqVO) {
+        // 校验存在
+        this.validateNotifyTemplateExists(updateReqVO.getId());
+        // 更新
+        NotifyTemplateDO updateObj = NotifyTemplateConvert.INSTANCE.convert(updateReqVO);
+        notifyTemplateMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteNotifyTemplate(Long id) {
+        // 校验存在
+        this.validateNotifyTemplateExists(id);
+        // 删除
+        notifyTemplateMapper.deleteById(id);
+    }
+
+    private void validateNotifyTemplateExists(Long id) {
+        if (notifyTemplateMapper.selectById(id) == null) {
+            throw exception(NOTIFY_TEMPLATE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public NotifyTemplateDO getNotifyTemplate(Long id) {
+        return notifyTemplateMapper.selectById(id);
+    }
+
+    @Override
+    public List<NotifyTemplateDO> getNotifyTemplateList(Collection<Long> ids) {
+        return notifyTemplateMapper.selectBatchIds(ids);
+    }
+
+    @Override
+    public PageResult<NotifyTemplateDO> getNotifyTemplatePage(NotifyTemplatePageReqVO pageReqVO) {
+        return notifyTemplateMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<NotifyTemplateDO> getNotifyTemplateList(NotifyTemplateExportReqVO exportReqVO) {
+        return notifyTemplateMapper.selectList(exportReqVO);
+    }
+
+}

From d16f873521d24892f1148cfa9b43f01e94514e04 Mon Sep 17 00:00:00 2001
From: xrcoder <53924337@qq.com>
Date: Sat, 6 Aug 2022 10:03:09 +0800
Subject: [PATCH 26/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |   1 +
 .../vo/template/NotifyTemplateRespVO.java     |   3 +
 .../dataobject/notify/NotifyTemplateDO.java   |  27 ++-
 .../mysql/notify/NotifyTemplateMapper.java    |   9 +
 .../notify/NotifyTemplateRefreshConsumer.java |  29 ++++
 .../notify/NotifyTemplateRefreshMessage.java  |  21 +++
 .../mq/producer/notify/NotifyProducer.java    |  33 ++++
 .../service/notify/NotifyTemplateService.java |  24 +++
 .../notify/NotifyTemplateServiceImpl.java     | 159 +++++++++++++++++-
 9 files changed, 290 insertions(+), 16 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 321599f002..078deb7f4a 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -144,6 +144,7 @@ public interface ErrorCodeConstants {
 
     // ========== 站内信模版 1002023000 ==========
     ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002023000, "站内信模版不存在");
+    ErrorCode NOTIFY_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002023001, "已经存在编码为【{}】的站内信模板");
 
     // ========== 站内信 1002024000 ==========
     ErrorCode NOTIFY_MESSAGE_NOT_EXISTS = new ErrorCode(1002024000, "站内信不存在");
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
index 52dd3656e2..f77126f6ca 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
@@ -13,6 +13,9 @@ public class NotifyTemplateRespVO extends NotifyTemplateBaseVO {
     @ApiModelProperty(value = "ID", required = true)
     private Long id;
 
+    @ApiModelProperty(value = "参数数组", example = "name,code")
+    private List<String> params;
+
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
index aa7cce11e1..2066f0b239 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
@@ -1,16 +1,22 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.notify;
 
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
+
+import java.util.List;
 
 /**
  * 站内信模版 DO
  *
  * @author xrcoder
  */
-@TableName("system_notify_template")
+@TableName(value = "system_notify_template", autoResultMap = true)
 @KeySequence("system_notify_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,28 +31,35 @@ public class NotifyTemplateDO extends BaseDO {
      */
     @TableId
     private Long id;
+
     /**
      * 模版编码
      */
     private String code;
+
     /**
      * 模版标题
      */
     private String title;
+
     /**
      * 模版内容
      */
     private String content;
+
     /**
      * 参数数组
      */
-    private String params;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<String> params;
+
     /**
      * 状态：1-启用 0-禁用
-     *
-     * 枚举 {@link TODO common_status 对应的类}
+     * <p>
+     * 枚举 {@link CommonStatusEnum}
      */
     private String status;
+
     /**
      * 备注
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
index 115055b097..c71a054b1d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
@@ -8,7 +8,9 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 站内信模版 Mapper
@@ -18,6 +20,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface NotifyTemplateMapper extends BaseMapperX<NotifyTemplateDO> {
 
+    @Select("SELECT COUNT(*) FROM system_notify_template WHERE update_time > #{maxUpdateTime}")
+    Long selectCountByUpdateTimeGt(Date maxUpdateTime);
+
+    default NotifyTemplateDO selectByCode(String code) {
+        return selectOne(NotifyTemplateDO::getCode, code);
+    }
+
     default PageResult<NotifyTemplateDO> selectPage(NotifyTemplatePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyTemplateDO>()
                 .eqIfPresent(NotifyTemplateDO::getCode, reqVO.getCode())
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java
new file mode 100644
index 0000000000..c2d8133b39
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.mq.consumer.notify;
+
+import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
+import cn.iocoder.yudao.module.system.mq.message.notify.NotifyTemplateRefreshMessage;
+import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 针对 {@link NotifyTemplateRefreshMessage} 的消费者
+ *
+ * @author xrcoder
+ */
+@Component
+@Slf4j
+public class NotifyTemplateRefreshConsumer extends AbstractChannelMessageListener<NotifyTemplateRefreshMessage> {
+
+    @Resource
+    private NotifyTemplateService notifyTemplateService;
+
+    @Override
+    public void onMessage(NotifyTemplateRefreshMessage message) {
+        log.info("[onMessage][收到 NotifyTemplate 刷新消息]");
+        notifyTemplateService.initLocalCache();
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java
new file mode 100644
index 0000000000..3eddf0bc6b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.system.mq.message.notify;
+
+import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 站内信模板的数据刷新 Message
+ *
+ * @author xrcoder
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NotifyTemplateRefreshMessage extends AbstractChannelMessage {
+
+    @Override
+    public String getChannel() {
+        return "system.notify-template.refresh";
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java
new file mode 100644
index 0000000000..3affe2c2f6
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.mq.producer.notify;
+
+import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
+import cn.iocoder.yudao.module.system.mq.message.notify.NotifyTemplateRefreshMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * Notify 站内信相关消息的 Producer
+ *
+ * @author xrcoder
+ * @since 2022-08-06
+ */
+@Slf4j
+@Component
+public class NotifyProducer {
+
+    @Resource
+    private RedisMQTemplate redisMQTemplate;
+
+
+    /**
+     * 发送 {@link NotifyTemplateRefreshMessage} 消息
+     */
+    public void sendNotifyTemplateRefreshMessage() {
+        NotifyTemplateRefreshMessage message = new NotifyTemplateRefreshMessage();
+        redisMQTemplate.send(message);
+    }
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
index 744d5585eb..f7a9318a11 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.Notify
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 
 /**
  * 站内信模版 Service 接口
@@ -17,6 +18,29 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
  */
 public interface NotifyTemplateService {
 
+    /**
+     * 初始化站内信模板的本地缓存
+     */
+    void initLocalCache();
+
+    /**
+     * 获得站内信模板，从缓存中
+     *
+     * @param code 模板编码
+     * @return 站内信模板
+     */
+    NotifyTemplateDO getNotifyTemplateByCodeFromCache(String code);
+
+
+    /**
+     * 格式化站内信内容
+     *
+     * @param content 站内信模板的内容
+     * @param params 站内信内容的参数
+     * @return 格式化后的内容
+     */
+    String formatNotifyTemplateContent(String content, Map<String, Object> params);
+
     /**
      * 创建站内信模版
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
index eb43af802c..65b71d92ea 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
@@ -1,23 +1,34 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper;
+import cn.iocoder.yudao.module.system.mq.producer.notify.NotifyProducer;
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
-import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_CODE_DUPLICATE;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_NOT_EXISTS;
 
 /**
  * 站内信模版 Service 实现类
@@ -26,16 +37,123 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
+@Slf4j
 public class NotifyTemplateServiceImpl implements NotifyTemplateService {
 
+    /**
+     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
+     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
+     */
+    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
+
+    /**
+     * 正则表达式，匹配 {} 中的变量
+     */
+    private static final Pattern PATTERN_PARAMS = Pattern.compile("\\{(.*?)}");
+
     @Resource
     private NotifyTemplateMapper notifyTemplateMapper;
 
+    @Resource
+    private NotifyProducer notifyProducer;
+
+    /**
+     * 站内信模板缓存
+     * key：站内信模板编码 {@link NotifyTemplateDO#getCode()}
+     * <p>
+     * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
+     */
+    private volatile Map<String, NotifyTemplateDO> notifyTemplateCache;
+
+    /**
+     * 缓存站内信模板的最大更新时间，用于后续的增量轮询，判断是否有更新
+     */
+    private volatile Date maxUpdateTime;
+
+    /**
+     * 初始化站内信模板的本地缓存
+     */
+    @Override
+    public void initLocalCache() {
+        // 获取站内信模板列表，如果有更新
+        List<NotifyTemplateDO> notifyTemplateList = this.loadNotifyTemplateIfUpdate(maxUpdateTime);
+        if (CollUtil.isEmpty(notifyTemplateList)) {
+            return;
+        }
+
+        // 写入缓存
+        notifyTemplateCache = CollectionUtils.convertMap(notifyTemplateList, NotifyTemplateDO::getCode);
+        maxUpdateTime = CollectionUtils.getMaxValue(notifyTemplateList, NotifyTemplateDO::getUpdateTime);
+        log.info("[initLocalCache][初始化 NotifyTemplate 数量为 {}]", notifyTemplateList.size());
+
+    }
+
+    /**
+     * 如果站内信模板发生变化，从数据库中获取最新的全量站内信模板。
+     * 如果未发生变化，则返回空
+     *
+     * @param maxUpdateTime 当前站内信模板的最大更新时间
+     * @return 站内信模板列表
+     */
+    private List<NotifyTemplateDO> loadNotifyTemplateIfUpdate(Date maxUpdateTime) {
+        // 第一步，判断是否要更新。
+        if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据
+            log.info("[loadNotifyTemplateIfUpdate][首次加载全量站内信模板]");
+        } else { // 判断数据库中是否有更新的站内信模板
+            if (notifyTemplateMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
+                return null;
+            }
+            log.info("[loadNotifyTemplateIfUpdate][增量加载全量站内信模板]");
+        }
+        // 第二步，如果有更新，则从数据库加载所有站内信模板
+        return notifyTemplateMapper.selectList();
+    }
+
+    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
+    public void schedulePeriodicRefresh() {
+        initLocalCache();
+    }
+
+
+    /**
+     * 获得站内信模板，从缓存中
+     *
+     * @param code 模板编码
+     * @return 站内信模板
+     */
+    @Override
+    public NotifyTemplateDO getNotifyTemplateByCodeFromCache(String code) {
+        return notifyTemplateCache.get(code);
+    }
+
+    /**
+     * 格式化站内信内容
+     *
+     * @param content 站内信模板的内容
+     * @param params  站内信内容的参数
+     * @return 格式化后的内容
+     */
+    @Override
+    public String formatNotifyTemplateContent(String content, Map<String, Object> params) {
+        return StrUtil.format(content, params);
+    }
+
+    @VisibleForTesting
+    public List<String> parseTemplateContentParams(String content) {
+        return ReUtil.findAllGroup1(PATTERN_PARAMS, content);
+    }
+
     @Override
     public Long createNotifyTemplate(NotifyTemplateCreateReqVO createReqVO) {
+        // 校验站内信编码是否重复
+        checkNotifyTemplateCodeDuplicate(null, createReqVO.getCode());
+
         // 插入
         NotifyTemplateDO notifyTemplate = NotifyTemplateConvert.INSTANCE.convert(createReqVO);
+        notifyTemplate.setParams(parseTemplateContentParams(notifyTemplate.getContent()));
         notifyTemplateMapper.insert(notifyTemplate);
+        // 发送刷新消息
+        notifyProducer.sendNotifyTemplateRefreshMessage();
         // 返回
         return notifyTemplate.getId();
     }
@@ -44,9 +162,16 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
     public void updateNotifyTemplate(NotifyTemplateUpdateReqVO updateReqVO) {
         // 校验存在
         this.validateNotifyTemplateExists(updateReqVO.getId());
+        // 校验站内信编码是否重复
+        checkNotifyTemplateCodeDuplicate(updateReqVO.getId(), updateReqVO.getCode());
+
         // 更新
         NotifyTemplateDO updateObj = NotifyTemplateConvert.INSTANCE.convert(updateReqVO);
+        updateObj.setParams(parseTemplateContentParams(updateObj.getContent()));
+
         notifyTemplateMapper.updateById(updateObj);
+        // 发送刷新消息
+        notifyProducer.sendNotifyTemplateRefreshMessage();
     }
 
     @Override
@@ -55,6 +180,8 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         this.validateNotifyTemplateExists(id);
         // 删除
         notifyTemplateMapper.deleteById(id);
+        // 发送刷新消息
+        notifyProducer.sendNotifyTemplateRefreshMessage();
     }
 
     private void validateNotifyTemplateExists(Long id) {
@@ -83,4 +210,18 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         return notifyTemplateMapper.selectList(exportReqVO);
     }
 
+    @VisibleForTesting
+    public void checkNotifyTemplateCodeDuplicate(Long id, String code) {
+        NotifyTemplateDO template = notifyTemplateMapper.selectByCode(code);
+        if (template == null) {
+            return;
+        }
+        // 如果 id 为空，说明不用比较是否为相同 id 的字典类型
+        if (id == null) {
+            throw exception(NOTIFY_TEMPLATE_CODE_DUPLICATE, code);
+        }
+        if (!template.getId().equals(id)) {
+            throw exception(NOTIFY_TEMPLATE_CODE_DUPLICATE, code);
+        }
+    }
 }

From af4290784e852ba0f673e848af75955f03eca7c4 Mon Sep 17 00:00:00 2001
From: xrcoder <53924337@qq.com>
Date: Sat, 6 Aug 2022 10:47:54 +0800
Subject: [PATCH 27/67] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AB=99=E5=86=85=E4=BF=A1=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=95=B0=E9=87=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |  1 +
 .../notify/UserNotifyMessageController.java   | 16 +++++-
 .../vo/message/NotifyMessagePageReqVO.java    |  6 +++
 .../dal/mysql/notify/NotifyMessageMapper.java | 14 ++++-
 .../service/notify/NotifyMessageService.java  | 17 ++++--
 .../notify/NotifyMessageServiceImpl.java      | 52 ++++++++++++++++++-
 6 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 078deb7f4a..a126aee6e9 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -145,6 +145,7 @@ public interface ErrorCodeConstants {
     // ========== 站内信模版 1002023000 ==========
     ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002023000, "站内信模版不存在");
     ErrorCode NOTIFY_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002023001, "已经存在编码为【{}】的站内信模板");
+    ErrorCode NOTIFY_TEMPLATE_PARAM_MISS = new ErrorCode(1002023002, "模板参数({})缺失");
 
     // ========== 站内信 1002024000 ==========
     ErrorCode NOTIFY_MESSAGE_NOT_EXISTS = new ErrorCode(1002024000, "站内信不存在");
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
index c74291d585..eaae42e81e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
@@ -23,6 +25,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 /**
  * 管理后台 - 站内信-消息中心
@@ -42,6 +45,8 @@ public class UserNotifyMessageController {
     @GetMapping("/page")
     @ApiOperation("获得站内信分页")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
+        pageVO.setUserId(getLoginUserId());
+        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
@@ -49,13 +54,22 @@ public class UserNotifyMessageController {
     @GetMapping("/latest/list")
     @ApiOperation("获得最新10站内信列表")
     public CommonResult<List<NotifyMessageRespVO>> getNotifyLatestMessageList() {
+        NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
+        reqVO.setUserId(getLoginUserId());
+        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+        reqVO.setPageNo(1);
+        reqVO.setPageSize(10);
+        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(reqVO);
+        if (CollUtil.isNotEmpty(pageResult.getList())) {
+            return success(NotifyMessageConvert.INSTANCE.convertList(pageResult.getList()));
+        }
         return success(Collections.emptyList());
     }
 
     @GetMapping("/unread/count")
     @ApiOperation("获得未读站内信数量")
     public CommonResult<Long> getUnreadNotifyMessageCount() {
-        return success(1L);
+        return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
     }
 
     @GetMapping("/read")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
index 8331d1b5fe..6db082d2cc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
@@ -24,4 +24,10 @@ public class NotifyMessagePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date[] createTime;
 
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "用户类型", hidden = true)
+    private Integer userType;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 2a7293d107..899208b8b3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -1,12 +1,15 @@
 package cn.iocoder.yudao.module.system.dal.mysql.notify;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 站内信 Mapper
  *
@@ -20,6 +23,15 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
                 .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
                 .orderByDesc(NotifyMessageDO::getId));
     }
+
+    default Long selectUnreadCountByUserIdAndUserType(Long userId, Integer userType) {
+        return selectCount(new LambdaQueryWrapperX<NotifyMessageDO>()
+                .eq(NotifyMessageDO::getReadStatus, NotifyReadStatusEnum.UNREAD.getStatus())
+                .eq(NotifyMessageDO::getUserId, userId)
+                .eq(NotifyMessageDO::getUserType, userType));
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index 42b4f05ead..847ab9a4b7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -1,13 +1,14 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
-import java.util.*;
-import javax.validation.*;
-
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 站内信 Service 接口
@@ -62,4 +63,12 @@ public interface NotifyMessageService {
      */
     PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO);
 
+    /**
+     * 统计用户未读站内信条数
+     *
+     * @param userId 用户ID
+     * @param userType 用户类型
+     * @return 返回未读站内信条数
+     */
+    Long getUnreadNotifyMessageCount(Long userId, Integer userType);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index 25a6f94a6f..c37ada4fd5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -1,21 +1,26 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import com.google.common.annotations.VisibleForTesting;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_MESSAGE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 站内信 Service 实现类
@@ -29,6 +34,39 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
     @Resource
     private NotifyMessageMapper notifyMessageMapper;
 
+    @Resource
+    private NotifyTemplateService notifyTemplateService;
+
+
+    @VisibleForTesting
+    public NotifyTemplateDO checkNotifyTemplateValid(String templateCode) {
+        // 获得站内信模板。考虑到效率，从缓存中获取
+        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplateByCodeFromCache(templateCode);
+        // 站内信模板不存在
+        if (template == null) {
+            throw exception(NOTIFY_TEMPLATE_NOT_EXISTS);
+        }
+        return template;
+    }
+
+    /**
+     * 将参数模板，处理成有序的 KeyValue 数组
+     *
+     * @param template       站内信模板
+     * @param templateParams 原始参数
+     * @return 处理后的参数
+     */
+    @VisibleForTesting
+    public List<KeyValue<String, Object>> buildTemplateParams(NotifyTemplateDO template, Map<String, Object> templateParams) {
+        return template.getParams().stream().map(key -> {
+            Object value = templateParams.get(key);
+            if (value == null) {
+                throw exception(NOTIFY_TEMPLATE_PARAM_MISS, key);
+            }
+            return new KeyValue<>(key, value);
+        }).collect(Collectors.toList());
+    }
+
     @Override
     public Long createNotifyMessage(NotifyMessageCreateReqVO createReqVO) {
         // 插入
@@ -75,4 +113,16 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
     public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
         return notifyMessageMapper.selectPage(pageReqVO);
     }
+
+    /**
+     * 统计用户未读站内信条数
+     *
+     * @param userId   用户ID
+     * @param userType 用户类型
+     * @return 返回未读站内信条数
+     */
+    @Override
+    public Long getUnreadNotifyMessageCount(Long userId, Integer userType) {
+        return notifyMessageMapper.selectUnreadCountByUserIdAndUserType(userId, userType);
+    }
 }

From 7d6737479c0a5266f96241641a1be6d7d85412e9 Mon Sep 17 00:00:00 2001
From: xrcoder <53924337@qq.com>
Date: Sat, 6 Aug 2022 10:53:36 +0800
Subject: [PATCH 28/67] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=B1=BB=E9=AA=8C=E8=AF=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/notify/vo/message/NotifyMessageBaseVO.java | 12 ++++++++----
 .../notify/vo/template/NotifyTemplateBaseVO.java     | 11 +++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
index b19480e715..ca77eaccb3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -21,6 +24,7 @@ public class NotifyMessageBaseVO {
 
     @ApiModelProperty(value = "用户类型", required = true)
     @NotNull(message = "用户类型不能为空")
+    @InEnum(value = UserTypeEnum.class, message = "用户类型必须是 {value}")
     private Integer userType;
 
     @ApiModelProperty(value = "标题")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
index 371239455c..bff746e14c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 
 /**
 * 站内信模版 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -26,6 +28,7 @@ public class NotifyTemplateBaseVO {
 
     @ApiModelProperty(value = "状态：1-启用 0-禁用", required = true)
     @NotNull(message = "状态：1-启用 0-禁用不能为空")
+    @InEnum(value = CommonStatusEnum.class, message = "状态必须是 {value}")
     private String status;
 
     @ApiModelProperty(value = "备注")

From 872107b319973655e11c716a2cf922348d3febb9 Mon Sep 17 00:00:00 2001
From: xrcoder <53924337@qq.com>
Date: Sat, 6 Aug 2022 11:30:12 +0800
Subject: [PATCH 29/67] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AB=99=E5=86=85?=
 =?UTF-8?q?=E4=BF=A1=E9=98=85=E8=AF=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |  1 +
 .../notify/UserNotifyMessageController.java   |  9 ++-
 .../vo/message/NotifyMessageBaseVO.java       |  2 +-
 .../vo/message/NotifyMessagePageReqVO.java    |  2 +-
 .../dataobject/notify/NotifyMessageDO.java    |  4 +-
 .../dal/mysql/notify/NotifyMessageMapper.java |  7 ++
 .../service/notify/NotifyMessageService.java  | 24 +++++++
 .../notify/NotifyMessageServiceImpl.java      | 71 +++++++++++++++++++
 8 files changed, 113 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index a126aee6e9..91dae4dfed 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -149,5 +149,6 @@ public interface ErrorCodeConstants {
 
     // ========== 站内信 1002024000 ==========
     ErrorCode NOTIFY_MESSAGE_NOT_EXISTS = new ErrorCode(1002024000, "站内信不存在");
+    ErrorCode NOTIFY_MESSAGE_ID_PARAM_ERROR = new ErrorCode(1002024001, "站内信ID错误");
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
index eaae42e81e..4104acdc1e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyM
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum;
 import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -77,7 +78,8 @@ public class UserNotifyMessageController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     public CommonResult<NotifyMessageRespVO> readNotifyMessage(@RequestParam("id") Long id) {
         NotifyMessageDO notifyMessage = notifyMessageService.getNotifyMessage(id);
-        // TODO 记录消息已读。
+        // 记录消息已读。
+        notifyMessageService.updateNotifyMessageReadStatus(id, NotifyReadStatusEnum.READ.getStatus());
         return success(NotifyMessageConvert.INSTANCE.convert(notifyMessage));
     }
 
@@ -85,13 +87,14 @@ public class UserNotifyMessageController {
     @ApiOperation("批量标记已读")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
     public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+        notifyMessageService.batchUpdateNotifyMessageReadStatus(ids, getLoginUserId());
         return success(Boolean.TRUE);
     }
 
     @GetMapping("/read/all")
     @ApiOperation("所有未读消息标记已读")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
+        notifyMessageService.batchUpdateAllNotifyMessageReadStatus(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
index ca77eaccb3..e7f7439c26 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
@@ -35,7 +35,7 @@ public class NotifyMessageBaseVO {
     private String content;
 
     @ApiModelProperty(value = "是否已读 0-未读  1-已读")
-    private Boolean readStatus;
+    private Integer readStatus;
 
     @ApiModelProperty(value = "阅读时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
index 6db082d2cc..7f24c61c0f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
@@ -18,7 +18,7 @@ public class NotifyMessagePageReqVO extends PageParam {
     private String title;
 
     @ApiModelProperty(value = "是否已读 0-未读  1-已读")
-    private Boolean readStatus;
+    private Integer readStatus;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
index c826c9d106..714ec4498a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
@@ -48,9 +48,9 @@ public class NotifyMessageDO extends BaseDO {
     /**
      * 是否已读 0-未读  1-已读
      *
-     * 枚举 {@link TODO system_notify_message_read_status 对应的类}
+     * 枚举 {@link cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum}
      */
-    private Boolean readStatus;
+    private Integer readStatus;
     /**
      * 阅读时间
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 899208b8b3..2c9137f11d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -34,4 +34,11 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType));
     }
+
+    default List<NotifyMessageDO> selectUnreadListByUserIdAndUserType(Long userId, Integer userType) {
+        return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
+                .eq(NotifyMessageDO::getReadStatus, NotifyReadStatusEnum.UNREAD.getStatus())
+                .eq(NotifyMessageDO::getUserId, userId)
+                .eq(NotifyMessageDO::getUserType, userType));
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index 847ab9a4b7..f74a394b71 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -71,4 +71,28 @@ public interface NotifyMessageService {
      * @return 返回未读站内信条数
      */
     Long getUnreadNotifyMessageCount(Long userId, Integer userType);
+
+    /**
+     * 修改站内信阅读状态
+     *
+     * @param id 站内信编号
+     * @param status 状态
+     */
+    void updateNotifyMessageReadStatus(Long id, Integer status);
+
+    /**
+     * 批量修改站内信阅读状态
+     *
+     * @param ids 站内信编号集合
+     * @param userId 用户ID
+     */
+    void batchUpdateNotifyMessageReadStatus(Collection<Long> ids, Long userId);
+
+    /**
+     * 批量修改用户所有未读消息标记已读
+     *
+     * @param userId 用户ID
+     * @param userType 用户类型
+     */
+    void batchUpdateAllNotifyMessageReadStatus(Long userId, Integer userType);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index c37ada4fd5..4c385ee485 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
@@ -9,6 +12,7 @@ import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum;
 import com.google.common.annotations.VisibleForTesting;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -125,4 +129,71 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
     public Long getUnreadNotifyMessageCount(Long userId, Integer userType) {
         return notifyMessageMapper.selectUnreadCountByUserIdAndUserType(userId, userType);
     }
+
+    /**
+     * 修改站内信阅读状态
+     *
+     * @param id     站内信编号
+     * @param status 状态
+     */
+    @Override
+    public void updateNotifyMessageReadStatus(Long id, Integer status) {
+        // 校验消息是否存在
+        this.validateNotifyMessageExists(id);
+        // 更新状态
+        batchUpdateReadStatus(CollectionUtils.singleton(id));
+    }
+
+    /**
+     * 批量修改站内信阅读状态
+     *
+     * @param ids    站内信编号集合
+     * @param userId 用户ID
+     */
+    @Override
+    public void batchUpdateNotifyMessageReadStatus(Collection<Long> ids, Long userId) {
+        List<NotifyMessageDO> list = getNotifyMessageList(ids);
+        if (CollUtil.isEmpty(list)) {
+            throw exception(NOTIFY_MESSAGE_NOT_EXISTS);
+        }
+        // 验证站内信是否是属于用户
+        for (NotifyMessageDO messageDO : list) {
+            checkNotifyMessageIdValid(messageDO, userId);
+        }
+        batchUpdateReadStatus(ids);
+    }
+
+    @VisibleForTesting
+    public void checkNotifyMessageIdValid(NotifyMessageDO notifyMessageDO, Long userId) {
+        if (!NumberUtil.equals(notifyMessageDO.getUserId(), userId)) {
+            throw exception(NOTIFY_MESSAGE_ID_PARAM_ERROR);
+        }
+    }
+
+    /**
+     * 批量修改用户所有未读消息标记已读
+     *
+     * @param userId   用户ID
+     * @param userType 用户类型
+     */
+    @Override
+    public void batchUpdateAllNotifyMessageReadStatus(Long userId, Integer userType) {
+        List<NotifyMessageDO> list = notifyMessageMapper.selectUnreadListByUserIdAndUserType(userId, userType);
+        if (CollUtil.isNotEmpty(list)) {
+            batchUpdateReadStatus(CollectionUtils.convertList(list, NotifyMessageDO::getId));
+
+        }
+    }
+
+    private void batchUpdateReadStatus(Collection<Long> ids) {
+        if (CollUtil.isNotEmpty(ids)) {
+            for (Long id : ids) {
+                NotifyMessageDO updateObj = new NotifyMessageDO();
+                updateObj.setId(id);
+                updateObj.setReadStatus(NotifyReadStatusEnum.READ.getStatus());
+                notifyMessageMapper.updateById(updateObj);
+            }
+        }
+
+    }
 }

From 131adad9c070e650fea9e644f1cca391987152e0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Nov 2022 11:52:55 +0800
Subject: [PATCH 30/67] =?UTF-8?q?review=20=E9=83=A8=E5=88=86=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E4=BF=A1=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enums/notify/NotifyReadStatusEnum.java    | 22 -------------------
 .../notify/UserNotifyMessageController.java   |  6 +----
 .../dataobject/notify/NotifyMessageDO.java    | 22 +++++++++++++------
 .../dataobject/notify/NotifyTemplateDO.java   | 12 +++-------
 4 files changed, 19 insertions(+), 43 deletions(-)
 delete mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java
deleted file mode 100644
index f0af060daa..0000000000
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notify/NotifyReadStatusEnum.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.system.enums.notify;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 站内信阅读状态枚举类
- *
- * @author xrcoder
- */
-@Getter
-@AllArgsConstructor
-public enum NotifyReadStatusEnum {
-
-    UNREAD(0),
-    READ(1);
-
-    /**
-     * 类型
-     */
-    private final Integer status;
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
index 4104acdc1e..430c3ade83 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
@@ -28,11 +28,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
-/**
- * 管理后台 - 站内信-消息中心
- *
- * @author xrcoder
- */
+// TODO 芋艿：合并到 合并到 NotifyTemplateController 中
 @Api(tags = "管理后台 - 站内信-消息中心")
 @RestController
 @RequestMapping("/system/user/notify-message")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
index 714ec4498a..5a923998ac 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
@@ -1,9 +1,13 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.notify;
 
-import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.util.Date;
 
 /**
  * 站内信 DO
@@ -27,14 +31,20 @@ public class NotifyMessageDO extends BaseDO {
     private Long id;
     /**
      * 站内信模版编号
+     *
+     * 关联 {@link NotifyTemplateDO#getId()}
      */
     private Long templateId;
     /**
      * 用户编号
+     *
+     * 关联 MemberUserDO 的 id 字段、或者 AdminUserDO 的 id 字段
      */
     private Long userId;
     /**
      * 用户类型
+     *
+     * 枚举 {@link UserTypeEnum}
      */
     private Integer userType;
     /**
@@ -46,11 +56,9 @@ public class NotifyMessageDO extends BaseDO {
      */
     private String content;
     /**
-     * 是否已读 0-未读  1-已读
-     *
-     * 枚举 {@link cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum}
+     * 是否已读
      */
-    private Integer readStatus;
+    private Boolean readStatus;
     /**
      * 阅读时间
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
index 2066f0b239..ab8b128eaf 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
@@ -31,38 +31,32 @@ public class NotifyTemplateDO extends BaseDO {
      */
     @TableId
     private Long id;
-
     /**
      * 模版编码
      */
     private String code;
-
     /**
      * 模版标题
      */
     private String title;
-
     /**
      * 模版内容
      */
     private String content;
-
     /**
      * 参数数组
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> params;
-
     /**
-     * 状态：1-启用 0-禁用
-     * <p>
+     * 状态
+     *
      * 枚举 {@link CommonStatusEnum}
      */
     private String status;
-
     /**
      * 备注
      */
-    private String remarks;
+    private String remark;
 
 }

From e8dd66c6f848963e4b4329e14ecac3c80a18d844 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Nov 2022 13:01:16 +0800
Subject: [PATCH 31/67] =?UTF-8?q?review=20=E9=83=A8=E5=88=86=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E4=BF=A1=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/notify/NotifyMessageController.java | 27 +------------------
 .../notify/NotifyTemplateController.java      | 15 ++++-------
 .../notify/UserNotifyMessageController.java   |  8 +++++-
 .../vo/message/NotifyMessageCreateReqVO.java  | 15 -----------
 .../vo/message/NotifyMessagePageReqVO.java    | 13 ++++++---
 .../vo/message/NotifyMessageUpdateReqVO.java  | 20 --------------
 .../service/notify/NotifyMessageService.java  | 25 -----------------
 .../notify/NotifyMessageServiceImpl.java      | 27 +------------------
 .../service/notify/NotifyTemplateService.java | 12 +++++----
 .../notify/NotifyTemplateServiceImpl.java     |  1 -
 10 files changed, 30 insertions(+), 133 deletions(-)
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
index 0f52903772..7c65e49612 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
@@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.system.controller.admin.notify;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
@@ -30,30 +28,6 @@ public class NotifyMessageController {
     @Resource
     private NotifyMessageService notifyMessageService;
 
-    @PostMapping("/create")
-    @ApiOperation("创建站内信")
-    @PreAuthorize("@ss.hasPermission('system:notify-message:create')")
-    public CommonResult<Long> createNotifyMessage(@Valid @RequestBody NotifyMessageCreateReqVO createReqVO) {
-        return success(notifyMessageService.createNotifyMessage(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新站内信")
-    @PreAuthorize("@ss.hasPermission('system:notify-message:update')")
-    public CommonResult<Boolean> updateNotifyMessage(@Valid @RequestBody NotifyMessageUpdateReqVO updateReqVO) {
-        notifyMessageService.updateNotifyMessage(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除站内信")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('system:notify-message:delete')")
-    public CommonResult<Boolean> deleteNotifyMessage(@RequestParam("id") Long id) {
-        notifyMessageService.deleteNotifyMessage(id);
-        return success(true);
-    }
-
     @GetMapping("/get")
     @ApiOperation("获得站内信")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@@ -70,4 +44,5 @@ public class NotifyMessageController {
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
index fe7f8a1a25..2be58771d6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
@@ -19,12 +19,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
+// TODO 芋艿：VO 类上的 swagger 注解完善下，例如说 swagger，枚举等等
 @Api(tags = "管理后台 - 站内信模版")
 @RestController
 @RequestMapping("/system/notify-template")
@@ -67,15 +67,6 @@ public class NotifyTemplateController {
         return success(NotifyTemplateConvert.INSTANCE.convert(notifyTemplate));
     }
 
-    @GetMapping("/list")
-    @ApiOperation("获得站内信模版列表")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
-    public CommonResult<List<NotifyTemplateRespVO>> getNotifyTemplateList(@RequestParam("ids") Collection<Long> ids) {
-        List<NotifyTemplateDO> list = notifyTemplateService.getNotifyTemplateList(ids);
-        return success(NotifyTemplateConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @ApiOperation("获得站内信模版分页")
     @PreAuthorize("@ss.hasPermission('system:notify-template:query')")
@@ -96,4 +87,8 @@ public class NotifyTemplateController {
         ExcelUtils.write(response, "站内信模版.xls", "数据", NotifyTemplateExcelVO.class, datas);
     }
 
+    // TODO @芋艿：参考 SmsTemplateController 的 sendNotify 写一个发送站内信的接口
+
+    // TODO @芋艿：参考 SmsSendServiceImpl，新建一个 NotifySendServiceImpl，用于提供出来给发送消息。注意，不要考虑异步发送，直接 insert 就可以了。也不用考虑发送后的回调
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
index 430c3ade83..04bd09160e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
@@ -38,7 +38,7 @@ public class UserNotifyMessageController {
     @Resource
     private NotifyMessageService notifyMessageService;
 
-
+    // TODO 芋艿：和 NotifyMessageController 的 page 合并
     @GetMapping("/page")
     @ApiOperation("获得站内信分页")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
@@ -48,6 +48,7 @@ public class UserNotifyMessageController {
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
 
+    // TODO @芋艿：url 改成 get-recent-list；方法名也改下。默认传入 size = 10；
     @GetMapping("/latest/list")
     @ApiOperation("获得最新10站内信列表")
     public CommonResult<List<NotifyMessageRespVO>> getNotifyLatestMessageList() {
@@ -56,6 +57,7 @@ public class UserNotifyMessageController {
         reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
         reqVO.setPageNo(1);
         reqVO.setPageSize(10);
+        // TODO 芋艿：不要用分页写；
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(reqVO);
         if (CollUtil.isNotEmpty(pageResult.getList())) {
             return success(NotifyMessageConvert.INSTANCE.convertList(pageResult.getList()));
@@ -63,12 +65,14 @@ public class UserNotifyMessageController {
         return success(Collections.emptyList());
     }
 
+    // TODO @芋艿：get-unread-count
     @GetMapping("/unread/count")
     @ApiOperation("获得未读站内信数量")
     public CommonResult<Long> getUnreadNotifyMessageCount() {
         return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
     }
 
+    // TODO @芋艿：把 get 站内信，和更新站内信已经读分开。其中更新单条和多条，使用一个接口就好列
     @GetMapping("/read")
     @ApiOperation("获得站内信")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@@ -79,6 +83,7 @@ public class UserNotifyMessageController {
         return success(NotifyMessageConvert.INSTANCE.convert(notifyMessage));
     }
 
+    // TODO @芋艿：PutMapping；update-list-read
     @GetMapping("/read/list")
     @ApiOperation("批量标记已读")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
@@ -87,6 +92,7 @@ public class UserNotifyMessageController {
         return success(Boolean.TRUE);
     }
 
+    // TODO @芋艿：PutMapping：update-all-read
     @GetMapping("/read/all")
     @ApiOperation("所有未读消息标记已读")
     public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java
deleted file mode 100644
index 61a0e56669..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageCreateReqVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
-
-import lombok.*;
-import io.swagger.annotations.*;
-
-@ApiModel("管理后台 - 站内信创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class NotifyMessageCreateReqVO extends NotifyMessageBaseVO {
-
-    @ApiModelProperty(value = "站内信模版编号")
-    private Long templateId;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
index 7f24c61c0f..443f3729a7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
@@ -1,11 +1,15 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("管理后台 - 站内信分页 Request VO")
@@ -18,12 +22,13 @@ public class NotifyMessagePageReqVO extends PageParam {
     private String title;
 
     @ApiModelProperty(value = "是否已读 0-未读  1-已读")
-    private Integer readStatus;
+    private Boolean readStatus;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date[] createTime;
 
+    // TODO 芋艿：去掉 userId 和 userType，不要在 VO 里
 
     @ApiModelProperty(value = "用户编号", hidden = true)
     private Long userId;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java
deleted file mode 100644
index 3576cca9f3..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageUpdateReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
-
-import lombok.*;
-import io.swagger.annotations.*;
-import javax.validation.constraints.*;
-
-@ApiModel("管理后台 - 站内信更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class NotifyMessageUpdateReqVO extends NotifyMessageBaseVO {
-
-    @ApiModelProperty(value = "ID", required = true)
-    @NotNull(message = "ID不能为空")
-    private Long id;
-
-    @ApiModelProperty(value = "站内信模版编号")
-    private Long templateId;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index f74a394b71..e6057bef03 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -1,12 +1,9 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 
-import javax.validation.Valid;
 import java.util.Collection;
 import java.util.List;
 
@@ -17,28 +14,6 @@ import java.util.List;
  */
 public interface NotifyMessageService {
 
-    /**
-     * 创建站内信
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createNotifyMessage(@Valid NotifyMessageCreateReqVO createReqVO);
-
-    /**
-     * 更新站内信
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateNotifyMessage(@Valid NotifyMessageUpdateReqVO updateReqVO);
-
-    /**
-     * 删除站内信
-     *
-     * @param id 编号
-     */
-    void deleteNotifyMessage(Long id);
-
     /**
      * 获得站内信
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index 4c385ee485..8150ee4533 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -71,32 +71,6 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         }).collect(Collectors.toList());
     }
 
-    @Override
-    public Long createNotifyMessage(NotifyMessageCreateReqVO createReqVO) {
-        // 插入
-        NotifyMessageDO notifyMessage = NotifyMessageConvert.INSTANCE.convert(createReqVO);
-        notifyMessageMapper.insert(notifyMessage);
-        // 返回
-        return notifyMessage.getId();
-    }
-
-    @Override
-    public void updateNotifyMessage(NotifyMessageUpdateReqVO updateReqVO) {
-        // 校验存在
-        this.validateNotifyMessageExists(updateReqVO.getId());
-        // 更新
-        NotifyMessageDO updateObj = NotifyMessageConvert.INSTANCE.convert(updateReqVO);
-        notifyMessageMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteNotifyMessage(Long id) {
-        // 校验存在
-        this.validateNotifyMessageExists(id);
-        // 删除
-        notifyMessageMapper.deleteById(id);
-    }
-
     private void validateNotifyMessageExists(Long id) {
         if (notifyMessageMapper.selectById(id) == null) {
             throw exception(NOTIFY_MESSAGE_NOT_EXISTS);
@@ -185,6 +159,7 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         }
     }
 
+    // TODO 芋艿：批量更新，不要单条遍历哈。
     private void batchUpdateReadStatus(Collection<Long> ids) {
         if (CollUtil.isNotEmpty(ids)) {
             for (Long id : ids) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
index f7a9318a11..cb2a5576c7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
@@ -1,21 +1,23 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
-import java.util.*;
-import javax.validation.*;
-
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 站内信模版 Service 接口
  *
  * @author xrcoder
  */
+// TODO 芋艿：缺少单测，可以参考 SmsTemplateServiceTest 写下
 public interface NotifyTemplateService {
 
     /**
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
index 65b71d92ea..1342fe03b0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
@@ -114,7 +114,6 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         initLocalCache();
     }
 
-
     /**
      * 获得站内信模板，从缓存中
      *

From f77522980f9898594e54ac115e4b3fc903c837c4 Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Wed, 23 Nov 2022 12:26:51 +0800
Subject: [PATCH 32/67] =?UTF-8?q?fix(=E7=AB=99=E5=86=85=E4=BF=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4):=20=E6=8E=A5=E5=8F=A3fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/notify/NotifyMessageController.java |  45 ++++++++
 .../notify/NotifyTemplateController.java      |  16 ++-
 .../notify/UserNotifyMessageController.java   | 102 ------------------
 .../vo/message/NotifyMessageBaseVO.java       |   4 +-
 .../vo/template/NotifyTemplateBaseVO.java     |   2 +-
 .../vo/template/NotifyTemplateExcelVO.java    |   5 +-
 .../template/NotifyTemplateExportReqVO.java   |   2 +-
 .../vo/template/NotifyTemplateSendReqVO.java  |  24 +++++
 .../convert/notify/NotifyMessageConvert.java  |   6 --
 .../dataobject/notify/NotifyTemplateDO.java   |   2 +-
 .../dal/mysql/notify/NotifyMessageMapper.java |  16 ++-
 .../service/notify/NotifyMessageService.java  |  10 +-
 .../notify/NotifyMessageServiceImpl.java      |  26 ++---
 .../service/notify/NotifySendService.java     |  51 +++++++++
 .../service/notify/NotifySendServiceImpl.java |  77 +++++++++++++
 15 files changed, 248 insertions(+), 140 deletions(-)
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
index 7c65e49612..7e14b86c7c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
@@ -17,7 +19,12 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Api(tags = "管理后台 - 站内信")
 @RestController
@@ -41,8 +48,46 @@ public class NotifyMessageController {
     @ApiOperation("获得站内信分页")
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
+        pageVO.setUserId(getLoginUserId());
+        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @GetMapping("/get-recent-list")
+    @ApiOperation("获取当前用户最新站内信，默认10条")
+    @ApiImplicitParam(name = "size", value = "10", defaultValue = "10", dataTypeClass = Integer.class)
+    public CommonResult<List<NotifyMessageRespVO>> getRecentList(@RequestParam(name = "size", defaultValue = "10") Integer size) {
+        NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
+        reqVO.setUserId(getLoginUserId());
+        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+
+        List<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessageList(reqVO, size);
+        if (CollUtil.isNotEmpty(pageResult)) {
+            return success(NotifyMessageConvert.INSTANCE.convertList(pageResult));
+        }
+        return success(Collections.emptyList());
+    }
+
+    @GetMapping("/get-unread-count")
+    @ApiOperation("获得未读站内信数量")
+    public CommonResult<Long> getUnreadCount() {
+        return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
+    }
+
+    @GetMapping("/update-list-read")
+    @ApiOperation("批量标记已读")
+    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
+    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+        notifyMessageService.batchUpdateNotifyMessageReadStatus(ids, getLoginUserId());
+        return success(Boolean.TRUE);
+    }
+
+    @GetMapping("/update-all-read")
+    @ApiOperation("所有未读消息标记已读")
+    public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
+        notifyMessageService.batchUpdateAllNotifyMessageReadStatus(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
+        return success(Boolean.TRUE);
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
index 2be58771d6..aa57a795ea 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.*;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifySendService;
 import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -24,7 +25,6 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
-// TODO 芋艿：VO 类上的 swagger 注解完善下，例如说 swagger，枚举等等
 @Api(tags = "管理后台 - 站内信模版")
 @RestController
 @RequestMapping("/system/notify-template")
@@ -34,6 +34,10 @@ public class NotifyTemplateController {
     @Resource
     private NotifyTemplateService notifyTemplateService;
 
+    @Resource
+    private NotifySendService notifySendService;
+
+
     @PostMapping("/create")
     @ApiOperation("创建站内信模版")
     @PreAuthorize("@ss.hasPermission('system:notify-template:create')")
@@ -87,8 +91,10 @@ public class NotifyTemplateController {
         ExcelUtils.write(response, "站内信模版.xls", "数据", NotifyTemplateExcelVO.class, datas);
     }
 
-    // TODO @芋艿：参考 SmsTemplateController 的 sendNotify 写一个发送站内信的接口
-
-    // TODO @芋艿：参考 SmsSendServiceImpl，新建一个 NotifySendServiceImpl，用于提供出来给发送消息。注意，不要考虑异步发送，直接 insert 就可以了。也不用考虑发送后的回调
-
+    @PostMapping("/send-notify")
+    @ApiOperation("发送站内信")
+    public CommonResult<Long> sendNotify(@Valid @RequestBody NotifyTemplateSendReqVO sendReqVO) {
+        return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),
+                sendReqVO.getTemplateId(), sendReqVO.getTemplateParams()));
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
deleted file mode 100644
index 04bd09160e..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/UserNotifyMessageController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
-import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-import cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum;
-import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-// TODO 芋艿：合并到 合并到 NotifyTemplateController 中
-@Api(tags = "管理后台 - 站内信-消息中心")
-@RestController
-@RequestMapping("/system/user/notify-message")
-@Validated
-public class UserNotifyMessageController {
-
-    @Resource
-    private NotifyMessageService notifyMessageService;
-
-    // TODO 芋艿：和 NotifyMessageController 的 page 合并
-    @GetMapping("/page")
-    @ApiOperation("获得站内信分页")
-    public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
-        pageVO.setUserId(getLoginUserId());
-        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
-        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
-        return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    // TODO @芋艿：url 改成 get-recent-list；方法名也改下。默认传入 size = 10；
-    @GetMapping("/latest/list")
-    @ApiOperation("获得最新10站内信列表")
-    public CommonResult<List<NotifyMessageRespVO>> getNotifyLatestMessageList() {
-        NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
-        reqVO.setUserId(getLoginUserId());
-        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-        reqVO.setPageNo(1);
-        reqVO.setPageSize(10);
-        // TODO 芋艿：不要用分页写；
-        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(reqVO);
-        if (CollUtil.isNotEmpty(pageResult.getList())) {
-            return success(NotifyMessageConvert.INSTANCE.convertList(pageResult.getList()));
-        }
-        return success(Collections.emptyList());
-    }
-
-    // TODO @芋艿：get-unread-count
-    @GetMapping("/unread/count")
-    @ApiOperation("获得未读站内信数量")
-    public CommonResult<Long> getUnreadNotifyMessageCount() {
-        return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
-    }
-
-    // TODO @芋艿：把 get 站内信，和更新站内信已经读分开。其中更新单条和多条，使用一个接口就好列
-    @GetMapping("/read")
-    @ApiOperation("获得站内信")
-    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    public CommonResult<NotifyMessageRespVO> readNotifyMessage(@RequestParam("id") Long id) {
-        NotifyMessageDO notifyMessage = notifyMessageService.getNotifyMessage(id);
-        // 记录消息已读。
-        notifyMessageService.updateNotifyMessageReadStatus(id, NotifyReadStatusEnum.READ.getStatus());
-        return success(NotifyMessageConvert.INSTANCE.convert(notifyMessage));
-    }
-
-    // TODO @芋艿：PutMapping；update-list-read
-    @GetMapping("/read/list")
-    @ApiOperation("批量标记已读")
-    @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
-        notifyMessageService.batchUpdateNotifyMessageReadStatus(ids, getLoginUserId());
-        return success(Boolean.TRUE);
-    }
-
-    // TODO @芋艿：PutMapping：update-all-read
-    @GetMapping("/read/all")
-    @ApiOperation("所有未读消息标记已读")
-    public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
-        notifyMessageService.batchUpdateAllNotifyMessageReadStatus(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
-        return success(Boolean.TRUE);
-    }
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
index e7f7439c26..62d8a31130 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
@@ -34,8 +34,8 @@ public class NotifyMessageBaseVO {
     @NotNull(message = "内容不能为空")
     private String content;
 
-    @ApiModelProperty(value = "是否已读 0-未读  1-已读")
-    private Integer readStatus;
+    @ApiModelProperty(value = "是否已读 false-未读  true-已读")
+    private Boolean readStatus;
 
     @ApiModelProperty(value = "阅读时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
index bff746e14c..84aa4b6865 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
@@ -29,7 +29,7 @@ public class NotifyTemplateBaseVO {
     @ApiModelProperty(value = "状态：1-启用 0-禁用", required = true)
     @NotNull(message = "状态：1-启用 0-禁用不能为空")
     @InEnum(value = CommonStatusEnum.class, message = "状态必须是 {value}")
-    private String status;
+    private Integer status;
 
     @ApiModelProperty(value = "备注")
     private String remarks;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
index e0402da8ce..6790f1858a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -30,8 +31,8 @@ public class NotifyTemplateExcelVO {
     private String content;
 
     @ExcelProperty(value = "状态：1-启用 0-禁用", converter = DictConvert.class)
-    @DictFormat("common_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private String status;
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
+    private Integer status;
 
     @ExcelProperty("备注")
     private String remarks;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
index a9f8877e22..b3a9979336 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
@@ -19,7 +19,7 @@ public class NotifyTemplateExportReqVO {
     private String title;
 
     @ApiModelProperty(value = "状态：1-启用 0-禁用")
-    private String status;
+    private Integer status;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
new file mode 100644
index 0000000000..abfcb2b369
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@ApiModel("管理后台 - 站内信模板的发送 Request VO")
+@Data
+public class NotifyTemplateSendReqVO {
+
+    @ApiModelProperty(value = "用户id", required = true, example = "01")
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    @ApiModelProperty(value = "模板Id", required = true, example = "01")
+    @NotNull(message = "模板Id不能为空")
+    private Long templateId;
+
+    @ApiModelProperty(value = "模板参数")
+    private Map<String, Object> templateParams;
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
index b5bce25d43..a111827fe9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
@@ -4,9 +4,7 @@ import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
@@ -21,10 +19,6 @@ public interface NotifyMessageConvert {
 
     NotifyMessageConvert INSTANCE = Mappers.getMapper(NotifyMessageConvert.class);
 
-    NotifyMessageDO convert(NotifyMessageCreateReqVO bean);
-
-    NotifyMessageDO convert(NotifyMessageUpdateReqVO bean);
-
     NotifyMessageRespVO convert(NotifyMessageDO bean);
 
     List<NotifyMessageRespVO> convertList(List<NotifyMessageDO> list);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
index ab8b128eaf..28fa834067 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
@@ -53,7 +53,7 @@ public class NotifyTemplateDO extends BaseDO {
      *
      * 枚举 {@link CommonStatusEnum}
      */
-    private String status;
+    private Integer status;
     /**
      * 备注
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 2c9137f11d..9523264d10 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-import cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -28,16 +27,27 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
                 .orderByDesc(NotifyMessageDO::getId));
     }
 
+    default List<NotifyMessageDO> selectList(NotifyMessagePageReqVO reqVO, Integer size) {
+        return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
+                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
+                .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
+                .orderByDesc(NotifyMessageDO::getId)
+                .last("limit " + size));
+    }
+
     default Long selectUnreadCountByUserIdAndUserType(Long userId, Integer userType) {
         return selectCount(new LambdaQueryWrapperX<NotifyMessageDO>()
-                .eq(NotifyMessageDO::getReadStatus, NotifyReadStatusEnum.UNREAD.getStatus())
+                .eq(NotifyMessageDO::getReadStatus, false)
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType));
     }
 
     default List<NotifyMessageDO> selectUnreadListByUserIdAndUserType(Long userId, Integer userType) {
         return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
-                .eq(NotifyMessageDO::getReadStatus, NotifyReadStatusEnum.UNREAD.getStatus())
+                .eq(NotifyMessageDO::getReadStatus, false)
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType));
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index e6057bef03..10f3975059 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -30,6 +30,14 @@ public interface NotifyMessageService {
      */
     List<NotifyMessageDO> getNotifyMessageList(Collection<Long> ids);
 
+    /**
+     * 获得站内信集合
+     *
+     * @param pageReqVO 分页查询
+     * @return 站内信分页
+     */
+    List<NotifyMessageDO> getNotifyMessageList(NotifyMessagePageReqVO pageReqVO, Integer size);
+
     /**
      * 获得站内信分页
      *
@@ -53,7 +61,7 @@ public interface NotifyMessageService {
      * @param id 站内信编号
      * @param status 状态
      */
-    void updateNotifyMessageReadStatus(Long id, Integer status);
+    void updateNotifyMessageReadStatus(Long id, Boolean status);
 
     /**
      * 批量修改站内信阅读状态
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index 8150ee4533..0597fd6898 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -5,14 +5,11 @@ import cn.hutool.core.util.NumberUtil;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageCreateReqVO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageUpdateReqVO;
-import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
-import cn.iocoder.yudao.module.system.enums.notify.NotifyReadStatusEnum;
 import com.google.common.annotations.VisibleForTesting;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -87,6 +84,11 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         return notifyMessageMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<NotifyMessageDO> getNotifyMessageList(NotifyMessagePageReqVO pageReqVO, Integer size) {
+        return notifyMessageMapper.selectList(pageReqVO, size);
+    }
+
     @Override
     public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
         return notifyMessageMapper.selectPage(pageReqVO);
@@ -111,7 +113,7 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
      * @param status 状态
      */
     @Override
-    public void updateNotifyMessageReadStatus(Long id, Integer status) {
+    public void updateNotifyMessageReadStatus(Long id, Boolean status) {
         // 校验消息是否存在
         this.validateNotifyMessageExists(id);
         // 更新状态
@@ -155,20 +157,12 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         List<NotifyMessageDO> list = notifyMessageMapper.selectUnreadListByUserIdAndUserType(userId, userType);
         if (CollUtil.isNotEmpty(list)) {
             batchUpdateReadStatus(CollectionUtils.convertList(list, NotifyMessageDO::getId));
-
         }
     }
 
-    // TODO 芋艿：批量更新，不要单条遍历哈。
     private void batchUpdateReadStatus(Collection<Long> ids) {
-        if (CollUtil.isNotEmpty(ids)) {
-            for (Long id : ids) {
-                NotifyMessageDO updateObj = new NotifyMessageDO();
-                updateObj.setId(id);
-                updateObj.setReadStatus(NotifyReadStatusEnum.READ.getStatus());
-                notifyMessageMapper.updateById(updateObj);
-            }
-        }
-
+        NotifyMessageDO updateObj = new NotifyMessageDO();
+        updateObj.setReadStatus(false);
+        notifyMessageMapper.update(updateObj, new LambdaQueryWrapperX<NotifyMessageDO>().in(NotifyMessageDO::getId, ids));
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
new file mode 100644
index 0000000000..bbf8c2dc51
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import java.util.List;
+import java.util.Map;
+
+public interface NotifySendService {
+
+
+    /**
+     * 发送单条站内信给管理后台的用户
+     *
+     * 在 mobile 为空时，使用 userId 加载对应管理员的手机号
+     *
+     * @param userId 用户编号
+     * @param templateId 短信模板编号
+     * @param templateParams 短信模板参数
+     * @return 发送日志编号
+     */
+    Long sendSingleNotifyToAdmin(Long userId,
+                                 Long templateId, Map<String, Object> templateParams);
+    /**
+     * 发送单条站内信给用户 APP 的用户
+     *
+     * 在 mobile 为空时，使用 userId 加载对应会员的手机号
+     *
+     * @param userId 用户编号
+     * @param templateId 站内信模板编号
+     * @param templateParams 站内信模板参数
+     * @return 发送日志编号
+     */
+    Long sendSingleNotifyToMember(Long userId,
+                                  Long templateId, Map<String, Object> templateParams);
+
+    /**
+     * 发送单条站内信给用户
+     *
+     * @param userId 用户编号
+     * @param userType 用户类型
+     * @param templateId 站内信模板编号
+     * @param templateParams 站内信模板参数
+     * @return 发送日志编号
+     */
+    Long sendSingleNotify( Long userId, Integer userType,
+                           Long templateId, Map<String, Object> templateParams);
+
+    default void sendBatchNotify(List<String> mobiles, List<Long> userIds, Integer userType,
+                              String templateCode, Map<String, Object> templateParams) {
+        throw new UnsupportedOperationException("暂时不支持该操作，感兴趣可以实现该功能哟！");
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
new file mode 100644
index 0000000000..63237e79b6
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND;
+
+/**
+ * 站内信发送 Service 实现类
+ *
+ * @author xrcoder
+ */
+@Service
+@Validated
+@Slf4j
+public class NotifySendServiceImpl implements NotifySendService {
+
+    @Resource
+    private NotifyTemplateService notifyTemplateService;
+
+    @Resource
+    private NotifyMessageMapper notifyMessageMapper;
+
+    @Override
+    public Long sendSingleNotifyToAdmin(Long userId, Long templateId, Map<String, Object> templateParams) {
+
+        return sendSingleNotify(userId, UserTypeEnum.ADMIN.getValue(), templateId, templateParams);
+    }
+
+    @Override
+    public Long sendSingleNotifyToMember(Long userId, Long templateId, Map<String, Object> templateParams) {
+        return sendSingleNotify(userId, UserTypeEnum.MEMBER.getValue(), templateId, templateParams);
+    }
+
+    @Override
+    public Long sendSingleNotify(Long userId, Integer userType, Long templateId, Map<String, Object> templateParams) {
+        // 校验短信模板是否合法
+        NotifyTemplateDO template = this.checkNotifyTemplateValid(templateId);
+        String content = notifyTemplateService.formatNotifyTemplateContent(template.getContent(), templateParams);
+
+        // todo 模板状态未开启时的业务
+        NotifyMessageDO notifyMessageDO = new NotifyMessageDO();
+        notifyMessageDO.setContent(content);
+        notifyMessageDO.setTitle(template.getTitle());
+        notifyMessageDO.setReadStatus(false);
+        notifyMessageDO.setReadTime(new Date());
+        notifyMessageDO.setTemplateId(templateId);
+        notifyMessageDO.setUserId(userId);
+        notifyMessageDO.setUserType(userType);
+        notifyMessageMapper.insert(notifyMessageDO);
+        return notifyMessageDO.getId();
+    }
+
+    // 此注解的含义
+    @VisibleForTesting
+    public NotifyTemplateDO checkNotifyTemplateValid(Long templateId) {
+        // 获得短信模板。考虑到效率，从缓存中获取
+        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplate(templateId);
+        // 短信模板不存在
+        if (template == null) {
+            throw exception(NOTICE_NOT_FOUND);
+        }
+        return template;
+    }
+
+}

From 826a564abd022c973190391d5729b1766100579f Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Sat, 17 Dec 2022 16:41:14 +0800
Subject: [PATCH 33/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/notify/NotifyLogController.java     |  54 +++
 .../admin/notify/NotifyMessageController.java |  16 +-
 .../notify/NotifyTemplateController.java      |   2 +-
 .../admin/notify/vo/log/NotifyLogBaseVO.java  |  44 +++
 .../notify/vo/log/NotifyLogPageReqVO.java     |  30 ++
 .../vo/message/NotifyMessageBaseVO.java       |  28 +-
 .../vo/message/NotifyMessagePageReqVO.java    |   7 -
 .../vo/message/NotifyMessageRespVO.java       |   3 -
 .../vo/template/NotifyTemplateSendReqVO.java  |   6 +-
 .../convert/notify/NotifyLogConvert.java      |  23 ++
 .../convert/notify/NotifyMessageConvert.java  |   8 +-
 .../dataobject/notify/NotifyMessageDO.java    |  18 +
 .../dal/mysql/notify/NotifyMessageMapper.java |  22 +-
 .../service/notify/NotifyLogService.java      |  24 ++
 .../service/notify/NotifyLogServiceImpl.java  |  35 ++
 .../service/notify/NotifyMessageService.java  |   9 +-
 .../notify/NotifyMessageServiceImpl.java      |  15 +-
 .../service/notify/NotifySendService.java     |  12 +-
 .../service/notify/NotifySendServiceImpl.java |  32 +-
 .../notify/NotifyTemplateServiceImpl.java     |   2 +-
 .../src/api/system/notify/myNotify.js         |  38 ++
 .../src/api/system/notify/notifyLog.js        |  11 +
 .../src/api/system/notify/notifyTemplate.js   |  64 ++++
 yudao-ui-admin/src/utils/dict.js              |   1 +
 .../src/views/system/notify/myNotify.vue      | 143 ++++++++
 .../src/views/system/notify/notifyLog.vue     | 120 +++++++
 .../views/system/notify/notifyTemplate.vue    | 339 ++++++++++++++++++
 27 files changed, 1029 insertions(+), 77 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java
 create mode 100644 yudao-ui-admin/src/api/system/notify/myNotify.js
 create mode 100644 yudao-ui-admin/src/api/system/notify/notifyLog.js
 create mode 100644 yudao-ui-admin/src/api/system/notify/notifyTemplate.js
 create mode 100644 yudao-ui-admin/src/views/system/notify/myNotify.vue
 create mode 100644 yudao-ui-admin/src/views/system/notify/notifyLog.vue
 create mode 100644 yudao-ui-admin/src/views/system/notify/notifyTemplate.vue

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java
new file mode 100644
index 0000000000..84152df7d3
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyLogConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyLogService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@Api(tags = "管理后台 - 站内信发送日志")
+@RestController
+@RequestMapping("/system/notify-log")
+@Validated
+public class NotifyLogController {
+
+    @Resource
+    private NotifyLogService notifyLogService;
+
+    @Resource
+    private AdminUserService userService;
+
+    @GetMapping("/page")
+    @ApiOperation("获得发送站内信日志分页")
+    public CommonResult<PageResult<NotifyLogBaseVO>> getNotifyLogPage(@Valid NotifyLogPageReqVO pageVO) {
+        PageResult<NotifyMessageDO> pageResult = notifyLogService.getNotifyMessageSendPage(pageVO);
+        PageResult<NotifyLogBaseVO> result = NotifyLogConvert.INSTANCE.convertPage(pageResult);
+        result.getList().forEach(v -> {
+            v.setReceiveUserName(userService.getUser(v.getUserId()).getNickname());
+        });
+        return success(result);
+    }
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
index 7e14b86c7c..67b0d5d587 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
@@ -18,15 +18,13 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
-@Api(tags = "管理后台 - 站内信")
+@Api(tags = "管理后台 - 我的站内信")
 @RestController
 @RequestMapping("/system/notify-message")
 @Validated
@@ -48,8 +46,6 @@ public class NotifyMessageController {
     @ApiOperation("获得站内信分页")
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
-        pageVO.setUserId(getLoginUserId());
-        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
@@ -59,9 +55,6 @@ public class NotifyMessageController {
     @ApiImplicitParam(name = "size", value = "10", defaultValue = "10", dataTypeClass = Integer.class)
     public CommonResult<List<NotifyMessageRespVO>> getRecentList(@RequestParam(name = "size", defaultValue = "10") Integer size) {
         NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
-        reqVO.setUserId(getLoginUserId());
-        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-
         List<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessageList(reqVO, size);
         if (CollUtil.isNotEmpty(pageResult)) {
             return success(NotifyMessageConvert.INSTANCE.convertList(pageResult));
@@ -75,19 +68,20 @@ public class NotifyMessageController {
         return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
     }
 
-    @GetMapping("/update-list-read")
+    @PutMapping("/update-list-read")
     @ApiOperation("批量标记已读")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestBody List<Long> ids) {
         notifyMessageService.batchUpdateNotifyMessageReadStatus(ids, getLoginUserId());
         return success(Boolean.TRUE);
     }
 
-    @GetMapping("/update-all-read")
+    @PutMapping("/update-all-read")
     @ApiOperation("所有未读消息标记已读")
     public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
         notifyMessageService.batchUpdateAllNotifyMessageReadStatus(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
index aa57a795ea..b0aad865ed 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
@@ -95,6 +95,6 @@ public class NotifyTemplateController {
     @ApiOperation("发送站内信")
     public CommonResult<Long> sendNotify(@Valid @RequestBody NotifyTemplateSendReqVO sendReqVO) {
         return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),
-                sendReqVO.getTemplateId(), sendReqVO.getTemplateParams()));
+                sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java
new file mode 100644
index 0000000000..e24a7d49bc
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.log;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class NotifyLogBaseVO {
+
+    @ApiModelProperty(value = "模版编码")
+    private String templateCode;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容", required = true)
+    private String content;
+
+    @ApiModelProperty(value = "发送时间", required = true)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date sendTime;
+
+    @ApiModelProperty(value = "芋艿", required = true)
+    private String receiveUserName;
+
+    @ApiModelProperty(value = "1", required = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "是否已读 false-未读  true-已读")
+    private Boolean readStatus;
+
+    @ApiModelProperty(value = "阅读时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date readTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java
new file mode 100644
index 0000000000..aefd60498f
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.log;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 站内信日志分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyLogPageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "模版编码")
+    private String templateCode;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] sendTime;
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
index 62d8a31130..f8d5d814a4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
@@ -1,39 +1,33 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
-* 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class NotifyMessageBaseVO {
 
-    @ApiModelProperty(value = "用户编号", required = true)
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
-    @ApiModelProperty(value = "用户类型", required = true)
-    @NotNull(message = "用户类型不能为空")
-    @InEnum(value = UserTypeEnum.class, message = "用户类型必须是 {value}")
-    private Integer userType;
-
     @ApiModelProperty(value = "标题")
     private String title;
 
-    @ApiModelProperty(value = "内容", required = true)
-    @NotNull(message = "内容不能为空")
+    @ApiModelProperty(value = "内容")
     private String content;
 
+    @ApiModelProperty(value = "发送时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date sendTime;
+
+    @ApiModelProperty(value = "芋艿")
+    private String sendUserName;
+
     @ApiModelProperty(value = "是否已读 false-未读  true-已读")
     private Boolean readStatus;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
index 443f3729a7..3d786796b7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
@@ -28,11 +28,4 @@ public class NotifyMessagePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date[] createTime;
 
-    // TODO 芋艿：去掉 userId 和 userType，不要在 VO 里
-
-    @ApiModelProperty(value = "用户编号", hidden = true)
-    private Long userId;
-
-    @ApiModelProperty(value = "用户类型", hidden = true)
-    private Integer userType;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
index 530b368c11..306b7bd28d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
@@ -13,7 +13,4 @@ public class NotifyMessageRespVO extends NotifyMessageBaseVO {
     @ApiModelProperty(value = "ID", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "创建时间", required = true)
-    private Date createTime;
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
index abfcb2b369..7a04db5dc4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
@@ -15,9 +15,9 @@ public class NotifyTemplateSendReqVO {
     @NotNull(message = "用户id不能为空")
     private Long userId;
 
-    @ApiModelProperty(value = "模板Id", required = true, example = "01")
-    @NotNull(message = "模板Id不能为空")
-    private Long templateId;
+    @ApiModelProperty(value = "模板编码", required = true, example = "01")
+    @NotNull(message = "模板编码不能为空")
+    private String templateCode;
 
     @ApiModelProperty(value = "模板参数")
     private Map<String, Object> templateParams;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java
new file mode 100644
index 0000000000..07e3dfb858
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.system.convert.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogBaseVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@Mapper
+public interface NotifyLogConvert {
+
+    NotifyLogConvert INSTANCE = Mappers.getMapper(NotifyLogConvert.class);
+
+    PageResult<NotifyLogBaseVO> convertPage(PageResult<NotifyMessageDO> page);
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
index a111827fe9..4a393d30c8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java
@@ -1,13 +1,12 @@
 package cn.iocoder.yudao.module.system.convert.notify;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+
+import java.util.List;
 
 /**
  * 站内信 Convert
@@ -25,4 +24,5 @@ public interface NotifyMessageConvert {
 
     PageResult<NotifyMessageRespVO> convertPage(PageResult<NotifyMessageDO> page);
 
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
index 5a923998ac..b431795cf3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
@@ -35,6 +35,12 @@ public class NotifyMessageDO extends BaseDO {
      * 关联 {@link NotifyTemplateDO#getId()}
      */
     private Long templateId;
+    /**
+     * 站内信模版编码
+     *
+     * 关联 {@link NotifyTemplateDO#getCode()}
+     */
+    private String templateCode;
     /**
      * 用户编号
      *
@@ -55,6 +61,18 @@ public class NotifyMessageDO extends BaseDO {
      * 内容
      */
     private String content;
+    /**
+     * 发送时间
+     */
+    private Date sendTime;
+    /**
+     * 发送用户id
+     */
+    private Long sendUserId;
+    /**
+     * 发送用户名
+     */
+    private String sendUserName;
     /**
      * 是否已读
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 9523264d10..7b599e25e8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.dal.mysql.notify;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,23 +18,31 @@ import java.util.List;
 @Mapper
 public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
 
-    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO) {
+    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO, Long userId, Integer userType) {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
                 .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
+                .eq(NotifyMessageDO::getUserId, userId)
+                .eq(NotifyMessageDO::getUserType, userType)
                 .orderByDesc(NotifyMessageDO::getId));
     }
 
-    default List<NotifyMessageDO> selectList(NotifyMessagePageReqVO reqVO, Integer size) {
+    default PageResult<NotifyMessageDO> selectSendPage(NotifyLogPageReqVO reqVO, Long userId) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
+                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
+                .betweenIfPresent(NotifyMessageDO::getSendTime, reqVO.getSendTime())
+                .eq(NotifyMessageDO::getSendUserId, userId)
+                .orderByDesc(NotifyMessageDO::getId));
+    }
+
+    default List<NotifyMessageDO> selectList(NotifyMessagePageReqVO reqVO, Integer size,  Long userId, Integer userType) {
         return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
                 .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
+                .eqIfPresent(NotifyMessageDO::getUserId, userId)
+                .eqIfPresent(NotifyMessageDO::getUserType, userType)
                 .orderByDesc(NotifyMessageDO::getId)
                 .last("limit " + size));
     }
@@ -51,4 +60,5 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType));
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
new file mode 100644
index 0000000000..272648c9c0
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+
+/**
+ * <p>
+ * 站内信日志 Service 接口
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+public interface NotifyLogService {
+
+
+    /**
+     * 获得站内信发送分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 站内信分页
+     */
+    PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO);
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java
new file mode 100644
index 0000000000..be95d8a6dd
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+/**
+ * <p>
+ * 站内信日志 Service 实现类
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@Service
+@Validated
+public class NotifyLogServiceImpl implements NotifyLogService {
+
+    @Resource
+    private NotifyMessageMapper notifyMessageMapper;
+
+    @Override
+    public PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO) {
+        return notifyMessageMapper.selectSendPage(pageReqVO, getLoginUserId());
+    }
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index 10f3975059..bb8d7e9232 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -49,7 +49,7 @@ public interface NotifyMessageService {
     /**
      * 统计用户未读站内信条数
      *
-     * @param userId 用户ID
+     * @param userId   用户ID
      * @param userType 用户类型
      * @return 返回未读站内信条数
      */
@@ -58,7 +58,7 @@ public interface NotifyMessageService {
     /**
      * 修改站内信阅读状态
      *
-     * @param id 站内信编号
+     * @param id     站内信编号
      * @param status 状态
      */
     void updateNotifyMessageReadStatus(Long id, Boolean status);
@@ -66,7 +66,7 @@ public interface NotifyMessageService {
     /**
      * 批量修改站内信阅读状态
      *
-     * @param ids 站内信编号集合
+     * @param ids    站内信编号集合
      * @param userId 用户ID
      */
     void batchUpdateNotifyMessageReadStatus(Collection<Long> ids, Long userId);
@@ -74,8 +74,9 @@ public interface NotifyMessageService {
     /**
      * 批量修改用户所有未读消息标记已读
      *
-     * @param userId 用户ID
+     * @param userId   用户ID
      * @param userType 用户类型
      */
     void batchUpdateAllNotifyMessageReadStatus(Long userId, Integer userType);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index 0597fd6898..fdfff486e5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.notify;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -16,11 +17,13 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -86,12 +89,12 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
 
     @Override
     public List<NotifyMessageDO> getNotifyMessageList(NotifyMessagePageReqVO pageReqVO, Integer size) {
-        return notifyMessageMapper.selectList(pageReqVO, size);
+        return notifyMessageMapper.selectList(pageReqVO, size, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
     }
 
     @Override
     public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
-        return notifyMessageMapper.selectPage(pageReqVO);
+        return notifyMessageMapper.selectPage(pageReqVO, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
     }
 
     /**
@@ -160,9 +163,15 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         }
     }
 
+
+    /**
+     * 批量修改阅读状态为已读
+     * @param ids
+     */
     private void batchUpdateReadStatus(Collection<Long> ids) {
         NotifyMessageDO updateObj = new NotifyMessageDO();
-        updateObj.setReadStatus(false);
+        updateObj.setReadStatus(true);
+        updateObj.setReadTime(new Date());
         notifyMessageMapper.update(updateObj, new LambdaQueryWrapperX<NotifyMessageDO>().in(NotifyMessageDO::getId, ids));
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
index bbf8c2dc51..68e9a78c48 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
@@ -12,36 +12,36 @@ public interface NotifySendService {
      * 在 mobile 为空时，使用 userId 加载对应管理员的手机号
      *
      * @param userId 用户编号
-     * @param templateId 短信模板编号
+     * @param templateCode 短信模板编号
      * @param templateParams 短信模板参数
      * @return 发送日志编号
      */
     Long sendSingleNotifyToAdmin(Long userId,
-                                 Long templateId, Map<String, Object> templateParams);
+                                 String templateCode, Map<String, Object> templateParams);
     /**
      * 发送单条站内信给用户 APP 的用户
      *
      * 在 mobile 为空时，使用 userId 加载对应会员的手机号
      *
      * @param userId 用户编号
-     * @param templateId 站内信模板编号
+     * @param templateCode 站内信模板编号
      * @param templateParams 站内信模板参数
      * @return 发送日志编号
      */
     Long sendSingleNotifyToMember(Long userId,
-                                  Long templateId, Map<String, Object> templateParams);
+                                  String templateCode, Map<String, Object> templateParams);
 
     /**
      * 发送单条站内信给用户
      *
      * @param userId 用户编号
      * @param userType 用户类型
-     * @param templateId 站内信模板编号
+     * @param templateCode 站内信模板编号
      * @param templateParams 站内信模板参数
      * @return 发送日志编号
      */
     Long sendSingleNotify( Long userId, Integer userType,
-                           Long templateId, Map<String, Object> templateParams);
+                           String templateCode, Map<String, Object> templateParams);
 
     default void sendBatchNotify(List<String> mobiles, List<Long> userIds, Integer userType,
                               String templateCode, Map<String, Object> templateParams) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
index 63237e79b6..984fc196bc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
@@ -3,7 +3,9 @@ package cn.iocoder.yudao.module.system.service.notify;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -14,6 +16,7 @@ import java.util.Date;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND;
 
 /**
@@ -32,41 +35,48 @@ public class NotifySendServiceImpl implements NotifySendService {
     @Resource
     private NotifyMessageMapper notifyMessageMapper;
 
-    @Override
-    public Long sendSingleNotifyToAdmin(Long userId, Long templateId, Map<String, Object> templateParams) {
+    @Resource
+    private AdminUserService userService;
 
-        return sendSingleNotify(userId, UserTypeEnum.ADMIN.getValue(), templateId, templateParams);
+    @Override
+    public Long sendSingleNotifyToAdmin(Long userId, String templateCode, Map<String, Object> templateParams) {
+
+        return sendSingleNotify(userId, UserTypeEnum.ADMIN.getValue(), templateCode, templateParams);
     }
 
     @Override
-    public Long sendSingleNotifyToMember(Long userId, Long templateId, Map<String, Object> templateParams) {
-        return sendSingleNotify(userId, UserTypeEnum.MEMBER.getValue(), templateId, templateParams);
+    public Long sendSingleNotifyToMember(Long userId, String templateCode, Map<String, Object> templateParams) {
+        return sendSingleNotify(userId, UserTypeEnum.MEMBER.getValue(), templateCode, templateParams);
     }
 
     @Override
-    public Long sendSingleNotify(Long userId, Integer userType, Long templateId, Map<String, Object> templateParams) {
+    public Long sendSingleNotify(Long userId, Integer userType, String templateCode, Map<String, Object> templateParams) {
         // 校验短信模板是否合法
-        NotifyTemplateDO template = this.checkNotifyTemplateValid(templateId);
+        NotifyTemplateDO template = this.checkNotifyTemplateValid(templateCode);
         String content = notifyTemplateService.formatNotifyTemplateContent(template.getContent(), templateParams);
+        AdminUserDO sendUser = userService.getUser(getLoginUserId());
 
         // todo 模板状态未开启时的业务
         NotifyMessageDO notifyMessageDO = new NotifyMessageDO();
         notifyMessageDO.setContent(content);
         notifyMessageDO.setTitle(template.getTitle());
         notifyMessageDO.setReadStatus(false);
-        notifyMessageDO.setReadTime(new Date());
-        notifyMessageDO.setTemplateId(templateId);
+        notifyMessageDO.setTemplateId(template.getId());
+        notifyMessageDO.setTemplateCode(templateCode);
         notifyMessageDO.setUserId(userId);
         notifyMessageDO.setUserType(userType);
+        notifyMessageDO.setSendTime(new Date());
+        notifyMessageDO.setSendUserId(sendUser.getId());
+        notifyMessageDO.setSendUserName(sendUser.getUsername());
         notifyMessageMapper.insert(notifyMessageDO);
         return notifyMessageDO.getId();
     }
 
     // 此注解的含义
     @VisibleForTesting
-    public NotifyTemplateDO checkNotifyTemplateValid(Long templateId) {
+    public NotifyTemplateDO checkNotifyTemplateValid(String templateCode) {
         // 获得短信模板。考虑到效率，从缓存中获取
-        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplate(templateId);
+        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplateByCodeFromCache(templateCode);
         // 短信模板不存在
         if (template == null) {
             throw exception(NOTICE_NOT_FOUND);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
index 1342fe03b0..fe5058074e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
@@ -109,7 +109,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         return notifyTemplateMapper.selectList();
     }
 
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
+    @Scheduled(fixedDelay = SCHEDULER_PERIOD)
     public void schedulePeriodicRefresh() {
         initLocalCache();
     }
diff --git a/yudao-ui-admin/src/api/system/notify/myNotify.js b/yudao-ui-admin/src/api/system/notify/myNotify.js
new file mode 100644
index 0000000000..cd37fd8988
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/notify/myNotify.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+
+// 获得我的站内信分页
+export function getNotifyMessagePage(query) {
+  return request({
+    url: '/system/notify-message/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得单条我的站内信
+export function getNotifyMessage(query) {
+  return request({
+    url: '/system/notify-message/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 批量标记已读
+export function updateNotifyMessageListRead(data) {
+  return request({
+    url: '/system/notify-message/update-list-read',
+    method: 'put',
+    data: data
+  })
+}
+
+// 所有未读消息标记已读
+export function updateNotifyMessageAllRead(data) {
+  return request({
+    url: '/system/notify-message/update-all-read',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/yudao-ui-admin/src/api/system/notify/notifyLog.js b/yudao-ui-admin/src/api/system/notify/notifyLog.js
new file mode 100644
index 0000000000..de9e9f1ad3
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/notify/notifyLog.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+// 获得我的站内信分页
+export function getNotifyLogPage(query) {
+  return request({
+    url: '/system/notify-log/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/yudao-ui-admin/src/api/system/notify/notifyTemplate.js b/yudao-ui-admin/src/api/system/notify/notifyTemplate.js
new file mode 100644
index 0000000000..59c0365406
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/notify/notifyTemplate.js
@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 创建站内信模板
+export function createNotifyTemplate(data) {
+  return request({
+    url: '/system/notify-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新站内信模板
+export function updateNotifyTemplate(data) {
+  return request({
+    url: '/system/notify-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除站内信模板
+export function deleteNotifyTemplate(id) {
+  return request({
+    url: '/system/notify-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得站内信模板
+export function getNotifyTemplate(id) {
+  return request({
+    url: '/system/notify-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得站内信模板分页
+export function getNotifyTemplatePage(query) {
+  return request({
+    url: '/system/notify-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建站内信模板
+export function sendNotify(data) {
+  return request({
+    url: '/system/notify-template/send-notify',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出站内信模板 Excel
+export function exportNotifyTemplateExcel(query) {
+  return request({
+    url: '/system/notify-template/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
diff --git a/yudao-ui-admin/src/utils/dict.js b/yudao-ui-admin/src/utils/dict.js
index 1ddde889a7..4ed01e9a9e 100644
--- a/yudao-ui-admin/src/utils/dict.js
+++ b/yudao-ui-admin/src/utils/dict.js
@@ -24,6 +24,7 @@ export const DICT_TYPE = {
   SYSTEM_SMS_RECEIVE_STATUS: 'system_sms_receive_status',
   SYSTEM_ERROR_CODE_TYPE: 'system_error_code_type',
   SYSTEM_OAUTH2_GRANT_TYPE: 'system_oauth2_grant_type',
+  SYSTEM_NOTIFY_READ_STATUS: "system_notify_read_status",
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING: 'infra_boolean_string',
diff --git a/yudao-ui-admin/src/views/system/notify/myNotify.vue b/yudao-ui-admin/src/views/system/notify/myNotify.vue
new file mode 100644
index 0000000000..1c8a1b58a9
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/notify/myNotify.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="模板标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="读取状态" prop="readStatus">
+        <el-select v-model="queryParams.readStatus" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleUpdateList">标记已读</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleUpdateAll">全部已读</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" ref="tables" :data="list">
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" width="300" />
+      <el-table-column label="发送人" align="center" prop="sendUserName" />
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sendTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="读取状态" align="center" prop="readStatus">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS" :value="scope.row.readStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template slot-scope="scope">
+          <el-button v-show="!scope.row.readStatus" size="mini" type="text" icon="el-icon-check" @click="handleUpdateSingle(scope.row)">已读</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+  </div>
+</template>
+
+<script>
+import { getNotifyMessagePage, updateNotifyMessageListRead, updateNotifyMessageAllRead} from "@/api/system/notify/myNotify";
+
+export default {
+  name: "myNotify",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 我的站内信列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        readStatus: null,
+        code: null,
+        title: null,
+        createTime: []
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyMessagePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleUpdateList(){
+      let list = this.$refs["tables"].selection;
+      if(list.length != 0){
+        this.handleUpdate(list.map(v=>v.id))
+      }
+    },
+    handleUpdateSingle(row){
+      this.handleUpdate([row.id])
+    },
+    handleUpdate(ids){
+      updateNotifyMessageListRead(ids).then(response => {
+        this.$modal.msgSuccess("修改成功");
+            this.getList();
+      });
+    },
+    handleUpdateAll(){
+      updateNotifyMessageAllRead().then(response => {
+        this.$modal.msgSuccess("修改成功");
+            this.getList();
+      });
+    }
+  }
+}
+</script>
diff --git a/yudao-ui-admin/src/views/system/notify/notifyLog.vue b/yudao-ui-admin/src/views/system/notify/notifyLog.vue
new file mode 100644
index 0000000000..7e9eb5610c
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/notify/notifyLog.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="模板编码" prop="templateCode">
+        <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="发送时间" prop="sendTime">
+        <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:notify-log:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="templateCode" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" width="300" />
+      <el-table-column label="阅读状态" align="center" prop="readStatus">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS" :value="scope.row.readStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收人" align="center" prop="receiveUserName" />
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sendTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="阅读时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.readTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+  </div>
+</template>
+
+<script>
+import { getNotifyLogPage} from "@/api/system/notify/notifyLog";
+
+export default {
+  name: "notifyLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 我的站内信列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        templateCode: null,
+        title: null,
+        sendTime: []
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyLogPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/yudao-ui-admin/src/views/system/notify/notifyTemplate.vue b/yudao-ui-admin/src/views/system/notify/notifyTemplate.vue
new file mode 100644
index 0000000000..9fa396839c
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/notify/notifyTemplate.vue
@@ -0,0 +1,339 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="模板编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:notify-template:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:notify-template:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="code" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" width="300" />
+      <el-table-column label="开启状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-share" @click="handleSendNotify(scope.row)"
+                     v-hasPermi="['system:notify-template:send-notify']">发送</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:notify-template:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:notify-template:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="模板编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入模板编号" />
+        </el-form-item>
+        <el-form-item label="模板标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题名称" />
+        </el-form-item>
+        <el-form-item label="模板内容" prop="content">
+          <el-input type="textarea" v-model="form.content" placeholder="请输入模板内容" />
+        </el-form-item>
+        <el-form-item label="开启状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 对话框(发送站内信) -->
+    <el-dialog title="发送站内信" :visible.sync="sendNotifyOpen" width="500px" append-to-body>
+      <el-form ref="sendNotifyForm" :model="sendNotifyForm" :rules="sendNotifyRules" label-width="140px">
+        <el-form-item label="模板内容" prop="content">
+          <el-input v-model="sendNotifyForm.content" type="textarea" placeholder="请输入模板内容" readonly />
+        </el-form-item>
+        <el-form-item label="接收人" prop="userId">
+          <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">
+            <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">
+          <el-input v-model="sendNotifyForm.templateParams[param]" :placeholder="'请输入 ' + param + ' 参数'" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSendNotifyForm">确 定</el-button>
+        <el-button @click="cancelSendNotify">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { createNotifyTemplate, updateNotifyTemplate, deleteNotifyTemplate, getNotifyTemplate, getNotifyTemplatePage,
+  exportNotifyTemplateExcel, sendNotify } from "@/api/system/notify/notifyTemplate";
+import {listSimpleUsers} from "@/api/system/user";
+
+export default {
+  name: "NotifyTemplate",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 短信模板列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        status: null,
+        code: null,
+        title: null,
+        createTime: []
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
+        title: [{ required: true, message: "模板标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "模板内容不能为空", trigger: "blur" }],
+        userId: [{ required: true, message: "接收人不能为空", trigger: "blur" }]
+      },
+      // 用户列表
+      users: [],
+      // 发送短信
+      sendNotifyOpen: false,
+      sendNotifyForm: {
+        params: [], // 模板的参数列表
+      },
+      sendNotifyRules: {
+        mobile: [{ required: true, message: "手机不能为空", trigger: "blur" }],
+        templateCode: [{ required: true, message: "手机不能为空", trigger: "blur" }],
+        templateParams: { }
+      }
+    };
+  },
+  created() {
+    this.getList();
+    // 获得用户列表
+    listSimpleUsers().then(response => {
+      this.users = response.data;
+    })
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyTemplatePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        status: undefined,
+        code: undefined,
+        title: undefined,
+        content: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加站内信模板";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getNotifyTemplate(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改站内信模板";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateNotifyTemplate(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createNotifyTemplate(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除站内信模板编号为"' + id + '"的数据项?').then(function() {
+        return deleteNotifyTemplate(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有站内信模板数据项?', "警告").then(() => {
+        this.exportLoading = true;
+        return exportNotifyTemplateExcel(params);
+      }).then(response => {
+        this.$download.excel(response, '短信模板.xls');
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
+    /** 发送站内信按钮 */
+    handleSendNotify(row) {
+      this.resetSendNotify(row);
+      // 设置参数
+      this.sendNotifyForm.content = row.content;
+      this.sendNotifyForm.params = row.params;
+      this.sendNotifyForm.templateCode = row.code;
+      this.sendNotifyForm.templateParams = row.params.reduce(function(obj, item) {
+        obj[item] = undefined;
+        return obj;
+      }, {});
+      // 根据 row 重置 rules
+      this.sendNotifyRules.templateParams = row.params.reduce(function(obj, item) {
+        obj[item] = { required: true, message: '参数 ' + item + " 不能为空", trigger: "change" };
+        return obj;
+      }, {});
+      // 设置打开
+      this.sendNotifyOpen = true;
+    },
+    /** 重置发送站内信的表单 */
+    resetSendNotify() {
+      // 根据 row 重置表单
+      this.sendNotifyForm = {
+        content: undefined,
+        params: undefined,
+        userId: undefined,
+        templateCode: undefined,
+        templateParams: {}
+      };
+      this.resetForm("sendNotifyForm");
+    },
+    /** 取消发送站内信 */
+    cancelSendNotify() {
+      this.sendNotifyOpen = false;
+      this.resetSendNotify();
+    },
+    /** 提交按钮 */
+    submitSendNotifyForm() {
+      this.$refs["sendNotifyForm"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 添加的提交
+        sendNotify(this.sendNotifyForm).then(response => {
+          this.$modal.msgSuccess("提交发送成功！发送结果，见发送日志编号：" + response.data);
+          this.sendNotifyOpen = false;
+        });
+      });
+    },
+  }
+};
+</script>

From ed2d19541164df791de1fbf15c45ed677726855e Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Sat, 17 Dec 2022 16:42:40 +0800
Subject: [PATCH 34/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/dal/mysql/notify/NotifyMessageMapper.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 7b599e25e8..4704192448 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -32,6 +32,7 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
                 .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
                 .betweenIfPresent(NotifyMessageDO::getSendTime, reqVO.getSendTime())
+                .eqIfPresent(NotifyMessageDO::getTemplateCode, reqVO.getTemplateCode())
                 .eq(NotifyMessageDO::getSendUserId, userId)
                 .orderByDesc(NotifyMessageDO::getId));
     }

From 5cac636f325250e5d7d5ff033761b6fc54a4afed Mon Sep 17 00:00:00 2001
From: luowenfeng <1092164058@qq.com>
Date: Sat, 17 Dec 2022 17:30:05 +0800
Subject: [PATCH 35/67] =?UTF-8?q?feature(=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91):=20=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/mysql/ruoyi-vue-pro.sql | 83 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql
index 683206e6f7..dc3661448f 100644
--- a/sql/mysql/ruoyi-vue-pro.sql
+++ b/sql/mysql/ruoyi-vue-pro.sql
@@ -1330,6 +1330,9 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1158, 3, 'implicit', 'implicit', 'system_oauth2_grant_type', 0, 'success', '', '简化模式', '1', '2022-05-12 00:23:40', '1', '2022-05-11 16:26:05', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1159, 4, 'client_credentials', 'client_credentials', 'system_oauth2_grant_type', 0, 'default', '', '客户端模式', '1', '2022-05-12 00:23:51', '1', '2022-05-11 16:26:08', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1160, 5, 'refresh_token', 'refresh_token', 'system_oauth2_grant_type', 0, 'info', '', '刷新模式', '1', '2022-05-12 00:24:02', '1', '2022-05-11 16:26:11', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1162, 0, '已读', 'true', 'system_notify_read_status', 0, 'success', '', NULL, '1', '2022-12-16 17:48:28', '1', '2022-12-17 03:32:09', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1163, 1, '未读', 'false', 'system_notify_read_status', 0, 'info', '', NULL, '1', '2022-12-16 17:48:43', '1', '2022-12-17 03:32:11', b'0');
+
 COMMIT;
 
 -- ----------------------------
@@ -1395,6 +1398,8 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (145, '角色类型', 'system_role_type', 0, '角色类型', '1', '2022-02-16 13:01:46', '1', '2022-02-16 13:01:46', b'0');
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (146, '文件存储器', 'infra_file_storage', 0, '文件存储器', '1', '2022-03-15 00:24:38', '1', '2022-03-15 00:24:38', b'0');
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (147, 'OAuth 2.0 授权类型', 'system_oauth2_grant_type', 0, 'OAuth 2.0 授权类型（模式）', '1', '2022-05-12 00:20:52', '1', '2022-05-11 16:25:49', b'0');
+INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (149, '站内信读取状态', 'system_notify_read_status', 0, '站内信读取状态', '1', '2022-12-16 17:47:35', '1', '2022-12-17 03:25:08', b'0');
+
 COMMIT;
 
 -- ----------------------------
@@ -1712,6 +1717,21 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1267, '客户端删除', 'system:oauth2-client:delete', 3, 4, 1263, '', '', '', 0, b'1', b'1', '', '2022-05-10 16:26:33', '1', '2022-05-11 00:31:33', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1281, '可视化报表', '', 1, 12, 0, '/visualization', 'chart', NULL, 0, b'1', b'1', '1', '2022-07-10 20:22:15', '1', '2022-07-10 20:33:30', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1282, '积木报表', '', 2, 1, 1281, 'jimu-report', 'example', 'visualization/jmreport/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-28 21:17:34', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2030, '站内信', '', 1, 14, 1, 'notify', 'build', '', 0, b'1', b'1', '1', '2022-12-16 11:27:45', '1', '2022-12-16 11:44:11', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2031, '站内信模板', '', 2, 1, 2030, 'notify-template', 'build', 'system/notify/notifyTemplate', 0, b'1', b'1', '1', '2022-12-16 11:35:14', '1', '2022-12-16 11:44:43', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2032, '我的站内信', '', 2, 2, 2030, 'my-notify', 'checkbox', 'system/notify/myNotify', 0, b'1', b'1', '1', '2022-12-16 11:35:58', '1', '2022-12-16 11:44:48', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2033, '查询', 'system:notify-template:query', 3, 1, 2031, '', '', '', 0, b'1', b'1', '1', '2022-12-16 11:36:57', '1', '2022-12-16 11:36:57', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2034, '创建', 'system:notify-template:create', 3, 2, 2031, '', '', '', 0, b'1', b'1', '1', '2022-12-16 11:43:16', '1', '2022-12-16 12:06:48', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2035, '更新', 'system:notify-template:update', 3, 3, 2031, '', '', '', 0, b'1', b'1', '1', '2022-12-16 12:06:41', '1', '2022-12-16 12:06:41', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2036, '删除', 'system:notify-template:delete', 3, 4, 2031, '', '', '', 0, b'1', b'1', '1', '2022-12-16 12:07:03', '1', '2022-12-16 12:07:03', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2037, '导出', 'system:notify-template:export', 3, 5, 2031, '', '', '', 0, b'1', b'1', '1', '2022-12-16 12:07:20', '1', '2022-12-16 12:07:20', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2038, '发送', 'system:notify-template:send-notify', 3, 6, 2031, '', '', '', 0, b'1', b'1', '1', '2022-12-16 15:21:16', '1', '2022-12-16 15:21:16', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2039, '日志', '', 2, 3, 2030, 'notify-log', 'post', 'system/notify/notifyLog', 0, b'1', b'1', '1', '2022-12-16 17:29:00', '1', '2022-12-17 16:07:58', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2040, '查询', 'system:notify-log:query', 3, 1, 2039, '', '', '', 0, b'1', b'1', '1', '2022-12-16 17:29:23', '1', '2022-12-16 17:29:23', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2041, '撤销', 'system:notify-log:cancel', 3, 2, 2039, '', '', '', 0, b'1', b'1', '1', '2022-12-16 17:30:13', '1', '2022-12-16 17:30:13', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2042, '查询', 'system:my-notify:query', 3, 1, 2032, '', '', '', 0, b'1', b'1', '1', '2022-12-16 17:31:31', '1', '2022-12-16 17:31:31', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2043, '读取', 'system:my-notify:query', 3, 2, 2032, '', '', '', 0, b'1', b'1', '1', '2022-12-16 17:32:03', '1', '2022-12-16 09:32:20', b'1');
+
 COMMIT;
 
 -- ----------------------------
@@ -2661,4 +2681,65 @@ SET FOREIGN_KEY_CHECKS = 1;
 
 -- 积木报表菜单
 INSERT INTO `system_menu` VALUES (1281, '可视化报表', '', 1, 12, 0, '/visualization', 'chart', NULL, 0, b'1', b'1', '1', '2022-07-10 20:22:15', '1', '2022-07-10 20:33:30', b'0');
-INSERT INTO `system_menu` VALUES (1282, '积木报表', '', 2, 1, 1281, 'jm-report', '#', 'visualization/jm/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-10 20:33:26', b'0');
\ No newline at end of file
+INSERT INTO `system_menu` VALUES (1282, '积木报表', '', 2, 1, 1281, 'jm-report', '#', 'visualization/jm/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-10 20:33:26', b'0');
+
+-- ----------------------------
+-- Table structure for system_notify_message
+-- ----------------------------
+DROP TABLE IF EXISTS `system_notify_message`;
+
+CREATE TABLE `system_notify_message` (
+    `id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `template_id` int DEFAULT NULL COMMENT '模板id',
+    `template_code` varchar(64)  DEFAULT NULL COMMENT '模板编码',
+    `title` varchar(100)  DEFAULT NULL COMMENT '模板标题',
+    `content` varchar(255)  DEFAULT NULL COMMENT '模板内容',
+    `send_time` datetime DEFAULT NULL COMMENT '发送时间',
+    `send_user_id` int DEFAULT NULL COMMENT '发送用户id',
+    `send_user_name` varchar(30)  DEFAULT NULL COMMENT '发送用户名',
+    `user_id` bigint DEFAULT NULL COMMENT '用户id',
+    `user_type` bit(2) DEFAULT NULL COMMENT '用户类型',
+    `read_status` bit(1) DEFAULT NULL COMMENT '阅读状态 0未读 1已读',
+    `read_time` datetime DEFAULT NULL COMMENT '阅读时间',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+    `creator` varchar(64)  DEFAULT NULL COMMENT '创建者',
+    `updater` varchar(64)  DEFAULT NULL COMMENT '更新者',
+    `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB COMMENT = '站内信消息表';
+
+-- ----------------------------
+-- Records of system_notify_message
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for system_notify_template
+-- ----------------------------
+DROP TABLE IF EXISTS `system_notify_template`;
+
+CREATE TABLE `system_notify_template` (
+    `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `code` varchar(64)  DEFAULT NULL COMMENT '模版编码',
+    `title` varchar(255)  DEFAULT NULL COMMENT '模版标题',
+    `content` varchar(255) DEFAULT NULL COMMENT '模版内容',
+    `params` varchar(255)  DEFAULT NULL COMMENT '参数数组',
+    `status` bit(1) DEFAULT NULL COMMENT '状态',
+    `remark` varchar(60)  DEFAULT NULL COMMENT '备注',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+    `creator` varchar(64)  DEFAULT NULL COMMENT '创建者',
+    `updater` varchar(64)  DEFAULT NULL COMMENT '更新者',
+    `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id` int DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB COMMENT = '站内信模板表';
+
+-- ----------------------------
+-- Records of system_notify_template
+-- ----------------------------
+BEGIN;
+COMMIT;
\ No newline at end of file

From 491921d5aefd36470ef38682a0bfe2385d7823d6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 23 Dec 2022 18:41:41 +0800
Subject: [PATCH 36/67] =?UTF-8?q?code=20review=20=E7=AB=99=E5=86=85?=
 =?UTF-8?q?=E4=BF=A1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dal/dataobject/notify/NotifyMessageDO.java       | 2 ++
 .../module/system/service/notify/NotifyLogService.java      | 4 ++--
 .../system/service/notify/NotifyMessageServiceImpl.java     | 6 ++++--
 .../module/system/service/notify/NotifySendServiceImpl.java | 5 +++--
 .../system/service/notify/NotifyTemplateServiceImpl.java    | 1 -
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
index b431795cf3..fe80784a8b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
@@ -61,10 +61,12 @@ public class NotifyMessageDO extends BaseDO {
      * 内容
      */
     private String content;
+    // TODO @luowenfeng：是不是创建时间，直接作为发送时间；
     /**
      * 发送时间
      */
     private Date sendTime;
+    // TODO @luowenfeng：是不是不用发送 id 和名字😑？
     /**
      * 发送用户id
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
index 272648c9c0..290b8f2b97 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
@@ -5,14 +5,13 @@ import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPa
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 
 /**
- * <p>
  * 站内信日志 Service 接口
- * </p>
  *
  * @author LuoWenFeng
  */
 public interface NotifyLogService {
 
+    // TODO @LuoWenFeng：NotifyLogService=》NotifyMessageService
 
     /**
      * 获得站内信发送分页
@@ -21,4 +20,5 @@ public interface NotifyLogService {
      * @return 站内信分页
      */
     PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index fdfff486e5..f8ddad0cf5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -163,15 +163,17 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         }
     }
 
-
     /**
      * 批量修改阅读状态为已读
-     * @param ids
+     *
+     * @param ids 站内变编号数组
      */
     private void batchUpdateReadStatus(Collection<Long> ids) {
         NotifyMessageDO updateObj = new NotifyMessageDO();
         updateObj.setReadStatus(true);
         updateObj.setReadTime(new Date());
+        // TODO @luowenfeng：涉及到 mybatis 的操作，都要隐藏到 mapper 中；
         notifyMessageMapper.update(updateObj, new LambdaQueryWrapperX<NotifyMessageDO>().in(NotifyMessageDO::getId, ids));
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
index 984fc196bc..e72bd6c866 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
@@ -19,6 +19,7 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND;
 
+// TODO @luowenfeng：可以直接合并到 NotifyMessageService 中；之前 sms 台复杂，所以没合并。
 /**
  * 站内信发送 Service 实现类
  *
@@ -40,7 +41,6 @@ public class NotifySendServiceImpl implements NotifySendService {
 
     @Override
     public Long sendSingleNotifyToAdmin(Long userId, String templateCode, Map<String, Object> templateParams) {
-
         return sendSingleNotify(userId, UserTypeEnum.ADMIN.getValue(), templateCode, templateParams);
     }
 
@@ -54,9 +54,10 @@ public class NotifySendServiceImpl implements NotifySendService {
         // 校验短信模板是否合法
         NotifyTemplateDO template = this.checkNotifyTemplateValid(templateCode);
         String content = notifyTemplateService.formatNotifyTemplateContent(template.getContent(), templateParams);
+        // 获得用户
         AdminUserDO sendUser = userService.getUser(getLoginUserId());
 
-        // todo 模板状态未开启时的业务
+        // todo 模板状态未开启时的业务；如果未开启，就直接 return 好了；
         NotifyMessageDO notifyMessageDO = new NotifyMessageDO();
         notifyMessageDO.setContent(content);
         notifyMessageDO.setTitle(template.getTitle());
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
index fe5058074e..7bfa9027ce 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
@@ -85,7 +85,6 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         notifyTemplateCache = CollectionUtils.convertMap(notifyTemplateList, NotifyTemplateDO::getCode);
         maxUpdateTime = CollectionUtils.getMaxValue(notifyTemplateList, NotifyTemplateDO::getUpdateTime);
         log.info("[initLocalCache][初始化 NotifyTemplate 数量为 {}]", notifyTemplateList.size());
-
     }
 
     /**

From 0262fa5c153628e63c6c266026c7bb7a06d49f1a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 17:48:09 +0800
Subject: [PATCH 37/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20account=20=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/api/mail/MailSendApi.java   |  30 +++
 .../system/api/mail/dto/MailSendReqDTO.java   |  38 ---
 .../mail/dto/MailSendSingleToUserReqDTO.java  |  39 +++
 .../system/enums/ErrorCodeConstants.java      |   9 +-
 .../enums/mail/MailLogUserTypeEnum.java       |  22 --
 .../system/api/mail/MailSendApiImpl.java      |  14 +-
 .../admin/mail/MailAccountController.java     |  23 +-
 .../mail/vo/account/MailAccountBaseVO.java    |  34 ++-
 .../vo/account/MailAccountCreateReqVO.java    |   3 -
 .../mail/vo/account/MailAccountPageReqVO.java |  15 +-
 .../mail/vo/account/MailAccountRespVO.java    |  25 ++
 .../vo/account/MailAccountSimpleRespVO.java   |  17 ++
 .../vo/account/MailAccountUpdateReqVO.java    |   3 -
 .../convert/mail/MailAccountConvert.java      |  29 ++-
 .../dal/dataobject/mail/MailAccountDO.java    |   9 +-
 .../system/dal/dataobject/mail/MailLogDO.java |  54 +++--
 .../dal/dataobject/mail/MailTemplateDO.java   |   7 +-
 .../dal/mysql/mail/MailAccountMapper.java     |  28 +--
 .../dal/mysql/mail/MailTemplateMapper.java    |   8 +-
 .../system/mq/producer/mail/MailProducer.java |   2 +-
 .../service/mail/MailAccountService.java      |   6 +-
 .../service/mail/MailTemplateService.java     |   8 +
 .../mail/impl/MailAccountServiceImpl.java     | 113 +++------
 .../service/mail/impl/MailLogServiceImpl.java |   5 +-
 .../mail/impl/MailTemplateServiceImpl.java    |  14 +-
 .../service/sms/SmsChannelServiceImpl.java    |   2 +-
 yudao-ui-admin/src/api/system/mail/account.js |  44 ++++
 .../src/views/system/mail/account/index.vue   | 226 ++++++++++++++++++
 28 files changed, 555 insertions(+), 272 deletions(-)
 delete mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
 delete mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java
 create mode 100755 yudao-ui-admin/src/api/system/mail/account.js
 create mode 100755 yudao-ui-admin/src/views/system/mail/account/index.vue

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
index 2ffe0d7cb7..3885259f26 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
@@ -1,4 +1,34 @@
 package cn.iocoder.yudao.module.system.api.mail;
 
+import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
+
+import javax.validation.Valid;
+
+/**
+ * 邮箱发送 API 接口
+ *
+ * @author 芋道源码
+ */
 public interface MailSendApi {
+
+    /**
+     * 发送单条邮箱给 Admin 用户
+     *
+     * 在 mail 为空时，使用 userId 加载对应 Admin 的邮箱
+     *
+     * @param reqDTO 发送请求
+     * @return 发送日志编号
+     */
+    Long sendSingleSmsToAdmin(@Valid MailSendSingleToUserReqDTO reqDTO);
+
+    /**
+     * 发送单条邮箱给 Member 用户
+     *
+     * 在 mail 为空时，使用 userId 加载对应 Member 的邮箱
+     *
+     * @param reqDTO 发送请求
+     * @return 发送日志编号
+     */
+    Long sendSingleSmsToMember(@Valid MailSendSingleToUserReqDTO reqDTO);
+
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
deleted file mode 100644
index caa69678c2..0000000000
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendReqDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.system.api.mail.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-import java.util.Map;
-
-@ApiModel("管理后台 - 邮件发送 Req VO")
-@Data
-public class MailSendReqDTO { // TODO @wangjingqi：1）, 不用空格；2）应该只要传递 templateCode、参数就好，title、from、content、附件应该都是参数里的
-
-    @ApiModelProperty(value = "用户编码",required = true)
-    @NotNull(message = "用户编码不能为空")
-    private String userId;
-
-    @ApiModelProperty(value = "用户类型",required = true)
-    @NotNull(message = "用户类型不能为空")
-    private String userType;
-
-    @ApiModelProperty(value = "邮箱模版id",example = "1024")
-    @NotNull(message = "邮箱模版编码不能为空")
-    private Integer templateCode;
-
-    @ApiModelProperty(value = "邮箱参数")
-    @NotNull(message = "模版参数不能为空")
-    private Map<String,Object> templateParams;
-
-    @ApiModelProperty(value = "收件人",required = true,example = "yudaoyuanma@123.com")
-    @NotNull(message = "收件人不能为空")
-    private List<String> tos;
-
-
-
-}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
new file mode 100644
index 0000000000..e2ede96aea
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.system.api.mail.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+/**
+ * 邮件发送 Request DTO
+ *
+ * @author wangjingqi
+ */
+@Data
+public class MailSendSingleToUserReqDTO {
+
+    /**
+     * 用户编号
+     */
+    @NotNull(message = "用户编号不能为空")
+    private String userId;
+    /**
+     * 邮箱
+     */
+    @Email
+    private String mail;
+
+    /**
+     * 邮件模板编号
+     */
+    @NotNull(message = "邮件模板编号不能为空")
+    private String templateCode;
+    /**
+     * 邮件模板参数
+     */
+    @NotNull(message = "邮件模板参数不能为空")
+    private Map<String, Object> templateParams;
+
+}
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index ead06b2042..135248867d 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -141,16 +141,13 @@ public interface ErrorCodeConstants {
     ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
     ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022001, "code 已过期");
 
-    // TODO @芋艿：需要重新搞下 mail 错误码
-
-    // ========== 邮箱账号 1002020000 ==========
-    ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002020000, "邮箱账号不存在");
-    ErrorCode MAIL_ACCOUNT_EXISTS = new ErrorCode(1002020001, "邮箱账号存在");
+    // ========== 邮箱账号 1002023000 ==========
+    ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002023000, "邮箱账号不存在");
+    ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002023001, "无法删除，该邮箱账号还有邮件模板");
 
     // ========== 邮箱模版 1002021000 ==========
     ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000, "邮箱模版不存在");
     ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002021001, "邮箱模版存在");
-    ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002021002, "存在关联邮箱模版");
     ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002021003, "模板参数({})缺失");
 
 }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java
deleted file mode 100644
index 4154c9bc1c..0000000000
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailLogUserTypeEnum.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.system.enums.mail;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 邮件日志用户类型
- *
- * @author wangjingyi
- */
-@Getter
-@AllArgsConstructor
-public enum MailLogUserTypeEnum {
-
-    COMMON (10),
-    VIP (20);
-
-    /**
-     * 类型
-     */
-    private final int userType;
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
index cce0ed3883..eaad0f8abd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.api.mail;
 
+import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -10,5 +11,16 @@ import org.springframework.validation.annotation.Validated;
  */
 @Service
 @Validated
-public class MailSendApiImpl implements MailSendApi{
+public class MailSendApiImpl implements MailSendApi {
+
+    @Override
+    public Long sendSingleSmsToAdmin(MailSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
+    @Override
+    public Long sendSingleSmsToMember(MailSendSingleToUserReqDTO reqDTO) {
+        return null;
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index 17a305c481..a18fb137b2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -3,11 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.*;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
@@ -36,14 +32,14 @@ public class MailAccountController {
     @ApiOperation("创建邮箱账号")
     @PreAuthorize("@ss.hasPermission('system:mail-account:create')")
     public CommonResult<Long> createMailAccount(@Valid @RequestBody MailAccountCreateReqVO createReqVO) {
-        return success(mailAccountService.create(createReqVO));
+        return success(mailAccountService.createMailAccount(createReqVO));
     }
 
     @PutMapping("/update")
     @ApiOperation("修改邮箱账号")
     @PreAuthorize("@ss.hasPermission('system:mail-account:update')")
     public CommonResult<Boolean> updateMailAccount(@Valid @RequestBody MailAccountUpdateReqVO updateReqVO) {
-        mailAccountService.update(updateReqVO);
+        mailAccountService.updateMailAccount(updateReqVO);
         return success(true);
     }
 
@@ -52,18 +48,15 @@ public class MailAccountController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-account:delete')")
     public CommonResult<Boolean> deleteMailAccount(@RequestParam Long id) {
-        mailAccountService.delete(id);
+        mailAccountService.deleteMailAccount(id);
         return success(true);
     }
 
-    // TODO @wangjingyi：getMailAccount 和 getMailAccountPage 这两个接口，定义一个对应的 Resp 类哈，参考别的模块。主要不要返回 password 字段。
-    // 一个可以的做法，是 MailAccountBaseVO 不返回 password，然后 MailAccountCreateReqVO、MailAccountUpdateReqVO 添加这个字段 DONE
-
     @GetMapping("/get")
     @ApiOperation("获得邮箱账号")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-account:get')")
-    public CommonResult<MailAccountBaseVO> getMailAccount(@RequestParam("id") Long id) {
+    public CommonResult<MailAccountRespVO> getMailAccount(@RequestParam("id") Long id) {
         MailAccountDO mailAccountDO = mailAccountService.getMailAccount(id);
         return success(MailAccountConvert.INSTANCE.convert(mailAccountDO));
     }
@@ -76,14 +69,10 @@ public class MailAccountController {
         return success(MailAccountConvert.INSTANCE.convertPage(pageResult));
     }
 
-    // TODO @wangjingyi：getSimpleMailAccountList 单独定义一个类，只返回精简的信息，id，from 即可。像密码之类都是敏感信息，不应该返回 DONE
-
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获得邮箱账号精简列表")
-    public CommonResult<List<MailAccountBaseVO>> getSimpleMailAccountList() {
+    public CommonResult<List<MailAccountSimpleRespVO>> getSimpleMailAccountList() {
         List<MailAccountDO> list = mailAccountService.getMailAccountList();
-        // 排序后，返回给前端
-        list.sort(Comparator.comparing(MailAccountDO::getId));
         return success(MailAccountConvert.INSTANCE.convertList02(list));
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 8e392d4766..7a3f2347fd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -1,33 +1,41 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 
-@ApiModel("管理后台 - 邮箱账号基类 Base VO")
+/**
+ * 邮箱账号 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class MailAccountBaseVO {
 
-    @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
-    @NotNull(message = "邮箱必填")
-    @Email(message = "必须是Email格式")
-    private String fromAddress;
+    @ApiModelProperty(value = "邮箱", required = true, example = "yudaoyuanma@123.com")
+    @NotNull(message = "邮箱不能为空")
+    @Email(message = "必须是 Email 格式")
+    private String mail;
 
-    @ApiModelProperty(value = "用户名",required = true,example = "yudao")
-    @NotNull(message = "用户名必填")
+    @ApiModelProperty(value = "用户名", required = true, example = "yudao")
+    @NotNull(message = "用户名不能为空")
     private String username;
 
-    @ApiModelProperty(value = "网站",required = true,example = "www.iocoder.cn")
-    @NotNull(message = "网站必填")
+    @ApiModelProperty(value = "密码", required = true, example = "123456")
+    @NotNull(message = "密码必填")
+    private String password;
+
+    @ApiModelProperty(value = "网站", required = true, example = "www.iocoder.cn")
+    @NotNull(message = "网站不能为空")
     private String host;
 
-    @ApiModelProperty(value = "端口",required = true,example = "80")
+    @ApiModelProperty(value = "端口", required = true, example = "80")
+    @NotNull(message = "端口不能为空")
     private Integer port;
 
-    @ApiModelProperty(value = "是否开启ssl",required = true,example = "2")
-    @NotNull(message = "是否开启ssl必填")
+    @ApiModelProperty(value = "是否开启 ssl", required = true, example = "true")
+    @NotNull(message = "是否开启 ssl 必填")
     private Boolean sslEnable;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
index 476a3077aa..2bcca7850a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java
@@ -14,7 +14,4 @@ import javax.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class MailAccountCreateReqVO extends MailAccountBaseVO {
 
-    @ApiModelProperty(value = "密码",required = true,example = "123456")
-    @NotNull(message = "密码必填")
-    private String password;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
index 327c8465de..9e5869172f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java
@@ -13,21 +13,10 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class MailAccountPageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
-    private String fromAddress;
+    @ApiModelProperty(value = "邮箱", required = true, example = "yudaoyuanma@123.com")
+    private String mail;
 
     @ApiModelProperty(value = "用户名" , required = true , example = "yudao")
     private String username;
 
-    @ApiModelProperty(value = "密码" , required = true , example = "123456")
-    private String password;
-
-    @ApiModelProperty(value = "网站" , required = true , example = "www.iocoder.cn")
-    private String host;
-
-    @ApiModelProperty(value = "端口" , required = true , example = "80")
-    private String port;
-
-    @ApiModelProperty(value = "是否开启ssl" , required = true , example = "2")
-    private Boolean sslEnable;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java
new file mode 100644
index 0000000000..9eef7281a8
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@ApiModel("管理后台 - 邮箱账号 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailAccountRespVO extends MailAccountBaseVO {
+
+    @ApiModelProperty(value = "编号", required = true, example = "1024")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java
new file mode 100644
index 0000000000..93118388e3
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("管理后台 - 邮箱账号的精简 Response VO")
+@Data
+public class MailAccountSimpleRespVO {
+
+    @ApiModelProperty(value = "邮箱比那好", required = true, example = "1024")
+    private Long id;
+
+    @ApiModelProperty(value = "邮箱", required = true, example = "768541388@qq.com")
+    private String mail;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
index 4544e95b55..43a13ad18b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java
@@ -18,7 +18,4 @@ public class MailAccountUpdateReqVO extends MailAccountBaseVO {
     @NotNull(message = "编号不能为空")
     private Long id;
 
-    @ApiModelProperty(value = "密码",required = true,example = "123456")
-    @NotNull(message = "密码必填")
-    private String password;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index b60ac088ff..daadbfe5a6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.system.convert.mail;
 import cn.hutool.extra.mail.MailAccount;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import org.mapstruct.Mapper;
@@ -14,30 +16,33 @@ import java.util.Map;
 
 @Mapper
 public interface MailAccountConvert {
+
     MailAccountConvert INSTANCE = Mappers.getMapper(MailAccountConvert.class);
 
-    MailAccountDO convert (MailAccountBaseVO mailAccountBaseVO);
+    MailAccountDO convert(MailAccountBaseVO bean);
 
-    MailAccountBaseVO convert (MailAccountDO mailAccountDO);
+    MailAccountRespVO convert(MailAccountDO bean);
 
-    PageResult<MailAccountBaseVO>  convertPage(PageResult<MailAccountDO> pageResult);
+    PageResult<MailAccountBaseVO> convertPage(PageResult<MailAccountDO> pageResult);
 
-    List<MailAccountBaseVO> convertList02(List<MailAccountDO> list);
+    List<MailAccountSimpleRespVO> convertList02(List<MailAccountDO> list);
 
-    default MailAccount convertAccount(MailSendMessage mailAccountDO){
+    // TODO 芋艿：改下
+    default MailAccount convertAccount(MailSendMessage bean) {
         return new MailAccount()
-                .setHost(mailAccountDO.getHost())
-                .setPort(mailAccountDO.getPort())
+                .setHost(bean.getHost())
+                .setPort(bean.getPort())
                 .setAuth(true)
-                .setFrom(mailAccountDO.getFromAddress())
-                .setUser(mailAccountDO.getUsername())
-                .setPass(mailAccountDO.getPassword())
-                .setSslEnable(mailAccountDO.getSslEnable());
+                .setFrom(bean.getFromAddress())
+                .setUser(bean.getUsername())
+                .setPass(bean.getPassword())
+                .setSslEnable(bean.getSslEnable());
     }
 
+    // TODO 芋艿：改下
     default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
         Map<String , String> map = new HashMap<>();
-        map.put("from_address" , mailAccountDO.getFromAddress());
+        map.put("from_address" , mailAccountDO.getMail());
         map.put("username" , mailAccountDO.getUsername());
         map.put("content" , content);
         return map;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index 910440df7a..33e6859e24 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -1,14 +1,14 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 邮箱账号
- * 配置发送邮箱的账号
+ * 邮箱账号 DO
+ *
+ * 用途：配置发送邮箱的账号
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -25,7 +25,8 @@ public class MailAccountDO extends BaseDO {
     /**
      * 邮箱
      */
-    private String fromAddress;
+    private String mail;
+
     /**
      * 用户名
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index d4b0e5f811..598b52cfca 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.system.enums.mail.MailLogUserTypeEnum;
 import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,7 +13,7 @@ import java.util.Date;
 import java.util.Map;
 
 /**
- * 邮箱日志
+ * 邮箱日志 DO
  * 记录每一次邮件的发送
  *
  * @author wangjingyi
@@ -29,7 +29,7 @@ import java.util.Map;
 public class MailLogDO extends BaseDO implements Serializable {
 
     /**
-     * 主键
+     * 日志编号，自增
      */
     private Long id;
 
@@ -37,62 +37,74 @@ public class MailLogDO extends BaseDO implements Serializable {
      * 用户编码
      */
     private Long userId;
-
     /**
      * 用户类型
      *
-     * 冗余 {@link MailLogUserTypeEnum#getUserType}
+     * 枚举 {@link UserTypeEnum}
      */
     private Integer userType;
+    /**
+     * 接收邮箱地址
+     */
+    private String toMail;
 
-    // TODO @wangjingyi：accountId
     /**
      * 邮箱账号编号
+     *
+     * 关联 {@link MailAccountDO#getId()}
      */
     private Long accountId;
-
-    // TODO @wangjingyi：如果是冗余字段，记得 @ 下；DONE
     /**
-     * 邮箱账号
+     * 发送邮箱地址
      *
-     * 冗余 {@link MailAccountDO}
+     * 冗余 {@link MailAccountDO#getMail()}
      */
-    private String fromAddress;
+    private String fromMail;
 
+    // ========= 模板相关字段 =========
     /**
-     * 模版主键
+     * 模版编号
+     *
+     * 关联 {@link MailTemplateDO#getId()}
      */
     private Long templateId;
-
+    /**
+     * 末班编码
+     *
+     * 冗余 {@link MailTemplateDO#getCode()}
+     */
+    private String templateCode;
     /**
      * 模版内容
+     *
+     * 基于 {@link MailTemplateDO#getContent()} 格式化后的内容
      */
     private String templateContent;
-
     /**
+     * 模版参数
+     *
      * 基于 {@link MailTemplateDO#getParams()} 输入后的参数
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String,Object> templateParams;
 
-    /**
-     * 发送时间
-     */
-    private Date sendTime;
-
-    //=========接收相关字段=========
+    // ========= 发送相关字段 =========
     /**
      * 发送状态
      *
      * 枚举 {@link MailSendStatusEnum}
      */
     private Integer sendStatus;
+    /**
+     * 发送时间
+     */
+    private Date sendTime;
 
+    // ========= 接收相关字段 =========
     /**
      * 发送结果
      */
     private String sendResult;
-
     /**
      *  消息ID
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index c4708657f5..c3c1cae83e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 import java.util.List;
 
 /**
- * 邮箱模版
+ * 邮箱模版 DO
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -34,9 +34,12 @@ public class MailTemplateDO extends BaseDO {
      */
     private String code;
     /**
-     * 邮箱账号主键
+     * 发送的邮箱账号编号
+     *
+     * 关联 {@link MailAccountDO#getId()}
      */
     private Long accountId;
+
     /**
      * 标题
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index 1e4f263acd..24ce1ef067 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -2,37 +2,19 @@ package cn.iocoder.yudao.module.system.dal.mysql.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Date;
 
 @Mapper
 public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
 
     default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) {
-        return selectPage(pageReqVO, new QueryWrapperX<MailAccountDO>()
-                .likeIfPresent("from_address" , pageReqVO.getFromAddress())
-                .likeIfPresent("host" , pageReqVO.getHost())
-                .likeIfPresent("username" , pageReqVO.getUsername())
-                .eqIfPresent("password" , pageReqVO.getPassword())
-                .eqIfPresent("port" , pageReqVO.getPort())
-        );
-    }
-
-    default MailAccountDO selectByUserName(String userName){
-        return selectOne(new QueryWrapperX<MailAccountDO>()
-                .eqIfPresent("username" , userName));
-    }
-
-    default MailAccountDO selectByUserNameAndId(String userName,Long id){
-        return selectOne(new QueryWrapperX<MailAccountDO>()
-                .eqIfPresent("username" , userName)
-                .neIfPresent("id" , id));
+        return selectPage(pageReqVO, new LambdaQueryWrapperX<MailAccountDO>()
+                .likeIfPresent(MailAccountDO::getMail, pageReqVO.getMail())
+                .likeIfPresent(MailAccountDO::getUsername , pageReqVO.getUsername()));
     }
 
     default MailAccountDO selectOneByFrom(String from){
@@ -40,6 +22,4 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
                 .eqIfPresent("from_address" , from));
     }
 
-    @Select("SELECT COUNT(*) FROM system_mail_account WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(Date maxUpdateTime);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
index d7d1cd73c9..86bb5e8f5f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -36,5 +37,10 @@ public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
     default MailTemplateDO selectOneByAccountId(Long accountId){
         return selectOne(new QueryWrapperX<MailTemplateDO>()
                 .eqIfPresent("account_id" , accountId));
-    };
+    }
+
+    default Long selectCountByAccountId(Long accountId) {
+        return selectCount(MailTemplateDO::getAccountId, accountId);
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index 50c5055123..8b92ee9536 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -55,7 +55,7 @@ public class MailProducer {
     public void sendMailSendMessage(Long sendLogId,MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content,List<KeyValue<String, Object>> templateParams,String to) {
         MailSendMessage message = new MailSendMessage();
         message.setContent(content)
-        .setFromAddress(mailAccountDO.getFromAddress())
+        .setFromAddress(mailAccountDO.getMail())
         .setHost(mailAccountDO.getHost())
         .setPort(mailAccountDO.getPort())
         .setPassword(mailAccountDO.getPassword())
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index fe0615f4f9..2c90a91219 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -28,21 +28,21 @@ public interface MailAccountService {
      * @param createReqVO 邮箱账号信息
      * @return 编号
      */
-    Long create(@Valid MailAccountCreateReqVO createReqVO);
+    Long createMailAccount(@Valid MailAccountCreateReqVO createReqVO);
 
     /**
      * 修改邮箱账号
      *
      * @param updateReqVO 邮箱账号信息
      */
-    void update(@Valid MailAccountUpdateReqVO updateReqVO);
+    void updateMailAccount(@Valid MailAccountUpdateReqVO updateReqVO);
 
     /**
      * 删除邮箱账号
      *
      * @param id 编号
      */
-    void delete(Long id);
+    void deleteMailAccount(Long id);
 
     /**
      * 获取邮箱账号信息
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 16d65b4f9c..662d77623a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -85,4 +85,12 @@ public interface MailTemplateService {
      */
     String formatMailTemplateContent(String content, Map<String, String> params);
 
+    /**
+     * 获得指定邮箱账号下的邮件模板数量
+     *
+     * @param accountId 账号编号
+     * @return 数量
+     */
+    long countByAccountId(Long accountId);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
index 3ae44693ba..2da58091bc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
@@ -1,32 +1,28 @@
 package cn.iocoder.yudao.module.system.service.mail.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
-import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
-
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS;
 
 /**
  * 邮箱账号 Service 实现类
@@ -43,7 +39,7 @@ public class MailAccountServiceImpl implements MailAccountService {
     private MailAccountMapper mailAccountMapper;
 
     @Resource
-    private MailTemplateMapper mailTemplateMapper;
+    private MailTemplateService mailTemplateService;
 
     @Resource
     private MailProducer mailProducer;
@@ -56,75 +52,61 @@ public class MailAccountServiceImpl implements MailAccountService {
      */
     private volatile Map<Long, MailAccountDO> mailAccountCache;
 
-    /**
-     * 缓存菜单的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    private volatile Date maxUpdateTime;
-
     @Override
     @PostConstruct
     public void initLocalCache() {
-        List<MailAccountDO> mailAccountDOList = this.loadMailAccountIfUpdate(maxUpdateTime);
-        if (CollUtil.isEmpty(mailAccountDOList)) {
-            return;
-        }
+        // 第一步：查询数据
+        List<MailAccountDO> accounts = mailAccountMapper.selectList();
+        log.info("[initLocalCache][缓存邮箱账号，数量:{}]", accounts.size());
 
-        // 写入缓存
-        mailAccountCache = CollectionUtils.convertMap(mailAccountDOList, MailAccountDO::getId);
-        maxUpdateTime = CollectionUtils.getMaxValue(mailAccountDOList, MailAccountDO::getUpdateTime);
-        log.info("[initLocalCache][初始化 MailAccount 数量为 {}]", mailAccountDOList.size());
-    }
-
-    private List<MailAccountDO> loadMailAccountIfUpdate(Date maxUpdateTime) {
-        //第一步 判断是否需要更新
-        if(null == maxUpdateTime){ // 如果更新时间为空，说明 DB 一定有新数据
-            log.info("[loadMailAccountIfUpdate][首次加载全量账号信息]");
-        }else{ // 判断数据库中是否有更新的账号信息
-            if (mailAccountMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                return null;
-            }
-            log.info("[loadMailAccountIfUpdate][增量加载全量账号信息]");
-        }
-        return mailAccountMapper.selectList();
+        // 第二步：构建缓存
+        mailAccountCache = convertMap(accounts, MailAccountDO::getId);
     }
 
     @Override
-    public Long create(MailAccountCreateReqVO createReqVO) {
-        // username 要校验唯一
-        this.validateMailAccountOnlyByUserName(createReqVO.getUsername());
-        MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(createReqVO);
-        mailAccountMapper.insert(mailAccountDO);
+    public Long createMailAccount(MailAccountCreateReqVO createReqVO) {
+        // 插入
+        MailAccountDO account = MailAccountConvert.INSTANCE.convert(createReqVO);
+        mailAccountMapper.insert(account);
 
-        // 更新
+        // 发送刷新消息
         mailProducer.sendMailAccountRefreshMessage();
-        return mailAccountDO.getId();
+        return account.getId();
     }
 
     @Override
-    public void update(MailAccountUpdateReqVO updateReqVO) {
-        // username 要校验唯一 TODO @wangjingyi：校验唯一的时候，需要排除掉自己 DONE
-        this.validateMailAccountOnlyByUserNameAndId(updateReqVO.getUsername(),updateReqVO.getId());
-        MailAccountDO mailAccountDO = MailAccountConvert.INSTANCE.convert(updateReqVO);
+    public void updateMailAccount(MailAccountUpdateReqVO updateReqVO) {
         // 校验是否存在
-        validateMailAccountExists(mailAccountDO.getId());
+        validateMailAccountExists(updateReqVO.getId());
 
         // 更新
+        MailAccountDO updateObj = MailAccountConvert.INSTANCE.convert(updateReqVO);
+        mailAccountMapper.updateById(updateObj);
+        // 发送刷新消息
         mailProducer.sendMailAccountRefreshMessage();
-        mailAccountMapper.updateById(mailAccountDO);
     }
 
     @Override
-    public void delete(Long id) {
+    public void deleteMailAccount(Long id) {
         // 校验是否存在账号
         validateMailAccountExists(id);
         // 校验是否存在关联模版
-        validateMailTemplateByAccountId(id);
+        if (mailTemplateService.countByAccountId(id) > 0) {
+            throw exception(MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS);
+        }
+
         // 删除
         mailAccountMapper.deleteById(id);
-        // 更新
+        // 发送刷新消息
         mailProducer.sendMailAccountRefreshMessage();
     }
 
+    private void validateMailAccountExists(Long id) {
+        if (mailAccountMapper.selectById(id) == null) {
+            throw exception(MAIL_ACCOUNT_NOT_EXISTS);
+        }
+    }
+
     @Override
     public MailAccountDO getMailAccount(Long id) {
         return mailAccountMapper.selectById(id);
@@ -140,33 +122,4 @@ public class MailAccountServiceImpl implements MailAccountService {
         return mailAccountMapper.selectList();
     }
 
-    private void validateMailAccountExists(Long id) {
-        if (mailAccountMapper.selectById(id) == null) {
-            throw exception(MAIL_ACCOUNT_NOT_EXISTS);
-        }
-    }
-
-    private void validateMailAccountOnlyByUserName(String userName){
-        mailAccountCache.forEach((key,value)->{
-            if(value.getUsername().equals(userName)){
-                throw exception(MAIL_ACCOUNT_EXISTS);
-            }
-        });
-    }
-    private void validateMailAccountOnlyByUserNameAndId(String userName,Long id){
-        mailAccountCache.forEach((key , value)->{
-            if (value.getUsername().equals(userName)){
-                if (!key.equals(id)){
-                    throw exception(MAIL_ACCOUNT_EXISTS);
-                }
-            }
-        });
-    }
-    private void validateMailTemplateByAccountId(Long accountId){
-        MailTemplateDO mailTemplateDO =  mailTemplateMapper.selectOneByAccountId(accountId);
-        if (mailTemplateDO != null) {
-            // TODO wangjingyi：MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS DONE
-            throw exception(MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS);
-        }
-    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index a7bf04fc76..c489ad9bb2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -9,7 +9,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
 import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -51,7 +50,7 @@ public class MailLogServiceImpl implements MailLogService {
         logDOBuilder.sendStatus(Objects.equals(isSend, true) ? MailSendStatusEnum.INIT.getStatus()
                 : MailSendStatusEnum.IGNORE.getStatus())
                 // 设置邮箱相关字段
-                .fromAddress(mailAccountDO.getFromAddress())
+                .fromMail(mailAccountDO.getMail())
                 .accountId(mailAccountDO.getId())
                 // TODO @wangjingyi：userId、userType
                 //用户信息
@@ -60,7 +59,7 @@ public class MailLogServiceImpl implements MailLogService {
                 .templateId(template.getId()).templateParams(templateParams).templateContent(templateContent);
 
 
-        logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
+        logDOBuilder.fromMail(mailAccountDO.getMail());
         logDOBuilder.accountId(mailAccountDO.getId());
         // TODO @wangjingyi：每个接收人一条日志。发送多个人，就调用多次，业务方。因为某个邮箱有问题，会导致所有都发送失败。 DONE
         // 设置模板相关字段
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 3fcac8b9e5..9ae635cee6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -53,19 +53,19 @@ public class MailTemplateServiceImpl implements MailTemplateService {
      */
     private volatile Map<Long, MailTemplateDO> mailTemplateCache;
 
-    private volatile Date maxUpdateTime;
-
     @Override
     @PostConstruct
     public void initLocalCache() {
-        List<MailTemplateDO> mailTemplateDOList = this.loadMailTemplateIfUpdate(maxUpdateTime);
+        if (true) {
+            return;
+        }
+        List<MailTemplateDO> mailTemplateDOList = this.loadMailTemplateIfUpdate(null);
         if (CollUtil.isEmpty(mailTemplateDOList)) {
             return;
         }
 
         // 写入缓存
         mailTemplateCache = CollectionUtils.convertMap(mailTemplateDOList, MailTemplateDO::getId);
-        maxUpdateTime = CollectionUtils.getMaxValue(mailTemplateDOList, MailTemplateDO::getUpdateTime);
         log.info("[initLocalCache][初始化 mailTemplate 数量为 {}]", mailTemplateDOList.size());
     }
 
@@ -156,4 +156,10 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         // 第二步，如果有更新，则从数据库加载所有邮件模板
         return mailTemplateMapper.selectList();
     }
+
+    @Override
+    public long countByAccountId(Long accountId) {
+        return mailTemplateMapper.selectCountByAccountId(accountId);
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
index 592864651e..d126fbf0f4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
@@ -81,7 +81,7 @@ public class SmsChannelServiceImpl implements SmsChannelService {
     public void deleteSmsChannel(Long id) {
         // 校验存在
         this.validateSmsChannelExists(id);
-        // 校验是否有字典数据
+        // 校验是否有在使用该账号的模版
         if (smsTemplateService.countByChannelId(id) > 0) {
             throw exception(SMS_CHANNEL_HAS_CHILDREN);
         }
diff --git a/yudao-ui-admin/src/api/system/mail/account.js b/yudao-ui-admin/src/api/system/mail/account.js
new file mode 100755
index 0000000000..171fe553fc
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/mail/account.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 创建邮箱账号
+export function createMailAccount(data) {
+  return request({
+    url: '/system/mail-account/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新邮箱账号
+export function updateMailAccount(data) {
+  return request({
+    url: '/system/mail-account/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邮箱账号
+export function deleteMailAccount(id) {
+  return request({
+    url: '/system/mail-account/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得邮箱账号
+export function getMailAccount(id) {
+  return request({
+    url: '/system/mail-account/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮箱账号分页
+export function getMailAccountPage(query) {
+  return request({
+    url: '/system/mail-account/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/yudao-ui-admin/src/views/system/mail/account/index.vue b/yudao-ui-admin/src/views/system/mail/account/index.vue
new file mode 100755
index 0000000000..f3821d8bcd
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/mail/account/index.vue
@@ -0,0 +1,226 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="邮箱" prop="mail">
+        <el-input v-model="queryParams.mail" placeholder="请输入邮箱" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model="queryParams.username" placeholder="请输入用户名" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:mail-account:create']">新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="邮箱" align="center" prop="mail" />
+      <el-table-column label="用户名" align="center" prop="username" />
+      <el-table-column label="主机" align="center" prop="host" />
+      <el-table-column label="端口" align="center" prop="port" />
+      <el-table-column label="是否开启 SSL" align="center" prop="sslEnable">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.sslEnable" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:mail-account:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:mail-account:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="邮箱" prop="mail">
+          <el-input v-model="form.mail" placeholder="请输入邮箱" />
+        </el-form-item>
+        <el-form-item label="用户名" prop="username">
+          <el-input v-model="form.username" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="主机" prop="host">
+          <el-input v-model="form.host" placeholder="请输入主机" />
+        </el-form-item>
+        <el-form-item label="端口" prop="port">
+          <el-input v-model="form.port" placeholder="请输入端口" />
+        </el-form-item>
+        <el-form-item label="是否开启 SSL" prop="sslEnable">
+          <el-radio-group v-model="form.sslEnable">
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                      :key="dict.value" :label="dict.value === 'true'">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createMailAccount, updateMailAccount, deleteMailAccount, getMailAccount, getMailAccountPage } from "@/api/system/mail/account";
+
+export default {
+  name: "MailAccount",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 邮箱账号列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        mail: null,
+        username: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        mail: [{ required: true, message: "邮箱不能为空", trigger: "blur" }],
+        username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
+        password: [{ required: true, message: "密码不能为空", trigger: "blur" }],
+        host: [{ required: true, message: "主机不能为空", trigger: "blur" }],
+        port: [{ required: true, message: "端口不能为空", trigger: "blur" }],
+        sslEnable: [{ required: true, message: "是否开启 SSL不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getMailAccountPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        mail: undefined,
+        username: undefined,
+        password: undefined,
+        host: undefined,
+        port: undefined,
+        sslEnable: true,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加邮箱账号";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getMailAccount(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改邮箱账号";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateMailAccount(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createMailAccount(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除邮箱账号编号为"' + id + '"的数据项?').then(function() {
+          return deleteMailAccount(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>

From ea39dcc5c803ffd0a569243cb2a678ebc0d04b1b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 20:44:48 +0800
Subject: [PATCH 38/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20template=20=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |   8 +-
 .../admin/mail/MailTemplateController.java    |  35 +--
 .../mail/vo/account/MailAccountBaseVO.java    |   8 +-
 .../vo/account/MailAccountSimpleRespVO.java   |   2 +-
 .../mail/vo/template/MailTemplateBaseVO.java  |  41 +--
 .../vo/template/MailTemplateCreateReqVO.java  |   3 +-
 .../vo/template/MailTemplatePageReqVO.java    |  41 ++-
 .../mail/vo/template/MailTemplateRespVO.java  |  25 +-
 .../vo/template/MailTemplateSimpleRespVO.java |  17 ++
 .../vo/template/MailTemplateUpdateReqVO.java  |   3 +-
 .../convert/mail/MailTemplateConvert.java     |  11 +-
 .../dal/dataobject/mail/MailAccountDO.java    |   4 +-
 .../system/dal/dataobject/mail/MailLogDO.java |  12 +-
 .../dal/dataobject/mail/MailTemplateDO.java   |   6 +-
 .../dal/mysql/mail/MailTemplateMapper.java    |  33 +--
 .../service/mail/MailTemplateService.java     |  36 +--
 .../mail/impl/MailTemplateServiceImpl.java    | 120 ++++----
 .../src/main/resources/application.yaml       |   3 +
 yudao-ui-admin/src/api/system/mail/account.js |   8 +
 .../src/api/system/mail/template.js           |  44 +++
 .../src/views/system/mail/account/index.vue   |  20 +-
 .../src/views/system/mail/template/index.vue  | 269 ++++++++++++++++++
 22 files changed, 550 insertions(+), 199 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java
 create mode 100755 yudao-ui-admin/src/api/system/mail/template.js
 create mode 100755 yudao-ui-admin/src/views/system/mail/template/index.vue

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 135248867d..577fcb2ade 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -145,9 +145,9 @@ public interface ErrorCodeConstants {
     ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002023000, "邮箱账号不存在");
     ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002023001, "无法删除，该邮箱账号还有邮件模板");
 
-    // ========== 邮箱模版 1002021000 ==========
-    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002021000, "邮箱模版不存在");
-    ErrorCode MAIL_TEMPLATE_EXISTS = new ErrorCode(1002021001, "邮箱模版存在");
-    ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002021003, "模板参数({})缺失");
+    // ========== 邮箱模版 1002024000 ==========
+    ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002024000, "邮件模版不存在");
+    ErrorCode MAIL_TEMPLATE_CODE_EXISTS = new ErrorCode(1002024001, "邮件模版 code({}) 已存在");
+    ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002021003, "模板参数({})缺失"); // TODO 优化
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
index 2fae6164b8..741462c950 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.*;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
@@ -10,13 +9,11 @@ import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
-
-import java.util.Comparator;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -26,37 +23,35 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/system/mail-template")
 public class MailTemplateController {
 
-    // TODO @wangjingyi：private DONE
-    @Autowired
+    @Resource
     private MailTemplateService mailTempleService;
 
     @PostMapping("/create")
-    @ApiOperation("创建邮箱模版")
+    @ApiOperation("创建邮件模版")
     @PreAuthorize("@ss.hasPermission('system:mail-template:create')")
     public CommonResult<Long> createMailTemplate(@Valid @RequestBody MailTemplateCreateReqVO createReqVO){
-        return success(mailTempleService.create(createReqVO));
+        return success(mailTempleService.createMailTemplate(createReqVO));
     }
 
     @PutMapping("/update")
-    @ApiOperation("修改邮箱模版")
+    @ApiOperation("修改邮件模版")
     @PreAuthorize("@ss.hasPermission('system:mail-template:update')")
     public CommonResult<Boolean> updateMailTemplate(@Valid @RequestBody MailTemplateUpdateReqVO updateReqVO){
-        mailTempleService.update(updateReqVO);
+        mailTempleService.updateMailTemplate(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除邮箱模版")
+    @ApiOperation("删除邮件模版")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-template:delete')")
-    public CommonResult<Boolean> deleteMailTemplate(@Valid @RequestBody Long id) {
-        mailTempleService.delete(id);
+    public CommonResult<Boolean> deleteMailTemplate(@RequestParam("id") Long id) {
+        mailTempleService.deleteMailTemplate(id);
         return success(true);
     }
 
-    // TODO @wangjingyi：下面几个 VO 也参考我在 account 给的建议 DONE RespVO中需要BaseVO 中哪些字段
-
     @GetMapping("/get")
-    @ApiOperation("获得邮箱模版")
+    @ApiOperation("获得邮件模版")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('system:mail-template:get')")
     public CommonResult<MailTemplateRespVO> getMailTemplate(@RequestParam("id") Long id) {
@@ -65,7 +60,7 @@ public class MailTemplateController {
     }
 
     @GetMapping("/page")
-    @ApiOperation("获得邮箱模版分页")
+    @ApiOperation("获得邮件模版分页")
     @PreAuthorize("@ss.hasPermission('system:mail-template:query')")
     public CommonResult<PageResult<MailTemplateRespVO>> getMailTemplatePage(@Valid MailTemplatePageReqVO pageReqVO) {
         PageResult<MailTemplateDO> pageResult = mailTempleService.getMailTemplatePage(pageReqVO);
@@ -73,11 +68,9 @@ public class MailTemplateController {
     }
 
     @GetMapping("/list-all-simple")
-    @ApiOperation(value = "获得邮箱模版精简列表")
-    public CommonResult<List<MailTemplateRespVO>> getSimpleTemplateList() {
+    @ApiOperation(value = "获得邮件模版精简列表")
+    public CommonResult<List<MailTemplateSimpleRespVO>> getSimpleTemplateList() {
         List<MailTemplateDO> list = mailTempleService.getMailTemplateList();
-        // 排序后，返回给前端
-        list.sort(Comparator.comparing(MailTemplateDO::getId));
         return success(MailTemplateConvert.INSTANCE.convertList02(list));
     }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
index 7a3f2347fd..ef18cb6ac5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java
@@ -26,12 +26,12 @@ public class MailAccountBaseVO {
     @NotNull(message = "密码必填")
     private String password;
 
-    @ApiModelProperty(value = "网站", required = true, example = "www.iocoder.cn")
-    @NotNull(message = "网站不能为空")
+    @ApiModelProperty(value = "SMTP 服务器域名", required = true, example = "www.iocoder.cn")
+    @NotNull(message = "SMTP 服务器域名不能为空")
     private String host;
 
-    @ApiModelProperty(value = "端口", required = true, example = "80")
-    @NotNull(message = "端口不能为空")
+    @ApiModelProperty(value = "SMTP 服务器端口", required = true, example = "80")
+    @NotNull(message = "SMTP 服务器端口不能为空")
     private Integer port;
 
     @ApiModelProperty(value = "是否开启 ssl", required = true, example = "true")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java
index 93118388e3..96916a7151 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java
@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class MailAccountSimpleRespVO {
 
-    @ApiModelProperty(value = "邮箱比那好", required = true, example = "1024")
+    @ApiModelProperty(value = "邮箱编号", required = true, example = "1024")
     private Long id;
 
     @ApiModelProperty(value = "邮箱", required = true, example = "768541388@qq.com")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
index 1e44336aac..e2835debd4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java
@@ -1,44 +1,47 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
 
-import io.swagger.annotations.ApiModel;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
-@ApiModel("管理后台 - 邮箱模版基类 Base VO")
+/**
+ * 邮件模版 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class MailTemplateBaseVO {
-    @ApiModelProperty("主键")
-    @NotNull(message = "主键不能为空")
-    private Long id;
 
-    @ApiModelProperty("名称")
+    @ApiModelProperty(value = "模版名称", required = true, example = "测试名字")
     @NotNull(message = "名称不能为空")
     private String name;
 
-    @ApiModelProperty("标识")
-    @NotNull(message = "邮箱模版code不能为空")
+    @ApiModelProperty(value = "模版编号", required = true, example = "test")
+    @NotNull(message = "模版编号不能为空")
     private String code;
 
-    @ApiModelProperty("发件人")
-    @NotNull(message = "发件人不能为空")
-    @Email(message = "发件人格式有误")
-    private String username;
+    @ApiModelProperty(value = "发送的邮箱账号编号", required = true, example = "1")
+    @NotNull(message = "发送的邮箱账号编号不能为空")
+    private Long accountId;
 
-    @ApiModelProperty("标题")
-    @NotNull(message = "标题不能为空")
+    @ApiModelProperty(value = "发送人名称", example = "芋头")
+    private String nickname;
+
+    @ApiModelProperty(value = "标题", required = true, example = "注册成功")
+    @NotEmpty(message = "标题不能为空")
     private String title;
 
-    @ApiModelProperty("内容")
-    @NotNull(message = "内容不能为空")
+    @ApiModelProperty(value = "内容", required = true, example = "你好，注册成功啦")
+    @NotEmpty(message = "内容不能为空")
     private String content;
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
     @NotNull(message = "状态不能为空")
     private Integer status;
 
-    @ApiModelProperty("备注")
+    @ApiModelProperty(value = "备注", example = "奥特曼")
     private String remark;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
index 2311cb087b..6eab6e9ab8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java
@@ -5,11 +5,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-@ApiModel("管理后台 - 邮箱模版创建 Request VO")
+@ApiModel("管理后台 - 邮件模版创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MailTemplateCreateReqVO extends MailTemplateBaseVO {
 
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
index a48c5a91af..f3cec08f9b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java
@@ -6,33 +6,32 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
-@ApiModel("管理后台 - 邮箱模版分页 Request VO")
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 邮件模版分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MailTemplatePageReqVO extends PageParam {
-    @ApiModelProperty("主键")
-    private Long id;
 
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("标识")
-    private String code;
-
-    @ApiModelProperty("发件人")
-    private String username;
-
-    @ApiModelProperty("标题")
-    private String title;
-
-    @ApiModelProperty("内容")
-    private String content;
-
-    @ApiModelProperty("状态")
+    @ApiModelProperty(value = "状态", example = "1", notes = "参见 CommonStatusEnum 枚举")
     private Integer status;
 
-    @ApiModelProperty("备注")
-    private String remark;
+    @ApiModelProperty(value = "标识", example = "code_1024", notes = "模糊匹配")
+    private String code;
+
+    @ApiModelProperty(value = "名称", example = "芋头", notes = "模糊匹配")
+    private String name;
+
+    @ApiModelProperty(value = "账号编号", example = "2048")
+    private Long accountId;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java
index 33683b1c58..a2153f9cdc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java
@@ -1,4 +1,27 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
 
-public class MailTemplateRespVO extends MailTemplateBaseVO{
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("管理后台 - 邮件末班 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailTemplateRespVO extends MailTemplateBaseVO {
+
+    @ApiModelProperty(value = "编号", required = true, example = "1024")
+    private Long id;
+
+    @ApiModelProperty(value = "参数数组", example = "name,code")
+    private List<String> params;
+
+    @ApiModelProperty(value = "创建时间", required = true)
+    private LocalDateTime createTime;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java
new file mode 100644
index 0000000000..2ff4880368
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("管理后台 - 邮件模版的精简 Response VO")
+@Data
+public class MailTemplateSimpleRespVO {
+
+    @ApiModelProperty(value = "模版编号", required = true, example = "1024")
+    private Long id;
+
+    @ApiModelProperty(value = "模版名字", required = true, example = "哒哒哒")
+    private String name;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
index 82d9997bee..5dfa377a2a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java
@@ -8,7 +8,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
 
-@ApiModel("管理后台 - 邮箱模版修改 Request VO")
+@ApiModel("管理后台 - 邮件模版修改 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -17,4 +17,5 @@ public class MailTemplateUpdateReqVO extends MailTemplateBaseVO {
     @ApiModelProperty(value = "编号", required = true, example = "1024")
     @NotNull(message = "编号不能为空")
     private Long id;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
index 46a25b9e2a..4430ffb05d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java
@@ -1,8 +1,7 @@
 package cn.iocoder.yudao.module.system.convert.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -14,12 +13,14 @@ public interface MailTemplateConvert {
 
     MailTemplateConvert INSTANCE = Mappers.getMapper(MailTemplateConvert.class);
 
-    MailTemplateDO convert(MailTemplateBaseVO baseVO);
+    MailTemplateDO convert(MailTemplateUpdateReqVO bean);
 
-    MailTemplateRespVO convert(MailTemplateDO mailTemplateDO);
+    MailTemplateDO convert(MailTemplateCreateReqVO bean);
+
+    MailTemplateRespVO convert(MailTemplateDO bean);
 
     PageResult<MailTemplateRespVO> convertPage(PageResult<MailTemplateDO> pageResult);
 
-    List<MailTemplateRespVO> convertList02(List<MailTemplateDO> list);
+    List<MailTemplateSimpleRespVO> convertList02(List<MailTemplateDO> list);
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index 33e6859e24..b5d349439c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -36,11 +36,11 @@ public class MailAccountDO extends BaseDO {
      */
     private String password;
     /**
-     * 主机
+     * SMTP 服务器域名
      */
     private String host;
     /**
-     * 端口
+     * SMTP 服务器端口
      */
     private Integer port;
     /**
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 598b52cfca..ddd0f71584 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -69,11 +69,21 @@ public class MailLogDO extends BaseDO implements Serializable {
      */
     private Long templateId;
     /**
-     * 末班编码
+     * 模版编码
      *
      * 冗余 {@link MailTemplateDO#getCode()}
      */
     private String templateCode;
+    /**
+     * 模版发送人名称
+     *
+     * 冗余 {@link MailTemplateDO#getNickname()}
+     */
+    private String templateNickname;
+    /**
+     * 模版标题
+     */
+    private String templateTitle;
     /**
      * 模版内容
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
index c3c1cae83e..f669b455f0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 import java.util.List;
 
 /**
- * 邮箱模版 DO
+ * 邮件模版 DO
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -40,6 +40,10 @@ public class MailTemplateDO extends BaseDO {
      */
     private Long accountId;
 
+    /**
+     * 发送人名称
+     */
+    private String nickname;
     /**
      * 标题
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
index 86bb5e8f5f..f03aa4ae99 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.dal.mysql.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
@@ -11,36 +12,24 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.Date;
 
-
 @Mapper
 public interface MailTemplateMapper extends BaseMapperX<MailTemplateDO> {
 
     default PageResult<MailTemplateDO> selectPage(MailTemplatePageReqVO pageReqVO){
-        return selectPage(pageReqVO , new QueryWrapperX<MailTemplateDO>()
-                .likeIfPresent("name" , pageReqVO.getName())
-                .likeIfPresent("username" , pageReqVO.getUsername())
-                .likeIfPresent("title" , pageReqVO.getTitle())
-                .likeIfPresent("content" , pageReqVO.getContent())
-                .eqIfPresent("status" , pageReqVO.getStatus())
-                .likeIfPresent("remark" , pageReqVO.getRemark())
-        );
-    }
-
-    default MailTemplateDO selectOneByCode(String code){
-        return selectOne(new QueryWrapperX<MailTemplateDO>()
-                .eqIfPresent("code" , code));
-    };
-
-    @Select("SELECT COUNT(*) FROM system_mail_template WHERE update_time > #{maxUpdateTime} LIMIT 1")
-    Long selectByMaxUpdateTime(Date maxUpdateTime);
-
-    default MailTemplateDO selectOneByAccountId(Long accountId){
-        return selectOne(new QueryWrapperX<MailTemplateDO>()
-                .eqIfPresent("account_id" , accountId));
+        return selectPage(pageReqVO , new LambdaQueryWrapperX<MailTemplateDO>()
+                .eqIfPresent(MailTemplateDO::getStatus, pageReqVO.getStatus())
+                .likeIfPresent(MailTemplateDO::getCode, pageReqVO.getCode())
+                .likeIfPresent(MailTemplateDO::getName, pageReqVO.getName())
+                .eqIfPresent(MailTemplateDO::getAccountId, pageReqVO.getAccountId())
+                .betweenIfPresent(MailTemplateDO::getCreateTime, pageReqVO.getCreateTime()));
     }
 
     default Long selectCountByAccountId(Long accountId) {
         return selectCount(MailTemplateDO::getAccountId, accountId);
     }
 
+    default MailTemplateDO selectByCode(String code) {
+        return selectOne(MailTemplateDO::getCode, code);
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 662d77623a..704f7d6537 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *  邮箱模版服务类
+ * 邮件模版 Service 接口
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -19,34 +19,34 @@ import java.util.Map;
 public interface MailTemplateService {
 
     /**
-     * 初始化邮箱模版的本地缓存
+     * 初始化邮件模版的本地缓存
      */
     void initLocalCache();
 
     /**
-     * 邮箱模版创建
+     * 邮件模版创建
      *
-     * @param createReqVO 邮箱信息
+     * @param createReqVO 邮件信息
      * @return 编号
      */
-    Long create(@Valid MailTemplateCreateReqVO createReqVO);
+    Long createMailTemplate(@Valid MailTemplateCreateReqVO createReqVO);
 
     /**
-     * 邮箱模版修改
+     * 邮件模版修改
      *
-     * @param updateReqVO 邮箱信息
+     * @param updateReqVO 邮件信息
      */
-    void update(@Valid MailTemplateUpdateReqVO updateReqVO);
+    void updateMailTemplate(@Valid MailTemplateUpdateReqVO updateReqVO);
 
     /**
-     * 邮箱模版删除
+     * 邮件模版删除
      *
      * @param id 编号
      */
-    void delete(Long id);
+    void deleteMailTemplate(Long id);
 
     /**
-     * 获取邮箱模版
+     * 获取邮件模版
      *
      * @param id 编号
      * @return 邮件模版
@@ -54,39 +54,39 @@ public interface MailTemplateService {
     MailTemplateDO getMailTemplate(Long id);
 
     /**
-     * 获取邮箱模版分页
+     * 获取邮件模版分页
      *
      * @param pageReqVO 模版信息
-     * @return 邮箱模版分页信息
+     * @return 邮件模版分页信息
      */
     PageResult<MailTemplateDO> getMailTemplatePage(MailTemplatePageReqVO pageReqVO);
 
     /**
-     * 获取邮箱模板数组
+     * 获取邮件模板数组
      *
      * @return 模版数组
      */
     List<MailTemplateDO> getMailTemplateList();
 
     /**
-     * 从缓存中获取邮箱模版
+     * 从缓存中获取邮件模版
      *
      * @param code 模板编码
-     * @return 邮箱模板
+     * @return 邮件模板
      */
     MailTemplateDO getMailTemplateByCodeFromCache(String code);
 
     /**
      * 邮件模版内容合成
      *
-     * @param content 邮箱模版
+     * @param content 邮件模版
      * @param params 合成参数
      * @return 格式化后的内容
      */
     String formatMailTemplateContent(String content, Map<String, String> params);
 
     /**
-     * 获得指定邮箱账号下的邮件模板数量
+     * 获得指定邮件账号下的邮件模板数量
      *
      * @param accountId 账号编号
      * @return 数量
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
index 9ae635cee6..753614683f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
@@ -2,9 +2,11 @@ package cn.iocoder.yudao.module.system.service.mail.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
@@ -13,6 +15,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -25,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_EXISTS;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 邮箱模版 Service 实现类
@@ -47,56 +50,71 @@ public class MailTemplateServiceImpl implements MailTemplateService {
 
     /**
      * 邮件模板缓存
-     * key：邮箱模板编码 {@link MailTemplateDO#getId()}
+     * key：邮件模版标识 {@link MailTemplateDO#getCode()}
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
-    private volatile Map<Long, MailTemplateDO> mailTemplateCache;
+    private volatile Map<String, MailTemplateDO> mailTemplateCache;
 
     @Override
     @PostConstruct
     public void initLocalCache() {
-        if (true) {
-            return;
-        }
-        List<MailTemplateDO> mailTemplateDOList = this.loadMailTemplateIfUpdate(null);
-        if (CollUtil.isEmpty(mailTemplateDOList)) {
-            return;
-        }
+        // 第一步：查询数据
+        List<MailTemplateDO> templates = mailTemplateMapper.selectList();
+        log.info("[initLocalCache][缓存邮件模版，数量:{}]", templates.size());
 
-        // 写入缓存
-        mailTemplateCache = CollectionUtils.convertMap(mailTemplateDOList, MailTemplateDO::getId);
-        log.info("[initLocalCache][初始化 mailTemplate 数量为 {}]", mailTemplateDOList.size());
+        // 第二步：构建缓存
+        mailTemplateCache = convertMap(templates, MailTemplateDO::getCode);
     }
 
     @Override
-    public Long create(MailTemplateCreateReqVO createReqVO) {
-        // 要校验存在
-        validateMailTemplateExists(createReqVO.getId());
-        MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(createReqVO);
-        mailTemplateMapper.insert(mailTemplateDO);
-        // TODO @wangjingyi：mq 更新 DONE
+    public Long createMailTemplate(MailTemplateCreateReqVO createReqVO) {
+        // 校验 code 是否唯一
+        validateCodeUnique(null, createReqVO.getCode());
+
+        // 插入
+        MailTemplateDO template = MailTemplateConvert.INSTANCE.convert(createReqVO);
+        mailTemplateMapper.insert(template);
+        // 发送刷新消息
         mailProducer.sendMailTemplateRefreshMessage();
-        return mailTemplateDO.getId();
+        return template.getId();
     }
 
     @Override
-    public void update(@Valid MailTemplateUpdateReqVO updateReqVO) {
-        // 校验是否唯一
-        // TODO @wangjingyi：参考下我在 account 给的唯一校验的说明。DONE
-        this.validateMailTemplateOnlyByCode(updateReqVO.getId(),updateReqVO.getCode());
-        MailTemplateDO mailTemplateDO = MailTemplateConvert.INSTANCE.convert(updateReqVO);
-        mailTemplateMapper.updateById(mailTemplateDO);
-        // TODO @wangjingyi：mq 更新 DONE
-        mailProducer.sendMailTemplateRefreshMessage();
-    }
-
-    @Override
-    public void delete(Long id) {
+    public void updateMailTemplate(@Valid MailTemplateUpdateReqVO updateReqVO) {
         // 校验是否存在
-        this.validateMailTemplateExists(id);
+        validateMailTemplateExists(updateReqVO.getId());
+        // 校验 code 是否唯一
+        validateCodeUnique(updateReqVO.getId(),updateReqVO.getCode());
+
+        // 更新
+        MailTemplateDO updateObj = MailTemplateConvert.INSTANCE.convert(updateReqVO);
+        mailTemplateMapper.updateById(updateObj);
+        // 发送刷新消息
+        mailProducer.sendMailTemplateRefreshMessage();
+    }
+
+    @VisibleForTesting
+    public void validateCodeUnique(Long id, String code) {
+        MailTemplateDO template = mailTemplateMapper.selectByCode(code);
+        if (template == null) {
+            return;
+        }
+        // 存在 template 记录的情况下
+        if (id == null // 新增时，说明重复
+                || ObjUtil.notEqual(id, template.getId())) { // 更新时，如果 id 不一致，说明重复
+            throw exception(MAIL_TEMPLATE_CODE_EXISTS);
+        }
+    }
+
+    @Override
+    public void deleteMailTemplate(Long id) {
+        // 校验是否存在
+        validateMailTemplateExists(id);
+
+        // 删除
         mailTemplateMapper.deleteById(id);
-        // TODO @wangjingyi：mq 更新 DONE
+        // 发送刷新消息
         mailProducer.sendMailTemplateRefreshMessage();
     }
 
@@ -122,41 +140,11 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     }
 
     private void validateMailTemplateExists(Long id) {
-        if (mailTemplateCache.get(id) == null) {
+        if (mailTemplateMapper.selectById(id) == null) {
             throw exception(MAIL_TEMPLATE_NOT_EXISTS);
         }
     }
 
-    private void validateMailTemplateOnlyByCode(Long id ,String code){
-        mailTemplateCache.forEach((key,value)->{
-            if (value.getCode().equals(code)){
-                if (!key.equals(id)){
-                    throw exception(MAIL_TEMPLATE_EXISTS);
-                }
-            }
-        });
-    }
-    /**
-     * 如果邮件模板发生变化，从数据库中获取最新的全量邮件模板。
-     * 如果未发生变化，则返回空
-     *
-     * @param maxUpdateTime 当前邮件模板的最大更新时间
-     * @return 邮件模板列表
-     */
-    private List<MailTemplateDO> loadMailTemplateIfUpdate(Date maxUpdateTime) {
-        // 第一步，判断是否要更新。
-        if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据
-            log.info("[loadMailTemplateIfUpdate][首次加载全量邮件模板]");
-        } else { // 判断数据库中是否有更新的邮件模板
-            if (mailTemplateMapper.selectByMaxUpdateTime(maxUpdateTime) == 0) {
-                return null;
-            }
-            log.info("[loadSmsTemplateIfUpdate][增量加载全量邮件模板]");
-        }
-        // 第二步，如果有更新，则从数据库加载所有邮件模板
-        return mailTemplateMapper.selectList();
-    }
-
     @Override
     public long countByAccountId(Long accountId) {
         return mailTemplateMapper.selectCountByAccountId(accountId);
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 325e88f423..e1bcb137e8 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -138,6 +138,9 @@ yudao:
       - system_sms_log
       - system_sensitive_word
       - system_oauth2_client
+      - system_mail_account
+      - system_mail_template
+      - system_mail_log
       - infra_codegen_column
       - infra_codegen_table
       - infra_test_demo
diff --git a/yudao-ui-admin/src/api/system/mail/account.js b/yudao-ui-admin/src/api/system/mail/account.js
index 171fe553fc..0868e4f37a 100755
--- a/yudao-ui-admin/src/api/system/mail/account.js
+++ b/yudao-ui-admin/src/api/system/mail/account.js
@@ -42,3 +42,11 @@ export function getMailAccountPage(query) {
     params: query
   })
 }
+
+// 获取邮箱账号的精简信息列表
+export function getSimpleMailAccountList() {
+  return request({
+    url: '/system/mail-account/list-all-simple',
+    method: 'get',
+  })
+}
diff --git a/yudao-ui-admin/src/api/system/mail/template.js b/yudao-ui-admin/src/api/system/mail/template.js
new file mode 100755
index 0000000000..ee5d8d4540
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/mail/template.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 创建邮件模版
+export function createMailTemplate(data) {
+  return request({
+    url: '/system/mail-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新邮件模版
+export function updateMailTemplate(data) {
+  return request({
+    url: '/system/mail-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邮件模版
+export function deleteMailTemplate(id) {
+  return request({
+    url: '/system/mail-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得邮件模版
+export function getMailTemplate(id) {
+  return request({
+    url: '/system/mail-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮件模版分页
+export function getMailTemplatePage(query) {
+  return request({
+    url: '/system/mail-template/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/yudao-ui-admin/src/views/system/mail/account/index.vue b/yudao-ui-admin/src/views/system/mail/account/index.vue
index f3821d8bcd..96e3cc4616 100755
--- a/yudao-ui-admin/src/views/system/mail/account/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/account/index.vue
@@ -29,8 +29,8 @@
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="邮箱" align="center" prop="mail" />
       <el-table-column label="用户名" align="center" prop="username" />
-      <el-table-column label="主机" align="center" prop="host" />
-      <el-table-column label="端口" align="center" prop="port" />
+      <el-table-column label="SMTP 服务器域名" align="center" prop="host" />
+      <el-table-column label="SMTP 服务器端口" align="center" prop="port" />
       <el-table-column label="是否开启 SSL" align="center" prop="sslEnable">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.sslEnable" />
@@ -56,7 +56,7 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="邮箱" prop="mail">
           <el-input v-model="form.mail" placeholder="请输入邮箱" />
         </el-form-item>
@@ -66,11 +66,11 @@
         <el-form-item label="密码" prop="password">
           <el-input v-model="form.password" placeholder="请输入密码" />
         </el-form-item>
-        <el-form-item label="主机" prop="host">
-          <el-input v-model="form.host" placeholder="请输入主机" />
+        <el-form-item label="SMTP 服务器域名" prop="host">
+          <el-input v-model="form.host" placeholder="请输入 SMTP 服务器域名" />
         </el-form-item>
-        <el-form-item label="端口" prop="port">
-          <el-input v-model="form.port" placeholder="请输入端口" />
+        <el-form-item label="SMTP 服务器端口" prop="port">
+          <el-input v-model="form.port" placeholder="请输入 SMTP 服务器端口" />
         </el-form-item>
         <el-form-item label="是否开启 SSL" prop="sslEnable">
           <el-radio-group v-model="form.sslEnable">
@@ -124,10 +124,10 @@ export default {
         mail: [{ required: true, message: "邮箱不能为空", trigger: "blur" }],
         username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
         password: [{ required: true, message: "密码不能为空", trigger: "blur" }],
-        host: [{ required: true, message: "主机不能为空", trigger: "blur" }],
-        port: [{ required: true, message: "端口不能为空", trigger: "blur" }],
+        host: [{ required: true, message: "SMTP 服务器域名不能为空", trigger: "blur" }],
+        port: [{ required: true, message: "SMTP 服务器端口不能为空", trigger: "blur" }],
         sslEnable: [{ required: true, message: "是否开启 SSL不能为空", trigger: "blur" }],
-      }
+      },
     };
   },
   created() {
diff --git a/yudao-ui-admin/src/views/system/mail/template/index.vue b/yudao-ui-admin/src/views/system/mail/template/index.vue
new file mode 100755
index 0000000000..690e65fbbe
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/mail/template/index.vue
@@ -0,0 +1,269 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模板名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入模板名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="邮箱账号" prop="accountId">
+        <el-select v-model="queryParams.accountId" placeholder="请输入邮箱账号" clearable>
+          <el-option v-for="account in accountOptions" :key="account.id" :value="account.id" :label="account.mail" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:mail-template:create']">新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="code" />
+      <el-table-column label="模板名称" align="center" prop="name" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="邮箱账号" align="center" prop="accountId">
+        <template v-slot="scope">
+          {{ accountOptions.find(account => account.id === scope.row.accountId)?.mail }}
+        </template>
+      </el-table-column>
+      <el-table-column label="发送人名称" align="center" prop="nickname" />
+      <el-table-column label="开启状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:mail-template:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:mail-template:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入模板名称" />
+        </el-form-item>
+        <el-form-item label="模板编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入模板编码" />
+        </el-form-item>
+        <el-form-item label="邮箱账号" prop="accountId">
+          <el-select v-model="form.accountId" placeholder="请输入邮箱账号">
+            <el-option v-for="account in accountOptions" :key="account.id" :value="account.id" :label="account.mail" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发送人名称" prop="nickname">
+          <el-input v-model="form.nickname" placeholder="请输入发送人名称" />
+        </el-form-item>
+        <el-form-item label="模板标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入模板标题" />
+        </el-form-item>
+        <el-form-item label="模板内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="开启状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createMailTemplate, updateMailTemplate, deleteMailTemplate, getMailTemplate, getMailTemplatePage } from "@/api/system/mail/template";
+import Editor from '@/components/Editor';
+import { CommonStatusEnum } from "@/utils/constants";
+import { getSimpleMailAccountList } from "@/api/system/mail/account";
+
+export default {
+  name: "MailTemplate",
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 邮件模版列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        code: null,
+        accountId: null,
+        status: null,
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "模板名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
+        accountId: [{ required: true, message: "邮箱账号不能为空", trigger: "blur" }],
+        title: [{ required: true, message: "模板标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "模板内容不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
+      },
+      // 邮箱账号
+      accountOptions: []
+    };
+  },
+  created() {
+    this.getList();
+    // 获得邮箱账号列表
+    getSimpleMailAccountList().then(response => {
+      this.accountOptions = response.data
+    })
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getMailTemplatePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        accountId: undefined,
+        nickname: undefined,
+        title: undefined,
+        content: undefined,
+        status: CommonStatusEnum.ENABLE,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加邮件模版";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getMailTemplate(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改邮件模版";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateMailTemplate(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createMailTemplate(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除邮件模版编号为"' + id + '"的数据项?').then(function() {
+          return deleteMailTemplate(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>

From afced9d420626919b9cf8e165a073abad9713b65 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 21:32:32 +0800
Subject: [PATCH 39/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=E5=8F=91=E9=80=81=20send=20?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/ErrorCodeConstants.java      |   7 +-
 .../dal/mysql/mail/MailAccountMapper.java     |   5 -
 .../service/mail/MailAccountService.java      |   8 +
 .../{impl => }/MailAccountServiceImpl.java    |  12 +-
 .../mail/{impl => }/MailLogServiceImpl.java   |   3 +-
 .../system/service/mail/MailSendService.java  |  47 +++--
 .../service/mail/MailSendServiceImpl.java     | 172 ++++++++++++++++++
 .../service/mail/MailTemplateService.java     |   2 +-
 .../{impl => }/MailTemplateServiceImpl.java   |  38 ++--
 .../mail/impl/MailSendServiceImpl.java        | 116 ------------
 .../system/service/member/MemberService.java  |   8 +
 .../service/member/MemberServiceImpl.java     |  21 ++-
 .../service/sms/SmsTemplateServiceImpl.java   |   2 +-
 13 files changed, 275 insertions(+), 166 deletions(-)
 rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/{impl => }/MailAccountServiceImpl.java (92%)
 rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/{impl => }/MailLogServiceImpl.java (97%)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
 rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/{impl => }/MailTemplateServiceImpl.java (87%)
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 577fcb2ade..5eea402f70 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -145,9 +145,12 @@ public interface ErrorCodeConstants {
     ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1002023000, "邮箱账号不存在");
     ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1002023001, "无法删除，该邮箱账号还有邮件模板");
 
-    // ========== 邮箱模版 1002024000 ==========
+    // ========== 邮件模版 1002024000 ==========
     ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1002024000, "邮件模版不存在");
     ErrorCode MAIL_TEMPLATE_CODE_EXISTS = new ErrorCode(1002024001, "邮件模版 code({}) 已存在");
-    ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002021003, "模板参数({})缺失"); // TODO 优化
+
+    // ========== 邮件发送 1002025000 ==========
+    ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
+    ErrorCode MAIL_SEND_MAIL_NOT_EXISTS = new ErrorCode(1002025000, "邮箱不存在");
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
index 24ce1ef067..e14fc18d70 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -17,9 +17,4 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
                 .likeIfPresent(MailAccountDO::getUsername , pageReqVO.getUsername()));
     }
 
-    default MailAccountDO selectOneByFrom(String from){
-        return selectOne(new QueryWrapperX<MailAccountDO>()
-                .eqIfPresent("from_address" , from));
-    }
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
index 2c90a91219..b0e02cb4bd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
@@ -22,6 +22,14 @@ public interface MailAccountService {
      */
     void initLocalCache();
 
+    /**
+     * 从缓存中获取邮箱账号
+     *
+     * @param id 编号
+     * @return 邮箱账号
+     */
+    MailAccountDO getMailAccountFromCache(Long id);
+
     /**
      * 创建邮箱账号
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
similarity index 92%
rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
index 2da58091bc..bb673a7ade 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
+package cn.iocoder.yudao.module.system.service.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
@@ -8,8 +8,6 @@ import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
-import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
-import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -21,8 +19,7 @@ import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 邮箱账号 Service 实现类
@@ -63,6 +60,11 @@ public class MailAccountServiceImpl implements MailAccountService {
         mailAccountCache = convertMap(accounts, MailAccountDO::getId);
     }
 
+    @Override
+    public MailAccountDO getMailAccountFromCache(Long id) {
+        return mailAccountCache.get(id);
+    }
+
     @Override
     public Long createMailAccount(MailAccountCreateReqVO createReqVO) {
         // 插入
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
similarity index 97%
rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
index c489ad9bb2..0582679d1f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
+package cn.iocoder.yudao.module.system.service.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
@@ -28,7 +28,6 @@ import java.util.Objects;
 @Validated
 public class MailLogServiceImpl implements MailLogService {
 
-    // TODO @wangjingyi：private，然后使用 @Resource DONE
     @Resource
     private MailLogMapper mailLogMapper;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
index 615b34fcf9..898816868f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java
@@ -1,19 +1,11 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.send.MailReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 
-import javax.validation.Valid;
-import java.util.List;
 import java.util.Map;
 
 /**
- *  邮箱模版服务类
+ * 邮件发送 Service 接口
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -21,17 +13,41 @@ import java.util.Map;
 public interface MailSendService {
 
     /**
-     * 发送邮件
+     * 发送单条邮件给管理后台的用户
      *
+     * @param mail 邮箱
+     * @param userId 用户编码
      * @param templateCode 邮件模版编码
-     * @param from 邮箱
-     * @param content 内容
-     * @param templateParams 模版参数
-     * @param to 收件人
+     * @param templateParams 邮件模版参数
+     * @return 发送日志编号
+     */
+    Long sendSingleMailToAdmin(String mail, Long userId,
+                               String templateCode, Map<String, Object> templateParams);
+
+    /**
+     * 发送单条邮件给用户 APP 的用户
+     *
+     * @param mail 邮箱
+     * @param userId 用户编码
+     * @param templateCode 邮件模版编码
+     * @param templateParams 邮件模版参数
+     * @return 发送日志编号
+     */
+    Long sendSingleMailToMember(String mail, Long userId,
+                                String templateCode, Map<String, Object> templateParams);
+
+    /**
+     * 发送单条邮件给用户
+     *
+     * @param mail 邮箱
      * @param userId 用户编码
      * @param userType 用户类型
+     * @param templateCode 邮件模版编码
+     * @param templateParams 邮件模版参数
+     * @return 发送日志编号
      */
-    void sendMail(Long userId, Integer userType, String templateCode, String from,String to, String content, Map<String, Object> templateParams);
+    Long sendSingleMail(String mail, Long userId, Integer userType,
+                        String templateCode, Map<String, Object> templateParams);
 
     /**
      * 执行真正的邮件发送
@@ -40,4 +56,5 @@ public interface MailSendService {
      * @param message 邮件
      */
     void doSendMail(MailSendMessage message);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
new file mode 100644
index 0000000000..2ffd99a5cf
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
@@ -0,0 +1,172 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.mail.MailAccount;
+import cn.hutool.extra.mail.MailUtil;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
+import cn.iocoder.yudao.module.system.service.mail.MailLogService;
+import cn.iocoder.yudao.module.system.service.mail.MailSendService;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import cn.iocoder.yudao.module.system.service.member.MemberService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+
+/**
+ * 邮箱模版 服务实现类
+ *
+ * @author wangjingyi
+ * @since 2022-03-21
+ */
+@Service
+@Validated
+@Slf4j
+public class MailSendServiceImpl implements MailSendService {
+
+    @Resource
+    private AdminUserService adminUserService;
+    @Resource
+    private MemberService memberService;
+
+    @Resource
+    private MailAccountService mailAccountService;
+    @Resource
+    private MailTemplateService mailTemplateService;
+
+    @Resource
+    private MailLogService mailLogService;
+    @Resource
+    private MailProducer mailProducer;
+
+    @Override
+    public Long sendSingleMailToAdmin(String mail, Long userId,
+                                      String templateCode, Map<String, Object> templateParams) {
+        // 如果 mail 为空，则加载用户编号对应的邮箱
+        if (StrUtil.isEmpty(mail)) {
+            AdminUserDO user = adminUserService.getUser(userId);
+            if (user != null) {
+                mail = user.getEmail();
+            }
+        }
+        // 执行发送
+        return sendSingleMail(mail, userId, UserTypeEnum.ADMIN.getValue(), templateCode, templateParams);
+    }
+
+    @Override
+    public Long sendSingleMailToMember(String mail, Long userId,
+                                       String templateCode, Map<String, Object> templateParams) {
+        // 如果 mail 为空，则加载用户编号对应的邮箱
+        if (StrUtil.isEmpty(mail)) {
+            mail = memberService.getMemberUserEmail(userId);
+        }
+        // 执行发送
+        return sendSingleMail(mail, userId, UserTypeEnum.MEMBER.getValue(), templateCode, templateParams);
+    }
+
+    @Override
+    public Long sendSingleMail(String mail, Long userId, Integer userType,
+                               String templateCode, Map<String, Object> templateParams) {
+        // 校验邮箱模版是否合法
+        MailTemplateDO template = checkMailTemplateValid(templateCode);
+        // 校验邮箱账号是否合法
+        MailAccountDO account = checkMailAccountValid(template.getAccountId());
+
+        // 校验邮箱是否存在
+        mail = checkMail(mail);
+        // 构建有序的模板参数。为什么放在这个位置，是提前保证模板参数的正确性，而不是到了插入发送日志
+        List<KeyValue<String, Object>> newTemplateParams = buildTemplateParams(template, templateParams);
+
+        // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志
+        Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus());
+        String content = mailTemplateService.formatMailTemplateContent(template.getContent(), templateParams);
+        Long sendLogId = mailLogService.createMailLog(userId, userType, mail,
+                account, template, content, templateParams, isSend); // TODO 芋艿：待测试
+        // 发送 MQ 消息，异步执行发送短信
+        if (isSend) {
+            mailProducer.sendMailSendMessage(sendLogId, account, template, content, newTemplateParams, mail); // TODO 芋艿：待测试
+        }
+        return sendLogId;
+    }
+
+    @Override
+    public void doSendMail(MailSendMessage message) {
+        // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的 DONE
+        //装载账号信息
+        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(message);
+        //发送邮件
+        try {
+            String messageId = MailUtil.send(account,message.getTo(),message.getTitle(),message.getContent(),false,null);
+            mailLogService.updateMailSendResult(message.getLogId() , messageId);
+        } catch (Exception e){
+            mailLogService.updateFailMailSendResult(message.getLogId() , e.getMessage());
+        }
+    }
+
+    @VisibleForTesting
+    public MailTemplateDO checkMailTemplateValid(String templateCode) {
+        // 获得邮件模板。考虑到效率，从缓存中获取
+        MailTemplateDO template = mailTemplateService.getMailTemplateByCodeFromCache(templateCode);
+        // 邮件模板不存在
+        if (template == null) {
+            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
+        }
+        return template;
+    }
+
+    @VisibleForTesting
+    public MailAccountDO checkMailAccountValid(Long accountId) {
+        // 获得邮箱账号。考虑到效率，从缓存中获取
+        MailAccountDO account = mailAccountService.getMailAccountFromCache(accountId);
+        // 邮箱账号不存在
+        if (account == null) {
+            throw exception(MAIL_ACCOUNT_NOT_EXISTS);
+        }
+        return account;
+    }
+
+    @VisibleForTesting
+    public String checkMail(String mail) {
+        if (StrUtil.isEmpty(mail)) {
+            throw exception(MAIL_SEND_MAIL_NOT_EXISTS);
+        }
+        return mail;
+    }
+
+    /**
+     * 将参数模板，处理成有序的 KeyValue 数组
+     *
+     * @param template 邮箱模板
+     * @param templateParams 原始参数
+     * @return 处理后的参数
+     */
+    @VisibleForTesting
+    public List<KeyValue<String, Object>> buildTemplateParams(MailTemplateDO template, Map<String, Object> templateParams) {
+        return template.getParams().stream().map(key -> {
+            Object value = templateParams.get(key);
+            if (value == null) {
+                throw exception(MAIL_SEND_TEMPLATE_PARAM_MISS, key);
+            }
+            return new KeyValue<>(key, value);
+        }).collect(Collectors.toList());
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
index 704f7d6537..cb9dc61efc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
@@ -83,7 +83,7 @@ public interface MailTemplateService {
      * @param params 合成参数
      * @return 格式化后的内容
      */
-    String formatMailTemplateContent(String content, Map<String, String> params);
+    String formatMailTemplateContent(String content, Map<String, Object> params);
 
     /**
      * 获得指定邮件账号下的邮件模板数量
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
similarity index 87%
rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
index 753614683f..c3e72f4443 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
@@ -1,12 +1,9 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
+package cn.iocoder.yudao.module.system.service.mail;
 
-
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
@@ -14,7 +11,6 @@ import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
-import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,12 +19,12 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -42,6 +38,11 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class MailTemplateServiceImpl implements MailTemplateService {
 
+    /**
+     * 正则表达式，匹配 {} 中的变量
+     */
+    private static final Pattern PATTERN_PARAMS = Pattern.compile("\\{(.*?)}");
+
     @Resource
     private MailTemplateMapper mailTemplateMapper;
 
@@ -73,7 +74,8 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         validateCodeUnique(null, createReqVO.getCode());
 
         // 插入
-        MailTemplateDO template = MailTemplateConvert.INSTANCE.convert(createReqVO);
+        MailTemplateDO template = MailTemplateConvert.INSTANCE.convert(createReqVO)
+                .setParams(parseTemplateContentParams(createReqVO.getContent()));
         mailTemplateMapper.insert(template);
         // 发送刷新消息
         mailProducer.sendMailTemplateRefreshMessage();
@@ -88,7 +90,8 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         validateCodeUnique(updateReqVO.getId(),updateReqVO.getCode());
 
         // 更新
-        MailTemplateDO updateObj = MailTemplateConvert.INSTANCE.convert(updateReqVO);
+        MailTemplateDO updateObj = MailTemplateConvert.INSTANCE.convert(updateReqVO)
+                .setParams(parseTemplateContentParams(updateReqVO.getContent()));
         mailTemplateMapper.updateById(updateObj);
         // 发送刷新消息
         mailProducer.sendMailTemplateRefreshMessage();
@@ -118,6 +121,12 @@ public class MailTemplateServiceImpl implements MailTemplateService {
         mailProducer.sendMailTemplateRefreshMessage();
     }
 
+    private void validateMailTemplateExists(Long id) {
+        if (mailTemplateMapper.selectById(id) == null) {
+            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
+        }
+    }
+
     @Override
     public MailTemplateDO getMailTemplate(Long id) {return mailTemplateMapper.selectById(id);}
 
@@ -135,14 +144,13 @@ public class MailTemplateServiceImpl implements MailTemplateService {
     }
 
     @Override
-    public String formatMailTemplateContent(String content, Map<String, String> params) {
+    public String formatMailTemplateContent(String content, Map<String, Object> params) {
         return StrUtil.format(content, params);
     }
 
-    private void validateMailTemplateExists(Long id) {
-        if (mailTemplateMapper.selectById(id) == null) {
-            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
-        }
+    @VisibleForTesting
+    public List<String> parseTemplateContentParams(String content) {
+        return ReUtil.findAllGroup1(PATTERN_PARAMS, content);
     }
 
     @Override
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
deleted file mode 100644
index 9a9e9fe50c..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailSendServiceImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package cn.iocoder.yudao.module.system.service.mail.impl;
-
-import cn.hutool.extra.mail.MailAccount;
-import cn.hutool.extra.mail.MailUtil;
-import cn.iocoder.yudao.framework.common.core.KeyValue;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
-import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
-import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
-import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
-import cn.iocoder.yudao.module.system.service.mail.MailLogService;
-import cn.iocoder.yudao.module.system.service.mail.MailSendService;
-import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
-import com.google.common.annotations.VisibleForTesting;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
-
-/**
- * 邮箱模版 服务实现类
- *
- * @author wangjingyi
- * @since 2022-03-21
- */
-@Service
-@Validated
-@Slf4j
-public class MailSendServiceImpl implements MailSendService {
-    
-    @Resource
-    private MailAccountMapper mailAccountMapper;
-    @Resource
-    private MailTemplateService mailTemplateService;
-    @Resource
-    private MailLogService mailLogService;
-    @Resource
-    private MailProducer mailProducer;
-
-
-    @Override
-    public void sendMail(Long userId, Integer userType, String templateCode, String from,String to, String content, Map<String, Object> templateParams) {
-        // TODO @@wangjingyi：发送的时候，参考下短信；DONE
-        //校验邮箱模版是否合法
-        MailTemplateDO mailTemplateDO =  this.checkMailTemplateValid(templateCode);
-        // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志
-        Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(mailTemplateDO.getStatus());
-        //校验账号信息是否合法
-        MailAccountDO mailAccountDO = this.checkMailAccountValid(from);
-        Map<String , String> params = MailAccountConvert.INSTANCE.convertToMap(mailAccountDO , content);
-        content = mailTemplateService.formatMailTemplateContent(mailTemplateDO.getContent(), params);
-        Long sendLogId = mailLogService.createMailLog(userId,userType,to,mailAccountDO , mailTemplateDO , content,  templateParams,  isSend);
-        List<KeyValue<String,Object>> newTemplateParams = buildTemplateParams(mailTemplateDO,templateParams);
-        // 发送 MQ 消息，异步执行发送短信
-        if (isSend) {
-            mailProducer.sendMailSendMessage(sendLogId,mailAccountDO , mailTemplateDO ,content, newTemplateParams,to);
-        }
-    }
-
-    private MailAccountDO checkMailAccountValid(String from) {
-        MailAccountDO mailAccountDO = mailAccountMapper.selectOneByFrom(from);
-        if(null == mailAccountDO){
-            throw exception(MAIL_ACCOUNT_NOT_EXISTS);
-        }
-        return mailAccountDO;
-    }
-
-    @Override
-    public void doSendMail(MailSendMessage message) {
-        // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的 DONE
-        //装载账号信息
-        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(message);
-        //发送邮件
-        try{
-            String messageId = MailUtil.send(account,message.getTo(),message.getTitle(),message.getContent(),false,null);
-            mailLogService.updateMailSendResult(message.getLogId() , messageId);
-        }catch (Exception e){
-            mailLogService.updateFailMailSendResult(message.getLogId() , e.getMessage());
-        }
-
-    }
-
-    private MailTemplateDO checkMailTemplateValid(String templateCode) {
-        MailTemplateDO mailTemplateDO = mailTemplateService.getMailTemplateByCodeFromCache(templateCode);
-        if (mailTemplateDO == null){
-            throw exception(MAIL_TEMPLATE_NOT_EXISTS);
-        }
-        return mailTemplateDO;
-    }
-    /**
-     * 将参数模板，处理成有序的 KeyValue 数组
-     *
-     * @param template 邮箱模板
-     * @param templateParams 原始参数
-     * @return 处理后的参数
-     */
-    @VisibleForTesting
-    public List<KeyValue<String, Object>> buildTemplateParams(MailTemplateDO template, Map<String, Object> templateParams) {
-        return template.getParams().stream().map(key -> {
-            Object value = templateParams.get(key);
-            if (value == null) {
-                throw exception(MAIL_SEND_TEMPLATE_PARAM_MISS, key);
-            }
-            return new KeyValue<>(key, value);
-        }).collect(Collectors.toList());
-    }
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java
index d96352b156..933e5bfc07 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java
@@ -15,4 +15,12 @@ public interface MemberService {
      */
     String getMemberUserMobile(Long id);
 
+    /**
+     * 获得会员用户的邮箱
+     *
+     * @param id 会员用户编号
+     * @return 邮箱
+     */
+    String getMemberUserEmail(Long id);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java
index 676a95a4e4..7b31e0456a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java
@@ -21,16 +21,29 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     public String getMemberUserMobile(Long id) {
-        if (id == null) {
-            return null;
-        }
-        Object user = ReflectUtil.invoke(getMemberUserApi(), "getUser", id);
+        Object user = getMemberUser(id);
         if (user == null) {
             return null;
         }
         return ReflectUtil.invoke(user, "getMobile");
     }
 
+    @Override
+    public String getMemberUserEmail(Long id) {
+        Object user = getMemberUser(id);
+        if (user == null) {
+            return null;
+        }
+        return ReflectUtil.invoke(user, "getEmail");
+    }
+
+    private Object getMemberUser(Long id) {
+        if (id == null) {
+            return null;
+        }
+        return ReflectUtil.invoke(getMemberUserApi(), "getUser", id);
+    }
+
     private Object getMemberUserApi() {
         if (memberUserApi == null) {
             memberUserApi = SpringUtil.getBean(ClassUtil.loadClass(String.format("%s.module.member.api.user.MemberUserApi", basePackage)));
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
index fd6a03f4ff..031edb7cc0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
@@ -39,7 +39,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
  * 短信模板 Service 实现类
  *
  * @author zzf
- * @date 2021/1/25 9:25
+ * @since 2021/1/25 9:25
  */
 @Service
 @Slf4j

From f9ab45df181b791da899bbd1327c7f9a436d7107 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 26 Jan 2023 01:57:57 +0800
Subject: [PATCH 40/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20log=20=E7=9B=B8=E5=85=B3=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao-module-system-biz/pom.xml           |  4 ++
 .../admin/mail/MailTemplateController.http    | 14 +++++
 .../admin/mail/MailTemplateController.java    | 13 ++++
 .../admin/mail/vo/send/MailReqVO.java         | 37 ------------
 .../vo/template/MailTemplateSendReqVO.java    | 26 ++++++++
 .../convert/mail/MailAccountConvert.java      |  2 +-
 .../system/dal/dataobject/mail/MailLogDO.java | 13 ++--
 .../mq/message/mail/MailSendMessage.java      | 60 +++++--------------
 .../system/mq/producer/mail/MailProducer.java | 36 ++++-------
 .../system/service/mail/MailLogService.java   | 10 ++--
 .../service/mail/MailLogServiceImpl.java      | 33 ++++------
 .../service/mail/MailSendServiceImpl.java     | 15 ++---
 .../service/mail/MailSendServiceImplTest.java | 26 ++++++++
 13 files changed, 141 insertions(+), 148 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java

diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
index f1887ea907..42464d7623 100644
--- a/yudao-module-system/yudao-module-system-biz/pom.xml
+++ b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -106,6 +106,10 @@
             <artifactId>yudao-spring-boot-starter-captcha</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http
new file mode 100644
index 0000000000..f3c47f514d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http
@@ -0,0 +1,14 @@
+### 请求 /system/mail-template/send-mail 接口 => 成功
+POST {{baseUrl}}/system/mail-template/send-mail
+Authorization: Bearer {{token}}
+Content-Type: application/json
+tenant-id: {{adminTenentId}}
+
+{
+  "templateCode": "test_01",
+  "mail": "7685413@qq.com",
+  "templateParams": {
+    "key01": "value01",
+    "key02": "value02"
+  }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
index 741462c950..e98b4f0846 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -3,8 +3,10 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.*;
+import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateSendReqVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -25,6 +27,8 @@ public class MailTemplateController {
 
     @Resource
     private MailTemplateService mailTempleService;
+    @Resource
+    private MailSendService mailSendService;
 
     @PostMapping("/create")
     @ApiOperation("创建邮件模版")
@@ -73,4 +77,13 @@ public class MailTemplateController {
         List<MailTemplateDO> list = mailTempleService.getMailTemplateList();
         return success(MailTemplateConvert.INSTANCE.convertList02(list));
     }
+
+    @PostMapping("/send-mail")
+    @ApiOperation("发送短信")
+    @PreAuthorize("@ss.hasPermission('system:mail-template:send-mail')")
+    public CommonResult<Long> sendMail(@Valid @RequestBody MailTemplateSendReqVO sendReqVO) {
+        return success(mailSendService.sendSingleMailToAdmin(sendReqVO.getMail(), null,
+                sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
deleted file mode 100644
index 560c3bf424..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail.vo.send;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@ApiModel("管理后台 - 邮件发送 Req VO")
-@Data
-public class MailReqVO { // TODO @wangjingqi：1）, 不用空格；2）应该只要传递 templateCode、参数就好，title、from、content、附件应该都是参数里的
-
-    @ApiModelProperty(value = "邮箱",required = true,example = "yudaoyuanma@123.com")
-    @NotNull(message = "邮箱账号不能为空")
-    @Email(message = "邮箱账号格式错误")
-    private String from;
-
-    @ApiModelProperty(value = "标题",example = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "内容",example = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "邮箱模版id",example = "1024")
-    @NotNull(message = "邮箱模版id不能为空")
-    private Integer templateId;
-
-    @ApiModelProperty(value = "收件人",required = true,example = "yudaoyuanma@123.com")
-    @NotNull(message = "收件人不能为空")
-    private List<String> tos;
-
-    @ApiModelProperty(value = "附件",example = "附件编码")
-    private List<String> fileIds;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java
new file mode 100644
index 0000000000..ccef597702
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@ApiModel("管理后台 - 邮件发送 Req VO")
+@Data
+public class MailTemplateSendReqVO {
+
+    @ApiModelProperty(value = "接收邮箱", required = true, example = "7685413@qq.com")
+    @NotEmpty(message = "接收邮箱不能为空")
+    private String mail;
+
+    @ApiModelProperty(value = "模板编码", required = true, example = "test_01")
+    @NotNull(message = "模板编码不能为空")
+    private String templateCode;
+
+    @ApiModelProperty(value = "模板参数")
+    private Map<String, Object> templateParams;
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index daadbfe5a6..4c3fec628e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -33,7 +33,7 @@ public interface MailAccountConvert {
                 .setHost(bean.getHost())
                 .setPort(bean.getPort())
                 .setAuth(true)
-                .setFrom(bean.getFromAddress())
+                .setFrom(bean.getMail())
                 .setUser(bean.getUsername())
                 .setPass(bean.getPassword())
                 .setSslEnable(bean.getSslEnable());
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index ddd0f71584..97a9a21056 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -96,7 +96,7 @@ public class MailLogDO extends BaseDO implements Serializable {
      * 基于 {@link MailTemplateDO#getParams()} 输入后的参数
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private Map<String,Object> templateParams;
+    private Map<String, Object> templateParams;
 
     // ========= 发送相关字段 =========
     /**
@@ -109,16 +109,13 @@ public class MailLogDO extends BaseDO implements Serializable {
      * 发送时间
      */
     private Date sendTime;
-
-    // ========= 接收相关字段 =========
+    /**
+     * 发送返回的消息 ID
+     */
+    private String sendMessageId;
     /**
      * 发送结果
      */
     private String sendResult;
-    /**
-     *  消息ID
-     */
-    private String messageId;
-
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
index 6e8c46668e..0adafa4094 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.system.mq.message.mail;
 
-import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 邮箱发送消息
@@ -19,61 +17,35 @@ import java.util.Map;
 public class MailSendMessage extends AbstractStreamMessage {
 
     /**
-     * 日志id
+     * 邮件日志编号
      */
-    @NotNull(message = "邮箱日志id不能为空")
+    @NotNull(message = "邮件日志编号不能为空")
     private Long logId;
     /**
-     * 邮箱地址
+     * 接收邮件地址
      */
-    @NotNull(message = "邮箱地址不能为空")
-    private String fromAddress;
+    @NotNull(message = "接收邮件地址不能为空")
+    private String mail;
     /**
-     * 用户名
+     * 邮件账号编号
      */
-    @NotNull(message = "用户名不能为空")
-    private String username;
+    @NotNull(message = "邮件账号编号不能为空")
+    private Long accountId;
+
     /**
-     * 密码
+     * 邮件发件人
      */
-    @NotNull(message = "密码不能为空")
-    private String password;
+    private String nickname;
     /**
-     * 邮箱模板编号
-     */
-    @NotNull(message = "邮箱模板编号不能为空")
-    private String templateCode;
-    /**
-     * 收件人
-     */
-    @NotNull(message = "收件人不能为空")
-    private String to;
-    /**
-     * 标题
+     * 邮件标题
      */
+    @NotEmpty(message = "邮件标题不能为空")
     private String title;
     /**
-     * 内容
+     * 邮件内容
      */
+    @NotEmpty(message = "邮件内容不能为空")
     private String content;
-    /**
-     * 主机
-     */
-    @NotNull(message = "host不能为空")
-    private String host;
-    /**
-     * 端口
-     */
-    @NotNull(message = "端口号不能为空")
-    private Integer port;
-    /**
-     * 是否开启 SSL
-     */
-    private Boolean sslEnable;
-    /**
-     * 邮箱模板参数
-     */
-    private List<KeyValue<String, Object>> templateParams;
 
     @Override
     public String getStreamKey() {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index 8b92ee9536..19de302fd0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -1,9 +1,6 @@
 package cn.iocoder.yudao.module.system.mq.producer.mail;
 
-import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage;
@@ -11,13 +8,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * Mail 邮件相关消息的 Producer
  *
  * @author wangjingyi
- * @date 2021/4/19 13:33
+ * @since 2021/4/19 13:33
  */
 @Slf4j
 @Component
@@ -46,26 +42,18 @@ public class MailProducer {
      * 发送 {@link MailSendMessage} 消息
      *
      * @param sendLogId 发送日志编码
-     * @param mailAccountDO 邮箱账号信息
-     * @param mailTemplateDO 邮箱模版信息
-     * @param content 内容
-     * @param templateParams 邮箱模版参数
-     * @param to 收件人
+     * @param mail 接收邮件地址
+     * @param accountId 邮件账号编号
+     * @param nickname 邮件发件人
+     * @param title 邮件标题
+     * @param content 邮件内容
      */
-    public void sendMailSendMessage(Long sendLogId,MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content,List<KeyValue<String, Object>> templateParams,String to) {
-        MailSendMessage message = new MailSendMessage();
-        message.setContent(content)
-        .setFromAddress(mailAccountDO.getMail())
-        .setHost(mailAccountDO.getHost())
-        .setPort(mailAccountDO.getPort())
-        .setPassword(mailAccountDO.getPassword())
-        .setUsername(mailAccountDO.getUsername())
-        .setSslEnable(mailAccountDO.getSslEnable())
-        .setTemplateCode(mailTemplateDO.getCode())
-        .setTitle(mailTemplateDO.getTitle())
-        .setTo(to)
-        .setLogId(sendLogId)
-        .setTemplateParams(templateParams);
+    public void sendMailSendMessage(Long sendLogId, String mail, Long accountId,
+                                    String nickname, String title, String content) {
+        MailSendMessage message = new MailSendMessage()
+                .setLogId(sendLogId).setMail(mail).setAccountId(accountId)
+                .setNickname(nickname).setTitle(title).setContent(content);
         redisMQTemplate.send(message);
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index 6b04f7a74f..a92711a17c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 邮箱日志服务类
+ * 邮件日志 Service 接口
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -19,7 +19,7 @@ import java.util.Map;
 public interface MailLogService {
 
     /**
-     * 邮箱日志分页
+     * 邮件日志分页
      *
      * @param pageVO 分页参数
      * @return 分页结果
@@ -27,7 +27,7 @@ public interface MailLogService {
     PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO);
 
     /**
-     * 邮箱日志数组信息
+     * 邮件日志数组信息
      *
      * @param exportReqVO 导出筛选请求
      * @return 导出的日志数据
@@ -35,12 +35,12 @@ public interface MailLogService {
     List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO);
 
     /**
-     * 创建邮箱日志
+     * 创建邮件日志
      *
      * @param userId 用户编码
      * @param userType 用户类型
      * @param to 收件人
-     * @param mailAccountDO 邮箱账号信息
+     * @param mailAccountDO 邮件账号信息
      * @param template      模版信息
      * @param templateContent 模版内容
      * @param templateParams 模版参数
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
index 0582679d1f..024db96717 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
 import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
-import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -19,7 +18,7 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- *  邮箱日志实现类
+ * 邮件日志 Service 实现类
  *
  * @author wangjingyi
  * @since 2022-03-21
@@ -42,29 +41,19 @@ public class MailLogServiceImpl implements MailLogService {
     }
 
     @Override
-    public Long createMailLog(Long userId,Integer userType,String to,MailAccountDO mailAccountDO, MailTemplateDO template , String templateContent, Map<String, Object> templateParams, Boolean isSend) {
+    public Long createMailLog(Long userId, Integer userType, String toMail,
+                              MailAccountDO account, MailTemplateDO template,
+                              String templateContent, Map<String, Object> templateParams, Boolean isSend) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        // TODO @wangjingyi：使用 builder 的时候，不用每个 set 是一行。DONE
         // 根据是否要发送，设置状态
         logDOBuilder.sendStatus(Objects.equals(isSend, true) ? MailSendStatusEnum.INIT.getStatus()
                 : MailSendStatusEnum.IGNORE.getStatus())
-                // 设置邮箱相关字段
-                .fromMail(mailAccountDO.getMail())
-                .accountId(mailAccountDO.getId())
-                // TODO @wangjingyi：userId、userType
-                //用户信息
-                .userId(userId).userType(userType)
-                //模版信息
-                .templateId(template.getId()).templateParams(templateParams).templateContent(templateContent);
-
-
-        logDOBuilder.fromMail(mailAccountDO.getMail());
-        logDOBuilder.accountId(mailAccountDO.getId());
-        // TODO @wangjingyi：每个接收人一条日志。发送多个人，就调用多次，业务方。因为某个邮箱有问题，会导致所有都发送失败。 DONE
-        // 设置模板相关字段
-        // TODO @wangjingyi：可以参考下 sms 短信的逻辑，templateContent、templateParams
-        // TODO @wangjingyi：有结果的时候，才是 sendTime 哈 DONE
-        //logDOBuilder.sendTime(new Date());
+                // 用户信息
+                .userId(userId).userType(userType).toMail(toMail)
+                .accountId(account.getId()).fromMail(account.getMail())
+                // 模板相关字段
+                .templateId(template.getId()).templateCode(template.getCode()).templateNickname(template.getNickname())
+                .templateTitle(template.getTitle()).templateContent(templateContent).templateParams(templateParams);
 
         // 插入数据库
         MailLogDO logDO = logDOBuilder.build();
@@ -76,7 +65,7 @@ public class MailLogServiceImpl implements MailLogService {
     @Override
     public void updateMailSendResult(Long logId, String result) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.id(logId).sendTime(new Date()).sendResult(result).messageId(result).sendStatus(MailSendStatusEnum.SUCCESS.getStatus());
+        logDOBuilder.id(logId).sendTime(new Date()).sendResult(result).sendMessageId(result).sendStatus(MailSendStatusEnum.SUCCESS.getStatus());
         MailLogDO mailLogDO = logDOBuilder.build();
         mailLogMapper.updateById(mailLogDO);
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
index 2ffd99a5cf..8a8308c09a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
@@ -100,22 +100,23 @@ public class MailSendServiceImpl implements MailSendService {
         Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus());
         String content = mailTemplateService.formatMailTemplateContent(template.getContent(), templateParams);
         Long sendLogId = mailLogService.createMailLog(userId, userType, mail,
-                account, template, content, templateParams, isSend); // TODO 芋艿：待测试
+                account, template, content, templateParams, isSend);
         // 发送 MQ 消息，异步执行发送短信
         if (isSend) {
-            mailProducer.sendMailSendMessage(sendLogId, account, template, content, newTemplateParams, mail); // TODO 芋艿：待测试
+            mailProducer.sendMailSendMessage(sendLogId, mail, account.getId(),
+                    template.getNickname(), template.getTitle(), content);
         }
         return sendLogId;
     }
 
     @Override
     public void doSendMail(MailSendMessage message) {
-        // TODO @wangjingyi：直接使用 hutool 发送，不要封装 mail client 哈，因为短信的客户端都是比较统一的 DONE
-        //装载账号信息
-        MailAccount account  = MailAccountConvert.INSTANCE.convertAccount(message);
-        //发送邮件
+        // 装载账号信息
+        MailAccount mailAccount  = MailAccountConvert.INSTANCE.convertAccount(message);
+        // 发送邮件
         try {
-            String messageId = MailUtil.send(account,message.getTo(),message.getTitle(),message.getContent(),false,null);
+            String messageId = MailUtil.send(mailAccount, message.getMail(),
+                    message.getTitle(), message.getContent(),true);
             mailLogService.updateMailSendResult(message.getLogId() , messageId);
         } catch (Exception e){
             mailLogService.updateFailMailSendResult(message.getLogId() , e.getMessage());
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
new file mode 100644
index 0000000000..33e17314a9
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.hutool.extra.mail.MailAccount;
+import cn.hutool.extra.mail.MailUtil;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class MailSendServiceImplTest {
+
+    /**
+     * 用于快速测试你的邮箱账号是否正常
+     */
+    @Test
+    @Disabled
+    public void testDemo() {
+        MailAccount mailAccount = new MailAccount()
+                .setFrom("奥特曼 <ydym_test@163.com>")
+                .setHost("smtp.163.com").setPort(465).setSslEnable(true)
+                .setAuth(true).setUser("ydym_test@163.com").setPass("WBZTEINMIFVRYSOE");
+        String messageId = MailUtil.send(mailAccount, "7685413@qq.com", "主题", "内容", false);
+        System.out.println("发送结果：" + messageId);
+    }
+
+}

From 525078abd36c091b33462aa22ac31006855ce0a0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 26 Jan 2023 20:39:38 +0800
Subject: [PATCH 41/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20log=20=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/mail/MailSendStatusEnum.java |   2 +-
 .../admin/mail/MailLogController.java         |  23 +-
 .../admin/mail/vo/log/MailLogBaseVO.java      |  80 +++++--
 .../admin/mail/vo/log/MailLogExcelVO.java     |  42 ----
 .../admin/mail/vo/log/MailLogExportReqVO.java |   9 -
 .../admin/mail/vo/log/MailLogPageReqVO.java   |  36 ++-
 .../admin/mail/vo/log/MailLogRespVO.java      |  47 +---
 .../convert/mail/MailAccountConvert.java      |  28 +--
 .../system/convert/mail/MailLogConvert.java   |   5 +-
 .../system/dal/dataobject/mail/MailLogDO.java |   4 +-
 .../system/dal/mysql/mail/MailLogMapper.java  |  42 +---
 .../system/service/mail/MailLogService.java   |  34 +--
 .../service/mail/MailLogServiceImpl.java      |  33 +--
 .../service/mail/MailSendServiceImpl.java     |  21 +-
 yudao-ui-admin/src/api/system/mail/log.js     |  18 ++
 yudao-ui-admin/src/utils/dict.js              |   1 +
 .../src/views/system/mail/log/index.vue       | 225 ++++++++++++++++++
 .../src/views/system/mail/template/index.vue  |   2 +-
 .../src/views/system/sms/smsLog.vue           |   2 +-
 19 files changed, 388 insertions(+), 266 deletions(-)
 mode change 100644 => 100755 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
 mode change 100644 => 100755 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
 create mode 100755 yudao-ui-admin/src/api/system/mail/log.js
 create mode 100755 yudao-ui-admin/src/views/system/mail/log/index.vue

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
index 8936ea9c79..7cb16edef4 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java
@@ -7,7 +7,7 @@ import lombok.Getter;
  * 邮件的发送状态枚举
  *
  * @author wangjingyi
- * @date 2022/4/10 13:39
+ * @since 2022/4/10 13:39
  */
 @Getter
 @AllArgsConstructor
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
index 1cad6a02ab..88cfeb7a4e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
@@ -3,23 +3,20 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.*;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailLogConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 
-import java.io.IOException;
-import java.util.List;
+import javax.annotation.Resource;
+import javax.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -29,7 +26,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/system/mail-log")
 public class MailLogController {
 
-    @Autowired
+    @Resource
     private MailLogService mailLogService;
 
     @GetMapping("/page")
@@ -40,14 +37,4 @@ public class MailLogController {
         return success(MailLogConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出邮箱日志Excel")
-    @PreAuthorize("@ss.hasPermission('system:mail-log:export')")
-    public void exportMailLogExcel(@Valid MailLogExportReqVO exportReqVO ,
-                                   HttpServletResponse response) throws IOException {
-        List<MailLogDO> list = mailLogService.getMailLogList(exportReqVO);
-        // 导出 Excel
-        List<MailLogExcelVO> datas = MailLogConvert.INSTANCE.convertList(list);
-        ExcelUtils.write(response, "邮箱日志.xls", "数据", MailLogExcelVO.class, datas);
-    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
old mode 100644
new mode 100755
index 04679c7f03..4a06fb893d
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java
@@ -1,46 +1,76 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import io.swagger.annotations.*;
+import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.sql.Timestamp;
-
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 邮箱日志基类 Base VO")
+/**
+* 邮件日志 Base VO，提供给添加、修改、详细的子 VO 使用
+* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+*/
 @Data
 public class MailLogBaseVO {
 
-    @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
-    private String from;
+    @ApiModelProperty(value = "用户编号", example = "30883")
+    private Long userId;
 
-    @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
-    private String templateId;
+    @ApiModelProperty(value = "用户类型", example = "2", notes = "参见 UserTypeEnum 枚举")
+    private Byte userType;
 
-    @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
+    @ApiModelProperty(value = "接收邮箱地址", required = true, example = "76854@qq.com")
+    @NotNull(message = "接收邮箱地址不能为空")
+    private String toMail;
+
+    @ApiModelProperty(value = "邮箱账号编号", required = true, example = "18107")
+    @NotNull(message = "邮箱账号编号不能为空")
+    private Long accountId;
+
+    @ApiModelProperty(value = "发送邮箱地址", required = true, example = "85757@qq.com")
+    @NotNull(message = "发送邮箱地址不能为空")
+    private String fromMail;
+
+    @ApiModelProperty(value = "模板编号", required = true, example = "5678")
+    @NotNull(message = "模板编号不能为空")
+    private Long templateId;
+
+    @ApiModelProperty(value = "模板编码", required = true, example = "test_01")
+    @NotNull(message = "模板编码不能为空")
     private String templateCode;
 
-    @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
-    private String title;
+    @ApiModelProperty(value = "模版发送人名称", example = "李四")
+    private String templateNickname;
 
-    @ApiModelProperty(value = "内容" , required = false , example = "遇到源码")
-    private String content;
+    @ApiModelProperty(value = "邮件标题", required = true, example = "测试标题")
+    @NotNull(message = "邮件标题不能为空")
+    private String templateTitle;
 
-    @ApiModelProperty(value = "收件人" , required = false , example = "yudaoyuanma@456.com")
-    private String to;
+    @ApiModelProperty(value = "邮件内容", required = true, example = "测试内容")
+    @NotNull(message = "邮件内容不能为空")
+    private String templateContent;
 
+    @ApiModelProperty(value = "邮件参数", required = true)
+    @NotNull(message = "邮件参数不能为空")
+    private Map<String, Object> templateParams;
+
+    @ApiModelProperty(value = "发送状态", required = true, example = "1", notes = "参见 MailSendStatusEnum 枚举")
+    @NotNull(message = "发送状态不能为空")
+    private Byte sendStatus;
+
+    @ApiModelProperty(value = "发送时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "发送时间" , required = false , example = "2022-03-26 03:45:20")
-    private Timestamp sendTime;
+    private LocalDateTime sendTime;
 
-    @ApiModelProperty(value = "发送状态" , required = false , example = "1")
-    private Boolean sendStatus;
+    @ApiModelProperty(value = "发送返回的消息 ID", example = "28568")
+    private String sendMessageId;
 
-    @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
-    private String sendResult;
+    @ApiModelProperty(value = "发送异常")
+    private String sendException;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
deleted file mode 100644
index d341ce6789..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExcelVO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.sql.Timestamp;
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel("管理后台 - 邮箱日志导出 Request VO")
-@Data
-public class MailLogExcelVO {
-
-    @ExcelProperty(value = "邮箱" )
-    private String from;
-
-    @ExcelProperty(value = "模版编号" )
-    private String templeCode;
-
-    @ExcelProperty(value = "标题")
-    private String title;
-
-    @ExcelProperty(value = "内容")
-    private String content;
-
-    @ExcelProperty(value = "收件人" )
-    private String to;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ExcelProperty(value = "发送时间" )
-    private Date sendTime;
-
-    @ExcelProperty(value = "发送状态")
-    private Integer sendStatus;
-
-    @ExcelProperty(value = "发送结果")
-    private String sendResult;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
deleted file mode 100644
index 7f737ae4bf..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogExportReqVO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel("管理后台 - 邮箱日志导出 Request VO")
-@Data
-public class MailLogExportReqVO extends MailLogPageReqVO {
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
index 680fe6d1f6..77b632e02c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -9,6 +9,7 @@ import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -18,33 +19,26 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class MailLogPageReqVO extends PageParam {
 
-    // TODO @wangjingyi：required 为 false 时，它是默认值，所以不用谢 DONE
+    @ApiModelProperty(value = "用户编号", example = "30883")
+    private Long userId;
 
-    @ApiModelProperty(value = "邮箱" , example = "yudaoyuanma@123.com")
-    private String from;
+    @ApiModelProperty(value = "用户类型", example = "2", notes = "参见 UserTypeEnum 枚举")
+    private Byte userType;
 
-    @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
-    private String templateId;
+    @ApiModelProperty(value = "接收邮箱地址", example = "76854@qq.com", notes = "模糊匹配")
+    private String toMail;
 
-    @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
-    private String templateCode;
+    @ApiModelProperty(value = "邮箱账号编号", example = "18107")
+    private Long accountId;
 
-    @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
-    private String title;
+    @ApiModelProperty(value = "模板编号", example = "5678")
+    private Long templateId;
 
-    @ApiModelProperty(value = "内容" , required = false , example = "遇到源码")
-    private String content;
-
-    @ApiModelProperty(value = "收件人" , required = false , example = "yudaoyuanma@456.com")
-    private String to;
+    @ApiModelProperty(value = "发送状态", example = "1", notes = "参见 MailSendStatusEnum 枚举")
+    private Integer sendStatus;
 
+    @ApiModelProperty(value = "发送时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "发送时间" , required = false , example = "2022-03-26 03:45:20")
-    private Timestamp sendTime;
+    private LocalDateTime[] sendTime;
 
-    @ApiModelProperty(value = "发送状态" , required = false , example = "1")
-    private Boolean sendStatus;
-
-    @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
-    private String sendResult;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
old mode 100644
new mode 100755
index 024e075f44..b0e10355a6
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java
@@ -1,44 +1,19 @@
 package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.*;
+import java.time.LocalDateTime;
+import io.swagger.annotations.*;
 
-import java.sql.Timestamp;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel("管理后台 - 邮箱日志返回 Request VO")
+@ApiModel("管理后台 - 邮件日志 Response VO")
 @Data
-public class MailLogRespVO {
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MailLogRespVO extends MailLogBaseVO {
 
-    @ApiModelProperty(value = "邮箱" , required = false , example = "yudaoyuanma@123.com")
-    private String from;
+    @ApiModelProperty(value = "编号", required = true, example = "31020")
+    private Long id;
 
-    @ApiModelProperty(value = "模版编号" , required = false , example = "templeId")
-    private String templateId;
-
-    @ApiModelProperty(value = "模版code" , required = false , example = "templeCode")
-    private String templateCode;
-
-    @ApiModelProperty(value = "标题" , required = false , example = "芋道源码")
-    private String title;
-
-    @ApiModelProperty(value = "内容" , required = false , example = "遇到源码")
-    private String content;
-
-    @ApiModelProperty(value = "收件人" , required = false , example = "yudaoyuanma@456.com")
-    private String to;
-
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "发送时间" , required = false , example = "2022-03-26 03:45:20")
-    private Timestamp sendTime;
-
-    @ApiModelProperty(value = "发送状态" , required = false , example = "1")
-    private Integer sendStatus;
-
-    @ApiModelProperty(value = "发送结果" , required = false , example = "yudaoyuanma@123.com")
-    private String sendResult;
+    @ApiModelProperty(value = "创建时间", required = true)
+    private LocalDateTime createTime;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index 4c3fec628e..d057261674 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -1,18 +1,16 @@
 package cn.iocoder.yudao.module.system.convert.mail;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.mail.MailAccount;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface MailAccountConvert {
@@ -27,25 +25,11 @@ public interface MailAccountConvert {
 
     List<MailAccountSimpleRespVO> convertList02(List<MailAccountDO> list);
 
-    // TODO 芋艿：改下
-    default MailAccount convertAccount(MailSendMessage bean) {
-        return new MailAccount()
-                .setHost(bean.getHost())
-                .setPort(bean.getPort())
-                .setAuth(true)
-                .setFrom(bean.getMail())
-                .setUser(bean.getUsername())
-                .setPass(bean.getPassword())
-                .setSslEnable(bean.getSslEnable());
-    }
-
-    // TODO 芋艿：改下
-    default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
-        Map<String , String> map = new HashMap<>();
-        map.put("from_address" , mailAccountDO.getMail());
-        map.put("username" , mailAccountDO.getUsername());
-        map.put("content" , content);
-        return map;
+    default MailAccount convert(MailAccountDO account, String nickname) {
+        String from = StrUtil.isNotEmpty(nickname) ? nickname + " <" + account.getMail() + ">" : account.getMail();
+        return new MailAccount().setFrom(from).setAuth(true)
+                .setUser(account.getUsername()).setPass(account.getPassword())
+                .setHost(account.getHost()).setPort(account.getPort()).setSslEnable(account.getSslEnable());
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
index 4175508866..f4a729c5c4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
@@ -1,19 +1,16 @@
 package cn.iocoder.yudao.module.system.convert.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExcelVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
-import java.util.List;
-
 @Mapper
 public interface MailLogConvert {
+
     MailLogConvert INSTANCE = Mappers.getMapper(MailLogConvert.class);
 
     PageResult<MailLogRespVO> convertPage(PageResult<MailLogDO> pageResult);
 
-    List<MailLogExcelVO> convertList(List<MailLogDO> list);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 97a9a21056..e2b2c3cc9b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -114,8 +114,8 @@ public class MailLogDO extends BaseDO implements Serializable {
      */
     private String sendMessageId;
     /**
-     * 发送结果
+     * 发送异常
      */
-    private String sendResult;
+    private String sendException;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
index a8b8ccf61b..38be2dbb3d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
@@ -2,41 +2,25 @@ package cn.iocoder.yudao.module.system.dal.mysql.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
 @Mapper
 public interface MailLogMapper extends BaseMapperX<MailLogDO> {
 
-    default PageResult<MailLogDO> selectPage(MailLogPageReqVO pageVO){
-        return selectPage(pageVO , new QueryWrapperX<MailLogDO>()
-                .eqIfPresent("from", pageVO.getFrom())
-                .eqIfPresent("templeCode", pageVO.getTemplateCode())
-                .likeIfPresent("title" , pageVO.getTitle())
-                .likeIfPresent("content" , pageVO.getContent())
-                .eqIfPresent("to", pageVO.getTo())
-                .eqIfPresent("sendTime" , pageVO.getSendTime())
-                .eqIfPresent("sendStatus" , pageVO.getSendStatus())
-                .eqIfPresent("sendResult" , pageVO.getSendResult())
-                .orderByDesc("sendTime")
-        );
-    };
+    default PageResult<MailLogDO> selectPage(MailLogPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MailLogDO>()
+                .eqIfPresent(MailLogDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(MailLogDO::getUserType, reqVO.getUserType())
+                .likeIfPresent(MailLogDO::getToMail, reqVO.getToMail())
+                .eqIfPresent(MailLogDO::getAccountId, reqVO.getAccountId())
+                .likeIfPresent(MailLogDO::getFromMail, reqVO.getFromMail())
+                .eqIfPresent(MailLogDO::getTemplateId, reqVO.getTemplateId())
+                .eqIfPresent(MailLogDO::getSendStatus, reqVO.getSendStatus())
+                .betweenIfPresent(MailLogDO::getSendTime, reqVO.getSendTime())
+                .orderByDesc(MailLogDO::getId));
+    }
 
-    default List<MailLogDO> selectList(MailLogExportReqVO exportReqVO){
-        return selectList(new QueryWrapperX<MailLogDO>()
-                .eqIfPresent("from", exportReqVO.getFrom())
-                .eqIfPresent("templeCode", exportReqVO.getTemplateCode())
-                .likeIfPresent("title" , exportReqVO.getTitle())
-                .likeIfPresent("content" , exportReqVO.getContent())
-                .eqIfPresent("to", exportReqVO.getTo())
-                .eqIfPresent("sendTime" , exportReqVO.getSendTime())
-                .eqIfPresent("sendStatus" , exportReqVO.getSendStatus())
-                .eqIfPresent("sendResult" , exportReqVO.getSendResult())
-                .orderByDesc("sendTime")
-        );
-    };
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index a92711a17c..859b93c75c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,42 +24,30 @@ public interface MailLogService {
      */
     PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO);
 
-    /**
-     * 邮件日志数组信息
-     *
-     * @param exportReqVO 导出筛选请求
-     * @return 导出的日志数据
-     */
-    List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO);
-
     /**
      * 创建邮件日志
      *
      * @param userId 用户编码
      * @param userType 用户类型
-     * @param to 收件人
-     * @param mailAccountDO 邮件账号信息
+     * @param toMail 收件人邮件
+     * @param account 邮件账号信息
      * @param template      模版信息
      * @param templateContent 模版内容
      * @param templateParams 模版参数
      * @param isSend        是否发送成功
+     * @return 日志编号
      */
-    Long createMailLog(Long userId,Integer userType,String to,MailAccountDO mailAccountDO, MailTemplateDO template , String templateContent, Map<String, Object> templateParams, Boolean isSend);
+    Long createMailLog(Long userId,Integer userType, String toMail,
+                       MailAccountDO account, MailTemplateDO template ,
+                       String templateContent, Map<String, Object> templateParams, Boolean isSend);
 
     /**
      * 更新邮件发送结果
      *
-     * @param logId  发送日志Id
-     * @param result 发送结果 默认返回messageId
+     * @param logId  日志编号
+     * @param messageId 发送后的消息编号
+     * @param exception 发送异常
      */
-    void updateMailSendResult(Long logId, String result);
-
-    /**
-     * 更新邮件发送结果
-     *
-     * @param logId  发送日志Id
-     * @param exception 发送结果
-     */
-    void updateFailMailSendResult(Long logId, String exception);
+    void updateMailSendResult(Long logId, String messageId, Exception exception);
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
index 024db96717..997eb3d88d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
@@ -13,10 +12,11 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static cn.hutool.core.exceptions.ExceptionUtil.getRootCauseMessage;
+
 /**
  * 邮件日志 Service 实现类
  *
@@ -35,11 +35,6 @@ public class MailLogServiceImpl implements MailLogService {
         return mailLogMapper.selectPage(pageVO);
     }
 
-    @Override
-    public List<MailLogDO> getMailLogList(MailLogExportReqVO exportReqVO) {
-        return mailLogMapper.selectList(exportReqVO);
-    }
-
     @Override
     public Long createMailLog(Long userId, Integer userType, String toMail,
                               MailAccountDO account, MailTemplateDO template,
@@ -61,20 +56,18 @@ public class MailLogServiceImpl implements MailLogService {
         return logDO.getId();
     }
 
-    // TODO @wangjingyi：还是加几个字段哈，日志上。sendStatus，成功、失败；messageId 消息标号。sendException 记录发送的异常。这样界面才好筛选邮件的发送结果。DONE
     @Override
-    public void updateMailSendResult(Long logId, String result) {
-        MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.id(logId).sendTime(new Date()).sendResult(result).sendMessageId(result).sendStatus(MailSendStatusEnum.SUCCESS.getStatus());
-        MailLogDO mailLogDO = logDOBuilder.build();
-        mailLogMapper.updateById(mailLogDO);
+    public void updateMailSendResult(Long logId, String messageId, Exception exception) {
+        // 1. 成功
+        if (exception == null) {
+            mailLogMapper.updateById(new MailLogDO().setId(logId).setSendTime(new Date())
+                    .setSendStatus(MailSendStatusEnum.SUCCESS.getStatus()).setSendMessageId(messageId));
+            return;
+        }
+        // 2. 失败
+        mailLogMapper.updateById(new MailLogDO().setId(logId).setSendTime(new Date())
+                .setSendStatus(MailSendStatusEnum.FAILURE.getStatus()).setSendException(getRootCauseMessage(exception)));
+
     }
 
-    @Override
-    public void updateFailMailSendResult(Long logId, String exception) {
-        MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.id(logId).sendTime(new Date()).sendResult(exception).sendStatus(MailSendStatusEnum.FAILURE.getStatus());
-        MailLogDO mailLogDO = logDOBuilder.build();
-        mailLogMapper.updateById(mailLogDO);
-    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
index 8a8308c09a..57fbf5c297 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
@@ -9,14 +9,9 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
-import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
-import cn.iocoder.yudao.module.system.service.mail.MailLogService;
-import cn.iocoder.yudao.module.system.service.mail.MailSendService;
-import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import cn.iocoder.yudao.module.system.service.member.MemberService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.google.common.annotations.VisibleForTesting;
@@ -111,15 +106,18 @@ public class MailSendServiceImpl implements MailSendService {
 
     @Override
     public void doSendMail(MailSendMessage message) {
-        // 装载账号信息
-        MailAccount mailAccount  = MailAccountConvert.INSTANCE.convertAccount(message);
-        // 发送邮件
+        // 1. 创建发送账号
+        MailAccountDO account = checkMailAccountValid(message.getAccountId());
+        MailAccount mailAccount  = MailAccountConvert.INSTANCE.convert(account, message.getNickname());
+        // 2. 发送邮件
         try {
             String messageId = MailUtil.send(mailAccount, message.getMail(),
                     message.getTitle(), message.getContent(),true);
-            mailLogService.updateMailSendResult(message.getLogId() , messageId);
-        } catch (Exception e){
-            mailLogService.updateFailMailSendResult(message.getLogId() , e.getMessage());
+            // 3. 更新结果（成功）
+            mailLogService.updateMailSendResult(message.getLogId(), messageId, null);
+        } catch (Exception e) {
+            // 3. 更新结果（异常）
+            mailLogService.updateMailSendResult(message.getLogId(), null, e);
         }
     }
 
@@ -170,4 +168,5 @@ public class MailSendServiceImpl implements MailSendService {
             return new KeyValue<>(key, value);
         }).collect(Collectors.toList());
     }
+
 }
diff --git a/yudao-ui-admin/src/api/system/mail/log.js b/yudao-ui-admin/src/api/system/mail/log.js
new file mode 100755
index 0000000000..05215259aa
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/mail/log.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得邮件日志
+export function getMailLog(id) {
+  return request({
+    url: '/system/mail-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮件日志分页
+export function getMailLogPage(query) {
+  return request({
+    url: '/system/mail-log/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/yudao-ui-admin/src/utils/dict.js b/yudao-ui-admin/src/utils/dict.js
index ebee669f8e..22c0ef40cc 100644
--- a/yudao-ui-admin/src/utils/dict.js
+++ b/yudao-ui-admin/src/utils/dict.js
@@ -25,6 +25,7 @@ export const DICT_TYPE = {
   SYSTEM_SMS_RECEIVE_STATUS: 'system_sms_receive_status',
   SYSTEM_ERROR_CODE_TYPE: 'system_error_code_type',
   SYSTEM_OAUTH2_GRANT_TYPE: 'system_oauth2_grant_type',
+  SYSTEM_MAIL_SEND_STATUS: 'system_mail_send_status',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING: 'infra_boolean_string',
diff --git a/yudao-ui-admin/src/views/system/mail/log/index.vue b/yudao-ui-admin/src/views/system/mail/log/index.vue
new file mode 100755
index 0000000000..efaac16ffc
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/mail/log/index.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="接收邮箱" prop="toMail">
+        <el-input v-model="queryParams.toMail" placeholder="请输入接收邮箱" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="邮箱账号" prop="accountId">
+        <el-select v-model="queryParams.accountId" placeholder="请输入邮箱账号" clearable>
+          <el-option v-for="account in accountOptions" :key="account.id" :value="account.id" :label="account.mail" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板编号" prop="templateId">
+        <el-input v-model="queryParams.templateId" placeholder="请输入模板编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="发送状态" prop="sendStatus">
+        <el-select v-model="queryParams.sendStatus" placeholder="请选择发送状态" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_MAIL_SEND_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发送时间" prop="sendTime">
+        <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="用户编号" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.USER_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.sendTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收邮箱" align="center" prop="toMail" width="200">
+        <template v-slot="scope">
+          <div>{{ scope.row.toMail }}</div>
+          <div v-if="scope.row.userType && scope.row.userId">
+            <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType"/>{{ '(' + scope.row.userId + ')' }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="邮件标题" align="center" prop="templateTitle" />
+      <el-table-column label="发送状态" align="center" prop="sendStatus">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_MAIL_SEND_STATUS" :value="scope.row.sendStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="邮箱账号" align="center" prop="fromMail" />
+      <el-table-column label="模板编号" align="center" prop="templateId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+                     v-hasPermi="['system:mail-log:query']">详细</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 邮件日志详细-->
+    <el-dialog :title="title" :visible.sync="open" width="700px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" label-width="160px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="日志主键：">{{ form.id }}</el-form-item>
+            <el-form-item label="用户编号：">{{ form.userId }}</el-form-item>
+            <el-form-item label="用户类型：">
+              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="form.userType"/>
+            </el-form-item>
+            <el-form-item label="接收邮箱地址：">{{ form.toMail }}</el-form-item>
+            <el-form-item label="邮箱账号编号：">{{ form.accountId }}</el-form-item>
+            <el-form-item label="发送邮箱地址：">{{ form.fromMail }}</el-form-item>
+            <el-form-item label="模板编号：">{{ form.templateId }}</el-form-item>
+            <el-form-item label="模板编码：">{{ form.templateCode }}</el-form-item>
+            <el-form-item label="模版发送人名称：">{{ form.templateNickname }}</el-form-item>
+            <el-form-item label="邮件标题：">{{ form.templateTitle }}</el-form-item>
+            <el-form-item label="邮件内容：">
+              <editor v-model="form.templateContent" :min-height="192" read-only />
+            </el-form-item>
+            <el-form-item label="邮件参数：">{{ form.templateParams }}</el-form-item>
+            <el-form-item label="发送状态：">
+              <dict-tag :type="DICT_TYPE.SYSTEM_MAIL_SEND_STATUS" :value="form.sendStatus" />
+            </el-form-item>
+            <el-form-item label="发送时间：">{{ parseTime(form.sendTime) }}</el-form-item>
+            <el-form-item label="发送返回的消息编号：">{{ form.sendMessageId }}</el-form-item>
+            <el-form-item label="发送异常：">{{ form.sendException }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getMailLog, getMailLogPage } from "@/api/system/mail/log";
+import Editor from '@/components/Editor';
+import { getSimpleMailAccountList } from "@/api/system/mail/account";
+
+export default {
+  name: "MailLog",
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 邮件日志列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        userId: null,
+        userType: null,
+        toMail: null,
+        accountId: null,
+        templateId: null,
+        sendStatus: null,
+        sendTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 邮箱账号
+      accountOptions: []
+    };
+  },
+  created() {
+    this.getList();
+    // 获得邮箱账号列表
+    getSimpleMailAccountList().then(response => {
+      this.accountOptions = response.data
+    })
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getMailLogPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        userId: undefined,
+        userType: undefined,
+        toMail: undefined,
+        accountId: undefined,
+        fromMail: undefined,
+        templateId: undefined,
+        templateCode: undefined,
+        templateNickname: undefined,
+        templateTitle: undefined,
+        templateContent: undefined,
+        templateParams: undefined,
+        sendStatus: undefined,
+        sendTime: undefined,
+        sendMessageId: undefined,
+        sendException: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.open = true;
+      this.form = row;
+    }
+  }
+};
+</script>
diff --git a/yudao-ui-admin/src/views/system/mail/template/index.vue b/yudao-ui-admin/src/views/system/mail/template/index.vue
index 690e65fbbe..10d71a9bdc 100755
--- a/yudao-ui-admin/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/template/index.vue
@@ -44,7 +44,7 @@
       <el-table-column label="模板编码" align="center" prop="code" />
       <el-table-column label="模板名称" align="center" prop="name" />
       <el-table-column label="模板标题" align="center" prop="title" />
-      <el-table-column label="邮箱账号" align="center" prop="accountId">
+      <el-table-column label="邮箱账号" align="center" prop="accountId" width="200">
         <template v-slot="scope">
           {{ accountOptions.find(account => account.id === scope.row.accountId)?.mail }}
         </template>
diff --git a/yudao-ui-admin/src/views/system/sms/smsLog.vue b/yudao-ui-admin/src/views/system/sms/smsLog.vue
index 196abd7692..f9b2825bab 100644
--- a/yudao-ui-admin/src/views/system/sms/smsLog.vue
+++ b/yudao-ui-admin/src/views/system/sms/smsLog.vue
@@ -94,7 +94,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row,scope.index)"
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
                      v-hasPermi="['system:sms-log:query']">详细</el-button>
         </template>
       </el-table-column>

From 0895ee7d988e40c856844ce7e1ca34ad8d32752c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 26 Jan 2023 23:04:26 +0800
Subject: [PATCH 42/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20account=20=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/test/core/util/RandomUtils.java |   7 +
 .../admin/mail/MailAccountController.java     |   2 +-
 .../convert/mail/MailAccountConvert.java      |   8 +-
 .../dal/dataobject/mail/MailAccountDO.java    |   2 +
 .../system/dal/mysql/mail/MailLogMapper.java  |   1 -
 .../service/mail/MailAccountServiceImpl.java  |   2 +
 .../mail/MailAccountServiceImplTest.java      | 154 ++++++++++++++++++
 .../src/test/resources/sql/clean.sql          |   1 +
 .../src/test/resources/sql/create_tables.sql  |  16 ++
 .../src/views/system/mail/account/index.vue   |   4 +-
 10 files changed, 188 insertions(+), 9 deletions(-)
 create mode 100755 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java

diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
index 8664dae424..11a810cf12 100644
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
@@ -7,7 +7,10 @@ import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import uk.co.jemos.podam.api.PodamFactory;
 import uk.co.jemos.podam.api.PodamFactoryImpl;
+import uk.co.jemos.podam.common.AttributeStrategy;
 
+import javax.validation.constraints.Email;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -95,6 +98,10 @@ public class RandomUtils {
         return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus();
     }
 
+    public static String randomEmail() {
+        return randomString() + "@qq.com";
+    }
+
     @SafeVarargs
     public static <T> T randomPojo(Class<T> clazz, Consumer<T>... consumers) {
         T pojo = PODAM_FACTORY.manufacturePojo(clazz);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
index a18fb137b2..e2271ceb09 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-@Api(tags = "管理后台 - 邮件账号")
+@Api(tags = "管理后台 - 邮箱账号")
 @RestController
 @RequestMapping("/system/mail-account")
 public class MailAccountController {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index d057261674..ffd1501352 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.system.convert.mail;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.mail.MailAccount;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountSimpleRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -17,7 +15,9 @@ public interface MailAccountConvert {
 
     MailAccountConvert INSTANCE = Mappers.getMapper(MailAccountConvert.class);
 
-    MailAccountDO convert(MailAccountBaseVO bean);
+    MailAccountDO convert(MailAccountCreateReqVO bean);
+
+    MailAccountDO convert(MailAccountUpdateReqVO bean);
 
     MailAccountRespVO convert(MailAccountDO bean);
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
index b5d349439c..275fc8570e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -21,6 +22,7 @@ public class MailAccountDO extends BaseDO {
     /**
      * 主键
      */
+    @TableId
     private Long id;
     /**
      * 邮箱
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
index 38be2dbb3d..6b147cff62 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java
@@ -16,7 +16,6 @@ public interface MailLogMapper extends BaseMapperX<MailLogDO> {
                 .eqIfPresent(MailLogDO::getUserType, reqVO.getUserType())
                 .likeIfPresent(MailLogDO::getToMail, reqVO.getToMail())
                 .eqIfPresent(MailLogDO::getAccountId, reqVO.getAccountId())
-                .likeIfPresent(MailLogDO::getFromMail, reqVO.getFromMail())
                 .eqIfPresent(MailLogDO::getTemplateId, reqVO.getTemplateId())
                 .eqIfPresent(MailLogDO::getSendStatus, reqVO.getSendStatus())
                 .betweenIfPresent(MailLogDO::getSendTime, reqVO.getSendTime())
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
index bb673a7ade..4da029e471 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -47,6 +48,7 @@ public class MailAccountServiceImpl implements MailAccountService {
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
+    @Getter
     private volatile Map<Long, MailAccountDO> mailAccountCache;
 
     @Override
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java
new file mode 100755
index 0000000000..ffca4b1b6e
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java
@@ -0,0 +1,154 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.verify;
+
+/**
+* {@link MailAccountServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(MailAccountServiceImpl.class)
+public class MailAccountServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MailAccountServiceImpl mailAccountService;
+
+    @Resource
+    private MailAccountMapper mailAccountMapper;
+
+    @MockBean
+    private MailTemplateService mailTemplateService;
+    @MockBean
+    private MailProducer mailProducer;
+
+    @Test
+    public void testInitLocalCache() {
+        MailAccountDO accountDO1 = randomPojo(MailAccountDO.class);
+        mailAccountMapper.insert(accountDO1);
+        MailAccountDO accountDO02 = randomPojo(MailAccountDO.class);
+        mailAccountMapper.insert(accountDO02);
+
+        // 调用
+        mailAccountService.initLocalCache();
+        // 断言 mailAccountCache 缓存
+        Map<Long, MailAccountDO> mailAccountCache = mailAccountService.getMailAccountCache();
+        assertPojoEquals(accountDO1, mailAccountCache.get(accountDO1.getId()));
+        assertPojoEquals(accountDO02, mailAccountCache.get(accountDO02.getId()));
+    }
+
+    @Test
+    public void testCreateMailAccount_success() {
+        // 准备参数
+        MailAccountCreateReqVO reqVO = randomPojo(MailAccountCreateReqVO.class, o -> o.setMail(randomEmail()));
+
+        // 调用
+        Long mailAccountId = mailAccountService.createMailAccount(reqVO);
+        // 断言
+        assertNotNull(mailAccountId);
+        // 校验记录的属性是否正确
+        MailAccountDO mailAccount = mailAccountMapper.selectById(mailAccountId);
+        assertPojoEquals(reqVO, mailAccount);
+        verify(mailProducer).sendMailAccountRefreshMessage();
+    }
+
+    @Test
+    public void testUpdateMailAccount_success() {
+        // mock 数据
+        MailAccountDO dbMailAccount = randomPojo(MailAccountDO.class);
+        mailAccountMapper.insert(dbMailAccount);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        MailAccountUpdateReqVO reqVO = randomPojo(MailAccountUpdateReqVO.class, o -> {
+            o.setId(dbMailAccount.getId()); // 设置更新的 ID
+            o.setMail(randomEmail());
+        });
+
+        // 调用
+        mailAccountService.updateMailAccount(reqVO);
+        // 校验是否更新正确
+        MailAccountDO mailAccount = mailAccountMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, mailAccount);
+        verify(mailProducer).sendMailAccountRefreshMessage();
+    }
+
+    @Test
+    public void testUpdateMailAccount_notExists() {
+        // 准备参数
+        MailAccountUpdateReqVO reqVO = randomPojo(MailAccountUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> mailAccountService.updateMailAccount(reqVO), MAIL_ACCOUNT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteMailAccount_success() {
+        // mock 数据
+        MailAccountDO dbMailAccount = randomPojo(MailAccountDO.class);
+        mailAccountMapper.insert(dbMailAccount);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbMailAccount.getId();
+
+        // 调用
+        mailAccountService.deleteMailAccount(id);
+       // 校验数据不存在了
+       assertNull(mailAccountMapper.selectById(id));
+        verify(mailProducer).sendMailAccountRefreshMessage();
+    }
+
+    @Test
+    public void testDeleteMailAccount_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> mailAccountService.deleteMailAccount(id), MAIL_ACCOUNT_NOT_EXISTS);
+    }
+
+    @Test
+    public void testGetMailAccountPage() {
+       // mock 数据
+       MailAccountDO dbMailAccount = randomPojo(MailAccountDO.class, o -> { // 等会查询到
+           o.setMail("768@qq.com");
+           o.setUsername("yunai");
+       });
+       mailAccountMapper.insert(dbMailAccount);
+       // 测试 mail 不匹配
+       mailAccountMapper.insert(cloneIgnoreId(dbMailAccount, o -> o.setMail("788@qq.com")));
+       // 测试 username 不匹配
+       mailAccountMapper.insert(cloneIgnoreId(dbMailAccount, o -> o.setUsername("tudou")));
+       // 准备参数
+       MailAccountPageReqVO reqVO = new MailAccountPageReqVO();
+       reqVO.setMail("768");
+       reqVO.setUsername("yu");
+
+       // 调用
+       PageResult<MailAccountDO> pageResult = mailAccountService.getMailAccountPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbMailAccount, pageResult.getList().get(0));
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
index b13b191dbd..b4181d16c8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
@@ -25,3 +25,4 @@ DELETE FROM "system_oauth2_approve";
 DELETE FROM "system_oauth2_access_token";
 DELETE FROM "system_oauth2_refresh_token";
 DELETE FROM "system_oauth2_code";
+DELETE FROM "system_mail_account";
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
index 7590e57a3f..0ce2f0c2a8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
@@ -566,3 +566,19 @@ CREATE TABLE IF NOT EXISTS "system_oauth2_code" (
      "deleted" bit NOT NULL DEFAULT FALSE,
      PRIMARY KEY ("id")
 ) COMMENT 'OAuth2 刷新令牌';
+
+CREATE TABLE IF NOT EXISTS "system_mail_account" (
+     "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+     "mail" varchar NOT NULL,
+     "username" varchar NOT NULL,
+     "password" varchar NOT NULL,
+     "host" varchar NOT NULL,
+     "port" int NOT NULL,
+     "ssl_enable" bit NOT NULL,
+     "creator" varchar DEFAULT '',
+     "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+     "updater" varchar DEFAULT '',
+     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+     "deleted" bit NOT NULL DEFAULT FALSE,
+     PRIMARY KEY ("id")
+) COMMENT '邮箱账号表';
diff --git a/yudao-ui-admin/src/views/system/mail/account/index.vue b/yudao-ui-admin/src/views/system/mail/account/index.vue
index 96e3cc4616..e64563528c 100755
--- a/yudao-ui-admin/src/views/system/mail/account/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/account/index.vue
@@ -61,7 +61,7 @@
           <el-input v-model="form.mail" placeholder="请输入邮箱" />
         </el-form-item>
         <el-form-item label="用户名" prop="username">
-          <el-input v-model="form.username" placeholder="请输入用户名" />
+          <el-input v-model="form.username" placeholder="请输入用户名，一般和邮箱一致" />
         </el-form-item>
         <el-form-item label="密码" prop="password">
           <el-input v-model="form.password" placeholder="请输入密码" />
@@ -98,8 +98,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数

From c0b029b2447e381436b83a35a2dcdbac680baf62 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 26 Jan 2023 23:32:18 +0800
Subject: [PATCH 43/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20template=20=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/util/date/LocalDateTimeUtils.java  |   5 +
 .../service/mail/MailTemplateServiceImpl.java |   2 +
 .../mail/MailTemplateServiceImplTest.java     | 163 ++++++++++++++++++
 .../src/test/resources/sql/clean.sql          |   1 +
 .../src/test/resources/sql/create_tables.sql  |  45 +++--
 .../src/api/system/mail/template.js           |   9 +
 .../src/api/system/sms/smsTemplate.js         |   2 +-
 .../src/views/system/mail/template/index.vue  |  93 +++++++++-
 .../src/views/system/sms/smsTemplate.vue      |   2 +-
 9 files changed, 300 insertions(+), 22 deletions(-)
 create mode 100755 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java

diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
index a29d5fb2ed..62e0e44419 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
@@ -41,6 +41,11 @@ public class LocalDateTimeUtils {
         return LocalDateTime.of(year, mouth, day, 0, 0, 0);
     }
 
+    public static LocalDateTime[] buildBetweenTime(int year1, int mouth1, int day1,
+                                                   int year2, int mouth2, int day2) {
+        return new LocalDateTime[]{buildTime(year1, mouth1, day1), buildTime(year2, mouth2, day2)};
+    }
+
     /**
      * 判断当前时间是否在该时间范围内
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
index c3e72f4443..62baa7e83a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
 import com.google.common.annotations.VisibleForTesting;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -55,6 +56,7 @@ public class MailTemplateServiceImpl implements MailTemplateService {
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
+    @Getter
     private volatile Map<String, MailTemplateDO> mailTemplateCache;
 
     @Override
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java
new file mode 100755
index 0000000000..ab005822be
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java
@@ -0,0 +1,163 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+* {@link MailTemplateServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(MailTemplateServiceImpl.class)
+public class MailTemplateServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MailTemplateServiceImpl mailTemplateService;
+
+    @Resource
+    private MailTemplateMapper mailTemplateMapper;
+
+    @MockBean
+    private MailProducer mailProducer;
+
+    @Test
+    public void testInitLocalCache() {
+        MailTemplateDO templateDO01 = randomPojo(MailTemplateDO.class);
+        mailTemplateMapper.insert(templateDO01);
+        MailTemplateDO templateDO02 = randomPojo(MailTemplateDO.class);
+        mailTemplateMapper.insert(templateDO02);
+
+        // 调用
+        mailTemplateService.initLocalCache();
+        // 断言 mailTemplateCache 缓存
+        Map<String, MailTemplateDO> mailTemplateCache = mailTemplateService.getMailTemplateCache();
+        assertPojoEquals(templateDO01, mailTemplateCache.get(templateDO01.getCode()));
+        assertPojoEquals(templateDO02, mailTemplateCache.get(templateDO02.getCode()));
+    }
+
+    @Test
+    public void testCreateMailTemplate_success() {
+        // 准备参数
+        MailTemplateCreateReqVO reqVO = randomPojo(MailTemplateCreateReqVO.class);
+
+        // 调用
+        Long mailTemplateId = mailTemplateService.createMailTemplate(reqVO);
+        // 断言
+        assertNotNull(mailTemplateId);
+        // 校验记录的属性是否正确
+        MailTemplateDO mailTemplate = mailTemplateMapper.selectById(mailTemplateId);
+        assertPojoEquals(reqVO, mailTemplate);
+    }
+
+    @Test
+    public void testUpdateMailTemplate_success() {
+        // mock 数据
+        MailTemplateDO dbMailTemplate = randomPojo(MailTemplateDO.class);
+        mailTemplateMapper.insert(dbMailTemplate);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        MailTemplateUpdateReqVO reqVO = randomPojo(MailTemplateUpdateReqVO.class, o -> {
+            o.setId(dbMailTemplate.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        mailTemplateService.updateMailTemplate(reqVO);
+        // 校验是否更新正确
+        MailTemplateDO mailTemplate = mailTemplateMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, mailTemplate);
+    }
+
+    @Test
+    public void testUpdateMailTemplate_notExists() {
+        // 准备参数
+        MailTemplateUpdateReqVO reqVO = randomPojo(MailTemplateUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> mailTemplateService.updateMailTemplate(reqVO), MAIL_TEMPLATE_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteMailTemplate_success() {
+        // mock 数据
+        MailTemplateDO dbMailTemplate = randomPojo(MailTemplateDO.class);
+        mailTemplateMapper.insert(dbMailTemplate);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbMailTemplate.getId();
+
+        // 调用
+        mailTemplateService.deleteMailTemplate(id);
+       // 校验数据不存在了
+       assertNull(mailTemplateMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteMailTemplate_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> mailTemplateService.deleteMailTemplate(id), MAIL_TEMPLATE_NOT_EXISTS);
+    }
+
+    @Test
+    public void testGetMailTemplatePage() {
+       // mock 数据
+       MailTemplateDO dbMailTemplate = randomPojo(MailTemplateDO.class, o -> { // 等会查询到
+           o.setName("源码");
+           o.setCode("test_01");
+           o.setAccountId(1L);
+           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+           o.setCreateTime(buildTime(2023, 2, 3));
+       });
+       mailTemplateMapper.insert(dbMailTemplate);
+       // 测试 name 不匹配
+       mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setName("芋道")));
+       // 测试 code 不匹配
+       mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setCode("test_02")));
+       // 测试 accountId 不匹配
+       mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setAccountId(2L)));
+       // 测试 status 不匹配
+       mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+       // 测试 createTime 不匹配
+       mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setCreateTime(buildTime(2023, 1, 5))));
+       // 准备参数
+       MailTemplatePageReqVO reqVO = new MailTemplatePageReqVO();
+       reqVO.setName("源");
+       reqVO.setCode("est_01");
+       reqVO.setAccountId(1L);
+       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 5));
+
+       // 调用
+       PageResult<MailTemplateDO> pageResult = mailTemplateService.getMailTemplatePage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbMailTemplate, pageResult.getList().get(0));
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
index b4181d16c8..e3c2d2fdde 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
@@ -26,3 +26,4 @@ DELETE FROM "system_oauth2_access_token";
 DELETE FROM "system_oauth2_refresh_token";
 DELETE FROM "system_oauth2_code";
 DELETE FROM "system_mail_account";
+DELETE FROM "system_mail_template";
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
index 0ce2f0c2a8..230f778dd6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
@@ -568,17 +568,36 @@ CREATE TABLE IF NOT EXISTS "system_oauth2_code" (
 ) COMMENT 'OAuth2 刷新令牌';
 
 CREATE TABLE IF NOT EXISTS "system_mail_account" (
-     "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "mail" varchar NOT NULL,
-     "username" varchar NOT NULL,
-     "password" varchar NOT NULL,
-     "host" varchar NOT NULL,
-     "port" int NOT NULL,
-     "ssl_enable" bit NOT NULL,
-     "creator" varchar DEFAULT '',
-     "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-     "updater" varchar DEFAULT '',
-     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-     "deleted" bit NOT NULL DEFAULT FALSE,
-     PRIMARY KEY ("id")
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "mail" varchar NOT NULL,
+    "username" varchar NOT NULL,
+    "password" varchar NOT NULL,
+    "host" varchar NOT NULL,
+    "port" int NOT NULL,
+    "ssl_enable" bit NOT NULL,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    PRIMARY KEY ("id")
 ) COMMENT '邮箱账号表';
+
+CREATE TABLE IF NOT EXISTS "system_mail_template" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "code" varchar NOT NULL,
+    "account_id" bigint NOT NULL,
+    "nickname" varchar,
+    "title" varchar NOT NULL,
+    "content" varchar NOT NULL,
+    "params" varchar NOT NULL,
+    "status" varchar NOT NULL,
+    "remark" varchar,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    PRIMARY KEY ("id")
+) COMMENT '邮件模版表';
diff --git a/yudao-ui-admin/src/api/system/mail/template.js b/yudao-ui-admin/src/api/system/mail/template.js
index ee5d8d4540..4d6f12c480 100755
--- a/yudao-ui-admin/src/api/system/mail/template.js
+++ b/yudao-ui-admin/src/api/system/mail/template.js
@@ -42,3 +42,12 @@ export function getMailTemplatePage(query) {
     params: query
   })
 }
+
+// 发送测试邮件
+export function sendMail(data) {
+  return request({
+    url: '/system/mail-template/send-mail',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/yudao-ui-admin/src/api/system/sms/smsTemplate.js b/yudao-ui-admin/src/api/system/sms/smsTemplate.js
index d6d933044f..853784cd14 100644
--- a/yudao-ui-admin/src/api/system/sms/smsTemplate.js
+++ b/yudao-ui-admin/src/api/system/sms/smsTemplate.js
@@ -43,7 +43,7 @@ export function getSmsTemplatePage(query) {
   })
 }
 
-// 创建短信模板
+// 发送测试短信
 export function sendSms(data) {
   return request({
     url: '/system/sms-template/send-sms',
diff --git a/yudao-ui-admin/src/views/system/mail/template/index.vue b/yudao-ui-admin/src/views/system/mail/template/index.vue
index 10d71a9bdc..a8825144e3 100755
--- a/yudao-ui-admin/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/template/index.vue
@@ -44,6 +44,7 @@
       <el-table-column label="模板编码" align="center" prop="code" />
       <el-table-column label="模板名称" align="center" prop="name" />
       <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱账号" align="center" prop="accountId" width="200">
         <template v-slot="scope">
           {{ accountOptions.find(account => account.id === scope.row.accountId)?.mail }}
@@ -55,14 +56,15 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-share" @click="handleSend(scope.row)"
+                     v-hasPermi="['system:mail-template:send-mail']">测试</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:mail-template:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -112,11 +114,30 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 对话框(发送邮件) -->
+    <el-dialog title="测试发送邮件" :visible.sync="sendOpen" width="500px" append-to-body>
+      <el-form ref="sendForm" :model="sendForm" :rules="sendRules" label-width="140px">
+        <el-form-item label="模板内容" prop="content">
+          <el-input v-model="sendForm.content" type="textarea" placeholder="请输入模板内容" readonly />
+        </el-form-item>
+        <el-form-item label="收件邮箱" prop="mail">
+          <el-input v-model="sendForm.mail" placeholder="请输入收件邮箱" />
+        </el-form-item>
+        <el-form-item v-for="param in sendForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">
+          <el-input v-model="sendForm.templateParams[param]" :placeholder="'请输入 ' + param + ' 参数'" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSendForm">确 定</el-button>
+        <el-button @click="cancelSend">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createMailTemplate, updateMailTemplate, deleteMailTemplate, getMailTemplate, getMailTemplatePage } from "@/api/system/mail/template";
+import { createMailTemplate, updateMailTemplate, deleteMailTemplate, getMailTemplate, getMailTemplatePage, sendMail } from "@/api/system/mail/template";
 import Editor from '@/components/Editor';
 import { CommonStatusEnum } from "@/utils/constants";
 import { getSimpleMailAccountList } from "@/api/system/mail/account";
@@ -130,8 +151,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -164,7 +183,18 @@ export default {
         status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
       },
       // 邮箱账号
-      accountOptions: []
+      accountOptions: [],
+
+      // 发送邮箱
+      sendOpen: false,
+      sendForm: {
+        params: [], // 模板的参数列表
+      },
+      sendRules: {
+        mail: [{ required: true, message: "收件邮箱不能为空", trigger: "blur" }],
+        templateCode: [{ required: true, message: "模版编码不能为空", trigger: "blur" }],
+        templateParams: { }
+      }
     };
   },
   created() {
@@ -263,7 +293,56 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
-    }
+    },
+    /** 发送短息按钮 */
+    handleSend(row) {
+      this.resetSend(row);
+      // 设置参数
+      this.sendForm.content = row.content;
+      this.sendForm.params = row.params;
+      this.sendForm.templateCode = row.code;
+      this.sendForm.templateParams = row.params.reduce(function(obj, item) {
+        obj[item] = undefined;
+        return obj;
+      }, {});
+      // 根据 row 重置 rules
+      this.sendRules.templateParams = row.params.reduce(function(obj, item) {
+        obj[item] = { required: true, message: '参数 ' + item + " 不能为空", trigger: "change" };
+        return obj;
+      }, {});
+      // 设置打开
+      this.sendOpen = true;
+    },
+    /** 重置发送邮箱的表单 */
+    resetSend() {
+      // 根据 row 重置表单
+      this.sendForm = {
+        content: undefined,
+        params: undefined,
+        mobile: undefined,
+        templateCode: undefined,
+        templateParams: {}
+      };
+      this.resetForm("sendForm");
+    },
+    /** 取消发送邮箱 */
+    cancelSend() {
+      this.sendOpen = false;
+      this.resetSend();
+    },
+    /** 提交按钮 */
+    submitSendForm() {
+      this.$refs["sendForm"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 添加的提交
+        sendMail(this.sendForm).then(response => {
+          this.$modal.msgSuccess("提交发送成功！发送结果，见发送日志编号：" + response.data);
+          this.sendOpen = false;
+        });
+      });
+    },
   }
 };
 </script>
diff --git a/yudao-ui-admin/src/views/system/sms/smsTemplate.vue b/yudao-ui-admin/src/views/system/sms/smsTemplate.vue
index bf3e054a20..07fbd4beb4 100644
--- a/yudao-ui-admin/src/views/system/sms/smsTemplate.vue
+++ b/yudao-ui-admin/src/views/system/sms/smsTemplate.vue
@@ -216,7 +216,7 @@ export default {
       },
       sendSmsRules: {
         mobile: [{ required: true, message: "手机不能为空", trigger: "blur" }],
-        templateCode: [{ required: true, message: "手机不能为空", trigger: "blur" }],
+        templateCode: [{ required: true, message: "模版编码不能为空", trigger: "blur" }],
         templateParams: { }
       }
     };

From f0d2c7a58a60cecedeb1e44c635e501b3c024b67 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 09:38:42 +0800
Subject: [PATCH 44/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20log=20=E7=9A=84=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/vo/log/MailLogPageReqVO.java   |   2 +-
 .../service/mail/MailLogServiceImplTest.java  | 169 ++++++++++++++++++
 .../system/service/sms/SmsLogServiceTest.java |   1 -
 .../src/test/resources/sql/clean.sql          |   1 +
 .../src/test/resources/sql/create_tables.sql  |  25 +++
 5 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100755 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
index 77b632e02c..1c02a15d0f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java
@@ -23,7 +23,7 @@ public class MailLogPageReqVO extends PageParam {
     private Long userId;
 
     @ApiModelProperty(value = "用户类型", example = "2", notes = "参见 UserTypeEnum 枚举")
-    private Byte userType;
+    private Integer userType;
 
     @ApiModelProperty(value = "接收邮箱地址", example = "76854@qq.com", notes = "模糊匹配")
     private String toMail;
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
new file mode 100755
index 0000000000..ccf4ba7378
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
@@ -0,0 +1,169 @@
+package cn.iocoder.yudao.module.system.service.mail;
+
+import cn.hutool.core.map.MapUtil;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper;
+import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+* {@link MailLogServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(MailLogServiceImpl.class)
+public class MailLogServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private MailLogServiceImpl mailLogService;
+
+    @Resource
+    private MailLogMapper mailLogMapper;
+
+    @Test
+    public void testCreateMailLog() {
+        // 准备参数
+        Long userId = randomLongId();
+        Integer userType = randomEle(UserTypeEnum.values()).getValue();
+        String toMail = randomEmail();
+        MailAccountDO account = randomPojo(MailAccountDO.class);
+        MailTemplateDO template = randomPojo(MailTemplateDO.class);
+        String templateContent = randomString();
+        Map<String, Object> templateParams = randomTemplateParams();
+        Boolean isSend = true;
+        // mock 方法
+
+        // 调用
+        Long logId = mailLogService.createMailLog(userId, userType, toMail, account, template, templateContent, templateParams, isSend);
+        // 断言
+        MailLogDO log = mailLogMapper.selectById(logId);
+        assertNotNull(log);
+        assertEquals(MailSendStatusEnum.INIT.getStatus(), log.getSendStatus());
+        assertEquals(userId, log.getUserId());
+        assertEquals(userType, log.getUserType());
+        assertEquals(toMail, log.getToMail());
+        assertEquals(account.getId(), log.getAccountId());
+        assertEquals(account.getMail(), log.getFromMail());
+        assertEquals(template.getId(), log.getTemplateId());
+        assertEquals(template.getCode(), log.getTemplateCode());
+        assertEquals(template.getNickname(), log.getTemplateNickname());
+        assertEquals(template.getTitle(), log.getTemplateTitle());
+        assertEquals(templateContent, log.getTemplateContent());
+        assertEquals(templateParams, log.getTemplateParams());
+    }
+
+    @Test
+    public void testUpdateMailSendResult_success() {
+        // mock 数据
+        MailLogDO log = randomPojo(MailLogDO.class, o -> {
+            o.setSendStatus(MailSendStatusEnum.INIT.getStatus());
+            o.setSendTime(null).setSendMessageId(null).setSendException(null)
+                    .setTemplateParams(randomTemplateParams());
+        });
+        mailLogMapper.insert(log);
+        // 准备参数
+        Long logId = log.getId();
+        String messageId = randomString();
+
+        // 调用
+        mailLogService.updateMailSendResult(logId, messageId, null);
+        // 断言
+        MailLogDO dbLog = mailLogMapper.selectById(logId);
+        assertEquals(MailSendStatusEnum.SUCCESS.getStatus(), dbLog.getSendStatus());
+        assertNotNull(dbLog.getSendTime());
+        assertEquals(messageId, dbLog.getSendMessageId());
+        assertNull(dbLog.getSendException());
+    }
+
+    @Test
+    public void testUpdateMailSendResult_exception() {
+        // mock 数据
+        MailLogDO log = randomPojo(MailLogDO.class, o -> {
+            o.setSendStatus(MailSendStatusEnum.INIT.getStatus());
+            o.setSendTime(null).setSendMessageId(null).setSendException(null)
+                    .setTemplateParams(randomTemplateParams());
+        });
+        mailLogMapper.insert(log);
+        // 准备参数
+        Long logId = log.getId();
+        Exception exception = new NullPointerException("测试异常");
+
+        // 调用
+        mailLogService.updateMailSendResult(logId, null, exception);
+        // 断言
+        MailLogDO dbLog = mailLogMapper.selectById(logId);
+        assertEquals(MailSendStatusEnum.FAILURE.getStatus(), dbLog.getSendStatus());
+        assertNotNull(dbLog.getSendTime());
+        assertNull(dbLog.getSendMessageId());
+        assertEquals("NullPointerException: 测试异常", dbLog.getSendException());
+    }
+
+    @Test
+    public void testGetMailLogPage() {
+       // mock 数据
+       MailLogDO dbMailLog = randomPojo(MailLogDO.class, o -> { // 等会查询到
+           o.setUserId(1L);
+           o.setUserType(UserTypeEnum.ADMIN.getValue());
+           o.setToMail("768@qq.com");
+           o.setAccountId(10L);
+           o.setTemplateId(100L);
+           o.setSendStatus(MailSendStatusEnum.INIT.getStatus());
+           o.setSendTime(buildTime(2023, 2, 10));
+           o.setTemplateParams(randomTemplateParams());
+       });
+       mailLogMapper.insert(dbMailLog);
+       // 测试 userId 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setUserId(2L)));
+       // 测试 userType 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+       // 测试 toMail 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setToMail("788@.qq.com")));
+       // 测试 accountId 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setAccountId(11L)));
+       // 测试 templateId 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setTemplateId(101L)));
+       // 测试 sendStatus 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendStatus(MailSendStatusEnum.SUCCESS.getStatus())));
+       // 测试 sendTime 不匹配
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(buildTime(2023, 3, 10))));
+       // 准备参数
+       MailLogPageReqVO reqVO = new MailLogPageReqVO();
+       reqVO.setUserId(1L);
+       reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+       reqVO.setToMail("768");
+       reqVO.setAccountId(10L);
+       reqVO.setTemplateId(100L);
+       reqVO.setSendStatus(MailSendStatusEnum.INIT.getStatus());
+       reqVO.setSendTime((buildBetweenTime(2023, 2, 1, 2023, 2, 15)));
+
+       // 调用
+       PageResult<MailLogDO> pageResult = mailLogService.getMailLogPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbMailLog, pageResult.getList().get(0));
+    }
+
+    private static Map<String, Object> randomTemplateParams() {
+        return MapUtil.<String, Object>builder().put(randomString(), randomString())
+                .put(randomString(), randomString()).build();
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceTest.java
index 3b314b791a..5a31892f58 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceTest.java
@@ -235,7 +235,6 @@ public class SmsLogServiceTest extends BaseDbUnitTest {
         return randomPojo(SmsLogDO.class, ArrayUtils.append(consumer, consumers));
     }
 
-
     private static Map<String, Object> randomTemplateParams() {
         return MapUtil.<String, Object>builder().put(randomString(), randomString())
                 .put(randomString(), randomString()).build();
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
index e3c2d2fdde..1fb4cbaf9c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
@@ -27,3 +27,4 @@ DELETE FROM "system_oauth2_refresh_token";
 DELETE FROM "system_oauth2_code";
 DELETE FROM "system_mail_account";
 DELETE FROM "system_mail_template";
+DELETE FROM "system_mail_log";
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
index 230f778dd6..1a2c41b738 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
@@ -601,3 +601,28 @@ CREATE TABLE IF NOT EXISTS "system_mail_template" (
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
 ) COMMENT '邮件模版表';
+
+CREATE TABLE IF NOT EXISTS "system_mail_log" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "user_id" bigint,
+    "user_type" varchar,
+    "to_mail" varchar NOT NULL,
+    "account_id" bigint NOT NULL,
+    "from_mail" varchar NOT NULL,
+    "template_id" bigint NOT NULL,
+    "template_code" varchar NOT NULL,
+    "template_nickname" varchar,
+    "template_title" varchar NOT NULL,
+    "template_content" varchar NOT NULL,
+    "template_params" varchar NOT NULL,
+    "send_status" varchar NOT NULL,
+    "send_time" datetime,
+    "send_message_id" varchar,
+    "send_exception" varchar,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    PRIMARY KEY ("id")
+) COMMENT '邮件日志表';

From 5d1abd5f4447290e63741138849f771f7a85e86e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 10:14:15 +0800
Subject: [PATCH 45/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=20send=20=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mail/dto/MailSendSingleToUserReqDTO.java  |   2 +-
 .../system/api/mail/MailSendApiImpl.java      |  14 +-
 .../service/mail/MailSendServiceImplTest.java | 154 +++++++++++++++++-
 3 files changed, 161 insertions(+), 9 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
index e2ede96aea..28333a5e78 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
@@ -18,7 +18,7 @@ public class MailSendSingleToUserReqDTO {
      * 用户编号
      */
     @NotNull(message = "用户编号不能为空")
-    private String userId;
+    private Long userId;
     /**
      * 邮箱
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
index eaad0f8abd..59648f5a58 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.system.api.mail;
 
 import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
+
 /**
- * 邮件发送 API 接口
+ * 邮件发送 API 实现类
  *
  * @author wangjingyi
  */
@@ -13,14 +16,19 @@ import org.springframework.validation.annotation.Validated;
 @Validated
 public class MailSendApiImpl implements MailSendApi {
 
+    @Resource
+    private MailSendService mailSendService;
+
     @Override
     public Long sendSingleSmsToAdmin(MailSendSingleToUserReqDTO reqDTO) {
-        return null;
+        return mailSendService.sendSingleMailToAdmin(reqDTO.getMail(), reqDTO.getUserId(),
+                reqDTO.getTemplateCode(), reqDTO.getTemplateParams());
     }
 
     @Override
     public Long sendSingleSmsToMember(MailSendSingleToUserReqDTO reqDTO) {
-        return null;
+        return mailSendService.sendSingleMailToMember(reqDTO.getMail(), reqDTO.getUserId(),
+                reqDTO.getTemplateCode(), reqDTO.getTemplateParams());
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
index 33e17314a9..bd93cd00a0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
@@ -1,13 +1,44 @@
 package cn.iocoder.yudao.module.system.service.mail;
 
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.extra.mail.MailAccount;
 import cn.hutool.extra.mail.MailUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
+import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 
-import static org.junit.jupiter.api.Assertions.*;
+import java.util.HashMap;
+import java.util.Map;
 
-class MailSendServiceImplTest {
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class MailSendServiceImplTest extends BaseMockitoUnitTest {
+
+    @InjectMocks
+    private MailSendServiceImpl mailSendService;
+
+    @Mock
+    private MailAccountService mailAccountService;
+    @Mock
+    private MailTemplateService mailTemplateService;
+    @Mock
+    private MailLogService mailLogService;
+    @Mock
+    private MailProducer mailProducer;
 
     /**
      * 用于快速测试你的邮箱账号是否正常
@@ -16,11 +47,124 @@ class MailSendServiceImplTest {
     @Disabled
     public void testDemo() {
         MailAccount mailAccount = new MailAccount()
-                .setFrom("奥特曼 <ydym_test@163.com>")
-                .setHost("smtp.163.com").setPort(465).setSslEnable(true)
-                .setAuth(true).setUser("ydym_test@163.com").setPass("WBZTEINMIFVRYSOE");
+//                .setFrom("奥特曼 <ydym_test@163.com>")
+                .setFrom("ydym_test@163.com") // 邮箱地址
+                .setHost("smtp.163.com").setPort(465).setSslEnable(true) // SMTP 服务器
+                .setAuth(true).setUser("ydym_test@163.com").setPass("WBZTEINMIFVRYSOE"); // 登录账号密码
         String messageId = MailUtil.send(mailAccount, "7685413@qq.com", "主题", "内容", false);
         System.out.println("发送结果：" + messageId);
     }
 
+    /**
+     * 发送成功，当短信模板开启时
+     */
+    @Test
+    public void testSendSingleMail_successWhenMailTemplateEnable() {
+        // 准备参数
+        String mail = randomEmail();
+        Long userId = randomLongId();
+        Integer userType = randomEle(UserTypeEnum.values()).getValue();
+        String templateCode = randomString();
+        Map<String, Object> templateParams = MapUtil.<String, Object>builder().put("code", "1234")
+                .put("op", "login").build();
+        // mock MailTemplateService 的方法
+        MailTemplateDO template = randomPojo(MailTemplateDO.class, o -> {
+            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+            o.setContent("验证码为{code}, 操作为{op}");
+            o.setParams(Lists.newArrayList("code", "op"));
+        });
+        when(mailTemplateService.getMailTemplateByCodeFromCache(eq(templateCode))).thenReturn(template);
+        String content = randomString();
+        when(mailTemplateService.formatMailTemplateContent(eq(template.getContent()), eq(templateParams)))
+                .thenReturn(content);
+        // mock MailAccountService 的方法
+        MailAccountDO account = randomPojo(MailAccountDO.class);
+        when(mailAccountService.getMailAccountFromCache(eq(template.getAccountId()))).thenReturn(account);
+        // mock MailLogService 的方法
+        Long mailLogId = randomLongId();
+        when(mailLogService.createMailLog(eq(userId), eq(userType), eq(mail),
+                eq(account), eq(template), eq(content), eq(templateParams), eq(true))).thenReturn(mailLogId);
+
+        // 调用
+        Long resultMailLogId = mailSendService.sendSingleMail(mail, userId, userType, templateCode, templateParams);
+        // 断言
+        assertEquals(mailLogId, resultMailLogId);
+        // 断言调用
+        verify(mailProducer).sendMailSendMessage(eq(mailLogId), eq(mail),
+                eq(account.getId()), eq(template.getNickname()), eq(template.getTitle()), eq(content));
+    }
+
+    /**
+     * 发送成功，当短信模板关闭时
+     */
+    @Test
+    public void testSendSingleMail_successWhenSmsTemplateDisable() {
+        // 准备参数
+        String mail = randomEmail();
+        Long userId = randomLongId();
+        Integer userType = randomEle(UserTypeEnum.values()).getValue();
+        String templateCode = randomString();
+        Map<String, Object> templateParams = MapUtil.<String, Object>builder().put("code", "1234")
+                .put("op", "login").build();
+        // mock MailTemplateService 的方法
+        MailTemplateDO template = randomPojo(MailTemplateDO.class, o -> {
+            o.setStatus(CommonStatusEnum.DISABLE.getStatus());
+            o.setContent("验证码为{code}, 操作为{op}");
+            o.setParams(Lists.newArrayList("code", "op"));
+        });
+        when(mailTemplateService.getMailTemplateByCodeFromCache(eq(templateCode))).thenReturn(template);
+        String content = randomString();
+        when(mailTemplateService.formatMailTemplateContent(eq(template.getContent()), eq(templateParams)))
+                .thenReturn(content);
+        // mock MailAccountService 的方法
+        MailAccountDO account = randomPojo(MailAccountDO.class);
+        when(mailAccountService.getMailAccountFromCache(eq(template.getAccountId()))).thenReturn(account);
+        // mock MailLogService 的方法
+        Long mailLogId = randomLongId();
+        when(mailLogService.createMailLog(eq(userId), eq(userType), eq(mail),
+                eq(account), eq(template), eq(content), eq(templateParams), eq(false))).thenReturn(mailLogId);
+
+        // 调用
+        Long resultMailLogId = mailSendService.sendSingleMail(mail, userId, userType, templateCode, templateParams);
+        // 断言
+        assertEquals(mailLogId, resultMailLogId);
+        // 断言调用
+        verify(mailProducer, times(0)).sendMailSendMessage(anyLong(), anyString(),
+                anyLong(), anyString(), anyString(), anyString());
+    }
+
+    @Test
+    public void testCheckMailTemplateValid_notExists() {
+        // 准备参数
+        String templateCode = randomString();
+        // mock 方法
+
+        // 调用，并断言异常
+        assertServiceException(() -> mailSendService.checkMailTemplateValid(templateCode),
+                MAIL_TEMPLATE_NOT_EXISTS);
+    }
+
+    @Test
+    public void testBuildTemplateParams_paramMiss() {
+        // 准备参数
+        MailTemplateDO template = randomPojo(MailTemplateDO.class,
+                o -> o.setParams(Lists.newArrayList("code")));
+        Map<String, Object> templateParams = new HashMap<>();
+        // mock 方法
+
+        // 调用，并断言异常
+        assertServiceException(() -> mailSendService.buildTemplateParams(template, templateParams),
+                MAIL_SEND_TEMPLATE_PARAM_MISS, "code");
+    }
+
+    @Test
+    public void testCheckMail_notExists() {
+        // 准备参数
+        // mock 方法
+
+        // 调用，并断言异常
+        assertServiceException(() -> mailSendService.checkMail(null),
+                MAIL_SEND_MAIL_NOT_EXISTS);
+    }
+
 }

From 2c55d29411991aaceb0181c5518db7b802486b28 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 14:15:45 +0800
Subject: [PATCH 46/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=8C=E5=96=84=E5=89=8D=E7=AB=AF=E7=9A=84=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/system/mail/account/index.vue  | 1 +
 yudao-ui-admin/src/views/system/mail/log/index.vue      | 1 +
 yudao-ui-admin/src/views/system/mail/template/index.vue | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/system/mail/account/index.vue b/yudao-ui-admin/src/views/system/mail/account/index.vue
index e64563528c..27f8d0fc1c 100755
--- a/yudao-ui-admin/src/views/system/mail/account/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/account/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/yudao-ui-admin/src/views/system/mail/log/index.vue b/yudao-ui-admin/src/views/system/mail/log/index.vue
index efaac16ffc..d0b0b34276 100755
--- a/yudao-ui-admin/src/views/system/mail/log/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/log/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/yudao-ui-admin/src/views/system/mail/template/index.vue b/yudao-ui-admin/src/views/system/mail/template/index.vue
index a8825144e3..1160dee06c 100755
--- a/yudao-ui-admin/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/template/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -119,7 +120,7 @@
     <el-dialog title="测试发送邮件" :visible.sync="sendOpen" width="500px" append-to-body>
       <el-form ref="sendForm" :model="sendForm" :rules="sendRules" label-width="140px">
         <el-form-item label="模板内容" prop="content">
-          <el-input v-model="sendForm.content" type="textarea" placeholder="请输入模板内容" readonly />
+          <editor v-model="sendForm.content" :min-height="192" readonly />
         </el-form-item>
         <el-form-item label="收件邮箱" prop="mail">
           <el-input v-model="sendForm.mail" placeholder="请输入收件邮箱" />

From 4cbf7398e850deb88e8aa40cf90c8e5c3906ad9f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 15:11:11 +0800
Subject: [PATCH 47/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9Avue3=20=E9=82=AE=E7=AE=B1=E8=B4=A6=E5=8F=B7=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   1 +
 .../src/api/system/mail/account/index.ts      |  41 +++++
 .../mail/account/account.template.data.ts     |  65 ++++++++
 .../src/views/system/mail/account/index.vue   | 151 ++++++++++++++++++
 .../src/views/system/mail/account/index.vue   |   2 +-
 5 files changed, 259 insertions(+), 1 deletion(-)
 create mode 100644 yudao-ui-admin-vue3/src/api/system/mail/account/index.ts
 create mode 100644 yudao-ui-admin-vue3/src/views/system/mail/account/account.template.data.ts
 create mode 100644 yudao-ui-admin-vue3/src/views/system/mail/account/index.vue

diff --git a/README.md b/README.md
index c2b9997df1..1e30309e89 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@
 | 🚀  | 租户套餐  | 配置租户套餐，自定每个租户的菜单、操作、按钮的权限       |
 |     | 字典管理  | 对系统中经常使用的一些较为固定的数据进行维护          |
 | 🚀  | 短信管理  | 短信渠道、短息模板、短信日志，对接阿里云、腾讯云等主流短信平台 |
+| 🚀  | 邮件管理  | 邮箱账号、邮件模版、邮件发送日志，支持所有邮件平台       |
 | 🚀  | 操作日志  | 系统正常操作日志记录和查询，集成 Swagger 生成日志内容 |
 | ⭐️  | 登录日志  | 系统登录日志记录查询，包含登录异常               |
 | 🚀  | 错误码管理 | 系统所有错误码的管理，可在线修改错误提示，无需重启服务     |
diff --git a/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts b/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts
new file mode 100644
index 0000000000..37bdc81470
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+export interface MailAccountVO {
+  id: number
+  mail: string
+  username: string
+  password: string
+  host: string
+  port: number
+  sslEnable: boolean
+}
+
+export interface MailAccountPageReqVO extends PageParam {
+  mail?: string
+  username?: string
+}
+
+// 查询邮箱账号列表
+export const getMailAccountPageApi = async (params: MailAccountPageReqVO) => {
+  return await request.get({ url: '/system/mail-account/page', params })
+}
+
+// 查询邮箱账号详情
+export const getMailAccountApi = async (id: number) => {
+  return await request.get({ url: '/system/mail-account/get?id=' + id })
+}
+
+// 新增邮箱账号
+export const createMailAccountApi = async (data: MailAccountVO) => {
+  return await request.post({ url: '/system/mail-account/create', data })
+}
+
+// 修改邮箱账号
+export const updateMailAccountApi = async (data: MailAccountVO) => {
+  return await request.put({ url: '/system/mail-account/update', data })
+}
+
+// 删除邮箱账号
+export const deleteMailAccountApi = async (id: number) => {
+  return await request.delete({ url: '/system/mail-account/delete?id=' + id })
+}
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/account/account.template.data.ts b/yudao-ui-admin-vue3/src/views/system/mail/account/account.template.data.ts
new file mode 100644
index 0000000000..a2e29f8523
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/mail/account/account.template.data.ts
@@ -0,0 +1,65 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+
+// 表单校验
+export const rules = reactive({
+  mail: [required],
+  username: [required],
+  password: [required],
+  host: [required],
+  port: [required],
+  sslEnable: [required]
+})
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id', // 默认的主键 ID
+  primaryTitle: '编号',
+  primaryType: 'id',
+  action: true,
+  actionWidth: '200', // 3 个按钮默认 200，如有删减对应增减即可
+  columns: [
+    {
+      title: '邮箱',
+      field: 'mail',
+      isSearch: true
+    },
+    {
+      title: '用户名',
+      field: 'username',
+      isSearch: true
+    },
+    {
+      title: '密码',
+      field: 'password',
+      isTable: false
+    },
+    {
+      title: 'SMTP 服务器域名',
+      field: 'host'
+    },
+    {
+      title: 'SMTP 服务器端口',
+      field: 'port',
+      form: {
+        component: 'InputNumber',
+        value: 465
+      }
+    },
+    {
+      title: '是否开启 SSL',
+      field: 'sslEnable',
+      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+      dictClass: 'boolean'
+    },
+    {
+      title: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      formatter: 'formatDate',
+      table: {
+        width: 180
+      }
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue b/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue
new file mode 100644
index 0000000000..b8fdf09311
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue
@@ -0,0 +1,151 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #toolbar_buttons>
+        <!-- 操作：新增 -->
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          :title="t('action.add')"
+          v-hasPermi="['system:mail-account:create']"
+          @click="handleCreate()"
+        />
+      </template>
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：修改 -->
+        <XTextButton
+          preIcon="ep:edit"
+          :title="t('action.edit')"
+          v-hasPermi="['system:mail-account:update']"
+          @click="handleUpdate(row.id)"
+        />
+        <!-- 操作：详情 -->
+        <XTextButton
+          preIcon="ep:view"
+          :title="t('action.detail')"
+          v-hasPermi="['system:mail-account:query']"
+          @click="handleDetail(row.id)"
+        />
+        <!-- 操作：删除 -->
+        <XTextButton
+          preIcon="ep:delete"
+          :title="t('action.del')"
+          v-hasPermi="['system:mail-account:delete']"
+          @click="deleteData(row.id)"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+  <!-- 弹窗 -->
+  <XModal id="mailAccountModel" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：添加/修改 -->
+    <Form
+      ref="formRef"
+      v-if="['create', 'update'].includes(actionType)"
+      :schema="allSchemas.formSchema"
+      :rules="rules"
+    />
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
+        @click="submitForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts" name="MailAccount">
+import { FormExpose } from '@/components/Form'
+// 业务相关的 import
+import { rules, allSchemas } from './account.template.data'
+import * as MailAccountApi from '@/api/system/mail/account'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+// 列表相关的变量
+const [registerTable, { reload, deleteData }] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: MailAccountApi.getMailAccountPageApi,
+  deleteApi: MailAccountApi.deleteMailAccountApi
+})
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+}
+
+// 新增操作
+const handleCreate = () => {
+  setDialogTile('create')
+  modelLoading.value = false
+}
+
+// 修改操作
+const handleUpdate = async (rowId: number) => {
+  setDialogTile('update')
+  // 设置数据
+  const res = await MailAccountApi.getMailAccountApi(rowId)
+  unref(formRef)?.setValues(res)
+  modelLoading.value = false
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  setDialogTile('detail')
+  const res = await MailAccountApi.getMailAccountApi(rowId)
+  detailData.value = res
+  modelLoading.value = false
+}
+
+// 提交按钮
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as MailAccountApi.MailAccountVO
+        if (actionType.value === 'create') {
+          await MailAccountApi.createMailAccountApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await MailAccountApi.updateMailAccountApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        modelVisible.value = false
+      } finally {
+        actionLoading.value = false
+        // 刷新列表
+        await reload()
+      }
+    }
+  })
+}
+</script>
diff --git a/yudao-ui-admin/src/views/system/mail/account/index.vue b/yudao-ui-admin/src/views/system/mail/account/index.vue
index 27f8d0fc1c..56b6f3b842 100755
--- a/yudao-ui-admin/src/views/system/mail/account/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/account/index.vue
@@ -27,7 +27,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="邮箱" align="center" prop="mail" />
       <el-table-column label="用户名" align="center" prop="username" />
       <el-table-column label="SMTP 服务器域名" align="center" prop="host" />

From 4996d05d1e29bb8b85b95a973649d204c03ecc18 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 16:59:24 +0800
Subject: [PATCH 48/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9Avue3=20=E9=82=AE=E4=BB=B6=E6=A8=A1=E7=89=88=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/mail/account/index.ts      |   5 +
 .../src/api/system/mail/template/index.ts     |  58 ++++
 ...count.template.data.ts => account.data.ts} |   0
 .../src/views/system/mail/account/index.vue   |   2 +-
 .../src/views/system/mail/template/index.vue  | 258 ++++++++++++++++++
 .../system/mail/template/template.data.ts     |  93 +++++++
 .../views/system/sms/smsTemplate/index.vue    |   4 +-
 7 files changed, 417 insertions(+), 3 deletions(-)
 create mode 100644 yudao-ui-admin-vue3/src/api/system/mail/template/index.ts
 rename yudao-ui-admin-vue3/src/views/system/mail/account/{account.template.data.ts => account.data.ts} (100%)
 create mode 100644 yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
 create mode 100644 yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts

diff --git a/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts b/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts
index 37bdc81470..8b662a701c 100644
--- a/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/mail/account/index.ts
@@ -39,3 +39,8 @@ export const updateMailAccountApi = async (data: MailAccountVO) => {
 export const deleteMailAccountApi = async (id: number) => {
   return await request.delete({ url: '/system/mail-account/delete?id=' + id })
 }
+
+// 获得邮箱账号精简列表
+export const getSimpleMailAccounts = async () => {
+  return request.get({ url: '/system/mail-account/list-all-simple' })
+}
diff --git a/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts b/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts
new file mode 100644
index 0000000000..a0a0faf2f8
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts
@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface MailTemplateVO {
+  id: number
+  name: string
+  code: string
+  accountId: number
+  nickname: string
+  title: string
+  content: string
+  params: string
+  status: number
+  remark: string
+}
+
+export interface MailTemplatePageReqVO extends PageParam {
+  name?: string
+  code?: string
+  accountId?: number
+  status?: number
+  createTime?: Date[]
+}
+
+export interface MailSmsReqVO {
+  mail: string
+  templateCode: string
+  templateParams: Map<String, Object>
+}
+
+// 查询邮件模版列表
+export const getMailTemplatePageApi = async (params: MailTemplatePageReqVO) => {
+  return await request.get({ url: '/system/mail-template/page', params })
+}
+
+// 查询邮件模版详情
+export const getMailTemplateApi = async (id: number) => {
+  return await request.get({ url: '/system/mail-template/get?id=' + id })
+}
+
+// 新增邮件模版
+export const createMailTemplateApi = async (data: MailTemplateVO) => {
+  return await request.post({ url: '/system/mail-template/create', data })
+}
+
+// 修改邮件模版
+export const updateMailTemplateApi = async (data: MailTemplateVO) => {
+  return await request.put({ url: '/system/mail-template/update', data })
+}
+
+// 删除邮件模版
+export const deleteMailTemplateApi = async (id: number) => {
+  return await request.delete({ url: '/system/mail-template/delete?id=' + id })
+}
+
+// 发送邮件
+export const sendMailApi = (data: MailSmsReqVO) => {
+  return request.post({ url: '/system/mail-template/send-mail', data })
+}
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/account/account.template.data.ts b/yudao-ui-admin-vue3/src/views/system/mail/account/account.data.ts
similarity index 100%
rename from yudao-ui-admin-vue3/src/views/system/mail/account/account.template.data.ts
rename to yudao-ui-admin-vue3/src/views/system/mail/account/account.data.ts
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue b/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue
index b8fdf09311..7c4ad0f9df 100644
--- a/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/mail/account/index.vue
@@ -69,7 +69,7 @@
 <script setup lang="ts" name="MailAccount">
 import { FormExpose } from '@/components/Form'
 // 业务相关的 import
-import { rules, allSchemas } from './account.template.data'
+import { rules, allSchemas } from './account.data'
 import * as MailAccountApi from '@/api/system/mail/account'
 
 const { t } = useI18n() // 国际化
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
new file mode 100644
index 0000000000..dca04829bd
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
@@ -0,0 +1,258 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #toolbar_buttons>
+        <!-- 操作：新增 -->
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          :title="t('action.add')"
+          v-hasPermi="['system:mail-template:create']"
+          @click="handleCreate()"
+        />
+      </template>
+      <template #accountId_default="{ row }">
+        <span>{{ accountOptions.find((account) => account.id === row.accountId)?.mail }}</span>
+      </template>
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：测试短信 -->
+        <XTextButton
+          preIcon="ep:cpu"
+          :title="t('action.test')"
+          v-hasPermi="['system:mail-template:send-mail']"
+          @click="handleSendMail(row)"
+        />
+        <!-- 操作：修改 -->
+        <XTextButton
+          preIcon="ep:edit"
+          :title="t('action.edit')"
+          v-hasPermi="['system:mail-template:update']"
+          @click="handleUpdate(row.id)"
+        />
+        <!-- 操作：详情 -->
+        <XTextButton
+          preIcon="ep:view"
+          :title="t('action.detail')"
+          v-hasPermi="['system:mail-template:query']"
+          @click="handleDetail(row.id)"
+        />
+        <!-- 操作：删除 -->
+        <XTextButton
+          preIcon="ep:delete"
+          :title="t('action.del')"
+          v-hasPermi="['system:mail-template:delete']"
+          @click="deleteData(row.id)"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+
+  <!-- 添加/修改/详情的弹窗 -->
+  <XModal id="mailTemplateModel" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：添加/修改 -->
+    <Form
+      ref="formRef"
+      v-if="['create', 'update'].includes(actionType)"
+      :schema="allSchemas.formSchema"
+      :rules="rules"
+    >
+      <template #accountId="form">
+        <el-select v-model="form.accountId">
+          <el-option
+            v-for="item in accountOptions"
+            :key="item.id"
+            :label="item.mail"
+            :value="item.id"
+          />
+        </el-select>
+      </template>
+    </Form>
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
+        @click="submitForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+
+  <!-- 测试邮件的弹窗 -->
+  <XModal id="sendTest" v-model="sendVisible" title="测试">
+    <el-form :model="sendForm" :rules="sendRules" label-width="200px" label-position="top">
+      <el-form-item label="模板内容" prop="content">
+        <Editor :model-value="sendForm.content" readonly height="150px" />
+      </el-form-item>
+      <el-form-item label="收件邮箱" prop="mail">
+        <el-input v-model="sendForm.mail" placeholder="请输入收件邮箱" />
+      </el-form-item>
+      <el-form-item
+        v-for="param in sendForm.params"
+        :key="param"
+        :label="'参数 {' + param + '}'"
+        :prop="'templateParams.' + param"
+      >
+        <el-input
+          v-model="sendForm.templateParams[param]"
+          :placeholder="'请输入 ' + param + ' 参数'"
+        />
+      </el-form-item>
+    </el-form>
+    <!-- 操作按钮 -->
+    <template #footer>
+      <XButton
+        type="primary"
+        :title="t('action.test')"
+        :loading="actionLoading"
+        @click="sendTest()"
+      />
+      <XButton :title="t('dialog.close')" @click="sendVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts" name="MailTemplate">
+import { FormExpose } from '@/components/Form'
+// 业务相关的 import
+import { rules, allSchemas } from './template.data'
+import * as MailTemplateApi from '@/api/system/mail/template'
+import * as MailAccountApi from '@/api/system/mail/account'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+// 列表相关的变量
+const [registerTable, { reload, deleteData }] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: MailTemplateApi.getMailTemplatePageApi,
+  deleteApi: MailTemplateApi.deleteMailTemplateApi
+})
+const accountOptions = ref([]) // 账号下拉选项
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+}
+
+// 新增操作
+const handleCreate = () => {
+  setDialogTile('create')
+  modelLoading.value = false
+}
+
+// 修改操作
+const handleUpdate = async (rowId: number) => {
+  setDialogTile('update')
+  // 设置数据
+  const res = await MailTemplateApi.getMailTemplateApi(rowId)
+  unref(formRef)?.setValues(res)
+  modelLoading.value = false
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  setDialogTile('detail')
+  const res = await MailTemplateApi.getMailTemplateApi(rowId)
+  detailData.value = res
+  modelLoading.value = false
+}
+
+// 提交按钮
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as MailTemplateApi.MailTemplateVO
+        if (actionType.value === 'create') {
+          await MailTemplateApi.createMailTemplateApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await MailTemplateApi.updateMailTemplateApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        modelVisible.value = false
+      } finally {
+        actionLoading.value = false
+        // 刷新列表
+        await reload()
+      }
+    }
+  })
+}
+
+// ========== 测试相关 ==========
+const sendForm = ref({
+  content: '',
+  params: {},
+  mail: '',
+  templateCode: '',
+  templateParams: {}
+})
+const sendRules = ref({
+  mail: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
+  templateCode: [{ required: true, message: '模版编号不能为空', trigger: 'blur' }],
+  templateParams: {}
+})
+const sendVisible = ref(false)
+
+const handleSendMail = (row: any) => {
+  sendForm.value.content = row.content
+  sendForm.value.params = row.params
+  sendForm.value.templateCode = row.code
+  sendForm.value.templateParams = row.params.reduce(function (obj, item) {
+    obj[item] = undefined
+    return obj
+  }, {})
+  sendRules.value.templateParams = row.params.reduce(function (obj, item) {
+    obj[item] = { required: true, message: '参数 ' + item + ' 不能为空', trigger: 'change' }
+    return obj
+  }, {})
+  sendVisible.value = true
+}
+
+const sendTest = async () => {
+  const data: MailTemplateApi.MailSmsReqVO = {
+    mail: sendForm.value.mail,
+    templateCode: sendForm.value.templateCode,
+    templateParams: sendForm.value.templateParams as unknown as Map<string, Object>
+  }
+  const res = await MailTemplateApi.sendMailApi(data)
+  if (res) {
+    message.success('提交发送成功！发送结果，见发送日志编号：' + res)
+  }
+  sendVisible.value = false
+}
+
+// ========== 初始化 ==========
+onMounted(() => {
+  MailAccountApi.getSimpleMailAccounts().then((data) => {
+    accountOptions.value = data
+  })
+})
+</script>
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts b/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts
new file mode 100644
index 0000000000..b7707b433d
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts
@@ -0,0 +1,93 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+
+// 表单校验
+export const rules = reactive({
+  name: [required],
+  code: [required],
+  accountId: [required],
+  title: [required],
+  content: [required],
+  params: [required],
+  status: [required]
+})
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id', // 默认的主键ID
+  primaryTitle: '编号', // 默认显示的值
+  primaryType: null,
+  action: true,
+  actionWidth: '260',
+  columns: [
+    {
+      title: '模板编码',
+      field: 'code',
+      isSearch: true
+    },
+    {
+      title: '模板名称',
+      field: 'name',
+      isSearch: true
+    },
+    {
+      title: '模板标题',
+      field: 'title'
+    },
+    {
+      title: '模板内容',
+      field: 'content',
+      form: {
+        component: 'Editor',
+        colProps: {
+          span: 24
+        },
+        componentProps: {
+          valueHtml: ''
+        }
+      }
+    },
+    {
+      title: '邮箱账号',
+      field: 'accountId',
+      isSearch: true,
+      table: {
+        width: 200,
+        slots: {
+          default: 'accountId_default'
+        }
+      }
+    },
+    {
+      title: '发送人名称',
+      field: 'nickname'
+    },
+    {
+      title: '开启状态',
+      field: 'status',
+      isSearch: true,
+      dictType: DICT_TYPE.COMMON_STATUS,
+      dictClass: 'number'
+    },
+    {
+      title: '备注',
+      field: 'remark',
+      isTable: false
+    },
+    {
+      title: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      formatter: 'formatDate',
+      table: {
+        width: 180
+      },
+      search: {
+        show: true,
+        itemRender: {
+          name: 'XDataTimePicker'
+        }
+      }
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
index 0bc40c8d8a..bbc7c86369 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
@@ -197,7 +197,7 @@ const sendSmsForm = ref({
 })
 const sendSmsRules = ref({
   mobile: [{ required: true, message: '手机不能为空', trigger: 'blur' }],
-  templateCode: [{ required: true, message: '手机不能为空', trigger: 'blur' }],
+  templateCode: [{ required: true, message: '模版编号不能为空', trigger: 'blur' }],
   templateParams: {}
 })
 const sendVisible = ref(false)
@@ -225,7 +225,7 @@ const sendSmsTest = async () => {
   }
   const res = await SmsTemplateApi.sendSmsApi(data)
   if (res) {
-    message.success('发送成功')
+    message.success('提交发送成功！发送结果，见发送日志编号：' + res)
   }
   sendVisible.value = false
 }

From 86a884e3d23554fed4a2a6b6ba25f2eca2c06de5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 17:10:15 +0800
Subject: [PATCH 49/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9Avue3=20=E9=82=AE=E4=BB=B6=E6=A8=A1=E7=89=88=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/mail/template/index.vue      | 15 +++++++++++++++
 .../views/system/mail/template/template.data.ts   |  5 +++++
 .../src/views/system/mail/template/index.vue      |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
index dca04829bd..e7ddd23962 100644
--- a/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
@@ -2,6 +2,17 @@
   <ContentWrap>
     <!-- 列表 -->
     <XTable @register="registerTable">
+      <template #accountId_search>
+        <el-select v-model="queryParams.accountId">
+          <el-option :key="undefined" label="全部" :value="undefined" />
+          <el-option
+            v-for="item in accountOptions"
+            :key="item.id"
+            :label="item.mail"
+            :value="item.id"
+          />
+        </el-select>
+      </template>
       <template #toolbar_buttons>
         <!-- 操作：新增 -->
         <XButton
@@ -132,8 +143,12 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 // 列表相关的变量
+const queryParams = reactive({
+  accountId: null
+})
 const [registerTable, { reload, deleteData }] = useXTable({
   allSchemas: allSchemas,
+  params: queryParams,
   getListApi: MailTemplateApi.getMailTemplatePageApi,
   deleteApi: MailTemplateApi.deleteMailTemplateApi
 })
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts b/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts
index b7707b433d..32522e33c5 100644
--- a/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/mail/template/template.data.ts
@@ -55,6 +55,11 @@ const crudSchemas = reactive<VxeCrudSchema>({
         slots: {
           default: 'accountId_default'
         }
+      },
+      search: {
+        slots: {
+          default: 'accountId_search'
+        }
       }
     },
     {
diff --git a/yudao-ui-admin/src/views/system/mail/template/index.vue b/yudao-ui-admin/src/views/system/mail/template/index.vue
index 1160dee06c..e1361464ac 100755
--- a/yudao-ui-admin/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/template/index.vue
@@ -320,7 +320,7 @@ export default {
       this.sendForm = {
         content: undefined,
         params: undefined,
-        mobile: undefined,
+        mail: undefined,
         templateCode: undefined,
         templateParams: {}
       };

From 28ba9a7456d013a7eb6f41a7104af7250d4736f0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 20:51:52 +0800
Subject: [PATCH 50/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9Avue3=20=E9=82=AE=E4=BB=B6=E6=97=A5=E5=BF=97=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/mail/MailLogController.java         |  14 ++
 .../system/convert/mail/MailLogConvert.java   |   2 +
 .../system/service/mail/MailLogService.java   |   8 ++
 .../service/mail/MailLogServiceImpl.java      |   5 +
 .../src/api/system/mail/log/index.ts          |  40 ++++++
 yudao-ui-admin-vue3/src/utils/dict.ts         |   1 +
 .../src/views/system/mail/log/index.vue       |  96 ++++++++++++++
 .../src/views/system/mail/log/log.data.ts     | 121 ++++++++++++++++++
 8 files changed, 287 insertions(+)
 create mode 100644 yudao-ui-admin-vue3/src/api/system/mail/log/index.ts
 create mode 100644 yudao-ui-admin-vue3/src/views/system/mail/log/index.vue
 create mode 100644 yudao-ui-admin-vue3/src/views/system/mail/log/log.data.ts

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
index 88cfeb7a4e..2252c8789a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java
@@ -5,14 +5,19 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateRespVO;
 import cn.iocoder.yudao.module.system.convert.mail.MailLogConvert;
+import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import cn.iocoder.yudao.module.system.service.mail.MailLogService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -37,4 +42,13 @@ public class MailLogController {
         return success(MailLogConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @GetMapping("/get")
+    @ApiOperation("获得邮箱日志")
+    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
+    @PreAuthorize("@ss.hasPermission('system:mail-log:query')")
+    public CommonResult<MailLogRespVO> getMailTemplate(@RequestParam("id") Long id) {
+        MailLogDO mailLogDO = mailLogService.getMailLog(id);
+        return success(MailLogConvert.INSTANCE.convert(mailLogDO));
+    }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
index f4a729c5c4..c5599e355a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java
@@ -13,4 +13,6 @@ public interface MailLogConvert {
 
     PageResult<MailLogRespVO> convertPage(PageResult<MailLogDO> pageResult);
 
+    MailLogRespVO convert(MailLogDO bean);
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index 859b93c75c..703467141c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -24,6 +24,14 @@ public interface MailLogService {
      */
     PageResult<MailLogDO> getMailLogPage(MailLogPageReqVO pageVO);
 
+    /**
+     * 获得指定编号的邮件日志
+     *
+     * @param id 日志编号
+     * @return 邮件日志
+     */
+    MailLogDO getMailLog(Long id);
+
     /**
      * 创建邮件日志
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
index 997eb3d88d..743c3a4c77 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java
@@ -35,6 +35,11 @@ public class MailLogServiceImpl implements MailLogService {
         return mailLogMapper.selectPage(pageVO);
     }
 
+    @Override
+    public MailLogDO getMailLog(Long id) {
+        return mailLogMapper.selectById(id);
+    }
+
     @Override
     public Long createMailLog(Long userId, Integer userType, String toMail,
                               MailAccountDO account, MailTemplateDO template,
diff --git a/yudao-ui-admin-vue3/src/api/system/mail/log/index.ts b/yudao-ui-admin-vue3/src/api/system/mail/log/index.ts
new file mode 100644
index 0000000000..9c6c60eb26
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/api/system/mail/log/index.ts
@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+export interface MailLogVO {
+  id: number
+  userId: number
+  userType: number
+  toMail: string
+  accountId: number
+  fromMail: string
+  templateId: number
+  templateCode: string
+  templateNickname: string
+  templateTitle: string
+  templateContent: string
+  templateParams: string
+  sendStatus: number
+  sendTime: Date
+  sendMessageId: string
+  sendException: string
+}
+
+export interface MailLogPageReqVO extends PageParam {
+  userId?: number
+  userType?: number
+  toMail?: string
+  accountId?: number
+  templateId?: number
+  sendStatus?: number
+  sendTime?: Date[]
+}
+
+// 查询邮件日志列表
+export const getMailLogPageApi = async (params: MailLogPageReqVO) => {
+  return await request.get({ url: '/system/mail-log/page', params })
+}
+
+// 查询邮件日志详情
+export const getMailLogApi = async (id: number) => {
+  return await request.get({ url: '/system/mail-log/get?id=' + id })
+}
diff --git a/yudao-ui-admin-vue3/src/utils/dict.ts b/yudao-ui-admin-vue3/src/utils/dict.ts
index 5e168e3013..176ddf92d4 100644
--- a/yudao-ui-admin-vue3/src/utils/dict.ts
+++ b/yudao-ui-admin-vue3/src/utils/dict.ts
@@ -90,6 +90,7 @@ export enum DICT_TYPE {
   SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
   SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
   SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
+  SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/log/index.vue b/yudao-ui-admin-vue3/src/views/system/mail/log/index.vue
new file mode 100644
index 0000000000..be96482003
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/mail/log/index.vue
@@ -0,0 +1,96 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #accountId_search>
+        <el-select v-model="queryParams.accountId">
+          <el-option :key="undefined" label="全部" :value="undefined" />
+          <el-option
+            v-for="item in accountOptions"
+            :key="item.id"
+            :label="item.mail"
+            :value="item.id"
+          />
+        </el-select>
+      </template>
+      <template #toMail_default="{ row }">
+        <div>{{ row.toMail }}</div>
+        <div v-if="row.userType && row.userId">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="row.userType" />{{ '(' + row.userId + ')' }}
+        </div>
+      </template>
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：详情 -->
+        <XTextButton
+          preIcon="ep:view"
+          :title="t('action.detail')"
+          v-hasPermi="['system:mail-log:query']"
+          @click="handleDetail(row.id)"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+  <!-- 弹窗 -->
+  <XModal id="mailLogModel" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts" name="MailLog">
+// 业务相关的 import
+import { allSchemas } from './log.data'
+import * as MailLogApi from '@/api/system/mail/log'
+import * as MailAccountApi from '@/api/system/mail/account'
+
+const { t } = useI18n() // 国际化
+
+// 列表相关的变量
+const queryParams = reactive({
+  accountId: null
+})
+const [registerTable] = useXTable({
+  allSchemas: allSchemas,
+  params: queryParams,
+  getListApi: MailLogApi.getMailLogPageApi
+})
+const accountOptions = ref([]) // 账号下拉选项
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  setDialogTile('detail')
+  const res = await MailLogApi.getMailLogApi(rowId)
+  detailData.value = res
+  modelLoading.value = false
+}
+
+// ========== 初始化 ==========
+onMounted(() => {
+  MailAccountApi.getSimpleMailAccounts().then((data) => {
+    accountOptions.value = data
+  })
+})
+</script>
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/log/log.data.ts b/yudao-ui-admin-vue3/src/views/system/mail/log/log.data.ts
new file mode 100644
index 0000000000..d389bce58b
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/mail/log/log.data.ts
@@ -0,0 +1,121 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id',
+  primaryTitle: '编号',
+  primaryType: 'id',
+  action: true,
+  actionWidth: '70',
+  columns: [
+    {
+      title: '发送时间',
+      field: 'sendTime',
+      table: {
+        width: 180
+      },
+      formatter: 'formatDate',
+      search: {
+        show: true,
+        itemRender: {
+          name: 'XDataTimePicker'
+        }
+      }
+    },
+    {
+      title: '接收邮箱',
+      field: 'toMail',
+      isSearch: true,
+      table: {
+        width: 180,
+        slots: {
+          default: 'toMail_default'
+        }
+      }
+    },
+    {
+      title: '用户编号',
+      field: 'userId',
+      isSearch: true,
+      isTable: false
+    },
+    {
+      title: '用户类型',
+      field: 'userType',
+      dictType: DICT_TYPE.USER_TYPE,
+      dictClass: 'number',
+      isSearch: true,
+      isTable: false
+    },
+    {
+      title: '邮件标题',
+      field: 'templateTitle'
+    },
+    {
+      title: '邮件内容',
+      field: 'templateContent',
+      isTable: false
+    },
+    {
+      title: '邮箱参数',
+      field: 'templateParams',
+      isTable: false
+    },
+    {
+      title: '发送状态',
+      field: 'sendStatus',
+      dictType: DICT_TYPE.SYSTEM_MAIL_SEND_STATUS,
+      dictClass: 'string',
+      isSearch: true
+    },
+    {
+      title: '邮箱账号',
+      field: 'accountId',
+      isSearch: true,
+      isTable: false,
+      search: {
+        slots: {
+          default: 'accountId_search'
+        }
+      }
+    },
+    {
+      title: '发送邮箱地址',
+      field: 'fromMail',
+      table: {
+        title: '邮箱账号'
+      }
+    },
+    {
+      title: '模板编号',
+      field: 'templateId',
+      isSearch: true
+    },
+    {
+      title: '模板编码',
+      field: 'templateCode',
+      isTable: false
+    },
+    {
+      title: '模版发送人名称',
+      field: 'templateNickname',
+      isTable: false
+    },
+    {
+      title: '发送返回的消息编号',
+      field: 'sendMessageId',
+      isTable: false
+    },
+    {
+      title: '发送异常',
+      field: 'sendException',
+      isTable: false
+    },
+    {
+      title: '创建时间',
+      field: 'createTime',
+      isTable: false
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

From 1a4bea8ca2521f38781fd61dfb1bafa223bd0502 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 20:58:00 +0800
Subject: [PATCH 51/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E7=9A=84=20SQL=20?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/mysql/ruoyi-vue-pro.sql | 349 +++++++++++++++++++++++++++++++++---
 1 file changed, 326 insertions(+), 23 deletions(-)

diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql
index efb464e9c6..8d34f8c149 100644
--- a/sql/mysql/ruoyi-vue-pro.sql
+++ b/sql/mysql/ruoyi-vue-pro.sql
@@ -11,7 +11,7 @@
  Target Server Version : 80026
  File Encoding         : 65001
 
- Date: 17/01/2023 23:47:35
+ Date: 27/01/2023 20:57:31
 */
 
 SET NAMES utf8mb4;
@@ -300,7 +300,7 @@ CREATE TABLE `bpm_form`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义';
+) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义';
 
 -- ----------------------------
 -- Records of bpm_form
@@ -329,7 +329,7 @@ CREATE TABLE `bpm_oa_leave`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OA 请假申请表';
+) ENGINE = InnoDB AUTO_INCREMENT = 35 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OA 请假申请表';
 
 -- ----------------------------
 -- Records of bpm_oa_leave
@@ -359,7 +359,7 @@ CREATE TABLE `bpm_process_definition_ext`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 135 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义的拓展表\n';
+) ENGINE = InnoDB AUTO_INCREMENT = 140 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义的拓展表\n';
 
 -- ----------------------------
 -- Records of bpm_process_definition_ext
@@ -389,7 +389,7 @@ CREATE TABLE `bpm_process_instance_ext`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 290 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程实例的拓展';
+) ENGINE = InnoDB AUTO_INCREMENT = 295 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程实例的拓展';
 
 -- ----------------------------
 -- Records of bpm_process_instance_ext
@@ -415,7 +415,7 @@ CREATE TABLE `bpm_task_assign_rule`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 265 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表';
+) ENGINE = InnoDB AUTO_INCREMENT = 274 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表';
 
 -- ----------------------------
 -- Records of bpm_task_assign_rule
@@ -444,7 +444,7 @@ CREATE TABLE `bpm_task_ext`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 341 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程任务的拓展表';
+) ENGINE = InnoDB AUTO_INCREMENT = 350 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程任务的拓展表';
 
 -- ----------------------------
 -- Records of bpm_task_ext
@@ -469,7 +469,7 @@ CREATE TABLE `bpm_user_group`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 111 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户组';
+) ENGINE = InnoDB AUTO_INCREMENT = 113 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户组';
 
 -- ----------------------------
 -- Records of bpm_user_group
@@ -546,7 +546,7 @@ CREATE TABLE `infra_api_error_log`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 931 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
+) ENGINE = InnoDB AUTO_INCREMENT = 949 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
 
 -- ----------------------------
 -- Records of infra_api_error_log
@@ -584,7 +584,7 @@ CREATE TABLE `infra_codegen_column`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1533 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
+) ENGINE = InnoDB AUTO_INCREMENT = 1582 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
 
 -- ----------------------------
 -- Records of infra_codegen_column
@@ -616,7 +616,7 @@ CREATE TABLE `infra_codegen_table`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 119 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
+) ENGINE = InnoDB AUTO_INCREMENT = 122 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
 
 -- ----------------------------
 -- Records of infra_codegen_table
@@ -699,7 +699,7 @@ CREATE TABLE `infra_file`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 355 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
+) ENGINE = InnoDB AUTO_INCREMENT = 356 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
 
 -- ----------------------------
 -- Records of infra_file
@@ -1191,7 +1191,7 @@ CREATE TABLE `system_dict_data`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1213 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
+) ENGINE = InnoDB AUTO_INCREMENT = 1227 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
 
 -- ----------------------------
 -- Records of system_dict_data
@@ -1391,6 +1391,10 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1220, 8, '地理位置', 'location', 'mp_message_type', 0, 'default', '', '公众号的消息类型 - 地理位置', '1', '2023-01-17 22:17:32', '1', '2023-01-17 14:23:51', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1221, 9, '链接', 'link', 'mp_message_type', 0, 'default', '', '公众号的消息类型 - 链接', '1', '2023-01-17 22:17:32', '1', '2023-01-17 14:24:49', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1222, 10, '事件', 'event', 'mp_message_type', 0, 'default', '', '公众号的消息类型 - 事件', '1', '2023-01-17 22:17:32', '1', '2023-01-17 14:24:49', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1223, 0, '初始化', '0', 'system_mail_send_status', 0, 'primary', '', '邮件发送状态 - 初始化\n', '1', '2023-01-26 09:53:49', '1', '2023-01-26 16:36:14', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1224, 10, '发送成功', '10', 'system_mail_send_status', 0, 'success', '', '邮件发送状态 - 发送成功', '1', '2023-01-26 09:54:28', '1', '2023-01-26 16:36:22', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1225, 20, '发送失败', '20', 'system_mail_send_status', 0, 'danger', '', '邮件发送状态 - 发送失败', '1', '2023-01-26 09:54:50', '1', '2023-01-26 16:36:26', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1226, 30, '不发送', '30', 'system_mail_send_status', 0, 'info', '', '邮件发送状态 -  不发送', '1', '2023-01-26 09:55:06', '1', '2023-01-26 16:36:36', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -1411,7 +1415,7 @@ CREATE TABLE `system_dict_type`  (
   `deleted_time` datetime NULL DEFAULT NULL COMMENT '删除时间',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `dict_type`(`type` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 165 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
+) ENGINE = InnoDB AUTO_INCREMENT = 167 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
 
 -- ----------------------------
 -- Records of system_dict_type
@@ -1474,6 +1478,7 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (163, '交易订单项的售后状态', 'trade_order_item_after_sale_status', 0, '交易订单项的售后状态', '1', '2022-12-10 20:58:08', '1', '2022-12-10 20:58:08', b'0', NULL);
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (164, '公众号自动回复的请求关键字匹配模式', 'mp_auto_reply_request_match', 0, '公众号自动回复的请求关键字匹配模式', '1', '2023-01-16 23:29:56', '1', '2023-01-16 23:29:56', b'0', '1970-01-01 00:00:00');
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (165, '公众号的消息类型', 'mp_message_type', 0, '公众号的消息类型', '1', '2023-01-17 22:17:09', '1', '2023-01-17 22:17:09', b'0', '1970-01-01 00:00:00');
+INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (166, '邮件发送状态', 'system_mail_send_status', 0, '邮件发送状态', '1', '2023-01-26 09:53:13', '1', '2023-01-26 09:53:13', b'0', '1970-01-01 00:00:00');
 COMMIT;
 
 -- ----------------------------
@@ -1522,7 +1527,7 @@ CREATE TABLE `system_login_log`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1963 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
+) ENGINE = InnoDB AUTO_INCREMENT = 1980 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
 
 -- ----------------------------
 -- Records of system_login_log
@@ -1530,6 +1535,102 @@ CREATE TABLE `system_login_log`  (
 BEGIN;
 COMMIT;
 
+-- ----------------------------
+-- Table structure for system_mail_account
+-- ----------------------------
+DROP TABLE IF EXISTS `system_mail_account`;
+CREATE TABLE `system_mail_account`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `mail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮箱',
+  `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '用户名',
+  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '密码',
+  `host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SMTP 服务器域名',
+  `port` int NOT NULL COMMENT 'SMTP 服务器端口',
+  `ssl_enable` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否开启 SSL',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '邮箱账号表';
+
+-- ----------------------------
+-- Records of system_mail_account
+-- ----------------------------
+BEGIN;
+INSERT INTO `system_mail_account` (`id`, `mail`, `username`, `password`, `host`, `port`, `ssl_enable`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '7684413@qq.com', '7684413@qq.com', '123457', '127.0.0.1', 8080, b'0', '1', '2023-01-25 17:39:52', '1', '2023-01-26 22:59:04', b'0');
+INSERT INTO `system_mail_account` (`id`, `mail`, `username`, `password`, `host`, `port`, `ssl_enable`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2, 'ydym_test@163.com', 'ydym_test@163.com', 'WBZTEINMIFVRYSOE', 'smtp.163.com', 465, b'1', '1', '2023-01-26 01:26:03', '1', '2023-01-26 01:26:03', b'0');
+INSERT INTO `system_mail_account` (`id`, `mail`, `username`, `password`, `host`, `port`, `ssl_enable`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3, '76854114@qq.com', '3335', '11234', 'yunai1.cn', 466, b'0', '1', '2023-01-27 15:06:38', '1', '2023-01-27 07:08:36', b'1');
+COMMIT;
+
+-- ----------------------------
+-- Table structure for system_mail_log
+-- ----------------------------
+DROP TABLE IF EXISTS `system_mail_log`;
+CREATE TABLE `system_mail_log`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `user_id` bigint NULL DEFAULT NULL COMMENT '用户编号',
+  `user_type` tinyint NULL DEFAULT NULL COMMENT '用户类型',
+  `to_mail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '接收邮箱地址',
+  `account_id` bigint NOT NULL COMMENT '邮箱账号编号',
+  `from_mail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '发送邮箱地址',
+  `template_id` bigint NOT NULL COMMENT '模板编号',
+  `template_code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板编码',
+  `template_nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '模版发送人名称',
+  `template_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮件标题',
+  `template_content` varchar(10240) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮件内容',
+  `template_params` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮件参数',
+  `send_status` tinyint NOT NULL DEFAULT 0 COMMENT '发送状态',
+  `send_time` datetime NULL DEFAULT NULL COMMENT '发送时间',
+  `send_message_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '发送返回的消息 ID',
+  `send_exception` varchar(4096) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '发送异常',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 354 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '邮件日志表';
+
+-- ----------------------------
+-- Records of system_mail_log
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for system_mail_template
+-- ----------------------------
+DROP TABLE IF EXISTS `system_mail_template`;
+CREATE TABLE `system_mail_template`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `name` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板名称',
+  `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板编码',
+  `account_id` bigint NOT NULL COMMENT '发送的邮箱账号编号',
+  `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '发送人名称',
+  `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板标题',
+  `content` varchar(10240) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板内容',
+  `params` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '参数数组',
+  `status` tinyint NOT NULL COMMENT '开启状态',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '邮件模版表';
+
+-- ----------------------------
+-- Records of system_mail_template
+-- ----------------------------
+BEGIN;
+INSERT INTO `system_mail_template` (`id`, `name`, `code`, `account_id`, `nickname`, `title`, `content`, `params`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (13, '后台用户短信登录', 'admin-sms-login', 1, '奥特曼', '你猜我猜', '<p>您的验证码是{code}，名字是{name}</p>', '[\"code\",\"name\"]', 0, '3', '1', '2021-10-11 08:10:00', '1', '2023-01-26 23:22:05', b'0');
+INSERT INTO `system_mail_template` (`id`, `name`, `code`, `account_id`, `nickname`, `title`, `content`, `params`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (14, '测试模版', 'test_01', 2, '芋艿', '一个标题', '<p>你是 {key01} 吗？</p><p><br></p><p>是的话，赶紧 {key02} 一下！</p>', '[\"key01\",\"key02\"]', 0, NULL, '1', '2023-01-26 01:27:40', '1', '2023-01-27 10:32:16', b'0');
+INSERT INTO `system_mail_template` (`id`, `name`, `code`, `account_id`, `nickname`, `title`, `content`, `params`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (15, '3', '2', 2, '7', '4', '<p>45</p>', '[]', 1, '80', '1', '2023-01-27 15:50:35', '1', '2023-01-27 16:34:49', b'0');
+COMMIT;
+
 -- ----------------------------
 -- Table structure for system_menu
 -- ----------------------------
@@ -1553,7 +1654,7 @@ CREATE TABLE `system_menu`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2125 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
+) ENGINE = InnoDB AUTO_INCREMENT = 2144 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
 
 -- ----------------------------
 -- Records of system_menu
@@ -1776,7 +1877,7 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1250, '敏感词更新', 'system:sensitive-word:update', 3, 3, 1247, '', '', '', 0, b'1', b'1', '', '2022-04-07 16:55:03', '', '2022-04-20 17:03:10', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1251, '敏感词删除', 'system:sensitive-word:delete', 3, 4, 1247, '', '', '', 0, b'1', b'1', '', '2022-04-07 16:55:03', '', '2022-04-20 17:03:10', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1252, '敏感词导出', 'system:sensitive-word:export', 3, 5, 1247, '', '', '', 0, b'1', b'1', '', '2022-04-07 16:55:03', '', '2022-04-20 17:03:10', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1254, '作者动态', '', 1, 0, 0, 'https://www.iocoder.cn', 'people', NULL, 0, b'1', b'1', '1', '2022-04-23 01:03:15', '1', '2022-06-22 13:35:05', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1254, '作者动态', '', 1, 0, 0, 'https://www.iocoder.cn', 'people', NULL, 0, b'1', b'1', '1', '2022-04-23 01:03:15', '1', '2023-01-25 20:05:55', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1255, '数据源配置', '', 2, 1, 2, 'data-source-config', 'rate', 'infra/dataSourceConfig/index', 0, b'1', b'1', '', '2022-04-27 14:37:32', '1', '2022-04-27 22:42:06', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1256, '数据源配置查询', 'infra:data-source-config:query', 3, 1, 1255, '', '', '', 0, b'1', b'1', '', '2022-04-27 14:37:32', '', '2022-04-27 14:37:32', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1257, '数据源配置创建', 'infra:data-source-config:create', 3, 2, 1255, '', '', '', 0, b'1', b'1', '', '2022-04-27 14:37:32', '', '2022-04-27 14:37:32', b'0');
@@ -1908,6 +2009,20 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2127, '删除菜单', 'mp:menu:delete', 3, 2, 2119, '', '', '', 0, b'1', b'1', '1', '2023-01-17 23:06:16', '1', '2023-01-17 23:06:16', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2128, '查询消息', 'mp:message:query', 3, 0, 2103, '', '', '', 0, b'1', b'1', '1', '2023-01-17 23:07:14', '1', '2023-01-17 23:07:14', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2129, '发送消息', 'mp:message:send', 3, 1, 2103, '', '', '', 0, b'1', b'1', '1', '2023-01-17 23:07:26', '1', '2023-01-17 23:07:26', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2130, '邮箱管理', '', 2, 11, 1, 'mail', 'email', NULL, 0, b'1', b'1', '1', '2023-01-25 17:27:44', '1', '2023-01-25 17:27:44', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2131, '邮箱账号', '', 2, 0, 2130, 'mail-account', 'user', 'system/mail/account/index', 0, b'1', b'1', '', '2023-01-25 09:33:48', '1', '2023-01-26 16:37:37', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2132, '账号查询', 'system:mail-account:query', 3, 1, 2131, '', '', '', 0, b'1', b'1', '', '2023-01-25 09:33:48', '', '2023-01-25 09:33:48', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2133, '账号创建', 'system:mail-account:create', 3, 2, 2131, '', '', '', 0, b'1', b'1', '', '2023-01-25 09:33:48', '', '2023-01-25 09:33:48', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2134, '账号更新', 'system:mail-account:update', 3, 3, 2131, '', '', '', 0, b'1', b'1', '', '2023-01-25 09:33:48', '', '2023-01-25 09:33:48', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2135, '账号删除', 'system:mail-account:delete', 3, 4, 2131, '', '', '', 0, b'1', b'1', '', '2023-01-25 09:33:48', '', '2023-01-25 09:33:48', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2136, '邮件模版', '', 2, 0, 2130, 'mail-template', 'education', 'system/mail/template/index', 0, b'1', b'1', '', '2023-01-25 12:05:31', '1', '2023-01-26 16:38:35', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2137, '模版查询', 'system:mail-template:query', 3, 1, 2136, '', '', '', 0, b'1', b'1', '', '2023-01-25 12:05:31', '', '2023-01-25 12:05:31', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2138, '模版创建', 'system:mail-template:create', 3, 2, 2136, '', '', '', 0, b'1', b'1', '', '2023-01-25 12:05:31', '', '2023-01-25 12:05:31', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2139, '模版更新', 'system:mail-template:update', 3, 3, 2136, '', '', '', 0, b'1', b'1', '', '2023-01-25 12:05:31', '', '2023-01-25 12:05:31', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2140, '模版删除', 'system:mail-template:delete', 3, 4, 2136, '', '', '', 0, b'1', b'1', '', '2023-01-25 12:05:31', '', '2023-01-25 12:05:31', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2141, '邮件记录', '', 2, 0, 2130, 'mail-log', 'log', 'system/mail/log/index', 0, b'1', b'1', '', '2023-01-26 02:16:50', '1', '2023-01-26 16:38:27', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2142, '日志查询', 'system:mail-log:query', 3, 1, 2141, '', '', '', 0, b'1', b'1', '', '2023-01-26 02:16:50', '', '2023-01-26 02:16:50', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2143, '发送测试邮件', 'system:mail-template:send-mail', 3, 5, 2136, '', '', '', 0, b'1', b'1', '1', '2023-01-26 23:29:15', '1', '2023-01-26 23:29:15', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -1958,7 +2073,7 @@ CREATE TABLE `system_oauth2_access_token`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1083 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
+) ENGINE = InnoDB AUTO_INCREMENT = 1214 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
 
 -- ----------------------------
 -- Records of system_oauth2_access_token
@@ -2080,7 +2195,7 @@ CREATE TABLE `system_oauth2_refresh_token`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 571 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
+) ENGINE = InnoDB AUTO_INCREMENT = 588 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
 
 -- ----------------------------
 -- Records of system_oauth2_refresh_token
@@ -2120,7 +2235,7 @@ CREATE TABLE `system_operate_log`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4018 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
+) ENGINE = InnoDB AUTO_INCREMENT = 4177 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
 
 -- ----------------------------
 -- Records of system_operate_log
@@ -2212,7 +2327,7 @@ CREATE TABLE `system_role_menu`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1991 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色和菜单关联表';
+) ENGINE = InnoDB AUTO_INCREMENT = 2185 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色和菜单关联表';
 
 -- ----------------------------
 -- Records of system_role_menu
@@ -2628,6 +2743,194 @@ INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_t
 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1988, 118, 1018, '1', '2022-12-30 11:47:52', '1', '2022-12-30 11:47:52', b'0', 129);
 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1989, 118, 1019, '1', '2022-12-30 11:47:52', '1', '2022-12-30 11:47:52', b'0', 129);
 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1990, 118, 1020, '1', '2022-12-30 11:47:52', '1', '2022-12-30 11:47:52', b'0', 129);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1991, 2, 1024, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1992, 2, 1025, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1993, 2, 1026, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1994, 2, 1027, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1995, 2, 1028, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1996, 2, 1029, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1997, 2, 1030, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1998, 2, 1031, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1999, 2, 1032, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2000, 2, 1033, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2001, 2, 1034, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2002, 2, 1035, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2003, 2, 1036, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2004, 2, 1037, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2005, 2, 1038, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2006, 2, 1039, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2007, 2, 1040, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2008, 2, 1042, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2009, 2, 1043, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2010, 2, 1045, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2011, 2, 1046, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2012, 2, 1048, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2013, 2, 1050, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2014, 2, 1051, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2015, 2, 1052, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2016, 2, 1053, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2017, 2, 1054, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2018, 2, 1056, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2019, 2, 1057, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2020, 2, 1058, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2021, 2, 2083, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2022, 2, 1059, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2023, 2, 1060, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2024, 2, 1063, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2025, 2, 1064, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2026, 2, 1065, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2027, 2, 1066, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2028, 2, 1067, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2029, 2, 1070, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2030, 2, 1071, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2031, 2, 1072, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2032, 2, 1073, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2033, 2, 1074, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2034, 2, 1075, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2035, 2, 1076, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2036, 2, 1082, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2037, 2, 1085, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2038, 2, 1086, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2039, 2, 1087, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2040, 2, 1088, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2041, 2, 1089, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2042, 2, 1091, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2043, 2, 1092, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2044, 2, 1095, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2045, 2, 1096, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2046, 2, 1097, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2047, 2, 1098, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2048, 2, 1101, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2049, 2, 1102, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2050, 2, 1103, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2051, 2, 1104, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2052, 2, 1105, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2053, 2, 1106, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2054, 2, 1108, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2055, 2, 1109, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2056, 2, 1111, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2057, 2, 1112, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2058, 2, 1113, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2059, 2, 1114, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2060, 2, 1115, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2061, 2, 1127, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2062, 2, 1128, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2063, 2, 1129, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2064, 2, 1130, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2065, 2, 1131, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2066, 2, 1132, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2067, 2, 1133, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2068, 2, 1134, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2069, 2, 1135, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2070, 2, 1136, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2071, 2, 1137, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2072, 2, 114, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2073, 2, 1139, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2074, 2, 115, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2075, 2, 1140, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2076, 2, 116, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2077, 2, 1141, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2078, 2, 1142, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2079, 2, 1143, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2080, 2, 1150, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2081, 2, 1161, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2082, 2, 1162, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2083, 2, 1163, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2084, 2, 1164, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2085, 2, 1165, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2086, 2, 1166, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2087, 2, 1173, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2088, 2, 1174, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2089, 2, 1175, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2090, 2, 1176, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2091, 2, 1177, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2092, 2, 1178, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2093, 2, 1179, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2094, 2, 1180, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2095, 2, 1181, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2096, 2, 1182, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2097, 2, 1183, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2098, 2, 1184, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2099, 2, 1226, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2100, 2, 1227, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2101, 2, 1228, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2102, 2, 1229, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2103, 2, 1237, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2104, 2, 1238, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2105, 2, 1239, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2106, 2, 1240, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2107, 2, 1241, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2108, 2, 1242, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2109, 2, 1243, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2110, 2, 1247, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2111, 2, 1248, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2112, 2, 1249, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2113, 2, 1250, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2114, 2, 1251, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2115, 2, 1252, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2116, 2, 1254, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2117, 2, 1255, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2118, 2, 1256, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2119, 2, 1257, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2120, 2, 1258, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2121, 2, 1259, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2122, 2, 1260, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2123, 2, 1261, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2124, 2, 1263, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2125, 2, 1264, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2126, 2, 1265, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2127, 2, 1266, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2128, 2, 1267, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2129, 2, 1001, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2130, 2, 1002, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2131, 2, 1003, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2132, 2, 1004, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2133, 2, 1005, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2134, 2, 1006, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2135, 2, 1007, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2136, 2, 1008, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2137, 2, 1009, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2138, 2, 1010, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2139, 2, 1011, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2140, 2, 1012, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2141, 2, 1013, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2142, 2, 1014, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2143, 2, 1015, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2144, 2, 1016, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2145, 2, 1017, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2146, 2, 1018, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2147, 2, 1019, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2148, 2, 1020, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2149, 2, 1021, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2150, 2, 1022, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2151, 2, 1023, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2152, 2, 1281, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2153, 2, 1282, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2154, 2, 2000, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2155, 2, 2002, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2156, 2, 2003, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2157, 2, 2004, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2158, 2, 2005, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2159, 2, 2006, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2160, 2, 2008, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2161, 2, 2009, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2162, 2, 2010, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2163, 2, 2011, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2164, 2, 2012, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2170, 2, 2019, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2171, 2, 2020, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2172, 2, 2021, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2173, 2, 2022, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2174, 2, 2023, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2175, 2, 2025, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2177, 2, 2027, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2178, 2, 2028, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2179, 2, 2029, '1', '2023-01-25 08:42:58', '1', '2023-01-25 08:42:58', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2180, 2, 2014, '1', '2023-01-25 08:43:12', '1', '2023-01-25 08:43:12', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2181, 2, 2015, '1', '2023-01-25 08:43:12', '1', '2023-01-25 08:43:12', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2182, 2, 2016, '1', '2023-01-25 08:43:12', '1', '2023-01-25 08:43:12', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2183, 2, 2017, '1', '2023-01-25 08:43:12', '1', '2023-01-25 08:43:12', b'0', 1);
+INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2184, 2, 2018, '1', '2023-01-25 08:43:12', '1', '2023-01-25 08:43:12', b'0', 1);
 COMMIT;
 
 -- ----------------------------
@@ -2752,7 +3055,7 @@ CREATE TABLE `system_sms_log`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 339 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志';
+) ENGINE = InnoDB AUTO_INCREMENT = 347 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志';
 
 -- ----------------------------
 -- Records of system_sms_log
@@ -3050,7 +3353,7 @@ CREATE TABLE `system_users`  (
 -- Records of system_users
 -- ----------------------------
 BEGIN;
-INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '127.0.0.1', '2023-01-17 12:33:07', 'admin', '2021-01-05 17:03:47', NULL, '2023-01-17 12:33:07', b'0', 1);
+INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '0:0:0:0:0:0:0:1', '2023-01-27 14:31:00', 'admin', '2021-01-05 17:03:47', NULL, '2023-01-27 14:31:00', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$YMpimV4T6BtDhIaA8jSW.u8UTGBeGhc/qwXP4oxoMr4mOw9.qttt6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-07-08 01:26:27', '', '2021-01-13 23:50:35', NULL, '2022-07-08 01:26:27', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$10$GP8zvqHB//TekuzYZSBYAuBQJiNq1.fxQVDYJ.uBCOnWCtDVKE4H6', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-05-28 15:43:17', '', '2021-01-21 02:13:53', NULL, '2022-07-09 09:00:33', b'0', 1);

From 7e65ede92d1e6e31f36a66692ac3936c398be456 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 21:31:30 +0800
Subject: [PATCH 52/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A=20+=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/api/mail/MailSendApi.java   |  4 +--
 .../system/api/mail/MailSendApiImpl.java      |  4 +--
 .../mail/MailAccountRefreshConsumer.java      | 31 +++++++++++++++++++
 .../mq/consumer/mail/MailSendConsumer.java    |  8 ++++-
 .../mail/MailTemplateRefreshConsumer.java     |  3 +-
 .../mail/MailAccountRefreshMessage.java       |  4 ++-
 .../mail/MailTemplateRefreshMessage.java      |  4 ++-
 .../system/mq/producer/mail/MailProducer.java |  2 +-
 8 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
index 3885259f26..5427277950 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
@@ -19,7 +19,7 @@ public interface MailSendApi {
      * @param reqDTO 发送请求
      * @return 发送日志编号
      */
-    Long sendSingleSmsToAdmin(@Valid MailSendSingleToUserReqDTO reqDTO);
+    Long sendSingleMailToAdmin(@Valid MailSendSingleToUserReqDTO reqDTO);
 
     /**
      * 发送单条邮箱给 Member 用户
@@ -29,6 +29,6 @@ public interface MailSendApi {
      * @param reqDTO 发送请求
      * @return 发送日志编号
      */
-    Long sendSingleSmsToMember(@Valid MailSendSingleToUserReqDTO reqDTO);
+    Long sendSingleMailToMember(@Valid MailSendSingleToUserReqDTO reqDTO);
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
index 59648f5a58..72d03afbcd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
@@ -20,13 +20,13 @@ public class MailSendApiImpl implements MailSendApi {
     private MailSendService mailSendService;
 
     @Override
-    public Long sendSingleSmsToAdmin(MailSendSingleToUserReqDTO reqDTO) {
+    public Long sendSingleMailToAdmin(MailSendSingleToUserReqDTO reqDTO) {
         return mailSendService.sendSingleMailToAdmin(reqDTO.getMail(), reqDTO.getUserId(),
                 reqDTO.getTemplateCode(), reqDTO.getTemplateParams());
     }
 
     @Override
-    public Long sendSingleSmsToMember(MailSendSingleToUserReqDTO reqDTO) {
+    public Long sendSingleMailToMember(MailSendSingleToUserReqDTO reqDTO) {
         return mailSendService.sendSingleMailToMember(reqDTO.getMail(), reqDTO.getUserId(),
                 reqDTO.getTemplateCode(), reqDTO.getTemplateParams());
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java
new file mode 100644
index 0000000000..69ddfce33b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.system.mq.consumer.mail;
+
+import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage;
+import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage;
+import cn.iocoder.yudao.module.system.service.mail.MailAccountService;
+import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 针对 {@link MailAccountRefreshMessage} 的消费者
+ *
+ * @author wangjingyi
+ */
+@Component
+@Slf4j
+public class MailAccountRefreshConsumer extends AbstractChannelMessageListener<MailAccountRefreshMessage> {
+
+    @Resource
+    private MailAccountService mailAccountService;
+
+    @Override
+    public void onMessage(MailAccountRefreshMessage message) {
+        log.info("[onMessage][收到 Mail Account 刷新信息]");
+        mailAccountService.initLocalCache();
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
index 978ea59973..3cff145b83 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
@@ -2,19 +2,25 @@ package cn.iocoder.yudao.module.system.mq.consumer.mail;
 
 import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessageListener;
 import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage;
+import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage;
 import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
-
+/**
+ * 针对 {@link MailSendMessage} 的消费者
+ *
+ * @author 芋道源码
+ */
 @Component
 @Slf4j
 public class MailSendConsumer extends AbstractStreamMessageListener<MailSendMessage> {
 
     @Resource
     private MailSendService mailSendService;
+
     @Override
     public void onMessage(MailSendMessage message) {
         log.info("[onMessage][消息内容({})]", message);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
index 199b147c80..35da1edec2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
@@ -22,7 +22,8 @@ public class MailTemplateRefreshConsumer extends AbstractChannelMessageListener<
 
     @Override
     public void onMessage(MailTemplateRefreshMessage message) {
-        log.info("[onMessage][收到 MailTemplate 刷新信息]");
+        log.info("[onMessage][收到 Mail Template 刷新信息]");
         mailTemplateService.initLocalCache();
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
index d5eafb04d9..d6e9d08a9c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
@@ -5,15 +5,17 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- *  邮箱账号的数据刷新 Message
+ * 邮箱账号的数据刷新 Message
  *
  * @author wangjingyi
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class MailAccountRefreshMessage extends AbstractChannelMessage {
+
     @Override
     public String getChannel() {
         return "system.mail-account.refresh";
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java
index 476411ca1b..f6ff0925ad 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java
@@ -5,15 +5,17 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- *  邮箱模板的数据刷新 Message
+ * 邮箱模板的数据刷新 Message
  *
  * @author wangjingyi
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class MailTemplateRefreshMessage extends AbstractChannelMessage {
+
     @Override
     public String getChannel() {
         return "system.mail-template.refresh";
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index 19de302fd0..afa958cd74 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -31,7 +31,7 @@ public class MailProducer {
     }
 
     /**
-     * 发送 {@link MailTemplateRefreshMessage} 消息
+     * 发送 {@link MailAccountRefreshMessage} 消息
      */
     public void sendMailAccountRefreshMessage() {
         MailAccountRefreshMessage message = new MailAccountRefreshMessage();

From 378336760581d930e69141ee62b394e3f1862c60 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Jan 2023 21:43:39 +0800
Subject: [PATCH 53/67] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A=20+=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/api/mail/dto/MailSendSingleToUserReqDTO.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
index 28333a5e78..c8c5cbae55 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
@@ -17,7 +17,6 @@ public class MailSendSingleToUserReqDTO {
     /**
      * 用户编号
      */
-    @NotNull(message = "用户编号不能为空")
     private Long userId;
     /**
      * 邮箱
@@ -33,7 +32,6 @@ public class MailSendSingleToUserReqDTO {
     /**
      * 邮件模板参数
      */
-    @NotNull(message = "邮件模板参数不能为空")
     private Map<String, Object> templateParams;
 
 }

From ae3ee95cdd5b9e46199f48deb5b50296af39bfca Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 28 Jan 2023 20:10:19 +0800
Subject: [PATCH 54/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A=E6=95=B4=E4=BD=93=E5=8A=9F=E8=83=BD=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/query/LambdaQueryWrapperX.java       |   2 +
 .../mybatis/core/query/QueryWrapperX.java     |   8 +-
 .../system/enums/ErrorCodeConstants.java      |  14 +-
 .../admin/notify/NotifyLogController.java     |  54 ----
 .../admin/notify/NotifyMessageController.java |  58 ++--
 .../notify/NotifyTemplateController.java      |  21 +-
 .../admin/notify/vo/log/NotifyLogBaseVO.java  |  44 ---
 .../vo/message/NotifyMessageBaseVO.java       |  47 +++-
 .../NotifyMessageMyPageReqVO.java}            |  18 +-
 .../vo/message/NotifyMessagePageReqVO.java    |  17 +-
 .../vo/message/NotifyMessageRespVO.java       |   5 +-
 .../vo/template/NotifyTemplateBaseVO.java     |  29 +-
 .../template/NotifyTemplateCreateReqVO.java   |   1 -
 .../vo/template/NotifyTemplateExcelVO.java    |  43 ---
 .../template/NotifyTemplateExportReqVO.java   |  28 --
 .../vo/template/NotifyTemplatePageReqVO.java  |  15 +-
 .../vo/template/NotifyTemplateRespVO.java     |   2 +-
 .../vo/template/NotifyTemplateSendReqVO.java  |   3 +-
 .../template/NotifyTemplateUpdateReqVO.java   |   4 +-
 .../convert/notify/NotifyLogConvert.java      |  23 --
 .../convert/notify/NotifyTemplateConvert.java |   3 -
 .../dataobject/notify/NotifyMessageDO.java    |  68 +++--
 .../dataobject/notify/NotifyTemplateDO.java   |  14 +-
 .../dal/mysql/notify/NotifyMessageMapper.java |  69 ++---
 .../mysql/notify/NotifyTemplateMapper.java    |  28 +-
 .../system/dal/mysql/sms/SmsCodeMapper.java   |   2 +-
 .../system/service/mail/MailLogService.java   |   2 +-
 .../service/mail/MailSendServiceImpl.java     |  15 +-
 .../service/notify/NotifyLogService.java      |  24 --
 .../service/notify/NotifyLogServiceImpl.java  |  35 ---
 .../service/notify/NotifyMessageService.java  |  85 +++---
 .../notify/NotifyMessageServiceImpl.java      | 146 ++--------
 .../service/notify/NotifySendService.java     |   6 +-
 .../service/notify/NotifySendServiceImpl.java |  66 +++--
 .../service/notify/NotifyTemplateService.java |  31 +-
 .../notify/NotifyTemplateServiceImpl.java     | 119 ++------
 .../service/mail/MailSendServiceImplTest.java |   4 +-
 .../notify/NotifyMessageServiceImplTest.java  | 266 ++++++++++++++++++
 .../notify/NotifySendServiceImplTest.java     | 121 ++++++++
 .../notify/NotifyTemplateServiceImplTest.java | 146 ++++++++++
 .../src/test/resources/sql/clean.sql          |   2 +
 .../src/test/resources/sql/create_tables.sql  |  40 +++
 .../src/main/resources/application.yaml       |   2 +
 .../src/api/system/notify/message.js          |  51 ++++
 .../src/api/system/notify/myNotify.js         |  38 ---
 .../src/api/system/notify/notifyLog.js        |  11 -
 .../notify/{notifyTemplate.js => template.js} |   0
 .../src/components/RuoYi/Doc/index.vue        |   2 +-
 .../src/layout/components/Message/index.vue   |  83 ++++++
 .../src/layout/components/Navbar.vue          |   7 +-
 yudao-ui-admin/src/router/index.js            |  81 +++---
 yudao-ui-admin/src/utils/dict.js              |   2 +-
 .../src/views/system/mail/log/index.vue       |   2 +-
 .../src/views/system/notify/message/index.vue | 179 ++++++++++++
 .../notify/{myNotify.vue => my/index.vue}     |  64 ++---
 .../src/views/system/notify/notifyLog.vue     | 120 --------
 .../index.vue}                                |  81 +++---
 57 files changed, 1400 insertions(+), 1051 deletions(-)
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java
 rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/{log/NotifyLogPageReqVO.java => message/NotifyMessageMyPageReqVO.java} (67%)
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java
 create mode 100644 yudao-ui-admin/src/api/system/notify/message.js
 delete mode 100644 yudao-ui-admin/src/api/system/notify/myNotify.js
 delete mode 100644 yudao-ui-admin/src/api/system/notify/notifyLog.js
 rename yudao-ui-admin/src/api/system/notify/{notifyTemplate.js => template.js} (100%)
 create mode 100644 yudao-ui-admin/src/layout/components/Message/index.vue
 create mode 100644 yudao-ui-admin/src/views/system/notify/message/index.vue
 rename yudao-ui-admin/src/views/system/notify/{myNotify.vue => my/index.vue} (67%)
 delete mode 100644 yudao-ui-admin/src/views/system/notify/notifyLog.vue
 rename yudao-ui-admin/src/views/system/notify/{notifyTemplate.vue => template/index.vue} (82%)

diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
index 9fd1d16f83..d0bc6c9e85 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.framework.mybatis.core.query;
 
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
+import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
index a443008336..9661b7363b 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
@@ -146,19 +146,19 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
      *
      * @return this
      */
-    public QueryWrapperX<T> limit1() {
+    public QueryWrapperX<T> limitN(int n) {
         Assert.notNull(SqlConstants.DB_TYPE, "获取不到数据库的类型");
         switch (SqlConstants.DB_TYPE) {
             case ORACLE:
             case ORACLE_12C:
-                super.eq("ROWNUM", 1);
+                super.eq("ROWNUM", n);
                 break;
             case SQL_SERVER:
             case SQL_SERVER2005:
-                super.select("TOP 1 *"); // 由于 SQL Server 是通过 SELECT TOP 1 实现限制一条，所以只好使用 * 查询剩余字段
+                super.select("TOP " + n + " *"); // 由于 SQL Server 是通过 SELECT TOP 1 实现限制一条，所以只好使用 * 查询剩余字段
                 break;
             default:
-                super.last("LIMIT 1");
+                super.last("LIMIT " + n);
         }
         return this;
     }
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
index 82266ac44f..b108ca775e 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
@@ -153,13 +153,13 @@ public interface ErrorCodeConstants {
     ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
     ErrorCode MAIL_SEND_MAIL_NOT_EXISTS = new ErrorCode(1002025000, "邮箱不存在");
 
-    // ========== 站内信模版 1002023000 ==========
-    ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002023000, "站内信模版不存在");
-    ErrorCode NOTIFY_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002023001, "已经存在编码为【{}】的站内信模板");
-    ErrorCode NOTIFY_TEMPLATE_PARAM_MISS = new ErrorCode(1002023002, "模板参数({})缺失");
+    // ========== 站内信模版 1002026000 ==========
+    ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1002026000, "站内信模版不存在");
+    ErrorCode NOTIFY_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002026001, "已经存在编码为【{}】的站内信模板");
 
-    // ========== 站内信 1002024000 ==========
-    ErrorCode NOTIFY_MESSAGE_NOT_EXISTS = new ErrorCode(1002024000, "站内信不存在");
-    ErrorCode NOTIFY_MESSAGE_ID_PARAM_ERROR = new ErrorCode(1002024001, "站内信ID错误");
+    // ========== 站内信模版 1002027000 ==========
+
+    // ========== 站内信发送 1002028000 ==========
+    ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002025000, "模板参数({})缺失");
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java
deleted file mode 100644
index 84152df7d3..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogBaseVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
-import cn.iocoder.yudao.module.system.convert.notify.NotifyLogConvert;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-import cn.iocoder.yudao.module.system.service.notify.NotifyLogService;
-import cn.iocoder.yudao.module.system.service.user.AdminUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author LuoWenFeng
- */
-@Api(tags = "管理后台 - 站内信发送日志")
-@RestController
-@RequestMapping("/system/notify-log")
-@Validated
-public class NotifyLogController {
-
-    @Resource
-    private NotifyLogService notifyLogService;
-
-    @Resource
-    private AdminUserService userService;
-
-    @GetMapping("/page")
-    @ApiOperation("获得发送站内信日志分页")
-    public CommonResult<PageResult<NotifyLogBaseVO>> getNotifyLogPage(@Valid NotifyLogPageReqVO pageVO) {
-        PageResult<NotifyMessageDO> pageResult = notifyLogService.getNotifyMessageSendPage(pageVO);
-        PageResult<NotifyLogBaseVO> result = NotifyLogConvert.INSTANCE.convertPage(pageResult);
-        result.getList().forEach(v -> {
-            v.setReceiveUserName(userService.getUser(v.getUserId()).getNickname());
-        });
-        return success(result);
-    }
-
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
index 67b0d5d587..51d236110a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java
@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.Collections;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -33,6 +32,8 @@ public class NotifyMessageController {
     @Resource
     private NotifyMessageService notifyMessageService;
 
+    // ========== 管理所有的站内信 ==========
+
     @GetMapping("/get")
     @ApiOperation("获得站内信")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@@ -50,38 +51,45 @@ public class NotifyMessageController {
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/get-recent-list")
-    @ApiOperation("获取当前用户最新站内信，默认10条")
-    @ApiImplicitParam(name = "size", value = "10", defaultValue = "10", dataTypeClass = Integer.class)
-    public CommonResult<List<NotifyMessageRespVO>> getRecentList(@RequestParam(name = "size", defaultValue = "10") Integer size) {
-        NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
-        List<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessageList(reqVO, size);
-        if (CollUtil.isNotEmpty(pageResult)) {
-            return success(NotifyMessageConvert.INSTANCE.convertList(pageResult));
-        }
-        return success(Collections.emptyList());
+    // ========== 查看自己的站内信 ==========
+
+    @GetMapping("/my-page")
+    @ApiOperation("获得我的站内信分页")
+    public CommonResult<PageResult<NotifyMessageRespVO>> getMyMyNotifyMessagePage(@Valid NotifyMessageMyPageReqVO pageVO) {
+        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO,
+                getLoginUserId(), UserTypeEnum.ADMIN.getValue());
+        return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/get-unread-count")
-    @ApiOperation("获得未读站内信数量")
-    public CommonResult<Long> getUnreadCount() {
-        return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
-    }
-
-    @PutMapping("/update-list-read")
-    @ApiOperation("批量标记已读")
+    @PutMapping("/update-read")
+    @ApiOperation("标记站内信为已读")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestBody List<Long> ids) {
-        notifyMessageService.batchUpdateNotifyMessageReadStatus(ids, getLoginUserId());
+    public CommonResult<Boolean> updateNotifyMessageRead(@RequestParam("ids") List<Long> ids) {
+        notifyMessageService.updateNotifyMessageRead(ids, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 
     @PutMapping("/update-all-read")
-    @ApiOperation("所有未读消息标记已读")
-    public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
-        notifyMessageService.batchUpdateAllNotifyMessageReadStatus(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
+    @ApiOperation("标记所有站内信为已读")
+    public CommonResult<Boolean> updateAllNotifyMessageRead() {
+        notifyMessageService.updateAllNotifyMessageRead(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 
+    @GetMapping("/get-unread-list")
+    @ApiOperation("获取当前用户的最新站内信列表，默认 10 条")
+    @ApiImplicitParam(name = "size", value = "10", defaultValue = "10", dataTypeClass = Integer.class)
+    public CommonResult<List<NotifyMessageRespVO>> getUnreadNotifyMessageList(
+            @RequestParam(name = "size", defaultValue = "10") Integer size) {
+        List<NotifyMessageDO> list = notifyMessageService.getUnreadNotifyMessageList(
+                getLoginUserId(), UserTypeEnum.ADMIN.getValue(), size);
+        return success(NotifyMessageConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/get-unread-count")
+    @ApiOperation("获得当前用户的未读站内信数量")
+    public CommonResult<Long> getUnreadNotifyMessageCount() {
+        return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
+    }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
index b0aad865ed..c90145dcd6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
@@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.system.controller.admin.notify;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.*;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
@@ -17,13 +15,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
-import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "管理后台 - 站内信模版")
 @RestController
@@ -37,7 +31,6 @@ public class NotifyTemplateController {
     @Resource
     private NotifySendService notifySendService;
 
-
     @PostMapping("/create")
     @ApiOperation("创建站内信模版")
     @PreAuthorize("@ss.hasPermission('system:notify-template:create')")
@@ -79,22 +72,12 @@ public class NotifyTemplateController {
         return success(NotifyTemplateConvert.INSTANCE.convertPage(pageResult));
     }
 
-    @GetMapping("/export-excel")
-    @ApiOperation("导出站内信模版 Excel")
-    @PreAuthorize("@ss.hasPermission('system:notify-template:export')")
-    @OperateLog(type = EXPORT)
-    public void exportNotifyTemplateExcel(@Valid NotifyTemplateExportReqVO exportReqVO,
-                                          HttpServletResponse response) throws IOException {
-        List<NotifyTemplateDO> list = notifyTemplateService.getNotifyTemplateList(exportReqVO);
-        // 导出 Excel
-        List<NotifyTemplateExcelVO> datas = NotifyTemplateConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "站内信模版.xls", "数据", NotifyTemplateExcelVO.class, datas);
-    }
-
     @PostMapping("/send-notify")
     @ApiOperation("发送站内信")
+    @PreAuthorize("@ss.hasPermission('system:notify-template:send-notify')")
     public CommonResult<Long> sendNotify(@Valid @RequestBody NotifyTemplateSendReqVO sendReqVO) {
         return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),
                 sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java
deleted file mode 100644
index e24a7d49bc..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify.vo.log;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-/**
- * 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class NotifyLogBaseVO {
-
-    @ApiModelProperty(value = "模版编码")
-    private String templateCode;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "内容", required = true)
-    private String content;
-
-    @ApiModelProperty(value = "发送时间", required = true)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date sendTime;
-
-    @ApiModelProperty(value = "芋艿", required = true)
-    private String receiveUserName;
-
-    @ApiModelProperty(value = "1", required = true)
-    private Long userId;
-
-    @ApiModelProperty(value = "是否已读 false-未读  true-已读")
-    private Boolean readStatus;
-
-    @ApiModelProperty(value = "阅读时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date readTime;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
index f8d5d814a4..161fb93319 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java
@@ -4,35 +4,58 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
- * 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 站内信消息 Base VO，提供给添加、修改、详细的子 VO 使用
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
 public class NotifyMessageBaseVO {
 
-    @ApiModelProperty(value = "标题")
-    private String title;
+    @ApiModelProperty(value = "用户编号", required = true, example = "25025")
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
 
-    @ApiModelProperty(value = "内容")
-    private String content;
+    @ApiModelProperty(value = "用户类型", required = true, example = "1", notes = "参见 UserTypeEnum 枚举")
+    @NotNull(message = "用户类型不能为空")
+    private Byte userType;
 
-    @ApiModelProperty(value = "发送时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date sendTime;
+    @ApiModelProperty(value = "模版编号", required = true, example = "13013")
+    @NotNull(message = "模版编号不能为空")
+    private Long templateId;
 
-    @ApiModelProperty(value = "芋艿")
-    private String sendUserName;
+    @ApiModelProperty(value = "模板编码", required = true, example = "test_01")
+    @NotNull(message = "模板编码不能为空")
+    private String templateCode;
 
-    @ApiModelProperty(value = "是否已读 false-未读  true-已读")
+    @ApiModelProperty(value = "模版发送人名称", required = true, example = "芋艿")
+    @NotNull(message = "模版发送人名称不能为空")
+    private String templateNickname;
+
+    @ApiModelProperty(value = "模版内容", required = true, example = "测试内容")
+    @NotNull(message = "模版内容不能为空")
+    private String templateContent;
+
+    @ApiModelProperty(value = "模版类型", required = true, example = "2")
+    @NotNull(message = "模版类型不能为空")
+    private Integer templateType;
+
+    @ApiModelProperty(value = "模版参数", required = true)
+    @NotNull(message = "模版参数不能为空")
+    private Map<String, Object> templateParams;
+
+    @ApiModelProperty(value = "是否已读", required = true, example = "true")
+    @NotNull(message = "是否已读不能为空")
     private Boolean readStatus;
 
     @ApiModelProperty(value = "阅读时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date readTime;
+    private LocalDateTime readTime;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java
similarity index 67%
rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java
rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java
index aefd60498f..8d3eac162d 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify.vo.log;
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
@@ -8,23 +8,21 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 站内信日志分页 Request VO")
+@ApiModel("管理后台 - 站内信分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class NotifyLogPageReqVO extends PageParam {
+public class NotifyMessageMyPageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "模版编码")
-    private String templateCode;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
+    @ApiModelProperty(value = "是否已读", example = "true")
+    private Boolean readStatus;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date[] sendTime;
+    private LocalDateTime[] createTime;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
index 3d786796b7..f705527c43 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -18,14 +19,20 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class NotifyMessagePageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "标题")
-    private String title;
+    @ApiModelProperty(value = "用户编号", example = "25025")
+    private Long userId;
 
-    @ApiModelProperty(value = "是否已读 0-未读  1-已读")
-    private Boolean readStatus;
+    @ApiModelProperty(value = "用户类型", example = "1")
+    private Integer userType;
+
+    @ApiModelProperty(value = "模板编码", example = "test_01")
+    private String templateCode;
+
+    @ApiModelProperty(value = "模版类型", example = "2")
+    private Integer templateType;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date[] createTime;
+    private LocalDateTime[] createTime;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
index 306b7bd28d..26be638a44 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java
@@ -10,7 +10,10 @@ import io.swagger.annotations.*;
 @ToString(callSuper = true)
 public class NotifyMessageRespVO extends NotifyMessageBaseVO {
 
-    @ApiModelProperty(value = "ID", required = true)
+    @ApiModelProperty(value = "ID", required = true, example = "1024")
     private Long id;
 
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
index 84aa4b6865..118f55baf5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.validation.InEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -14,24 +15,32 @@ import javax.validation.constraints.NotNull;
 @Data
 public class NotifyTemplateBaseVO {
 
-    @ApiModelProperty(value = "模版编码", required = true)
+    @ApiModelProperty(value = "模版名称", required = true, example = "测试模版")
+    @NotEmpty(message = "模版名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "模版编码", required = true, example = "SEND_TEST")
     @NotNull(message = "模版编码不能为空")
     private String code;
 
-    @ApiModelProperty(value = "模版标题", required = true)
-    @NotNull(message = "模版标题不能为空")
-    private String title;
+    @ApiModelProperty(value = "模版类型", required = true, example = "1", notes = "对应 system_notify_template_type 字典")
+    @NotNull(message = "模版类型不能为空")
+    private Integer type;
 
-    @ApiModelProperty(value = "模版内容", required = true)
-    @NotNull(message = "模版内容不能为空")
+    @ApiModelProperty(value = "发送人名称", required = true, example = "土豆")
+    @NotEmpty(message = "发送人名称不能为空")
+    private String nickname;
+
+    @ApiModelProperty(value = "模版内容", required = true, example = "我是模版内容")
+    @NotEmpty(message = "模版内容不能为空")
     private String content;
 
-    @ApiModelProperty(value = "状态：1-启用 0-禁用", required = true)
-    @NotNull(message = "状态：1-启用 0-禁用不能为空")
+    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举")
+    @NotNull(message = "状态不能为空")
     @InEnum(value = CommonStatusEnum.class, message = "状态必须是 {value}")
     private Integer status;
 
-    @ApiModelProperty(value = "备注")
-    private String remarks;
+    @ApiModelProperty(value = "备注", example = "我是备注")
+    private String remark;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
index e39a2774a2..aa41b4e28f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java
@@ -8,5 +8,4 @@ import io.swagger.annotations.*;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class NotifyTemplateCreateReqVO extends NotifyTemplateBaseVO {
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
deleted file mode 100644
index 6790f1858a..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExcelVO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
-
-import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-
-
-/**
- * 站内信模版 Excel VO
- *
- * @author 芋道源码
- */
-@Data
-public class NotifyTemplateExcelVO {
-
-    @ExcelProperty("ID")
-    private Long id;
-
-    @ExcelProperty("模版编码")
-    private String code;
-
-    @ExcelProperty("模版标题")
-    private String title;
-
-    @ExcelProperty("模版内容")
-    private String content;
-
-    @ExcelProperty(value = "状态：1-启用 0-禁用", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.COMMON_STATUS)
-    private Integer status;
-
-    @ExcelProperty("备注")
-    private String remarks;
-
-    @ExcelProperty("创建时间")
-    private Date createTime;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
deleted file mode 100644
index b3a9979336..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateExportReqVO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
-
-import lombok.*;
-import java.util.*;
-import io.swagger.annotations.*;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@ApiModel(value = "管理后台 - 站内信模版 Excel 导出 Request VO", description = "参数和 NotifyTemplatePageReqVO 是一致的")
-@Data
-public class NotifyTemplateExportReqVO {
-
-    @ApiModelProperty(value = "模版编码")
-    private String code;
-
-    @ApiModelProperty(value = "模版标题")
-    private String title;
-
-    @ApiModelProperty(value = "状态：1-启用 0-禁用")
-    private Integer status;
-
-    @ApiModelProperty(value = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date[] createTime;
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
index 7a8145b677..849ce1275c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java
@@ -1,6 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
 
+import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 import io.swagger.annotations.*;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -14,17 +17,17 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class NotifyTemplatePageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "模版编码")
+    @ApiModelProperty(value = "模版编码", example = "test_01")
     private String code;
 
-    @ApiModelProperty(value = "模版标题")
-    private String title;
+    @ApiModelProperty(value = "模版名称", example = "我是名称")
+    private String name;
 
-    @ApiModelProperty(value = "状态：1-启用 0-禁用")
-    private String status;
+    @ApiModelProperty(value = "状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
+    private Integer status;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date[] createTime;
+    private LocalDateTime[] createTime;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
index f77126f6ca..4df5b7b648 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.*;
 @ToString(callSuper = true)
 public class NotifyTemplateRespVO extends NotifyTemplateBaseVO {
 
-    @ApiModelProperty(value = "ID", required = true)
+    @ApiModelProperty(value = "ID", required = true, example = "1024")
     private Long id;
 
     @ApiModelProperty(value = "参数数组", example = "name,code")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
index 7a04db5dc4..e078fd845b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Map;
 
@@ -16,7 +17,7 @@ public class NotifyTemplateSendReqVO {
     private Long userId;
 
     @ApiModelProperty(value = "模板编码", required = true, example = "01")
-    @NotNull(message = "模板编码不能为空")
+    @NotEmpty(message = "模板编码不能为空")
     private String templateCode;
 
     @ApiModelProperty(value = "模板参数")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java
index 267159447b..6e75ccf897 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java
@@ -10,8 +10,8 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class NotifyTemplateUpdateReqVO extends NotifyTemplateBaseVO {
 
-    @ApiModelProperty(value = "ID", required = true)
-    @NotNull(message = "ID不能为空")
+    @ApiModelProperty(value = "ID", required = true, example = "1024")
+    @NotNull(message = "ID 不能为空")
     private Long id;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java
deleted file mode 100644
index 07e3dfb858..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.system.convert.notify;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogBaseVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author LuoWenFeng
- */
-@Mapper
-public interface NotifyLogConvert {
-
-    NotifyLogConvert INSTANCE = Mappers.getMapper(NotifyLogConvert.class);
-
-    PageResult<NotifyLogBaseVO> convertPage(PageResult<NotifyMessageDO> page);
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java
index 8d58067b9f..bc8c14d5bc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java
@@ -5,7 +5,6 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExcelVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
 import org.mapstruct.Mapper;
@@ -32,6 +31,4 @@ public interface NotifyTemplateConvert {
 
     PageResult<NotifyTemplateRespVO> convertPage(PageResult<NotifyTemplateDO> page);
 
-    List<NotifyTemplateExcelVO> convertList02(List<NotifyTemplateDO> list);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
index fe80784a8b..e73badf263 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java
@@ -2,19 +2,24 @@ package cn.iocoder.yudao.module.system.dal.dataobject.notify;
 
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * 站内信 DO
  *
  * @author xrcoder
  */
-@TableName("system_notify_message")
+@TableName(value = "system_notify_message", autoResultMap = true)
 @KeySequence("system_notify_message_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,22 +30,10 @@ import java.util.Date;
 public class NotifyMessageDO extends BaseDO {
 
     /**
-     * ID
+     * 站内信编号，自增
      */
     @TableId
     private Long id;
-    /**
-     * 站内信模版编号
-     *
-     * 关联 {@link NotifyTemplateDO#getId()}
-     */
-    private Long templateId;
-    /**
-     * 站内信模版编码
-     *
-     * 关联 {@link NotifyTemplateDO#getCode()}
-     */
-    private String templateCode;
     /**
      * 用户编号
      *
@@ -53,28 +46,49 @@ public class NotifyMessageDO extends BaseDO {
      * 枚举 {@link UserTypeEnum}
      */
     private Integer userType;
+
+    // ========= 模板相关字段 =========
+
     /**
-     * 标题
+     * 模版编号
+     *
+     * 关联 {@link NotifyTemplateDO#getId()}
      */
-    private String title;
+    private Long templateId;
     /**
-     * 内容
+     * 模版编码
+     *
+     * 关联 {@link NotifyTemplateDO#getCode()}
      */
-    private String content;
-    // TODO @luowenfeng：是不是创建时间，直接作为发送时间；
+    private String templateCode;
     /**
-     * 发送时间
+     * 模版类型
+     *
+     * 冗余 {@link NotifyTemplateDO#getType()}
      */
-    private Date sendTime;
-    // TODO @luowenfeng：是不是不用发送 id 和名字😑？
+    private Integer templateType;
     /**
-     * 发送用户id
+     * 模版发送人名称
+     *
+     * 冗余 {@link NotifyTemplateDO#getNickname()}
      */
-    private Long sendUserId;
+    private String templateNickname;
     /**
-     * 发送用户名
+     * 模版内容
+     *
+     * 基于 {@link NotifyTemplateDO#getContent()} 格式化后的内容
      */
-    private String sendUserName;
+    private String templateContent;
+    /**
+     * 模版参数
+     *
+     * 基于 {@link NotifyTemplateDO#getParams()} 输入后的参数
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Map<String, Object> templateParams;
+
+    // ========= 读取相关字段 =========
+
     /**
      * 是否已读
      */
@@ -82,6 +96,6 @@ public class NotifyMessageDO extends BaseDO {
     /**
      * 阅读时间
      */
-    private Date readTime;
+    private LocalDateTime readTime;
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
index 28fa834067..1bce809a1f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java
@@ -31,14 +31,24 @@ public class NotifyTemplateDO extends BaseDO {
      */
     @TableId
     private Long id;
+    /**
+     * 模版名称
+     */
+    private String name;
     /**
      * 模版编码
      */
     private String code;
     /**
-     * 模版标题
+     * 模版类型
+     *
+     * 对应 system_notify_template_type 字典
      */
-    private String title;
+    private Integer type;
+    /**
+     * 发送人名称
+     */
+    private String nickname;
     /**
      * 模版内容
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 4704192448..52e2c641e9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -3,49 +3,61 @@ package cn.iocoder.yudao.module.system.dal.mysql.notify;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 
-/**
- * 站内信 Mapper
- *
- * @author xrcoder
- */
 @Mapper
 public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
 
-    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO, Long userId, Integer userType) {
+    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
-                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
-                .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
+                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
+                .likeIfPresent(NotifyMessageDO::getTemplateCode, reqVO.getTemplateCode())
+                .eqIfPresent(NotifyMessageDO::getTemplateType, reqVO.getTemplateType())
+                .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(NotifyMessageDO::getId));
+    }
+
+    default PageResult<NotifyMessageDO> selectPage(NotifyMessageMyPageReqVO reqVO, Long userId, Integer userType) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
+                .eq(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType)
                 .orderByDesc(NotifyMessageDO::getId));
     }
 
-    default PageResult<NotifyMessageDO> selectSendPage(NotifyLogPageReqVO reqVO, Long userId) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
-                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
-                .betweenIfPresent(NotifyMessageDO::getSendTime, reqVO.getSendTime())
-                .eqIfPresent(NotifyMessageDO::getTemplateCode, reqVO.getTemplateCode())
-                .eq(NotifyMessageDO::getSendUserId, userId)
-                .orderByDesc(NotifyMessageDO::getId));
+    default int updateListRead(Collection<Long> ids, Long userId, Integer userType) {
+        return update(new NotifyMessageDO().setReadStatus(true).setReadTime(LocalDateTime.now()),
+                new LambdaQueryWrapperX<NotifyMessageDO>()
+                        .in(NotifyMessageDO::getId, ids)
+                        .eq(NotifyMessageDO::getUserId, userId)
+                        .eq(NotifyMessageDO::getUserType, userType)
+                        .eq(NotifyMessageDO::getReadStatus, false));
     }
 
-    default List<NotifyMessageDO> selectList(NotifyMessagePageReqVO reqVO, Integer size,  Long userId, Integer userType) {
-        return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
-                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
-                .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
-                .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(NotifyMessageDO::getUserId, userId)
-                .eqIfPresent(NotifyMessageDO::getUserType, userType)
-                .orderByDesc(NotifyMessageDO::getId)
-                .last("limit " + size));
+    default int updateListRead(Long userId, Integer userType) {
+        return update(new NotifyMessageDO().setReadStatus(true).setReadTime(LocalDateTime.now()),
+                new LambdaQueryWrapperX<NotifyMessageDO>()
+                        .eq(NotifyMessageDO::getUserId, userId)
+                        .eq(NotifyMessageDO::getUserType, userType)
+                        .eq(NotifyMessageDO::getReadStatus, false));
+    }
+
+    default List<NotifyMessageDO> selectUnreadListByUserIdAndUserType(Long userId, Integer userType, Integer size) {
+        return selectList(new QueryWrapperX<NotifyMessageDO>() // 由于要使用 limitN 语句，所以只能用 QueryWrapperX
+                .eq("user_id", userId)
+                .eq("user_type", userType)
+                .eq("read_status", false)
+                .orderByDesc("id").limitN(size));
     }
 
     default Long selectUnreadCountByUserIdAndUserType(Long userId, Integer userType) {
@@ -55,11 +67,4 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
                 .eq(NotifyMessageDO::getUserType, userType));
     }
 
-    default List<NotifyMessageDO> selectUnreadListByUserIdAndUserType(Long userId, Integer userType) {
-        return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
-                .eq(NotifyMessageDO::getReadStatus, false)
-                .eq(NotifyMessageDO::getUserId, userId)
-                .eq(NotifyMessageDO::getUserType, userType));
-    }
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
index c71a054b1d..1fcb8ee0d5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java
@@ -1,45 +1,23 @@
 package cn.iocoder.yudao.module.system.dal.mysql.notify;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-/**
- * 站内信模版 Mapper
- *
- * @author xrcoder
- */
 @Mapper
 public interface NotifyTemplateMapper extends BaseMapperX<NotifyTemplateDO> {
 
-    @Select("SELECT COUNT(*) FROM system_notify_template WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(Date maxUpdateTime);
-
     default NotifyTemplateDO selectByCode(String code) {
         return selectOne(NotifyTemplateDO::getCode, code);
     }
 
     default PageResult<NotifyTemplateDO> selectPage(NotifyTemplatePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyTemplateDO>()
-                .eqIfPresent(NotifyTemplateDO::getCode, reqVO.getCode())
-                .eqIfPresent(NotifyTemplateDO::getTitle, reqVO.getTitle())
-                .eqIfPresent(NotifyTemplateDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(NotifyTemplateDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(NotifyTemplateDO::getId));
-    }
-
-    default List<NotifyTemplateDO> selectList(NotifyTemplateExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<NotifyTemplateDO>()
-                .eqIfPresent(NotifyTemplateDO::getCode, reqVO.getCode())
-                .eqIfPresent(NotifyTemplateDO::getTitle, reqVO.getTitle())
+                .likeIfPresent(NotifyTemplateDO::getCode, reqVO.getCode())
+                .likeIfPresent(NotifyTemplateDO::getName, reqVO.getName())
                 .eqIfPresent(NotifyTemplateDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(NotifyTemplateDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(NotifyTemplateDO::getId));
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java
index 854eb7faa6..599c1abef9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java
@@ -22,7 +22,7 @@ public interface SmsCodeMapper extends BaseMapperX<SmsCodeDO> {
                 .eqIfPresent("scene", scene)
                 .eqIfPresent("code", code)
                 .orderByDesc("id")
-                .limit1());
+                .limitN(1));
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
index 703467141c..4a0b204385 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java
@@ -45,7 +45,7 @@ public interface MailLogService {
      * @param isSend        是否发送成功
      * @return 日志编号
      */
-    Long createMailLog(Long userId,Integer userType, String toMail,
+    Long createMailLog(Long userId, Integer userType, String toMail,
                        MailAccountDO account, MailTemplateDO template ,
                        String templateContent, Map<String, Object> templateParams, Boolean isSend);
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
index 57fbf5c297..d7b17d8777 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
@@ -88,8 +88,7 @@ public class MailSendServiceImpl implements MailSendService {
 
         // 校验邮箱是否存在
         mail = checkMail(mail);
-        // 构建有序的模板参数。为什么放在这个位置，是提前保证模板参数的正确性，而不是到了插入发送日志
-        List<KeyValue<String, Object>> newTemplateParams = buildTemplateParams(template, templateParams);
+        checkTemplateParams(template, templateParams);
 
         // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志
         Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus());
@@ -152,21 +151,19 @@ public class MailSendServiceImpl implements MailSendService {
     }
 
     /**
-     * 将参数模板，处理成有序的 KeyValue 数组
+     * 校验邮件参数是否确实
      *
      * @param template 邮箱模板
-     * @param templateParams 原始参数
-     * @return 处理后的参数
+     * @param templateParams 参数列表
      */
     @VisibleForTesting
-    public List<KeyValue<String, Object>> buildTemplateParams(MailTemplateDO template, Map<String, Object> templateParams) {
-        return template.getParams().stream().map(key -> {
+    public void checkTemplateParams(MailTemplateDO template, Map<String, Object> templateParams) {
+        template.getParams().forEach(key -> {
             Object value = templateParams.get(key);
             if (value == null) {
                 throw exception(MAIL_SEND_TEMPLATE_PARAM_MISS, key);
             }
-            return new KeyValue<>(key, value);
-        }).collect(Collectors.toList());
+        });
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
deleted file mode 100644
index 290b8f2b97..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.system.service.notify;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-
-/**
- * 站内信日志 Service 接口
- *
- * @author LuoWenFeng
- */
-public interface NotifyLogService {
-
-    // TODO @LuoWenFeng：NotifyLogService=》NotifyMessageService
-
-    /**
-     * 获得站内信发送分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 站内信分页
-     */
-    PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO);
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java
deleted file mode 100644
index be95d8a6dd..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.system.service.notify;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
-import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-/**
- * <p>
- * 站内信日志 Service 实现类
- *
- * </p>
- *
- * @author LuoWenFeng
- */
-@Service
-@Validated
-public class NotifyLogServiceImpl implements NotifyLogService {
-
-    @Resource
-    private NotifyMessageMapper notifyMessageMapper;
-
-    @Override
-    public PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO) {
-        return notifyMessageMapper.selectSendPage(pageReqVO, getLoginUserId());
-    }
-
-
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
index bb8d7e9232..b06aef322a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java
@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 站内信 Service 接口
@@ -15,28 +18,17 @@ import java.util.List;
 public interface NotifyMessageService {
 
     /**
-     * 获得站内信
+     * 创建站内信
      *
-     * @param id 编号
-     * @return 站内信
+     * @param userId 用户编号
+     * @param userType 用户类型
+     * @param template 模版信息
+     * @param templateContent 模版内容
+     * @param templateParams 模版参数
+     * @return 站内信编号
      */
-    NotifyMessageDO getNotifyMessage(Long id);
-
-    /**
-     * 获得站内信列表
-     *
-     * @param ids 编号
-     * @return 站内信列表
-     */
-    List<NotifyMessageDO> getNotifyMessageList(Collection<Long> ids);
-
-    /**
-     * 获得站内信集合
-     *
-     * @param pageReqVO 分页查询
-     * @return 站内信分页
-     */
-    List<NotifyMessageDO> getNotifyMessageList(NotifyMessagePageReqVO pageReqVO, Integer size);
+    Long createNotifyMessage(Long userId, Integer userType,
+                             NotifyTemplateDO template, String templateContent, Map<String, Object> templateParams);
 
     /**
      * 获得站内信分页
@@ -46,37 +38,60 @@ public interface NotifyMessageService {
      */
     PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO);
 
+    /**
+     * 获得【我的】站内信分页
+     *
+     * @param pageReqVO 分页查询
+     * @param userId 用户编号
+     * @param userType 用户类型
+     * @return 站内信分页
+     */
+    PageResult<NotifyMessageDO> getMyMyNotifyMessagePage(NotifyMessageMyPageReqVO pageReqVO, Long userId, Integer userType);
+
+    /**
+     * 获得站内信
+     *
+     * @param id 编号
+     * @return 站内信
+     */
+    NotifyMessageDO getNotifyMessage(Long id);
+
+    /**
+     * 获得【我的】未读站内信列表
+     *
+     * @param userId   用户编号
+     * @param userType 用户类型
+     * @param size     数量
+     * @return 站内信列表
+     */
+    List<NotifyMessageDO> getUnreadNotifyMessageList(Long userId, Integer userType, Integer size);
+
     /**
      * 统计用户未读站内信条数
      *
-     * @param userId   用户ID
+     * @param userId   用户编号
      * @param userType 用户类型
      * @return 返回未读站内信条数
      */
     Long getUnreadNotifyMessageCount(Long userId, Integer userType);
 
     /**
-     * 修改站内信阅读状态
-     *
-     * @param id     站内信编号
-     * @param status 状态
-     */
-    void updateNotifyMessageReadStatus(Long id, Boolean status);
-
-    /**
-     * 批量修改站内信阅读状态
+     * 标记站内信为已读
      *
      * @param ids    站内信编号集合
-     * @param userId 用户ID
+     * @param userId 用户编号
+     * @param userType 用户类型
+     * @return 更新到的条数
      */
-    void batchUpdateNotifyMessageReadStatus(Collection<Long> ids, Long userId);
+    int updateNotifyMessageRead(Collection<Long> ids, Long userId, Integer userType);
 
     /**
-     * 批量修改用户所有未读消息标记已读
+     * 标记所有站内信为已读
      *
-     * @param userId   用户ID
+     * @param userId   用户编号
      * @param userType 用户类型
+     * @return 更新到的条数
      */
-    void batchUpdateAllNotifyMessageReadStatus(Long userId, Integer userType);
+    int updateAllNotifyMessageRead(Long userId, Integer userType);
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
index f8ddad0cf5..3abcebcf97 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java
@@ -1,30 +1,20 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.iocoder.yudao.framework.common.core.KeyValue;
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
-import com.google.common.annotations.VisibleForTesting;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 站内信 Service 实现类
@@ -38,43 +28,25 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
     @Resource
     private NotifyMessageMapper notifyMessageMapper;
 
-    @Resource
-    private NotifyTemplateService notifyTemplateService;
-
-
-    @VisibleForTesting
-    public NotifyTemplateDO checkNotifyTemplateValid(String templateCode) {
-        // 获得站内信模板。考虑到效率，从缓存中获取
-        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplateByCodeFromCache(templateCode);
-        // 站内信模板不存在
-        if (template == null) {
-            throw exception(NOTIFY_TEMPLATE_NOT_EXISTS);
-        }
-        return template;
+    @Override
+    public Long createNotifyMessage(Long userId, Integer userType,
+                                    NotifyTemplateDO template, String templateContent, Map<String, Object> templateParams) {
+        NotifyMessageDO message = new NotifyMessageDO().setUserId(userId).setUserType(userType)
+                .setTemplateId(template.getId()).setTemplateCode(template.getCode())
+                .setTemplateType(template.getType()).setTemplateNickname(template.getNickname())
+                .setTemplateContent(templateContent).setTemplateParams(templateParams).setReadStatus(false);
+        notifyMessageMapper.insert(message);
+        return message.getId();
     }
 
-    /**
-     * 将参数模板，处理成有序的 KeyValue 数组
-     *
-     * @param template       站内信模板
-     * @param templateParams 原始参数
-     * @return 处理后的参数
-     */
-    @VisibleForTesting
-    public List<KeyValue<String, Object>> buildTemplateParams(NotifyTemplateDO template, Map<String, Object> templateParams) {
-        return template.getParams().stream().map(key -> {
-            Object value = templateParams.get(key);
-            if (value == null) {
-                throw exception(NOTIFY_TEMPLATE_PARAM_MISS, key);
-            }
-            return new KeyValue<>(key, value);
-        }).collect(Collectors.toList());
+    @Override
+    public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
+        return notifyMessageMapper.selectPage(pageReqVO);
     }
 
-    private void validateNotifyMessageExists(Long id) {
-        if (notifyMessageMapper.selectById(id) == null) {
-            throw exception(NOTIFY_MESSAGE_NOT_EXISTS);
-        }
+    @Override
+    public PageResult<NotifyMessageDO> getMyMyNotifyMessagePage(NotifyMessageMyPageReqVO pageReqVO, Long userId, Integer userType) {
+        return notifyMessageMapper.selectPage(pageReqVO, userId, userType);
     }
 
     @Override
@@ -83,97 +55,23 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
     }
 
     @Override
-    public List<NotifyMessageDO> getNotifyMessageList(Collection<Long> ids) {
-        return notifyMessageMapper.selectBatchIds(ids);
+    public List<NotifyMessageDO> getUnreadNotifyMessageList(Long userId, Integer userType, Integer size) {
+        return notifyMessageMapper.selectUnreadListByUserIdAndUserType(userId, userType, size);
     }
 
-    @Override
-    public List<NotifyMessageDO> getNotifyMessageList(NotifyMessagePageReqVO pageReqVO, Integer size) {
-        return notifyMessageMapper.selectList(pageReqVO, size, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
-    }
-
-    @Override
-    public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
-        return notifyMessageMapper.selectPage(pageReqVO, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
-    }
-
-    /**
-     * 统计用户未读站内信条数
-     *
-     * @param userId   用户ID
-     * @param userType 用户类型
-     * @return 返回未读站内信条数
-     */
     @Override
     public Long getUnreadNotifyMessageCount(Long userId, Integer userType) {
         return notifyMessageMapper.selectUnreadCountByUserIdAndUserType(userId, userType);
     }
 
-    /**
-     * 修改站内信阅读状态
-     *
-     * @param id     站内信编号
-     * @param status 状态
-     */
     @Override
-    public void updateNotifyMessageReadStatus(Long id, Boolean status) {
-        // 校验消息是否存在
-        this.validateNotifyMessageExists(id);
-        // 更新状态
-        batchUpdateReadStatus(CollectionUtils.singleton(id));
+    public int updateNotifyMessageRead(Collection<Long> ids, Long userId, Integer userType) {
+        return notifyMessageMapper.updateListRead(ids, userId, userType);
     }
 
-    /**
-     * 批量修改站内信阅读状态
-     *
-     * @param ids    站内信编号集合
-     * @param userId 用户ID
-     */
     @Override
-    public void batchUpdateNotifyMessageReadStatus(Collection<Long> ids, Long userId) {
-        List<NotifyMessageDO> list = getNotifyMessageList(ids);
-        if (CollUtil.isEmpty(list)) {
-            throw exception(NOTIFY_MESSAGE_NOT_EXISTS);
-        }
-        // 验证站内信是否是属于用户
-        for (NotifyMessageDO messageDO : list) {
-            checkNotifyMessageIdValid(messageDO, userId);
-        }
-        batchUpdateReadStatus(ids);
-    }
-
-    @VisibleForTesting
-    public void checkNotifyMessageIdValid(NotifyMessageDO notifyMessageDO, Long userId) {
-        if (!NumberUtil.equals(notifyMessageDO.getUserId(), userId)) {
-            throw exception(NOTIFY_MESSAGE_ID_PARAM_ERROR);
-        }
-    }
-
-    /**
-     * 批量修改用户所有未读消息标记已读
-     *
-     * @param userId   用户ID
-     * @param userType 用户类型
-     */
-    @Override
-    public void batchUpdateAllNotifyMessageReadStatus(Long userId, Integer userType) {
-        List<NotifyMessageDO> list = notifyMessageMapper.selectUnreadListByUserIdAndUserType(userId, userType);
-        if (CollUtil.isNotEmpty(list)) {
-            batchUpdateReadStatus(CollectionUtils.convertList(list, NotifyMessageDO::getId));
-        }
-    }
-
-    /**
-     * 批量修改阅读状态为已读
-     *
-     * @param ids 站内变编号数组
-     */
-    private void batchUpdateReadStatus(Collection<Long> ids) {
-        NotifyMessageDO updateObj = new NotifyMessageDO();
-        updateObj.setReadStatus(true);
-        updateObj.setReadTime(new Date());
-        // TODO @luowenfeng：涉及到 mybatis 的操作，都要隐藏到 mapper 中；
-        notifyMessageMapper.update(updateObj, new LambdaQueryWrapperX<NotifyMessageDO>().in(NotifyMessageDO::getId, ids));
+    public int updateAllNotifyMessageRead(Long userId, Integer userType) {
+        return notifyMessageMapper.updateListRead(userId, userType);
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
index 68e9a78c48..f4a8d4f4ca 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java
@@ -3,9 +3,13 @@ package cn.iocoder.yudao.module.system.service.notify;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 站内信发送 Service 接口
+ *
+ * @author xrcoder
+ */
 public interface NotifySendService {
 
-
     /**
      * 发送单条站内信给管理后台的用户
      *
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
index e72bd6c866..39e685fd58 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java
@@ -1,25 +1,20 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
-import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
-import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.Map;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
-// TODO @luowenfeng：可以直接合并到 NotifyMessageService 中；之前 sms 台复杂，所以没合并。
 /**
  * 站内信发送 Service 实现类
  *
@@ -34,10 +29,7 @@ public class NotifySendServiceImpl implements NotifySendService {
     private NotifyTemplateService notifyTemplateService;
 
     @Resource
-    private NotifyMessageMapper notifyMessageMapper;
-
-    @Resource
-    private AdminUserService userService;
+    private NotifyMessageService notifyMessageService;
 
     @Override
     public Long sendSingleNotifyToAdmin(Long userId, String templateCode, Map<String, Object> templateParams) {
@@ -51,38 +43,44 @@ public class NotifySendServiceImpl implements NotifySendService {
 
     @Override
     public Long sendSingleNotify(Long userId, Integer userType, String templateCode, Map<String, Object> templateParams) {
-        // 校验短信模板是否合法
-        NotifyTemplateDO template = this.checkNotifyTemplateValid(templateCode);
-        String content = notifyTemplateService.formatNotifyTemplateContent(template.getContent(), templateParams);
-        // 获得用户
-        AdminUserDO sendUser = userService.getUser(getLoginUserId());
+        // 校验模版
+        NotifyTemplateDO template = checkNotifyTemplateValid(templateCode);
+        if (Objects.equals(template.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
+            log.info("[sendSingleNotify][模版({})已经关闭，无法给用户({}/{})发送]", templateCode, userId, userType);
+            return null;
+        }
+        // 校验参数
+        checkTemplateParams(template, templateParams);
 
-        // todo 模板状态未开启时的业务；如果未开启，就直接 return 好了；
-        NotifyMessageDO notifyMessageDO = new NotifyMessageDO();
-        notifyMessageDO.setContent(content);
-        notifyMessageDO.setTitle(template.getTitle());
-        notifyMessageDO.setReadStatus(false);
-        notifyMessageDO.setTemplateId(template.getId());
-        notifyMessageDO.setTemplateCode(templateCode);
-        notifyMessageDO.setUserId(userId);
-        notifyMessageDO.setUserType(userType);
-        notifyMessageDO.setSendTime(new Date());
-        notifyMessageDO.setSendUserId(sendUser.getId());
-        notifyMessageDO.setSendUserName(sendUser.getUsername());
-        notifyMessageMapper.insert(notifyMessageDO);
-        return notifyMessageDO.getId();
+        // 发送站内信
+        String content = notifyTemplateService.formatNotifyTemplateContent(template.getContent(), templateParams);
+        return notifyMessageService.createNotifyMessage(userId, userType, template, content, templateParams);
     }
 
-    // 此注解的含义
     @VisibleForTesting
     public NotifyTemplateDO checkNotifyTemplateValid(String templateCode) {
-        // 获得短信模板。考虑到效率，从缓存中获取
+        // 获得站内信模板。考虑到效率，从缓存中获取
         NotifyTemplateDO template = notifyTemplateService.getNotifyTemplateByCodeFromCache(templateCode);
-        // 短信模板不存在
+        // 站内信模板不存在
         if (template == null) {
             throw exception(NOTICE_NOT_FOUND);
         }
         return template;
     }
 
+    /**
+     * 校验站内信模版参数是否确实
+     *
+     * @param template 邮箱模板
+     * @param templateParams 参数列表
+     */
+    @VisibleForTesting
+    public void checkTemplateParams(NotifyTemplateDO template, Map<String, Object> templateParams) {
+        template.getParams().forEach(key -> {
+            Object value = templateParams.get(key);
+            if (value == null) {
+                throw exception(NOTIFY_SEND_TEMPLATE_PARAM_MISS, key);
+            }
+        });
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
index cb2a5576c7..260159b799 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
@@ -2,14 +2,11 @@ package cn.iocoder.yudao.module.system.service.notify;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
 
 import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,7 +14,6 @@ import java.util.Map;
  *
  * @author xrcoder
  */
-// TODO 芋艿：缺少单测，可以参考 SmsTemplateServiceTest 写下
 public interface NotifyTemplateService {
 
     /**
@@ -33,16 +29,6 @@ public interface NotifyTemplateService {
      */
     NotifyTemplateDO getNotifyTemplateByCodeFromCache(String code);
 
-
-    /**
-     * 格式化站内信内容
-     *
-     * @param content 站内信模板的内容
-     * @param params 站内信内容的参数
-     * @return 格式化后的内容
-     */
-    String formatNotifyTemplateContent(String content, Map<String, Object> params);
-
     /**
      * 创建站内信模版
      *
@@ -73,14 +59,6 @@ public interface NotifyTemplateService {
      */
     NotifyTemplateDO getNotifyTemplate(Long id);
 
-    /**
-     * 获得站内信模版列表
-     *
-     * @param ids 编号
-     * @return 站内信模版列表
-     */
-    List<NotifyTemplateDO> getNotifyTemplateList(Collection<Long> ids);
-
     /**
      * 获得站内信模版分页
      *
@@ -90,11 +68,12 @@ public interface NotifyTemplateService {
     PageResult<NotifyTemplateDO> getNotifyTemplatePage(NotifyTemplatePageReqVO pageReqVO);
 
     /**
-     * 获得站内信模版列表, 用于 Excel 导出
+     * 格式化站内信内容
      *
-     * @param exportReqVO 查询条件
-     * @return 站内信模版列表
+     * @param content 站内信模板的内容
+     * @param params 站内信内容的参数
+     * @return 格式化后的内容
      */
-    List<NotifyTemplateDO> getNotifyTemplateList(NotifyTemplateExportReqVO exportReqVO);
+    String formatNotifyTemplateContent(String content, Map<String, Object> params);
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
index 7bfa9027ce..5ee8b4bbcf 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
@@ -1,12 +1,10 @@
 package cn.iocoder.yudao.module.system.service.notify;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateExportReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
 import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert;
@@ -15,20 +13,17 @@ import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.notify.NotifyProducer;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_CODE_DUPLICATE;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 站内信模版 Service 实现类
@@ -40,12 +35,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEM
 @Slf4j
 public class NotifyTemplateServiceImpl implements NotifyTemplateService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 正则表达式，匹配 {} 中的变量
      */
@@ -65,82 +54,25 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
      */
     private volatile Map<String, NotifyTemplateDO> notifyTemplateCache;
 
-    /**
-     * 缓存站内信模板的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    private volatile Date maxUpdateTime;
-
     /**
      * 初始化站内信模板的本地缓存
      */
     @Override
+    @PostConstruct
     public void initLocalCache() {
-        // 获取站内信模板列表，如果有更新
-        List<NotifyTemplateDO> notifyTemplateList = this.loadNotifyTemplateIfUpdate(maxUpdateTime);
-        if (CollUtil.isEmpty(notifyTemplateList)) {
-            return;
-        }
+        // 第一步：查询数据
+        List<NotifyTemplateDO> templates = notifyTemplateMapper.selectList();
+        log.info("[initLocalCache][缓存站内信模版，数量为:{}]", templates.size());
 
-        // 写入缓存
-        notifyTemplateCache = CollectionUtils.convertMap(notifyTemplateList, NotifyTemplateDO::getCode);
-        maxUpdateTime = CollectionUtils.getMaxValue(notifyTemplateList, NotifyTemplateDO::getUpdateTime);
-        log.info("[initLocalCache][初始化 NotifyTemplate 数量为 {}]", notifyTemplateList.size());
+        // 第二步：构建缓存
+        notifyTemplateCache = CollectionUtils.convertMap(templates, NotifyTemplateDO::getCode);
     }
 
-    /**
-     * 如果站内信模板发生变化，从数据库中获取最新的全量站内信模板。
-     * 如果未发生变化，则返回空
-     *
-     * @param maxUpdateTime 当前站内信模板的最大更新时间
-     * @return 站内信模板列表
-     */
-    private List<NotifyTemplateDO> loadNotifyTemplateIfUpdate(Date maxUpdateTime) {
-        // 第一步，判断是否要更新。
-        if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据
-            log.info("[loadNotifyTemplateIfUpdate][首次加载全量站内信模板]");
-        } else { // 判断数据库中是否有更新的站内信模板
-            if (notifyTemplateMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                return null;
-            }
-            log.info("[loadNotifyTemplateIfUpdate][增量加载全量站内信模板]");
-        }
-        // 第二步，如果有更新，则从数据库加载所有站内信模板
-        return notifyTemplateMapper.selectList();
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCache();
-    }
-
-    /**
-     * 获得站内信模板，从缓存中
-     *
-     * @param code 模板编码
-     * @return 站内信模板
-     */
     @Override
     public NotifyTemplateDO getNotifyTemplateByCodeFromCache(String code) {
         return notifyTemplateCache.get(code);
     }
 
-    /**
-     * 格式化站内信内容
-     *
-     * @param content 站内信模板的内容
-     * @param params  站内信内容的参数
-     * @return 格式化后的内容
-     */
-    @Override
-    public String formatNotifyTemplateContent(String content, Map<String, Object> params) {
-        return StrUtil.format(content, params);
-    }
-
-    @VisibleForTesting
-    public List<String> parseTemplateContentParams(String content) {
-        return ReUtil.findAllGroup1(PATTERN_PARAMS, content);
-    }
-
     @Override
     public Long createNotifyTemplate(NotifyTemplateCreateReqVO createReqVO) {
         // 校验站内信编码是否重复
@@ -150,32 +82,37 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         NotifyTemplateDO notifyTemplate = NotifyTemplateConvert.INSTANCE.convert(createReqVO);
         notifyTemplate.setParams(parseTemplateContentParams(notifyTemplate.getContent()));
         notifyTemplateMapper.insert(notifyTemplate);
+
         // 发送刷新消息
         notifyProducer.sendNotifyTemplateRefreshMessage();
-        // 返回
         return notifyTemplate.getId();
     }
 
     @Override
     public void updateNotifyTemplate(NotifyTemplateUpdateReqVO updateReqVO) {
         // 校验存在
-        this.validateNotifyTemplateExists(updateReqVO.getId());
+        validateNotifyTemplateExists(updateReqVO.getId());
         // 校验站内信编码是否重复
         checkNotifyTemplateCodeDuplicate(updateReqVO.getId(), updateReqVO.getCode());
 
         // 更新
         NotifyTemplateDO updateObj = NotifyTemplateConvert.INSTANCE.convert(updateReqVO);
         updateObj.setParams(parseTemplateContentParams(updateObj.getContent()));
-
         notifyTemplateMapper.updateById(updateObj);
+
         // 发送刷新消息
         notifyProducer.sendNotifyTemplateRefreshMessage();
     }
 
+    @VisibleForTesting
+    public List<String> parseTemplateContentParams(String content) {
+        return ReUtil.findAllGroup1(PATTERN_PARAMS, content);
+    }
+
     @Override
     public void deleteNotifyTemplate(Long id) {
         // 校验存在
-        this.validateNotifyTemplateExists(id);
+        validateNotifyTemplateExists(id);
         // 删除
         notifyTemplateMapper.deleteById(id);
         // 发送刷新消息
@@ -193,21 +130,11 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         return notifyTemplateMapper.selectById(id);
     }
 
-    @Override
-    public List<NotifyTemplateDO> getNotifyTemplateList(Collection<Long> ids) {
-        return notifyTemplateMapper.selectBatchIds(ids);
-    }
-
     @Override
     public PageResult<NotifyTemplateDO> getNotifyTemplatePage(NotifyTemplatePageReqVO pageReqVO) {
         return notifyTemplateMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public List<NotifyTemplateDO> getNotifyTemplateList(NotifyTemplateExportReqVO exportReqVO) {
-        return notifyTemplateMapper.selectList(exportReqVO);
-    }
-
     @VisibleForTesting
     public void checkNotifyTemplateCodeDuplicate(Long id, String code) {
         NotifyTemplateDO template = notifyTemplateMapper.selectByCode(code);
@@ -222,4 +149,16 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
             throw exception(NOTIFY_TEMPLATE_CODE_DUPLICATE, code);
         }
     }
+
+    /**
+     * 格式化站内信内容
+     *
+     * @param content 站内信模板的内容
+     * @param params  站内信内容的参数
+     * @return 格式化后的内容
+     */
+    @Override
+    public String formatNotifyTemplateContent(String content, Map<String, Object> params) {
+        return StrUtil.format(content, params);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
index bd93cd00a0..e1be7e8d62 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
@@ -145,7 +145,7 @@ class MailSendServiceImplTest extends BaseMockitoUnitTest {
     }
 
     @Test
-    public void testBuildTemplateParams_paramMiss() {
+    public void testCheckTemplateParams_paramMiss() {
         // 准备参数
         MailTemplateDO template = randomPojo(MailTemplateDO.class,
                 o -> o.setParams(Lists.newArrayList("code")));
@@ -153,7 +153,7 @@ class MailSendServiceImplTest extends BaseMockitoUnitTest {
         // mock 方法
 
         // 调用，并断言异常
-        assertServiceException(() -> mailSendService.buildTemplateParams(template, templateParams),
+        assertServiceException(() -> mailSendService.checkTemplateParams(template, templateParams),
                 MAIL_SEND_TEMPLATE_PARAM_MISS, "code");
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
new file mode 100644
index 0000000000..1087918cca
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
@@ -0,0 +1,266 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.hutool.core.map.MapUtil;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import com.baomidou.mybatisplus.annotation.DbType;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+* {@link NotifyMessageServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(NotifyMessageServiceImpl.class)
+public class NotifyMessageServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private NotifyMessageServiceImpl notifyMessageService;
+
+    @Resource
+    private NotifyMessageMapper notifyMessageMapper;
+
+    @Test
+    public void testCreateNotifyMessage_success() {
+        // 准备参数
+        Long userId = randomLongId();
+        Integer userType = randomEle(UserTypeEnum.values()).getValue();
+        NotifyTemplateDO template = randomPojo(NotifyTemplateDO.class);
+        String templateContent = randomString();
+        Map<String, Object> templateParams = randomTemplateParams();
+        // mock 方法
+
+        // 调用
+        Long messageId = notifyMessageService.createNotifyMessage(userId, userType,
+                template, templateContent, templateParams);
+        // 断言
+        NotifyMessageDO message = notifyMessageMapper.selectById(messageId);
+        assertNotNull(message);
+        assertEquals(userId, message.getUserId());
+        assertEquals(userType, message.getUserType());
+        assertEquals(template.getId(), message.getTemplateId());
+        assertEquals(template.getCode(), message.getTemplateCode());
+        assertEquals(template.getType(), message.getTemplateType());
+        assertEquals(template.getNickname(), message.getTemplateNickname());
+        assertEquals(templateContent, message.getTemplateContent());
+        assertEquals(templateParams, message.getTemplateParams());
+        assertEquals(false, message.getReadStatus());
+        assertNull(message.getReadTime());
+    }
+
+    @Test
+    public void testGetNotifyMessagePage() {
+       // mock 数据
+       NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
+           o.setUserId(1L);
+           o.setUserType(UserTypeEnum.ADMIN.getValue());
+           o.setTemplateCode("test_01");
+           o.setTemplateType(10);
+           o.setCreateTime(buildTime(2022, 1, 2));
+           o.setTemplateParams(randomTemplateParams());
+       });
+       notifyMessageMapper.insert(dbNotifyMessage);
+       // 测试 userId 不匹配
+       notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserId(2L)));
+       // 测试 userType 不匹配
+       notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+       // 测试 templateCode 不匹配
+       notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setTemplateCode("test_11")));
+       // 测试 templateType 不匹配
+       notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setTemplateType(20)));
+       // 测试 createTime 不匹配
+       notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setCreateTime(buildTime(2022, 2, 1))));
+       // 准备参数
+       NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
+       reqVO.setUserId(1L);
+       reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
+       reqVO.setTemplateCode("est_01");
+       reqVO.setTemplateType(10);
+       reqVO.setCreateTime(buildBetweenTime(2022, 1, 1, 2022, 1, 10));
+
+       // 调用
+       PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbNotifyMessage, pageResult.getList().get(0));
+    }
+
+    @Test
+    public void testGetMyNotifyMessagePage() {
+        // mock 数据
+        NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
+            o.setUserId(1L);
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
+            o.setReadStatus(true);
+            o.setCreateTime(buildTime(2022, 1, 2));
+            o.setTemplateParams(randomTemplateParams());
+        });
+        notifyMessageMapper.insert(dbNotifyMessage);
+        // 测试 userId 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserId(2L)));
+        // 测试 userType 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+        // 测试 readStatus 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(false)));
+        // 测试 createTime 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setCreateTime(buildTime(2022, 2, 1))));
+        // 准备参数
+        Long userId = 1L;
+        Integer userType = UserTypeEnum.ADMIN.getValue();
+        NotifyMessageMyPageReqVO reqVO = new NotifyMessageMyPageReqVO();
+        reqVO.setReadStatus(true);
+        reqVO.setCreateTime(buildBetweenTime(2022, 1, 1, 2022, 1, 10));
+
+        // 调用
+        PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(reqVO, userId, userType);
+        // 断言
+        assertEquals(1, pageResult.getTotal());
+        assertEquals(1, pageResult.getList().size());
+        assertPojoEquals(dbNotifyMessage, pageResult.getList().get(0));
+    }
+
+    @Test
+    public void testGetUnreadNotifyMessageList() {
+        SqlConstants.init(DbType.MYSQL);
+        // mock 数据
+        NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
+            o.setUserId(1L);
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
+            o.setReadStatus(false);
+            o.setTemplateParams(randomTemplateParams());
+        });
+        notifyMessageMapper.insert(dbNotifyMessage);
+        // 测试 userId 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserId(2L)));
+        // 测试 userType 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+        // 测试 readStatus 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
+        // 准备参数
+        Long userId = 1L;
+        Integer userType = UserTypeEnum.ADMIN.getValue();
+        Integer size = 10;
+
+        // 调用
+        List<NotifyMessageDO> list = notifyMessageService.getUnreadNotifyMessageList(userId, userType, size);
+        // 断言
+        assertEquals(1, list.size());
+        assertPojoEquals(dbNotifyMessage, list.get(0));
+    }
+
+    @Test
+    public void testGetUnreadNotifyMessageCount() {
+        SqlConstants.init(DbType.MYSQL);
+        // mock 数据
+        NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
+            o.setUserId(1L);
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
+            o.setReadStatus(false);
+            o.setTemplateParams(randomTemplateParams());
+        });
+        notifyMessageMapper.insert(dbNotifyMessage);
+        // 测试 userId 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserId(2L)));
+        // 测试 userType 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+        // 测试 readStatus 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
+        // 准备参数
+        Long userId = 1L;
+        Integer userType = UserTypeEnum.ADMIN.getValue();
+
+        // 调用，并断言
+        assertEquals(1, notifyMessageService.getUnreadNotifyMessageCount(userId, userType));
+    }
+
+    @Test
+    public void testUpdateNotifyMessageRead() {
+        // mock 数据
+        NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
+            o.setUserId(1L);
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
+            o.setReadStatus(false);
+            o.setReadTime(null);
+            o.setTemplateParams(randomTemplateParams());
+        });
+        notifyMessageMapper.insert(dbNotifyMessage);
+        // 测试 userId 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserId(2L)));
+        // 测试 userType 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+        // 测试 readStatus 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
+        // 准备参数
+        Collection<Long> ids = Arrays.asList(dbNotifyMessage.getId(), dbNotifyMessage.getId() + 1,
+                dbNotifyMessage.getId() + 2, dbNotifyMessage.getId() + 3);
+        Long userId = 1L;
+        Integer userType = UserTypeEnum.ADMIN.getValue();
+
+        // 调用
+        int updateCount = notifyMessageService.updateNotifyMessageRead(ids, userId, userType);
+        // 断言
+        assertEquals(1, updateCount);
+        NotifyMessageDO notifyMessage = notifyMessageMapper.selectById(dbNotifyMessage.getId());
+        assertTrue(notifyMessage.getReadStatus());
+        assertNotNull(notifyMessage.getReadTime());
+    }
+
+    @Test
+    public void testUpdateAllNotifyMessageRead() {
+        // mock 数据
+        NotifyMessageDO dbNotifyMessage = randomPojo(NotifyMessageDO.class, o -> { // 等会查询到
+            o.setUserId(1L);
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
+            o.setReadStatus(false);
+            o.setReadTime(null);
+            o.setTemplateParams(randomTemplateParams());
+        });
+        notifyMessageMapper.insert(dbNotifyMessage);
+        // 测试 userId 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserId(2L)));
+        // 测试 userType 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
+        // 测试 readStatus 不匹配
+        notifyMessageMapper.insert(cloneIgnoreId(dbNotifyMessage, o -> o.setReadStatus(true)));
+        // 准备参数
+        Long userId = 1L;
+        Integer userType = UserTypeEnum.ADMIN.getValue();
+
+        // 调用
+        int updateCount = notifyMessageService.updateAllNotifyMessageRead(userId, userType);
+        // 断言
+        assertEquals(1, updateCount);
+        NotifyMessageDO notifyMessage = notifyMessageMapper.selectById(dbNotifyMessage.getId());
+        assertTrue(notifyMessage.getReadStatus());
+        assertNotNull(notifyMessage.getReadTime());
+    }
+
+    private static Map<String, Object> randomTemplateParams() {
+        return MapUtil.<String, Object>builder().put(randomString(), randomString())
+                .put(randomString(), randomString()).build();
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java
new file mode 100644
index 0000000000..e3ee328537
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java
@@ -0,0 +1,121 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.hutool.core.map.MapUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class NotifySendServiceImplTest extends BaseMockitoUnitTest {
+
+    @InjectMocks
+    private NotifySendServiceImpl notifySendService;
+
+    @Mock
+    private NotifyTemplateService notifyTemplateService;
+    @Mock
+    private NotifyMessageService notifyMessageService;
+
+    /**
+     * 发送成功，当短信模板开启时
+     */
+    @Test
+    public void testSendSingleNotify_successWhenMailTemplateEnable() {
+        // 准备参数
+        Long userId = randomLongId();
+        Integer userType = randomEle(UserTypeEnum.values()).getValue();
+        String templateCode = randomString();
+        Map<String, Object> templateParams = MapUtil.<String, Object>builder().put("code", "1234")
+                .put("op", "login").build();
+        // mock NotifyTemplateService 的方法
+        NotifyTemplateDO template = randomPojo(NotifyTemplateDO.class, o -> {
+            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+            o.setContent("验证码为{code}, 操作为{op}");
+            o.setParams(Lists.newArrayList("code", "op"));
+        });
+        when(notifyTemplateService.getNotifyTemplateByCodeFromCache(eq(templateCode))).thenReturn(template);
+        String content = randomString();
+        when(notifyTemplateService.formatNotifyTemplateContent(eq(template.getContent()), eq(templateParams)))
+                .thenReturn(content);
+        // mock NotifyMessageService 的方法
+        Long messageId = randomLongId();
+        when(notifyMessageService.createNotifyMessage(eq(userId), eq(userType),
+                eq(template), eq(content), eq(templateParams))).thenReturn(messageId);
+
+        // 调用
+        Long resultMessageId = notifySendService.sendSingleNotify(userId, userType, templateCode, templateParams);
+        // 断言
+        assertEquals(messageId, resultMessageId);
+    }
+
+    /**
+     * 发送成功，当短信模板关闭时
+     */
+    @Test
+    public void testSendSingleMail_successWhenSmsTemplateDisable() {
+        // 准备参数
+        Long userId = randomLongId();
+        Integer userType = randomEle(UserTypeEnum.values()).getValue();
+        String templateCode = randomString();
+        Map<String, Object> templateParams = MapUtil.<String, Object>builder().put("code", "1234")
+                .put("op", "login").build();
+        // mock NotifyTemplateService 的方法
+        NotifyTemplateDO template = randomPojo(NotifyTemplateDO.class, o -> {
+            o.setStatus(CommonStatusEnum.DISABLE.getStatus());
+            o.setContent("验证码为{code}, 操作为{op}");
+            o.setParams(Lists.newArrayList("code", "op"));
+        });
+        when(notifyTemplateService.getNotifyTemplateByCodeFromCache(eq(templateCode))).thenReturn(template);
+
+        // 调用
+        Long resultMessageId = notifySendService.sendSingleNotify(userId, userType, templateCode, templateParams);
+        // 断言
+        assertNull(resultMessageId);
+        verify(notifyTemplateService, never()).formatNotifyTemplateContent(anyString(), anyMap());
+        verify(notifyMessageService, never()).createNotifyMessage(anyLong(), anyInt(), any(), anyString(), anyMap());
+    }
+
+    @Test
+    public void testCheckMailTemplateValid_notExists() {
+        // 准备参数
+        String templateCode = randomString();
+        // mock 方法
+
+        // 调用，并断言异常
+        assertServiceException(() -> notifySendService.checkNotifyTemplateValid(templateCode),
+                NOTICE_NOT_FOUND);
+    }
+
+    @Test
+    public void testCheckTemplateParams_paramMiss() {
+        // 准备参数
+        NotifyTemplateDO template = randomPojo(NotifyTemplateDO.class,
+                o -> o.setParams(Lists.newArrayList("code")));
+        Map<String, Object> templateParams = new HashMap<>();
+        // mock 方法
+
+        // 调用，并断言异常
+        assertServiceException(() -> notifySendService.checkTemplateParams(template, templateParams),
+                NOTIFY_SEND_TEMPLATE_PARAM_MISS, "code");
+    }
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java
new file mode 100644
index 0000000000..5a6f5a508c
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java
@@ -0,0 +1,146 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper;
+import cn.iocoder.yudao.module.system.mq.producer.notify.NotifyProducer;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.verify;
+
+/**
+* {@link NotifyTemplateServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(NotifyTemplateServiceImpl.class)
+public class NotifyTemplateServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private NotifyTemplateServiceImpl notifyTemplateService;
+
+    @Resource
+    private NotifyTemplateMapper notifyTemplateMapper;
+
+    @MockBean
+    private NotifyProducer notifyProducer;
+
+    @Test
+    public void testCreateNotifyTemplate_success() {
+        // 准备参数
+        NotifyTemplateCreateReqVO reqVO = randomPojo(NotifyTemplateCreateReqVO.class,
+                o -> o.setStatus(randomCommonStatus()));
+
+        // 调用
+        Long notifyTemplateId = notifyTemplateService.createNotifyTemplate(reqVO);
+        // 断言
+        assertNotNull(notifyTemplateId);
+        // 校验记录的属性是否正确
+        NotifyTemplateDO notifyTemplate = notifyTemplateMapper.selectById(notifyTemplateId);
+        assertPojoEquals(reqVO, notifyTemplate);
+        verify(notifyProducer).sendNotifyTemplateRefreshMessage();
+    }
+
+    @Test
+    public void testUpdateNotifyTemplate_success() {
+        // mock 数据
+        NotifyTemplateDO dbNotifyTemplate = randomPojo(NotifyTemplateDO.class);
+        notifyTemplateMapper.insert(dbNotifyTemplate);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        NotifyTemplateUpdateReqVO reqVO = randomPojo(NotifyTemplateUpdateReqVO.class, o -> {
+            o.setId(dbNotifyTemplate.getId()); // 设置更新的 ID
+            o.setStatus(randomCommonStatus());
+        });
+
+        // 调用
+        notifyTemplateService.updateNotifyTemplate(reqVO);
+        // 校验是否更新正确
+        NotifyTemplateDO notifyTemplate = notifyTemplateMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, notifyTemplate);
+        verify(notifyProducer).sendNotifyTemplateRefreshMessage();
+    }
+
+    @Test
+    public void testUpdateNotifyTemplate_notExists() {
+        // 准备参数
+        NotifyTemplateUpdateReqVO reqVO = randomPojo(NotifyTemplateUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> notifyTemplateService.updateNotifyTemplate(reqVO), NOTIFY_TEMPLATE_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteNotifyTemplate_success() {
+        // mock 数据
+        NotifyTemplateDO dbNotifyTemplate = randomPojo(NotifyTemplateDO.class);
+        notifyTemplateMapper.insert(dbNotifyTemplate);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbNotifyTemplate.getId();
+
+        // 调用
+        notifyTemplateService.deleteNotifyTemplate(id);
+       // 校验数据不存在了
+       assertNull(notifyTemplateMapper.selectById(id));
+       verify(notifyProducer).sendNotifyTemplateRefreshMessage();
+    }
+
+    @Test
+    public void testDeleteNotifyTemplate_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> notifyTemplateService.deleteNotifyTemplate(id), NOTIFY_TEMPLATE_NOT_EXISTS);
+    }
+
+    @Test
+    public void testGetNotifyTemplatePage() {
+       // mock 数据
+       NotifyTemplateDO dbNotifyTemplate = randomPojo(NotifyTemplateDO.class, o -> { // 等会查询到
+           o.setName("芋头");
+           o.setCode("test_01");
+           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+           o.setCreateTime(buildTime(2022, 2, 3));
+       });
+       notifyTemplateMapper.insert(dbNotifyTemplate);
+       // 测试 name 不匹配
+       notifyTemplateMapper.insert(cloneIgnoreId(dbNotifyTemplate, o -> o.setName("投")));
+       // 测试 code 不匹配
+       notifyTemplateMapper.insert(cloneIgnoreId(dbNotifyTemplate, o -> o.setCode("test_02")));
+       // 测试 status 不匹配
+       notifyTemplateMapper.insert(cloneIgnoreId(dbNotifyTemplate, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+       // 测试 createTime 不匹配
+       notifyTemplateMapper.insert(cloneIgnoreId(dbNotifyTemplate, o -> o.setCreateTime(buildTime(2022, 1, 5))));
+       // 准备参数
+       NotifyTemplatePageReqVO reqVO = new NotifyTemplatePageReqVO();
+       reqVO.setName("芋");
+       reqVO.setCode("est_01");
+       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+       reqVO.setCreateTime(buildBetweenTime(2022, 2, 1, 2022, 2, 5));
+
+       // 调用
+       PageResult<NotifyTemplateDO> pageResult = notifyTemplateService.getNotifyTemplatePage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbNotifyTemplate, pageResult.getList().get(0));
+    }
+
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
index 1fb4cbaf9c..1be69f28ba 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
@@ -28,3 +28,5 @@ DELETE FROM "system_oauth2_code";
 DELETE FROM "system_mail_account";
 DELETE FROM "system_mail_template";
 DELETE FROM "system_mail_log";
+DELETE FROM "system_notify_template";
+DELETE FROM "system_notify_message";
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
index 1a2c41b738..bf135f39e5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
@@ -626,3 +626,43 @@ CREATE TABLE IF NOT EXISTS "system_mail_log" (
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
 ) COMMENT '邮件日志表';
+
+-- 将该建表 SQL 语句，添加到 yudao-module-system-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "system_notify_template" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "name" varchar NOT NULL,
+    "code" varchar NOT NULL,
+    "nickname" varchar NOT NULL,
+    "content" varchar NOT NULL,
+    "type" varchar NOT NULL,
+    "params" varchar,
+    "status" varchar NOT NULL,
+    "remark" varchar,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    PRIMARY KEY ("id")
+) COMMENT '站内信模板表';
+
+CREATE TABLE IF NOT EXISTS "system_notify_message" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "user_id" bigint NOT NULL,
+    "user_type" varchar NOT NULL,
+    "template_id" bigint NOT NULL,
+    "template_code" varchar NOT NULL,
+    "template_nickname" varchar NOT NULL,
+    "template_content" varchar NOT NULL,
+    "template_type" int NOT NULL,
+    "template_params" varchar NOT NULL,
+    "read_status" bit NOT NULL,
+    "read_time" varchar,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint not null default  '0',
+    PRIMARY KEY ("id")
+) COMMENT '站内信消息表';
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index e1bcb137e8..c443218aa5 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -115,6 +115,7 @@ yudao:
       - cn.iocoder.yudao.module.member.enums.ErrorCodeConstants
       - cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants
       - cn.iocoder.yudao.module.system.enums.ErrorCodeConstants
+      - cn.iocoder.yudao.module.mp.enums.ErrorCodeConstants
   tenant: # 多租户相关配置项
     enable: true
     ignore-urls:
@@ -141,6 +142,7 @@ yudao:
       - system_mail_account
       - system_mail_template
       - system_mail_log
+      - system_notify_template
       - infra_codegen_column
       - infra_codegen_table
       - infra_test_demo
diff --git a/yudao-ui-admin/src/api/system/notify/message.js b/yudao-ui-admin/src/api/system/notify/message.js
new file mode 100644
index 0000000000..0fdf4717d9
--- /dev/null
+++ b/yudao-ui-admin/src/api/system/notify/message.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获得我的站内信分页
+export function getNotifyMessagePage(query) {
+  return request({
+    url: '/system/notify-message/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得我的站内信分页
+export function getMyNotifyMessagePage(query) {
+  return request({
+    url: '/system/notify-message/my-page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 批量标记已读
+export function updateNotifyMessageRead(ids) {
+  return request({
+    url: '/system/notify-message/update-read?' + qs.stringify({ids: ids}, { indices: false }),
+    method: 'put'
+  })
+}
+
+// 标记所有站内信为已读
+export function updateAllNotifyMessageRead() {
+  return request({
+    url: '/system/notify-message/update-all-read',
+    method: 'put'
+  })
+}
+
+// 获取当前用户的最新站内信列表
+export function getUnreadNotifyMessageList() {
+  return request({
+    url: '/system/notify-message/get-unread-list',
+    method: 'get'
+  })
+}
+
+export function getUnreadNotifyMessageCount() {
+  return request({
+    url: '/system/notify-message/get-unread-count',
+    method: 'get'
+  })
+}
diff --git a/yudao-ui-admin/src/api/system/notify/myNotify.js b/yudao-ui-admin/src/api/system/notify/myNotify.js
deleted file mode 100644
index cd37fd8988..0000000000
--- a/yudao-ui-admin/src/api/system/notify/myNotify.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import request from '@/utils/request'
-
-
-// 获得我的站内信分页
-export function getNotifyMessagePage(query) {
-  return request({
-    url: '/system/notify-message/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得单条我的站内信
-export function getNotifyMessage(query) {
-  return request({
-    url: '/system/notify-message/get',
-    method: 'get',
-    params: query
-  })
-}
-
-// 批量标记已读
-export function updateNotifyMessageListRead(data) {
-  return request({
-    url: '/system/notify-message/update-list-read',
-    method: 'put',
-    data: data
-  })
-}
-
-// 所有未读消息标记已读
-export function updateNotifyMessageAllRead(data) {
-  return request({
-    url: '/system/notify-message/update-all-read',
-    method: 'put',
-    data: data
-  })
-}
diff --git a/yudao-ui-admin/src/api/system/notify/notifyLog.js b/yudao-ui-admin/src/api/system/notify/notifyLog.js
deleted file mode 100644
index de9e9f1ad3..0000000000
--- a/yudao-ui-admin/src/api/system/notify/notifyLog.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import request from '@/utils/request'
-
-
-// 获得我的站内信分页
-export function getNotifyLogPage(query) {
-  return request({
-    url: '/system/notify-log/page',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/yudao-ui-admin/src/api/system/notify/notifyTemplate.js b/yudao-ui-admin/src/api/system/notify/template.js
similarity index 100%
rename from yudao-ui-admin/src/api/system/notify/notifyTemplate.js
rename to yudao-ui-admin/src/api/system/notify/template.js
diff --git a/yudao-ui-admin/src/components/RuoYi/Doc/index.vue b/yudao-ui-admin/src/components/RuoYi/Doc/index.vue
index 92ee3776c0..af9155b7d4 100644
--- a/yudao-ui-admin/src/components/RuoYi/Doc/index.vue
+++ b/yudao-ui-admin/src/components/RuoYi/Doc/index.vue
@@ -9,7 +9,7 @@ export default {
   name: 'YudaoDoc',
   data() {
     return {
-      url: 'http://www.iocoder.cn/Yudao/build-debugger-environment/?yudao'
+      url: 'https://doc.iocoder.cn/'
     }
   },
   methods: {
diff --git a/yudao-ui-admin/src/layout/components/Message/index.vue b/yudao-ui-admin/src/layout/components/Message/index.vue
new file mode 100644
index 0000000000..1d40b8caab
--- /dev/null
+++ b/yudao-ui-admin/src/layout/components/Message/index.vue
@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-popover placement="bottom" width="600" trigger="click">
+      <!-- icon 展示 -->
+      <el-badge slot="reference" :is-dot="unreadCount > 0" type="danger">
+         <svg-icon icon-class="message" @click="getList"/>
+      </el-badge>
+
+      <!-- 弹出列表 -->
+      <el-table v-loading="loading" :data="list">
+        <el-table-column width="120" property="templateNickname" label="日期" />
+        <el-table-column width="180" property="title" label="发送时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" align="center" prop="templateType" width="100">
+          <template v-slot="scope">
+            <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
+          </template>
+        </el-table-column>
+        <el-table-column property="templateContent" label="内容" />
+      </el-table>
+
+      <!-- 更多 -->
+      <div style="text-align: right; margin-top: 10px">
+        <el-button type="primary" size="mini" @click="goMyList">查看全部</el-button>
+      </div>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import {getUnreadNotifyMessageCount, getUnreadNotifyMessageList} from "@/api/system/notify/message";
+
+export default {
+  name: 'NotifyMessage',
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 列表
+      list: [],
+      // 未读数量,
+      unreadCount: 0,
+    }
+  },
+  created() {
+    // 首次加载小红点
+    this.getUnreadCount()
+    // 轮询刷新小红点
+    window.timer = setInterval(()=>{
+      this.getUnreadCount()
+    },1000 * 60 * 2)
+  },
+  methods: {
+    getList: function() {
+      this.loading = true;
+      getUnreadNotifyMessageList().then(response => {
+        this.list = response.data;
+        this.loading = false;
+        // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
+        this.unreadCount = 0
+      });
+    },
+    getUnreadCount: function() {
+      getUnreadNotifyMessageCount().then(response => {
+        this.unreadCount = response.data;
+      })
+    },
+    goMyList: function() {
+      this.$router.push({
+        name: 'MyNotifyMessage'
+      });
+    }
+  }
+}
+</script>
+<style>
+.el-badge__content.is-fixed {
+  top: 10px; /* 保证徽章的位置 */
+}
+</style>
diff --git a/yudao-ui-admin/src/layout/components/Navbar.vue b/yudao-ui-admin/src/layout/components/Navbar.vue
index fbc2e75797..2bec4f399a 100644
--- a/yudao-ui-admin/src/layout/components/Navbar.vue
+++ b/yudao-ui-admin/src/layout/components/Navbar.vue
@@ -9,6 +9,9 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
+        <!-- 站内信 -->
+        <notify-message class="right-menu-item hover-effect" />
+
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
@@ -57,6 +60,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import NotifyMessage from '@/layout/components/Message'
 import {getPath} from "@/utils/ruoyi";
 
 export default {
@@ -68,7 +72,8 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc
+    RuoYiDoc,
+    NotifyMessage
   },
   computed: {
     ...mapGetters([
diff --git a/yudao-ui-admin/src/router/index.js b/yudao-ui-admin/src/router/index.js
index be6fabaf2a..90d5e3b539 100644
--- a/yudao-ui-admin/src/router/index.js
+++ b/yudao-ui-admin/src/router/index.js
@@ -75,7 +75,8 @@ export const constantRoutes = [
         meta: {title: '首页', icon: 'dashboard', affix: true}
       }
     ]
-  }, {
+  },
+  {
     path: '/user',
     component: Layout,
     hidden: true,
@@ -85,9 +86,14 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
         name: 'Profile',
         meta: {title: '个人中心', icon: 'user'}
-      }
-    ]
-  }, {
+      }, {
+        path: 'notify-message',
+        component: (resolve) => require(['@/views/system/notify/my/index'], resolve),
+        name: 'MyNotifyMessage',
+        meta: { title: '我的站内信', icon: 'message' },
+    }]
+  },
+  {
     path: '/dict',
     component: Layout,
     hidden: true,
@@ -98,18 +104,8 @@ export const constantRoutes = [
         meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'}
       }
     ]
-  }, {
-    path: '/property',
-    component: Layout,
-    hidden: true,
-    children: [{
-        path: 'value/:propertyId(\\d+)',
-        component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
-        name: 'PropertyValue',
-        meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'}
-      }
-    ]
-  }, {
+  },
+  {
     path: '/job',
     component: Layout,
     hidden: true,
@@ -131,24 +127,8 @@ export const constantRoutes = [
         meta: {title: '修改生成配置', activeMenu: '/infra/codegen'}
       }
     ]
-  }, {
-    path: '/spu',
-    component: Layout,
-    hidden: true,
-    children: [{
-        path: 'edit/:spuId(\\d+)',
-        component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-        name: 'SpuEdit',
-        meta: {title: '修改商品', activeMenu: '/product/spu'}
-      },
-      {
-        path: 'add',
-        component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
-        name: 'SpuAdd',
-        meta: {title: '添加商品', activeMenu: '/product/spu'}
-      }
-    ]
-  }, {
+  },
+  {
     path: '/bpm',
     component: Layout,
     hidden: true,
@@ -165,7 +145,8 @@ export const constantRoutes = [
         meta: {title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave'}
       }
     ]
-  }, {
+  },
+  {
     path: '/bpm',
     component: Layout,
     hidden: true,
@@ -197,6 +178,36 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/property',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: 'value/:propertyId(\\d+)',
+      component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
+      name: 'PropertyValue',
+      meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'}
+    }
+    ]
+  },
+  {
+    path: '/spu',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: 'edit/:spuId(\\d+)',
+      component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
+      name: 'SpuEdit',
+      meta: {title: '修改商品', activeMenu: '/product/spu'}
+    },
+      {
+        path: 'add',
+        component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
+        name: 'SpuAdd',
+        meta: {title: '添加商品', activeMenu: '/product/spu'}
+      }
+    ]
+  },
   {
     path: '/trade/order',
     component: Layout,
diff --git a/yudao-ui-admin/src/utils/dict.js b/yudao-ui-admin/src/utils/dict.js
index fc83af5b31..3da6bd68af 100644
--- a/yudao-ui-admin/src/utils/dict.js
+++ b/yudao-ui-admin/src/utils/dict.js
@@ -25,8 +25,8 @@ export const DICT_TYPE = {
   SYSTEM_SMS_RECEIVE_STATUS: 'system_sms_receive_status',
   SYSTEM_ERROR_CODE_TYPE: 'system_error_code_type',
   SYSTEM_OAUTH2_GRANT_TYPE: 'system_oauth2_grant_type',
-  SYSTEM_NOTIFY_READ_STATUS: "system_notify_read_status",
   SYSTEM_MAIL_SEND_STATUS: 'system_mail_send_status',
+  SYSTEM_NOTIFY_TEMPLATE_TYPE: 'system_notify_template_type',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING: 'infra_boolean_string',
diff --git a/yudao-ui-admin/src/views/system/mail/log/index.vue b/yudao-ui-admin/src/views/system/mail/log/index.vue
index d0b0b34276..fca363bfba 100755
--- a/yudao-ui-admin/src/views/system/mail/log/index.vue
+++ b/yudao-ui-admin/src/views/system/mail/log/index.vue
@@ -140,7 +140,7 @@ export default {
       // 邮件日志列表
       list: [],
       // 弹出层标题
-      title: "",
+      title: "邮件发送日志详细",
       // 是否显示弹出层
       open: false,
       // 查询参数
diff --git a/yudao-ui-admin/src/views/system/notify/message/index.vue b/yudao-ui-admin/src/views/system/notify/message/index.vue
new file mode 100644
index 0000000000..ed326252ec
--- /dev/null
+++ b/yudao-ui-admin/src/views/system/notify/message/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户编号" prop="userId">
+        <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.USER_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板编码" prop="templateCode">
+        <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模版类型" prop="templateType">
+        <el-select v-model="queryParams.templateType" placeholder="请选择模版类型" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="用户类型" align="center" prop="userType">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="模板编码" align="center" prop="templateCode" />
+      <el-table-column label="发送人名称" align="center" prop="templateNickname" />
+      <el-table-column label="模版内容" align="center" prop="templateContent" />
+      <el-table-column label="模版类型" align="center" prop="templateType">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否已读" align="center" prop="readStatus">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="阅读时间" align="center" prop="readTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.readTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+                     v-hasPermi="['system:notify-message:query']">详细</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 站内信详细-->
+    <el-dialog :title="title" :visible.sync="open" width="700px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" label-width="160px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="日志主键：">{{ form.id }}</el-form-item>
+            <el-form-item label="发送时间：">{{ parseTime(form.createTime) }}</el-form-item>
+            <el-form-item label="用户编号：">{{ form.userId }}</el-form-item>
+            <el-form-item label="用户类型：">
+              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="form.userType"/>
+            </el-form-item>
+            <el-form-item label="模板编号：">{{ form.templateId }}</el-form-item>
+            <el-form-item label="模板编码：">{{ form.templateCode }}</el-form-item>
+            <el-form-item label="模板类型：">
+              <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="form.templateType" />
+            </el-form-item>
+            <el-form-item label="模版发送人名称：">{{ form.templateNickname }}</el-form-item>
+            <el-form-item label="邮件内容：">{{ form.templateContent }}</el-form-item>
+            <el-form-item label="模版参数：">{{ form.templateParams }}</el-form-item>
+            <el-form-item label="是否已读：">
+              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="form.readStatus" />
+            </el-form-item>
+            <el-form-item label="阅读时间：">{{ parseTime(form.readTime) }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getNotifyMessagePage } from "@/api/system/notify/message";
+
+export default {
+  name: "NotifyMessage",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 站内信消息列表
+      list: [],
+      // 弹出层标题
+      title: "站内信详细",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        userId: null,
+        userType: null,
+        templateCode: null,
+        templateType: null,
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyMessagePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.open = true;
+      this.form = row;
+    }
+  }
+};
+</script>
diff --git a/yudao-ui-admin/src/views/system/notify/myNotify.vue b/yudao-ui-admin/src/views/system/notify/my/index.vue
similarity index 67%
rename from yudao-ui-admin/src/views/system/notify/myNotify.vue
rename to yudao-ui-admin/src/views/system/notify/my/index.vue
index 1c8a1b58a9..0c9ba433f4 100644
--- a/yudao-ui-admin/src/views/system/notify/myNotify.vue
+++ b/yudao-ui-admin/src/views/system/notify/my/index.vue
@@ -1,17 +1,14 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-      <el-form-item label="模板标题" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="读取状态" prop="readStatus">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="是否已读" prop="readStatus">
         <el-select v-model="queryParams.readStatus" placeholder="请选择状态" clearable>
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item label="发送时间" prop="createTime">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
@@ -35,17 +32,21 @@
     <!-- 列表 -->
     <el-table v-loading="loading" ref="tables" :data="list">
       <el-table-column type="selection" width="55" />
-      <el-table-column label="模板标题" align="center" prop="title" />
-      <el-table-column label="模板内容" align="center" prop="content" width="300" />
-      <el-table-column label="发送人" align="center" prop="sendUserName" />
-      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+      <el-table-column label="发送人" align="center" prop="templateNickname" width="120" />
+      <el-table-column label="发送时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sendTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="读取状态" align="center" prop="readStatus">
+      <el-table-column label="类型" align="center" prop="templateType" width="80">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.templateType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="内容" align="center" prop="templateContent" />
+      <el-table-column label="是否已读" align="center" prop="readStatus" width="80">
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS" :value="scope.row.readStatus"/>
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
@@ -62,7 +63,7 @@
 </template>
 
 <script>
-import { getNotifyMessagePage, updateNotifyMessageListRead, updateNotifyMessageAllRead} from "@/api/system/notify/myNotify";
+import {getMyNotifyMessagePage, updateAllNotifyMessageRead, updateNotifyMessageRead} from "@/api/system/notify/message";
 
 export default {
   name: "myNotify",
@@ -70,25 +71,17 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
       // 我的站内信列表
       list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         readStatus: null,
-        code: null,
-        title: null,
         createTime: []
       },
     };
@@ -101,7 +94,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getNotifyMessagePage(this.queryParams).then(response => {
+      getMyNotifyMessagePage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -117,25 +110,26 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    handleUpdateList(){
+    handleUpdateList() {
       let list = this.$refs["tables"].selection;
-      if(list.length != 0){
-        this.handleUpdate(list.map(v=>v.id))
+      if (list.length === 0) {
+        return;
       }
+      this.handleUpdate(list.map(v => v.id))
     },
-    handleUpdateSingle(row){
+    handleUpdateSingle(row) {
       this.handleUpdate([row.id])
     },
-    handleUpdate(ids){
-      updateNotifyMessageListRead(ids).then(response => {
-        this.$modal.msgSuccess("修改成功");
-            this.getList();
+    handleUpdate(ids) {
+      updateNotifyMessageRead(ids).then(response => {
+        this.$modal.msgSuccess("标记已读成功！");
+        this.getList();
       });
     },
     handleUpdateAll(){
-      updateNotifyMessageAllRead().then(response => {
-        this.$modal.msgSuccess("修改成功");
-            this.getList();
+      updateAllNotifyMessageRead().then(response => {
+        this.$modal.msgSuccess("全部已读成功！");
+        this.getList();
       });
     }
   }
diff --git a/yudao-ui-admin/src/views/system/notify/notifyLog.vue b/yudao-ui-admin/src/views/system/notify/notifyLog.vue
deleted file mode 100644
index 7e9eb5610c..0000000000
--- a/yudao-ui-admin/src/views/system/notify/notifyLog.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-      <el-form-item label="模板编码" prop="templateCode">
-        <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="模板标题" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="发送时间" prop="sendTime">
-        <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:notify-log:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="模板编码" align="center" prop="templateCode" />
-      <el-table-column label="模板标题" align="center" prop="title" />
-      <el-table-column label="模板内容" align="center" prop="content" width="300" />
-      <el-table-column label="阅读状态" align="center" prop="readStatus">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS" :value="scope.row.readStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="接收人" align="center" prop="receiveUserName" />
-      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sendTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="阅读时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.readTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-  </div>
-</template>
-
-<script>
-import { getNotifyLogPage} from "@/api/system/notify/notifyLog";
-
-export default {
-  name: "notifyLog",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 我的站内信列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        templateCode: null,
-        title: null,
-        sendTime: []
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getNotifyLogPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/yudao-ui-admin/src/views/system/notify/notifyTemplate.vue b/yudao-ui-admin/src/views/system/notify/template/index.vue
similarity index 82%
rename from yudao-ui-admin/src/views/system/notify/notifyTemplate.vue
rename to yudao-ui-admin/src/views/system/notify/template/index.vue
index 9fa396839c..8e415c8583 100644
--- a/yudao-ui-admin/src/views/system/notify/notifyTemplate.vue
+++ b/yudao-ui-admin/src/views/system/notify/template/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-      <el-form-item label="模板编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模板名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入模板名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="模板标题" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="模版编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入模版编码" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="开启状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
@@ -30,17 +30,19 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                    v-hasPermi="['system:notify-template:create']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:notify-template:export']">导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="模板编码" align="center" prop="code" />
-      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板名称" align="center" prop="name" />
+      <el-table-column label="类型" align="center" prop="type">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="发送人名称" align="center" prop="nickname" />
       <el-table-column label="模板内容" align="center" prop="content" width="300" />
       <el-table-column label="开启状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -74,12 +76,21 @@
         <el-form-item label="模板编号" prop="code">
           <el-input v-model="form.code" placeholder="请输入模板编号" />
         </el-form-item>
-        <el-form-item label="模板标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题名称" />
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入模版名称" />
+        </el-form-item>
+        <el-form-item label="发件人名称" prop="nickname">
+          <el-input v-model="form.nickname" placeholder="请输入发件人名称" />
         </el-form-item>
         <el-form-item label="模板内容" prop="content">
           <el-input type="textarea" v-model="form.content" placeholder="请输入模板内容" />
         </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="开启状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
@@ -122,8 +133,9 @@
 
 <script>
 import { createNotifyTemplate, updateNotifyTemplate, deleteNotifyTemplate, getNotifyTemplate, getNotifyTemplatePage,
-  exportNotifyTemplateExcel, sendNotify } from "@/api/system/notify/notifyTemplate";
+  sendNotify } from "@/api/system/notify/template";
 import {listSimpleUsers} from "@/api/system/user";
+import {CommonStatusEnum} from "@/utils/constants";
 
 export default {
   name: "NotifyTemplate",
@@ -131,8 +143,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -156,11 +166,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
-        code: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
-        title: [{ required: true, message: "模板标题不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "模板内容不能为空", trigger: "blur" }],
-        userId: [{ required: true, message: "接收人不能为空", trigger: "blur" }]
+        name: [{ required: true, message: "模板名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "模版编码不能为空", trigger: "blur" }],
+        nickname: [{ required: true, message: "发件人名称不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "模版内容不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
       },
       // 用户列表
       users: [],
@@ -170,8 +181,8 @@ export default {
         params: [], // 模板的参数列表
       },
       sendNotifyRules: {
-        mobile: [{ required: true, message: "手机不能为空", trigger: "blur" }],
-        templateCode: [{ required: true, message: "手机不能为空", trigger: "blur" }],
+        userId: [{ required: true, message: "接收人不能为空", trigger: "blur" }],
+        templateCode: [{ required: true, message: "模版编号不能为空", trigger: "blur" }],
         templateParams: { }
       }
     };
@@ -203,10 +214,13 @@ export default {
     reset() {
       this.form = {
         id: undefined,
-        status: undefined,
+        name: undefined,
         code: undefined,
-        title: undefined,
+        nickname: undefined,
         content: undefined,
+        type: undefined,
+        params: undefined,
+        status: CommonStatusEnum.ENABLE,
         remark: undefined,
       };
       this.resetForm("form");
@@ -270,21 +284,6 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有站内信模板数据项?', "警告").then(() => {
-        this.exportLoading = true;
-        return exportNotifyTemplateExcel(params);
-      }).then(response => {
-        this.$download.excel(response, '短信模板.xls');
-        this.exportLoading = false;
-      }).catch(() => {});
-    },
     /** 发送站内信按钮 */
     handleSendNotify(row) {
       this.resetSendNotify(row);

From 1943e71e3fb418ef0c496151e837ecc69f263f46 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 28 Jan 2023 22:59:01 +0800
Subject: [PATCH 55/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A=E5=AE=8C=E5=96=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/notify/NotifyMessageSendApi.java      |  8 ++---
 .../api/notify/NotifyMessageSendApiImpl.java  | 32 ++++++++-----------
 .../dal/mysql/notify/NotifyMessageMapper.java |  2 +-
 .../src/layout/components/Message/index.vue   |  2 +-
 .../src/views/system/notify/message/index.vue |  2 +-
 .../src/views/system/notify/my/index.vue      |  2 ++
 .../views/system/notify/template/index.vue    | 10 +++---
 .../src/views/system/oauth2/client/index.vue  |  1 +
 .../src/views/system/oauth2/token/index.vue   |  2 ++
 9 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
index b5885e7ef9..facedfadea 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java
@@ -13,21 +13,17 @@ public interface NotifyMessageSendApi {
 
     /**
      * 发送单条站内信给 Admin 用户
-     * <p>
-     * 在 mobile 为空时，使用 userId 加载对应 Admin 的手机号
      *
      * @param reqDTO 发送请求
-     * @return 发送消息ID
+     * @return 发送消息 ID
      */
     Long sendSingleMessageToAdmin(@Valid NotifySendSingleToUserReqDTO reqDTO);
 
     /**
      * 发送单条站内信给 Member 用户
-     * <p>
-     * 在 mobile 为空时，使用 userId 加载对应 Member 的手机号
      *
      * @param reqDTO 发送请求
-     * @return 发送消息ID
+     * @return 发送消息 ID
      */
     Long sendSingleMessageToMember(@Valid NotifySendSingleToUserReqDTO reqDTO);
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java
index 6861ff8c5e..fc5ba1d122 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApiImpl.java
@@ -1,39 +1,33 @@
 package cn.iocoder.yudao.module.system.api.notify;
 
 import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService;
+import cn.iocoder.yudao.module.system.service.notify.NotifySendService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
- * 站内信发送 API 接口
+ * 站内信发送 API 实现类
  *
  * @author xrcoder
  */
 @Service
 public class NotifyMessageSendApiImpl implements NotifyMessageSendApi {
 
-    /**
-     * 发送单条站内信给 Admin 用户
-     * <p>
-     * 在 mobile 为空时，使用 userId 加载对应 Admin 的手机号
-     *
-     * @param reqDTO 发送请求
-     * @return 发送消息ID
-     */
+    @Resource
+    private NotifySendService notifySendService;
+
     @Override
     public Long sendSingleMessageToAdmin(NotifySendSingleToUserReqDTO reqDTO) {
-        return null;
+        return notifySendService.sendSingleNotifyToAdmin(reqDTO.getUserId(),
+                reqDTO.getTemplateCode(), reqDTO.getTemplateParams());
     }
 
-    /**
-     * 发送单条站内信给 Member 用户
-     * <p>
-     * 在 mobile 为空时，使用 userId 加载对应 Member 的手机号
-     *
-     * @param reqDTO 发送请求
-     * @return 发送消息ID
-     */
     @Override
     public Long sendSingleMessageToMember(NotifySendSingleToUserReqDTO reqDTO) {
-        return null;
+        return notifySendService.sendSingleNotifyToMember(reqDTO.getUserId(),
+                reqDTO.getTemplateCode(), reqDTO.getTemplateParams());
     }
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
index 52e2c641e9..e9ce6d719b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java
@@ -28,7 +28,7 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
 
     default PageResult<NotifyMessageDO> selectPage(NotifyMessageMyPageReqVO reqVO, Long userId, Integer userType) {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
-                .eq(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
+                .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType)
diff --git a/yudao-ui-admin/src/layout/components/Message/index.vue b/yudao-ui-admin/src/layout/components/Message/index.vue
index 1d40b8caab..347242cbe8 100644
--- a/yudao-ui-admin/src/layout/components/Message/index.vue
+++ b/yudao-ui-admin/src/layout/components/Message/index.vue
@@ -8,7 +8,7 @@
 
       <!-- 弹出列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column width="120" property="templateNickname" label="日期" />
+        <el-table-column width="120" property="templateNickname" label="发送人" />
         <el-table-column width="180" property="title" label="发送时间">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
diff --git a/yudao-ui-admin/src/views/system/notify/message/index.vue b/yudao-ui-admin/src/views/system/notify/message/index.vue
index ed326252ec..0e354f931e 100644
--- a/yudao-ui-admin/src/views/system/notify/message/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/message/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-
+    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用户编号" prop="userId">
diff --git a/yudao-ui-admin/src/views/system/notify/my/index.vue b/yudao-ui-admin/src/views/system/notify/my/index.vue
index 0c9ba433f4..56a579bec4 100644
--- a/yudao-ui-admin/src/views/system/notify/my/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/my/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="是否已读" prop="readStatus">
diff --git a/yudao-ui-admin/src/views/system/notify/template/index.vue b/yudao-ui-admin/src/views/system/notify/template/index.vue
index 8e415c8583..0a9739590e 100644
--- a/yudao-ui-admin/src/views/system/notify/template/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/template/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="模板名称" prop="name">
@@ -58,7 +60,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-share" @click="handleSendNotify(scope.row)"
-                     v-hasPermi="['system:notify-template:send-notify']">发送</el-button>
+                     v-hasPermi="['system:notify-template:send-notify']">测试</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:notify-template:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -73,8 +75,8 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="模板编号" prop="code">
-          <el-input v-model="form.code" placeholder="请输入模板编号" />
+        <el-form-item label="模版编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入模版编码" />
         </el-form-item>
         <el-form-item label="模板名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入模版名称" />
@@ -182,7 +184,7 @@ export default {
       },
       sendNotifyRules: {
         userId: [{ required: true, message: "接收人不能为空", trigger: "blur" }],
-        templateCode: [{ required: true, message: "模版编号不能为空", trigger: "blur" }],
+        templateCode: [{ required: true, message: "模版编码不能为空", trigger: "blur" }],
         templateParams: { }
       }
     };
diff --git a/yudao-ui-admin/src/views/system/oauth2/client/index.vue b/yudao-ui-admin/src/views/system/oauth2/client/index.vue
index f4a6d4b8e8..fb7ce7c453 100755
--- a/yudao-ui-admin/src/views/system/oauth2/client/index.vue
+++ b/yudao-ui-admin/src/views/system/oauth2/client/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/yudao-ui-admin/src/views/system/oauth2/token/index.vue b/yudao-ui-admin/src/views/system/oauth2/token/index.vue
index 797904d4b4..e4b15495e2 100644
--- a/yudao-ui-admin/src/views/system/oauth2/token/index.vue
+++ b/yudao-ui-admin/src/views/system/oauth2/token/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
+    <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
     <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
       <el-form-item label="用户编号" prop="userId">

From cb0da2db6a2fcd32a3a331e1b680061e5a83925a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 28 Jan 2023 23:51:31 +0800
Subject: [PATCH 56/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9Avue3=20=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/mail/template/index.ts     |   4 +-
 .../src/api/system/notify/template/index.ts   |  55 ++++
 yudao-ui-admin-vue3/src/utils/dict.ts         |   1 +
 .../src/views/system/mail/template/index.vue  |   2 +-
 .../views/system/notify/template/index.vue    | 251 ++++++++++++++++++
 .../system/notify/template/template.data.ts   |  85 ++++++
 6 files changed, 395 insertions(+), 3 deletions(-)
 create mode 100644 yudao-ui-admin-vue3/src/api/system/notify/template/index.ts
 create mode 100644 yudao-ui-admin-vue3/src/views/system/notify/template/index.vue
 create mode 100644 yudao-ui-admin-vue3/src/views/system/notify/template/template.data.ts

diff --git a/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts b/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts
index a0a0faf2f8..c044ddd4e4 100644
--- a/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/mail/template/index.ts
@@ -21,7 +21,7 @@ export interface MailTemplatePageReqVO extends PageParam {
   createTime?: Date[]
 }
 
-export interface MailSmsReqVO {
+export interface MailSendReqVO {
   mail: string
   templateCode: string
   templateParams: Map<String, Object>
@@ -53,6 +53,6 @@ export const deleteMailTemplateApi = async (id: number) => {
 }
 
 // 发送邮件
-export const sendMailApi = (data: MailSmsReqVO) => {
+export const sendMailApi = (data: MailSendReqVO) => {
   return request.post({ url: '/system/mail-template/send-mail', data })
 }
diff --git a/yudao-ui-admin-vue3/src/api/system/notify/template/index.ts b/yudao-ui-admin-vue3/src/api/system/notify/template/index.ts
new file mode 100644
index 0000000000..66530a904a
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/api/system/notify/template/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface NotifyTemplateVO {
+  id: number
+  name: string
+  code: string
+  content: string
+  type: number
+  params: string
+  status: number
+  remark: string
+}
+
+export interface NotifyTemplatePageReqVO extends PageParam {
+  name?: string
+  code?: string
+  status?: number
+  createTime?: Date[]
+}
+
+export interface NotifySendReqVO {
+  userId: number
+  templateCode: string
+  templateParams: Map<String, Object>
+}
+
+// 查询站内信模板列表
+export const getNotifyTemplatePageApi = async (params: NotifyTemplatePageReqVO) => {
+  return await request.get({ url: '/system/notify-template/page', params })
+}
+
+// 查询站内信模板详情
+export const getNotifyTemplateApi = async (id: number) => {
+  return await request.get({ url: '/system/notify-template/get?id=' + id })
+}
+
+// 新增站内信模板
+export const createNotifyTemplateApi = async (data: NotifyTemplateVO) => {
+  return await request.post({ url: '/system/notify-template/create', data })
+}
+
+// 修改站内信模板
+export const updateNotifyTemplateApi = async (data: NotifyTemplateVO) => {
+  return await request.put({ url: '/system/notify-template/update', data })
+}
+
+// 删除站内信模板
+export const deleteNotifyTemplateApi = async (id: number) => {
+  return await request.delete({ url: '/system/notify-template/delete?id=' + id })
+}
+
+// 发送站内信
+export const sendNotifyApi = (data: NotifySendReqVO) => {
+  return request.post({ url: '/system/notify-template/send-notify', data })
+}
diff --git a/yudao-ui-admin-vue3/src/utils/dict.ts b/yudao-ui-admin-vue3/src/utils/dict.ts
index 176ddf92d4..b9dfa1601d 100644
--- a/yudao-ui-admin-vue3/src/utils/dict.ts
+++ b/yudao-ui-admin-vue3/src/utils/dict.ts
@@ -91,6 +91,7 @@ export enum DICT_TYPE {
   SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
   SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
   SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
+  SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',
diff --git a/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
index e7ddd23962..4532d6cc4e 100644
--- a/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
@@ -252,7 +252,7 @@ const handleSendMail = (row: any) => {
 }
 
 const sendTest = async () => {
-  const data: MailTemplateApi.MailSmsReqVO = {
+  const data: MailTemplateApi.MailSendReqVO = {
     mail: sendForm.value.mail,
     templateCode: sendForm.value.templateCode,
     templateParams: sendForm.value.templateParams as unknown as Map<string, Object>
diff --git a/yudao-ui-admin-vue3/src/views/system/notify/template/index.vue b/yudao-ui-admin-vue3/src/views/system/notify/template/index.vue
new file mode 100644
index 0000000000..d243518e0d
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/notify/template/index.vue
@@ -0,0 +1,251 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #toolbar_buttons>
+        <!-- 操作：新增 -->
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          :title="t('action.add')"
+          v-hasPermi="['system:notify-template:create']"
+          @click="handleCreate()"
+        />
+      </template>
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：测试站内信 -->
+        <XTextButton
+          preIcon="ep:cpu"
+          :title="t('action.test')"
+          v-hasPermi="['system:notify-template:send-notify']"
+          @click="handleSendNotify(row)"
+        />
+        <!-- 操作：修改 -->
+        <XTextButton
+          preIcon="ep:edit"
+          :title="t('action.edit')"
+          v-hasPermi="['system:notify-template:update']"
+          @click="handleUpdate(row.id)"
+        />
+        <!-- 操作：详情 -->
+        <XTextButton
+          preIcon="ep:view"
+          :title="t('action.detail')"
+          v-hasPermi="['system:notify-template:query']"
+          @click="handleDetail(row.id)"
+        />
+        <!-- 操作：删除 -->
+        <XTextButton
+          preIcon="ep:delete"
+          :title="t('action.del')"
+          v-hasPermi="['system:notify-template:delete']"
+          @click="deleteData(row.id)"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+
+  <!-- 添加/修改的弹窗 -->
+  <XModal id="templateModel" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：添加/修改 -->
+    <Form
+      ref="formRef"
+      v-if="['create', 'update'].includes(actionType)"
+      :schema="allSchemas.formSchema"
+      :rules="rules"
+    />
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
+        @click="submitForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+
+  <!-- 测试站内信的弹窗 -->
+  <XModal id="sendTest" v-model="sendVisible" title="测试">
+    <el-form :model="sendForm" :rules="sendRules" label-width="200px" label-position="top">
+      <el-form-item label="模板内容" prop="content">
+        <el-input type="textarea" v-model="sendForm.content" readonly />
+      </el-form-item>
+      <el-form-item label="接收人" prop="userId">
+        <el-select v-model="sendForm.userId" placeholder="请选择接收人">
+          <el-option
+            v-for="item in userOption"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-for="param in sendForm.params"
+        :key="param"
+        :label="'参数 {' + param + '}'"
+        :prop="'templateParams.' + param"
+      >
+        <el-input
+          v-model="sendForm.templateParams[param]"
+          :placeholder="'请输入 ' + param + ' 参数'"
+        />
+      </el-form-item>
+    </el-form>
+    <!-- 操作按钮 -->
+    <template #footer>
+      <XButton
+        type="primary"
+        :title="t('action.test')"
+        :loading="actionLoading"
+        @click="sendTest()"
+      />
+      <XButton :title="t('dialog.close')" @click="sendVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts" name="NotifyTemplate">
+import { FormExpose } from '@/components/Form'
+// 业务相关的 import
+import { rules, allSchemas } from './template.data'
+import * as NotifyTemplateApi from '@/api/system/notify/template'
+import { getListSimpleUsersApi, UserVO } from '@/api/system/user'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+// 列表相关的变量
+const [registerTable, { reload, deleteData }] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: NotifyTemplateApi.getNotifyTemplatePageApi,
+  deleteApi: NotifyTemplateApi.deleteNotifyTemplateApi
+})
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+}
+
+// 新增操作
+const handleCreate = () => {
+  setDialogTile('create')
+  modelLoading.value = false
+}
+
+// 修改操作
+const handleUpdate = async (rowId: number) => {
+  setDialogTile('update')
+  // 设置数据
+  const res = await NotifyTemplateApi.getNotifyTemplateApi(rowId)
+  unref(formRef)?.setValues(res)
+  modelLoading.value = false
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  setDialogTile('detail')
+  const res = await NotifyTemplateApi.getNotifyTemplateApi(rowId)
+  detailData.value = res
+  modelLoading.value = false
+}
+
+// 提交按钮
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as NotifyTemplateApi.NotifyTemplateVO
+        if (actionType.value === 'create') {
+          await NotifyTemplateApi.createNotifyTemplateApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await NotifyTemplateApi.updateNotifyTemplateApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        modelVisible.value = false
+      } finally {
+        actionLoading.value = false
+        // 刷新列表
+        await reload()
+      }
+    }
+  })
+}
+
+// ========== 测试相关 ==========
+const sendForm = ref({
+  content: '',
+  params: {},
+  userId: undefined,
+  templateCode: '',
+  templateParams: {}
+})
+const sendRules = ref({
+  userId: [{ required: true, message: '用户编号不能为空', trigger: 'blur' }],
+  templateCode: [{ required: true, message: '模版编号不能为空', trigger: 'blur' }],
+  templateParams: {}
+})
+const sendVisible = ref(false)
+const userOption = ref<UserVO[]>([])
+
+const handleSendNotify = (row: any) => {
+  sendForm.value.content = row.content
+  sendForm.value.params = row.params
+  sendForm.value.templateCode = row.code
+  sendForm.value.templateParams = row.params.reduce(function (obj, item) {
+    obj[item] = undefined
+    return obj
+  }, {})
+  sendRules.value.templateParams = row.params.reduce(function (obj, item) {
+    obj[item] = { required: true, message: '参数 ' + item + ' 不能为空', trigger: 'change' }
+    return obj
+  }, {})
+  sendVisible.value = true
+}
+
+const sendTest = async () => {
+  const data: NotifyTemplateApi.NotifySendReqVO = {
+    userId: sendForm.value.userId,
+    templateCode: sendForm.value.templateCode,
+    templateParams: sendForm.value.templateParams as unknown as Map<string, Object>
+  }
+  const res = await NotifyTemplateApi.sendNotifyApi(data)
+  if (res) {
+    message.success('提交发送成功！发送结果，见发送日志编号：' + res)
+  }
+  sendVisible.value = false
+}
+
+// ========== 初始化 ==========
+onMounted(() => {
+  getListSimpleUsersApi().then((data) => {
+    userOption.value = data
+  })
+})
+</script>
diff --git a/yudao-ui-admin-vue3/src/views/system/notify/template/template.data.ts b/yudao-ui-admin-vue3/src/views/system/notify/template/template.data.ts
new file mode 100644
index 0000000000..ae8c7b072b
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/notify/template/template.data.ts
@@ -0,0 +1,85 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+
+// 表单校验
+export const rules = reactive({
+  name: [required],
+  code: [required],
+  content: [required],
+  type: [required],
+  status: [required]
+})
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id',
+  primaryTitle: '编号',
+  primaryType: null,
+  action: true,
+  actionWidth: '260', // 3个按钮默认200，如有删减对应增减即可
+  columns: [
+    {
+      title: '模版编码',
+      field: 'code',
+      isSearch: true
+    },
+    {
+      title: '模板名称',
+      field: 'name',
+      isSearch: true
+    },
+    {
+      title: '发件人名称',
+      field: 'nickname'
+    },
+    {
+      title: '类型',
+      field: 'type',
+      dictType: DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE,
+      dictClass: 'number'
+    },
+    {
+      title: '模版内容',
+      field: 'content',
+      table: {
+        width: 300
+      },
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea',
+          rows: 4
+        },
+        colProps: {
+          span: 24
+        }
+      }
+    },
+    {
+      title: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.COMMON_STATUS,
+      dictClass: 'number',
+      isSearch: true
+    },
+    {
+      title: '备注',
+      field: 'remark'
+    },
+    {
+      title: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      formatter: 'formatDate',
+      search: {
+        show: true,
+        itemRender: {
+          name: 'XDataTimePicker'
+        }
+      },
+      table: {
+        width: 180
+      }
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

From 8cdae12b34faab9088f6c15fc0818fd578d7837a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Jan 2023 08:43:37 +0800
Subject: [PATCH 57/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9Avue3=20=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/notify/message/index.ts    |  33 ++++++
 .../src/views/system/notify/message/index.vue |  66 ++++++++++++
 .../system/notify/message/message.data.ts     | 101 ++++++++++++++++++
 3 files changed, 200 insertions(+)
 create mode 100644 yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
 create mode 100644 yudao-ui-admin-vue3/src/views/system/notify/message/index.vue
 create mode 100644 yudao-ui-admin-vue3/src/views/system/notify/message/message.data.ts

diff --git a/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts b/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
new file mode 100644
index 0000000000..92068b89df
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+
+export interface NotifyMessageVO {
+  id: number
+  userId: number
+  userType: number
+  templateId: number
+  templateCode: string
+  templateNickname: string
+  templateContent: string
+  templateType: number
+  templateParams: string
+  readStatus: boolean
+  readTime: Date
+}
+
+export interface NotifyMessagePageReqVO extends PageParam {
+  userId?: number
+  userType?: number
+  templateCode?: string
+  templateType?: number
+  createTime?: Date[]
+}
+
+// 查询站内信消息列表
+export const getNotifyMessagePageApi = async (params: NotifyMessagePageReqVO) => {
+  return await request.get({ url: '/system/notify-message/page', params })
+}
+
+// 查询站内信消息详情
+export const getNotifyMessageApi = async (id: number) => {
+  return await request.get({ url: '/system/notify-message/get?id=' + id })
+}
diff --git a/yudao-ui-admin-vue3/src/views/system/notify/message/index.vue b/yudao-ui-admin-vue3/src/views/system/notify/message/index.vue
new file mode 100644
index 0000000000..cb904d2700
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/notify/message/index.vue
@@ -0,0 +1,66 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：详情 -->
+        <XTextButton
+          preIcon="ep:view"
+          :title="t('action.detail')"
+          v-hasPermi="['system:notify-message:query']"
+          @click="handleDetail(row.id)"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+  <!-- 弹窗 -->
+  <XModal id="messageModel" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts" name="NotifyMessage">
+// 业务相关的 import
+import { allSchemas } from './message.data'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+
+const { t } = useI18n() // 国际化
+
+// 列表相关的变量
+const [registerTable] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: NotifyMessageApi.getNotifyMessagePageApi
+})
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const detailData = ref() // 详情 Ref
+
+// 设置标题
+const setDialogTile = (type: string) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+}
+
+// 详情操作
+const handleDetail = async (rowId: number) => {
+  setDialogTile('detail')
+  const res = await NotifyMessageApi.getNotifyMessageApi(rowId)
+  detailData.value = res
+  modelLoading.value = false
+}
+</script>
diff --git a/yudao-ui-admin-vue3/src/views/system/notify/message/message.data.ts b/yudao-ui-admin-vue3/src/views/system/notify/message/message.data.ts
new file mode 100644
index 0000000000..ff5eb315c4
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/notify/message/message.data.ts
@@ -0,0 +1,101 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id', // 默认的主键ID
+  primaryTitle: '编号', // 默认显示的值
+  primaryType: 'seq', // 默认为seq，序号模式
+  action: true,
+  actionWidth: '200', // 3个按钮默认200，如有删减对应增减即可
+  columns: [
+    {
+      title: '用户编号',
+      field: 'userId',
+      isSearch: true
+    },
+    {
+      title: '用户类型',
+      field: 'userType',
+      dictType: DICT_TYPE.USER_TYPE,
+      dictClass: 'string',
+      isSearch: true,
+      table: {
+        width: 80
+      }
+    },
+    {
+      title: '模版编号',
+      field: 'templateId'
+    },
+    {
+      title: '模板编码',
+      field: 'templateCode',
+      isSearch: true,
+      table: {
+        width: 80
+      }
+    },
+    {
+      title: '发送人名称',
+      field: 'templateNickname',
+      table: {
+        width: 120
+      }
+    },
+    {
+      title: '模版内容',
+      field: 'templateContent',
+      table: {
+        width: 200
+      }
+    },
+    {
+      title: '模版类型',
+      field: 'templateType',
+      dictType: DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE,
+      dictClass: 'number',
+      isSearch: true,
+      table: {
+        width: 80
+      }
+    },
+    {
+      title: '模版参数',
+      field: 'templateParams',
+      isTable: false
+    },
+    {
+      title: '是否已读',
+      field: 'readStatus',
+      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+      dictClass: 'boolean',
+      table: {
+        width: 80
+      }
+    },
+    {
+      title: '阅读时间',
+      field: 'readTime',
+      formatter: 'formatDate',
+      table: {
+        width: 180
+      }
+    },
+    {
+      title: '创建时间',
+      field: 'createTime',
+      isForm: false,
+      formatter: 'formatDate',
+      search: {
+        show: true,
+        itemRender: {
+          name: 'XDataTimePicker'
+        }
+      },
+      table: {
+        width: 180
+      }
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

From 91dd4a32b1aa7b93252ccbbce12bfaf652882b76 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Jan 2023 09:26:06 +0800
Subject: [PATCH 58/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9Avue3=20=E7=AB=99=E5=86=85=E4=BF=A1=E5=BC=B9?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/notify/message/index.ts    |  35 ++++++
 .../layout/components/Message/src/Message.vue | 105 +++++++++---------
 .../src/api/system/notify/message.js          |   1 +
 .../src/layout/components/Message/index.vue   |   4 +-
 4 files changed, 88 insertions(+), 57 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts b/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
index 92068b89df..d12ee35fa8 100644
--- a/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
@@ -31,3 +31,38 @@ export const getNotifyMessagePageApi = async (params: NotifyMessagePageReqVO) =>
 export const getNotifyMessageApi = async (id: number) => {
   return await request.get({ url: '/system/notify-message/get?id=' + id })
 }
+
+// 获得我的站内信分页
+// export function getMyNotifyMessagePage(query) {
+//   return request({
+//     url: '/system/notify-message/my-page',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// 批量标记已读
+// export function updateNotifyMessageRead(ids) {
+//   return request({
+//     url: '/system/notify-message/update-read?' + qs.stringify({ids: ids}, { indices: false }),
+//     method: 'put'
+//   })
+// }
+
+// 标记所有站内信为已读
+// export function updateAllNotifyMessageRead() {
+//   return request({
+//     url: '/system/notify-message/update-all-read',
+//     method: 'put'
+//   })
+// }
+
+// 获取当前用户的最新站内信列表
+export const getUnreadNotifyMessageListApi = async () => {
+  return await request.get({ url: '/system/notify-message/get-unread-list' })
+}
+
+// 获得当前用户的未读站内信数量
+export const getUnreadNotifyMessageCountApi = async () => {
+  return await request.get({ url: '/system/notify-message/get-unread-count' })
+}
diff --git a/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue b/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue
index ba21cfdcee..acef9ac950 100644
--- a/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue
@@ -1,77 +1,72 @@
 <script setup lang="ts">
-const activeName = ref('notice')
+import dayjs from 'dayjs'
+import * as NotifyMessageApi from '@/api/system/notify/message'
 
-const noticeList = ref([
-  { id: 1, title: '版本升级1', date: '2022-12-12 10:00:00' },
-  { id: 2, title: '版本升级2', date: '2022-12-12 10:00:00' },
-  { id: 3, title: '版本升级3', date: '2022-12-12 10:00:00' },
-  { id: 4, title: '版本升级4', date: '2022-12-12 10:00:00' },
-  { id: 5, title: '版本升级5', date: '2022-12-12 10:00:00' }
-])
-const messageList = ref([
-  { id: 1, title: '加班1', date: '2022-12-12 10:00:00' },
-  { id: 2, title: '加班2', date: '2022-12-12 10:00:00' },
-  { id: 3, title: '加班3', date: '2022-12-12 10:00:00' },
-  { id: 4, title: '加班4', date: '2022-12-12 10:00:00' },
-  { id: 5, title: '加班5', date: '2022-12-12 10:00:00' }
-])
-const needList = ref([
-  { id: 1, title: '审批1', date: '2022-12-12 10:00:00' },
-  { id: 2, title: '审批2', date: '2022-12-12 10:00:00' },
-  { id: 3, title: '审批3', date: '2022-12-12 10:00:00' },
-  { id: 4, title: '审批4', date: '2022-12-12 10:00:00' },
-  { id: 5, title: '审批5', date: '2022-12-12 10:00:00' }
-])
+const { push } = useRouter()
+const activeName = ref('notice')
+const count = ref(0) // 未读消息数量
+const list = ref([]) // 消息列表
+
+// 获得消息列表
+const getList = async () => {
+  list.value = await NotifyMessageApi.getUnreadNotifyMessageListApi()
+}
+
+// 获得未读消息数
+const getUnreadCount = async () => {
+  NotifyMessageApi.getUnreadNotifyMessageCountApi().then((data) => {
+    count.value = data
+  })
+}
+
+// 跳转我的站内信
+const goMyList = () => {
+  push({
+    name: 'MyNotifyMessage'
+  })
+}
+
+// ========== 初始化 =========
+onMounted(() => {
+  // 首次加载小红点
+  getUnreadCount()
+  // 轮询刷新小红点
+  setInterval(() => {
+    getUnreadCount()
+  }, 1000 * 60 * 2)
+})
 </script>
 <template>
   <div class="message">
-    <ElPopover placement="bottom" :width="310" trigger="click">
+    <ElPopover placement="bottom" :width="400" trigger="click">
       <template #reference>
-        <ElBadge :value="noticeList.length" class="item">
-          <Icon icon="ep:bell" :size="18" class="cursor-pointer" />
+        <ElBadge :is-dot="count > 0" class="item">
+          <Icon icon="ep:bell" :size="18" class="cursor-pointer" @click="getList" />
         </ElBadge>
       </template>
       <ElTabs v-model="activeName">
-        <ElTabPane label="通知(5)" name="notice">
+        <ElTabPane label="我的站内信" name="notice">
           <div class="message-list">
-            <template v-for="item in noticeList" :key="item.id">
+            <template v-for="item in list" :key="item.id">
               <div class="message-item">
                 <img src="@/assets/imgs/avatar.gif" alt="" class="message-icon" />
                 <div class="message-content">
-                  <span class="message-title">{{ item.title }}</span>
-                  <span class="message-date">{{ item.date }}</span>
-                </div>
-              </div>
-            </template>
-          </div>
-        </ElTabPane>
-        <ElTabPane label="消息(0)" name="message">
-          <div class="message-list">
-            <template v-for="item in messageList" :key="item.id">
-              <div class="message-item">
-                <img src="@/assets/imgs/avatar.gif" alt="" class="message-icon" />
-                <div class="message-content">
-                  <span class="message-title">{{ item.title }}</span>
-                  <span class="message-date">{{ item.date }}</span>
-                </div>
-              </div>
-            </template>
-          </div>
-        </ElTabPane>
-        <ElTabPane label="代办(0)" name="need">
-          <div class="message-list">
-            <template v-for="item in needList" :key="item.id">
-              <div class="message-item">
-                <img src="@/assets/imgs/avatar.gif" alt="" class="message-icon" />
-                <div class="message-content">
-                  <span class="message-title">{{ item.title }}</span>
-                  <span class="message-date">{{ item.date }}</span>
+                  <span class="message-title">
+                    {{ item.templateNickname }}：{{ item.templateContent }}
+                  </span>
+                  <span class="message-date">
+                    {{ dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+                  </span>
                 </div>
               </div>
             </template>
           </div>
         </ElTabPane>
       </ElTabs>
+      <!-- 更多 -->
+      <div style="text-align: right; margin-top: 10px">
+        <XButton type="primary" preIcon="ep:view" title="查看全部" @click="goMyList" />
+      </div>
     </ElPopover>
   </div>
 </template>
diff --git a/yudao-ui-admin/src/api/system/notify/message.js b/yudao-ui-admin/src/api/system/notify/message.js
index 0fdf4717d9..5ef63a4f28 100644
--- a/yudao-ui-admin/src/api/system/notify/message.js
+++ b/yudao-ui-admin/src/api/system/notify/message.js
@@ -43,6 +43,7 @@ export function getUnreadNotifyMessageList() {
   })
 }
 
+// 获得当前用户的未读站内信数量
 export function getUnreadNotifyMessageCount() {
   return request({
     url: '/system/notify-message/get-unread-count',
diff --git a/yudao-ui-admin/src/layout/components/Message/index.vue b/yudao-ui-admin/src/layout/components/Message/index.vue
index 347242cbe8..e490605618 100644
--- a/yudao-ui-admin/src/layout/components/Message/index.vue
+++ b/yudao-ui-admin/src/layout/components/Message/index.vue
@@ -9,7 +9,7 @@
       <!-- 弹出列表 -->
       <el-table v-loading="loading" :data="list">
         <el-table-column width="120" property="templateNickname" label="发送人" />
-        <el-table-column width="180" property="title" label="发送时间">
+        <el-table-column width="180" property="createTime" label="发送时间">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
@@ -49,7 +49,7 @@ export default {
     // 首次加载小红点
     this.getUnreadCount()
     // 轮询刷新小红点
-    window.timer = setInterval(()=>{
+    setInterval(() => {
       this.getUnreadCount()
     },1000 * 60 * 2)
   },

From f7762e646e502e8deabb60502b3d3f0cb2a59054 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Jan 2023 18:31:52 +0800
Subject: [PATCH 59/67] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A=E6=88=91=E7=9A=84=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=20vue3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   1 +
 sql/mysql/ruoyi-vue-pro.sql                   | 104 +++++++++++++++---
 .../src/api/system/notify/message/index.ts    |  36 +++---
 .../src/hooks/web/useXTable.ts                |   2 +-
 .../layout/components/Message/src/Message.vue |   8 +-
 .../components/UserInfo/src/UserInfo.vue      |   2 +-
 .../src/router/modules/remaining.ts           |  14 ++-
 .../src/views/system/notify/my/index.vue      |  58 ++++++++++
 .../src/views/system/notify/my/my.data.ts     |  58 ++++++++++
 9 files changed, 245 insertions(+), 38 deletions(-)
 create mode 100644 yudao-ui-admin-vue3/src/views/system/notify/my/index.vue
 create mode 100644 yudao-ui-admin-vue3/src/views/system/notify/my/my.data.ts

diff --git a/README.md b/README.md
index 1e30309e89..49ca04670e 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@
 |     | 字典管理  | 对系统中经常使用的一些较为固定的数据进行维护          |
 | 🚀  | 短信管理  | 短信渠道、短息模板、短信日志，对接阿里云、腾讯云等主流短信平台 |
 | 🚀  | 邮件管理  | 邮箱账号、邮件模版、邮件发送日志，支持所有邮件平台       |
+| 🚀  | 站内信   | 系统内的消息通知，提供站内信模版、站内信消息          |
 | 🚀  | 操作日志  | 系统正常操作日志记录和查询，集成 Swagger 生成日志内容 |
 | ⭐️  | 登录日志  | 系统登录日志记录查询，包含登录异常               |
 | 🚀  | 错误码管理 | 系统所有错误码的管理，可在线修改错误提示，无需重启服务     |
diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql
index 8d34f8c149..0b5d4e6b3d 100644
--- a/sql/mysql/ruoyi-vue-pro.sql
+++ b/sql/mysql/ruoyi-vue-pro.sql
@@ -546,7 +546,7 @@ CREATE TABLE `infra_api_error_log`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 949 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
+) ENGINE = InnoDB AUTO_INCREMENT = 965 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
 
 -- ----------------------------
 -- Records of infra_api_error_log
@@ -584,7 +584,7 @@ CREATE TABLE `infra_codegen_column`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1582 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
+) ENGINE = InnoDB AUTO_INCREMENT = 1612 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
 
 -- ----------------------------
 -- Records of infra_codegen_column
@@ -616,7 +616,7 @@ CREATE TABLE `infra_codegen_table`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 122 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
+) ENGINE = InnoDB AUTO_INCREMENT = 124 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
 
 -- ----------------------------
 -- Records of infra_codegen_table
@@ -1191,7 +1191,7 @@ CREATE TABLE `system_dict_data`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1227 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
+) ENGINE = InnoDB AUTO_INCREMENT = 1229 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
 
 -- ----------------------------
 -- Records of system_dict_data
@@ -1395,6 +1395,8 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1224, 10, '发送成功', '10', 'system_mail_send_status', 0, 'success', '', '邮件发送状态 - 发送成功', '1', '2023-01-26 09:54:28', '1', '2023-01-26 16:36:22', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1225, 20, '发送失败', '20', 'system_mail_send_status', 0, 'danger', '', '邮件发送状态 - 发送失败', '1', '2023-01-26 09:54:50', '1', '2023-01-26 16:36:26', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1226, 30, '不发送', '30', 'system_mail_send_status', 0, 'info', '', '邮件发送状态 -  不发送', '1', '2023-01-26 09:55:06', '1', '2023-01-26 16:36:36', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1227, 1, '通知公告', '1', 'system_notify_template_type', 0, 'primary', '', '站内信模版的类型 - 通知公告', '1', '2023-01-28 10:35:59', '1', '2023-01-28 10:35:59', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1228, 2, '系统消息', '2', 'system_notify_template_type', 0, 'success', '', '站内信模版的类型 - 系统消息', '1', '2023-01-28 10:36:20', '1', '2023-01-28 10:36:25', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -1415,7 +1417,7 @@ CREATE TABLE `system_dict_type`  (
   `deleted_time` datetime NULL DEFAULT NULL COMMENT '删除时间',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `dict_type`(`type` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 167 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
+) ENGINE = InnoDB AUTO_INCREMENT = 168 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
 
 -- ----------------------------
 -- Records of system_dict_type
@@ -1479,6 +1481,7 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (164, '公众号自动回复的请求关键字匹配模式', 'mp_auto_reply_request_match', 0, '公众号自动回复的请求关键字匹配模式', '1', '2023-01-16 23:29:56', '1', '2023-01-16 23:29:56', b'0', '1970-01-01 00:00:00');
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (165, '公众号的消息类型', 'mp_message_type', 0, '公众号的消息类型', '1', '2023-01-17 22:17:09', '1', '2023-01-17 22:17:09', b'0', '1970-01-01 00:00:00');
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (166, '邮件发送状态', 'system_mail_send_status', 0, '邮件发送状态', '1', '2023-01-26 09:53:13', '1', '2023-01-26 09:53:13', b'0', '1970-01-01 00:00:00');
+INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (167, '站内信模版的类型', 'system_notify_template_type', 0, '站内信模版的类型', '1', '2023-01-28 10:35:10', '1', '2023-01-28 10:35:10', b'0', '1970-01-01 00:00:00');
 COMMIT;
 
 -- ----------------------------
@@ -1527,7 +1530,7 @@ CREATE TABLE `system_login_log`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1980 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
+) ENGINE = InnoDB AUTO_INCREMENT = 1985 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
 
 -- ----------------------------
 -- Records of system_login_log
@@ -1620,7 +1623,7 @@ CREATE TABLE `system_mail_template`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '邮件模版表';
+) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '邮件模版表';
 
 -- ----------------------------
 -- Records of system_mail_template
@@ -1654,7 +1657,7 @@ CREATE TABLE `system_menu`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2144 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
+) ENGINE = InnoDB AUTO_INCREMENT = 2153 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
 
 -- ----------------------------
 -- Records of system_menu
@@ -1877,7 +1880,7 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1250, '敏感词更新', 'system:sensitive-word:update', 3, 3, 1247, '', '', '', 0, b'1', b'1', '', '2022-04-07 16:55:03', '', '2022-04-20 17:03:10', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1251, '敏感词删除', 'system:sensitive-word:delete', 3, 4, 1247, '', '', '', 0, b'1', b'1', '', '2022-04-07 16:55:03', '', '2022-04-20 17:03:10', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1252, '敏感词导出', 'system:sensitive-word:export', 3, 5, 1247, '', '', '', 0, b'1', b'1', '', '2022-04-07 16:55:03', '', '2022-04-20 17:03:10', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1254, '作者动态', '', 1, 0, 0, 'https://www.iocoder.cn', 'people', NULL, 0, b'1', b'1', '1', '2022-04-23 01:03:15', '1', '2023-01-25 20:05:55', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1254, '作者动态', '', 1, 0, 0, 'https://www.iocoder.cn', 'people', NULL, 0, b'1', b'1', '1', '2022-04-23 01:03:15', '1', '2023-01-28 12:33:52', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1255, '数据源配置', '', 2, 1, 2, 'data-source-config', 'rate', 'infra/dataSourceConfig/index', 0, b'1', b'1', '', '2022-04-27 14:37:32', '1', '2022-04-27 22:42:06', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1256, '数据源配置查询', 'infra:data-source-config:query', 3, 1, 1255, '', '', '', 0, b'1', b'1', '', '2022-04-27 14:37:32', '', '2022-04-27 14:37:32', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1257, '数据源配置创建', 'infra:data-source-config:create', 3, 2, 1255, '', '', '', 0, b'1', b'1', '', '2022-04-27 14:37:32', '', '2022-04-27 14:37:32', b'0');
@@ -2023,6 +2026,15 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2141, '邮件记录', '', 2, 0, 2130, 'mail-log', 'log', 'system/mail/log/index', 0, b'1', b'1', '', '2023-01-26 02:16:50', '1', '2023-01-26 16:38:27', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2142, '日志查询', 'system:mail-log:query', 3, 1, 2141, '', '', '', 0, b'1', b'1', '', '2023-01-26 02:16:50', '', '2023-01-26 02:16:50', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2143, '发送测试邮件', 'system:mail-template:send-mail', 3, 5, 2136, '', '', '', 0, b'1', b'1', '1', '2023-01-26 23:29:15', '1', '2023-01-26 23:29:15', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2144, '站内信管理', '', 1, 11, 1, 'notify', 'message', NULL, 0, b'1', b'1', '1', '2023-01-28 10:25:18', '1', '2023-01-28 10:25:46', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2145, '模板管理', '', 2, 0, 2144, 'notify-template', 'education', 'system/notify/template/index', 0, b'1', b'1', '', '2023-01-28 02:26:42', '1', '2023-01-28 10:27:47', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2146, '站内信模板查询', 'system:notify-template:query', 3, 1, 2145, '', '', '', 0, b'1', b'1', '', '2023-01-28 02:26:42', '', '2023-01-28 02:26:42', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2147, '站内信模板创建', 'system:notify-template:create', 3, 2, 2145, '', '', '', 0, b'1', b'1', '', '2023-01-28 02:26:42', '', '2023-01-28 02:26:42', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2148, '站内信模板更新', 'system:notify-template:update', 3, 3, 2145, '', '', '', 0, b'1', b'1', '', '2023-01-28 02:26:42', '', '2023-01-28 02:26:42', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2149, '站内信模板删除', 'system:notify-template:delete', 3, 4, 2145, '', '', '', 0, b'1', b'1', '', '2023-01-28 02:26:42', '', '2023-01-28 02:26:42', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2150, '发送测试站内信', 'system:notify-template:send-notify', 3, 5, 2145, '', '', '', 0, b'1', b'1', '1', '2023-01-28 10:54:43', '1', '2023-01-28 10:54:43', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2151, '消息记录', '', 2, 0, 2144, 'notify-message', 'edit', 'system/notify/message/index', 0, b'1', b'1', '', '2023-01-28 04:28:22', '1', '2023-01-28 20:59:53', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2152, '站内信消息查询', 'system:notify-message:query', 3, 1, 2151, '', '', '', 0, b'1', b'1', '', '2023-01-28 04:28:22', '', '2023-01-28 04:28:22', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -2053,6 +2065,72 @@ INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creato
 INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', b'0', 121);
 COMMIT;
 
+-- ----------------------------
+-- Table structure for system_notify_message
+-- ----------------------------
+DROP TABLE IF EXISTS `system_notify_message`;
+CREATE TABLE `system_notify_message`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `user_id` bigint NOT NULL COMMENT '用户id',
+  `user_type` tinyint NOT NULL COMMENT '用户类型',
+  `template_id` bigint NOT NULL COMMENT '模版编号',
+  `template_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板编码',
+  `template_nickname` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模版发送人名称',
+  `template_content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模版内容',
+  `template_type` int NOT NULL COMMENT '模版类型',
+  `template_params` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模版参数',
+  `read_status` bit(1) NOT NULL COMMENT '是否已读',
+  `read_time` datetime NULL DEFAULT NULL COMMENT '阅读时间',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '站内信消息表';
+
+-- ----------------------------
+-- Records of system_notify_message
+-- ----------------------------
+BEGIN;
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, 1, 2, 1, 'test', '123', '我是 1，我开始 2 了', 1, '{\"name\":\"1\",\"what\":\"2\"}', b'0', '2023-01-28 21:06:10', '1', '2023-01-28 11:44:08', '1', '2023-01-29 02:51:50', b'0', 1);
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (3, 1, 2, 1, 'test', '123', '我是 1，我开始 2 了', 1, '{\"name\":\"1\",\"what\":\"2\"}', b'0', '2023-01-29 10:34:13', '1', '2023-01-28 11:45:04', '1', '2023-01-29 02:51:52', b'0', 1);
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, 103, 2, 2, 'register', '系统消息', '你好，欢迎 哈哈 加入大家庭！', 2, '{\"name\":\"哈哈\"}', b'0', NULL, '1', '2023-01-28 21:02:20', '1', '2023-01-28 21:02:20', b'0', 1);
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (5, 1, 2, 1, 'test', '123', '我是 芋艿，我开始 写代码 了', 1, '{\"name\":\"芋艿\",\"what\":\"写代码\"}', b'0', '2023-01-29 10:41:45', '1', '2023-01-28 22:21:42', '1', '2023-01-29 02:51:54', b'0', 1);
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (6, 1, 2, 1, 'test', '123', '我是 芋艿，我开始 写代码 了', 1, '{\"name\":\"芋艿\",\"what\":\"写代码\"}', b'1', '2023-01-29 10:52:06', '1', '2023-01-28 22:22:07', '1', '2023-01-29 10:52:06', b'0', 1);
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (7, 1, 2, 1, 'test', '123', '我是 2，我开始 3 了', 1, '{\"name\":\"2\",\"what\":\"3\"}', b'1', '2023-01-29 10:52:06', '1', '2023-01-28 23:45:21', '1', '2023-01-29 10:52:06', b'0', 1);
+INSERT INTO `system_notify_message` (`id`, `user_id`, `user_type`, `template_id`, `template_code`, `template_nickname`, `template_content`, `template_type`, `template_params`, `read_status`, `read_time`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (8, 1, 2, 2, 'register', '系统消息', '你好，欢迎 123 加入大家庭！', 2, '{\"name\":\"123\"}', b'1', '2023-01-29 10:52:06', '1', '2023-01-28 23:50:21', '1', '2023-01-29 10:52:06', b'0', 1);
+COMMIT;
+
+-- ----------------------------
+-- Table structure for system_notify_template
+-- ----------------------------
+DROP TABLE IF EXISTS `system_notify_template`;
+CREATE TABLE `system_notify_template`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模板名称',
+  `code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模版编码',
+  `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '发送人名称',
+  `content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '模版内容',
+  `type` tinyint NOT NULL COMMENT '类型',
+  `params` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '参数数组',
+  `status` tinyint NOT NULL COMMENT '状态',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
+  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '站内信模板表';
+
+-- ----------------------------
+-- Records of system_notify_template
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for system_oauth2_access_token
 -- ----------------------------
@@ -2073,7 +2151,7 @@ CREATE TABLE `system_oauth2_access_token`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1214 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
+) ENGINE = InnoDB AUTO_INCREMENT = 1249 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
 
 -- ----------------------------
 -- Records of system_oauth2_access_token
@@ -2195,7 +2273,7 @@ CREATE TABLE `system_oauth2_refresh_token`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 588 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
+) ENGINE = InnoDB AUTO_INCREMENT = 593 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
 
 -- ----------------------------
 -- Records of system_oauth2_refresh_token
@@ -2235,7 +2313,7 @@ CREATE TABLE `system_operate_log`  (
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4177 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
+) ENGINE = InnoDB AUTO_INCREMENT = 4245 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
 
 -- ----------------------------
 -- Records of system_operate_log
@@ -3353,7 +3431,7 @@ CREATE TABLE `system_users`  (
 -- Records of system_users
 -- ----------------------------
 BEGIN;
-INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '0:0:0:0:0:0:0:1', '2023-01-27 14:31:00', 'admin', '2021-01-05 17:03:47', NULL, '2023-01-27 14:31:00', b'0', 1);
+INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '127.0.0.1', '2023-01-29 10:05:18', 'admin', '2021-01-05 17:03:47', NULL, '2023-01-29 10:05:18', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$YMpimV4T6BtDhIaA8jSW.u8UTGBeGhc/qwXP4oxoMr4mOw9.qttt6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-07-08 01:26:27', '', '2021-01-13 23:50:35', NULL, '2022-07-08 01:26:27', b'0', 1);
 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$10$GP8zvqHB//TekuzYZSBYAuBQJiNq1.fxQVDYJ.uBCOnWCtDVKE4H6', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-05-28 15:43:17', '', '2021-01-21 02:13:53', NULL, '2022-07-09 09:00:33', b'0', 1);
diff --git a/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts b/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
index d12ee35fa8..a42d75c213 100644
--- a/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/notify/message/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import qs from 'qs'
 
 export interface NotifyMessageVO {
   id: number
@@ -22,6 +23,11 @@ export interface NotifyMessagePageReqVO extends PageParam {
   createTime?: Date[]
 }
 
+export interface NotifyMessageMyPageReqVO extends PageParam {
+  readStatus?: boolean
+  createTime?: Date[]
+}
+
 // 查询站内信消息列表
 export const getNotifyMessagePageApi = async (params: NotifyMessagePageReqVO) => {
   return await request.get({ url: '/system/notify-message/page', params })
@@ -33,29 +39,21 @@ export const getNotifyMessageApi = async (id: number) => {
 }
 
 // 获得我的站内信分页
-// export function getMyNotifyMessagePage(query) {
-//   return request({
-//     url: '/system/notify-message/my-page',
-//     method: 'get',
-//     params: query
-//   })
-// }
+export const getMyNotifyMessagePage = async (params: NotifyMessageMyPageReqVO) => {
+  return await request.get({ url: '/system/notify-message/my-page', params })
+}
 
 // 批量标记已读
-// export function updateNotifyMessageRead(ids) {
-//   return request({
-//     url: '/system/notify-message/update-read?' + qs.stringify({ids: ids}, { indices: false }),
-//     method: 'put'
-//   })
-// }
+export const updateNotifyMessageRead = async (ids) => {
+  return await request.put({
+    url: '/system/notify-message/update-read?' + qs.stringify({ ids: ids }, { indices: false })
+  })
+}
 
 // 标记所有站内信为已读
-// export function updateAllNotifyMessageRead() {
-//   return request({
-//     url: '/system/notify-message/update-all-read',
-//     method: 'put'
-//   })
-// }
+export const updateAllNotifyMessageRead = async () => {
+  return await request.put({ url: '/system/notify-message/update-all-read' })
+}
 
 // 获取当前用户的最新站内信列表
 export const getUnreadNotifyMessageListApi = async () => {
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useXTable.ts b/yudao-ui-admin-vue3/src/hooks/web/useXTable.ts
index fddb7c46d4..501f982b31 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useXTable.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useXTable.ts
@@ -7,7 +7,7 @@ export interface tableMethod {
   deleteBatch: () => void // 批量删除
   exportList: (fileName?: string) => void // 导出列表
   getCurrentColumn: () => void // 获取当前列
-  getRadioRecord: () => void // 获取当前选中列，redio
+  getRadioRecord: () => void // 获取当前选中列，radio
   getCheckboxRecords: () => void //获取当前选中列， checkbox
 }
 
diff --git a/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue b/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue
index acef9ac950..ee3647dd34 100644
--- a/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/Message/src/Message.vue
@@ -4,18 +4,20 @@ import * as NotifyMessageApi from '@/api/system/notify/message'
 
 const { push } = useRouter()
 const activeName = ref('notice')
-const count = ref(0) // 未读消息数量
+const unreadCount = ref(0) // 未读消息数量
 const list = ref([]) // 消息列表
 
 // 获得消息列表
 const getList = async () => {
   list.value = await NotifyMessageApi.getUnreadNotifyMessageListApi()
+  // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
+  unreadCount.value = 0
 }
 
 // 获得未读消息数
 const getUnreadCount = async () => {
   NotifyMessageApi.getUnreadNotifyMessageCountApi().then((data) => {
-    count.value = data
+    unreadCount.value = data
   })
 }
 
@@ -40,7 +42,7 @@ onMounted(() => {
   <div class="message">
     <ElPopover placement="bottom" :width="400" trigger="click">
       <template #reference>
-        <ElBadge :is-dot="count > 0" class="item">
+        <ElBadge :is-dot="unreadCount > 0" class="item">
           <Icon icon="ep:bell" :size="18" class="cursor-pointer" @click="getList" />
         </ElBadge>
       </template>
diff --git a/yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
index 62b5eb5aa7..73e048ab27 100644
--- a/yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
@@ -41,7 +41,7 @@ const loginOut = () => {
     .catch(() => {})
 }
 const toProfile = async () => {
-  push('/userinfo/profile')
+  push('/user/profile')
 }
 const toDocument = () => {
   window.open('https://doc.iocoder.cn/')
diff --git a/yudao-ui-admin-vue3/src/router/modules/remaining.ts b/yudao-ui-admin-vue3/src/router/modules/remaining.ts
index e511e1948d..edaace6a49 100644
--- a/yudao-ui-admin-vue3/src/router/modules/remaining.ts
+++ b/yudao-ui-admin-vue3/src/router/modules/remaining.ts
@@ -71,7 +71,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     ]
   },
   {
-    path: '/userinfo',
+    path: '/user',
     component: Layout,
     name: 'UserInfo',
     meta: {
@@ -89,6 +89,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
           icon: 'ep:user',
           title: t('common.profile')
         }
+      },
+      {
+        path: 'notify-message',
+        component: () => import('@/views/system/notify/my/index.vue'),
+        name: 'MyNotifyMessage',
+        meta: {
+          canTo: true,
+          hidden: true,
+          noTagsView: false,
+          icon: 'ep:message',
+          title: '我的站内信'
+        }
       }
     ]
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/notify/my/index.vue b/yudao-ui-admin-vue3/src/views/system/notify/my/index.vue
new file mode 100644
index 0000000000..620a7430f0
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/notify/my/index.vue
@@ -0,0 +1,58 @@
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #toolbar_buttons>
+        <!-- 操作：标记已读 -->
+        <XButton type="primary" preIcon="ep:zoom-in" title="标记已读" @click="handleUpdateList" />
+        <!-- 操作：全部已读 -->
+        <XButton type="primary" preIcon="ep:zoom-in" title="全部已读" @click="handleUpdateAll" />
+      </template>
+      <template #actionbtns_default="{ row }">
+        <!-- 操作：已读 -->
+        <XTextButton
+          preIcon="ep:view"
+          title="已读"
+          v-hasPermi="['system:notify-message:query']"
+          v-if="!row.readStatus"
+          @click="handleUpdate([row.id])"
+        />
+      </template>
+    </XTable>
+  </ContentWrap>
+</template>
+<script setup lang="ts" name="MyNotifyMessage">
+// 业务相关的 import
+import { allSchemas } from './my.data'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+
+const message = useMessage() // 消息
+
+// 列表相关的变量
+const [registerTable, { reload, getCheckboxRecords }] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: NotifyMessageApi.getMyNotifyMessagePage
+})
+
+const handleUpdateList = async () => {
+  const list = getCheckboxRecords()
+  if (list.length === 0) {
+    return
+  }
+  await handleUpdate(list.map((v) => v.id))
+}
+
+// 标记指定 id 已读
+const handleUpdate = async (ids) => {
+  await NotifyMessageApi.updateNotifyMessageRead(ids)
+  message.success('标记已读成功！')
+  reload()
+}
+
+// 标记全部已读
+const handleUpdateAll = async () => {
+  await NotifyMessageApi.updateAllNotifyMessageRead()
+  message.success('全部已读成功！')
+  reload()
+}
+</script>
diff --git a/yudao-ui-admin-vue3/src/views/system/notify/my/my.data.ts b/yudao-ui-admin-vue3/src/views/system/notify/my/my.data.ts
new file mode 100644
index 0000000000..103ed8eff0
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/notify/my/my.data.ts
@@ -0,0 +1,58 @@
+import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+
+// CrudSchema
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'id',
+  primaryTitle: ' ',
+  primaryType: 'checkbox',
+  action: true,
+  actionWidth: '200', // 3个按钮默认200，如有删减对应增减即可
+  columns: [
+    {
+      title: '发送人名称',
+      field: 'templateNickname',
+      table: {
+        width: 120
+      }
+    },
+    {
+      title: '发送时间',
+      field: 'createTime',
+      isForm: false,
+      formatter: 'formatDate',
+      search: {
+        show: true,
+        itemRender: {
+          name: 'XDataTimePicker'
+        }
+      },
+      table: {
+        width: 180
+      }
+    },
+    {
+      title: '类型',
+      field: 'templateType',
+      dictType: DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE,
+      dictClass: 'number',
+      table: {
+        width: 80
+      }
+    },
+    {
+      title: '内容',
+      field: 'templateContent'
+    },
+    {
+      title: '是否已读',
+      field: 'readStatus',
+      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+      dictClass: 'boolean',
+      table: {
+        width: 80
+      },
+      isSearch: true
+    }
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

From ca8bb724175a8f53b44fa35ebb0d9208ec9f0f88 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 30 Jan 2023 02:30:42 +0800
Subject: [PATCH 60/67] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.7.0=20=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E3=80=81=E7=AB=99=E5=86=85=E4=BF=A1=E3=80=81?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E3=80=81=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 23 ++++++++++++++++++-
 pom.xml                                       |  2 +-
 yudao-dependencies/pom.xml                    |  2 +-
 .../banner/core/BannerApplicationRunner.java  |  4 ++++
 .../server/controller/DefaultController.java  |  6 +++++
 yudao-ui-admin-vue3/package.json              |  2 +-
 yudao-ui-admin/package.json                   |  2 +-
 .../src/components/DocAlert/index.vue         |  9 +++++++-
 yudao-ui-admin/src/views/mp/account/index.vue |  1 +
 .../src/views/mp/autoReply/index.vue          |  2 ++
 yudao-ui-admin/src/views/mp/draft/index.vue   |  2 ++
 .../src/views/mp/freePublish/index.vue        |  2 ++
 .../src/views/mp/material/index.vue           |  2 ++
 yudao-ui-admin/src/views/mp/menu/index.vue    |  2 ++
 yudao-ui-admin/src/views/mp/message/index.vue |  1 +
 .../src/views/mp/statistics/index.vue         |  2 ++
 yudao-ui-admin/src/views/mp/tag/index.vue     |  2 ++
 yudao-ui-admin/src/views/mp/user/index.vue    |  1 +
 18 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 49ca04670e..2e812f2070 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,20 @@
 | `ruoyi-vue-pro`      | Spring Boot 多模块        | **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro)** &nbsp;&nbsp;&nbsp; [Github](https://github.com/YunaiV/ruoyi-vue-pro)     |
 | `yudao-cloud`        | Spring Cloud 微服务       | **[Gitee](https://gitee.com/zhijiantianya/yudao-cloud)** &nbsp;&nbsp;&nbsp; [Github](https://github.com/YunaiV/yudao-cloud)         |
 | `Spring-Boot-Labs`   | Spring Boot & Cloud 入门 | **[Gitee](https://gitee.com/zhijiantianya/SpringBoot-Labs)** &nbsp;&nbsp;&nbsp; [Github](https://github.com/YunaiV/SpringBoot-Labs) |
- | `ruoyi-vue-pro-mini` | 精简版：移除工作流、支付等模块        | **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/mini)**                                                                |
+
+## 🐰 分支说明
+
+|       | JDK 8 完整版                                                 | JDK 8 精简版                                                          | JDK 17 完整版                                                                  |
+|-------|-----------------------------------------------------------|--------------------------------------------------------------------|-----------------------------------------------------------------------------|
+| 分支    | [`master`](https://gitee.com/zhijiantianya/ruoyi-vue-pro) | [`mini`](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/mini/) | [`boot-dev`](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/boot3-dev/) |
+| 说明    | 包括所有功能                                                    | 只保留核心功能                                                            | 适配 Spring Boot 3.X                                                          |
+| 系统功能  | √                                                         | √                                                                  | √                                                                           |
+| 基础设施  | √                                                         | √                                                                  | √                                                                           |
+| 会员中心  | √                                                         | √                                                                  | √                                                                           |
+| 工作流程  | √                                                         | x                                                                  | 适配中                                                                         |
+| 数据报表  | √                                                         | x                                                                  | 适配中                                                                         |
+| 商城系统  | √                                                         | x                                                                  | √                                                                           |
+| 微信公众号 | √                                                         | x                                                                  | √                                                                           |
 
 ## 😎 开源协议
 
@@ -55,6 +68,14 @@
 
 ③ 代码整洁、架构整洁，遵循《阿里巴巴 Java 开发手册》规范，代码注释详细，57000 行 Java 代码，22000 行代码注释。
 
+## 💰 项目外包
+
+我们也是接外包滴，如果你有项目想要外包，可以微信联系【**coeus2016**】。
+
+团队包含专业的项目经理、架构师、前端工程师、后端工程师、测试工程师、运维工程师，可以提供全流程的外包服务。
+
+项目可以是商城、SCRM 系统、OA 系统、物流系统、ERP 系统、CMS 系统、HIS 系统、支付系统、IM 聊天、微信公众号、微信小程序等等。
+
 ## 🐼 内置功能
 
 系统内置多种多种业务功能，可以用于快速你的业务系统：
diff --git a/pom.xml b/pom.xml
index 44da8dcb20..ec0fb64052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>1.6.6-snapshot</revision>
+        <revision>1.7.0-snapshot</revision>
         <!-- Maven 相关 -->
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 8eb87fe40e..84fc8abc7f 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>1.6.6-snapshot</revision>
+        <revision>1.7.0-snapshot</revision>
         <!-- 统一依赖管理 -->
         <spring.boot.version>2.7.7</spring.boot.version>
         <!-- Web 相关 -->
diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java b/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
index c22316ef12..645444e4f6 100644
--- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
+++ b/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
@@ -40,6 +40,10 @@ public class BannerApplicationRunner implements ApplicationRunner {
             if (isNotPresent("cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration")) {
                 System.out.println("[工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
             }
+            // 微信公众号
+            if (isNotPresent("cn.iocoder.yudao.module.mp.framework.mp.config.MpConfiguration")) {
+                System.out.println("[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
+            }
         });
     }
 
diff --git a/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java b/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java
index 14946218a4..4cf1005d89 100644
--- a/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java
+++ b/yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java
@@ -21,4 +21,10 @@ public class DefaultController {
                 "[工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
     }
 
+    @RequestMapping("/admin-api/mp/**")
+    public CommonResult<Boolean> mp404() {
+        return CommonResult.error(NOT_IMPLEMENTED.getCode(),
+                "[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
+    }
+
 }
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index e3b7700b36..35165c102d 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "1.6.6-snapshot.1925",
+  "version": "1.7.0-snapshot.1925",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,
diff --git a/yudao-ui-admin/package.json b/yudao-ui-admin/package.json
index 738ac509fb..73d4d0903e 100644
--- a/yudao-ui-admin/package.json
+++ b/yudao-ui-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.6.6-snapshot",
+  "version": "1.7.0-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",
diff --git a/yudao-ui-admin/src/components/DocAlert/index.vue b/yudao-ui-admin/src/components/DocAlert/index.vue
index 541b8ed207..1344b09a3a 100644
--- a/yudao-ui-admin/src/components/DocAlert/index.vue
+++ b/yudao-ui-admin/src/components/DocAlert/index.vue
@@ -1,5 +1,9 @@
 <template>
-  <el-alert v-if="enable()" :title="'【' + title + '】文档地址：' + url" type="success" show-icon />
+  <el-alert v-if="enable()" type="success" show-icon>
+    <template slot="title">
+      <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>
+    </template>
+  </el-alert>
 </template>
 
 <script>
@@ -14,6 +18,9 @@ export default {
   methods: {
     enable: function () {
       return getDocEnable();
+    },
+    goToUrl: function() {
+      window.open(this.url);
     }
   }
 };
diff --git a/yudao-ui-admin/src/views/mp/account/index.vue b/yudao-ui-admin/src/views/mp/account/index.vue
index 74f7c2c150..251d137e3e 100644
--- a/yudao-ui-admin/src/views/mp/account/index.vue
+++ b/yudao-ui-admin/src/views/mp/account/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="公众号接入" url="https://doc.iocoder.cn/mp/account/" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/yudao-ui-admin/src/views/mp/autoReply/index.vue b/yudao-ui-admin/src/views/mp/autoReply/index.vue
index 8f3329c6d1..6d55de735e 100644
--- a/yudao-ui-admin/src/views/mp/autoReply/index.vue
+++ b/yudao-ui-admin/src/views/mp/autoReply/index.vue
@@ -26,6 +26,8 @@ SOFTWARE.
 -->
 <template>
   <div class="app-container">
+    <doc-alert title="自动回复" url="https://doc.iocoder.cn/mp/auto-reply/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/draft/index.vue b/yudao-ui-admin/src/views/mp/draft/index.vue
index 3439b1f6e9..c753949c5b 100644
--- a/yudao-ui-admin/src/views/mp/draft/index.vue
+++ b/yudao-ui-admin/src/views/mp/draft/index.vue
@@ -27,6 +27,8 @@ SOFTWARE.
 -->
 <template>
   <div class="app-container">
+    <doc-alert title="公众号图文" url="https://doc.iocoder.cn/mp/article/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/freePublish/index.vue b/yudao-ui-admin/src/views/mp/freePublish/index.vue
index 03c90c8be0..99865033cf 100644
--- a/yudao-ui-admin/src/views/mp/freePublish/index.vue
+++ b/yudao-ui-admin/src/views/mp/freePublish/index.vue
@@ -25,6 +25,8 @@ SOFTWARE.
 -->
 <template>
   <div class="app-container">
+    <doc-alert title="公众号图文" url="https://doc.iocoder.cn/mp/article/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/material/index.vue b/yudao-ui-admin/src/views/mp/material/index.vue
index a351514270..1bad04fb47 100644
--- a/yudao-ui-admin/src/views/mp/material/index.vue
+++ b/yudao-ui-admin/src/views/mp/material/index.vue
@@ -27,6 +27,8 @@ SOFTWARE.
 -->
 <template>
   <div class="app-container">
+    <doc-alert title="公众号素材" url="https://doc.iocoder.cn/mp/material/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/menu/index.vue b/yudao-ui-admin/src/views/mp/menu/index.vue
index 65e960c949..a5ec5602bb 100644
--- a/yudao-ui-admin/src/views/mp/menu/index.vue
+++ b/yudao-ui-admin/src/views/mp/menu/index.vue
@@ -26,6 +26,8 @@ SOFTWARE.
 -->
 <template>
   <div class="app-container">
+    <doc-alert title="公众号菜单" url="https://doc.iocoder.cn/mp/menu/" />
+
     <!-- 搜索工作栏 -->
     <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/message/index.vue b/yudao-ui-admin/src/views/mp/message/index.vue
index 57d2a17a79..2b6634db8d 100644
--- a/yudao-ui-admin/src/views/mp/message/index.vue
+++ b/yudao-ui-admin/src/views/mp/message/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="公众号消息" url="https://doc.iocoder.cn/mp/message/" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
diff --git a/yudao-ui-admin/src/views/mp/statistics/index.vue b/yudao-ui-admin/src/views/mp/statistics/index.vue
index 7c2d54996e..21bb4e85ea 100644
--- a/yudao-ui-admin/src/views/mp/statistics/index.vue
+++ b/yudao-ui-admin/src/views/mp/statistics/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <doc-alert title="公众号统计" url="https://doc.iocoder.cn/mp/statistics/" />
+
     <!-- 搜索工作栏 -->
     <el-form ref="queryForm" size="small" :inline="true" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/tag/index.vue b/yudao-ui-admin/src/views/mp/tag/index.vue
index f67b16bdd5..e5597b2c17 100644
--- a/yudao-ui-admin/src/views/mp/tag/index.vue
+++ b/yudao-ui-admin/src/views/mp/tag/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <doc-alert title="公众号标签" url="https://doc.iocoder.cn/mp/tag/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
diff --git a/yudao-ui-admin/src/views/mp/user/index.vue b/yudao-ui-admin/src/views/mp/user/index.vue
index 1af2d6c852..f9901153b6 100644
--- a/yudao-ui-admin/src/views/mp/user/index.vue
+++ b/yudao-ui-admin/src/views/mp/user/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <doc-alert title="公众号粉丝" url="https://doc.iocoder.cn/mp/user/" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

From 5d863f8742f34cd032703ceb3bfe701bc6af5fcb Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 30 Jan 2023 02:31:58 +0800
Subject: [PATCH 61/67] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.7.0=20=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E3=80=81=E7=AB=99=E5=86=85=E4=BF=A1=E3=80=81?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E3=80=81=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e812f2070..e5d62c206a 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@
 
 ③ 代码整洁、架构整洁，遵循《阿里巴巴 Java 开发手册》规范，代码注释详细，57000 行 Java 代码，22000 行代码注释。
 
-## 💰 项目外包
+## 🤝 项目外包
 
 我们也是接外包滴，如果你有项目想要外包，可以微信联系【**coeus2016**】。
 

From 624b57167248a7518eda8878c266f16e4e40d3a9 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 30 Jan 2023 08:04:58 +0800
Subject: [PATCH 62/67] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.7.0=20=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E3=80=81=E7=AB=99=E5=86=85=E4=BF=A1=E3=80=81?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E3=80=81=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e5d62c206a..875ca57d74 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@
 
 ## 🤝 项目外包
 
-我们也是接外包滴，如果你有项目想要外包，可以微信联系【**coeus2016**】。
+我们也是接外包滴，如果你有项目想要外包，可以微信联系【**Aix9975**】。
 
 团队包含专业的项目经理、架构师、前端工程师、后端工程师、测试工程师、运维工程师，可以提供全流程的外包服务。
 

From 227361661f49121c1ce1669bc09eb0215a89d873 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 31 Jan 2023 09:27:27 +0800
Subject: [PATCH 63/67] fix: mp menu error

---
 sql/mysql/ruoyi-vue-pro.sql                   | 148 +++++++++---------
 .../src/views/mp/{user => fans}/index.vue     |   4 +-
 2 files changed, 76 insertions(+), 76 deletions(-)
 rename yudao-ui-admin/src/views/mp/{user => fans}/index.vue (98%)

diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql
index 0b5d4e6b3d..fc690f5995 100644
--- a/sql/mysql/ruoyi-vue-pro.sql
+++ b/sql/mysql/ruoyi-vue-pro.sql
@@ -1895,76 +1895,76 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1267, '客户端删除', 'system:oauth2-client:delete', 3, 4, 1263, '', '', '', 0, b'1', b'1', '', '2022-05-10 16:26:33', '1', '2022-05-11 00:31:33', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1281, '报表管理', '', 1, 40, 0, '/visualization', 'chart', NULL, 0, b'1', b'1', '1', '2022-07-10 20:22:15', '1', '2022-12-10 16:33:13', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1282, '报表设计器', '', 2, 1, 1281, 'jimu-report', 'example', 'visualization/jmreport/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-29 12:48:05', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2000, '商品中心', '', 1, 60, 0, '/product', 'merchant', NULL, 0, b'1', b'1', '', '2022-07-29 15:53:53', '1', '2022-07-30 22:26:19', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2002, '商品分类', '', 2, 2, 2000, 'category', 'dict', 'mall/product/category/index', 0, b'1', b'1', '', '2022-07-29 15:53:53', '1', '2022-07-30 22:23:37', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2003, '分类查询', 'product:category:query', 3, 1, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2004, '分类创建', 'product:category:create', 3, 2, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2005, '分类更新', 'product:category:update', 3, 3, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2006, '分类删除', 'product:category:delete', 3, 4, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2008, '商品品牌', '', 2, 3, 2000, 'brand', 'dashboard', 'mall/product/brand/index', 0, b'1', b'1', '', '2022-07-30 13:52:44', '1', '2022-10-24 22:29:30', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2009, '品牌查询', 'product:brand:query', 3, 1, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2010, '品牌创建', 'product:brand:create', 3, 2, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2011, '品牌更新', 'product:brand:update', 3, 3, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2012, '品牌删除', 'product:brand:delete', 3, 4, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2014, '商品列表', '', 2, 1, 2000, 'spu', 'list', 'mall/product/spu/index', 0, b'1', b'1', '', '2022-07-30 14:22:58', '1', '2022-10-24 22:29:25', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2015, '商品查询', 'product:spu:query', 3, 1, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2016, '商品创建', 'product:spu:create', 3, 2, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2017, '商品更新', 'product:spu:update', 3, 3, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2018, '商品删除', 'product:spu:delete', 3, 4, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2019, '商品属性', '', 2, 3, 2000, 'property', 'eye', 'mall/product/property/index', 0, b'1', b'1', '', '2022-08-01 14:55:35', '1', '2022-12-12 20:58:06', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2020, '规格查询', 'product:property:query', 3, 1, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:24', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2021, '规格创建', 'product:property:create', 3, 2, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:30', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2022, '规格更新', 'product:property:update', 3, 3, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:33', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2023, '规格删除', 'product:property:delete', 3, 4, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:37', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2025, 'Banner管理', '', 2, 100, 2000, 'banner', '', 'mall/market/banner/index', 0, b'1', b'1', '', '2022-08-01 14:56:14', '1', '2022-10-24 22:29:39', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2026, 'Banner查询', 'market:banner:query', 3, 1, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2027, 'Banner创建', 'market:banner:create', 3, 2, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2030, '营销中心', '', 1, 70, 0, '/promotion', 'rate', NULL, 0, b'1', b'1', '1', '2022-10-31 21:25:09', '1', '2022-10-31 21:25:09', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2032, '优惠劵', '', 2, 2, 2030, 'coupon-template', 'textarea', 'mall/promotion/couponTemplate/index', 0, b'1', b'1', '', '2022-10-31 22:27:14', '1', '2022-11-05 12:27:34', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2033, '优惠劵模板查询', 'promotion:coupon-template:query', 3, 1, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2034, '优惠劵模板创建', 'promotion:coupon-template:create', 3, 2, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2035, '优惠劵模板更新', 'promotion:coupon-template:update', 3, 3, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2036, '优惠劵模板删除', 'promotion:coupon-template:delete', 3, 4, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2038, '会员优惠劵', '', 2, 2, 2030, 'coupon', '', 'mall/promotion/coupon/index', 0, b'0', b'1', '', '2022-11-03 23:21:31', '1', '2022-11-05 12:27:45', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2039, '优惠劵查询', 'promotion:coupon:query', 3, 1, 2038, '', '', '', 0, b'1', b'1', '', '2022-11-03 23:21:31', '', '2022-11-03 23:21:31', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2040, '优惠劵删除', 'promotion:coupon:delete', 3, 4, 2038, '', '', '', 0, b'1', b'1', '', '2022-11-03 23:21:31', '', '2022-11-03 23:21:31', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2041, '满减送活动', '', 2, 10, 2030, 'reward-activity', 'radio', 'mall/promotion/rewardActivity/index', 0, b'1', b'1', '', '2022-11-04 23:47:49', '1', '2022-11-05 12:27:56', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2042, '满减送活动查询', 'promotion:reward-activity:query', 3, 1, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:49', '', '2022-11-04 23:47:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2043, '满减送活动创建', 'promotion:reward-activity:create', 3, 2, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:49', '', '2022-11-04 23:47:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2044, '满减送活动更新', 'promotion:reward-activity:update', 3, 3, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:50', '', '2022-11-04 23:47:50', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2045, '满减送活动删除', 'promotion:reward-activity:delete', 3, 4, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:50', '', '2022-11-04 23:47:50', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2046, '满减送活动关闭', 'promotion:reward-activity:close', 3, 5, 2041, '', '', '', 0, b'1', b'1', '1', '2022-11-05 10:42:53', '1', '2022-11-05 10:42:53', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2047, '限时折扣活动', '', 2, 7, 2030, 'discount-activity', 'time', 'mall/promotion/discountActivity/index', 0, b'1', b'1', '', '2022-11-05 17:12:15', '1', '2022-11-29 22:14:56', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2048, '限时折扣活动查询', 'promotion:discount-activity:query', 3, 1, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2049, '限时折扣活动创建', 'promotion:discount-activity:create', 3, 2, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2050, '限时折扣活动更新', 'promotion:discount-activity:update', 3, 3, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2051, '限时折扣活动删除', 'promotion:discount-activity:delete', 3, 4, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2052, '限时折扣活动关闭', 'promotion:discount-activity:close', 3, 5, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2059, '秒杀活动管理', '', 2, 0, 2030, 'seckill-activity', 'time-range', 'mall/promotion/seckill/seckillActivity/index', 0, b'1', b'1', '', '2022-11-06 22:24:49', '1', '2022-11-29 22:24:39', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2060, '秒杀活动查询', 'promotion:seckill-activity:query', 3, 1, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2061, '秒杀活动创建', 'promotion:seckill-activity:create', 3, 2, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2062, '秒杀活动更新', 'promotion:seckill-activity:update', 3, 3, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2063, '秒杀活动删除', 'promotion:seckill-activity:delete', 3, 4, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2064, '秒杀活动导出', 'promotion:seckill-activity:export', 3, 5, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2066, '秒杀时段管理', '', 2, 0, 2030, 'seckill-time', '', 'mall/promotion/seckill/seckillTime/index', 0, b'0', b'1', '', '2022-11-15 19:46:50', '1', '2022-11-29 22:09:03', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2067, '秒杀时段查询', 'promotion:seckill-time:query', 3, 1, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2068, '秒杀时段创建', 'promotion:seckill-time:create', 3, 2, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2069, '秒杀时段更新', 'promotion:seckill-time:update', 3, 3, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2070, '秒杀时段删除', 'promotion:seckill-time:delete', 3, 4, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2071, '秒杀时段导出', 'promotion:seckill-time:export', 3, 5, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2072, '订单中心', '', 1, 65, 0, '/trade', 'order', NULL, 0, b'1', b'1', '1', '2022-11-19 18:57:19', '1', '2022-12-10 16:32:57', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2073, '售后退款', '', 2, 1, 2072, 'trade/after-sale', 'education', 'mall/trade/afterSale/index', 0, b'1', b'1', '', '2022-11-19 20:15:32', '1', '2022-12-10 21:11:02', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2074, '售后查询', 'trade:after-sale:query', 3, 1, 2073, '', '', '', 0, b'1', b'1', '', '2022-11-19 20:15:33', '1', '2022-12-10 21:04:29', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2075, '秒杀活动关闭', 'promotion:sekill-activity:close', 3, 6, 2059, '', '', '', 0, b'1', b'1', '1', '2022-11-28 20:20:15', '1', '2022-11-28 20:20:15', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2076, '订单列表', '', 2, 0, 2072, 'trade/order', 'list', 'mall/trade/order/index', 0, b'1', b'1', '1', '2022-12-10 21:05:44', '1', '2022-12-10 21:08:44', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2077, '物流公司管理管理', '', 2, 0, 2072, 'express-company', '', 'mall/trade/expressCompany/index', 0, b'1', b'1', '', '2022-12-20 23:27:55', '1', '2022-12-20 23:36:20', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2078, '物流公司管理查询', 'trade:express-company:query', 3, 1, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2079, '物流公司管理创建', 'trade:express-company:create', 3, 2, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2080, '物流公司管理更新', 'trade:express-company:update', 3, 3, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2081, '物流公司管理删除', 'trade:express-company:delete', 3, 4, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2082, '物流公司管理导出', 'trade:express-company:export', 3, 5, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2000, '商品中心', '', 1, 60, 0, '/product', 'merchant', NULL, 0, b'1', b'1', '', '2022-07-29 15:53:53', '1', '2022-07-30 22:26:19', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2002, '商品分类', '', 2, 2, 2000, 'category', 'dict', 'mall/product/category/index', 0, b'1', b'1', '', '2022-07-29 15:53:53', '1', '2022-07-30 22:23:37', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2003, '分类查询', 'product:category:query', 3, 1, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2004, '分类创建', 'product:category:create', 3, 2, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2005, '分类更新', 'product:category:update', 3, 3, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2006, '分类删除', 'product:category:delete', 3, 4, 2002, '', '', '', 0, b'1', b'1', '', '2022-07-29 15:53:53', '', '2022-07-29 15:53:53', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2008, '商品品牌', '', 2, 3, 2000, 'brand', 'dashboard', 'mall/product/brand/index', 0, b'1', b'1', '', '2022-07-30 13:52:44', '1', '2022-10-24 22:29:30', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2009, '品牌查询', 'product:brand:query', 3, 1, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2010, '品牌创建', 'product:brand:create', 3, 2, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2011, '品牌更新', 'product:brand:update', 3, 3, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2012, '品牌删除', 'product:brand:delete', 3, 4, 2008, '', '', '', 0, b'1', b'1', '', '2022-07-30 13:52:44', '', '2022-07-30 13:52:44', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2014, '商品列表', '', 2, 1, 2000, 'spu', 'list', 'mall/product/spu/index', 0, b'1', b'1', '', '2022-07-30 14:22:58', '1', '2022-10-24 22:29:25', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2015, '商品查询', 'product:spu:query', 3, 1, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2016, '商品创建', 'product:spu:create', 3, 2, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2017, '商品更新', 'product:spu:update', 3, 3, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2018, '商品删除', 'product:spu:delete', 3, 4, 2014, '', '', '', 0, b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2019, '商品属性', '', 2, 3, 2000, 'property', 'eye', 'mall/product/property/index', 0, b'1', b'1', '', '2022-08-01 14:55:35', '1', '2022-12-12 20:58:06', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2020, '规格查询', 'product:property:query', 3, 1, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:24', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2021, '规格创建', 'product:property:create', 3, 2, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:30', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2022, '规格更新', 'product:property:update', 3, 3, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:33', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2023, '规格删除', 'product:property:delete', 3, 4, 2019, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:55:35', '', '2022-12-12 20:26:37', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2025, 'Banner管理', '', 2, 100, 2000, 'banner', '', 'mall/market/banner/index', 0, b'1', b'1', '', '2022-08-01 14:56:14', '1', '2022-10-24 22:29:39', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2026, 'Banner查询', 'market:banner:query', 3, 1, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2027, 'Banner创建', 'market:banner:create', 3, 2, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', 0, b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2030, '营销中心', '', 1, 70, 0, '/promotion', 'rate', NULL, 0, b'1', b'1', '1', '2022-10-31 21:25:09', '1', '2022-10-31 21:25:09', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2032, '优惠劵', '', 2, 2, 2030, 'coupon-template', 'textarea', 'mall/promotion/couponTemplate/index', 0, b'1', b'1', '', '2022-10-31 22:27:14', '1', '2022-11-05 12:27:34', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2033, '优惠劵模板查询', 'promotion:coupon-template:query', 3, 1, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2034, '优惠劵模板创建', 'promotion:coupon-template:create', 3, 2, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2035, '优惠劵模板更新', 'promotion:coupon-template:update', 3, 3, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2036, '优惠劵模板删除', 'promotion:coupon-template:delete', 3, 4, 2032, '', '', '', 0, b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2038, '会员优惠劵', '', 2, 2, 2030, 'coupon', '', 'mall/promotion/coupon/index', 0, b'0', b'1', '', '2022-11-03 23:21:31', '1', '2022-11-05 12:27:45', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2039, '优惠劵查询', 'promotion:coupon:query', 3, 1, 2038, '', '', '', 0, b'1', b'1', '', '2022-11-03 23:21:31', '', '2022-11-03 23:21:31', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2040, '优惠劵删除', 'promotion:coupon:delete', 3, 4, 2038, '', '', '', 0, b'1', b'1', '', '2022-11-03 23:21:31', '', '2022-11-03 23:21:31', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2041, '满减送活动', '', 2, 10, 2030, 'reward-activity', 'radio', 'mall/promotion/rewardActivity/index', 0, b'1', b'1', '', '2022-11-04 23:47:49', '1', '2022-11-05 12:27:56', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2042, '满减送活动查询', 'promotion:reward-activity:query', 3, 1, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:49', '', '2022-11-04 23:47:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2043, '满减送活动创建', 'promotion:reward-activity:create', 3, 2, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:49', '', '2022-11-04 23:47:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2044, '满减送活动更新', 'promotion:reward-activity:update', 3, 3, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:50', '', '2022-11-04 23:47:50', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2045, '满减送活动删除', 'promotion:reward-activity:delete', 3, 4, 2041, '', '', '', 0, b'1', b'1', '', '2022-11-04 23:47:50', '', '2022-11-04 23:47:50', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2046, '满减送活动关闭', 'promotion:reward-activity:close', 3, 5, 2041, '', '', '', 0, b'1', b'1', '1', '2022-11-05 10:42:53', '1', '2022-11-05 10:42:53', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2047, '限时折扣活动', '', 2, 7, 2030, 'discount-activity', 'time', 'mall/promotion/discountActivity/index', 0, b'1', b'1', '', '2022-11-05 17:12:15', '1', '2022-11-29 22:14:56', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2048, '限时折扣活动查询', 'promotion:discount-activity:query', 3, 1, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2049, '限时折扣活动创建', 'promotion:discount-activity:create', 3, 2, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2050, '限时折扣活动更新', 'promotion:discount-activity:update', 3, 3, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2051, '限时折扣活动删除', 'promotion:discount-activity:delete', 3, 4, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2052, '限时折扣活动关闭', 'promotion:discount-activity:close', 3, 5, 2047, '', '', '', 0, b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2059, '秒杀活动管理', '', 2, 0, 2030, 'seckill-activity', 'time-range', 'mall/promotion/seckill/seckillActivity/index', 0, b'1', b'1', '', '2022-11-06 22:24:49', '1', '2022-11-29 22:24:39', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2060, '秒杀活动查询', 'promotion:seckill-activity:query', 3, 1, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2061, '秒杀活动创建', 'promotion:seckill-activity:create', 3, 2, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2062, '秒杀活动更新', 'promotion:seckill-activity:update', 3, 3, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2063, '秒杀活动删除', 'promotion:seckill-activity:delete', 3, 4, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2064, '秒杀活动导出', 'promotion:seckill-activity:export', 3, 5, 2059, '', '', '', 0, b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2066, '秒杀时段管理', '', 2, 0, 2030, 'seckill-time', '', 'mall/promotion/seckill/seckillTime/index', 0, b'0', b'1', '', '2022-11-15 19:46:50', '1', '2022-11-29 22:09:03', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2067, '秒杀时段查询', 'promotion:seckill-time:query', 3, 1, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2068, '秒杀时段创建', 'promotion:seckill-time:create', 3, 2, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2069, '秒杀时段更新', 'promotion:seckill-time:update', 3, 3, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2070, '秒杀时段删除', 'promotion:seckill-time:delete', 3, 4, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2071, '秒杀时段导出', 'promotion:seckill-time:export', 3, 5, 2066, '', '', '', 0, b'1', b'1', '', '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2072, '订单中心', '', 1, 65, 0, '/trade', 'order', NULL, 0, b'1', b'1', '1', '2022-11-19 18:57:19', '1', '2022-12-10 16:32:57', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2073, '售后退款', '', 2, 1, 2072, 'trade/after-sale', 'education', 'mall/trade/afterSale/index', 0, b'1', b'1', '', '2022-11-19 20:15:32', '1', '2022-12-10 21:11:02', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2074, '售后查询', 'trade:after-sale:query', 3, 1, 2073, '', '', '', 0, b'1', b'1', '', '2022-11-19 20:15:33', '1', '2022-12-10 21:04:29', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2075, '秒杀活动关闭', 'promotion:sekill-activity:close', 3, 6, 2059, '', '', '', 0, b'1', b'1', '1', '2022-11-28 20:20:15', '1', '2022-11-28 20:20:15', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2076, '订单列表', '', 2, 0, 2072, 'trade/order', 'list', 'mall/trade/order/index', 0, b'1', b'1', '1', '2022-12-10 21:05:44', '1', '2022-12-10 21:08:44', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2077, '物流公司管理管理', '', 2, 0, 2072, 'express-company', '', 'mall/trade/expressCompany/index', 0, b'1', b'1', '', '2022-12-20 23:27:55', '1', '2022-12-20 23:36:20', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2078, '物流公司管理查询', 'trade:express-company:query', 3, 1, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2079, '物流公司管理创建', 'trade:express-company:create', 3, 2, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2080, '物流公司管理更新', 'trade:express-company:update', 3, 3, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2081, '物流公司管理删除', 'trade:express-company:delete', 3, 4, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
+# INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2082, '物流公司管理导出', 'trade:express-company:export', 3, 5, 2077, '', '', '', 0, b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2083, '地区管理', '', 2, 14, 1, 'area', 'row', 'system/area/index', 0, b'1', b'1', '1', '2022-12-23 17:35:05', '1', '2022-12-23 17:35:48', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2084, '公众号管理', '', 1, 100, 0, '/mp', 'wechat', NULL, 0, b'1', b'1', '1', '2023-01-01 20:11:04', '1', '2023-01-15 11:28:57', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2085, '账号管理', 'mp:account:query', 2, 1, 2084, 'account', 'phone', 'mp/account/index', 0, b'1', b'1', '1', '2023-01-01 20:13:31', '1', '2023-01-01 20:14:39', b'0');
@@ -1981,10 +1981,10 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2096, '修改标签', 'mp:tag:update', 3, 2, 2093, '', '', '', 0, b'1', b'1', '1', '2023-01-08 11:59:41', '1', '2023-01-08 11:59:41', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2097, '删除标签', 'mp:tag:delete', 3, 3, 2093, '', '', '', 0, b'1', b'1', '1', '2023-01-08 12:00:04', '1', '2023-01-08 12:00:13', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2098, '同步标签', 'mp:tag:sync', 3, 4, 2093, '', '', '', 0, b'1', b'1', '1', '2023-01-08 12:00:29', '1', '2023-01-08 12:00:29', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2099, '粉丝管理', '', 2, 4, 2084, 'user', 'people', 'mp/user/index', 0, b'1', b'1', '1', '2023-01-08 16:51:20', '1', '2023-01-08 16:56:19', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2100, '查询粉丝', 'mp:user:query', 3, 0, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:16:59', '1', '2023-01-08 17:17:23', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2101, '修改粉丝', 'mp:user:update', 3, 1, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:11', '1', '2023-01-08 17:17:11', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2102, '同步粉丝', 'mp:user:sync', 3, 2, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:40', '1', '2023-01-08 17:17:40', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2099, '粉丝管理', '', 2, 4, 2084, 'fans', 'people', 'mp/fans/index', 0, b'1', b'1', '1', '2023-01-08 16:51:20', '1', '2023-01-08 16:56:19', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2100, '查询粉丝', 'mp:fans:query', 3, 0, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:16:59', '1', '2023-01-08 17:17:23', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2101, '修改粉丝', 'mp:fans:update', 3, 1, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:11', '1', '2023-01-08 17:17:11', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2102, '同步粉丝', 'mp:fans:sync', 3, 2, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:40', '1', '2023-01-08 17:17:40', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2103, '消息管理', '', 2, 5, 2084, 'message', 'email', 'mp/message/index', 0, b'1', b'1', '1', '2023-01-08 18:44:19', '1', '2023-01-08 18:44:19', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2104, '图文发表记录', '', 2, 10, 2084, 'free-publish', 'education', 'mp/freePublish/index', 0, b'1', b'1', '1', '2023-01-13 00:30:50', '1', '2023-01-13 00:30:50', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2105, '查询发布列表', 'mp:free-publish:query', 3, 1, 2104, '', '', '', 0, b'1', b'1', '1', '2023-01-13 07:19:17', '1', '2023-01-13 07:19:17', b'0');
diff --git a/yudao-ui-admin/src/views/mp/user/index.vue b/yudao-ui-admin/src/views/mp/fans/index.vue
similarity index 98%
rename from yudao-ui-admin/src/views/mp/user/index.vue
rename to yudao-ui-admin/src/views/mp/fans/index.vue
index f9901153b6..a839148b9d 100644
--- a/yudao-ui-admin/src/views/mp/user/index.vue
+++ b/yudao-ui-admin/src/views/mp/fans/index.vue
@@ -25,7 +25,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-refresh" size="mini" @click="handleSync"
-                   v-hasPermi="['mp:user:sync']">同步
+                   v-hasPermi="['mp:fans:sync']">同步
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -58,7 +58,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['mp:user:update']">修改</el-button>
+                     v-hasPermi="['mp:fans:update']">修改</el-button>
         </template>
       </el-table-column>
     </el-table>

From c6f880bfc11e19001d695cd8f37b1c0bb575e0d9 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 31 Jan 2023 09:28:07 +0800
Subject: [PATCH 64/67] up springboot 2.7.8

---
 pom.xml                                          | 2 +-
 yudao-dependencies/pom.xml                       | 2 +-
 yudao-example/yudao-sso-demo-by-code/pom.xml     | 2 +-
 yudao-example/yudao-sso-demo-by-password/pom.xml | 2 +-
 yudao-server/pom.xml                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec0fb64052..86eabaec70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <!-- 看看咋放到 bom 里 -->
         <lombok.version>1.18.24</lombok.version>
-        <spring.boot.version>2.7.7</spring.boot.version>
+        <spring.boot.version>2.7.8</spring.boot.version>
         <mapstruct.version>1.5.3.Final</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 84fc8abc7f..92272ed792 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <revision>1.7.0-snapshot</revision>
         <!-- 统一依赖管理 -->
-        <spring.boot.version>2.7.7</spring.boot.version>
+        <spring.boot.version>2.7.8</spring.boot.version>
         <!-- Web 相关 -->
         <knife4j.version>4.0.0</knife4j.version>
         <swagger-annotations.version>1.6.8</swagger-annotations.version>
diff --git a/yudao-example/yudao-sso-demo-by-code/pom.xml b/yudao-example/yudao-sso-demo-by-code/pom.xml
index ef83df4acc..f60c21cb6f 100644
--- a/yudao-example/yudao-sso-demo-by-code/pom.xml
+++ b/yudao-example/yudao-sso-demo-by-code/pom.xml
@@ -21,7 +21,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- 统一依赖管理 -->
-        <spring.boot.version>2.7.7</spring.boot.version>
+        <spring.boot.version>2.7.8</spring.boot.version>
     </properties>
 
     <dependencyManagement>
diff --git a/yudao-example/yudao-sso-demo-by-password/pom.xml b/yudao-example/yudao-sso-demo-by-password/pom.xml
index 391358ee2a..0f7f9056af 100644
--- a/yudao-example/yudao-sso-demo-by-password/pom.xml
+++ b/yudao-example/yudao-sso-demo-by-password/pom.xml
@@ -21,7 +21,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- 统一依赖管理 -->
-        <spring.boot.version>2.7.7</spring.boot.version>
+        <spring.boot.version>2.7.8</spring.boot.version>
     </properties>
 
     <dependencyManagement>
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index 03cd5c9f6d..546eff4217 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -112,7 +112,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.7</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
+                <version>2.7.8</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
                 <configuration>
                     <fork>true</fork>
                 </configuration>

From 8c4bdccd4875684cf5f54696ac072d82ebb93d7e Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 31 Jan 2023 09:31:41 +0800
Subject: [PATCH 65/67] up captcha-plus 1.0.2

---
 yudao-dependencies/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 92272ed792..ec6e062ea5 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -41,12 +41,12 @@
         <!-- Bpm 工作流相关 -->
         <flowable.version>6.8.0</flowable.version>
         <!-- 工具类相关 -->
-        <captcha-plus.version>1.0.1</captcha-plus.version>
+        <captcha-plus.version>1.0.2</captcha-plus.version>
         <jsoup.version>1.15.3</jsoup.version>
         <lombok.version>1.18.24</lombok.version>
         <mapstruct.version>1.5.3.Final</mapstruct.version>
         <hutool.version>5.8.11</hutool.version>
-        <easyexcel.verion>3.1.5</easyexcel.verion>
+        <easyexcel.verion>3.2.0</easyexcel.verion>
         <velocity.version>2.3</velocity.version>
         <screw.version>1.0.5</screw.version>
         <fastjson.version>1.2.83</fastjson.version>

From 2ea9027031a23ac19f523cf2872fb9ad47dd2d95 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 31 Jan 2023 13:22:26 +0800
Subject: [PATCH 66/67] mp user => mp mpuser

---
 sql/mysql/ruoyi-vue-pro.sql                            | 8 ++++----
 yudao-ui-admin/src/api/mp/{user.js => mpuser.js}       | 0
 yudao-ui-admin/src/views/mp/components/wx-msg/main.vue | 2 +-
 yudao-ui-admin/src/views/mp/{fans => mpuser}/index.vue | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename yudao-ui-admin/src/api/mp/{user.js => mpuser.js} (100%)
 rename yudao-ui-admin/src/views/mp/{fans => mpuser}/index.vue (98%)

diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql
index fc690f5995..905338a86c 100644
--- a/sql/mysql/ruoyi-vue-pro.sql
+++ b/sql/mysql/ruoyi-vue-pro.sql
@@ -1981,10 +1981,10 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2096, '修改标签', 'mp:tag:update', 3, 2, 2093, '', '', '', 0, b'1', b'1', '1', '2023-01-08 11:59:41', '1', '2023-01-08 11:59:41', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2097, '删除标签', 'mp:tag:delete', 3, 3, 2093, '', '', '', 0, b'1', b'1', '1', '2023-01-08 12:00:04', '1', '2023-01-08 12:00:13', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2098, '同步标签', 'mp:tag:sync', 3, 4, 2093, '', '', '', 0, b'1', b'1', '1', '2023-01-08 12:00:29', '1', '2023-01-08 12:00:29', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2099, '粉丝管理', '', 2, 4, 2084, 'fans', 'people', 'mp/fans/index', 0, b'1', b'1', '1', '2023-01-08 16:51:20', '1', '2023-01-08 16:56:19', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2100, '查询粉丝', 'mp:fans:query', 3, 0, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:16:59', '1', '2023-01-08 17:17:23', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2101, '修改粉丝', 'mp:fans:update', 3, 1, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:11', '1', '2023-01-08 17:17:11', b'0');
-INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2102, '同步粉丝', 'mp:fans:sync', 3, 2, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:40', '1', '2023-01-08 17:17:40', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2099, '粉丝管理', '', 2, 4, 2084, 'mpuser', 'people', 'mp/mpuser/index', 0, b'1', b'1', '1', '2023-01-08 16:51:20', '1', '2023-01-08 16:56:19', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2100, '查询粉丝', 'mp:user:query', 3, 0, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:16:59', '1', '2023-01-08 17:17:23', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2101, '修改粉丝', 'mp:user:update', 3, 1, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:11', '1', '2023-01-08 17:17:11', b'0');
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2102, '同步粉丝', 'mp:user:sync', 3, 2, 2099, '', '', '', 0, b'1', b'1', '1', '2023-01-08 17:17:40', '1', '2023-01-08 17:17:40', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2103, '消息管理', '', 2, 5, 2084, 'message', 'email', 'mp/message/index', 0, b'1', b'1', '1', '2023-01-08 18:44:19', '1', '2023-01-08 18:44:19', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2104, '图文发表记录', '', 2, 10, 2084, 'free-publish', 'education', 'mp/freePublish/index', 0, b'1', b'1', '1', '2023-01-13 00:30:50', '1', '2023-01-13 00:30:50', b'0');
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2105, '查询发布列表', 'mp:free-publish:query', 3, 1, 2104, '', '', '', 0, b'1', b'1', '1', '2023-01-13 07:19:17', '1', '2023-01-13 07:19:17', b'0');
diff --git a/yudao-ui-admin/src/api/mp/user.js b/yudao-ui-admin/src/api/mp/mpuser.js
similarity index 100%
rename from yudao-ui-admin/src/api/mp/user.js
rename to yudao-ui-admin/src/api/mp/mpuser.js
diff --git a/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue b/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
index 4e47148c12..c6155eae9a 100644
--- a/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
+++ b/yudao-ui-admin/src/views/mp/components/wx-msg/main.vue
@@ -110,7 +110,7 @@ import { getMessagePage, sendMessage } from '@/api/mp/message'
   import WxNews from '@/views/mp/components/wx-news/main.vue';
   import WxLocation from '@/views/mp/components/wx-location/main.vue';
   import WxMusic from '@/views/mp/components/wx-music/main.vue';
-import { getUser } from "@/api/mp/user";
+import { getUser } from "@/api/mp/mpuser";
 
 export default {
   name: "wxMsg",
diff --git a/yudao-ui-admin/src/views/mp/fans/index.vue b/yudao-ui-admin/src/views/mp/mpuser/index.vue
similarity index 98%
rename from yudao-ui-admin/src/views/mp/fans/index.vue
rename to yudao-ui-admin/src/views/mp/mpuser/index.vue
index a839148b9d..8480610b8a 100644
--- a/yudao-ui-admin/src/views/mp/fans/index.vue
+++ b/yudao-ui-admin/src/views/mp/mpuser/index.vue
@@ -25,7 +25,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-refresh" size="mini" @click="handleSync"
-                   v-hasPermi="['mp:fans:sync']">同步
+                   v-hasPermi="['mp:user:sync']">同步
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -58,7 +58,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['mp:fans:update']">修改</el-button>
+                     v-hasPermi="['mp:user:update']">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import { updateUser, getUser, getUserPage, syncUser } from "@/api/mp/user";
+import { updateUser, getUser, getUserPage, syncUser } from "@/api/mp/mpuser";
 import { getSimpleAccounts } from "@/api/mp/account";
 import { getSimpleTags } from "@/api/mp/tag";
 

From 0bd0bbd5365017b28f07032e4ad7b3dc48af5c4c Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 31 Jan 2023 13:28:16 +0800
Subject: [PATCH 67/67] =?UTF-8?q?fix:=20slot-scope=20=E5=B7=B2=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=20=3D=3D=E3=80=8B=20v-slot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/form/ElementForm.vue        |  8 ++---
 .../penal/listeners/ElementListeners.vue      |  4 +--
 .../penal/listeners/UserTaskListeners.vue     |  4 +--
 .../package/penal/listeners/template.js       |  4 +--
 .../penal/properties/ElementProperties.vue    |  2 +-
 .../src/layout/components/Message/index.vue   |  2 +-
 .../src/views/infra/build/RightPanel.vue      |  2 +-
 .../src/views/mall/product/property/index.vue |  6 ++--
 .../src/views/mall/product/property/value.vue |  4 +--
 .../src/views/mall/product/spu/index.vue      | 32 +++++++++----------
 .../src/views/mall/product/spu/save.vue       | 22 ++++++-------
 .../src/views/mall/promotion/coupon/index.vue | 12 +++----
 .../mall/promotion/couponTemplate/index.vue   |  8 ++---
 .../mall/promotion/discountActivity/index.vue | 18 +++++------
 .../mall/promotion/rewardActivity/index.vue   |  8 ++---
 .../seckill/seckillActivity/index.vue         | 22 ++++++-------
 .../promotion/seckill/seckillTime/index.vue   |  8 ++---
 .../src/views/mall/trade/afterSale/index.vue  |  2 +-
 .../src/views/mall/trade/order/detail.vue     |  8 ++---
 .../src/views/mall/trade/order/index.vue      |  8 ++---
 yudao-ui-admin/src/views/mp/account/index.vue |  4 +--
 .../src/views/mp/autoReply/index.vue          |  6 ++--
 .../src/views/mp/material/index.vue           |  2 +-
 yudao-ui-admin/src/views/mp/message/index.vue |  8 ++---
 yudao-ui-admin/src/views/mp/mpuser/index.vue  |  8 ++---
 yudao-ui-admin/src/views/mp/tag/index.vue     |  4 +--
 .../src/views/system/notify/my/index.vue      |  6 ++--
 .../views/system/notify/template/index.vue    |  6 ++--
 .../src/views/system/role/index.vue           |  8 ++---
 29 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
index fc7dbb3419..43668e71e6 100644
--- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
+++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
@@ -21,7 +21,7 @@
         <el-table-column label="字段类型" prop="type" min-width="80px" :formatter="row => fieldType[row.type] || row.type" show-overflow-tooltip />
         <el-table-column label="默认值" prop="defaultValue" min-width="80px" show-overflow-tooltip />
         <el-table-column label="操作" width="90px">
-          <template slot-scope="{ row, $index }">
+          <template v-slot="{ row, $index }">
             <el-button size="mini" type="text" @click="openFieldForm(row, $index)">编辑</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button>
@@ -70,7 +70,7 @@
           <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />
           <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />
           <el-table-column label="操作" width="90px">
-            <template slot-scope="{ row, $index }">
+            <template v-slot="{ row, $index }">
               <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button>
               <el-divider direction="vertical" />
               <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button>
@@ -90,7 +90,7 @@
         <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />
         <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />
         <el-table-column label="操作" width="90px">
-          <template slot-scope="{ row, $index }">
+          <template v-slot="{ row, $index }">
             <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button>
@@ -109,7 +109,7 @@
         <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />
         <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
         <el-table-column label="操作" width="90px">
-          <template slot-scope="{ row, $index }">
+          <template v-slot="{ row, $index }">
             <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button>
diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
index 16f5099515..4555c1f477 100644
--- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
+++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
@@ -5,7 +5,7 @@
       <el-table-column label="事件类型" min-width="100px" prop="event" />
       <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
       <el-table-column label="操作" width="90px">
-        <template slot-scope="{ row, $index }">
+        <template v-slot="{ row, $index }">
           <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
@@ -108,7 +108,7 @@
         <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
         <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
         <el-table-column label="操作" width="100px">
-          <template slot-scope="{ row, $index }">
+          <template v-slot="{ row, $index }">
             <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
index b71e868e60..d198c43866 100644
--- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
+++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
@@ -6,7 +6,7 @@
       <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />
       <el-table-column label="监听器类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
       <el-table-column label="操作" width="90px">
-        <template slot-scope="{ row, $index }">
+        <template v-slot="{ row, $index }">
           <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
@@ -132,7 +132,7 @@
         <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
         <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
         <el-table-column label="操作" width="100px">
-          <template slot-scope="{ row, $index }">
+          <template v-slot="{ row, $index }">
             <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/template.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
index 455b70d8be..0ab64d0e16 100644
--- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
+++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
@@ -6,7 +6,7 @@ export const template = isTaskListener => {
       <el-table-column label="事件类型" min-width="100px" prop="event" />
       <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
       <el-table-column label="操作" width="90px">
-        <template slot-scope="{ row, $index }">
+        <template v-slot="{ row, $index }">
           <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
@@ -124,7 +124,7 @@ export const template = isTaskListener => {
         <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
         <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
         <el-table-column label="操作" width="100px">
-          <template slot-scope="{ row, $index }">
+          <template v-slot="{ row, $index }">
             <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
index 2666a24b22..a24e8c182d 100644
--- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
+++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
@@ -5,7 +5,7 @@
       <el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip />
       <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
       <el-table-column label="操作" width="90px">
-        <template slot-scope="{ row, $index }">
+        <template v-slot="{ row, $index }">
           <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>
diff --git a/yudao-ui-admin/src/layout/components/Message/index.vue b/yudao-ui-admin/src/layout/components/Message/index.vue
index e490605618..c27e8eeb59 100644
--- a/yudao-ui-admin/src/layout/components/Message/index.vue
+++ b/yudao-ui-admin/src/layout/components/Message/index.vue
@@ -10,7 +10,7 @@
       <el-table v-loading="loading" :data="list">
         <el-table-column width="120" property="templateNickname" label="发送人" />
         <el-table-column width="180" property="createTime" label="发送时间">
-          <template slot-scope="scope">
+          <template v-slot="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
diff --git a/yudao-ui-admin/src/views/infra/build/RightPanel.vue b/yudao-ui-admin/src/views/infra/build/RightPanel.vue
index 39cb0cc725..127b7039e9 100644
--- a/yudao-ui-admin/src/views/infra/build/RightPanel.vue
+++ b/yudao-ui-admin/src/views/infra/build/RightPanel.vue
@@ -554,7 +554,7 @@
               default-expand-all
               draggable
             >
-              <span slot-scope="{ node, data }">
+              <span v-slot="{ node, data }">
                 <span class="node-label">
                   <svg-icon class="node-icon" :icon-class="data.__config__?data.__config__.tagIcon:data.tagIcon" />
                   {{ node.label }}
diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue
index 26906a1e7d..dca67dfc2d 100644
--- a/yudao-ui-admin/src/views/mall/product/property/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/index.vue
@@ -29,7 +29,7 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="名称" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <router-link :to="'/property/value/' + scope.row.id" class="link-type">
             <span>{{ scope.row.name }}</span>
           </router-link>
@@ -37,12 +37,12 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['product:property:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
diff --git a/yudao-ui-admin/src/views/mall/product/property/value.vue b/yudao-ui-admin/src/views/mall/product/property/value.vue
index 22efe2c26a..bef8a4e8d5 100644
--- a/yudao-ui-admin/src/views/mall/product/property/value.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/value.vue
@@ -29,12 +29,12 @@
       <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:dict:update']">修改
           </el-button>
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index 3061c84174..f86188eab7 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -67,7 +67,7 @@
         <!-- 列表 -->
         <el-table v-loading="loading" :data="list">
           <el-table-column label="商品信息" align="center" width="260">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <div class="product-info">
                 <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height" />
                 <div class="message">{{ scope.row.name }}</div>
@@ -80,17 +80,17 @@
           <el-table-column label="销量" align="center" prop="salesCount"/>
           <el-table-column label="排序" align="center" prop="sort"/>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="status">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                          v-hasPermi="['product:spu:update']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -105,7 +105,7 @@
         <!-- 列表 -->
         <el-table v-loading="loading" :data="list">
           <el-table-column label="商品信息" align="center" width="260">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <div class="product-info">
                 <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/>
                 <div class="message">{{ scope.row.name }}</div>
@@ -117,17 +117,17 @@
           <el-table-column label="销量" align="center" prop="salesCount"/>
           <el-table-column label="排序" align="center" prop="sort"/>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="status">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                          v-hasPermi="['product:spu:update']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -142,7 +142,7 @@
         <!-- 列表 -->
         <el-table v-loading="loading" :data="list">
           <el-table-column label="商品信息" align="center" width="260">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <div class="product-info">
                 <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/>
                 <div class="message">{{ scope.row.name }}</div>
@@ -154,17 +154,17 @@
           <el-table-column label="销量" align="center" prop="salesCount"/>
           <el-table-column label="排序" align="center" prop="sort"/>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="status">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                          v-hasPermi="['product:spu:update']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -179,7 +179,7 @@
         <!-- 列表 -->
         <el-table v-loading="loading" :data="list">
           <el-table-column label="商品信息" align="center" width="260">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <div class="product-info">
                 <img v-if="scope.row.picUrls" :src="scope.row.picUrls[0]" alt="分类图片" class="img-height"/>
                 <div class="message">{{ scope.row.name }}</div>
@@ -191,17 +191,17 @@
           <el-table-column label="销量" align="center" prop="salesCount"/>
           <el-table-column label="排序" align="center" prop="sort"/>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="status">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <dict-tag :type="DICT_TYPE.PRODUCT_SPU_STATUS" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                          v-hasPermi="['product:spu:update']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
diff --git a/yudao-ui-admin/src/views/mall/product/spu/save.vue b/yudao-ui-admin/src/views/mall/product/spu/save.vue
index 82e58d10ab..1e2f482557 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/save.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/save.vue
@@ -69,18 +69,18 @@
               <template v-if="this.specSwitch">
                 <el-table-column :key="index" v-for="(item, index) in dynamicSpec.filter(v => v.specName !== undefined)"
                                  :label="item.specName">
-                  <template slot-scope="scope">
+                  <template v-slot="scope">
                     <el-input v-if="scope.row.spec" v-model="scope.row.spec[index]" disabled/>
                   </template>
                 </el-table-column>
               </template>
               <el-table-column label="规格图片" width="120px" :render-header="addRedStar" key="90">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false" style="width: 100px; height: 50px"/>
                 </template>
               </el-table-column>
               <el-table-column label="市场价(元)" :render-header="addRedStar" key="92">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]">
                     <el-input v-model="scope.row.marketPrice"
                               oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"/>
@@ -88,7 +88,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="销售价(元)" :render-header="addRedStar" key="93">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-form-item :prop="'rates.'+ scope.$index + '.price'"
                                 :rules="[{required: true, trigger: 'change'}]">
                     <el-input v-model="scope.row.price"
@@ -97,7 +97,7 @@
                 </template>
               </el-table-column>
               <el-table-column label="成本价" :render-header="addRedStar" key="94">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-form-item :prop="'rates.'+ scope.$index + '.costPrice'"
                                 :rules="[{required: true, trigger: 'change'}]">
                     <el-input v-model="scope.row.costPrice"
@@ -106,35 +106,35 @@
                 </template>
               </el-table-column>
               <el-table-column label="库存" :render-header="addRedStar" key="95">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-form-item :prop="'rates.'+ scope.$index + '.stock'" :rules="[{required: true, trigger: 'change'}]">
                     <el-input v-model="scope.row.stock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column label="预警库存" key="96">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-input v-model="scope.row.warnStock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="体积" key="97">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-input v-model="scope.row.volume" />
                 </template>
               </el-table-column>
               <el-table-column label="重量" key="98">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-input v-model="scope.row.weight" />
                 </template>
               </el-table-column>
               <el-table-column label="条码" key="99">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                   <el-input v-model="scope.row.barCode" />
                 </template>
               </el-table-column>
               <template v-if="this.specSwitch">
                 <el-table-column fixed="right" label="操作" width="50" key="100">
-                  <template slot-scope="scope">
+                  <template v-slot="scope">
                     <el-button @click="scope.row.status = 1" type="text" size="small"
                                v-show="scope.row.status === undefined || scope.row.status === 0 ">禁用
                     </el-button>
diff --git a/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue b/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
index 9049900c6f..7c866636a7 100755
--- a/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
@@ -30,32 +30,32 @@
       <el-table-column label="会员信息" align="center" prop="nickname" /> <!-- TODO 芋艿：以后支持头像，支持跳转 -->
       <el-table-column label="优惠劵" align="center" prop="name" />
       <el-table-column label="优惠券类型" align="center" prop="discountType">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" />
         </template>
       </el-table-column>
       <el-table-column label="领取方式" align="center" prop="takeType">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_TAKE_TYPE" :value="scope.row.takeType" />
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_COUPON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="领取时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="使用时间" align="center" prop="useTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.useTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['promotion:coupon:delete']">回收</el-button>
         </template>
diff --git a/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue b/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
index 3e77bb008d..4a50c9ed1a 100755
--- a/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
@@ -44,7 +44,7 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="优惠券名称" align="center" prop="name" />
       <el-table-column label="优惠券类型" align="center" prop="discountType">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_DISCOUNT_TYPE" :value="scope.row.discountType" />
         </template>
       </el-table-column>
@@ -54,17 +54,17 @@
       <el-table-column label="领取上限" align="center" prop="takeLimitCount" :formatter="takeLimitCountFormat" />
       <el-table-column label="有效期限" align="center" prop="validityType" width="180" :formatter="validityTypeFormat" />
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['promotion:coupon-template:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
diff --git a/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
index 267dbf0932..cfe4364fae 100755
--- a/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
@@ -35,23 +35,23 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="活动名称" align="center" prop="name" />
       <el-table-column label="活动时间" align="center" prop="startTime" width="240">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <div>开始：{{ parseTime(scope.row.startTime) }}</div>
           <div>结束：{{ parseTime(scope.row.endTime) }}</div>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-if="scope.row.status !== PromotionActivityStatusEnum.CLOSE.type"
                      v-hasPermi="['promotion:discount-activity:update']">修改</el-button>
@@ -92,18 +92,18 @@
           </el-select>
           <el-table v-loading="loading" :data="form.products">
             <el-table-column label="商品名称" align="center" width="200">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 {{ scope.row.spuName }} &nbsp; {{ scope.row.name}}
               </template>
             </el-table-column>
             <el-table-column label="商品价格" align="center" prop="price">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 ￥{{ (scope.row.price / 100.0).toFixed(2) }}
               </template>
             </el-table-column>
             <el-table-column label="库存" align="center" prop="stock" />
             <el-table-column label="优惠类型" align="center" property="discountType">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-select v-model="scope.row.discountType" placeholder="请选择优惠类型">
                   <el-option v-for="dict in getDictDatas(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)"
                              :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"/>
@@ -111,7 +111,7 @@
               </template>
             </el-table-column>
             <el-table-column label="优惠" align="center" prop="startTime" width="250">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-form-item v-if="scope.row.discountType === PromotionDiscountTypeEnum.PRICE.type" prop="discountPrice">
                   减 <el-input-number v-model="scope.row.discountPrice" placeholder="请输入优惠金额"
                                       style="width: 190px" :precision="2" :min="0" :max="scope.row.price / 100.0 - 0.01" /> 元
@@ -123,7 +123,7 @@
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-button size="mini" type="text" icon="el-icon-delete" @click="removeFormSku(scope.row.skuId)">删除</el-button>
               </template>
             </el-table-column>
diff --git a/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
index cf270c0214..4520e1e7e7 100755
--- a/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
@@ -31,23 +31,23 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="活动名称" align="center" prop="name" />
       <el-table-column label="活动时间" align="center" prop="startTime" width="240">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <div>开始：{{ parseTime(scope.row.startTime) }}</div>
           <div>结束：{{ parseTime(scope.row.endTime) }}</div>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-if="scope.row.status !== PromotionActivityStatusEnum.CLOSE.type"
                      v-hasPermi="['promotion:reward-activity:update']">修改</el-button>
diff --git a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
index 265c547495..c36cbf1662 100644
--- a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
@@ -47,12 +47,12 @@
         <el-table v-loading="loading" :data="list">
             <el-table-column label="活动名称" align="center" prop="name" />
             <el-table-column label="活动状态" align="center" prop="status">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                     <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
                 </template>
             </el-table-column>
             <el-table-column label="参与场次" prop="timeIds" width="250">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                     <span v-for="item in seckillTimeList" :key="item.id"
                         v-if="scope.row.timeIds.includes(item.id)">
                         <el-tag style="margin:4px;" size="small">{{ item.name }}</el-tag>
@@ -60,7 +60,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="活动开始时间" align="center" prop="startTime" width="190">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                     <span>{{ "开始: " + parseTime(scope.row.startTime) }}</span>
                     <span>{{ "结束: " + parseTime(scope.row.endTime) }}</span>
                 </template>
@@ -69,12 +69,12 @@
             <el-table-column label="付款订单数" align="center" prop="orderCount" />
             <el-table-column label="付款人数" align="center" prop="userCount" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                     <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
+                <template v-slot="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['promotion:seckill-activity:update']">修改</el-button>
                     <el-button size="mini" type="text" icon="el-icon-close" @click="handleClose(scope.row)"
@@ -137,37 +137,37 @@
                         <el-table-column type="selection" width="55">
                         </el-table-column>
                         <el-table-column label="商品名称" align="center" width="200">
-                            <template slot-scope="scope">
+                            <template v-slot="scope">
                                 {{ scope.row.spuName }} &nbsp; {{ scope.row.name }}
                             </template>
                         </el-table-column>
                         <el-table-column label="商品价格" align="center" prop="price">
-                            <template slot-scope="scope">
+                            <template v-slot="scope">
                                 ￥{{ (scope.row.price / 100.0).toFixed(2) }}
                             </template>
                         </el-table-column>
                         <el-table-column label="库存" align="center" prop="productStock" />
                         <el-table-column label="限购(0为不限购)" align="center" width="150">
-                            <template slot-scope="scope">
+                            <template v-slot="scope">
                                 <el-input-number v-model="scope.row.limitBuyCount" size="mini" :min="0" :max="10000">
                                 </el-input-number>
                             </template>
                         </el-table-column>
                         <el-table-column label="秒杀价(元)" align="center" width="150">
-                            <template slot-scope="scope">
+                            <template v-slot="scope">
                                 <el-input-number v-model="scope.row.seckillPrice" size="mini" :precision="2" :min="0"
                                     :max="10000">
                                 </el-input-number>
                             </template>
                         </el-table-column>
                         <el-table-column label="秒杀库存" align="center" width="150" prop="seckillStock">
-                            <template slot-scope="scope">
+                            <template v-slot="scope">
                                 <el-input-number v-model="scope.row.seckillStock" size="mini" :min="0" :max="10000">
                                 </el-input-number>
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                            <template slot-scope="scope">
+                            <template v-slot="scope">
                                 <el-button size="mini" type="text" icon="el-icon-delete"
                                     @click="removeFormSku(scope.row.skuId)">删除
                                 </el-button>
diff --git a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
index aa7df72007..b9801b3bd9 100644
--- a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
@@ -14,23 +14,23 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="秒杀时段名称" align="center" prop="name" />
       <el-table-column label="开始时间点" align="center" prop="startTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ scope.row.startTime }}</span>
         </template>
       </el-table-column>
       <el-table-column label="结束时间点" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ scope.row.endTime }}</span>
         </template>
       </el-table-column>
       <el-table-column label="秒杀活动数量" align="center" prop="seckillActivityCount" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleOpenSeckillActivity(scope.row)">
             查看秒杀活动</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
diff --git a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
index 5eda5bc6a1..a21a8a78a6 100644
--- a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
@@ -57,7 +57,7 @@
       <el-table-column label="订单编号" align="center" prop="orderNo" /> <!-- TODO 芋艿：未来要加个订单链接 -->
       <el-table-column label="商品信息" align="center" prop="spuName" width="auto" min-width="300">
         <!-- TODO @小红：样式不太对，辛苦改改 -->
-<!--        <div slot-scope="{ row }" class="goods-info">-->
+<!--        <div v-slot="{ row }" class="goods-info">-->
 <!--          <img :src="row.picUrl"/>-->
 <!--          <span class="ellipsis-2" :title="row.name">{{row.name}}</span>-->
 <!--        </div>-->
diff --git a/yudao-ui-admin/src/views/mall/trade/order/detail.vue b/yudao-ui-admin/src/views/mall/trade/order/detail.vue
index fe3e29604f..c2b74bb775 100644
--- a/yudao-ui-admin/src/views/mall/trade/order/detail.vue
+++ b/yudao-ui-admin/src/views/mall/trade/order/detail.vue
@@ -56,25 +56,25 @@
       <el-descriptions-item labelClassName="no-colon">
         <el-table :data="order.items" border>
           <el-table-column prop="spuName" label="商品" width="700">
-            <template slot-scope="{ row }">
+            <template v-slot="{ row }">
               {{row.spuName}}
               <el-tag size="medium" v-for="property in row.properties" :key="property.propertyId">
                 {{property.propertyName}}：{{property.valueName}}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="originalUnitPrice" label="单价(元)" width="180">
-            <template slot-scope="{ row }">
+            <template v-slot="{ row }">
               ￥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}
             </template>
           </el-table-column>
           <el-table-column prop="count" label="数量" width="180"/>
           <el-table-column prop="originalPrice" label="小计（元）" width="180">
-            <template slot-scope="{ row }">
+            <template v-slot="{ row }">
               ￥{{ (row.originalPrice / 100.0).toFixed(2) }}
             </template>
           </el-table-column>
           <el-table-column prop="afterSaleStatus" label="退款状态">
-            <template slot-scope="{ row }">
+            <template v-slot="{ row }">
               <dict-tag :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS" :value="row.afterSaleStatus" />
             </template>
           </el-table-column>
diff --git a/yudao-ui-admin/src/views/mall/trade/order/index.vue b/yudao-ui-admin/src/views/mall/trade/order/index.vue
index 619e27609c..96f156f7aa 100644
--- a/yudao-ui-admin/src/views/mall/trade/order/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/order/index.vue
@@ -71,7 +71,7 @@
         <!-- 列表 -->
         <el-table v-loading="loading" :data="list" :show-header="false" class="order-table">
           <el-table-column>
-            <template slot-scope="{ row }">
+            <template v-slot="{ row }">
               <el-row type="flex" align="middle">
                 <el-col :span="5">
                   订单号：{{row.no}}
@@ -94,7 +94,7 @@
               <!-- 订单下的商品 -->
               <el-table :data="row.items" border :show-header="true">
                 <el-table-column label="商品" prop="goods" header-align="center" width="auto" min-width="300">
-                  <template slot-scope="{ row, $index }">
+                  <template v-slot="{ row, $index }">
                     <div class="goods-info">
                       <img :src="row.picUrl"/>
                       <span class="ellipsis-2" :title="row.spuName">{{row.spuName}}</span>
@@ -105,7 +105,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="单价(元)/数量" prop="fee" align="center" width="115">
-                  <template slot-scope="{ row }">
+                  <template v-slot="{ row }">
                     <div>￥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}</div>
                     <div>{{row.count}} 件</div>
                   </template>
@@ -114,7 +114,7 @@
                 <el-table-column label="实付金额(元)" prop="amount" align="center" width="100"/>
                 <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的收件信息；使用 order.receiverXXX 开头的字段 -->
                 <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="auto" min-width="300">
-                  <template slot-scope="{ row }">
+                  <template v-slot="{ row }">
                     <!-- TODO @芋艿：以后增加一个会员详情界面 -->
                     <div>{{row.buyer}}</div>
                     <div>{{row.receiver}}{{row.tel}}</div>
diff --git a/yudao-ui-admin/src/views/mp/account/index.vue b/yudao-ui-admin/src/views/mp/account/index.vue
index 251d137e3e..02615f10f0 100644
--- a/yudao-ui-admin/src/views/mp/account/index.vue
+++ b/yudao-ui-admin/src/views/mp/account/index.vue
@@ -44,12 +44,12 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
 <!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
-<!--        <template slot-scope="scope">-->
+<!--        <template v-slot="scope">-->
 <!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['mp:account:update']">修改
           </el-button>
diff --git a/yudao-ui-admin/src/views/mp/autoReply/index.vue b/yudao-ui-admin/src/views/mp/autoReply/index.vue
index 6d55de735e..d9644c9fad 100644
--- a/yudao-ui-admin/src/views/mp/autoReply/index.vue
+++ b/yudao-ui-admin/src/views/mp/autoReply/index.vue
@@ -79,7 +79,7 @@ SOFTWARE.
         </template>
       </el-table-column>
       <el-table-column label="回复内容" align="center">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <div v-if="scope.row.responseMessageType === 'text'">{{ scope.row.responseContent }}</div>
           <div v-else-if="scope.row.responseMessageType === 'voice'">
             <wx-voice-player :url="scope.row.responseMediaUrl" />
@@ -103,12 +103,12 @@ SOFTWARE.
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['mp:auto-reply:update']">修改
           </el-button>
diff --git a/yudao-ui-admin/src/views/mp/material/index.vue b/yudao-ui-admin/src/views/mp/material/index.vue
index 1bad04fb47..bf36832357 100644
--- a/yudao-ui-admin/src/views/mp/material/index.vue
+++ b/yudao-ui-admin/src/views/mp/material/index.vue
@@ -94,7 +94,7 @@ SOFTWARE.
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
+            <template v-slot="scope">
               <el-button type="text" icon="el-icon-download" size="small" plain @click="handleDownload(scope.row)">下载</el-button>
               <el-button type="text" icon="el-icon-delete" size="small" plain @click="handleDelete(scope.row)"
                          v-hasPermi="['mp:material:delete']">删除</el-button>
diff --git a/yudao-ui-admin/src/views/mp/message/index.vue b/yudao-ui-admin/src/views/mp/message/index.vue
index 2b6634db8d..ccf568ee53 100644
--- a/yudao-ui-admin/src/views/mp/message/index.vue
+++ b/yudao-ui-admin/src/views/mp/message/index.vue
@@ -37,20 +37,20 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="发送时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="消息类型" align="center" prop="type" width="80"/>
       <el-table-column label="发送方" align="center" prop="sendFrom" width="80">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-tag v-if="scope.row.sendFrom === 1" type="success">粉丝</el-tag>
           <el-tag v-else type="info">公众号</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="用户标识" align="center" prop="openid" width="300" />
       <el-table-column label="内容" prop="content">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <!-- 【事件】区域 -->
           <div v-if="scope.row.type === 'event' && scope.row.event === 'subscribe'">
             <el-tag type="success" size="mini">关注</el-tag>
@@ -118,7 +118,7 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSend(scope.row)"
                      v-hasPermi="['mp:message:send']">消息
           </el-button>
diff --git a/yudao-ui-admin/src/views/mp/mpuser/index.vue b/yudao-ui-admin/src/views/mp/mpuser/index.vue
index 8480610b8a..462b6151dd 100644
--- a/yudao-ui-admin/src/views/mp/mpuser/index.vue
+++ b/yudao-ui-admin/src/views/mp/mpuser/index.vue
@@ -38,25 +38,25 @@
       <el-table-column label="昵称" align="center" prop="nickname" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="标签" align="center" prop="tagIds" width="200">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span v-for="(tagId, index) in scope.row.tagIds" :key="index">
             <el-tag>{{ tags.find(tag => tag.tagId === tagId)?.name }} </el-tag>&nbsp;
           </span>
         </template>
       </el-table-column>
       <el-table-column label="订阅状态" align="center" prop="subscribeStatus">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-tag v-if="scope.row.subscribeStatus === 0" type="success">已订阅</el-tag>
           <el-tag v-else type="danger">未订阅</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="订阅时间" align="center" prop="subscribeTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.subscribeTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['mp:user:update']">修改</el-button>
         </template>
diff --git a/yudao-ui-admin/src/views/mp/tag/index.vue b/yudao-ui-admin/src/views/mp/tag/index.vue
index e5597b2c17..90843a5109 100644
--- a/yudao-ui-admin/src/views/mp/tag/index.vue
+++ b/yudao-ui-admin/src/views/mp/tag/index.vue
@@ -39,12 +39,12 @@
       <el-table-column label="标签名称" align="center" prop="name"/>
       <el-table-column label="粉丝数" align="center" prop="count"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['mp:tag:update']">修改
           </el-button>
diff --git a/yudao-ui-admin/src/views/system/notify/my/index.vue b/yudao-ui-admin/src/views/system/notify/my/index.vue
index 56a579bec4..5ad1bbee15 100644
--- a/yudao-ui-admin/src/views/system/notify/my/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/my/index.vue
@@ -36,7 +36,7 @@
       <el-table-column type="selection" width="55" />
       <el-table-column label="发送人" align="center" prop="templateNickname" width="120" />
       <el-table-column label="发送时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
@@ -47,12 +47,12 @@
       </el-table-column>
       <el-table-column label="内容" align="center" prop="templateContent" />
       <el-table-column label="是否已读" align="center" prop="readStatus" width="80">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button v-show="!scope.row.readStatus" size="mini" type="text" icon="el-icon-check" @click="handleUpdateSingle(scope.row)">已读</el-button>
         </template>
       </el-table-column>
diff --git a/yudao-ui-admin/src/views/system/notify/template/index.vue b/yudao-ui-admin/src/views/system/notify/template/index.vue
index 0a9739590e..d12d642101 100644
--- a/yudao-ui-admin/src/views/system/notify/template/index.vue
+++ b/yudao-ui-admin/src/views/system/notify/template/index.vue
@@ -47,18 +47,18 @@
       <el-table-column label="发送人名称" align="center" prop="nickname" />
       <el-table-column label="模板内容" align="center" prop="content" width="300" />
       <el-table-column label="开启状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-share" @click="handleSendNotify(scope.row)"
                      v-hasPermi="['system:notify-template:send-notify']">测试</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
diff --git a/yudao-ui-admin/src/views/system/role/index.vue b/yudao-ui-admin/src/views/system/role/index.vue
index 7f945ed38a..2dfd13423e 100644
--- a/yudao-ui-admin/src/views/system/role/index.vue
+++ b/yudao-ui-admin/src/views/system/role/index.vue
@@ -43,23 +43,23 @@
       <el-table-column label="角色名称" prop="name" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="角色标识" prop="code" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="角色类型" prop="type" width="80">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_ROLE_TYPE" :value="scope.row.type"/>
         </template>
       </el-table-column>
       <el-table-column label="显示顺序" prop="sort" width="100" />
       <el-table-column label="状态" align="center" width="100">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:role:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleMenu(scope.row)"