From 9dd3fca1c8cd49dac0c67619b3044e83ae253551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 1 Dec 2021 10:14:25 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=A1=A5=E5=85=A8=20lombok=20?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/api/domain/SysDept.java | 1 + .../ruoyi/system/api/domain/SysDictData.java | 1 + .../ruoyi/system/api/domain/SysDictType.java | 1 + .../system/api/domain/SysLogininfor.java | 1 + .../ruoyi/system/api/domain/SysOperLog.java | 1 + .../com/ruoyi/system/api/domain/SysRole.java | 1 + .../com/ruoyi/system/api/domain/SysUser.java | 1 + .../ruoyi/common/core/enums/UserStatus.java | 20 ++---- .../core/exception/GlobalException.java | 3 +- .../core/exception/ServiceException.java | 2 - .../core/exception/base/BaseException.java | 32 ++------- .../core/web/controller/BaseController.java | 4 +- .../common/core/web/domain/BaseEntity.java | 66 +------------------ .../common/core/web/domain/TreeEntity.java | 53 ++------------- .../common/core/web/page/PageDomain.java | 41 +----------- .../common/core/web/page/TableDataInfo.java | 51 ++------------ .../ruoyi/common/log/aspect/LogAspect.java | 6 +- .../config/properties/CaptchaProperties.java | 21 +----- .../config/properties/XssProperties.java | 22 +------ .../handler/GatewayExceptionHandler.java | 3 +- .../java/com/ruoyi/gen/domain/GenTable.java | 1 + .../com/ruoyi/gen/domain/GenTableColumn.java | 1 + .../java/com/ruoyi/job/domain/SysJob.java | 1 + .../java/com/ruoyi/job/domain/SysJobLog.java | 1 + .../com/ruoyi/system/domain/SysConfig.java | 1 + .../java/com/ruoyi/system/domain/SysMenu.java | 1 + .../com/ruoyi/system/domain/SysNotice.java | 1 + .../java/com/ruoyi/system/domain/SysPost.java | 1 + 28 files changed, 53 insertions(+), 286 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java index 7376d1a9..2bd9954f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java @@ -18,6 +18,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysDept extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java index a42b26da..624e0b1d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java @@ -18,6 +18,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysDictData extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java index f423e2e0..f542f2c0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java @@ -17,6 +17,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysDictType extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java index b97147a6..98806b69 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java @@ -15,6 +15,7 @@ import lombok.experimental.Accessors; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysLogininfor extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java index 65f342fb..0759c633 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java @@ -15,6 +15,7 @@ import lombok.experimental.Accessors; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysOperLog extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java index d3ed67f3..df4b153c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java @@ -17,6 +17,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysRole extends BaseEntity { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index dae52f5a..85bb7d61 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -23,6 +23,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysUser extends BaseEntity { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java index 9ff84960..a6dbbf2a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java @@ -1,10 +1,15 @@ package com.ruoyi.common.core.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 用户状态 * * @author ruoyi */ +@Getter +@AllArgsConstructor public enum UserStatus { OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); @@ -12,19 +17,4 @@ public enum UserStatus private final String code; private final String info; - UserStatus(String code, String info) - { - this.code = code; - this.info = info; - } - - public String getCode() - { - return code; - } - - public String getInfo() - { - return info; - } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java index 9beb54bd..82a2abe1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java @@ -17,8 +17,6 @@ public class GlobalException extends RuntimeException /** * 错误明细，内部调试错误 - * - * 和 {@link CommonResult#getDetailMessage()} 一致的设计 */ private String detailMessage; @@ -45,6 +43,7 @@ public class GlobalException extends RuntimeException return this; } + @Override public String getMessage() { return message; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java index d2b7763b..8276f536 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java @@ -21,8 +21,6 @@ public final class ServiceException extends RuntimeException /** * 错误明细，内部调试错误 - * - * 和 {@link CommonResult#getDetailMessage()} 一致的设计 */ private String detailMessage; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java index 3d2fa105..4e9c0bd1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java @@ -1,10 +1,15 @@ package com.ruoyi.common.core.exception.base; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 基础异常 * * @author ruoyi */ +@Getter +@AllArgsConstructor public class BaseException extends RuntimeException { private static final long serialVersionUID = 1L; @@ -29,14 +34,6 @@ public class BaseException extends RuntimeException */ private String defaultMessage; - public BaseException(String module, String code, Object[] args, String defaultMessage) - { - this.module = module; - this.code = code; - this.args = args; - this.defaultMessage = defaultMessage; - } - public BaseException(String module, String code, Object[] args) { this(module, code, args, null); @@ -57,23 +54,4 @@ public class BaseException extends RuntimeException this(null, null, null, defaultMessage); } - public String getModule() - { - return module; - } - - public String getCode() - { - return code; - } - - public Object[] getArgs() - { - return args; - } - - public String getDefaultMessage() - { - return defaultMessage; - } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java index 64169511..d35f760e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -3,6 +3,8 @@ package com.ruoyi.common.core.web.controller; import java.beans.PropertyEditorSupport; import java.util.Date; import java.util.List; + +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -23,9 +25,9 @@ import com.ruoyi.common.core.web.page.TableSupport; * * @author ruoyi */ +@Slf4j public class BaseController { - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); /** * 将前台传递过来的日期格式的字符串，自动转化为Date类型 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index b316f893..b87d6f22 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java @@ -5,12 +5,14 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; /** * Entity基类 * * @author ruoyi */ +@Data public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -38,66 +40,6 @@ public class BaseEntity implements Serializable /** 请求参数 */ private Map params; - public String getSearchValue() - { - return searchValue; - } - - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - public Map getParams() { if (params == null) @@ -107,8 +49,4 @@ public class BaseEntity implements Serializable return params; } - public void setParams(Map params) - { - this.params = params; - } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java index 909d1e62..c78b2654 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.web.domain; +import lombok.*; + import java.util.ArrayList; import java.util.List; @@ -8,6 +10,8 @@ import java.util.List; * * @author ruoyi */ +@Data +@EqualsAndHashCode(callSuper = true) public class TreeEntity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -27,53 +31,4 @@ public class TreeEntity extends BaseEntity /** 子部门 */ private List children = new ArrayList<>(); - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public Integer getOrderNum() - { - return orderNum; - } - - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java index 413aabf2..813f774b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java @@ -1,12 +1,14 @@ package com.ruoyi.common.core.web.page; import com.ruoyi.common.core.utils.StringUtils; +import lombok.Data; /** * 分页数据 * * @author ruoyi */ +@Data public class PageDomain { /** 当前记录起始索引 */ @@ -33,41 +35,6 @@ public class PageDomain return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; } - public Integer getPageNum() - { - return pageNum; - } - - public void setPageNum(Integer pageNum) - { - this.pageNum = pageNum; - } - - public Integer getPageSize() - { - return pageSize; - } - - public void setPageSize(Integer pageSize) - { - this.pageSize = pageSize; - } - - public String getOrderByColumn() - { - return orderByColumn; - } - - public void setOrderByColumn(String orderByColumn) - { - this.orderByColumn = orderByColumn; - } - - public String getIsAsc() - { - return isAsc; - } - public void setIsAsc(String isAsc) { if (StringUtils.isNotEmpty(isAsc)) @@ -94,8 +61,4 @@ public class PageDomain return reasonable; } - public void setReasonable(Boolean reasonable) - { - this.reasonable = reasonable; - } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java index 41dc0fe7..e115970f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java @@ -1,5 +1,8 @@ package com.ruoyi.common.core.web.page; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.io.Serializable; import java.util.List; @@ -8,6 +11,8 @@ import java.util.List; * * @author ruoyi */ +@Data +@NoArgsConstructor public class TableDataInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -24,13 +29,6 @@ public class TableDataInfo implements Serializable /** 消息内容 */ private String msg; - /** - * 表格数据对象 - */ - public TableDataInfo() - { - } - /** * 分页 * @@ -43,43 +41,4 @@ public class TableDataInfo implements Serializable this.total = total; } - public long getTotal() - { - return total; - } - - public void setTotal(long total) - { - this.total = total; - } - - public List getRows() - { - return rows; - } - - public void setRows(List rows) - { - this.rows = rows; - } - - public int getCode() - { - return code; - } - - public void setCode(int code) - { - this.code = code; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index c7237f15..73b34e69 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -4,6 +4,8 @@ import java.util.Collection; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; @@ -30,12 +32,12 @@ import com.ruoyi.system.api.domain.SysOperLog; * * @author ruoyi */ +@Slf4j @Aspect @Component public class LogAspect { - private static final Logger log = LoggerFactory.getLogger(LogAspect.class); - + @Autowired private AsyncLogService asyncLogService; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java index dea2e168..300cad5d 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java @@ -1,5 +1,6 @@ package com.ruoyi.gateway.config.properties; +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; @@ -9,6 +10,7 @@ import org.springframework.context.annotation.Configuration; * * @author ruoyi */ +@Data @Configuration @RefreshScope @ConfigurationProperties(prefix = "security.captcha") @@ -24,23 +26,4 @@ public class CaptchaProperties */ private String type; - public Boolean getEnabled() - { - return enabled; - } - - public void setEnabled(Boolean enabled) - { - this.enabled = enabled; - } - - public String getType() - { - return type; - } - - public void setType(String type) - { - this.type = type; - } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java index 834188ba..188d2502 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java @@ -2,6 +2,8 @@ package com.ruoyi.gateway.config.properties; import java.util.ArrayList; import java.util.List; + +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; @@ -11,6 +13,7 @@ import org.springframework.context.annotation.Configuration; * * @author ruoyi */ +@Data @Configuration @RefreshScope @ConfigurationProperties(prefix = "security.xss") @@ -26,23 +29,4 @@ public class XssProperties */ private List excludeUrls = new ArrayList<>(); - public Boolean getEnabled() - { - return enabled; - } - - public void setEnabled(Boolean enabled) - { - this.enabled = enabled; - } - - public List getExcludeUrls() - { - return excludeUrls; - } - - public void setExcludeUrls(List excludeUrls) - { - this.excludeUrls = excludeUrls; - } } diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java index 593e7e62..b0496dc2 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java @@ -1,5 +1,6 @@ package com.ruoyi.gateway.handler; +import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.gateway.support.NotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,11 +18,11 @@ import reactor.core.publisher.Mono; * * @author ruoyi */ +@Slf4j @Order(-1) @Configuration public class GatewayExceptionHandler implements ErrorWebExceptionHandler { - private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class); @Override public Mono handle(ServerWebExchange exchange, Throwable ex) diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java index 2733c554..3bed431b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java @@ -17,6 +17,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class GenTable extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java index 301b82d3..ae3953df 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java @@ -13,6 +13,7 @@ import lombok.experimental.Accessors; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class GenTableColumn extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java index 87c7f500..8ba1477e 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java @@ -22,6 +22,7 @@ import com.ruoyi.job.util.CronUtils; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysJob extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java index fc4425a0..2af75775 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java @@ -15,6 +15,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysJobLog extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 8575a8a5..685788ae 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -17,6 +17,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysConfig extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index fcd32b7f..db68323c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -17,6 +17,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysMenu extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 994f1bb5..1047c643 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -16,6 +16,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysNotice extends BaseEntity { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 84e3966e..4ef8bfb2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -17,6 +17,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi */ @Data +@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Accessors(chain = true) public class SysPost extends BaseEntity {