🎨 同步master分支的代码

#4623

jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java

@@ -1,74 +1,80 @@
 package org.jeecg.common.api.dto;
+
 import lombok.Data;
 import org.jeecg.common.system.vo.LoginUser;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 日志对象
- * cloud api 用到的接口传输对象
+ * 日志对象 cloud api 用到的接口传输对象
+ *
  * @author: jeecg-boot
  */
 @Data
 public class LogDTO implements Serializable {
 
- private static final long serialVersionUID = 8482720462943906924L;
+ private static final long serialVersionUID = 8482720462943906924L;
+
+ /** 内容 */
+ private String logContent;
+
+ /** 日志类型(0:操作日志;1:登录日志;2:定时任务) */
+ private Integer logType;
+
+ /** 操作类型(1:添加;2:修改;3:删除;) */
+ private Integer operateType;
+
+ /** 登录用户 */
+ private LoginUser loginUser;
+
+ private String id;
 
- /**内容*/
- private String logContent;
+ private String createBy;
 
- /**日志类型(0:操作日志;1:登录日志;2:定时任务) */
- private Integer logType;
+ private Date createTime;
 
- /**操作类型(1:添加;2:修改;3:删除;) */
- private Integer operateType;
+ private Long costTime;
 
- /**登录用户 */
- private LoginUser loginUser;
+ private String ip;
 
- private String id;
- private String createBy;
- private Date createTime;
- private Long costTime;
- private String ip;
+ /** 请求参数 */
+ private String requestParam;
 
- /**请求参数 */
- private String requestParam;
+ /** 请求类型 */
+ private String requestType;
 
- /**请求类型*/
- private String requestType;
+ /** 请求路径 */
+ private String requestUrl;
 
- /**请求路径*/
- private String requestUrl;
+ /** 请求方法 */
+ private String method;
 
- /**请求方法 */
- private String method;
+ /** 操作人用户名称 */
+ private String username;
 
- /**操作人用户名称*/
- private String username;
+ /** 操作人用户账户 */
+ private String userid;
 
- /**操作人用户账户*/
- private String userid;
+ /**
+ * 租户ID
+ */
+ private Integer tenantId;
 
- /**
- * 租户ID
- */
- private Integer tenantId;
+ public LogDTO() {
 
- public LogDTO(){
+ }
 
- }
+ public LogDTO(String logContent, Integer logType, Integer operatetype) {
+ this.logContent = logContent;
+ this.logType = logType;
+ this.operateType = operatetype;
+ }
 
- public LogDTO(String logContent, Integer logType, Integer operatetype){
- this.logContent = logContent;
- this.logType = logType;
- this.operateType = operatetype;
- }
+ public LogDTO(String logContent, Integer logType, Integer operatetype, LoginUser loginUser) {
+ this.logContent = logContent;
+ this.logType = logType;
+ this.operateType = operatetype;
+ this.loginUser = loginUser;
+ }
 
- public LogDTO(String logContent, Integer logType, Integer operatetype, LoginUser loginUser){
- this.logContent = logContent;
- this.logType = logType;
- this.operateType = operatetype;
- this.loginUser = loginUser;
- }
 }

jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java

@@ -8,107 +8,110 @@
 
 /**
  * 普通消息
+ *
  * @author: jeecg-boot
  */
 @Data
 public class MessageDTO implements Serializable {
- private static final long serialVersionUID = -5690444483968058442L;
-
- /**
- * 发送人(用户登录账户)
- */
- protected String fromUser;
-
- /**
- * 发送给(用户登录账户)
- */
- protected String toUser;
-
- /**
- * 发送给所有人
- */
- protected Boolean toAll;
-
- /**
- * 消息主题
- */
- protected String title;
-
- /**
- * 消息内容
- */
- protected String content;
-
- /**
- * 消息类型 1:消息 2:系统消息
- */
- protected String category;
-
- //-----------------------------------------------------------------------
- //update-begin---author:taoyan ---date:20220705 for：支持自定义推送类型，邮件、钉钉、企业微信、系统消息-----------
-
- /**
- * 模板消息对应的模板编码
- */
- protected String templateCode;
- /**
- * 消息类型：org.jeecg.common.constant.enums.MessageTypeEnum
- * XT("system", "系统消息")
- * YJ("email", "邮件消息")
- * DD("dingtalk", "钉钉消息")
- * QYWX("wechat_enterprise", "企业微信")
- */
- protected String type;
-
- /**
- * 是否发送Markdown格式的消息
- */
- protected boolean isMarkdown;
-
- /**
- * 解析模板内容 对应的数据
- */
- protected Map<String, Object> data;
- //update-end---author:taoyan ---date::20220705 for：支持自定义推送类型，邮件、钉钉、企业微信、系统消息-----------
- //-----------------------------------------------------------------------
-
-
- /**
- * 抄送人
- */
- private String copyToUser;
-
- public MessageDTO(){
- }
-
- /**
- * 构造器1 系统消息
- */
- public MessageDTO(String fromUser,String toUser,String title, String content){
- this.fromUser = fromUser;
- this.toUser = toUser;
- this.title = title;
- this.content = content;
- //默认 都是2系统消息
- this.category = CommonConstant.MSG_CATEGORY_2;
- }
-
- /**
- * 构造器2 支持设置category 1:消息 2:系统消息
- */
- public MessageDTO(String fromUser,String toUser,String title, String content, String category){
- this.fromUser = fromUser;
- this.toUser = toUser;
- this.title = title;
- this.content = content;
- this.category = category;
- }
-
- public boolean isMarkdown() {
- return this.isMarkdown;
- }
-
- public void setIsMarkdown(boolean isMarkdown) {
- this.isMarkdown = isMarkdown;
- }
+
+ private static final long serialVersionUID = -5690444483968058442L;
+
+ /**
+ * 发送人(用户登录账户)
+ */
+ protected String fromUser;
+
+ /**
+ * 发送给(用户登录账户)
+ */
+ protected String toUser;
+
+ /**
+ * 发送给所有人
+ */
+ protected Boolean toAll;
+
+ /**
+ * 消息主题
+ */
+ protected String title;
+
+ /**
+ * 消息内容
+ */
+ protected String content;
+
+ /**
+ * 消息类型 1:消息 2:系统消息
+ */
+ protected String category;
+
+ // -----------------------------------------------------------------------
+ // update-begin---author:taoyan ---date:20220705
+ // for：支持自定义推送类型，邮件、钉钉、企业微信、系统消息-----------
+
+ /**
+ * 模板消息对应的模板编码
+ */
+ protected String templateCode;
+
+ /**
+ * 消息类型：org.jeecg.common.constant.enums.MessageTypeEnum XT("system", "系统消息")
+ * YJ("email", "邮件消息") DD("dingtalk", "钉钉消息") QYWX("wechat_enterprise", "企业微信")
+ */
+ protected String type;
+
+ /**
+ * 是否发送Markdown格式的消息
+ */
+ protected boolean isMarkdown;
+
+ /**
+ * 解析模板内容 对应的数据
+ */
+ protected Map<String, Object> data;
+
+ // update-end---author:taoyan ---date::20220705
+ // for：支持自定义推送类型，邮件、钉钉、企业微信、系统消息-----------
+ // -----------------------------------------------------------------------
+
+ /**
+ * 抄送人
+ */
+ private String copyToUser;
+
+ public MessageDTO() {
+ }
+
+ /**
+ * 构造器1 系统消息
+ */
+ public MessageDTO(String fromUser, String toUser, String title, String content) {
+ this.fromUser = fromUser;
+ this.toUser = toUser;
+ this.title = title;
+ this.content = content;
+ // 默认 都是2系统消息
+ this.category = CommonConstant.MSG_CATEGORY_2;
+ }
+
+ /**
+ * 构造器2 支持设置category 1:消息 2:系统消息
+ */
+ public MessageDTO(String fromUser, String toUser, String title, String content, String category) {
+ this.fromUser = fromUser;
+ this.toUser = toUser;
+ this.title = title;
+ this.content = content;
+ this.category = category;
+ }
+
+ public boolean isMarkdown() {
+ return this.isMarkdown;
+ }
+
+ public void setIsMarkdown(boolean isMarkdown) {
+ this.isMarkdown = isMarkdown;
+ }
+
 }