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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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/65] =?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 e637bff8cdc7071a04489fcbe3ffa60dd5b7c344 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Tue, 10 Jan 2023 15:10:16 +0800
Subject: [PATCH 25/65] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20vo=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-framework/pom.xml                       |  1 +
 .../pom.xml                                   | 26 ++++++++++
 .../desensitize/annotation/Desensitize.java   | 50 +++++++++++++++++++
 .../constants/DesensitizeConstants.java       | 24 +++++++++
 .../enums/DesensitizationStrategyEnum.java    | 49 ++++++++++++++++++
 .../DefaultDesensitizationHandler.java        | 10 ++++
 .../handler/DesensitizationHandler.java       | 13 +++++
 7 files changed, 173 insertions(+)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java

diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index 3bfc020ba6..0f20b1a788 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -41,6 +41,7 @@
         <module>yudao-spring-boot-starter-flowable</module>
         <module>yudao-spring-boot-starter-captcha</module>
         <module>yudao-spring-boot-starter-websocket</module>
+        <module>yudao-spring-boot-starter-biz-desensitize</module>
     </modules>
 
     <artifactId>yudao-framework</artifactId>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
new file mode 100644
index 0000000000..4119f8ea7a
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
@@ -0,0 +1,26 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-framework</artifactId>
+        <version>1.6.6-snapshot</version>
+    </parent>
+
+    <artifactId>yudao-spring-boot-starter-biz-desensitize</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
new file mode 100644
index 0000000000..bf0f585c42
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.framework.desensitize.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.enums.DesensitizationStrategyEnum;
+import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandler;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Desensitize 注解配置会覆盖 DesensitizationStrategyEnum 配置
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Desensitize {
+
+    /**
+     * 脱敏策略
+     */
+    DesensitizationStrategyEnum strategy();
+
+    /**
+     * 脱敏替换字符
+     */
+    String replacer();
+
+    /**
+     * 正则表达式
+     */
+    String regex();
+
+    /**
+     * 前缀保留长度
+     */
+    int preKeep();
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep();
+
+    /**
+     * 脱敏处理器
+     */
+    Class<? extends DesensitizationHandler> handler();
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java
new file mode 100644
index 0000000000..f883173c30
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.framework.desensitize.constants;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class DesensitizeConstants {
+
+    /**
+     * 默认正则
+     */
+    public static final String DEFAULT_REGEX = null;
+
+    /**
+     * 默认保持长度
+     */
+    public static final int DEFAULT_KEEP_LENGTH = -1;
+
+    /**
+     * 默认替换字符
+     */
+    public static final String DEFAULT_REPLACER = "****";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java
new file mode 100644
index 0000000000..89a1f63c82
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.framework.desensitize.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import static cn.iocoder.yudao.framework.desensitize.constants.DesensitizeConstants.DEFAULT_KEEP_LENGTH;
+import static cn.iocoder.yudao.framework.desensitize.constants.DesensitizeConstants.DEFAULT_REGEX;
+import static cn.iocoder.yudao.framework.desensitize.constants.DesensitizeConstants.DEFAULT_REPLACER;
+
+@Getter
+@RequiredArgsConstructor
+public enum DesensitizationStrategyEnum {
+    // 常用脱敏业务
+    PHONE_NUMBER(DEFAULT_REGEX, 3, 4, DEFAULT_REPLACER), // 手机号;比如：13248765917脱敏之后为132****5917
+    FIXED_PHONE(DEFAULT_REGEX, 4, 2, DEFAULT_REPLACER), // 固定电话;比如：01086551122脱敏之后为0108*****22
+    ID_CARD(DEFAULT_REGEX, 6, 2, DEFAULT_REPLACER), // 身份证号码;比如：530321199204074611脱敏之后为530321**********11
+    BANK_CARD(DEFAULT_REGEX, 6, 2, DEFAULT_REPLACER), // 银行卡号;比如：9988002866797031脱敏之后为998800********31
+    CHINESE_NAME(DEFAULT_REGEX, 1, 0, "**"),// 中文名;比如：刘子豪脱敏之后为刘**
+    ADDRESS("[\\s\\S]+区", DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER), // 地址只显示到地区，不显示详细地址;比如：广州市天河区幸福小区102号脱敏之后为广州市天河区********
+    EMAIL("(^.)[^@]*(@.*$)", DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, "$1****$2"), // 邮箱;比如：example@gmail.com脱敏之后为e******@gmail.com
+    CAR_LICENSE(DEFAULT_REGEX, 3, 1, DEFAULT_REPLACER), // 车牌号;比如：粤A66666脱敏之后为粤A6***6
+    PASSWORD(DEFAULT_REGEX, 0, 0, DEFAULT_REPLACER), // 密码;比如：123456脱敏之后为******
+
+    // 自定义脱敏业务
+    REGEX(DEFAULT_REGEX, DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER), // 自定义正则表达式
+    SLIDE(DEFAULT_REGEX, DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER), // 滑动脱敏
+    CUSTOM_HANDLE(DEFAULT_REGEX, DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER); // 自定义处理器
+    ;
+
+    /**
+     * 正则表达式
+     */
+    private final String regex;
+
+    /**
+     * 前缀保留长度
+     */
+    private final int preKeep;
+
+    /**
+     * 后缀保留长度
+     */
+    private final int suffixKeep;
+
+    /**
+     * 脱敏替换字符
+     */
+    private final String replacer;
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java
new file mode 100644
index 0000000000..4f8883c507
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.desensitize.handler;
+
+public class DefaultDesensitizationHandler implements DesensitizationHandler {
+
+    @Override
+    public String handle(String origin) {
+        return origin;
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
new file mode 100644
index 0000000000..d718aae1b7
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.framework.desensitize.handler;
+
+public interface DesensitizationHandler {
+
+    /**
+     * 脱敏
+     *
+     * @param origin 原始字符串
+     * @return 脱敏后的字符串
+     */
+    String handle(String origin);
+
+}

From 5c8e41b84791cf92cc45896071a6b96b49ba20e3 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Thu, 12 Jan 2023 14:54:33 +0800
Subject: [PATCH 26/65] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20vo=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                   | 21 ++++-
 .../desensitize/annotation/Desensitize.java   | 40 +++-------
 .../annotation/RegexDesensitize.java          | 33 ++++++++
 .../annotation/SliderDesensitize.java         | 39 ++++++++++
 .../constraints/BankCardDesensitize.java      | 21 +++++
 .../constraints/CarLicenseDesensitize.java    | 21 +++++
 .../constraints/ChineseNameDesensitize.java   | 21 +++++
 .../constraints/EmailDesensitize.java         | 21 +++++
 .../constraints/FixedPhoneDesensitize.java    | 21 +++++
 .../constraints/IdCardDesensitize.java        | 21 +++++
 .../constraints/PasswordDesensitize.java      | 21 +++++
 .../constraints/PhoneNumberDesensitize.java   | 21 +++++
 .../constants/DesensitizeConstants.java       | 24 ------
 .../enums/DesensitizationStrategyEnum.java    | 49 ------------
 .../DefaultDesensitizationHandler.java        | 10 ---
 .../handler/DesensitizationHandler.java       |  2 +-
 .../handler/DesensitizationHandlerHolder.java | 34 +++++++++
 .../handler/RegexDesensitizationHandler.java  | 13 ++++
 .../handler/SliderDesensitizationHandler.java | 39 ++++++++++
 .../StringDesensitizeSerializer.java          | 76 +++++++++++++++++++
 .../handler/DesensitizationHandlerTest.java   | 25 ++++++
 21 files changed, 457 insertions(+), 116 deletions(-)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
index 4119f8ea7a..7f15d0d4c7 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>cn.iocoder.boot</groupId>
         <artifactId>yudao-framework</artifactId>
-        <version>1.6.6-snapshot</version>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>yudao-spring-boot-starter-biz-desensitize</artifactId>
@@ -22,5 +22,22 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-common</artifactId>
         </dependency>
+
+        <!-- jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
index bf0f585c42..65dd2108d0 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.framework.desensitize.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.enums.DesensitizationStrategyEnum;
 import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.serializer.StringDesensitizeSerializer;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -11,40 +13,18 @@ import java.lang.annotation.Target;
 
 
 /**
- * Desensitize 注解配置会覆盖 DesensitizationStrategyEnum 配置
+ * Desensitize 顶级脱敏注解
  */
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@JsonSerialize(using = StringDesensitizeSerializer.class)
 public @interface Desensitize {
 
-    /**
-     * 脱敏策略
-     */
-    DesensitizationStrategyEnum strategy();
-
-    /**
-     * 脱敏替换字符
-     */
-    String replacer();
-
-    /**
-     * 正则表达式
-     */
-    String regex();
-
-    /**
-     * 前缀保留长度
-     */
-    int preKeep();
-
-    /**
-     * 后缀保留长度
-     */
-    int suffixKeep();
-
     /**
      * 脱敏处理器
      */
-    Class<? extends DesensitizationHandler> handler();
+    Class<? extends DesensitizationHandler> desensitizationHandler();
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java
new file mode 100644
index 0000000000..c2df586c43
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.framework.desensitize.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.handler.RegexDesensitizationHandler;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 正则脱敏注解
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationHandler = RegexDesensitizationHandler.class)
+public @interface RegexDesensitize {
+    /**
+     * 匹配的正则表达式（默认匹配所有）
+     */
+    String regex() default "^[\\s\\S]*$";
+
+    /**
+     * 替换规则，会将匹配到的字符串全部替换成 replacer
+     * 例如：regex=123; replacer=******
+     * 原始字符串 123456789
+     * 脱敏后字符串 ******456789
+     */
+    String replacer() default "******";
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java
new file mode 100644
index 0000000000..ebafaa9bc0
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.framework.desensitize.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.handler.SliderDesensitizationHandler;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 滑动脱敏注解
+ */
+@Documented
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationHandler = SliderDesensitizationHandler.class)
+public @interface SliderDesensitize {
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 0;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 0;
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java
new file mode 100644
index 0000000000..8fa73169a8
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 银行卡号
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 6, suffixKeep = 2, replacer = "*") // 银行卡号;比如：9988002866797031脱敏之后为998800********31
+public @interface BankCardDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java
new file mode 100644
index 0000000000..11f1f58141
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 车牌号
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 3, suffixKeep = 1, replacer = "*") // 车牌号;比如：粤A66666脱敏之后为粤A6***6
+public @interface CarLicenseDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java
new file mode 100644
index 0000000000..97d2698ed8
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 中文名
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 1, suffixKeep = 0, replacer = "*") // 中文名;比如：刘子豪脱敏之后为刘**
+public @interface ChineseNameDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java
new file mode 100644
index 0000000000..142e7c0f6e
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.RegexDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 邮箱
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@RegexDesensitize(regex = "(^.)[^@]*(@.*$)", replacer ="$1****$2")  // 邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
+public @interface EmailDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java
new file mode 100644
index 0000000000..f91988735c
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 固定电话
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 4, suffixKeep = 2, replacer = "*") // 固定电话;比如：01086551122脱敏之后为0108*****22
+public @interface FixedPhoneDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java
new file mode 100644
index 0000000000..921019c5de
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 身份证
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 6, suffixKeep = 2, replacer = "*") // 身份证号码;比如：530321199204074611脱敏之后为530321**********11
+public @interface IdCardDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java
new file mode 100644
index 0000000000..8d823a139c
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 密码
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 0, suffixKeep = 0, replacer = "*") // 密码;比如：123456脱敏之后为******
+public @interface PasswordDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java
new file mode 100644
index 0000000000..0829c6a455
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
+
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 手机号
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@SliderDesensitize(prefixKeep = 3, suffixKeep = 4, replacer = "*") // 手机号;比如：13248765917脱敏之后为132****5917
+public @interface PhoneNumberDesensitize {
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java
deleted file mode 100644
index f883173c30..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/constants/DesensitizeConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.constants;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class DesensitizeConstants {
-
-    /**
-     * 默认正则
-     */
-    public static final String DEFAULT_REGEX = null;
-
-    /**
-     * 默认保持长度
-     */
-    public static final int DEFAULT_KEEP_LENGTH = -1;
-
-    /**
-     * 默认替换字符
-     */
-    public static final String DEFAULT_REPLACER = "****";
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java
deleted file mode 100644
index 89a1f63c82..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/enums/DesensitizationStrategyEnum.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import static cn.iocoder.yudao.framework.desensitize.constants.DesensitizeConstants.DEFAULT_KEEP_LENGTH;
-import static cn.iocoder.yudao.framework.desensitize.constants.DesensitizeConstants.DEFAULT_REGEX;
-import static cn.iocoder.yudao.framework.desensitize.constants.DesensitizeConstants.DEFAULT_REPLACER;
-
-@Getter
-@RequiredArgsConstructor
-public enum DesensitizationStrategyEnum {
-    // 常用脱敏业务
-    PHONE_NUMBER(DEFAULT_REGEX, 3, 4, DEFAULT_REPLACER), // 手机号;比如：13248765917脱敏之后为132****5917
-    FIXED_PHONE(DEFAULT_REGEX, 4, 2, DEFAULT_REPLACER), // 固定电话;比如：01086551122脱敏之后为0108*****22
-    ID_CARD(DEFAULT_REGEX, 6, 2, DEFAULT_REPLACER), // 身份证号码;比如：530321199204074611脱敏之后为530321**********11
-    BANK_CARD(DEFAULT_REGEX, 6, 2, DEFAULT_REPLACER), // 银行卡号;比如：9988002866797031脱敏之后为998800********31
-    CHINESE_NAME(DEFAULT_REGEX, 1, 0, "**"),// 中文名;比如：刘子豪脱敏之后为刘**
-    ADDRESS("[\\s\\S]+区", DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER), // 地址只显示到地区，不显示详细地址;比如：广州市天河区幸福小区102号脱敏之后为广州市天河区********
-    EMAIL("(^.)[^@]*(@.*$)", DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, "$1****$2"), // 邮箱;比如：example@gmail.com脱敏之后为e******@gmail.com
-    CAR_LICENSE(DEFAULT_REGEX, 3, 1, DEFAULT_REPLACER), // 车牌号;比如：粤A66666脱敏之后为粤A6***6
-    PASSWORD(DEFAULT_REGEX, 0, 0, DEFAULT_REPLACER), // 密码;比如：123456脱敏之后为******
-
-    // 自定义脱敏业务
-    REGEX(DEFAULT_REGEX, DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER), // 自定义正则表达式
-    SLIDE(DEFAULT_REGEX, DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER), // 滑动脱敏
-    CUSTOM_HANDLE(DEFAULT_REGEX, DEFAULT_KEEP_LENGTH, DEFAULT_KEEP_LENGTH, DEFAULT_REPLACER); // 自定义处理器
-    ;
-
-    /**
-     * 正则表达式
-     */
-    private final String regex;
-
-    /**
-     * 前缀保留长度
-     */
-    private final int preKeep;
-
-    /**
-     * 后缀保留长度
-     */
-    private final int suffixKeep;
-
-    /**
-     * 脱敏替换字符
-     */
-    private final String replacer;
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java
deleted file mode 100644
index 4f8883c507..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DefaultDesensitizationHandler.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.handler;
-
-public class DefaultDesensitizationHandler implements DesensitizationHandler {
-
-    @Override
-    public String handle(String origin) {
-        return origin;
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
index d718aae1b7..a5d06feb1b 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
@@ -8,6 +8,6 @@ public interface DesensitizationHandler {
      * @param origin 原始字符串
      * @return 脱敏后的字符串
      */
-    String handle(String origin);
+    String desensitize(String origin, Object... arg);
 
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
new file mode 100644
index 0000000000..23336b0cf4
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.framework.desensitize.handler;
+
+import cn.hutool.core.util.ReflectUtil;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class DesensitizationHandlerHolder {
+    /**
+     * handler 缓存，默认初始化内置的处理器
+     */
+    private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<>() {{
+        put(RegexDesensitizationHandler.class, new RegexDesensitizationHandler());
+        put(SliderDesensitizationHandler.class, new SliderDesensitizationHandler());
+    }};
+
+    public static DesensitizationHandler getDesensitizationHandler(Class<? extends DesensitizationHandler> clazz) {
+        DesensitizationHandler handler = HANDLER_MAP.get(clazz);
+        if (handler != null) {
+            return handler;
+        }
+        synchronized (DesensitizationHandlerHolder.class) {
+            handler = HANDLER_MAP.get(clazz);
+            // 双重校验锁
+            if (handler != null) {
+                return handler;
+            }
+            handler = ReflectUtil.newInstanceIfPossible(clazz);
+            HANDLER_MAP.put(clazz, handler);
+        }
+        return handler;
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
new file mode 100644
index 0000000000..1846156d46
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.framework.desensitize.handler;
+
+public class RegexDesensitizationHandler implements DesensitizationHandler {
+
+    @Override
+    public String desensitize(String origin, Object... arg) {
+        String regex = (String) arg[0];
+        String replacer = (String) arg[1];
+
+        return origin.replaceAll(regex, replacer);
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
new file mode 100644
index 0000000000..81b9ccc500
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.framework.desensitize.handler;
+
+public class SliderDesensitizationHandler implements DesensitizationHandler {
+
+    @Override
+    public String desensitize(String origin, Object... arg) {
+        int prefixKeep = (Integer) arg[0];
+        int suffixKeep = (Integer) arg[1];
+        String replacer = (String) arg[2];
+
+        int length = origin.length();
+
+        // 原始字符串长度小于等于保留长度，则原始字符串全部替换
+        if (prefixKeep >= length || suffixKeep >= length) {
+            return buildReplacerByLength(replacer, length);
+        }
+
+        // 如果原始字符串小于等于前后缀保留字符串长度，则原始字符串全部替换
+        if ((prefixKeep + suffixKeep) >= length) {
+            return buildReplacerByLength(replacer, length);
+        }
+
+        int interval = length - prefixKeep - suffixKeep;
+        return origin.substring(0, prefixKeep) +
+                buildReplacerByLength(replacer, interval) +
+                origin.substring(prefixKeep + interval);
+    }
+
+    /**
+     * 根据长度循环构建替换符
+     *
+     * @param replacer 替换符
+     * @param length   长度
+     * @return 构建后的替换符
+     */
+    private String buildReplacerByLength(String replacer, int length) {
+        return String.valueOf(replacer).repeat(Math.max(0, length));
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
new file mode 100644
index 0000000000..a43b3e28eb
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.framework.desensitize.serializer;
+
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.desensitize.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.annotation.RegexDesensitize;
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandlerHolder;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+
+/**
+ * 脱敏序列化器
+ */
+public class StringDesensitizeSerializer extends StdSerializer<String> implements ContextualSerializer {
+    private final DesensitizationHandler desensitizationHandler;
+
+    protected StringDesensitizeSerializer(DesensitizationHandler desensitizationHandler) {
+        super(String.class);
+        this.desensitizationHandler = desensitizationHandler;
+    }
+
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) throws JsonMappingException {
+        Desensitize annotation = beanProperty.getAnnotation(Desensitize.class);
+        if (annotation == null) {
+            return this;
+        }
+
+        return new StringDesensitizeSerializer(DesensitizationHandlerHolder.getDesensitizationHandler(annotation.desensitizationHandler()));
+    }
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializerProvider) throws IOException {
+        if (StrUtil.isBlank(value)) {
+            gen.writeNull();
+            return;
+        }
+
+        String currentName = gen.getOutputContext().getCurrentName();
+        Object currentValue = gen.getCurrentValue();
+        Class<?> currentValueClass = currentValue.getClass();
+        Field field = ReflectUtil.getField(currentValueClass, currentName);
+
+        // 滑动处理器
+        SliderDesensitize sliderDesensitize = field.getAnnotation(SliderDesensitize.class);
+        if (sliderDesensitize != null) {
+            value = this.desensitizationHandler.desensitize(value, sliderDesensitize.prefixKeep(), sliderDesensitize.suffixKeep(), sliderDesensitize.replacer());
+        }
+
+        // 正则处理器
+        RegexDesensitize regexDesensitize = field.getAnnotation(RegexDesensitize.class);
+        if (regexDesensitize != null) {
+            value = this.desensitizationHandler.desensitize(value, regexDesensitize.regex(), regexDesensitize.replacer());
+        }
+
+        // 自定义处理器
+        Desensitize desensitize = field.getAnnotation(Desensitize.class);
+        if (desensitize != null) {
+            value = this.desensitizationHandler.desensitize(value);
+        }
+
+        gen.writeString(value);
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java
new file mode 100644
index 0000000000..63b4eaabfc
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.handler;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DesensitizationHandlerTest {
+
+    @Test
+    public void testSliderDesensitizationHandler() {
+        DesensitizationHandler handler = DesensitizationHandlerHolder.getDesensitizationHandler(SliderDesensitizationHandler.class);
+
+        Assertions.assertEquals("A****FG", handler.desensitize("ABCDEFG", 1, 2, "*"));
+        Assertions.assertEquals("芋**码", handler.desensitize("芋道源码", 1, 1, "*"));
+        Assertions.assertEquals("****", handler.desensitize("芋道源码", 4, 0, "*"));
+    }
+
+    @Test
+    public void testRegexDesensitizationHandler() {
+        DesensitizationHandler handler = DesensitizationHandlerHolder.getDesensitizationHandler(RegexDesensitizationHandler.class);
+
+        Assertions.assertEquals("e****@gmail.com", handler.desensitize("example@gmail.com", "(^.)[^@]*(@.*$)", "$1****$2"));
+        Assertions.assertEquals("***，铁***", handler.desensitize("他妈的，铁废物", "他妈的|去你大爷|卧槽|草泥马|废物", "***"));
+    }
+
+}

From cd9bcda9350a28d6547af3a391fdea757ad8b8ea Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Thu, 12 Jan 2023 15:31:44 +0800
Subject: [PATCH 27/65] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20vo=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml                    |  5 ++++
 .../StringDesensitizeSerializer.java          | 29 ++++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 7b056c46b0..be2f14dd65 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -141,6 +141,11 @@
                 <artifactId>yudao-spring-boot-starter-captcha</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>cn.iocoder.boot</groupId>
+                <artifactId>yudao-spring-boot-starter-biz-desensitize</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!-- Spring 核心 -->
             <dependency>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
index a43b3e28eb..f90475d6d3 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.framework.desensitize.serializer;
 
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.desensitize.annotation.Desensitize;
@@ -22,13 +24,19 @@ import java.lang.reflect.Field;
  * 脱敏序列化器
  */
 public class StringDesensitizeSerializer extends StdSerializer<String> implements ContextualSerializer {
-    private final DesensitizationHandler desensitizationHandler;
+    private DesensitizationHandler desensitizationHandler;
 
-    protected StringDesensitizeSerializer(DesensitizationHandler desensitizationHandler) {
+    protected StringDesensitizeSerializer() {
         super(String.class);
-        this.desensitizationHandler = desensitizationHandler;
     }
 
+    public DesensitizationHandler getDesensitizationHandler() {
+        return desensitizationHandler;
+    }
+
+    public void setDesensitizationHandler(DesensitizationHandler desensitizationHandler) {
+        this.desensitizationHandler = desensitizationHandler;
+    }
 
     @Override
     public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) throws JsonMappingException {
@@ -36,8 +44,9 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         if (annotation == null) {
             return this;
         }
-
-        return new StringDesensitizeSerializer(DesensitizationHandlerHolder.getDesensitizationHandler(annotation.desensitizationHandler()));
+        StringDesensitizeSerializer serializer = new StringDesensitizeSerializer();
+        serializer.setDesensitizationHandler(DesensitizationHandlerHolder.getDesensitizationHandler(annotation.desensitizationHandler()));
+        return serializer;
     }
 
     @Override
@@ -53,19 +62,23 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         Field field = ReflectUtil.getField(currentValueClass, currentName);
 
         // 滑动处理器
-        SliderDesensitize sliderDesensitize = field.getAnnotation(SliderDesensitize.class);
+        SliderDesensitize sliderDesensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, SliderDesensitize.class));
         if (sliderDesensitize != null) {
             value = this.desensitizationHandler.desensitize(value, sliderDesensitize.prefixKeep(), sliderDesensitize.suffixKeep(), sliderDesensitize.replacer());
+            gen.writeString(value);
+            return;
         }
 
         // 正则处理器
-        RegexDesensitize regexDesensitize = field.getAnnotation(RegexDesensitize.class);
+        RegexDesensitize regexDesensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, RegexDesensitize.class));
         if (regexDesensitize != null) {
             value = this.desensitizationHandler.desensitize(value, regexDesensitize.regex(), regexDesensitize.replacer());
+            gen.writeString(value);
+            return;
         }
 
         // 自定义处理器
-        Desensitize desensitize = field.getAnnotation(Desensitize.class);
+        Desensitize desensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, Desensitize.class));
         if (desensitize != null) {
             value = this.desensitizationHandler.desensitize(value);
         }

From 70f15ab60db12282411bc6fd6e50acb7798b3f78 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Thu, 12 Jan 2023 15:43:31 +0800
Subject: [PATCH 28/65] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/desensitize/handler/DesensitizationHandler.java  | 3 +++
 .../desensitize/handler/DesensitizationHandlerHolder.java      | 3 +++
 .../desensitize/handler/RegexDesensitizationHandler.java       | 3 +++
 .../desensitize/handler/SliderDesensitizationHandler.java      | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
index a5d06feb1b..ba5a63bfb5 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.framework.desensitize.handler;
 
+/**
+ * 脱敏处理器接口
+ */
 public interface DesensitizationHandler {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
index 23336b0cf4..456d2b920c 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
@@ -5,6 +5,9 @@ import cn.hutool.core.util.ReflectUtil;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * 脱敏处理器 Holder
+ */
 public class DesensitizationHandlerHolder {
     /**
      * handler 缓存，默认初始化内置的处理器
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
index 1846156d46..63089054fb 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.framework.desensitize.handler;
 
+/**
+ * 正则脱敏处理器
+ */
 public class RegexDesensitizationHandler implements DesensitizationHandler {
 
     @Override
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
index 81b9ccc500..2d8336d1f8 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.framework.desensitize.handler;
 
+/**
+ * 滑动脱敏处理器
+ */
 public class SliderDesensitizationHandler implements DesensitizationHandler {
 
     @Override

From 61a34ddac5478887621d05cd7cf9c6019a62f27b Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Thu, 12 Jan 2023 19:57:11 +0800
Subject: [PATCH 29/65] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20vo=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/DesensitizationHandler.java       | 14 ++++++++++++-
 .../handler/RegexDesensitizationHandler.java  |  9 ++++++++-
 .../handler/SliderDesensitizationHandler.java |  9 ++++++++-
 .../StringDesensitizeSerializer.java          | 20 ++++++++++++++-----
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
index ba5a63bfb5..74870e7716 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
@@ -1,16 +1,28 @@
 package cn.iocoder.yudao.framework.desensitize.handler;
 
+import java.lang.annotation.Annotation;
+
 /**
  * 脱敏处理器接口
  */
-public interface DesensitizationHandler {
+public interface DesensitizationHandler<T extends Annotation> {
 
     /**
      * 脱敏
      *
      * @param origin 原始字符串
+     * @param arg    参数
      * @return 脱敏后的字符串
      */
     String desensitize(String origin, Object... arg);
 
+    /**
+     * 获取注解参数
+     *
+     * @param anno 注解
+     * @return 注解参数
+     */
+    default Object[] getAnnotationArgs(T anno) {
+        return new Object[0];
+    }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
index 63089054fb..57fc711787 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.framework.desensitize.handler;
 
+import cn.iocoder.yudao.framework.desensitize.annotation.RegexDesensitize;
+
 /**
  * 正则脱敏处理器
  */
-public class RegexDesensitizationHandler implements DesensitizationHandler {
+public class RegexDesensitizationHandler implements DesensitizationHandler<RegexDesensitize> {
 
     @Override
     public String desensitize(String origin, Object... arg) {
@@ -13,4 +15,9 @@ public class RegexDesensitizationHandler implements DesensitizationHandler {
         return origin.replaceAll(regex, replacer);
     }
 
+    @Override
+    public Object[] getAnnotationArgs(RegexDesensitize anno) {
+        return new Object[]{anno.regex(), anno.replacer()};
+    }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
index 2d8336d1f8..47887da39f 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.framework.desensitize.handler;
 
+import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+
 /**
  * 滑动脱敏处理器
  */
-public class SliderDesensitizationHandler implements DesensitizationHandler {
+public class SliderDesensitizationHandler implements DesensitizationHandler<SliderDesensitize> {
 
     @Override
     public String desensitize(String origin, Object... arg) {
@@ -29,6 +31,11 @@ public class SliderDesensitizationHandler implements DesensitizationHandler {
                 origin.substring(prefixKeep + interval);
     }
 
+    @Override
+    public Object[] getAnnotationArgs(SliderDesensitize anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+
     /**
      * 根据长度循环构建替换符
      *
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
index f90475d6d3..956be23f33 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
 /**
@@ -64,7 +65,7 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         // 滑动处理器
         SliderDesensitize sliderDesensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, SliderDesensitize.class));
         if (sliderDesensitize != null) {
-            value = this.desensitizationHandler.desensitize(value, sliderDesensitize.prefixKeep(), sliderDesensitize.suffixKeep(), sliderDesensitize.replacer());
+            value = this.desensitizationHandler.desensitize(value, this.desensitizationHandler.getAnnotationArgs(sliderDesensitize));
             gen.writeString(value);
             return;
         }
@@ -72,15 +73,24 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         // 正则处理器
         RegexDesensitize regexDesensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, RegexDesensitize.class));
         if (regexDesensitize != null) {
-            value = this.desensitizationHandler.desensitize(value, regexDesensitize.regex(), regexDesensitize.replacer());
+            value = this.desensitizationHandler.desensitize(value, this.desensitizationHandler.getAnnotationArgs(regexDesensitize));
             gen.writeString(value);
             return;
         }
 
         // 自定义处理器
-        Desensitize desensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, Desensitize.class));
-        if (desensitize != null) {
-            value = this.desensitizationHandler.desensitize(value);
+        Desensitize[] annotations = AnnotationUtil.getCombinationAnnotations(field, Desensitize.class);
+        if (ArrayUtil.isEmpty(annotations)) {
+            gen.writeString(value);
+            return;
+        }
+
+        for (Annotation annotation : field.getAnnotations()) {
+            if (AnnotationUtil.hasAnnotation(annotation.annotationType(), Desensitize.class)) {
+                value = this.desensitizationHandler.desensitize(value, this.desensitizationHandler.getAnnotationArgs(annotation));
+                gen.writeString(value);
+                return;
+            }
         }
 
         gen.writeString(value);

From b8c728aef8a8f94938d49c4a5ff90e8632ec1e37 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Mon, 16 Jan 2023 13:10:02 +0800
Subject: [PATCH 30/65] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/codegen/CodegenServiceImpl.java   |  4 --
 .../service/db/DatabaseTableServiceImpl.java  | 47 ++++++++++++-------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
index d531d237b5..3b693eb505 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
@@ -237,10 +237,6 @@ public class CodegenServiceImpl implements CodegenService {
     @Override
     public List<DatabaseTableRespVO> getDatabaseTableList(Long dataSourceConfigId, String name, String comment) {
         List<TableInfo> tables = databaseTableService.getTableList(dataSourceConfigId, name, comment);
-        // 移除置顶前缀的表名 // TODO 未来做成可配置
-        tables.removeIf(table -> table.getName().toUpperCase().startsWith("QRTZ_"));
-        tables.removeIf(table -> table.getName().toUpperCase().startsWith("ACT_"));
-        tables.removeIf(table -> table.getName().toUpperCase().startsWith("FLW_"));
         // 移除已经生成的表
         // 移除在 Codegen 中，已经存在的
         Set<String> existsTables = CollectionUtils.convertSet(
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
index 6b8346cf0d..77ff2409fb 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
@@ -12,9 +12,12 @@ import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -28,6 +31,26 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
     @Resource
     private DataSourceConfigService dataSourceConfigService;
 
+    private final Map<Long, ConfigBuilder> ConfigBuilderMap = new HashMap<>();
+
+    @PostConstruct
+    public void initConfigBuilderMap() {
+        for (DataSourceConfigDO config : dataSourceConfigService.getDataSourceConfigList()) {
+            // 使用 MyBatis Plus Generator 解析表结构
+            DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder(config.getUrl(), config.getUsername(),
+                    config.getPassword()).build();
+            StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder();
+            // 移除工作流和定时任务前缀的表名 // TODO 未来做成可配置
+            strategyConfig.addExclude("ACT_[\\S\\s]+|QRTZ_[\\S\\s]+|FLW_[\\S\\s]+");
+
+            GlobalConfig globalConfig = new GlobalConfig.Builder().dateType(DateType.TIME_PACK).build(); // 只使用 Date 类型，不使用 LocalDate
+            ConfigBuilder builder = new ConfigBuilder(null, dataSourceConfig, strategyConfig.build(),
+                    null, globalConfig, null);
+
+            ConfigBuilderMap.put(config.getId(), builder);
+        }
+    }
+
     @Override
     public List<TableInfo> getTableList(Long dataSourceConfigId, String nameLike, String commentLike) {
         List<TableInfo> tables = getTableList0(dataSourceConfigId, null);
@@ -42,24 +65,16 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
     }
 
     public List<TableInfo> getTableList0(Long dataSourceConfigId, String name) {
-        // 获得数据源配置
-        DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(dataSourceConfigId);
-        Assert.notNull(config, "数据源({}) 不存在！", dataSourceConfigId);
+        ConfigBuilder builder = ConfigBuilderMap.get(dataSourceConfigId);
+        Assert.notNull(builder, "数据源({}) 不存在！", dataSourceConfigId);
 
-        // 使用 MyBatis Plus Generator 解析表结构
-        DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder(config.getUrl(), config.getUsername(),
-                config.getPassword()).build();
-        StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder();
-        if (StrUtil.isNotEmpty(name)) {
-            strategyConfig.addInclude(name);
-        }
-        GlobalConfig globalConfig = new GlobalConfig.Builder().dateType(DateType.TIME_PACK).build(); // 只使用 Date 类型，不使用 LocalDate
-        ConfigBuilder builder = new ConfigBuilder(null, dataSourceConfig, strategyConfig.build(),
-                null, globalConfig, null);
         // 按照名字排序
         List<TableInfo> tables = builder.getTableInfoList();
-        tables.sort(Comparator.comparing(TableInfo::getName));
-        return tables;
+        if (StrUtil.isBlank(name)) {
+            tables.sort(Comparator.comparing(TableInfo::getName));
+            return tables;
+        } else {
+            return CollUtil.filter(tables, tableInfo -> tableInfo.getName().equals(name));
+        }
     }
-
 }

From 4f5dbb2288912f74500cdc902382a5d28d040d78 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Mon, 16 Jan 2023 16:35:58 +0800
Subject: [PATCH 31/65] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/db/DatabaseTableServiceImpl.java  | 51 ++++++++-----------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
index 77ff2409fb..55f56a5dc7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
@@ -12,12 +12,9 @@ import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -31,26 +28,6 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
     @Resource
     private DataSourceConfigService dataSourceConfigService;
 
-    private final Map<Long, ConfigBuilder> ConfigBuilderMap = new HashMap<>();
-
-    @PostConstruct
-    public void initConfigBuilderMap() {
-        for (DataSourceConfigDO config : dataSourceConfigService.getDataSourceConfigList()) {
-            // 使用 MyBatis Plus Generator 解析表结构
-            DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder(config.getUrl(), config.getUsername(),
-                    config.getPassword()).build();
-            StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder();
-            // 移除工作流和定时任务前缀的表名 // TODO 未来做成可配置
-            strategyConfig.addExclude("ACT_[\\S\\s]+|QRTZ_[\\S\\s]+|FLW_[\\S\\s]+");
-
-            GlobalConfig globalConfig = new GlobalConfig.Builder().dateType(DateType.TIME_PACK).build(); // 只使用 Date 类型，不使用 LocalDate
-            ConfigBuilder builder = new ConfigBuilder(null, dataSourceConfig, strategyConfig.build(),
-                    null, globalConfig, null);
-
-            ConfigBuilderMap.put(config.getId(), builder);
-        }
-    }
-
     @Override
     public List<TableInfo> getTableList(Long dataSourceConfigId, String nameLike, String commentLike) {
         List<TableInfo> tables = getTableList0(dataSourceConfigId, null);
@@ -65,16 +42,28 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
     }
 
     public List<TableInfo> getTableList0(Long dataSourceConfigId, String name) {
-        ConfigBuilder builder = ConfigBuilderMap.get(dataSourceConfigId);
-        Assert.notNull(builder, "数据源({}) 不存在！", dataSourceConfigId);
+        // 获得数据源配置
+        DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(dataSourceConfigId);
+        Assert.notNull(config, "数据源({}) 不存在！", dataSourceConfigId);
 
+        // 使用 MyBatis Plus Generator 解析表结构
+        DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder(config.getUrl(), config.getUsername(),
+                config.getPassword()).build();
+        StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder();
+        if (StrUtil.isNotEmpty(name)) {
+            strategyConfig.addInclude(name);
+        }else{
+            // 移除工作流和定时任务前缀的表名 // TODO 未来做成可配置
+            strategyConfig.addExclude("ACT_[\\S\\s]+|QRTZ_[\\S\\s]+|FLW_[\\S\\s]+");
+        }
+
+        GlobalConfig globalConfig = new GlobalConfig.Builder().dateType(DateType.TIME_PACK).build(); // 只使用 Date 类型，不使用 LocalDate
+        ConfigBuilder builder = new ConfigBuilder(null, dataSourceConfig, strategyConfig.build(),
+                null, globalConfig, null);
         // 按照名字排序
         List<TableInfo> tables = builder.getTableInfoList();
-        if (StrUtil.isBlank(name)) {
-            tables.sort(Comparator.comparing(TableInfo::getName));
-            return tables;
-        } else {
-            return CollUtil.filter(tables, tableInfo -> tableInfo.getName().equals(name));
-        }
+        tables.sort(Comparator.comparing(TableInfo::getName));
+        return tables;
     }
+
 }

From c60f8d6da293fadf36ffd7fd0ddbb0793beca99b Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Mon, 16 Jan 2023 21:45:18 +0800
Subject: [PATCH 32/65] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20vo=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constraints/BankCardDesensitize.java      | 21 ----------
 .../constraints/CarLicenseDesensitize.java    | 21 ----------
 .../constraints/ChineseNameDesensitize.java   | 21 ----------
 .../constraints/EmailDesensitize.java         | 21 ----------
 .../constraints/FixedPhoneDesensitize.java    | 21 ----------
 .../constraints/IdCardDesensitize.java        | 21 ----------
 .../constraints/PasswordDesensitize.java      | 21 ----------
 .../constraints/PhoneNumberDesensitize.java   | 21 ----------
 .../base}/DesensitizationHandlerHolder.java   |  9 ++--
 .../base}/annotation/Desensitize.java         |  9 ++--
 .../base/handler/DesensitizationHandler.java  | 19 +++++++++
 .../regex/annotation/EmailDesensitize.java    | 34 +++++++++++++++
 .../regex}/annotation/RegexDesensitize.java   |  7 ++--
 .../AbstractRegexDesensitizationHandler.java  | 25 +++++++++++
 .../DefaultRegexDesensitizationHandler.java   | 14 +++++++
 .../handler/EmailDesensitizationHandler.java  | 11 +++++
 .../core/slider/annotation/BankCard.java      | 41 +++++++++++++++++++
 .../core/slider/annotation/CarLicense.java    | 41 +++++++++++++++++++
 .../core/slider/annotation/ChineseName.java   | 41 +++++++++++++++++++
 .../core/slider/annotation/FixedPhone.java    | 41 +++++++++++++++++++
 .../core/slider/annotation/IdCard.java        | 41 +++++++++++++++++++
 .../core/slider/annotation/Password.java      | 41 +++++++++++++++++++
 .../core/slider/annotation/PhoneNumber.java   | 41 +++++++++++++++++++
 .../slider/annotation/Slider.java}            |  9 ++--
 .../AbstractDesensitizationHandler.java}      | 31 +++++++-------
 .../handler/BankCardDesensitization.java      | 11 +++++
 .../handler/CarLicenseDesensitization.java    | 10 +++++
 .../handler/ChineseNameDesensitization.java   | 10 +++++
 .../DefaultDesensitizationHandler.java        | 14 +++++++
 .../handler/FixedPhoneDesensitization.java    | 10 +++++
 .../slider/handler/IdCardDesensitization.java | 10 +++++
 .../handler/PasswordDesensitization.java      | 10 +++++
 .../handler/PhoneNumberDesensitization.java   | 11 +++++
 .../handler/DesensitizationHandler.java       | 28 -------------
 .../handler/RegexDesensitizationHandler.java  | 23 -----------
 .../StringDesensitizeSerializer.java          | 29 +++----------
 .../handler/DesensitizationHandlerTest.java   | 25 -----------
 37 files changed, 518 insertions(+), 296 deletions(-)
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java
 rename yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/{handler => core/base}/DesensitizationHandlerHolder.java (66%)
 rename yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/{ => core/base}/annotation/Desensitize.java (71%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
 rename yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/{ => core/regex}/annotation/RegexDesensitize.java (71%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
 rename yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/{annotation/SliderDesensitize.java => core/slider/annotation/Slider.java} (70%)
 rename yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/{handler/SliderDesensitizationHandler.java => core/slider/handler/AbstractDesensitizationHandler.java} (60%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java
deleted file mode 100644
index 8fa73169a8..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/BankCardDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 银行卡号
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 6, suffixKeep = 2, replacer = "*") // 银行卡号;比如：9988002866797031脱敏之后为998800********31
-public @interface BankCardDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java
deleted file mode 100644
index 11f1f58141..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/CarLicenseDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 车牌号
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 3, suffixKeep = 1, replacer = "*") // 车牌号;比如：粤A66666脱敏之后为粤A6***6
-public @interface CarLicenseDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java
deleted file mode 100644
index 97d2698ed8..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/ChineseNameDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 中文名
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 1, suffixKeep = 0, replacer = "*") // 中文名;比如：刘子豪脱敏之后为刘**
-public @interface ChineseNameDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java
deleted file mode 100644
index 142e7c0f6e..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/EmailDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.RegexDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 邮箱
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@RegexDesensitize(regex = "(^.)[^@]*(@.*$)", replacer ="$1****$2")  // 邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
-public @interface EmailDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java
deleted file mode 100644
index f91988735c..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/FixedPhoneDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 固定电话
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 4, suffixKeep = 2, replacer = "*") // 固定电话;比如：01086551122脱敏之后为0108*****22
-public @interface FixedPhoneDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java
deleted file mode 100644
index 921019c5de..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/IdCardDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 身份证
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 6, suffixKeep = 2, replacer = "*") // 身份证号码;比如：530321199204074611脱敏之后为530321**********11
-public @interface IdCardDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java
deleted file mode 100644
index 8d823a139c..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PasswordDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 密码
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 0, suffixKeep = 0, replacer = "*") // 密码;比如：123456脱敏之后为******
-public @interface PasswordDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java
deleted file mode 100644
index 0829c6a455..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/constraints/PhoneNumberDesensitize.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.annotation.constraints;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 手机号
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@SliderDesensitize(prefixKeep = 3, suffixKeep = 4, replacer = "*") // 手机号;比如：13248765917脱敏之后为132****5917
-public @interface PhoneNumberDesensitize {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
similarity index 66%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
rename to yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
index 456d2b920c..5787eae569 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerHolder.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
@@ -1,6 +1,9 @@
-package cn.iocoder.yudao.framework.desensitize.handler;
+package cn.iocoder.yudao.framework.desensitize.core.base;
 
 import cn.hutool.core.util.ReflectUtil;
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.regex.handler.DefaultRegexDesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.DefaultDesensitizationHandler;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -13,8 +16,8 @@ public class DesensitizationHandlerHolder {
      * handler 缓存，默认初始化内置的处理器
      */
     private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<>() {{
-        put(RegexDesensitizationHandler.class, new RegexDesensitizationHandler());
-        put(SliderDesensitizationHandler.class, new SliderDesensitizationHandler());
+        put(DefaultRegexDesensitizationHandler.class, new DefaultRegexDesensitizationHandler());
+        put(DefaultDesensitizationHandler.class, new DefaultDesensitizationHandler());
     }};
 
     public static DesensitizationHandler getDesensitizationHandler(Class<? extends DesensitizationHandler> clazz) {
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
similarity index 71%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
rename to yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
index 65dd2108d0..888330ebe1 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/Desensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.framework.desensitize.annotation;
+package cn.iocoder.yudao.framework.desensitize.core.base.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
 import cn.iocoder.yudao.framework.desensitize.serializer.StringDesensitizeSerializer;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -16,7 +16,7 @@ import java.lang.annotation.Target;
  * Desensitize 顶级脱敏注解
  */
 @Documented
-@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @JsonSerialize(using = StringDesensitizeSerializer.class)
@@ -25,6 +25,5 @@ public @interface Desensitize {
     /**
      * 脱敏处理器
      */
-    Class<? extends DesensitizationHandler> desensitizationHandler();
-
+    Class<? extends DesensitizationHandler> desensitizationBy();
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
new file mode 100644
index 0000000000..9c10fb0ac6
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.framework.desensitize.core.base.handler;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * 脱敏处理器接口
+ */
+public interface DesensitizationHandler<T extends Annotation> {
+
+    /**
+     * 脱敏
+     *
+     * @param origin 原始字符串
+     * @param anno   注解信息
+     * @return 脱敏后的字符串
+     */
+    String desensitize(String origin, T anno);
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
new file mode 100644
index 0000000000..746e5503b7
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.framework.desensitize.core.regex.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.regex.handler.EmailDesensitizationHandler;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 邮箱
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = EmailDesensitizationHandler.class) // 邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
+public @interface EmailDesensitize {
+    /**
+     * 匹配的正则表达式（默认匹配所有）
+     */
+    String regex() default  "(^.)[^@]*(@.*$)";
+
+    /**
+     * 替换规则，会将匹配到的字符串全部替换成 replacer
+     * 例如：regex=123; replacer=******
+     * 原始字符串 123456789
+     * 脱敏后字符串 ******456789
+     */
+    String replacer() default "$1****$2";
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
similarity index 71%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java
rename to yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
index c2df586c43..7ee6fadd51 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/RegexDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
@@ -1,6 +1,7 @@
-package cn.iocoder.yudao.framework.desensitize.annotation;
+package cn.iocoder.yudao.framework.desensitize.core.regex.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.handler.RegexDesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.regex.handler.DefaultRegexDesensitizationHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
 import java.lang.annotation.Documented;
@@ -16,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationHandler = RegexDesensitizationHandler.class)
+@Desensitize(desensitizationBy = DefaultRegexDesensitizationHandler.class)
 public @interface RegexDesensitize {
     /**
      * 匹配的正则表达式（默认匹配所有）
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
new file mode 100644
index 0000000000..17c86055ea
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
+
+import java.lang.annotation.Annotation;
+
+public abstract class AbstractRegexDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
+
+    @Override
+    public String desensitize(String origin, T anno) {
+        Object[] args = getArgs(anno);
+        String regex = (String) args[0];
+        String replacer = (String) args[1];
+
+        return origin.replaceAll(regex, replacer);
+    }
+
+    /**
+     * 获取注解的参数
+     *
+     * @param anno 注解信息
+     * @return 注解的参数
+     */
+    abstract Object[] getArgs(T anno);
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
new file mode 100644
index 0000000000..a21734909c
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
+
+/**
+ * 正则脱敏处理器
+ */
+public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<RegexDesensitize> {
+
+    @Override
+    Object[] getArgs(RegexDesensitize anno) {
+        return new Object[]{anno.regex(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
new file mode 100644
index 0000000000..9336351dab
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
+
+public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHandler<EmailDesensitize> {
+
+    @Override
+    Object[] getArgs(EmailDesensitize anno) {
+        return new Object[]{anno.regex(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
new file mode 100644
index 0000000000..4402ab7d68
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.BankCardDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 银行卡号
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = BankCardDesensitization.class)// 银行卡号;比如：9988002866797031脱敏之后为998800********31
+public @interface BankCard {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 6;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 2;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
new file mode 100644
index 0000000000..898c9d4a79
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.CarLicenseDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 车牌号
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = CarLicenseDesensitization.class) // 车牌号;比如：粤A66666脱敏之后为粤A6***6
+public @interface CarLicense {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 3;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 1;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
new file mode 100644
index 0000000000..5b7e7e638e
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.ChineseNameDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 中文名
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = ChineseNameDesensitization.class) // 中文名;比如：刘子豪脱敏之后为刘**
+public @interface ChineseName {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 1;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 0;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
new file mode 100644
index 0000000000..7833377c40
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.FixedPhoneDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 固定电话
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = FixedPhoneDesensitization.class) // 固定电话;比如：01086551122脱敏之后为0108*****22
+public @interface FixedPhone {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 4;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 2;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
new file mode 100644
index 0000000000..1f8c7a4894
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.IdCardDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 身份证
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = IdCardDesensitization.class) // 身份证号码;比如：530321199204074611脱敏之后为530321**********11
+public @interface IdCard {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 6;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 2;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
new file mode 100644
index 0000000000..148189ffe3
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.PasswordDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 密码
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = PasswordDesensitization.class) // 密码;比如：123456脱敏之后为******
+public @interface Password {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 0;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 0;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
new file mode 100644
index 0000000000..2ad620c0e0
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.PhoneNumberDesensitization;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 手机号
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@Desensitize(desensitizationBy = PhoneNumberDesensitization.class) // 手机号;比如：13248765917脱敏之后为132****5917
+public @interface PhoneNumber {
+
+    /**
+     * 前缀保留长度
+     */
+    int prefixKeep() default 3;
+
+    /**
+     * 后缀保留长度
+     */
+    int suffixKeep() default 4;
+
+    /**
+     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
+     * 原始字符串  123456
+     * 脱敏后     1***56
+     */
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
similarity index 70%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java
rename to yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
index ebafaa9bc0..c752df310d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/annotation/SliderDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
@@ -1,6 +1,7 @@
-package cn.iocoder.yudao.framework.desensitize.annotation;
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.handler.SliderDesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.DefaultDesensitizationHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
 import java.lang.annotation.Documented;
@@ -16,8 +17,8 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationHandler = SliderDesensitizationHandler.class)
-public @interface SliderDesensitize {
+@Desensitize(desensitizationBy = DefaultDesensitizationHandler.class)
+public @interface Slider {
 
     /**
      * 后缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
similarity index 60%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
rename to yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
index 47887da39f..92b8c0d6c9 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/SliderDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
@@ -1,17 +1,17 @@
-package cn.iocoder.yudao.framework.desensitize.handler;
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
 
-/**
- * 滑动脱敏处理器
- */
-public class SliderDesensitizationHandler implements DesensitizationHandler<SliderDesensitize> {
+import java.lang.annotation.Annotation;
+
+public abstract class AbstractDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
 
     @Override
-    public String desensitize(String origin, Object... arg) {
-        int prefixKeep = (Integer) arg[0];
-        int suffixKeep = (Integer) arg[1];
-        String replacer = (String) arg[2];
+    public String desensitize(String origin, T anno) {
+        Object[] args = getArgs(anno);
+        int prefixKeep = (Integer) args[0];
+        int suffixKeep = (Integer) args[1];
+        String replacer = (String) args[2];
 
         int length = origin.length();
 
@@ -31,10 +31,13 @@ public class SliderDesensitizationHandler implements DesensitizationHandler<Slid
                 origin.substring(prefixKeep + interval);
     }
 
-    @Override
-    public Object[] getAnnotationArgs(SliderDesensitize anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
+    /**
+     * 获取注解的参数
+     *
+     * @param anno 注解信息
+     * @return 注解的参数
+     */
+    abstract Object[] getArgs(T anno);
 
     /**
      * 根据长度循环构建替换符
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
new file mode 100644
index 0000000000..942ca258fc
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
+
+public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCard> {
+
+    @Override
+    Object[] getArgs(BankCard anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
new file mode 100644
index 0000000000..d7cef7d2ff
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
+
+public class CarLicenseDesensitization  extends AbstractDesensitizationHandler<CarLicense> {
+    @Override
+    Object[] getArgs(CarLicense anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
new file mode 100644
index 0000000000..ba0a6607bb
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
+
+public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseName> {
+    @Override
+    Object[] getArgs(ChineseName anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
new file mode 100644
index 0000000000..3be33a0b8a
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+
+/**
+ * 滑动脱敏处理器
+ */
+public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<Slider> {
+
+    @Override
+    Object[] getArgs(Slider anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
new file mode 100644
index 0000000000..8fb71289f1
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
+
+public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhone> {
+    @Override
+    Object[] getArgs(FixedPhone anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
new file mode 100644
index 0000000000..ce76b357e3
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
+
+public class IdCardDesensitization  extends AbstractDesensitizationHandler<IdCard> {
+    @Override
+    Object[] getArgs(IdCard anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
new file mode 100644
index 0000000000..35a656c3db
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
+
+public class PasswordDesensitization extends AbstractDesensitizationHandler<Password> {
+    @Override
+    Object[] getArgs(Password anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
new file mode 100644
index 0000000000..0525cb874c
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PhoneNumber;
+
+public class PhoneNumberDesensitization extends AbstractDesensitizationHandler<PhoneNumber> {
+
+    @Override
+    Object[] getArgs(PhoneNumber anno) {
+        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
deleted file mode 100644
index 74870e7716..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.handler;
-
-import java.lang.annotation.Annotation;
-
-/**
- * 脱敏处理器接口
- */
-public interface DesensitizationHandler<T extends Annotation> {
-
-    /**
-     * 脱敏
-     *
-     * @param origin 原始字符串
-     * @param arg    参数
-     * @return 脱敏后的字符串
-     */
-    String desensitize(String origin, Object... arg);
-
-    /**
-     * 获取注解参数
-     *
-     * @param anno 注解
-     * @return 注解参数
-     */
-    default Object[] getAnnotationArgs(T anno) {
-        return new Object[0];
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
deleted file mode 100644
index 57fc711787..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/handler/RegexDesensitizationHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.handler;
-
-import cn.iocoder.yudao.framework.desensitize.annotation.RegexDesensitize;
-
-/**
- * 正则脱敏处理器
- */
-public class RegexDesensitizationHandler implements DesensitizationHandler<RegexDesensitize> {
-
-    @Override
-    public String desensitize(String origin, Object... arg) {
-        String regex = (String) arg[0];
-        String replacer = (String) arg[1];
-
-        return origin.replaceAll(regex, replacer);
-    }
-
-    @Override
-    public Object[] getAnnotationArgs(RegexDesensitize anno) {
-        return new Object[]{anno.regex(), anno.replacer()};
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
index 956be23f33..0fbdb04f11 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
@@ -4,11 +4,9 @@ import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.desensitize.annotation.Desensitize;
-import cn.iocoder.yudao.framework.desensitize.annotation.RegexDesensitize;
-import cn.iocoder.yudao.framework.desensitize.annotation.SliderDesensitize;
-import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.handler.DesensitizationHandlerHolder;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.base.DesensitizationHandlerHolder;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -46,7 +44,7 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
             return this;
         }
         StringDesensitizeSerializer serializer = new StringDesensitizeSerializer();
-        serializer.setDesensitizationHandler(DesensitizationHandlerHolder.getDesensitizationHandler(annotation.desensitizationHandler()));
+        serializer.setDesensitizationHandler(DesensitizationHandlerHolder.getDesensitizationHandler(annotation.desensitizationBy()));
         return serializer;
     }
 
@@ -62,22 +60,6 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         Class<?> currentValueClass = currentValue.getClass();
         Field field = ReflectUtil.getField(currentValueClass, currentName);
 
-        // 滑动处理器
-        SliderDesensitize sliderDesensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, SliderDesensitize.class));
-        if (sliderDesensitize != null) {
-            value = this.desensitizationHandler.desensitize(value, this.desensitizationHandler.getAnnotationArgs(sliderDesensitize));
-            gen.writeString(value);
-            return;
-        }
-
-        // 正则处理器
-        RegexDesensitize regexDesensitize = ArrayUtil.firstNonNull(AnnotationUtil.getCombinationAnnotations(field, RegexDesensitize.class));
-        if (regexDesensitize != null) {
-            value = this.desensitizationHandler.desensitize(value, this.desensitizationHandler.getAnnotationArgs(regexDesensitize));
-            gen.writeString(value);
-            return;
-        }
-
         // 自定义处理器
         Desensitize[] annotations = AnnotationUtil.getCombinationAnnotations(field, Desensitize.class);
         if (ArrayUtil.isEmpty(annotations)) {
@@ -86,8 +68,9 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         }
 
         for (Annotation annotation : field.getAnnotations()) {
+
             if (AnnotationUtil.hasAnnotation(annotation.annotationType(), Desensitize.class)) {
-                value = this.desensitizationHandler.desensitize(value, this.desensitizationHandler.getAnnotationArgs(annotation));
+                value = this.desensitizationHandler.desensitize(value, annotation);
                 gen.writeString(value);
                 return;
             }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java
deleted file mode 100644
index 63b4eaabfc..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/handler/DesensitizationHandlerTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.handler;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class DesensitizationHandlerTest {
-
-    @Test
-    public void testSliderDesensitizationHandler() {
-        DesensitizationHandler handler = DesensitizationHandlerHolder.getDesensitizationHandler(SliderDesensitizationHandler.class);
-
-        Assertions.assertEquals("A****FG", handler.desensitize("ABCDEFG", 1, 2, "*"));
-        Assertions.assertEquals("芋**码", handler.desensitize("芋道源码", 1, 1, "*"));
-        Assertions.assertEquals("****", handler.desensitize("芋道源码", 4, 0, "*"));
-    }
-
-    @Test
-    public void testRegexDesensitizationHandler() {
-        DesensitizationHandler handler = DesensitizationHandlerHolder.getDesensitizationHandler(RegexDesensitizationHandler.class);
-
-        Assertions.assertEquals("e****@gmail.com", handler.desensitize("example@gmail.com", "(^.)[^@]*(@.*$)", "$1****$2"));
-        Assertions.assertEquals("***，铁***", handler.desensitize("他妈的，铁废物", "他妈的|去你大爷|卧槽|草泥马|废物", "***"));
-    }
-
-}

From e5ab9b71b65c11c7ad300c2b225d98a19348b349 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Mon, 16 Jan 2023 21:50:09 +0800
Subject: [PATCH 33/65] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/regex/annotation/EmailDesensitize.java          | 9 +++------
 .../desensitize/core/slider/annotation/BankCard.java     | 7 ++-----
 .../desensitize/core/slider/annotation/CarLicense.java   | 7 ++-----
 .../desensitize/core/slider/annotation/ChineseName.java  | 7 ++-----
 .../desensitize/core/slider/annotation/FixedPhone.java   | 7 ++-----
 .../desensitize/core/slider/annotation/IdCard.java       | 7 ++-----
 .../desensitize/core/slider/annotation/Password.java     | 7 ++-----
 .../desensitize/core/slider/annotation/PhoneNumber.java  | 7 ++-----
 8 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
index 746e5503b7..ebd754b1ed 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
@@ -17,18 +17,15 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = EmailDesensitizationHandler.class) // 邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
+@Desensitize(desensitizationBy = EmailDesensitizationHandler.class)
 public @interface EmailDesensitize {
     /**
-     * 匹配的正则表达式（默认匹配所有）
+     * 匹配的正则表达式
      */
     String regex() default  "(^.)[^@]*(@.*$)";
 
     /**
-     * 替换规则，会将匹配到的字符串全部替换成 replacer
-     * 例如：regex=123; replacer=******
-     * 原始字符串 123456789
-     * 脱敏后字符串 ******456789
+     * 替换规则，邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
      */
     String replacer() default "$1****$2";
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
index 4402ab7d68..4c41569e88 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = BankCardDesensitization.class)// 银行卡号;比如：9988002866797031脱敏之后为998800********31
+@Desensitize(desensitizationBy = BankCardDesensitization.class)
 public @interface BankCard {
 
     /**
@@ -31,10 +31,7 @@ public @interface BankCard {
     int suffixKeep() default 2;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，银行卡号;比如：9988002866797031脱敏之后为998800********31
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
index 898c9d4a79..fb89ddb084 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = CarLicenseDesensitization.class) // 车牌号;比如：粤A66666脱敏之后为粤A6***6
+@Desensitize(desensitizationBy = CarLicenseDesensitization.class)
 public @interface CarLicense {
 
     /**
@@ -31,10 +31,7 @@ public @interface CarLicense {
     int suffixKeep() default 1;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，车牌号;比如：粤A66666脱敏之后为粤A6***6
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
index 5b7e7e638e..3b4a1a5302 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = ChineseNameDesensitization.class) // 中文名;比如：刘子豪脱敏之后为刘**
+@Desensitize(desensitizationBy = ChineseNameDesensitization.class)
 public @interface ChineseName {
 
     /**
@@ -31,10 +31,7 @@ public @interface ChineseName {
     int suffixKeep() default 0;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，中文名;比如：刘子豪脱敏之后为刘**
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
index 7833377c40..663388d892 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = FixedPhoneDesensitization.class) // 固定电话;比如：01086551122脱敏之后为0108*****22
+@Desensitize(desensitizationBy = FixedPhoneDesensitization.class)
 public @interface FixedPhone {
 
     /**
@@ -31,10 +31,7 @@ public @interface FixedPhone {
     int suffixKeep() default 2;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，固定电话;比如：01086551122脱敏之后为0108*****22
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
index 1f8c7a4894..ac2ba9cd39 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = IdCardDesensitization.class) // 身份证号码;比如：530321199204074611脱敏之后为530321**********11
+@Desensitize(desensitizationBy = IdCardDesensitization.class)
 public @interface IdCard {
 
     /**
@@ -31,10 +31,7 @@ public @interface IdCard {
     int suffixKeep() default 2;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，身份证号码;比如：530321199204074611脱敏之后为530321**********11
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
index 148189ffe3..c4bb6e1eb2 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = PasswordDesensitization.class) // 密码;比如：123456脱敏之后为******
+@Desensitize(desensitizationBy = PasswordDesensitization.class)
 public @interface Password {
 
     /**
@@ -31,10 +31,7 @@ public @interface Password {
     int suffixKeep() default 0;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，密码;比如：123456脱敏之后为******
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
index 2ad620c0e0..c78354d153 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = PhoneNumberDesensitization.class) // 手机号;比如：13248765917脱敏之后为132****5917
+@Desensitize(desensitizationBy = PhoneNumberDesensitization.class)
 public @interface PhoneNumber {
 
     /**
@@ -31,10 +31,7 @@ public @interface PhoneNumber {
     int suffixKeep() default 4;
 
     /**
-     * 替换规则，会将前缀后缀保留后，全部替换成 replacer
-     * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
-     * 原始字符串  123456
-     * 脱敏后     1***56
+     * 替换规则，手机号;比如：13248765917脱敏之后为132****5917
      */
     String replacer() default "*";
 

From 32d7d6ab2975f11e8d31ad4f7407a3023c7061df Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 17 Jan 2023 08:11:57 +0800
Subject: [PATCH 34/65] =?UTF-8?q?code=20review=20=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                          |  5 ++++-
 .../core/base/DesensitizationHandlerHolder.java      |  3 +++
 .../core/base/annotation/Desensitize.java            | 12 +++++++-----
 .../core/base/handler/DesensitizationHandler.java    |  2 +-
 .../handler/AbstractRegexDesensitizationHandler.java |  2 ++
 .../handler/AbstractDesensitizationHandler.java      |  8 +++++---
 .../serializer/StringDesensitizeSerializer.java      |  7 ++++---
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
index 7f15d0d4c7..1afb387b82 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
@@ -9,8 +9,11 @@
         <version>${revision}</version>
     </parent>
 
+    <!-- TODO 城：yudao-spring-boot-starter-biz-desensitize =》yudao-spring-boot-starter-desensitize，不属于业务哈 -->
     <artifactId>yudao-spring-boot-starter-biz-desensitize</artifactId>
+    <!-- TODO 城：这个组件的说明； -->
 
+    <!-- TODO 城：这里去掉哈 -->
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -40,4 +43,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
index 5787eae569..95c193f6b0 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
@@ -8,14 +8,17 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.handler.DefaultDesensi
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+// TODO @城：DesensitizationHandlerHolder =》 DesensitizationHandlerFactory？ Holder 没有太多工厂的味道哈
 /**
  * 脱敏处理器 Holder
  */
 public class DesensitizationHandlerHolder {
+
     /**
      * handler 缓存，默认初始化内置的处理器
      */
     private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<>() {{
+        // TODO @城：这 2 个，是不是不用呀？需要的时候初始化
         put(DefaultRegexDesensitizationHandler.class, new DefaultRegexDesensitizationHandler());
         put(DefaultDesensitizationHandler.class, new DefaultDesensitizationHandler());
     }};
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
index 888330ebe1..b95ccd68d5 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
@@ -11,19 +11,21 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
+// TODO @城：每个接口上，author 写下哈。
+// TODO @城：Desensitize = 》DesensitizeBy
+// TODO @城：Desensitize 类注释，方便读者阅读理解
 /**
  * Desensitize 顶级脱敏注解
  */
 @Documented
-@Target({ ElementType.ANNOTATION_TYPE})
+@Target(ElementType.ANNOTATION_TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@JsonSerialize(using = StringDesensitizeSerializer.class)
+@JacksonAnnotationsInside // TODO @城：这个的作用，也可以写下
+@JsonSerialize(using = StringDesensitizeSerializer.class) // TODO @城：这个的作用，也可以写下
 public @interface Desensitize {
 
     /**
      * 脱敏处理器
      */
-    Class<? extends DesensitizationHandler> desensitizationBy();
+    Class<? extends DesensitizationHandler> desensitizationBy(); // TODO @城：desensitizationBy -> handler
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
index 9c10fb0ac6..a4dd246659 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
@@ -11,7 +11,7 @@ public interface DesensitizationHandler<T extends Annotation> {
      * 脱敏
      *
      * @param origin 原始字符串
-     * @param anno   注解信息
+     * @param anno   注解信息 // TODO 不要这样的缩写哈，anno -> annotation
      * @return 脱敏后的字符串
      */
     String desensitize(String origin, T anno);
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
index 17c86055ea..a9d495adfb 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
@@ -15,6 +15,8 @@ public abstract class AbstractRegexDesensitizationHandler<T extends Annotation>
         return origin.replaceAll(regex, replacer);
     }
 
+    // TODO @城：是不是抽象两个方法，一个拿 regex；一个拿 replacer
+
     /**
      * 获取注解的参数
      *
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
index 92b8c0d6c9..0b25cdbe5d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
@@ -12,25 +12,26 @@ public abstract class AbstractDesensitizationHandler<T extends Annotation> imple
         int prefixKeep = (Integer) args[0];
         int suffixKeep = (Integer) args[1];
         String replacer = (String) args[2];
-
         int length = origin.length();
 
-        // 原始字符串长度小于等于保留长度，则原始字符串全部替换
+        // 情况一：原始字符串长度小于等于保留长度，则原始字符串全部替换
         if (prefixKeep >= length || suffixKeep >= length) {
             return buildReplacerByLength(replacer, length);
         }
 
-        // 如果原始字符串小于等于前后缀保留字符串长度，则原始字符串全部替换
+        // 情况二：如果原始字符串小于等于前后缀保留字符串长度，则原始字符串全部替换
         if ((prefixKeep + suffixKeep) >= length) {
             return buildReplacerByLength(replacer, length);
         }
 
+        // 情况三：TODO 城
         int interval = length - prefixKeep - suffixKeep;
         return origin.substring(0, prefixKeep) +
                 buildReplacerByLength(replacer, interval) +
                 origin.substring(prefixKeep + interval);
     }
 
+    // TODO @城：类似，子类直接获取到参数哈
     /**
      * 获取注解的参数
      *
@@ -49,4 +50,5 @@ public abstract class AbstractDesensitizationHandler<T extends Annotation> imple
     private String buildReplacerByLength(String replacer, int length) {
         return String.valueOf(replacer).repeat(Math.max(0, length));
     }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
index 0fbdb04f11..accfa77dd2 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
@@ -19,16 +19,19 @@ import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
+// TODO @城：挪到 base/serializer 包下
 /**
  * 脱敏序列化器
  */
 public class StringDesensitizeSerializer extends StdSerializer<String> implements ContextualSerializer {
+
     private DesensitizationHandler desensitizationHandler;
 
     protected StringDesensitizeSerializer() {
         super(String.class);
     }
 
+    // TODO @城：get 和 set 方法是必须的么？如果是的话，可以换成 lombok 注解哈，简洁一点~
     public DesensitizationHandler getDesensitizationHandler() {
         return desensitizationHandler;
     }
@@ -55,6 +58,7 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
             return;
         }
 
+        // TODO @城：抽个 private getField 方法。让这个方法的逻辑主干，更清晰
         String currentName = gen.getOutputContext().getCurrentName();
         Object currentValue = gen.getCurrentValue();
         Class<?> currentValueClass = currentValue.getClass();
@@ -66,16 +70,13 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
             gen.writeString(value);
             return;
         }
-
         for (Annotation annotation : field.getAnnotations()) {
-
             if (AnnotationUtil.hasAnnotation(annotation.annotationType(), Desensitize.class)) {
                 value = this.desensitizationHandler.desensitize(value, annotation);
                 gen.writeString(value);
                 return;
             }
         }
-
         gen.writeString(value);
     }
 

From 7b3fca28447d2947136048b5d5052462ffb44d96 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Tue, 17 Jan 2023 10:52:37 +0800
Subject: [PATCH 35/65] =?UTF-8?q?feat:=20=E8=84=B1=E6=95=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml                    |  2 +-
 yudao-framework/pom.xml                       |  2 +-
 .../AbstractRegexDesensitizationHandler.java  | 27 ----------
 .../handler/BankCardDesensitization.java      | 11 ----
 .../handler/CarLicenseDesensitization.java    | 10 ----
 .../handler/ChineseNameDesensitization.java   | 10 ----
 .../DefaultDesensitizationHandler.java        | 14 -----
 .../handler/FixedPhoneDesensitization.java    | 10 ----
 .../slider/handler/IdCardDesensitization.java | 10 ----
 .../handler/PasswordDesensitization.java      | 10 ----
 .../handler/PhoneNumberDesensitization.java   | 11 ----
 .../pom.xml                                   | 12 +----
 .../base/DesensitizationHandlerFactory.java}  | 15 ++----
 .../core/base/annotation/DesensitizeBy.java}  | 17 +++----
 .../base/handler/DesensitizationHandler.java  |  6 +--
 .../StringDesensitizeSerializer.java          | 51 ++++++++++---------
 .../regex/annotation/EmailDesensitize.java    |  9 ++--
 .../regex/annotation/RegexDesensitize.java    |  7 ++-
 .../AbstractRegexDesensitizationHandler.java  | 37 ++++++++++++++
 .../DefaultRegexDesensitizationHandler.java   | 14 +++--
 .../handler/EmailDesensitizationHandler.java  | 14 ++++-
 .../core/slider/annotation/BankCard.java      |  6 ++-
 .../core/slider/annotation/CarLicense.java    |  6 ++-
 .../core/slider/annotation/ChineseName.java   |  6 ++-
 .../core/slider/annotation/FixedPhone.java    |  6 ++-
 .../core/slider/annotation/IdCard.java        |  6 ++-
 .../core/slider/annotation/Password.java      |  6 ++-
 .../core/slider/annotation/PhoneNumber.java   |  6 ++-
 .../core/slider/annotation/Slider.java        |  6 ++-
 .../AbstractDesensitizationHandler.java       | 49 +++++++++++++-----
 .../handler/BankCardDesensitization.java      | 27 ++++++++++
 .../handler/CarLicenseDesensitization.java    | 25 +++++++++
 .../handler/ChineseNameDesensitization.java   | 25 +++++++++
 .../DefaultDesensitizationHandler.java        | 25 +++++++++
 .../handler/FixedPhoneDesensitization.java    | 25 +++++++++
 .../slider/handler/IdCardDesensitization.java | 25 +++++++++
 .../handler/PasswordDesensitization.java      | 25 +++++++++
 .../handler/PhoneNumberDesensitization.java   | 26 ++++++++++
 38 files changed, 390 insertions(+), 209 deletions(-)
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/pom.xml (70%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java => yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java} (60%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java => yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java} (50%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java (62%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize => yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base}/serializer/StringDesensitizeSerializer.java (71%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java (85%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java (90%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java (54%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java (52%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java (90%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java (90%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java (90%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java (90%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java (91%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java (90%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java (90%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java (91%)
 rename yudao-framework/{yudao-spring-boot-starter-biz-desensitize => yudao-spring-boot-starter-desensitize}/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java (53%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index be2f14dd65..f57f7a944b 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -143,7 +143,7 @@
             </dependency>
             <dependency>
                 <groupId>cn.iocoder.boot</groupId>
-                <artifactId>yudao-spring-boot-starter-biz-desensitize</artifactId>
+                <artifactId>yudao-spring-boot-starter-desensitize</artifactId>
                 <version>${revision}</version>
             </dependency>
 
diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index 0f20b1a788..12244f5ce6 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -41,7 +41,7 @@
         <module>yudao-spring-boot-starter-flowable</module>
         <module>yudao-spring-boot-starter-captcha</module>
         <module>yudao-spring-boot-starter-websocket</module>
-        <module>yudao-spring-boot-starter-biz-desensitize</module>
+        <module>yudao-spring-boot-starter-desensitize</module>
     </modules>
 
     <artifactId>yudao-framework</artifactId>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
deleted file mode 100644
index a9d495adfb..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-
-import java.lang.annotation.Annotation;
-
-public abstract class AbstractRegexDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
-
-    @Override
-    public String desensitize(String origin, T anno) {
-        Object[] args = getArgs(anno);
-        String regex = (String) args[0];
-        String replacer = (String) args[1];
-
-        return origin.replaceAll(regex, replacer);
-    }
-
-    // TODO @城：是不是抽象两个方法，一个拿 regex；一个拿 replacer
-
-    /**
-     * 获取注解的参数
-     *
-     * @param anno 注解信息
-     * @return 注解的参数
-     */
-    abstract Object[] getArgs(T anno);
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
deleted file mode 100644
index 942ca258fc..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
-
-public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCard> {
-
-    @Override
-    Object[] getArgs(BankCard anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
deleted file mode 100644
index d7cef7d2ff..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
-
-public class CarLicenseDesensitization  extends AbstractDesensitizationHandler<CarLicense> {
-    @Override
-    Object[] getArgs(CarLicense anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
deleted file mode 100644
index ba0a6607bb..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
-
-public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseName> {
-    @Override
-    Object[] getArgs(ChineseName anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
deleted file mode 100644
index 3be33a0b8a..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
-
-/**
- * 滑动脱敏处理器
- */
-public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<Slider> {
-
-    @Override
-    Object[] getArgs(Slider anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
deleted file mode 100644
index 8fb71289f1..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
-
-public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhone> {
-    @Override
-    Object[] getArgs(FixedPhone anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
deleted file mode 100644
index ce76b357e3..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
-
-public class IdCardDesensitization  extends AbstractDesensitizationHandler<IdCard> {
-    @Override
-    Object[] getArgs(IdCard anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
deleted file mode 100644
index 35a656c3db..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
-
-public class PasswordDesensitization extends AbstractDesensitizationHandler<Password> {
-    @Override
-    Object[] getArgs(Password anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java b/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
deleted file mode 100644
index 0525cb874c..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PhoneNumber;
-
-public class PhoneNumberDesensitization extends AbstractDesensitizationHandler<PhoneNumber> {
-
-    @Override
-    Object[] getArgs(PhoneNumber anno) {
-        return new Object[]{anno.prefixKeep(), anno.suffixKeep(), anno.replacer()};
-    }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml b/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
similarity index 70%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
rename to yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
index 1afb387b82..53879bd0f2 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
@@ -9,16 +9,8 @@
         <version>${revision}</version>
     </parent>
 
-    <!-- TODO 城：yudao-spring-boot-starter-biz-desensitize =》yudao-spring-boot-starter-desensitize，不属于业务哈 -->
-    <artifactId>yudao-spring-boot-starter-biz-desensitize</artifactId>
-    <!-- TODO 城：这个组件的说明； -->
-
-    <!-- TODO 城：这里去掉哈 -->
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <artifactId>yudao-spring-boot-starter-desensitize</artifactId>
+    <description>脱敏组件</description>
 
     <dependencies>
         <dependency>
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
similarity index 60%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
index 95c193f6b0..abd756ef23 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerHolder.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
@@ -2,33 +2,28 @@ package cn.iocoder.yudao.framework.desensitize.core.base;
 
 import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.core.regex.handler.DefaultRegexDesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.core.slider.handler.DefaultDesensitizationHandler;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-// TODO @城：DesensitizationHandlerHolder =》 DesensitizationHandlerFactory？ Holder 没有太多工厂的味道哈
 /**
  * 脱敏处理器 Holder
+ *
+ * @author gaibu
  */
-public class DesensitizationHandlerHolder {
+public class DesensitizationHandlerFactory {
 
     /**
      * handler 缓存，默认初始化内置的处理器
      */
-    private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<>() {{
-        // TODO @城：这 2 个，是不是不用呀？需要的时候初始化
-        put(DefaultRegexDesensitizationHandler.class, new DefaultRegexDesensitizationHandler());
-        put(DefaultDesensitizationHandler.class, new DefaultDesensitizationHandler());
-    }};
+    private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<Class<? extends DesensitizationHandler>, DesensitizationHandler>();
 
     public static DesensitizationHandler getDesensitizationHandler(Class<? extends DesensitizationHandler> clazz) {
         DesensitizationHandler handler = HANDLER_MAP.get(clazz);
         if (handler != null) {
             return handler;
         }
-        synchronized (DesensitizationHandlerHolder.class) {
+        synchronized (DesensitizationHandlerFactory.class) {
             handler = HANDLER_MAP.get(clazz);
             // 双重校验锁
             if (handler != null) {
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java
similarity index 50%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java
index b95ccd68d5..d06e633a6a 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/Desensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.framework.desensitize.core.base.annotation;
 
 import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.serializer.StringDesensitizeSerializer;
+import cn.iocoder.yudao.framework.desensitize.core.base.serializer.StringDesensitizeSerializer;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
@@ -11,21 +11,20 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-// TODO @城：每个接口上，author 写下哈。
-// TODO @城：Desensitize = 》DesensitizeBy
-// TODO @城：Desensitize 类注释，方便读者阅读理解
 /**
- * Desensitize 顶级脱敏注解
+ * 顶级脱敏注解，自定义注解需要使用此注解。
+ *
+ * @author gaibu
  */
 @Documented
 @Target(ElementType.ANNOTATION_TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside // TODO @城：这个的作用，也可以写下
-@JsonSerialize(using = StringDesensitizeSerializer.class) // TODO @城：这个的作用，也可以写下
-public @interface Desensitize {
+@JacksonAnnotationsInside // 此注解是其他所有 jackson 注解的元注解，打上了此注解的注解表明是 jackson 注解的一部分
+@JsonSerialize(using = StringDesensitizeSerializer.class) // 指定序列化器
+public @interface DesensitizeBy {
 
     /**
      * 脱敏处理器
      */
-    Class<? extends DesensitizationHandler> desensitizationBy(); // TODO @城：desensitizationBy -> handler
+    Class<? extends DesensitizationHandler> handler();
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
similarity index 62%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
index a4dd246659..e59d96cec6 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
@@ -10,10 +10,10 @@ public interface DesensitizationHandler<T extends Annotation> {
     /**
      * 脱敏
      *
-     * @param origin 原始字符串
-     * @param anno   注解信息 // TODO 不要这样的缩写哈，anno -> annotation
+     * @param origin     原始字符串
+     * @param annotation 注解信息
      * @return 脱敏后的字符串
      */
-    String desensitize(String origin, T anno);
+    String desensitize(String origin, T annotation);
 
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
similarity index 71%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
index accfa77dd2..85dee2f53f 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
@@ -1,12 +1,12 @@
-package cn.iocoder.yudao.framework.desensitize.serializer;
+package cn.iocoder.yudao.framework.desensitize.core.base.serializer;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.core.base.DesensitizationHandlerHolder;
+import cn.iocoder.yudao.framework.desensitize.core.base.DesensitizationHandlerFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -14,40 +14,36 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
-// TODO @城：挪到 base/serializer 包下
 /**
  * 脱敏序列化器
+ *
+ * @author gaibu
  */
 public class StringDesensitizeSerializer extends StdSerializer<String> implements ContextualSerializer {
 
+    @Getter
+    @Setter
     private DesensitizationHandler desensitizationHandler;
 
     protected StringDesensitizeSerializer() {
         super(String.class);
     }
 
-    // TODO @城：get 和 set 方法是必须的么？如果是的话，可以换成 lombok 注解哈，简洁一点~
-    public DesensitizationHandler getDesensitizationHandler() {
-        return desensitizationHandler;
-    }
-
-    public void setDesensitizationHandler(DesensitizationHandler desensitizationHandler) {
-        this.desensitizationHandler = desensitizationHandler;
-    }
-
     @Override
     public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) throws JsonMappingException {
-        Desensitize annotation = beanProperty.getAnnotation(Desensitize.class);
+        DesensitizeBy annotation = beanProperty.getAnnotation(DesensitizeBy.class);
         if (annotation == null) {
             return this;
         }
         StringDesensitizeSerializer serializer = new StringDesensitizeSerializer();
-        serializer.setDesensitizationHandler(DesensitizationHandlerHolder.getDesensitizationHandler(annotation.desensitizationBy()));
+        serializer.setDesensitizationHandler(DesensitizationHandlerFactory.getDesensitizationHandler(annotation.handler()));
         return serializer;
     }
 
@@ -57,21 +53,17 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
             gen.writeNull();
             return;
         }
-
-        // TODO @城：抽个 private getField 方法。让这个方法的逻辑主干，更清晰
-        String currentName = gen.getOutputContext().getCurrentName();
-        Object currentValue = gen.getCurrentValue();
-        Class<?> currentValueClass = currentValue.getClass();
-        Field field = ReflectUtil.getField(currentValueClass, currentName);
+        // 获取序列化字段
+        Field field = getField(gen);
 
         // 自定义处理器
-        Desensitize[] annotations = AnnotationUtil.getCombinationAnnotations(field, Desensitize.class);
+        DesensitizeBy[] annotations = AnnotationUtil.getCombinationAnnotations(field, DesensitizeBy.class);
         if (ArrayUtil.isEmpty(annotations)) {
             gen.writeString(value);
             return;
         }
         for (Annotation annotation : field.getAnnotations()) {
-            if (AnnotationUtil.hasAnnotation(annotation.annotationType(), Desensitize.class)) {
+            if (AnnotationUtil.hasAnnotation(annotation.annotationType(), DesensitizeBy.class)) {
                 value = this.desensitizationHandler.desensitize(value, annotation);
                 gen.writeString(value);
                 return;
@@ -80,4 +72,17 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         gen.writeString(value);
     }
 
+    /**
+     * 获取字段
+     *
+     * @param gen JsonGenerator
+     * @return 字段
+     */
+    private Field getField(JsonGenerator gen) {
+        String currentName = gen.getOutputContext().getCurrentName();
+        Object currentValue = gen.getCurrentValue();
+        Class<?> currentValueClass = currentValue.getClass();
+        return ReflectUtil.getField(currentValueClass, currentName);
+    }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
similarity index 85%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
index ebd754b1ed..303320b70a 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.regex.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.regex.handler.EmailDesensitizationHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,17 +12,20 @@ import java.lang.annotation.Target;
 
 /**
  * 邮箱
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = EmailDesensitizationHandler.class)
+@DesensitizeBy(handler = EmailDesensitizationHandler.class)
 public @interface EmailDesensitize {
+
     /**
      * 匹配的正则表达式
      */
-    String regex() default  "(^.)[^@]*(@.*$)";
+    String regex() default "(^.)[^@]*(@.*$)";
 
     /**
      * 替换规则，邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
index 7ee6fadd51..6c457fd0c6 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.regex.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.regex.handler.DefaultRegexDesensitizationHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,13 +12,16 @@ import java.lang.annotation.Target;
 
 /**
  * 正则脱敏注解
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = DefaultRegexDesensitizationHandler.class)
+@DesensitizeBy(handler = DefaultRegexDesensitizationHandler.class)
 public @interface RegexDesensitize {
+
     /**
      * 匹配的正则表达式（默认匹配所有）
      */
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
new file mode 100644
index 0000000000..158c6de3de
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * 正则表达式脱敏处理器抽象类，已实现通用的方法
+ *
+ * @author gaibu
+ */
+public abstract class AbstractRegexDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
+
+    @Override
+    public String desensitize(String origin, T annotation) {
+        String regex = getRegex(annotation);
+        String replacer = getReplacer(annotation);
+
+        return origin.replaceAll(regex, replacer);
+    }
+
+    /**
+     * 获取注解上的 regex 参数
+     *
+     * @param annotation 注解信息
+     * @return 正则表达式
+     */
+    abstract String getRegex(T annotation);
+
+    /**
+     * 获取注解上的 replacer 参数
+     *
+     * @param annotation 注解信息
+     * @return 待替换的字符串
+     */
+    abstract String getReplacer(T annotation);
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
similarity index 54%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
index a21734909c..b3a788aa96 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
@@ -3,12 +3,20 @@ package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
 
 /**
- * 正则脱敏处理器
+ * 默认正则脱敏处理器
+ *
+ * @author gaibu
  */
 public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<RegexDesensitize> {
 
+
     @Override
-    Object[] getArgs(RegexDesensitize anno) {
-        return new Object[]{anno.regex(), anno.replacer()};
+    String getRegex(RegexDesensitize annotation) {
+        return annotation.regex();
+    }
+
+    @Override
+    String getReplacer(RegexDesensitize annotation) {
+        return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
similarity index 52%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
index 9336351dab..5313381c30 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
@@ -2,10 +2,20 @@ package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
 
+/**
+ * 邮箱脱敏处理器
+ *
+ * @author gaibu
+ */
 public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHandler<EmailDesensitize> {
 
     @Override
-    Object[] getArgs(EmailDesensitize anno) {
-        return new Object[]{anno.regex(), anno.replacer()};
+    String getRegex(EmailDesensitize annotation) {
+        return annotation.regex();
+    }
+
+    @Override
+    String getReplacer(EmailDesensitize annotation) {
+        return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
index 4c41569e88..762ce3118b 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.BankCardDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 银行卡号
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = BankCardDesensitization.class)
+@DesensitizeBy(handler = BankCardDesensitization.class)
 public @interface BankCard {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
index fb89ddb084..d3d09ad42d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.CarLicenseDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 车牌号
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = CarLicenseDesensitization.class)
+@DesensitizeBy(handler = CarLicenseDesensitization.class)
 public @interface CarLicense {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
index 3b4a1a5302..92e46e594b 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.ChineseNameDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 中文名
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = ChineseNameDesensitization.class)
+@DesensitizeBy(handler = ChineseNameDesensitization.class)
 public @interface ChineseName {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
index 663388d892..8675521647 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.FixedPhoneDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 固定电话
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = FixedPhoneDesensitization.class)
+@DesensitizeBy(handler = FixedPhoneDesensitization.class)
 public @interface FixedPhone {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
similarity index 91%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
index ac2ba9cd39..7b976bac6c 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.IdCardDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 身份证
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = IdCardDesensitization.class)
+@DesensitizeBy(handler = IdCardDesensitization.class)
 public @interface IdCard {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
index c4bb6e1eb2..bbe067ab79 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.PasswordDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 密码
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = PasswordDesensitization.class)
+@DesensitizeBy(handler = PasswordDesensitization.class)
 public @interface Password {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
similarity index 90%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
index c78354d153..87d7893fe9 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.PhoneNumberDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 手机号
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = PhoneNumberDesensitization.class)
+@DesensitizeBy(handler = PhoneNumberDesensitization.class)
 public @interface PhoneNumber {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
similarity index 91%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
index c752df310d..4d3cac7a38 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.Desensitize;
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.slider.handler.DefaultDesensitizationHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
@@ -12,12 +12,14 @@ import java.lang.annotation.Target;
 
 /**
  * 滑动脱敏注解
+ *
+ * @author gaibu
  */
 @Documented
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@Desensitize(desensitizationBy = DefaultDesensitizationHandler.class)
+@DesensitizeBy(handler = DefaultDesensitizationHandler.class)
 public @interface Slider {
 
     /**
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
similarity index 53%
rename from yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
index 0b25cdbe5d..bd5ca926da 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
@@ -4,14 +4,18 @@ import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationH
 
 import java.lang.annotation.Annotation;
 
+/**
+ * 滑动脱敏处理器抽象类，已实现通用的方法
+ *
+ * @author gaibu
+ */
 public abstract class AbstractDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
 
     @Override
-    public String desensitize(String origin, T anno) {
-        Object[] args = getArgs(anno);
-        int prefixKeep = (Integer) args[0];
-        int suffixKeep = (Integer) args[1];
-        String replacer = (String) args[2];
+    public String desensitize(String origin, T annotation) {
+        int prefixKeep = getPrefixKeep(annotation);
+        int suffixKeep = getSuffixKeep(annotation);
+        String replacer = getReplacer(annotation);
         int length = origin.length();
 
         // 情况一：原始字符串长度小于等于保留长度，则原始字符串全部替换
@@ -19,26 +23,41 @@ public abstract class AbstractDesensitizationHandler<T extends Annotation> imple
             return buildReplacerByLength(replacer, length);
         }
 
-        // 情况二：如果原始字符串小于等于前后缀保留字符串长度，则原始字符串全部替换
+        // 情况二：原始字符串长度小于等于前后缀保留字符串长度，则原始字符串全部替换
         if ((prefixKeep + suffixKeep) >= length) {
             return buildReplacerByLength(replacer, length);
         }
 
-        // 情况三：TODO 城
+        // 情况三：原始字符串长度大于前后缀保留字符串长度，则替换中间字符串
         int interval = length - prefixKeep - suffixKeep;
         return origin.substring(0, prefixKeep) +
                 buildReplacerByLength(replacer, interval) +
                 origin.substring(prefixKeep + interval);
     }
 
-    // TODO @城：类似，子类直接获取到参数哈
     /**
-     * 获取注解的参数
+     * 前缀保留长度
      *
-     * @param anno 注解信息
-     * @return 注解的参数
+     * @param annotation 注解信息
+     * @return 前缀保留长度
      */
-    abstract Object[] getArgs(T anno);
+    abstract Integer getPrefixKeep(T annotation);
+
+    /**
+     * 后缀保留长度
+     *
+     * @param annotation 注解信息
+     * @return 后缀保留长度
+     */
+    abstract Integer getSuffixKeep(T annotation);
+
+    /**
+     * 替换符
+     *
+     * @param annotation 注解信息
+     * @return 替换符
+     */
+    abstract String getReplacer(T annotation);
 
     /**
      * 根据长度循环构建替换符
@@ -48,7 +67,11 @@ public abstract class AbstractDesensitizationHandler<T extends Annotation> imple
      * @return 构建后的替换符
      */
     private String buildReplacerByLength(String replacer, int length) {
-        return String.valueOf(replacer).repeat(Math.max(0, length));
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            builder.append(replacer);
+        }
+        return builder.toString();
     }
 
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
new file mode 100644
index 0000000000..76e63a6b11
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
+
+/**
+ * 银行卡脱敏处理器
+ *
+ * @author gaibu
+ */
+public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCard> {
+
+    @Override
+    Integer getPrefixKeep(BankCard annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(BankCard annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(BankCard annotation) {
+        return annotation.replacer();
+    }
+
+}
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
new file mode 100644
index 0000000000..742851a31d
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
+
+/**
+ * 车牌号脱敏处理器
+ *
+ * @author gaibu
+ */
+public class CarLicenseDesensitization extends AbstractDesensitizationHandler<CarLicense> {
+    @Override
+    Integer getPrefixKeep(CarLicense annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(CarLicense annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(CarLicense annotation) {
+        return annotation.replacer();
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
new file mode 100644
index 0000000000..f7314867d1
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
+
+/**
+ * 中文姓名脱敏处理器
+ *
+ * @author gaibu
+ */
+public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseName> {
+    @Override
+    Integer getPrefixKeep(ChineseName annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(ChineseName annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(ChineseName annotation) {
+        return annotation.replacer();
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
new file mode 100644
index 0000000000..0c498b071b
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+
+/**
+ * 滑动脱敏处理器
+ *
+ * @author gaibu
+ */
+public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<Slider> {
+    @Override
+    Integer getPrefixKeep(Slider annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(Slider annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(Slider annotation) {
+        return annotation.replacer();
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
new file mode 100644
index 0000000000..50672ce352
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
+
+/**
+ * 固定电话脱敏处理器
+ *
+ * @author gaibu
+ */
+public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhone> {
+    @Override
+    Integer getPrefixKeep(FixedPhone annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(FixedPhone annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(FixedPhone annotation) {
+        return annotation.replacer();
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
new file mode 100644
index 0000000000..657a191298
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
+
+/**
+ * 身份证脱敏处理器
+ *
+ * @author gaibu
+ */
+public class IdCardDesensitization extends AbstractDesensitizationHandler<IdCard> {
+    @Override
+    Integer getPrefixKeep(IdCard annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(IdCard annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(IdCard annotation) {
+        return annotation.replacer();
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
new file mode 100644
index 0000000000..d3561ce5da
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
+
+/**
+ * 密码脱敏处理器
+ *
+ * @author gaibu
+ */
+public class PasswordDesensitization extends AbstractDesensitizationHandler<Password> {
+    @Override
+    Integer getPrefixKeep(Password annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(Password annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(Password annotation) {
+        return annotation.replacer();
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
new file mode 100644
index 0000000000..e6c11bd445
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PhoneNumber;
+
+/**
+ * 手机号脱敏处理器
+ *
+ * @author gaibu
+ */
+public class PhoneNumberDesensitization extends AbstractDesensitizationHandler<PhoneNumber> {
+
+    @Override
+    Integer getPrefixKeep(PhoneNumber annotation) {
+        return annotation.prefixKeep();
+    }
+
+    @Override
+    Integer getSuffixKeep(PhoneNumber annotation) {
+        return annotation.suffixKeep();
+    }
+
+    @Override
+    String getReplacer(PhoneNumber annotation) {
+        return annotation.replacer();
+    }
+}

From 42bc0d1519783e877c3524c5296c31fab61b63a0 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Tue, 17 Jan 2023 11:28:33 +0800
Subject: [PATCH 36/65] =?UTF-8?q?feat:=20=E8=84=B1=E6=95=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{EmailDesensitize.java => Email.java}     |  2 +-
 .../{RegexDesensitize.java => Regex.java}     |  2 +-
 .../DefaultRegexDesensitizationHandler.java   |  8 +-
 .../handler/EmailDesensitizationHandler.java  |  8 +-
 .../core/slider/DesensitizeTest.java          | 88 +++++++++++++++++++
 .../core/slider/annotation/Address.java       | 27 ++++++
 .../core/slider/handler/AddressHandler.java   | 11 +++
 7 files changed, 136 insertions(+), 10 deletions(-)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/{EmailDesensitize.java => Email.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/{RegexDesensitize.java => Regex.java} (96%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java

diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
index 303320b70a..02d7043fe5 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = EmailDesensitizationHandler.class)
-public @interface EmailDesensitize {
+public @interface Email {
 
     /**
      * 匹配的正则表达式
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
index 6c457fd0c6..e5d2558fa2 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = DefaultRegexDesensitizationHandler.class)
-public @interface RegexDesensitize {
+public @interface Regex {
 
     /**
      * 匹配的正则表达式（默认匹配所有）
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
index b3a788aa96..9fa5d80d77 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
@@ -1,22 +1,22 @@
 package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
 
 /**
  * 默认正则脱敏处理器
  *
  * @author gaibu
  */
-public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<RegexDesensitize> {
+public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<Regex> {
 
 
     @Override
-    String getRegex(RegexDesensitize annotation) {
+    String getRegex(Regex annotation) {
         return annotation.regex();
     }
 
     @Override
-    String getReplacer(RegexDesensitize annotation) {
+    String getReplacer(Regex annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
index 5313381c30..b6692d448b 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
@@ -1,21 +1,21 @@
 package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Email;
 
 /**
  * 邮箱脱敏处理器
  *
  * @author gaibu
  */
-public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHandler<EmailDesensitize> {
+public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHandler<Email> {
 
     @Override
-    String getRegex(EmailDesensitize annotation) {
+    String getRegex(Email annotation) {
         return annotation.regex();
     }
 
     @Override
-    String getReplacer(EmailDesensitize annotation) {
+    String getReplacer(Email annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java
new file mode 100644
index 0000000000..03db9cb720
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java
@@ -0,0 +1,88 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider;
+
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Email;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Address;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PhoneNumber;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DesensitizeTest extends BaseMockitoUnitTest {
+
+    @Test
+    public void test() {
+        DesensitizeDemo desensitizeDemo = new DesensitizeDemo();
+        desensitizeDemo.setUserName("芋道源码");
+        desensitizeDemo.setBankCard("9988002866797031");
+        desensitizeDemo.setCarLicense("粤A66666");
+        desensitizeDemo.setFixedPhone("01086551122");
+        desensitizeDemo.setIdCard("530321199204074611");
+        desensitizeDemo.setPassword("123456");
+        desensitizeDemo.setPhoneNumber("13248765917");
+        desensitizeDemo.setSlider1("ABCDEFG");
+        desensitizeDemo.setSlider2("ABCDEFG");
+        desensitizeDemo.setSlider3("ABCDEFG");
+        desensitizeDemo.setEmail("1@eamil.com");
+        desensitizeDemo.setRegex("你好，我是芋道源码");
+        desensitizeDemo.setAddress("北京市海淀区上地十街10号");
+        desensitizeDemo.setOrigin("芋道源码");
+
+        DesensitizeDemo d = JsonUtils.parseObject(JsonUtils.toJsonString(desensitizeDemo), DesensitizeDemo.class);
+        assertEquals("芋***", d.getUserName());
+        assertEquals("998800********31", d.getBankCard());
+        assertEquals("粤A6***6", d.getCarLicense());
+        assertEquals("0108*****22", d.getFixedPhone());
+        assertEquals("530321**********11", d.getIdCard());
+        assertEquals("******", d.getPassword());
+        assertEquals("132****5917", d.getPhoneNumber());
+        assertEquals("#######", d.getSlider1());
+        assertEquals("ABC*EFG", d.getSlider2());
+        assertEquals("*******", d.getSlider3());
+        assertEquals("1****@eamil.com", d.getEmail());
+        assertEquals("你好，我是*", d.getRegex());
+        assertEquals("北京市海淀区上地十街10号*", d.getAddress());
+        assertEquals("芋道源码", d.getOrigin());
+    }
+
+    @Data
+    public static class DesensitizeDemo {
+        @ChineseName
+        private String userName;
+        @BankCard
+        private String bankCard;
+        @CarLicense
+        private String carLicense;
+        @FixedPhone
+        private String fixedPhone;
+        @IdCard
+        private String idCard;
+        @Password
+        private String password;
+        @PhoneNumber
+        private String phoneNumber;
+        @Slider(prefixKeep = 6,suffixKeep = 1,replacer = "#")
+        private String slider1;
+        @Slider(prefixKeep = 3,suffixKeep = 3)
+        private String slider2;
+        @Slider(prefixKeep = 10)
+        private String slider3;
+        @Email
+        private String email;
+        @Regex(regex = "芋道源码",replacer = "*")
+        private String regex;
+        @Address
+        private String address;
+        private String origin;
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java
new file mode 100644
index 0000000000..0cd338e1f5
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.AddressHandler;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 地址
+ *
+ * @author gaibu
+ */
+@Documented
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@JacksonAnnotationsInside
+@DesensitizeBy(handler = AddressHandler.class)
+public @interface Address {
+
+    String replacer() default "*";
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java
new file mode 100644
index 0000000000..ef1a2bbf9a
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+
+import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Address;
+
+public class AddressHandler implements DesensitizationHandler<Address> {
+    @Override
+    public String desensitize(String origin, Address annotation) {
+        return origin + annotation.replacer();
+    }
+}

From fcbcb28304a335970c281f34c3f2f958f907cc9b Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Tue, 17 Jan 2023 11:35:22 +0800
Subject: [PATCH 37/65] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/infra/service/db/DatabaseTableServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
index 55f56a5dc7..d0c80ba61e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
@@ -52,7 +52,7 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
         StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder();
         if (StrUtil.isNotEmpty(name)) {
             strategyConfig.addInclude(name);
-        }else{
+        } else {
             // 移除工作流和定时任务前缀的表名 // TODO 未来做成可配置
             strategyConfig.addExclude("ACT_[\\S\\s]+|QRTZ_[\\S\\s]+|FLW_[\\S\\s]+");
         }

From 6593ec4214ba27b87e890b759cc1b0a4db2e4236 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 19 Jan 2023 10:25:43 +0800
Subject: [PATCH 38/65] =?UTF-8?q?code=20review=20=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                   |  2 +-
 .../base/DesensitizationHandlerFactory.java   |  4 +++
 .../core/base/annotation/DesensitizeBy.java   |  4 ++-
 .../base/handler/DesensitizationHandler.java  |  2 ++
 .../StringDesensitizeSerializer.java          | 15 +++++---
 .../desensitize/core/package-info.java        |  4 +++
 .../core/regex/annotation/Email.java          |  7 ++--
 .../core/regex/annotation/Regex.java          |  1 +
 .../AbstractRegexDesensitizationHandler.java  |  5 +--
 .../DefaultRegexDesensitizationHandler.java   |  3 +-
 .../handler/EmailDesensitizationHandler.java  |  3 +-
 .../{PhoneNumber.java => Mobile.java}         |  6 ++--
 .../core/slider/annotation/Password.java      |  4 ++-
 .../AbstractDesensitizationHandler.java       | 33 ++++++++---------
 .../handler/BankCardDesensitization.java      |  4 +--
 .../handler/CarLicenseDesensitization.java    |  2 +-
 .../handler/ChineseNameDesensitization.java   |  4 ++-
 .../DefaultDesensitizationHandler.java        |  2 +-
 .../handler/FixedPhoneDesensitization.java    |  2 +-
 .../slider/handler/IdCardDesensitization.java |  2 +-
 ...zation.java => MobileDesensitization.java} | 12 +++----
 .../handler/PasswordDesensitization.java      |  2 +-
 .../core/{slider => }/DesensitizeTest.java    | 36 ++++++++++++-------
 .../core/{slider => }/annotation/Address.java |  7 ++--
 .../{slider => }/handler/AddressHandler.java  | 12 +++++--
 .../iocoder/yudao/framework/package-info.java |  3 ++
 26 files changed, 116 insertions(+), 65 deletions(-)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{PhoneNumber.java => Mobile.java} (88%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/{PhoneNumberDesensitization.java => MobileDesensitization.java} (54%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/{slider => }/DesensitizeTest.java (81%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/{slider => }/annotation/Address.java (70%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/{slider => }/handler/AddressHandler.java (50%)

diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml b/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
index 53879bd0f2..c4a96ebe1e 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>yudao-spring-boot-starter-desensitize</artifactId>
-    <description>脱敏组件</description>
+    <description>脱敏组件：支持 JSON 返回数据时，将邮箱、手机等字段进行脱敏</description>
 
     <dependencies>
         <dependency>
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
index abd756ef23..4c75cd9576 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.framework.desensitize.core.base;
 
+import cn.hutool.Hutool;
+import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
 
@@ -18,11 +20,13 @@ public class DesensitizationHandlerFactory {
      */
     private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<Class<? extends DesensitizationHandler>, DesensitizationHandler>();
 
+    // TODO @唐：可以考虑，使用 hutool 提供的 Singleton.get()
     public static DesensitizationHandler getDesensitizationHandler(Class<? extends DesensitizationHandler> clazz) {
         DesensitizationHandler handler = HANDLER_MAP.get(clazz);
         if (handler != null) {
             return handler;
         }
+        // 不存在，则进行创建
         synchronized (DesensitizationHandlerFactory.class) {
             handler = HANDLER_MAP.get(clazz);
             // 双重校验锁
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java
index d06e633a6a..0166cb6ef2 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java
@@ -12,7 +12,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 顶级脱敏注解，自定义注解需要使用此注解。
+ * 顶级脱敏注解，自定义注解需要使用此注解
  *
  * @author gaibu
  */
@@ -26,5 +26,7 @@ public @interface DesensitizeBy {
     /**
      * 脱敏处理器
      */
+    @SuppressWarnings("rawtypes")
     Class<? extends DesensitizationHandler> handler();
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
index e59d96cec6..470a0becf5 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java
@@ -4,6 +4,8 @@ import java.lang.annotation.Annotation;
 
 /**
  * 脱敏处理器接口
+ *
+ * @author gaibu
  */
 public interface DesensitizationHandler<T extends Annotation> {
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
index 85dee2f53f..3f85f88bd4 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
@@ -24,8 +24,11 @@ import java.lang.reflect.Field;
 /**
  * 脱敏序列化器
  *
+ * 实现 JSON 返回数据时，使用 {@link DesensitizationHandler} 对声明脱敏注解的字段，进行脱敏处理。
+ *
  * @author gaibu
  */
+@SuppressWarnings("rawtypes")
 public class StringDesensitizeSerializer extends StdSerializer<String> implements ContextualSerializer {
 
     @Getter
@@ -37,17 +40,19 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
     }
 
     @Override
-    public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) throws JsonMappingException {
+    public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) {
         DesensitizeBy annotation = beanProperty.getAnnotation(DesensitizeBy.class);
         if (annotation == null) {
             return this;
         }
+        // 创建一个 StringDesensitizeSerializer 对象，使用 DesensitizeBy 对应的处理器
         StringDesensitizeSerializer serializer = new StringDesensitizeSerializer();
         serializer.setDesensitizationHandler(DesensitizationHandlerFactory.getDesensitizationHandler(annotation.handler()));
         return serializer;
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializerProvider) throws IOException {
         if (StrUtil.isBlank(value)) {
             gen.writeNull();
@@ -75,12 +80,12 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
     /**
      * 获取字段
      *
-     * @param gen JsonGenerator
+     * @param generator JsonGenerator
      * @return 字段
      */
-    private Field getField(JsonGenerator gen) {
-        String currentName = gen.getOutputContext().getCurrentName();
-        Object currentValue = gen.getCurrentValue();
+    private Field getField(JsonGenerator generator) {
+        String currentName = generator.getOutputContext().getCurrentName();
+        Object currentValue = generator.getCurrentValue();
         Class<?> currentValueClass = currentValue.getClass();
         return ReflectUtil.getField(currentValueClass, currentName);
     }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java
new file mode 100644
index 0000000000..d56282535e
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 脱敏组件：支持 JSON 返回数据时，将邮箱、手机等字段进行脱敏
+ */
+package cn.iocoder.yudao.framework.desensitize.core;
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
index 02d7043fe5..686367c2f7 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
@@ -10,8 +10,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+// TODO @唐：名字还是 Email=》EmailDesensitize 合适一点，避免和 Validator 的注解有点冲突
 /**
- * 邮箱
+ * 邮箱脱敏注解
  *
  * @author gaibu
  */
@@ -28,7 +29,9 @@ public @interface Email {
     String regex() default "(^.)[^@]*(@.*$)";
 
     /**
-     * 替换规则，邮箱;比如：example@gmail.com脱敏之后为e****@gmail.com
+     * 替换规则，邮箱;
+     *
+     * 比如：example@gmail.com 脱敏之后 为e****@gmail.com
      */
     String replacer() default "$1****$2";
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
index e5d2558fa2..d0fddea6a4 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
@@ -29,6 +29,7 @@ public @interface Regex {
 
     /**
      * 替换规则，会将匹配到的字符串全部替换成 replacer
+     *
      * 例如：regex=123; replacer=******
      * 原始字符串 123456789
      * 脱敏后字符串 ******456789
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
index 158c6de3de..f43431b1d0 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java
@@ -9,13 +9,13 @@ import java.lang.annotation.Annotation;
  *
  * @author gaibu
  */
-public abstract class AbstractRegexDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
+public abstract class AbstractRegexDesensitizationHandler<T extends Annotation>
+        implements DesensitizationHandler<T> {
 
     @Override
     public String desensitize(String origin, T annotation) {
         String regex = getRegex(annotation);
         String replacer = getReplacer(annotation);
-
         return origin.replaceAll(regex, replacer);
     }
 
@@ -34,4 +34,5 @@ public abstract class AbstractRegexDesensitizationHandler<T extends Annotation>
      * @return 待替换的字符串
      */
     abstract String getReplacer(T annotation);
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
index 9fa5d80d77..718380570c 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
@@ -3,13 +3,12 @@ package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
 
 /**
- * 默认正则脱敏处理器
+ * {@link Regex} 的正则脱敏处理器
  *
  * @author gaibu
  */
 public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<Regex> {
 
-
     @Override
     String getRegex(Regex annotation) {
         return annotation.regex();
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
index b6692d448b..ff77755e9a 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Email;
 
 /**
- * 邮箱脱敏处理器
+ * {@link Email} 的脱敏处理器
  *
  * @author gaibu
  */
@@ -18,4 +18,5 @@ public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHan
     String getReplacer(Email annotation) {
         return annotation.replacer();
     }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Mobile.java
similarity index 88%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Mobile.java
index 87d7893fe9..ca2f4f041d 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PhoneNumber.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Mobile.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
 
 import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
-import cn.iocoder.yudao.framework.desensitize.core.slider.handler.PhoneNumberDesensitization;
+import cn.iocoder.yudao.framework.desensitize.core.slider.handler.MobileDesensitization;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
 import java.lang.annotation.Documented;
@@ -19,8 +19,8 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
-@DesensitizeBy(handler = PhoneNumberDesensitization.class)
-public @interface PhoneNumber {
+@DesensitizeBy(handler = MobileDesensitization.class)
+public @interface Mobile {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
index bbe067ab79..f96e13b21e 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
@@ -33,7 +33,9 @@ public @interface Password {
     int suffixKeep() default 0;
 
     /**
-     * 替换规则，密码;比如：123456脱敏之后为******
+     * 替换规则，密码;
+     *
+     * 比如：123456脱敏之后为******
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
index bd5ca926da..e41c57319a 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
@@ -9,7 +9,8 @@ import java.lang.annotation.Annotation;
  *
  * @author gaibu
  */
-public abstract class AbstractDesensitizationHandler<T extends Annotation> implements DesensitizationHandler<T> {
+public abstract class AbstractDesensitizationHandler<T extends Annotation>
+        implements DesensitizationHandler<T> {
 
     @Override
     public String desensitize(String origin, T annotation) {
@@ -35,6 +36,21 @@ public abstract class AbstractDesensitizationHandler<T extends Annotation> imple
                 origin.substring(prefixKeep + interval);
     }
 
+    /**
+     * 根据长度循环构建替换符
+     *
+     * @param replacer 替换符
+     * @param length   长度
+     * @return 构建后的替换符
+     */
+    private String buildReplacerByLength(String replacer, int length) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            builder.append(replacer);
+        }
+        return builder.toString();
+    }
+
     /**
      * 前缀保留长度
      *
@@ -59,19 +75,4 @@ public abstract class AbstractDesensitizationHandler<T extends Annotation> imple
      */
     abstract String getReplacer(T annotation);
 
-    /**
-     * 根据长度循环构建替换符
-     *
-     * @param replacer 替换符
-     * @param length   长度
-     * @return 构建后的替换符
-     */
-    private String buildReplacerByLength(String replacer, int length) {
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < length; i++) {
-            builder.append(replacer);
-        }
-        return builder.toString();
-    }
-
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
index 76e63a6b11..ca2e00c899 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
 
 /**
- * 银行卡脱敏处理器
+ * {@link BankCard} 的脱敏处理器
  *
  * @author gaibu
  */
@@ -24,4 +24,4 @@ public class BankCardDesensitization extends AbstractDesensitizationHandler<Bank
         return annotation.replacer();
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
index 742851a31d..eafe634b71 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
 
 /**
- * 车牌号脱敏处理器
+ * {@link CarLicense} 的脱敏处理器
  *
  * @author gaibu
  */
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
index f7314867d1..050843033d 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
@@ -3,11 +3,12 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
 
 /**
- * 中文姓名脱敏处理器
+ * {@link ChineseName} 的脱敏处理器
  *
  * @author gaibu
  */
 public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseName> {
+
     @Override
     Integer getPrefixKeep(ChineseName annotation) {
         return annotation.prefixKeep();
@@ -22,4 +23,5 @@ public class ChineseNameDesensitization extends AbstractDesensitizationHandler<C
     String getReplacer(ChineseName annotation) {
         return annotation.replacer();
     }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
index 0c498b071b..187a22f116 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
 
 /**
- * 滑动脱敏处理器
+ * {@link Slider} 的脱敏处理器
  *
  * @author gaibu
  */
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
index 50672ce352..69b07cadfc 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
 
 /**
- * 固定电话脱敏处理器
+ * {@link FixedPhone} 的脱敏处理器
  *
  * @author gaibu
  */
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
index 657a191298..dccf3e8341 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
 
 /**
- * 身份证脱敏处理器
+ * {@link IdCard} 的脱敏处理器
  *
  * @author gaibu
  */
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
similarity index 54%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
index e6c11bd445..e5ddb49c21 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PhoneNumberDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
@@ -1,26 +1,26 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PhoneNumber;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Mobile;
 
 /**
- * 手机号脱敏处理器
+ * {@link Mobile} 的脱敏处理器
  *
  * @author gaibu
  */
-public class PhoneNumberDesensitization extends AbstractDesensitizationHandler<PhoneNumber> {
+public class MobileDesensitization extends AbstractDesensitizationHandler<Mobile> {
 
     @Override
-    Integer getPrefixKeep(PhoneNumber annotation) {
+    Integer getPrefixKeep(Mobile annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(PhoneNumber annotation) {
+    Integer getSuffixKeep(Mobile annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(PhoneNumber annotation) {
+    String getReplacer(Mobile annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
index d3561ce5da..26a7de496f 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
 
 /**
- * 密码脱敏处理器
+ * {@link Password} 的码脱敏处理器
  *
  * @author gaibu
  */
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
similarity index 81%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
index 03db9cb720..18f4faee20 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/DesensitizeTest.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
@@ -1,29 +1,33 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider;
+package cn.iocoder.yudao.framework.desensitize.core;
 
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Email;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Address;
+import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PhoneNumber;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Mobile;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import lombok.Data;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
+/**
+ * {@link DesensitizeTest} 的单元测试
+ */
 public class DesensitizeTest extends BaseMockitoUnitTest {
 
     @Test
     public void test() {
+        // 准备参数
         DesensitizeDemo desensitizeDemo = new DesensitizeDemo();
-        desensitizeDemo.setUserName("芋道源码");
+        desensitizeDemo.setNickname("芋道源码");
         desensitizeDemo.setBankCard("9988002866797031");
         desensitizeDemo.setCarLicense("粤A66666");
         desensitizeDemo.setFixedPhone("01086551122");
@@ -33,13 +37,16 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
         desensitizeDemo.setSlider1("ABCDEFG");
         desensitizeDemo.setSlider2("ABCDEFG");
         desensitizeDemo.setSlider3("ABCDEFG");
-        desensitizeDemo.setEmail("1@eamil.com");
+        desensitizeDemo.setEmail("1@email.com");
         desensitizeDemo.setRegex("你好，我是芋道源码");
         desensitizeDemo.setAddress("北京市海淀区上地十街10号");
         desensitizeDemo.setOrigin("芋道源码");
 
+        // 调用
         DesensitizeDemo d = JsonUtils.parseObject(JsonUtils.toJsonString(desensitizeDemo), DesensitizeDemo.class);
-        assertEquals("芋***", d.getUserName());
+        // 断言
+        assertNotNull(d);
+        assertEquals("芋***", d.getNickname());
         assertEquals("998800********31", d.getBankCard());
         assertEquals("粤A6***6", d.getCarLicense());
         assertEquals("0108*****22", d.getFixedPhone());
@@ -49,7 +56,7 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
         assertEquals("#######", d.getSlider1());
         assertEquals("ABC*EFG", d.getSlider2());
         assertEquals("*******", d.getSlider3());
-        assertEquals("1****@eamil.com", d.getEmail());
+        assertEquals("1****@email.com", d.getEmail());
         assertEquals("你好，我是*", d.getRegex());
         assertEquals("北京市海淀区上地十街10号*", d.getAddress());
         assertEquals("芋道源码", d.getOrigin());
@@ -57,8 +64,9 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
 
     @Data
     public static class DesensitizeDemo {
+
         @ChineseName
-        private String userName;
+        private String nickname;
         @BankCard
         private String bankCard;
         @CarLicense
@@ -69,20 +77,22 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
         private String idCard;
         @Password
         private String password;
-        @PhoneNumber
+        @Mobile
         private String phoneNumber;
-        @Slider(prefixKeep = 6,suffixKeep = 1,replacer = "#")
+        @Slider(prefixKeep = 6, suffixKeep = 1, replacer = "#")
         private String slider1;
-        @Slider(prefixKeep = 3,suffixKeep = 3)
+        @Slider(prefixKeep = 3, suffixKeep = 3)
         private String slider2;
         @Slider(prefixKeep = 10)
         private String slider3;
         @Email
         private String email;
-        @Regex(regex = "芋道源码",replacer = "*")
+        @Regex(regex = "芋道源码", replacer = "*")
         private String regex;
         @Address
         private String address;
         private String origin;
+
     }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java
similarity index 70%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java
index 0cd338e1f5..735d25b346 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Address.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java
@@ -1,7 +1,8 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.annotation;
+package cn.iocoder.yudao.framework.desensitize.core.annotation;
 
+import cn.iocoder.yudao.framework.desensitize.core.DesensitizeTest;
 import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
-import cn.iocoder.yudao.framework.desensitize.core.slider.handler.AddressHandler;
+import cn.iocoder.yudao.framework.desensitize.core.handler.AddressHandler;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 
 import java.lang.annotation.Documented;
@@ -13,6 +14,8 @@ import java.lang.annotation.Target;
 /**
  * 地址
  *
+ * 用于 {@link DesensitizeTest} 测试使用
+ *
  * @author gaibu
  */
 @Documented
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java
similarity index 50%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java
index ef1a2bbf9a..7a8455f8d1 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AddressHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java
@@ -1,11 +1,19 @@
-package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
+package cn.iocoder.yudao.framework.desensitize.core.handler;
 
+import cn.iocoder.yudao.framework.desensitize.core.DesensitizeTest;
 import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Address;
+import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
 
+/**
+ * {@link Address} 的脱敏处理器
+ *
+ * 用于 {@link DesensitizeTest} 测试使用
+ */
 public class AddressHandler implements DesensitizationHandler<Address> {
+
     @Override
     public String desensitize(String origin, Address annotation) {
         return origin + annotation.replacer();
     }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java
index 8c69219d02..2dc5316920 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java
@@ -1 +1,4 @@
+/**
+ * Web 框架，全局异常、API 日志等
+ */
 package cn.iocoder.yudao.framework;

From 2aa208f44139270604724f2c505198829be1e2d8 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Thu, 19 Jan 2023 10:35:54 +0800
Subject: [PATCH 39/65] =?UTF-8?q?feat:=20=E8=84=B1=E6=95=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/DesensitizationHandlerFactory.java   | 42 -------------------
 .../StringDesensitizeSerializer.java          |  5 +--
 .../{Email.java => EmailDesensitize.java}     |  3 +-
 .../handler/EmailDesensitizationHandler.java  | 10 ++---
 .../desensitize/core/DesensitizeTest.java     |  4 +-
 5 files changed, 10 insertions(+), 54 deletions(-)
 delete mode 100644 yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/{Email.java => EmailDesensitize.java} (87%)

diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
deleted file mode 100644
index 4c75cd9576..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/DesensitizationHandlerFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.base;
-
-import cn.hutool.Hutool;
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * 脱敏处理器 Holder
- *
- * @author gaibu
- */
-public class DesensitizationHandlerFactory {
-
-    /**
-     * handler 缓存，默认初始化内置的处理器
-     */
-    private static final Map<Class<? extends DesensitizationHandler>, DesensitizationHandler> HANDLER_MAP = new ConcurrentHashMap<Class<? extends DesensitizationHandler>, DesensitizationHandler>();
-
-    // TODO @唐：可以考虑，使用 hutool 提供的 Singleton.get()
-    public static DesensitizationHandler getDesensitizationHandler(Class<? extends DesensitizationHandler> clazz) {
-        DesensitizationHandler handler = HANDLER_MAP.get(clazz);
-        if (handler != null) {
-            return handler;
-        }
-        // 不存在，则进行创建
-        synchronized (DesensitizationHandlerFactory.class) {
-            handler = HANDLER_MAP.get(clazz);
-            // 双重校验锁
-            if (handler != null) {
-                return handler;
-            }
-            handler = ReflectUtil.newInstanceIfPossible(clazz);
-            HANDLER_MAP.put(clazz, handler);
-        }
-        return handler;
-    }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
index 3f85f88bd4..2c15a747d1 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java
@@ -1,15 +1,14 @@
 package cn.iocoder.yudao.framework.desensitize.core.base.serializer;
 
 import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
 import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.core.base.DesensitizationHandlerFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
@@ -47,7 +46,7 @@ public class StringDesensitizeSerializer extends StdSerializer<String> implement
         }
         // 创建一个 StringDesensitizeSerializer 对象，使用 DesensitizeBy 对应的处理器
         StringDesensitizeSerializer serializer = new StringDesensitizeSerializer();
-        serializer.setDesensitizationHandler(DesensitizationHandlerFactory.getDesensitizationHandler(annotation.handler()));
+        serializer.setDesensitizationHandler(Singleton.get(annotation.handler()));
         return serializer;
     }
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
similarity index 87%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
index 686367c2f7..2e7ae34987 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Email.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
@@ -10,7 +10,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-// TODO @唐：名字还是 Email=》EmailDesensitize 合适一点，避免和 Validator 的注解有点冲突
 /**
  * 邮箱脱敏注解
  *
@@ -21,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = EmailDesensitizationHandler.class)
-public @interface Email {
+public @interface EmailDesensitize {
 
     /**
      * 匹配的正则表达式
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
index ff77755e9a..8d1867a64c 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java
@@ -1,21 +1,21 @@
 package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Email;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
 
 /**
- * {@link Email} 的脱敏处理器
+ * {@link EmailDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHandler<Email> {
+public class EmailDesensitizationHandler extends AbstractRegexDesensitizationHandler<EmailDesensitize> {
 
     @Override
-    String getRegex(Email annotation) {
+    String getRegex(EmailDesensitize annotation) {
         return annotation.regex();
     }
 
     @Override
-    String getReplacer(Email annotation) {
+    String getReplacer(EmailDesensitize annotation) {
         return annotation.replacer();
     }
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
index 18f4faee20..4009438333 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.framework.desensitize.core;
 
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Email;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
 import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
 import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
@@ -85,7 +85,7 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
         private String slider2;
         @Slider(prefixKeep = 10)
         private String slider3;
-        @Email
+        @EmailDesensitize
         private String email;
         @Regex(regex = "芋道源码", replacer = "*")
         private String regex;

From 372de7a4d5c98f20bfbeadfe53c1421af233fab8 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 19 Jan 2023 11:15:41 +0800
Subject: [PATCH 40/65] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=8A=A0=E8=BD=BD=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/.env.base                         | 2 ++
 yudao-ui-admin-vue3/.env.dev                          | 2 ++
 yudao-ui-admin-vue3/.env.pro                          | 2 ++
 yudao-ui-admin-vue3/.env.test                         | 2 ++
 yudao-ui-admin-vue3/src/main.ts                       | 7 +++++++
 yudao-ui-admin-vue3/src/types/auto-components.d.ts    | 6 ++++++
 yudao-ui-admin-vue3/src/utils/env.ts                  | 8 ++++++++
 yudao-ui-admin-vue3/src/views/infra/swagger/index.vue | 3 ++-
 yudao-ui-admin-vue3/types/env.d.ts                    | 1 +
 9 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 yudao-ui-admin-vue3/src/utils/env.ts

diff --git a/yudao-ui-admin-vue3/.env.base b/yudao-ui-admin-vue3/.env.base
index 7a2f2a0ff6..fdb26d8501 100644
--- a/yudao-ui-admin-vue3/.env.base
+++ b/yudao-ui-admin-vue3/.env.base
@@ -1,6 +1,8 @@
 # 本地开发环境
 NODE_ENV=development
 
+VITE_DEV=true
+
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
 
diff --git a/yudao-ui-admin-vue3/.env.dev b/yudao-ui-admin-vue3/.env.dev
index a67cdc6864..3b85e4819f 100644
--- a/yudao-ui-admin-vue3/.env.dev
+++ b/yudao-ui-admin-vue3/.env.dev
@@ -1,6 +1,8 @@
 # 开发环境
 NODE_ENV=production
 
+VITE_DEV=false
+
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
 
diff --git a/yudao-ui-admin-vue3/.env.pro b/yudao-ui-admin-vue3/.env.pro
index 4b47737e10..8348e02e3c 100644
--- a/yudao-ui-admin-vue3/.env.pro
+++ b/yudao-ui-admin-vue3/.env.pro
@@ -1,6 +1,8 @@
 # 生产环境
 NODE_ENV=production
 
+VITE_DEV=false
+
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
 
diff --git a/yudao-ui-admin-vue3/.env.test b/yudao-ui-admin-vue3/.env.test
index 6166840fa0..85e2cf5450 100644
--- a/yudao-ui-admin-vue3/.env.test
+++ b/yudao-ui-admin-vue3/.env.test
@@ -1,6 +1,8 @@
 # 测试环境
 NODE_ENV=production
 
+VITE_DEV=false
+
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
 
diff --git a/yudao-ui-admin-vue3/src/main.ts b/yudao-ui-admin-vue3/src/main.ts
index e4511d9b1e..f5e3c024e8 100644
--- a/yudao-ui-admin-vue3/src/main.ts
+++ b/yudao-ui-admin-vue3/src/main.ts
@@ -37,6 +37,13 @@ import App from './App.vue'
 
 import './permission'
 
+import { isDevMode } from '@/utils/env'
+
+if (isDevMode()) {
+  console.info(isDevMode())
+  import('element-plus/dist/index.css')
+}
+
 // 创建实例
 const setupAll = async () => {
   const app = createApp(App)
diff --git a/yudao-ui-admin-vue3/src/types/auto-components.d.ts b/yudao-ui-admin-vue3/src/types/auto-components.d.ts
index 0a56908aad..a35bc2a301 100644
--- a/yudao-ui-admin-vue3/src/types/auto-components.d.ts
+++ b/yudao-ui-admin-vue3/src/types/auto-components.d.ts
@@ -21,6 +21,7 @@ declare module '@vue/runtime-core' {
     DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default']
     Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
     Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
+    ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
@@ -30,6 +31,7 @@ declare module '@vue/runtime-core' {
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -38,6 +40,7 @@ declare module '@vue/runtime-core' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@@ -51,7 +54,10 @@ declare module '@vue/runtime-core' {
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
diff --git a/yudao-ui-admin-vue3/src/utils/env.ts b/yudao-ui-admin-vue3/src/utils/env.ts
new file mode 100644
index 0000000000..4a45f62236
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/utils/env.ts
@@ -0,0 +1,8 @@
+export const isDevMode = () => {
+  const dev = import.meta.env.VITE_DEV
+  if (dev && dev === true) {
+    return true
+  } else {
+    return false
+  }
+}
diff --git a/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue b/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue
index 72a826e619..dce8122eee 100644
--- a/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/swagger/index.vue
@@ -5,5 +5,6 @@
 </template>
 <script setup lang="ts" name="Swagger">
 const BASE_URL = import.meta.env.VITE_BASE_URL
-const src = ref(BASE_URL + '/doc.html')
+// const src = ref(BASE_URL + '/doc.html')
+const src = ref(BASE_URL + '/swagger-ui')
 </script>
diff --git a/yudao-ui-admin-vue3/types/env.d.ts b/yudao-ui-admin-vue3/types/env.d.ts
index 33e1f40b8b..81469b76d9 100644
--- a/yudao-ui-admin-vue3/types/env.d.ts
+++ b/yudao-ui-admin-vue3/types/env.d.ts
@@ -11,6 +11,7 @@ interface ImportMetaEnv {
   readonly VITE_APP_TITLE: string
   readonly VITE_PORT: number
   readonly VITE_OPEN: string
+  readonly VITE_DEV: boolean
   readonly VITE_ROUTE_ALWAYSSHOW_ENABLE: string
   readonly VITE_APP_CAPTCHA_ENABLE: string
   readonly VITE_APP_TENANT_ENABLE: string

From fbb154f93dadbb029c6e92146214a37b12ee51f6 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 19 Jan 2023 13:36:21 +0800
Subject: [PATCH 41/65] =?UTF-8?q?perf:=20=E7=94=A8=E6=88=B7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=A0=91=E8=B6=85=E5=87=BA=E9=AB=98=E5=BA=A6=E5=90=8E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/types/auto-components.d.ts            |  1 +
 .../src/views/system/user/index.vue           | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/types/auto-components.d.ts b/yudao-ui-admin-vue3/src/types/auto-components.d.ts
index a35bc2a301..46a1ae56c5 100644
--- a/yudao-ui-admin-vue3/src/types/auto-components.d.ts
+++ b/yudao-ui-admin-vue3/src/types/auto-components.d.ts
@@ -51,6 +51,7 @@ declare module '@vue/runtime-core' {
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
+    ElScroll: typeof import('element-plus/es')['ElScroll']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index 971db66dc6..d125112de7 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -8,17 +8,19 @@
         </div>
       </template>
       <el-input v-model="filterText" placeholder="搜索部门" />
-      <el-tree
-        ref="treeRef"
-        node-key="id"
-        default-expand-all
-        :data="deptOptions"
-        :props="defaultProps"
-        :highlight-current="true"
-        :filter-node-method="filterNode"
-        :expand-on-click-node="false"
-        @node-click="handleDeptNodeClick"
-      />
+      <el-scrollbar height="650">
+        <el-tree
+          ref="treeRef"
+          node-key="id"
+          default-expand-all
+          :data="deptOptions"
+          :props="defaultProps"
+          :highlight-current="true"
+          :filter-node-method="filterNode"
+          :expand-on-click-node="false"
+          @node-click="handleDeptNodeClick"
+        />
+      </el-scrollbar>
     </el-card>
     <el-card class="w-4/5 user" style="margin-left: 10px" :gutter="12" shadow="hover">
       <template #header>
@@ -534,8 +536,8 @@ onMounted(async () => {
 
 <style scoped>
 .user {
-  height: 900px;
-  max-height: 960px;
+  height: 780px;
+  max-height: 800px;
 }
 .card-header {
   display: flex;

From d207b95b29c380b46ff31e7a9f7f9d0f5842d7be Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 19 Jan 2023 13:44:04 +0800
Subject: [PATCH 42/65] fix: topAction bug

---
 yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
index d093489db3..3404975126 100644
--- a/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
+++ b/yudao-ui-admin-vue3/src/components/XTable/src/XTable.vue
@@ -255,16 +255,17 @@ const getToolBarConfig = (options: XTableProps) => {
   if (toolbarConfig) return
   if (toolBar) {
     if (!isBoolean(toolBar)) {
+      console.info(2)
       options.toolbarConfig = toolBar
       return
     }
-  } else if (!topActionSlots) {
+  } else if (topActionSlots != false) {
     options.toolbarConfig = {
-      enabled: true
+      slots: { buttons: 'toolbar_buttons' }
     }
   } else {
     options.toolbarConfig = {
-      slots: { buttons: 'toolbar_buttons' }
+      enabled: true
     }
   }
 }

From 729ec31dab4144ec70be764363213e4d50c0d8c2 Mon Sep 17 00:00:00 2001
From: gaibu <1016771049@qq.com>
Date: Thu, 19 Jan 2023 20:16:03 +0800
Subject: [PATCH 43/65] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=E6=B3=A8=E8=A7=A3=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{Regex.java => RegexDesensitize.java}     |  2 +-
 .../DefaultRegexDesensitizationHandler.java   | 10 ++---
 ...BankCard.java => BankCardDesensitize.java} |  2 +-
 ...icense.java => CarLicenseDesensitize.java} |  2 +-
 ...eName.java => ChineseNameDesensitize.java} |  2 +-
 ...dPhone.java => FixedPhoneDesensitize.java} |  2 +-
 .../{IdCard.java => IdCardDesensitize.java}   |  2 +-
 .../{Mobile.java => MobileDesensitize.java}   |  2 +-
 ...Password.java => PasswordDesensitize.java} |  2 +-
 .../{Slider.java => SliderDesensitize.java}   |  2 +-
 .../handler/BankCardDesensitization.java      | 12 +++---
 .../handler/CarLicenseDesensitization.java    | 12 +++---
 .../handler/ChineseNameDesensitization.java   | 12 +++---
 .../DefaultDesensitizationHandler.java        | 12 +++---
 .../handler/FixedPhoneDesensitization.java    | 12 +++---
 .../slider/handler/IdCardDesensitization.java | 12 +++---
 .../slider/handler/MobileDesensitization.java | 12 +++---
 .../handler/PasswordDesensitization.java      | 12 +++---
 .../desensitize/core/DesensitizeTest.java     | 40 +++++++++----------
 19 files changed, 82 insertions(+), 82 deletions(-)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/{Regex.java => RegexDesensitize.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{BankCard.java => BankCardDesensitize.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{CarLicense.java => CarLicenseDesensitize.java} (95%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{ChineseName.java => ChineseNameDesensitize.java} (95%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{FixedPhone.java => FixedPhoneDesensitize.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{IdCard.java => IdCardDesensitize.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{Mobile.java => MobileDesensitize.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{Password.java => PasswordDesensitize.java} (96%)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/{Slider.java => SliderDesensitize.java} (96%)

diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
index d0fddea6a4..4ab7c74157 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/Regex.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = DefaultRegexDesensitizationHandler.class)
-public @interface Regex {
+public @interface RegexDesensitize {
 
     /**
      * 匹配的正则表达式（默认匹配所有）
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
index 718380570c..f92414e0c3 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java
@@ -1,21 +1,21 @@
 package cn.iocoder.yudao.framework.desensitize.core.regex.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
 
 /**
- * {@link Regex} 的正则脱敏处理器
+ * {@link RegexDesensitize} 的正则脱敏处理器
  *
  * @author gaibu
  */
-public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<Regex> {
+public class DefaultRegexDesensitizationHandler extends AbstractRegexDesensitizationHandler<RegexDesensitize> {
 
     @Override
-    String getRegex(Regex annotation) {
+    String getRegex(RegexDesensitize annotation) {
         return annotation.regex();
     }
 
     @Override
-    String getReplacer(Regex annotation) {
+    String getReplacer(RegexDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java
index 762ce3118b..ca04b2b130 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCard.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = BankCardDesensitization.class)
-public @interface BankCard {
+public @interface BankCardDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java
similarity index 95%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java
index d3d09ad42d..82a99db200 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicense.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = CarLicenseDesensitization.class)
-public @interface CarLicense {
+public @interface CarLicenseDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java
similarity index 95%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java
index 92e46e594b..73a0d0ee51 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseName.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = ChineseNameDesensitization.class)
-public @interface ChineseName {
+public @interface ChineseNameDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java
index 8675521647..e847954ca9 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhone.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = FixedPhoneDesensitization.class)
-public @interface FixedPhone {
+public @interface FixedPhoneDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java
index 7b976bac6c..05fb73ab96 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCard.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = IdCardDesensitization.class)
-public @interface IdCard {
+public @interface IdCardDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Mobile.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Mobile.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java
index ca2f4f041d..90dbcacc70 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Mobile.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = MobileDesensitization.class)
-public @interface Mobile {
+public @interface MobileDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java
index f96e13b21e..99ca5d12cd 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Password.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = PasswordDesensitization.class)
-public @interface Password {
+public @interface PasswordDesensitize {
 
     /**
      * 前缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java
index 4d3cac7a38..e13e9c47cc 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/Slider.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @JacksonAnnotationsInside
 @DesensitizeBy(handler = DefaultDesensitizationHandler.class)
-public @interface Slider {
+public @interface SliderDesensitize {
 
     /**
      * 后缀保留长度
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
index ca2e00c899..1447f1a38b 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
@@ -1,26 +1,26 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize;
 
 /**
- * {@link BankCard} 的脱敏处理器
+ * {@link BankCardDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCard> {
+public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCardDesensitize> {
 
     @Override
-    Integer getPrefixKeep(BankCard annotation) {
+    Integer getPrefixKeep(BankCardDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(BankCard annotation) {
+    Integer getSuffixKeep(BankCardDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(BankCard annotation) {
+    String getReplacer(BankCardDesensitize annotation) {
         return annotation.replacer();
     }
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
index eafe634b71..3b10ef7ef9 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
@@ -1,25 +1,25 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize;
 
 /**
- * {@link CarLicense} 的脱敏处理器
+ * {@link CarLicenseDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class CarLicenseDesensitization extends AbstractDesensitizationHandler<CarLicense> {
+public class CarLicenseDesensitization extends AbstractDesensitizationHandler<CarLicenseDesensitize> {
     @Override
-    Integer getPrefixKeep(CarLicense annotation) {
+    Integer getPrefixKeep(CarLicenseDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(CarLicense annotation) {
+    Integer getSuffixKeep(CarLicenseDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(CarLicense annotation) {
+    String getReplacer(CarLicenseDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
index 050843033d..f75984dfaa 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
@@ -1,26 +1,26 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize;
 
 /**
- * {@link ChineseName} 的脱敏处理器
+ * {@link ChineseNameDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseName> {
+public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseNameDesensitize> {
 
     @Override
-    Integer getPrefixKeep(ChineseName annotation) {
+    Integer getPrefixKeep(ChineseNameDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(ChineseName annotation) {
+    Integer getSuffixKeep(ChineseNameDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(ChineseName annotation) {
+    String getReplacer(ChineseNameDesensitize annotation) {
         return annotation.replacer();
     }
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
index 187a22f116..1a114624bc 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
@@ -1,25 +1,25 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize;
 
 /**
- * {@link Slider} 的脱敏处理器
+ * {@link SliderDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<Slider> {
+public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<SliderDesensitize> {
     @Override
-    Integer getPrefixKeep(Slider annotation) {
+    Integer getPrefixKeep(SliderDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(Slider annotation) {
+    Integer getSuffixKeep(SliderDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(Slider annotation) {
+    String getReplacer(SliderDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
index 69b07cadfc..c617e46d35 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
@@ -1,25 +1,25 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize;
 
 /**
- * {@link FixedPhone} 的脱敏处理器
+ * {@link FixedPhoneDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhone> {
+public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhoneDesensitize> {
     @Override
-    Integer getPrefixKeep(FixedPhone annotation) {
+    Integer getPrefixKeep(FixedPhoneDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(FixedPhone annotation) {
+    Integer getSuffixKeep(FixedPhoneDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(FixedPhone annotation) {
+    String getReplacer(FixedPhoneDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
index dccf3e8341..35db2ccd93 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
@@ -1,25 +1,25 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize;
 
 /**
- * {@link IdCard} 的脱敏处理器
+ * {@link IdCardDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class IdCardDesensitization extends AbstractDesensitizationHandler<IdCard> {
+public class IdCardDesensitization extends AbstractDesensitizationHandler<IdCardDesensitize> {
     @Override
-    Integer getPrefixKeep(IdCard annotation) {
+    Integer getPrefixKeep(IdCardDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(IdCard annotation) {
+    Integer getSuffixKeep(IdCardDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(IdCard annotation) {
+    String getReplacer(IdCardDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
index e5ddb49c21..6c31606c5f 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
@@ -1,26 +1,26 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Mobile;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize;
 
 /**
- * {@link Mobile} 的脱敏处理器
+ * {@link MobileDesensitize} 的脱敏处理器
  *
  * @author gaibu
  */
-public class MobileDesensitization extends AbstractDesensitizationHandler<Mobile> {
+public class MobileDesensitization extends AbstractDesensitizationHandler<MobileDesensitize> {
 
     @Override
-    Integer getPrefixKeep(Mobile annotation) {
+    Integer getPrefixKeep(MobileDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(Mobile annotation) {
+    Integer getSuffixKeep(MobileDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(Mobile annotation) {
+    String getReplacer(MobileDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
index 26a7de496f..16013f87b1 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
@@ -1,25 +1,25 @@
 package cn.iocoder.yudao.framework.desensitize.core.slider.handler;
 
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize;
 
 /**
- * {@link Password} 的码脱敏处理器
+ * {@link PasswordDesensitize} 的码脱敏处理器
  *
  * @author gaibu
  */
-public class PasswordDesensitization extends AbstractDesensitizationHandler<Password> {
+public class PasswordDesensitization extends AbstractDesensitizationHandler<PasswordDesensitize> {
     @Override
-    Integer getPrefixKeep(Password annotation) {
+    Integer getPrefixKeep(PasswordDesensitize annotation) {
         return annotation.prefixKeep();
     }
 
     @Override
-    Integer getSuffixKeep(Password annotation) {
+    Integer getSuffixKeep(PasswordDesensitize annotation) {
         return annotation.suffixKeep();
     }
 
     @Override
-    String getReplacer(Password annotation) {
+    String getReplacer(PasswordDesensitize annotation) {
         return annotation.replacer();
     }
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
index 4009438333..c308a0eb55 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
@@ -2,16 +2,16 @@ package cn.iocoder.yudao.framework.desensitize.core;
 
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.Regex;
+import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
 import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCard;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicense;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhone;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCard;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Password;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Mobile;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.Slider;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize;
+import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
 import lombok.Data;
 import org.junit.jupiter.api.Test;
@@ -65,29 +65,29 @@ public class DesensitizeTest extends BaseMockitoUnitTest {
     @Data
     public static class DesensitizeDemo {
 
-        @ChineseName
+        @ChineseNameDesensitize
         private String nickname;
-        @BankCard
+        @BankCardDesensitize
         private String bankCard;
-        @CarLicense
+        @CarLicenseDesensitize
         private String carLicense;
-        @FixedPhone
+        @FixedPhoneDesensitize
         private String fixedPhone;
-        @IdCard
+        @IdCardDesensitize
         private String idCard;
-        @Password
+        @PasswordDesensitize
         private String password;
-        @Mobile
+        @MobileDesensitize
         private String phoneNumber;
-        @Slider(prefixKeep = 6, suffixKeep = 1, replacer = "#")
+        @SliderDesensitize(prefixKeep = 6, suffixKeep = 1, replacer = "#")
         private String slider1;
-        @Slider(prefixKeep = 3, suffixKeep = 3)
+        @SliderDesensitize(prefixKeep = 3, suffixKeep = 3)
         private String slider2;
-        @Slider(prefixKeep = 10)
+        @SliderDesensitize(prefixKeep = 10)
         private String slider3;
         @EmailDesensitize
         private String email;
-        @Regex(regex = "芋道源码", replacer = "*")
+        @RegexDesensitize(regex = "芋道源码", replacer = "*")
         private String regex;
         @Address
         private String address;

From 0763c720d2a5ba4f91cd3cbea6d8d8575eead5a4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 21 Jan 2023 13:17:08 +0800
Subject: [PATCH 44/65] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desensitize/core/regex/annotation/EmailDesensitize.java     | 2 +-
 .../desensitize/core/slider/annotation/BankCardDesensitize.java | 2 +-
 .../core/slider/annotation/CarLicenseDesensitize.java           | 2 +-
 .../core/slider/annotation/FixedPhoneDesensitize.java           | 2 +-
 .../desensitize/core/slider/annotation/IdCardDesensitize.java   | 2 +-
 .../desensitize/core/slider/annotation/MobileDesensitize.java   | 2 +-
 .../desensitize/core/slider/annotation/PasswordDesensitize.java | 2 +-
 .../desensitize/core/slider/annotation/SliderDesensitize.java   | 1 +
 ...onHandler.java => AbstractSliderDesensitizationHandler.java} | 2 +-
 .../core/slider/handler/BankCardDesensitization.java            | 2 +-
 .../core/slider/handler/CarLicenseDesensitization.java          | 2 +-
 .../core/slider/handler/ChineseNameDesensitization.java         | 2 +-
 .../core/slider/handler/DefaultDesensitizationHandler.java      | 2 +-
 .../core/slider/handler/FixedPhoneDesensitization.java          | 2 +-
 .../desensitize/core/slider/handler/IdCardDesensitization.java  | 2 +-
 .../desensitize/core/slider/handler/MobileDesensitization.java  | 2 +-
 .../core/slider/handler/PasswordDesensitization.java            | 2 +-
 17 files changed, 17 insertions(+), 16 deletions(-)
 rename yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/{AbstractDesensitizationHandler.java => AbstractSliderDesensitizationHandler.java} (96%)

diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
index 2e7ae34987..227f254990 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java
@@ -30,7 +30,7 @@ public @interface EmailDesensitize {
     /**
      * 替换规则，邮箱;
      *
-     * 比如：example@gmail.com 脱敏之后 为e****@gmail.com
+     * 比如：example@gmail.com 脱敏之后为 e****@gmail.com
      */
     String replacer() default "$1****$2";
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java
index ca04b2b130..19ad54e25b 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java
@@ -33,7 +33,7 @@ public @interface BankCardDesensitize {
     int suffixKeep() default 2;
 
     /**
-     * 替换规则，银行卡号;比如：9988002866797031脱敏之后为998800********31
+     * 替换规则，银行卡号; 比如：9988002866797031 脱敏之后为 998800********31
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java
index 82a99db200..9000e1ec43 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java
@@ -33,7 +33,7 @@ public @interface CarLicenseDesensitize {
     int suffixKeep() default 1;
 
     /**
-     * 替换规则，车牌号;比如：粤A66666脱敏之后为粤A6***6
+     * 替换规则，车牌号;比如：粤A66666 脱敏之后为粤A6***6
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java
index e847954ca9..862235346d 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java
@@ -33,7 +33,7 @@ public @interface FixedPhoneDesensitize {
     int suffixKeep() default 2;
 
     /**
-     * 替换规则，固定电话;比如：01086551122脱敏之后为0108*****22
+     * 替换规则，固定电话;比如：01086551122 脱敏之后为 0108*****22
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java
index 05fb73ab96..8a654c9154 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java
@@ -33,7 +33,7 @@ public @interface IdCardDesensitize {
     int suffixKeep() default 2;
 
     /**
-     * 替换规则，身份证号码;比如：530321199204074611脱敏之后为530321**********11
+     * 替换规则，身份证号码;比如：530321199204074611 脱敏之后为 530321**********11
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java
index 90dbcacc70..f0c42f192f 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java
@@ -33,7 +33,7 @@ public @interface MobileDesensitize {
     int suffixKeep() default 4;
 
     /**
-     * 替换规则，手机号;比如：13248765917脱敏之后为132****5917
+     * 替换规则，手机号;比如：13248765917 脱敏之后为 132****5917
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java
index 99ca5d12cd..6a3b2694f4 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java
@@ -35,7 +35,7 @@ public @interface PasswordDesensitize {
     /**
      * 替换规则，密码;
      *
-     * 比如：123456脱敏之后为******
+     * 比如：123456 脱敏之后为 ******
      */
     String replacer() default "*";
 
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java
index e13e9c47cc..ec79635b94 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java
@@ -29,6 +29,7 @@ public @interface SliderDesensitize {
 
     /**
      * 替换规则，会将前缀后缀保留后，全部替换成 replacer
+     *
      * 例如：prefixKeep = 1; suffixKeep = 2; replacer = "*";
      * 原始字符串  123456
      * 脱敏后     1***56
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java
similarity index 96%
rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
rename to yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java
index e41c57319a..7dd2a7fd1c 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java
@@ -9,7 +9,7 @@ import java.lang.annotation.Annotation;
  *
  * @author gaibu
  */
-public abstract class AbstractDesensitizationHandler<T extends Annotation>
+public abstract class AbstractSliderDesensitizationHandler<T extends Annotation>
         implements DesensitizationHandler<T> {
 
     @Override
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
index 1447f1a38b..e1d90ea6db 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDes
  *
  * @author gaibu
  */
-public class BankCardDesensitization extends AbstractDesensitizationHandler<BankCardDesensitize> {
+public class BankCardDesensitization extends AbstractSliderDesensitizationHandler<BankCardDesensitize> {
 
     @Override
     Integer getPrefixKeep(BankCardDesensitize annotation) {
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
index 3b10ef7ef9..34b3e9a69e 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseD
  *
  * @author gaibu
  */
-public class CarLicenseDesensitization extends AbstractDesensitizationHandler<CarLicenseDesensitize> {
+public class CarLicenseDesensitization extends AbstractSliderDesensitizationHandler<CarLicenseDesensitize> {
     @Override
     Integer getPrefixKeep(CarLicenseDesensitize annotation) {
         return annotation.prefixKeep();
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
index f75984dfaa..f71dac0e0d 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseName
  *
  * @author gaibu
  */
-public class ChineseNameDesensitization extends AbstractDesensitizationHandler<ChineseNameDesensitize> {
+public class ChineseNameDesensitization extends AbstractSliderDesensitizationHandler<ChineseNameDesensitize> {
 
     @Override
     Integer getPrefixKeep(ChineseNameDesensitize annotation) {
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
index 1a114624bc..8b0adaeab6 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesen
  *
  * @author gaibu
  */
-public class DefaultDesensitizationHandler extends AbstractDesensitizationHandler<SliderDesensitize> {
+public class DefaultDesensitizationHandler extends AbstractSliderDesensitizationHandler<SliderDesensitize> {
     @Override
     Integer getPrefixKeep(SliderDesensitize annotation) {
         return annotation.prefixKeep();
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
index c617e46d35..6e2326171c 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneD
  *
  * @author gaibu
  */
-public class FixedPhoneDesensitization extends AbstractDesensitizationHandler<FixedPhoneDesensitize> {
+public class FixedPhoneDesensitization extends AbstractSliderDesensitizationHandler<FixedPhoneDesensitize> {
     @Override
     Integer getPrefixKeep(FixedPhoneDesensitize annotation) {
         return annotation.prefixKeep();
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
index 35db2ccd93..9d525b34c6 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesen
  *
  * @author gaibu
  */
-public class IdCardDesensitization extends AbstractDesensitizationHandler<IdCardDesensitize> {
+public class IdCardDesensitization extends AbstractSliderDesensitizationHandler<IdCardDesensitize> {
     @Override
     Integer getPrefixKeep(IdCardDesensitize annotation) {
         return annotation.prefixKeep();
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
index 6c31606c5f..582900ad4c 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesen
  *
  * @author gaibu
  */
-public class MobileDesensitization extends AbstractDesensitizationHandler<MobileDesensitize> {
+public class MobileDesensitization extends AbstractSliderDesensitizationHandler<MobileDesensitize> {
 
     @Override
     Integer getPrefixKeep(MobileDesensitize annotation) {
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
index 16013f87b1..1bccaa2a4a 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDes
  *
  * @author gaibu
  */
-public class PasswordDesensitization extends AbstractDesensitizationHandler<PasswordDesensitize> {
+public class PasswordDesensitization extends AbstractSliderDesensitizationHandler<PasswordDesensitize> {
     @Override
     Integer getPrefixKeep(PasswordDesensitize annotation) {
         return annotation.prefixKeep();

From c744e115e3c20af79c2f98b0d2080c7210f7cfa0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 10:11:16 +0800
Subject: [PATCH 45/65] =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=9A=84=E5=AE=9E=E7=8E=B0=EF=BC=8C=E8=90=8C?=
 =?UTF-8?q?=E6=96=B0=E6=9B=B4=E5=AE=B9=E6=98=93=E7=9C=8B=E6=87=82=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/core/mapper/BaseMapperX.java      |  9 +--
 .../dal/mysql/file/FileConfigMapper.java      | 11 ---
 .../file/FileConfigRefreshConsumer.java       |  2 +-
 .../infra/service/file/FileConfigService.java |  2 +-
 .../service/file/FileConfigServiceImpl.java   | 48 +----------
 .../file/FileConfigServiceImplTest.java       |  6 +-
 .../dal/mysql/merchant/PayChannelMapper.java  | 11 +--
 .../merchant/PayChannelServiceImpl.java       | 39 +--------
 .../system/dal/mysql/dept/DeptMapper.java     |  5 --
 .../dal/mysql/oauth2/OAuth2ClientMapper.java  |  6 --
 .../dal/mysql/permission/MenuMapper.java      |  5 --
 .../dal/mysql/permission/RoleMapper.java      |  5 --
 .../permission/RoleMenuBatchInsertMapper.java | 14 ----
 .../dal/mysql/permission/RoleMenuMapper.java  | 18 ++---
 .../permission/UserRoleBatchInsertMapper.java | 14 ----
 .../dal/mysql/permission/UserRoleMapper.java  | 23 ++----
 .../sensitiveword/SensitiveWordMapper.java    |  5 --
 .../dal/mysql/sms/SmsChannelMapper.java       |  6 --
 .../dal/mysql/sms/SmsTemplateMapper.java      |  5 --
 .../system/dal/mysql/tenant/TenantMapper.java | 11 +--
 .../system/service/dept/DeptServiceImpl.java  | 47 ++---------
 .../oauth2/OAuth2ClientServiceImpl.java       | 43 +---------
 .../service/permission/MenuServiceImpl.java   | 46 ++---------
 .../permission/PermissionServiceImpl.java     | 79 +++----------------
 .../service/permission/RoleServiceImpl.java   | 44 +----------
 .../SensitiveWordServiceImpl.java             | 45 +----------
 .../service/sms/SmsChannelServiceImpl.java    | 45 +----------
 .../service/sms/SmsTemplateServiceImpl.java   | 58 +++-----------
 .../auth/AdminAuthServiceImplTest.java        |  5 +-
 .../system/service/dept/DeptServiceTest.java  | 20 ++---
 .../oauth2/OAuth2ClientServiceImplTest.java   |  3 -
 .../service/permission/MenuServiceTest.java   | 24 ++----
 .../permission/PermissionServiceTest.java     | 32 +++-----
 .../service/permission/RoleServiceTest.java   |  3 -
 .../SensitiveWordServiceImplTest.java         |  2 -
 .../service/sms/SmsChannelServiceTest.java    | 21 ++---
 .../service/sms/SmsTemplateServiceTest.java   |  6 +-
 37 files changed, 111 insertions(+), 657 deletions(-)
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuBatchInsertMapper.java
 delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleBatchInsertMapper.java

diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
index e0b5e4bb5d..a831337e8b 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
@@ -81,22 +81,19 @@ public interface BaseMapperX<T> extends BaseMapper<T> {
     }
 
     /**
-     * 逐条插入，适合少量数据插入，或者对性能要求不高的场景
-     * <p>
-     * 如果大量，请使用 {@link com.baomidou.mybatisplus.extension.service.impl.ServiceImpl#saveBatch(Collection)} 方法
-     * 使用示例，可见 RoleMenuBatchInsertMapper、UserRoleBatchInsertMapper 类
+     * 批量插入，适合大量数据插入
      *
      * @param entities 实体们
      */
     default void insertBatch(Collection<T> entities) {
-        entities.forEach(this::insert);
+        Db.saveBatch(entities);
     }
 
     /**
      * 批量插入，适合大量数据插入
      *
      * @param entities 实体们
-     * @param size     插入数量 Db.saveBatch 默认为1000
+     * @param size     插入数量 Db.saveBatch 默认为 1000
      */
     default void insertBatch(Collection<T> entities, int size) {
         Db.saveBatch(entities, size);
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java
index e770dcafd9..a2bf16be46 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java
@@ -6,15 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
-
-/**
- * 文件配置 Mapper
- *
- * @author 芋道源码
- */
 @Mapper
 public interface FileConfigMapper extends BaseMapperX<FileConfigDO> {
 
@@ -26,7 +18,4 @@ public interface FileConfigMapper extends BaseMapperX<FileConfigDO> {
                 .orderByDesc(FileConfigDO::getId));
     }
 
-    @Select("SELECT COUNT(*) FROM infra_file_config WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java
index 671b419431..a3b41197fb 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java
@@ -23,7 +23,7 @@ public class FileConfigRefreshConsumer extends AbstractChannelMessageListener<Fi
     @Override
     public void onMessage(FileConfigRefreshMessage message) {
         log.info("[onMessage][收到 FileConfig 刷新消息]");
-        fileConfigService.initFileClients();
+        fileConfigService.initLocalCache();
     }
 
 }
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
index 02197b98ee..b3fc6bad23 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java
@@ -21,7 +21,7 @@ public interface FileConfigService {
     /**
      * 初始化文件客户端
      */
-    void initFileClients();
+    void initLocalCache();
 
     /**
      * 创建文件配置
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
index 48361c14c4..590ff8116b 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.infra.service.file;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
 import cn.iocoder.yudao.framework.file.core.client.FileClient;
@@ -19,7 +18,6 @@ import cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper;
 import cn.iocoder.yudao.module.infra.mq.producer.file.FileConfigProducer;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -29,7 +27,6 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Validator;
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -48,18 +45,6 @@ import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_CONFIG
 @Slf4j
 public class FileConfigServiceImpl implements FileConfigService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
-    /**
-     * 缓存菜单的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    @Getter
-    private volatile LocalDateTime maxUpdateTime;
-
     @Resource
     private FileClientFactory fileClientFactory;
     /**
@@ -79,34 +64,12 @@ public class FileConfigServiceImpl implements FileConfigService {
 
     @Override
     @PostConstruct
-    public void initFileClients() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-        // 如果没有增量的数据变化，则不进行本地缓存的刷新
-        if (maxUpdateTime != null
-                && fileConfigMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-            log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-            return;
-        }
+    public void initLocalCache() {
+        // 第一步：查询数据
         List<FileConfigDO> configs = fileConfigMapper.selectList();
-        log.info("[initLocalCacheIfUpdate][缓存文件配置，数量为:{}]", configs.size());
+        log.info("[initLocalCache][缓存文件配置，数量为:{}]", configs.size());
 
-        // 第二步：构建缓存。创建或更新文件 Client
+        // 第二步：构建缓存：创建或更新文件 Client
         configs.forEach(config -> {
             fileClientFactory.createOrUpdateFileClient(config.getId(), config.getStorage(), config.getConfig());
             // 如果是 master，进行设置
@@ -114,9 +77,6 @@ public class FileConfigServiceImpl implements FileConfigService {
                 masterFileClient = fileClientFactory.getFileClient(config.getId());
             }
         });
-
-        // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-        this.maxUpdateTime = CollectionUtils.getMaxValue(configs, FileConfigDO::getUpdateTime);
     }
 
     @Override
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
index 33d0d1ad74..61c9827f63 100755
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
@@ -30,7 +30,6 @@ import java.util.Map;
 import static cn.hutool.core.util.RandomUtil.randomEle;
 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.common.util.object.ObjectUtils.max;
 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;
@@ -74,16 +73,13 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
         when(fileClientFactory.getFileClient(eq(1L))).thenReturn(masterFileClient);
 
         // 调用
-        fileConfigService.initFileClients();
+        fileConfigService.initLocalCache();
         // 断言 fileClientFactory 调用
         verify(fileClientFactory).createOrUpdateFileClient(eq(1L),
                 eq(configDO1.getStorage()), eq(configDO1.getConfig()));
         verify(fileClientFactory).createOrUpdateFileClient(eq(2L),
                 eq(configDO2.getStorage()), eq(configDO2.getConfig()));
         assertSame(masterFileClient, fileConfigService.getMasterFileClient());
-        // 断言 maxUpdateTime 缓存
-        assertEquals(max(configDO1.getUpdateTime(), configDO2.getUpdateTime()),
-                fileConfigService.getMaxUpdateTime());
     }
 
     @Test
diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapper.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapper.java
index 216cf689d2..bea47f8ba7 100644
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapper.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapper.java
@@ -8,9 +8,7 @@ import cn.iocoder.yudao.module.pay.controller.admin.merchant.vo.channel.PayChann
 import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayChannelDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
@@ -21,9 +19,6 @@ public interface PayChannelMapper extends BaseMapperX<PayChannelDO> {
         return selectOne(PayChannelDO::getAppId, appId, PayChannelDO::getCode, code);
     }
 
-    @Select("SELECT COUNT(*) FROM pay_channel WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
     default PageResult<PayChannelDO> selectPage(PayChannelPageReqVO reqVO) {
         return selectPage(reqVO, new QueryWrapperX<PayChannelDO>()
                 .eqIfPresent("code", reqVO.getCode())
@@ -67,14 +62,14 @@ public interface PayChannelMapper extends BaseMapperX<PayChannelDO> {
      * 根据条件获取渠道
      *
      * @param merchantId 商户编号
-     * @param appid      应用编号 // TODO @aquan：appid =》appId
+     * @param appI      应用编号
      * @param code       渠道编码
      * @return 数量
      */
-    default PayChannelDO selectOne(Long merchantId, Long appid, String code) {
+    default PayChannelDO selectOne(Long merchantId, Long appI, String code) {
         return this.selectOne((new QueryWrapper<PayChannelDO>().lambda()
                 .eq(PayChannelDO::getMerchantId, merchantId)
-                .eq(PayChannelDO::getAppId, appid)
+                .eq(PayChannelDO::getAppId, appI)
                 .eq(PayChannelDO::getCode, code)
         ));
     }
diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/merchant/PayChannelServiceImpl.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/merchant/PayChannelServiceImpl.java
index e2fac7cadf..d4869a414f 100644
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/merchant/PayChannelServiceImpl.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/merchant/PayChannelServiceImpl.java
@@ -5,7 +5,6 @@ import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
 import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum;
@@ -19,7 +18,6 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.merchant.PayChannelDO;
 import cn.iocoder.yudao.module.pay.dal.mysql.merchant.PayChannelMapper;
 import cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -44,12 +42,6 @@ import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.CHANNEL_NOT_E
 @Validated
 public class PayChannelServiceImpl implements PayChannelService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 缓存菜单的最大更新时间，用于后续的增量轮询，判断是否有更新
      */
@@ -70,40 +62,15 @@ public class PayChannelServiceImpl implements PayChannelService {
     @Override
     @PostConstruct
     public void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
         // 注意：忽略自动多租户，因为要全局初始化缓存
         TenantUtils.executeIgnore(() -> {
-            // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-            // 如果没有增量的数据变化，则不进行本地缓存的刷新
-            if (maxUpdateTime != null
-                    && channelMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-                return;
-            }
+            // 第一步：查询数据
             List<PayChannelDO> channels = channelMapper.selectList();
-            log.info("[initLocalCacheIfUpdate][缓存支付渠道，数量为:{}]", channels.size());
+            log.info("[initLocalCache][缓存支付渠道，数量为:{}]", channels.size());
 
-            // 第二步：构建缓存。创建或更新支付 Client
+            // 第二步：构建缓存：创建或更新支付 Client
             channels.forEach(payChannel -> payClientFactory.createOrUpdatePayClient(payChannel.getId(),
                     payChannel.getCode(), payChannel.getConfig()));
-
-            // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-            this.maxUpdateTime = CollectionUtils.getMaxValue(channels, PayChannelDO::getUpdateTime);
         });
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
index c8e6cf1f87..a7050a1820 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
@@ -6,9 +6,7 @@ import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqV
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Mapper
@@ -30,7 +28,4 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
         return selectCount(DeptDO::getParentId, parentId);
     }
 
-    @Select("SELECT COUNT(*) FROM system_dept WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java
index 902fae7bb3..e6012b0f0a 100755
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java
@@ -6,9 +6,6 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.time.LocalDateTime;
 
 
 /**
@@ -30,7 +27,4 @@ public interface OAuth2ClientMapper extends BaseMapperX<OAuth2ClientDO> {
         return selectOne(OAuth2ClientDO::getClientId, clientId);
     }
 
-    @Select("SELECT COUNT(*) FROM system_oauth2_client WHERE update_time > #{maxUpdateTime}")
-    int selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java
index 1334a6e15a..cdab84b53a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java
@@ -6,9 +6,7 @@ import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuLi
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Mapper
@@ -28,7 +26,4 @@ public interface MenuMapper extends BaseMapperX<MenuDO> {
                 .eqIfPresent(MenuDO::getStatus, reqVO.getStatus()));
     }
 
-    @Select("SELECT COUNT(*) FROM system_menu WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
index 1882236a3e..55e8532735 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
@@ -8,10 +8,8 @@ import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleEx
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.lang.Nullable;
 
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
@@ -47,7 +45,4 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
         return selectList(RoleDO::getStatus, statuses);
     }
 
-    @Select("SELECT COUNT(*) FROM system_role WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuBatchInsertMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuBatchInsertMapper.java
deleted file mode 100644
index 69ddfaf903..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuBatchInsertMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.permission;
-
-import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Repository;
-
-/**
- * 实体 {@link RoleMenuDO} 的批量插入 Mapper
- *
- * @author 芋道源码
- */
-@Repository
-public class RoleMenuBatchInsertMapper extends ServiceImpl<RoleMenuMapper, RoleMenuDO> {
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java
index a07e87cc99..20f4186768 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java
@@ -2,13 +2,11 @@ package cn.iocoder.yudao.module.system.dal.mysql.permission;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
@@ -20,23 +18,21 @@ public interface RoleMenuMapper extends BaseMapperX<RoleMenuDO> {
     }
 
     default List<RoleMenuDO> selectListByRoleId(Long roleId) {
-        return selectList(new QueryWrapper<RoleMenuDO>().eq("role_id", roleId));
+        return selectList(RoleMenuDO::getRoleId, roleId);
     }
 
     default void deleteListByRoleIdAndMenuIds(Long roleId, Collection<Long> menuIds) {
-        delete(new QueryWrapper<RoleMenuDO>().eq("role_id", roleId)
-                .in("menu_id", menuIds));
+        delete(new LambdaQueryWrapper<RoleMenuDO>()
+                .eq(RoleMenuDO::getRoleId, roleId)
+                .in(RoleMenuDO::getMenuId, menuIds));
     }
 
     default void deleteListByMenuId(Long menuId) {
-        delete(new QueryWrapper<RoleMenuDO>().eq("menu_id", menuId));
+        delete(new LambdaQueryWrapper<RoleMenuDO>().eq(RoleMenuDO::getMenuId, menuId));
     }
 
     default void deleteListByRoleId(Long roleId) {
-        delete(new QueryWrapper<RoleMenuDO>().eq("role_id", roleId));
+        delete(new LambdaQueryWrapper<RoleMenuDO>().eq(RoleMenuDO::getRoleId, roleId));
     }
 
-    @Select("SELECT COUNT(*) FROM system_role_menu WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleBatchInsertMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleBatchInsertMapper.java
deleted file mode 100644
index 474bdb2c10..0000000000
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleBatchInsertMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.permission;
-
-import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Repository;
-
-/**
- * 实体 {@link UserRoleDO} 的批量插入 Mapper
- *
- * @author 芋道源码
- */
-@Repository
-public class UserRoleBatchInsertMapper extends ServiceImpl<UserRoleMapper, UserRoleDO> {
-}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
index e3700da920..12ff88a0f0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
@@ -2,11 +2,9 @@ package cn.iocoder.yudao.module.system.dal.mysql.permission;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
@@ -14,32 +12,25 @@ import java.util.List;
 public interface UserRoleMapper extends BaseMapperX<UserRoleDO> {
 
     default List<UserRoleDO> selectListByUserId(Long userId) {
-        return selectList(new QueryWrapper<UserRoleDO>().eq("user_id", userId));
-    }
-
-    default List<UserRoleDO> selectListByRoleId(Long roleId) {
-        return selectList(new QueryWrapper<UserRoleDO>().eq("role_id", roleId));
+        return selectList(UserRoleDO::getUserId, userId);
     }
 
     default void deleteListByUserIdAndRoleIdIds(Long userId, Collection<Long> roleIds) {
-        delete(new QueryWrapper<UserRoleDO>().eq("user_id", userId)
-                .in("role_id", roleIds));
+        delete(new LambdaQueryWrapper<UserRoleDO>()
+                .eq(UserRoleDO::getUserId, userId)
+                .in(UserRoleDO::getRoleId, roleIds));
     }
 
     default void deleteListByUserId(Long userId) {
-        delete(new QueryWrapper<UserRoleDO>().eq("user_id", userId));
+        delete(new LambdaQueryWrapper<UserRoleDO>().eq(UserRoleDO::getUserId, userId));
     }
 
     default void deleteListByRoleId(Long roleId) {
-        delete(new QueryWrapper<UserRoleDO>().eq("role_id", roleId));
+        delete(new LambdaQueryWrapper<UserRoleDO>().eq(UserRoleDO::getRoleId, roleId));
     }
 
-
     default List<UserRoleDO> selectListByRoleIds(Collection<Long> roleIds) {
         return selectList(UserRoleDO::getRoleId, roleIds);
     }
 
-    @Select("SELECT COUNT(*) FROM system_user_role WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java
index 8e2788f09b..8311887616 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java
@@ -7,9 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.Sensitiv
 import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -42,7 +40,4 @@ public interface SensitiveWordMapper extends BaseMapperX<SensitiveWordDO> {
         return selectOne(SensitiveWordDO::getName, name);
     }
 
-    @Select("SELECT COUNT(*) FROM system_sensitive_word WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java
index ec38e896e6..4af731fc6e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java
@@ -6,9 +6,6 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.time.LocalDateTime;
 
 @Mapper
 public interface SmsChannelMapper extends BaseMapperX<SmsChannelDO> {
@@ -21,7 +18,4 @@ public interface SmsChannelMapper extends BaseMapperX<SmsChannelDO> {
                 .orderByDesc(SmsChannelDO::getId));
     }
 
-    @Select("SELECT COUNT(*) FROM system_sms_channel WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java
index 08029f51b7..ee6f54fef6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java
@@ -7,17 +7,12 @@ import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTempla
 import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Mapper
 public interface SmsTemplateMapper extends BaseMapperX<SmsTemplateDO> {
 
-    @Select("SELECT COUNT(*) FROM system_sms_template WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
     default SmsTemplateDO selectByCode(String code) {
         return selectOne(SmsTemplateDO::getCode, code);
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java
index 6fe0e649a7..8731e46284 100755
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java
@@ -1,15 +1,13 @@
 package cn.iocoder.yudao.module.system.dal.mysql.tenant;
 
-import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
 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.tenant.vo.tenant.TenantExportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -52,7 +50,4 @@ public interface TenantMapper extends BaseMapperX<TenantDO> {
         return selectList(TenantDO::getPackageId, packageId);
     }
 
-    @Select("SELECT COUNT(*) FROM system_tenant WHERE update_time > #{maxUpdateTime}")
-    Long selectCountByUpdateTimeGt(LocalDateTime maxUpdateTime);
-
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index 049a6415aa..6262eaf70f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -40,19 +41,13 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class DeptServiceImpl implements DeptService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 部门缓存
      * key：部门编号 {@link DeptDO#getId()}
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
-    @SuppressWarnings("FieldCanBeLocal")
+    @Getter
     private volatile Map<Long, DeptDO> deptCache;
     /**
      * 父部门缓存
@@ -61,11 +56,8 @@ public class DeptServiceImpl implements DeptService {
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
+    @Getter
     private volatile Multimap<Long, DeptDO> parentDeptCache;
-    /**
-     * 缓存部门的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    private volatile LocalDateTime maxUpdateTime;
 
     @Resource
     private DeptMapper deptMapper;
@@ -79,48 +71,21 @@ public class DeptServiceImpl implements DeptService {
     @Override
     @PostConstruct
     public synchronized void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
         // 注意：忽略自动多租户，因为要全局初始化缓存
         TenantUtils.executeIgnore(() -> {
-            // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-            // 如果没有增量的数据变化，则不进行本地缓存的刷新
-            if (maxUpdateTime != null
-                    && deptMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-                return;
-            }
+            // 第一步：查询数据
             List<DeptDO> depts = deptMapper.selectList();
-            log.info("[initLocalCacheIfUpdate][缓存部门，数量为:{}]", depts.size());
+            log.info("[initLocalCache][缓存部门，数量为:{}]", depts.size());
 
-            // 第二步：构建缓存。创建或更新支付 Client
-            // 构建缓存
+            // 第二步：构建缓存
             ImmutableMap.Builder<Long, DeptDO> builder = ImmutableMap.builder();
             ImmutableMultimap.Builder<Long, DeptDO> parentBuilder = ImmutableMultimap.builder();
             depts.forEach(sysRoleDO -> {
                 builder.put(sysRoleDO.getId(), sysRoleDO);
                 parentBuilder.put(sysRoleDO.getParentId(), sysRoleDO);
             });
-            // 设置缓存
             deptCache = builder.build();
             parentDeptCache = parentBuilder.build();
-
-            // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-            this.maxUpdateTime = CollectionUtils.getMaxValue(depts, DeptDO::getUpdateTime);
         });
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
index d9cadd1aad..970387bbb6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
@@ -17,20 +17,17 @@ import com.google.common.annotations.VisibleForTesting;
 import lombok.Getter;
 import lombok.Setter;
 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.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 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.framework.common.util.collection.CollectionUtils.getMaxValue;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -43,12 +40,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class OAuth2ClientServiceImpl implements OAuth2ClientService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 客户端缓存
      * key：客户端编号 {@link OAuth2ClientDO#getClientId()} ()}
@@ -58,11 +49,6 @@ public class OAuth2ClientServiceImpl implements OAuth2ClientService {
     @Getter // 解决单测
     @Setter // 解决单测
     private volatile Map<String, OAuth2ClientDO> clientCache;
-    /**
-     * 缓存角色的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    @Getter
-    private volatile LocalDateTime maxUpdateTime;
 
     @Resource
     private OAuth2ClientMapper oauth2ClientMapper;
@@ -76,37 +62,12 @@ public class OAuth2ClientServiceImpl implements OAuth2ClientService {
     @Override
     @PostConstruct
     public void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-        // 如果没有增量的数据变化，则不进行本地缓存的刷新
-        if (maxUpdateTime != null
-                && oauth2ClientMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-            log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-            return;
-        }
+        // 第一步：查询数据
         List<OAuth2ClientDO> clients = oauth2ClientMapper.selectList();
-        log.info("[initLocalCacheIfUpdate][缓存 OAuth2 客户端，数量为:{}]", clients.size());
+        log.info("[initLocalCache][缓存 OAuth2 客户端，数量为:{}]", clients.size());
 
         // 第二步：构建缓存。
         clientCache = convertMap(clients, OAuth2ClientDO::getClientId);
-
-        // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-        this.maxUpdateTime = getMaxValue(clients, OAuth2ClientDO::getUpdateTime);
     }
 
     @Override
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
index 1f9fee802f..32466d592c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
@@ -18,9 +18,9 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -28,7 +28,6 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -43,18 +42,13 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class MenuServiceImpl implements MenuService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 菜单缓存
      * key：菜单编号
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
+    @Getter
     private volatile Map<Long, MenuDO> menuCache;
     /**
      * 权限与菜单缓存
@@ -63,11 +57,8 @@ public class MenuServiceImpl implements MenuService {
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
+    @Getter
     private volatile Multimap<String, MenuDO> permissionMenuCache;
-    /**
-     * 缓存菜单的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    private volatile LocalDateTime maxUpdateTime;
 
     @Resource
     private MenuMapper menuMapper;
@@ -86,33 +77,11 @@ public class MenuServiceImpl implements MenuService {
     @Override
     @PostConstruct
     public synchronized void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-        // 如果没有增量的数据变化，则不进行本地缓存的刷新
-        if (maxUpdateTime != null
-            && menuMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-            log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-            return;
-        }
+        // 第一步：查询数据
         List<MenuDO> menuList = menuMapper.selectList();
-        log.info("[initLocalCacheIfUpdate][缓存菜单，数量为:{}]", menuList.size());
+        log.info("[initLocalCache][缓存菜单，数量为:{}]", menuList.size());
 
-        // 第二步：构建缓存。
+        // 第二步：构建缓存
         ImmutableMap.Builder<Long, MenuDO> menuCacheBuilder = ImmutableMap.builder();
         ImmutableMultimap.Builder<String, MenuDO> permMenuCacheBuilder = ImmutableMultimap.builder();
         menuList.forEach(menuDO -> {
@@ -123,9 +92,6 @@ public class MenuServiceImpl implements MenuService {
         });
         menuCache = menuCacheBuilder.build();
         permissionMenuCache = permMenuCacheBuilder.build();
-
-        // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-        this.maxUpdateTime = CollectionUtils.getMaxValue(menuList, MenuDO::getUpdateTime);
     }
 
     @Override
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java
index bc4d51b8e9..c40a8e31c7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java
@@ -16,9 +16,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
-import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMenuBatchInsertMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMenuMapper;
-import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleBatchInsertMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
 import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum;
 import cn.iocoder.yudao.module.system.mq.producer.permission.PermissionProducer;
@@ -32,7 +30,6 @@ import com.google.common.collect.Sets;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -40,12 +37,10 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Supplier;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getMaxValue;
 import static java.util.Collections.singleton;
 
 /**
@@ -57,12 +52,6 @@ import static java.util.Collections.singleton;
 @Slf4j
 public class PermissionServiceImpl implements PermissionService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 角色编号与菜单编号的缓存映射
      * key：角色编号
@@ -83,11 +72,6 @@ public class PermissionServiceImpl implements PermissionService {
     @Getter
     @Setter // 单元测试需要
     private volatile Multimap<Long, Long> menuRoleCache;
-    /**
-     * 缓存 RoleMenu 的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    @Getter
-    private volatile LocalDateTime roleMenuMaxUpdateTime;
 
     /**
      * 用户编号与角色编号的缓存映射
@@ -99,20 +83,11 @@ public class PermissionServiceImpl implements PermissionService {
     @Getter
     @Setter // 单元测试需要
     private volatile Map<Long, Set<Long>> userRoleCache;
-    /**
-     * 缓存 UserRole 的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    @Getter
-    private volatile LocalDateTime userRoleMaxUpdateTime;
 
     @Resource
     private RoleMenuMapper roleMenuMapper;
     @Resource
-    private RoleMenuBatchInsertMapper roleMenuBatchInsertMapper;
-    @Resource
     private UserRoleMapper userRoleMapper;
-    @Resource
-    private UserRoleBatchInsertMapper userRoleBatchInsertMapper;
 
     @Resource
     private RoleService roleService;
@@ -129,38 +104,22 @@ public class PermissionServiceImpl implements PermissionService {
     @Override
     @PostConstruct
     public void initLocalCache() {
-        initLocalCacheIfUpdateForRoleMenu(null);
-        initLocalCacheIfUpdateForUserRole(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdateForRoleMenu(this.roleMenuMaxUpdateTime);
-        initLocalCacheIfUpdateForUserRole(this.userRoleMaxUpdateTime);
+        initLocalCacheForRoleMenu();
+        initLocalCacheForUserRole();
     }
 
     /**
      * 刷新 RoleMenu 本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
      */
     @VisibleForTesting
-    void initLocalCacheIfUpdateForRoleMenu(LocalDateTime maxUpdateTime) {
+    void initLocalCacheForRoleMenu() {
         // 注意：忽略自动多租户，因为要全局初始化缓存
         TenantUtils.executeIgnore(() -> {
-            // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-            // 如果没有增量的数据变化，则不进行本地缓存的刷新
-            if (maxUpdateTime != null
-                    && roleMenuMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                log.info("[initLocalCacheIfUpdateForRoleMenu][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-                return;
-            }
+            // 第一步：查询数据
             List<RoleMenuDO> roleMenus = roleMenuMapper.selectList();
-            log.info("[initLocalCacheIfUpdateForRoleMenu][缓存角色与菜单，数量为:{}]", roleMenus.size());
+            log.info("[initLocalCacheForRoleMenu][缓存角色与菜单，数量为:{}]", roleMenus.size());
 
-            // 第二步：构建缓存。
+            // 第二步：构建缓存
             ImmutableMultimap.Builder<Long, Long> roleMenuCacheBuilder = ImmutableMultimap.builder();
             ImmutableMultimap.Builder<Long, Long> menuRoleCacheBuilder = ImmutableMultimap.builder();
             roleMenus.forEach(roleMenuDO -> {
@@ -169,40 +128,24 @@ public class PermissionServiceImpl implements PermissionService {
             });
             roleMenuCache = roleMenuCacheBuilder.build();
             menuRoleCache = menuRoleCacheBuilder.build();
-
-            // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-            this.roleMenuMaxUpdateTime = getMaxValue(roleMenus, RoleMenuDO::getUpdateTime);
         });
     }
 
     /**
      * 刷新 UserRole 本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
      */
     @VisibleForTesting
-    void initLocalCacheIfUpdateForUserRole(LocalDateTime maxUpdateTime) {
+    void initLocalCacheForUserRole() {
         // 注意：忽略自动多租户，因为要全局初始化缓存
         TenantUtils.executeIgnore(() -> {
-            // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-            // 如果没有增量的数据变化，则不进行本地缓存的刷新
-            if (maxUpdateTime != null
-                    && userRoleMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                log.info("[initLocalCacheIfUpdateForUserRole][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-                return;
-            }
+            // 第一步：加载数据
             List<UserRoleDO> userRoles = userRoleMapper.selectList();
-            log.info("[initLocalCacheIfUpdateForUserRole][缓存用户与角色，数量为:{}]", userRoles.size());
+            log.info("[initLocalCacheForUserRole][缓存用户与角色，数量为:{}]", userRoles.size());
 
             // 第二步：构建缓存。
             ImmutableMultimap.Builder<Long, Long> userRoleCacheBuilder = ImmutableMultimap.builder();
             userRoles.forEach(userRoleDO -> userRoleCacheBuilder.put(userRoleDO.getUserId(), userRoleDO.getRoleId()));
             userRoleCache = CollectionUtils.convertMultiMap2(userRoles, UserRoleDO::getUserId, UserRoleDO::getRoleId);
-
-            // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-            this.userRoleMaxUpdateTime = getMaxValue(userRoles, UserRoleDO::getUpdateTime);
         });
     }
 
@@ -264,7 +207,7 @@ public class PermissionServiceImpl implements PermissionService {
         Collection<Long> deleteMenuIds = CollUtil.subtract(dbMenuIds, menuIds);
         // 执行新增和删除。对于已经授权的菜单，不用做任何处理
         if (!CollectionUtil.isEmpty(createMenuIds)) {
-            roleMenuBatchInsertMapper.saveBatch(CollectionUtils.convertList(createMenuIds, menuId -> {
+            roleMenuMapper.insertBatch(CollectionUtils.convertList(createMenuIds, menuId -> {
                 RoleMenuDO entity = new RoleMenuDO();
                 entity.setRoleId(roleId);
                 entity.setMenuId(menuId);
@@ -308,7 +251,7 @@ public class PermissionServiceImpl implements PermissionService {
         Collection<Long> deleteMenuIds = CollUtil.subtract(dbRoleIds, roleIds);
         // 执行新增和删除。对于已经授权的角色，不用做任何处理
         if (!CollectionUtil.isEmpty(createRoleIds)) {
-            userRoleBatchInsertMapper.saveBatch(CollectionUtils.convertList(createRoleIds, roleId -> {
+            userRoleMapper.insertBatch(CollectionUtils.convertList(createRoleIds, roleId -> {
                 UserRoleDO entity = new UserRoleDO();
                 entity.setUserId(userId);
                 entity.setRoleId(roleId);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
index f5569f8552..3f9ee1351e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
@@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -31,7 +30,6 @@ import org.springframework.util.StringUtils;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,12 +45,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class RoleServiceImpl implements RoleService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 角色缓存
      * key：角色编号 {@link RoleDO#getId()}
@@ -61,11 +53,6 @@ public class RoleServiceImpl implements RoleService {
      */
     @Getter
     private volatile Map<Long, RoleDO> roleCache;
-    /**
-     * 缓存角色的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    @Getter
-    private volatile LocalDateTime maxUpdateTime;
 
     @Resource
     private PermissionService permissionService;
@@ -82,39 +69,14 @@ public class RoleServiceImpl implements RoleService {
     @Override
     @PostConstruct
     public void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
         // 注意：忽略自动多租户，因为要全局初始化缓存
         TenantUtils.executeIgnore(() -> {
-            // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-            // 如果没有增量的数据变化，则不进行本地缓存的刷新
-            if (maxUpdateTime != null
-                    && roleMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-                return;
-            }
+            // 第一步：查询数据
             List<RoleDO> roleList = roleMapper.selectList();
-            log.info("[initLocalCacheIfUpdate][缓存角色，数量为:{}]", roleList.size());
+            log.info("[initLocalCache][缓存角色，数量为:{}]", roleList.size());
 
-            // 第二步：构建缓存。
+            // 第二步：构建缓存
             roleCache = CollectionUtils.convertMap(roleList, RoleDO::getId);
-
-            // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-            this.maxUpdateTime = CollectionUtils.getMaxValue(roleList, RoleDO::getUpdateTime);
         });
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
index cc7975bfaf..53357753ff 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
@@ -17,13 +17,11 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import lombok.Getter;
 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.time.LocalDateTime;
 import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -40,12 +38,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SENSITIVE_
 @Validated
 public class SensitiveWordServiceImpl implements SensitiveWordService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 敏感词标签缓存
      * key：敏感词编号 {@link SensitiveWordDO#getId()}
@@ -55,12 +47,6 @@ public class SensitiveWordServiceImpl implements SensitiveWordService {
     @Getter
     private volatile Set<String> sensitiveWordTagsCache = Collections.emptySet();
 
-    /**
-     * 缓存敏感词的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    @Getter
-    private volatile LocalDateTime maxUpdateTime;
-
     @Resource
     private SensitiveWordMapper sensitiveWordMapper;
 
@@ -84,42 +70,17 @@ public class SensitiveWordServiceImpl implements SensitiveWordService {
     @Override
     @PostConstruct
     public void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-        // 如果没有增量的数据变化，则不进行本地缓存的刷新
-        if (maxUpdateTime != null
-                && sensitiveWordMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-            log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-            return;
-        }
+        // 第一步：查询数据
         List<SensitiveWordDO> sensitiveWords = sensitiveWordMapper.selectList();
-        log.info("[initLocalCacheIfUpdate][缓存敏感词，数量为:{}]", sensitiveWords.size());
+        log.info("[initLocalCache][缓存敏感词，数量为:{}]", sensitiveWords.size());
 
-        // 第二步：构建缓存。
+        // 第二步：构建缓存
         // 写入 sensitiveWordTagsCache 缓存
         Set<String> tags = new HashSet<>();
         sensitiveWords.forEach(word -> tags.addAll(word.getTags()));
         sensitiveWordTagsCache = tags;
         // 写入 defaultSensitiveWordTrie、tagSensitiveWordTries 缓存
         initSensitiveWordTrie(sensitiveWords);
-
-        // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-        this.maxUpdateTime = CollectionUtils.getMaxValue(sensitiveWords, SensitiveWordDO::getUpdateTime);
     }
 
     private void initSensitiveWordTrie(List<SensitiveWordDO> wordDOs) {
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 50eeb49105..592864651e 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
@@ -11,17 +11,14 @@ import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
 import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper;
 import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getMaxValue;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS;
 
@@ -34,17 +31,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNE
 @Slf4j
 public class SmsChannelServiceImpl implements SmsChannelService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
-    /**
-     * 缓存菜单的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    private volatile LocalDateTime maxUpdateTime;
-
     @Resource
     private SmsClientFactory smsClientFactory;
 
@@ -60,38 +46,13 @@ public class SmsChannelServiceImpl implements SmsChannelService {
     @Override
     @PostConstruct
     public void initLocalCache() {
-        initLocalCacheIfUpdate(null);
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCacheIfUpdate(this.maxUpdateTime);
-    }
-
-    /**
-     * 刷新本地缓存
-     *
-     * @param maxUpdateTime 最大更新时间
-     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
-     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
-     */
-    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步：基于 maxUpdateTime 判断缓存是否刷新。
-        // 如果没有增量的数据变化，则不进行本地缓存的刷新
-        if (maxUpdateTime != null
-                && smsChannelMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-            log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
-            return;
-        }
+        // 第一步：查询数据
         List<SmsChannelDO> channels = smsChannelMapper.selectList();
-        log.info("[initLocalCacheIfUpdate][缓存短信渠道，数量为:{}]", channels.size());
+        log.info("[initLocalCache][缓存短信渠道，数量为:{}]", channels.size());
 
-        // 第二步：构建缓存。创建或更新短信 Client
+        // 第二步：构建缓存：创建或更新短信 Client
         List<SmsChannelProperties> propertiesList = SmsChannelConvert.INSTANCE.convertList02(channels);
         propertiesList.forEach(properties -> smsClientFactory.createOrUpdateSmsClient(properties));
-
-        // 第三步：设置最新的 maxUpdateTime，用于下次的增量判断。
-        this.maxUpdateTime = getMaxValue(channels, SmsChannelDO::getUpdateTime);
     }
 
     @Override
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 9f3ad2dde4..fd6a03f4ff 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
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.system.service.sms;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
@@ -20,15 +19,17 @@ import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
 import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsTemplateMapper;
 import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer;
 import com.google.common.annotations.VisibleForTesting;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -44,12 +45,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 @Slf4j
 public class SmsTemplateServiceImpl implements SmsTemplateService {
 
-    /**
-     * 定时执行 {@link #schedulePeriodicRefresh()} 的周期
-     * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高
-     */
-    private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L;
-
     /**
      * 正则表达式，匹配 {} 中的变量
      */
@@ -73,51 +68,18 @@ public class SmsTemplateServiceImpl implements SmsTemplateService {
      *
      * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
      */
+    @Getter // 为了方便测试，这里提供 getter 方法
     private volatile Map<String, SmsTemplateDO> smsTemplateCache;
-    /**
-     * 缓存短信模板的最大更新时间，用于后续的增量轮询，判断是否有更新
-     */
-    private volatile LocalDateTime maxUpdateTime;
 
     @Override
     @PostConstruct
     public void initLocalCache() {
-        // 获取短信模板列表，如果有更新
-        List<SmsTemplateDO> smsTemplateList = this.loadSmsTemplateIfUpdate(maxUpdateTime);
-        if (CollUtil.isEmpty(smsTemplateList)) {
-            return;
-        }
+        // 第一步：查询数据
+        List<SmsTemplateDO> smsTemplateList = smsTemplateMapper.selectList();
+        log.info("[initLocalCache][缓存短信模版，数量为:{}]", smsTemplateList.size());
 
-        // 写入缓存
+        // 第二步：构建缓存
         smsTemplateCache = CollectionUtils.convertMap(smsTemplateList, SmsTemplateDO::getCode);
-        maxUpdateTime = CollectionUtils.getMaxValue(smsTemplateList, SmsTemplateDO::getUpdateTime);
-        log.info("[initLocalCache][初始化 SmsTemplate 数量为 {}]", smsTemplateList.size());
-    }
-
-    /**
-     * 如果短信模板发生变化，从数据库中获取最新的全量短信模板。
-     * 如果未发生变化，则返回空
-     *
-     * @param maxUpdateTime 当前短信模板的最大更新时间
-     * @return 短信模板列表
-     */
-    private List<SmsTemplateDO> loadSmsTemplateIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步，判断是否要更新。
-        if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据
-            log.info("[loadSmsTemplateIfUpdate][首次加载全量短信模板]");
-        } else { // 判断数据库中是否有更新的短信模板
-            if (smsTemplateMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                return null;
-            }
-            log.info("[loadSmsTemplateIfUpdate][增量加载全量短信模板]");
-        }
-        // 第二步，如果有更新，则从数据库加载所有短信模板
-        return smsTemplateMapper.selectList();
-    }
-
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
-    public void schedulePeriodicRefresh() {
-        initLocalCache();
     }
 
     @Override
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
index 218778ac9f..dc607b7ced 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
@@ -5,8 +5,6 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
-import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthLoginReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthLoginRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum;
@@ -16,7 +14,7 @@ import cn.iocoder.yudao.module.system.service.member.MemberService;
 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
-import com.anji.captcha.service.CaptchaService;
+import com.xingyuv.captcha.service.CaptchaService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
@@ -25,7 +23,6 @@ import javax.annotation.Resource;
 import javax.validation.Validator;
 
 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.randomPojo;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceTest.java
index e17187ad68..6b4ff1028c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceTest.java
@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.system.service.dept;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
+import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
@@ -9,9 +12,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
 import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum;
 import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer;
-import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import com.google.common.collect.Multimap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -19,17 +19,15 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static cn.hutool.core.bean.BeanUtil.getFieldValue;
 import static cn.hutool.core.util.RandomUtil.randomEle;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 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.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -56,8 +54,7 @@ public class DeptServiceTest extends BaseDbUnitTest {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
-    void testInitLocalCache() {
+    public void testInitLocalCache() {
         // mock 数据
         DeptDO deptDO1 = randomDeptDO();
         deptMapper.insert(deptDO1);
@@ -67,18 +64,15 @@ public class DeptServiceTest extends BaseDbUnitTest {
         // 调用
         deptService.initLocalCache();
         // 断言 deptCache 缓存
-        Map<Long, DeptDO> deptCache = (Map<Long, DeptDO>) getFieldValue(deptService, "deptCache");
+        Map<Long, DeptDO> deptCache = deptService.getDeptCache();
         assertEquals(2, deptCache.size());
         assertPojoEquals(deptDO1, deptCache.get(deptDO1.getId()));
         assertPojoEquals(deptDO2, deptCache.get(deptDO2.getId()));
         // 断言 parentDeptCache 缓存
-        Multimap<Long, DeptDO> parentDeptCache = (Multimap<Long, DeptDO>) getFieldValue(deptService, "parentDeptCache");
+        Multimap<Long, DeptDO> parentDeptCache = deptService.getParentDeptCache();
         assertEquals(2, parentDeptCache.size());
         assertPojoEquals(deptDO1, parentDeptCache.get(deptDO1.getParentId()));
         assertPojoEquals(deptDO2, parentDeptCache.get(deptDO2.getParentId()));
-        // 断言 maxUpdateTime 缓存
-        LocalDateTime maxUpdateTime = (LocalDateTime) getFieldValue(deptService, "maxUpdateTime");
-        assertEquals(ObjectUtils.max(deptDO1.getUpdateTime(), deptDO2.getUpdateTime()), maxUpdateTime);
     }
 
     @Test
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
index c7d4ce5781..50401cf970 100755
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
@@ -19,7 +19,6 @@ import java.util.Collections;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
 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.*;
@@ -59,8 +58,6 @@ public class OAuth2ClientServiceImplTest extends BaseDbUnitTest {
         assertEquals(2, clientCache.size());
         assertPojoEquals(clientDO1, clientCache.get(clientDO1.getClientId()));
         assertPojoEquals(clientDO2, clientCache.get(clientDO2.getClientId()));
-        // 断言 maxUpdateTime 缓存
-        assertEquals(max(clientDO1.getUpdateTime(), clientDO2.getUpdateTime()), oauth2ClientService.getMaxUpdateTime());
     }
 
     @Test
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceTest.java
index b5d21f0310..eae4633b12 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceTest.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.service.permission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.common.util.spring.SpringAopUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO;
@@ -20,7 +19,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
@@ -51,32 +49,24 @@ public class MenuServiceTest extends BaseDbUnitTest {
     private TenantService tenantService;
 
     @Test
-    public void testInitLocalCache_success() throws Exception {
-        MenuDO menuDO1 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L);
+    public void testInitLocalCache_success() {
+        MenuDO menuDO1 = randomPojo(MenuDO.class);
         menuMapper.insert(menuDO1);
-        MenuDO menuDO2 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L);
+        MenuDO menuDO2 = randomPojo(MenuDO.class);
         menuMapper.insert(menuDO2);
 
         // 调用
         menuService.initLocalCache();
-
-        // 获取代理对象
-        MenuServiceImpl target = (MenuServiceImpl) SpringAopUtils.getTarget(menuService);
-
-        Map<Long, MenuDO> menuCache =
-                (Map<Long, MenuDO>) BeanUtil.getFieldValue(target, "menuCache");
+        // 校验 menuCache 缓存
+        Map<Long, MenuDO> menuCache = menuService.getMenuCache();
         Assert.isTrue(menuCache.size() == 2);
         assertPojoEquals(menuDO1, menuCache.get(menuDO1.getId()));
         assertPojoEquals(menuDO2, menuCache.get(menuDO2.getId()));
-
-        Multimap<String, MenuDO> permissionMenuCache =
-                (Multimap<String, MenuDO>) BeanUtil.getFieldValue(target, "permissionMenuCache");
+        // 校验 permissionMenuCache 缓存
+        Multimap<String, MenuDO> permissionMenuCache = menuService.getPermissionMenuCache();
         Assert.isTrue(permissionMenuCache.size() == 2);
         assertPojoEquals(menuDO1, permissionMenuCache.get(menuDO1.getPermission()));
         assertPojoEquals(menuDO2, permissionMenuCache.get(menuDO2.getPermission()));
-
-        LocalDateTime maxUpdateTime = (LocalDateTime) BeanUtil.getFieldValue(target, "maxUpdateTime");
-        assertEquals(ObjectUtils.max(menuDO1.getUpdateTime(), menuDO2.getUpdateTime()), maxUpdateTime);
     }
 
     @Test
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
index 6352c4593c..afc4c0cedd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
@@ -3,18 +3,15 @@ package cn.iocoder.yudao.module.system.service.permission;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
-import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMenuBatchInsertMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMenuMapper;
-import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleBatchInsertMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
 import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum;
 import cn.iocoder.yudao.module.system.mq.producer.permission.PermissionProducer;
@@ -27,8 +24,10 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -42,8 +41,7 @@ import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@Import({PermissionServiceImpl.class,
-        RoleMenuBatchInsertMapper.class, UserRoleBatchInsertMapper.class})
+@Import({PermissionServiceImpl.class})
 public class PermissionServiceTest extends BaseDbUnitTest {
 
     @Resource
@@ -52,11 +50,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
     @Resource
     private RoleMenuMapper roleMenuMapper;
     @Resource
-    private RoleMenuBatchInsertMapper roleMenuBatchInsertMapper;
-    @Resource
     private UserRoleMapper userRoleMapper;
-    @Resource
-    private UserRoleBatchInsertMapper userRoleBatchInsertMapper;
 
     @MockBean
     private RoleService roleService;
@@ -71,7 +65,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
     private PermissionProducer permissionProducer;
 
     @Test
-    public void testInitLocalCacheIfUpdateForRoleMenu() {
+    public void testInitLocalCacheForRoleMenu() {
         // mock 数据
         RoleMenuDO roleMenuDO01 = randomPojo(RoleMenuDO.class, o -> o.setRoleId(1L).setMenuId(10L));
         roleMenuMapper.insert(roleMenuDO01);
@@ -79,7 +73,7 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         roleMenuMapper.insert(roleMenuDO02);
 
         // 调用
-        permissionService.initLocalCacheIfUpdateForRoleMenu(null);
+        permissionService.initLocalCacheForRoleMenu();
         // 断言 roleMenuCache 缓存
         assertEquals(1, permissionService.getRoleMenuCache().keySet().size());
         assertEquals(asList(10L, 20L), permissionService.getRoleMenuCache().get(1L));
@@ -87,13 +81,10 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         assertEquals(2, permissionService.getMenuRoleCache().size());
         assertEquals(singletonList(1L), permissionService.getMenuRoleCache().get(10L));
         assertEquals(singletonList(1L), permissionService.getMenuRoleCache().get(20L));
-        // 断言 maxUpdateTime 缓存
-        LocalDateTime maxUpdateTime = permissionService.getRoleMenuMaxUpdateTime();
-        assertEquals(ObjectUtils.max(roleMenuDO01.getUpdateTime(), roleMenuDO02.getUpdateTime()), maxUpdateTime);
     }
 
     @Test
-    public void testInitLocalCacheIfUpdateForUserRole() {
+    public void testInitLocalCacheForUserRole() {
         // mock 数据
         UserRoleDO userRoleDO01 = randomPojo(UserRoleDO.class, o -> o.setUserId(1L).setRoleId(10L));
         userRoleMapper.insert(userRoleDO01);
@@ -101,13 +92,10 @@ public class PermissionServiceTest extends BaseDbUnitTest {
         userRoleMapper.insert(roleMenuDO02);
 
         // 调用
-        permissionService.initLocalCacheIfUpdateForUserRole(null);
+        permissionService.initLocalCacheForUserRole();
         // 断言 roleMenuCache 缓存
         assertEquals(1, permissionService.getUserRoleCache().size());
         assertEquals(asSet(10L, 20L), permissionService.getUserRoleCache().get(1L));
-        // 断言 maxUpdateTime 缓存
-        LocalDateTime maxUpdateTime = permissionService.getUserRoleMaxUpdateTime();
-        assertEquals(ObjectUtils.max(userRoleDO01.getUpdateTime(), roleMenuDO02.getUpdateTime()), maxUpdateTime);
     }
 
     @Test
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceTest.java
index 37d3ba44eb..a0d6c79a05 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceTest.java
@@ -23,7 +23,6 @@ import java.util.*;
 
 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.common.util.object.ObjectUtils.max;
 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.*;
@@ -59,8 +58,6 @@ public class RoleServiceTest extends BaseDbUnitTest {
         Map<Long, RoleDO> roleCache = roleService.getRoleCache();
         assertPojoEquals(roleDO1, roleCache.get(roleDO1.getId()));
         assertPojoEquals(roleDO2, roleCache.get(roleDO2.getId()));
-        // 断言 maxUpdateTime 缓存
-        assertEquals(max(roleDO1.getUpdateTime(), roleDO2.getUpdateTime()), roleService.getMaxUpdateTime());
     }
 
     @Test
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
index 447ea744ce..273e74b4af 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
@@ -60,8 +60,6 @@ public class SensitiveWordServiceImplTest extends BaseDbUnitTest {
 
         // 调用
         sensitiveWordService.initLocalCache();
-        // 断言 maxUpdateTime 缓存
-        assertEquals(max(wordDO1.getUpdateTime(), wordDO2.getUpdateTime()), sensitiveWordService.getMaxUpdateTime());
         // 断言 sensitiveWordTagsCache 缓存
         assertEquals(SetUtils.asSet("论坛", "蔬菜"), sensitiveWordService.getSensitiveWordTags());
         // 断言 tagSensitiveWordTries 缓存
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
index 5dea2808fc..4fe433d904 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
@@ -1,18 +1,17 @@
 package cn.iocoder.yudao.module.system.service.sms;
 
-import cn.hutool.core.bean.BeanUtil;
-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.SmsChannelUpdateReqVO;
-import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper;
-import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer;
-import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+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.SmsChannelUpdateReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO;
+import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper;
+import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
@@ -22,12 +21,11 @@ import java.time.LocalDateTime;
 import java.util.function.Consumer;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN;
-import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
@@ -58,9 +56,6 @@ public class SmsChannelServiceTest extends BaseDbUnitTest {
 
         // 调用
         smsChannelService.initLocalCache();
-        // 校验 maxUpdateTime 属性
-        LocalDateTime maxUpdateTime = (LocalDateTime) BeanUtil.getFieldValue(smsChannelService, "maxUpdateTime");
-        assertEquals(max(smsChannelDO01.getUpdateTime(), smsChannelDO02.getUpdateTime()), maxUpdateTime);
         // 校验调用
         verify(smsClientFactory, times(1)).createOrUpdateSmsClient(
                 argThat(properties -> isPojoEquals(smsChannelDO01, properties)));
diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java
index 81e03f29c6..a89d1b2e1f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceTest.java
@@ -61,7 +61,6 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
     private SmsProducer smsProducer;
 
     @Test
-    @SuppressWarnings("unchecked")
     void testInitLocalCache() {
         // mock 数据
         SmsTemplateDO smsTemplate01 = randomSmsTemplateDO();
@@ -72,13 +71,10 @@ public class SmsTemplateServiceTest extends BaseDbUnitTest {
         // 调用
         smsTemplateService.initLocalCache();
         // 断言 deptCache 缓存
-        Map<String, SmsTemplateDO> smsTemplateCache = (Map<String, SmsTemplateDO>) getFieldValue(smsTemplateService, "smsTemplateCache");
+        Map<String, SmsTemplateDO> smsTemplateCache = smsTemplateService.getSmsTemplateCache();
         assertEquals(2, smsTemplateCache.size());
         assertPojoEquals(smsTemplate01, smsTemplateCache.get(smsTemplate01.getCode()));
         assertPojoEquals(smsTemplate02, smsTemplateCache.get(smsTemplate02.getCode()));
-        // 断言 maxUpdateTime 缓存
-        LocalDateTime maxUpdateTime = (LocalDateTime) getFieldValue(smsTemplateService, "maxUpdateTime");
-        assertEquals(max(smsTemplate01.getUpdateTime(), smsTemplate02.getUpdateTime()), maxUpdateTime);
     }
 
     @Test

From 179fdc8464b2828650d94abf28322607a00c9576 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 11:17:52 +0800
Subject: [PATCH 46/65] =?UTF-8?q?=E4=BC=98=E5=8C=96=20xss=20=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=9E=E7=8E=B0=EF=BC=8C=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=20xss=20=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/config/YudaoWebAutoConfiguration.java | 48 +--------------
 .../{web => xss}/config/XssProperties.java    |  2 +-
 .../xss/config/YudaoXssAutoConfiguration.java | 60 +++++++++++++++++++
 .../core/clean/JsoupXssCleaner.java           | 20 +------
 .../{web => xss}/core/clean/XssCleaner.java   |  3 +-
 .../{web => xss}/core/filter/XssFilter.java   |  8 +--
 .../core/filter/XssRequestWrapper.java        |  5 +-
 .../core/json/XssStringJsonDeserializer.java  |  4 +-
 .../yudao/framework/xss/package-info.java     |  6 ++
 ...ot.autoconfigure.AutoConfiguration.imports |  3 +-
 10 files changed, 83 insertions(+), 76 deletions(-)
 rename yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/{web => xss}/config/XssProperties.java (92%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java
 rename yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/{web => xss}/core/clean/JsoupXssCleaner.java (84%)
 rename yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/{web => xss}/core/clean/XssCleaner.java (83%)
 rename yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/{web => xss}/core/filter/XssFilter.java (80%)
 rename yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/{web => xss}/core/filter/XssRequestWrapper.java (95%)
 rename yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/{web => xss}/core/json/XssStringJsonDeserializer.java (94%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/package-info.java

diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
index 95955d5eeb..b20565eca4 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
@@ -2,27 +2,18 @@ package cn.iocoder.yudao.framework.web.config;
 
 import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService;
 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
-import cn.iocoder.yudao.framework.web.core.clean.JsoupXssCleaner;
-import cn.iocoder.yudao.framework.web.core.clean.XssCleaner;
 import cn.iocoder.yudao.framework.web.core.filter.CacheRequestBodyFilter;
 import cn.iocoder.yudao.framework.web.core.filter.DemoFilter;
-import cn.iocoder.yudao.framework.web.core.filter.XssFilter;
 import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
 import cn.iocoder.yudao.framework.web.core.handler.GlobalResponseBodyHandler;
-import cn.iocoder.yudao.framework.web.core.json.XssStringJsonDeserializer;
 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -34,7 +25,7 @@ import javax.annotation.Resource;
 import javax.servlet.Filter;
 
 @AutoConfiguration
-@EnableConfigurationProperties({WebProperties.class, XssProperties.class})
+@EnableConfigurationProperties(WebProperties.class)
 public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
 
     @Resource
@@ -107,15 +98,6 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
         return createFilterBean(new CacheRequestBodyFilter(), WebFilterOrderEnum.REQUEST_BODY_CACHE_FILTER);
     }
 
-    /**
-     * 创建 XssFilter Bean，解决 Xss 安全问题
-     */
-    @Bean
-    @ConditionalOnBean(XssCleaner.class)
-    public FilterRegistrationBean<XssFilter> xssFilter(XssProperties properties, PathMatcher pathMatcher, XssCleaner xssCleaner) {
-        return createFilterBean(new XssFilter(properties, pathMatcher, xssCleaner), WebFilterOrderEnum.XSS_FILTER);
-    }
-
     /**
      * 创建 DemoFilter Bean，演示模式
      */
@@ -125,33 +107,7 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
         return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER);
     }
 
-
-    /**
-     * Xss 清理者
-     *
-     * @return XssCleaner
-     */
-    @Bean
-    @ConditionalOnMissingBean(XssCleaner.class)
-    public XssCleaner xssCleaner() {
-        return new JsoupXssCleaner();
-    }
-
-    /**
-     * 注册 Jackson 的序列化器，用于处理 json 类型参数的 xss 过滤
-     *
-     * @return Jackson2ObjectMapperBuilderCustomizer
-     */
-    @Bean
-    @ConditionalOnMissingBean(name = "xssJacksonCustomizer")
-    @ConditionalOnBean(ObjectMapper.class)
-    @ConditionalOnProperty(value = "yudao.xss.enable", havingValue = "true")
-    public Jackson2ObjectMapperBuilderCustomizer xssJacksonCustomizer(XssCleaner xssCleaner) {
-        // 在反序列化时进行 xss 过滤，可以替换使用 XssStringJsonSerializer，在序列化时进行处理
-        return builder -> builder.deserializerByType(String.class, new XssStringJsonDeserializer(xssCleaner));
-    }
-
-    private static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) {
+    public static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) {
         FilterRegistrationBean<T> bean = new FilterRegistrationBean<>(filter);
         bean.setOrder(order);
         return bean;
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/XssProperties.java
similarity index 92%
rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java
rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/XssProperties.java
index e4d123089e..c914b0465b 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/XssProperties.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.web.config;
+package cn.iocoder.yudao.framework.xss.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java
new file mode 100644
index 0000000000..d5d892c077
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/config/YudaoXssAutoConfiguration.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.framework.xss.config;
+
+import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
+import cn.iocoder.yudao.framework.xss.core.clean.JsoupXssCleaner;
+import cn.iocoder.yudao.framework.xss.core.clean.XssCleaner;
+import cn.iocoder.yudao.framework.xss.core.filter.XssFilter;
+import cn.iocoder.yudao.framework.xss.core.json.XssStringJsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.util.PathMatcher;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import static cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration.createFilterBean;
+
+@AutoConfiguration
+@EnableConfigurationProperties(XssProperties.class)
+public class YudaoXssAutoConfiguration implements WebMvcConfigurer {
+
+    /**
+     * Xss 清理者
+     *
+     * @return XssCleaner
+     */
+    @Bean
+    @ConditionalOnMissingBean(XssCleaner.class)
+    public XssCleaner xssCleaner() {
+        return new JsoupXssCleaner();
+    }
+
+    /**
+     * 注册 Jackson 的序列化器，用于处理 json 类型参数的 xss 过滤
+     *
+     * @return Jackson2ObjectMapperBuilderCustomizer
+     */
+    @Bean
+    @ConditionalOnMissingBean(name = "xssJacksonCustomizer")
+    @ConditionalOnBean(ObjectMapper.class)
+    @ConditionalOnProperty(value = "yudao.xss.enable", havingValue = "true")
+    public Jackson2ObjectMapperBuilderCustomizer xssJacksonCustomizer(XssCleaner xssCleaner) {
+        // 在反序列化时进行 xss 过滤，可以替换使用 XssStringJsonSerializer，在序列化时进行处理
+        return builder -> builder.deserializerByType(String.class, new XssStringJsonDeserializer(xssCleaner));
+    }
+
+    /**
+     * 创建 XssFilter Bean，解决 Xss 安全问题
+     */
+    @Bean
+    @ConditionalOnBean(XssCleaner.class)
+    public FilterRegistrationBean<XssFilter> xssFilter(XssProperties properties, PathMatcher pathMatcher, XssCleaner xssCleaner) {
+        return createFilterBean(new XssFilter(properties, pathMatcher, xssCleaner), WebFilterOrderEnum.XSS_FILTER);
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/JsoupXssCleaner.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/clean/JsoupXssCleaner.java
similarity index 84%
rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/JsoupXssCleaner.java
rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/clean/JsoupXssCleaner.java
index 559267c3f1..4cbc907b9c 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/JsoupXssCleaner.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/clean/JsoupXssCleaner.java
@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.framework.web.core.clean;
+package cn.iocoder.yudao.framework.xss.core.clean;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.safety.Safelist;
 
 /**
- * jsonp 过滤字符串
+ * 基于 JSONP 实现 XSS 过滤字符串
  */
 public class JsoupXssCleaner implements XssCleaner {
 
@@ -24,21 +24,6 @@ public class JsoupXssCleaner implements XssCleaner {
         this.baseUri = "";
     }
 
-    public JsoupXssCleaner(Safelist safelist) {
-        this.safelist = safelist;
-        this.baseUri = "";
-    }
-
-    public JsoupXssCleaner(String baseUri) {
-        this.safelist = buildSafelist();
-        this.baseUri = baseUri;
-    }
-
-    public JsoupXssCleaner(Safelist safelist, String baseUri) {
-        this.safelist = safelist;
-        this.baseUri = baseUri;
-    }
-
     /**
      * 构建一个 Xss 清理的 Safelist 规则。
      * 基于 Safelist#relaxed() 的基础上:
@@ -67,7 +52,6 @@ public class JsoupXssCleaner implements XssCleaner {
         // 虽然可以重写 WhiteList#isSafeAttribute 来处理，但是有隐患，所以暂时不支持相对路径
         // WHITELIST.removeProtocols("a", "href", "ftp", "http", "https", "mailto");
         // WHITELIST.removeProtocols("img", "src", "http", "https");
-
         return relaxedSafelist;
     }
 
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/XssCleaner.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/clean/XssCleaner.java
similarity index 83%
rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/XssCleaner.java
rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/clean/XssCleaner.java
index 433f7e7758..529bc64a28 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/XssCleaner.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/clean/XssCleaner.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.framework.web.core.clean;
+package cn.iocoder.yudao.framework.xss.core.clean;
 
 /**
  * 对 html 文本中的有 Xss 风险的数据进行清理
@@ -12,4 +12,5 @@ public interface XssCleaner {
      * @return 清理后的 html
      */
     String clean(String html);
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/filter/XssFilter.java
similarity index 80%
rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java
rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/filter/XssFilter.java
index 2da18768d1..5f2ce6e3d3 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/filter/XssFilter.java
@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.framework.web.core.filter;
+package cn.iocoder.yudao.framework.xss.core.filter;
 
-import cn.iocoder.yudao.framework.web.config.XssProperties;
-import cn.iocoder.yudao.framework.web.core.clean.XssCleaner;
+import cn.iocoder.yudao.framework.xss.config.XssProperties;
+import cn.iocoder.yudao.framework.xss.core.clean.XssCleaner;
 import lombok.AllArgsConstructor;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.filter.OncePerRequestFilter;
@@ -14,8 +14,6 @@ import java.io.IOException;
 
 /**
  * Xss 过滤器
- * <p>
- * 对 Xss 不了解的胖友，可以看看 http://www.iocoder.cn/Fight/The-new-girl-asked-me-why-AJAX-requests-are-not-secure-I-did-not-answer/
  *
  * @author 芋道源码
  */
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/filter/XssRequestWrapper.java
similarity index 95%
rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java
rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/filter/XssRequestWrapper.java
index 7beed46cc9..35819f4435 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/filter/XssRequestWrapper.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.framework.web.core.filter;
+package cn.iocoder.yudao.framework.xss.core.filter;
 
-import cn.iocoder.yudao.framework.web.core.clean.XssCleaner;
+import cn.iocoder.yudao.framework.xss.core.clean.XssCleaner;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
@@ -13,6 +13,7 @@ import java.util.Map;
  * @author 芋道源码
  */
 public class XssRequestWrapper extends HttpServletRequestWrapper {
+
     private final XssCleaner xssCleaner;
 
     public XssRequestWrapper(HttpServletRequest request, XssCleaner xssCleaner) {
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/json/XssStringJsonDeserializer.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/json/XssStringJsonDeserializer.java
similarity index 94%
rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/json/XssStringJsonDeserializer.java
rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/json/XssStringJsonDeserializer.java
index 7e1f631c78..2b1725d96e 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/json/XssStringJsonDeserializer.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/core/json/XssStringJsonDeserializer.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.framework.web.core.json;
+package cn.iocoder.yudao.framework.xss.core.json;
 
-import cn.iocoder.yudao.framework.web.core.clean.XssCleaner;
+import cn.iocoder.yudao.framework.xss.core.clean.XssCleaner;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/package-info.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/package-info.java
new file mode 100644
index 0000000000..c6e46f070d
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/xss/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * 针对 XSS 的基础封装
+ *
+ * XSS 说明：https://tech.meituan.com/2018/09/27/fe-security.html
+ */
+package cn.iocoder.yudao.framework.xss;
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 2a422bfa2b..818e33aa31 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,5 @@
 cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration
 cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration
 cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration
-cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration
\ No newline at end of file
+cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration
+cn.iocoder.yudao.framework.xss.config.YudaoXssAutoConfiguration

From 9b47dd4a678e0afa46c8b7dd630dfa78483c1784 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 12:25:34 +0800
Subject: [PATCH 47/65] =?UTF-8?q?b4bdd4f=EF=BC=9A=E5=BC=80=E5=90=AFTopNav?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AD=90=E8=8F=9C=E5=8D=95=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/components/TopNav/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/yudao-ui-admin/src/components/TopNav/index.vue b/yudao-ui-admin/src/components/TopNav/index.vue
index 98c4afe842..02ca003d29 100644
--- a/yudao-ui-admin/src/components/TopNav/index.vue
+++ b/yudao-ui-admin/src/components/TopNav/index.vue
@@ -133,7 +133,9 @@ export default {
       } else {
         // 显示左侧联动菜单
         this.activeRoutes(key);
-        this.$store.dispatch('app/toggleSideBarHide', false);
+        if (!this.$route.meta.link) {
+          this.$store.dispatch('app/toggleSideBarHide', false);
+        }
       }
     },
     // 当前激活的路由
@@ -149,7 +151,7 @@ export default {
       if(routes.length > 0) {
         this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
       } else {
-        this.$store.dispatch("app/toggleSideBarHide", true);
+        this.$store.dispatch('app/toggleSideBarHide', true);
       }
     },
     ishttp(url) {

From e9814b129bf46c79e727a10c1bd6b45449a2824a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Jan 2023 12:32:54 +0800
Subject: [PATCH 48/65] =?UTF-8?q?492919d=EF=BC=9A=E5=8D=87=E7=BA=A7element?=
 =?UTF-8?q?-ui=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.15.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/package.json                    | 2 +-
 yudao-ui-admin/src/views/system/user/index.vue | 6 +++---
 yudao-ui-admin/yarn.lock                       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yudao-ui-admin/package.json b/yudao-ui-admin/package.json
index c16997fc02..738ac509fb 100644
--- a/yudao-ui-admin/package.json
+++ b/yudao-ui-admin/package.json
@@ -49,7 +49,7 @@
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "echarts": "5.4.0",
-    "element-ui": "2.15.10",
+    "element-ui": "2.15.12",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "highlight.js": "9.18.5",
diff --git a/yudao-ui-admin/src/views/system/user/index.vue b/yudao-ui-admin/src/views/system/user/index.vue
index 064f0bcf1b..5c3bb16551 100644
--- a/yudao-ui-admin/src/views/system/user/index.vue
+++ b/yudao-ui-admin/src/views/system/user/index.vue
@@ -364,9 +364,9 @@ export default {
   created() {
     this.getList();
     this.getTreeselect();
-    this.getConfigKey("sys.user.init-password").then(response => {
-      this.initPassword = response.msg;
-    });
+    // this.getConfigKey("sys.user.init-password").then(response => {
+    //   this.initPassword = response.msg;
+    // });
   },
   methods: {
     // 更多操作
diff --git a/yudao-ui-admin/yarn.lock b/yudao-ui-admin/yarn.lock
index 73a3fce0f6..0293cba48a 100644
--- a/yudao-ui-admin/yarn.lock
+++ b/yudao-ui-admin/yarn.lock
@@ -3999,10 +3999,10 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-element-ui@2.15.10:
-  version "2.15.10"
-  resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz"
-  integrity sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw==
+element-ui@2.15.12:
+  version "2.15.12"
+  resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.12.tgz#fdde927a54078b17a85541ff7c0f0dad32488b8e"
+  integrity sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==
   dependencies:
     async-validator "~1.8.1"
     babel-helper-vue-jsx-merge-props "^2.0.0"

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 49/65] =?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 50/65] =?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 51/65] =?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 52/65] =?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 53/65] =?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 54/65] =?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 55/65] =?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 56/65] =?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 57/65] =?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 58/65] =?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 59/65] =?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 60/65] =?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 61/65] =?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 62/65] =?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 63/65] =?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 64/65] =?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 65/65] =?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;
 
 }