From dd44159aadabdb13544f0b1f65b95e8721605c8a Mon Sep 17 00:00:00 2001 From: yangzheng Date: Thu, 5 Jan 2023 15:46:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?page=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E8=A7=A3@EqualsAndHashCode(callSuper=20=3D?= =?UTF-8?q?=20true)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-develop.yml | 17 ++++++++++++----- .../guzi/sherly/model/dto/ErrorCodePageDTO.java | 2 ++ .../guzi/sherly/model/dto/LoginLogPageDTO.java | 2 ++ .../guzi/sherly/model/dto/NoticePageDTO.java | 2 ++ .../sherly/model/dto/OperationLogPageDTO.java | 2 ++ .../guzi/sherly/model/dto/OssConfigPageDTO.java | 2 ++ .../guzi/sherly/model/dto/OssFilePageDTO.java | 2 ++ .../com/guzi/sherly/model/dto/RolePageDTO.java | 2 ++ .../model/dto/ScheduleTaskLogPageDTO.java | 2 ++ .../sherly/model/dto/ScheduleTaskPageDTO.java | 2 ++ .../sherly/model/dto/TenantPackagePageDTO.java | 2 ++ .../guzi/sherly/model/dto/TenantPageDTO.java | 2 ++ .../com/guzi/sherly/model/dto/UserPageDTO.java | 2 ++ 13 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sherly-admin/src/main/resources/application-develop.yml b/sherly-admin/src/main/resources/application-develop.yml index 6e840c1..b98c3ed 100644 --- a/sherly-admin/src/main/resources/application-develop.yml +++ b/sherly-admin/src/main/resources/application-develop.yml @@ -12,9 +12,9 @@ spring: # redis配置 redis: - host: 123.249.17.195 + host: 101.34.169.185 port: 6379 - password: mpw:svub+7BH4vk4cw+gu1+Htg== + password: mpw:tNvIJM/7zuhDi3RoOr2KAA== database: 0 lettuce: pool: @@ -27,9 +27,12 @@ spring: # mysql配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://123.249.17.195:3306/sherly?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true - username: mpw:tNvIJM/7zuhDi3RoOr2KAA== - password: mpw:svub+7BH4vk4cw+gu1+Htg== +# url: jdbc:mysql://123.249.17.195:3306/sherly?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true + url: jdbc:mysql://localhost:3306/sys?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true + # username: mpw:tNvIJM/7zuhDi3RoOr2KAA== + username: root +# password: mpw:svub+7BH4vk4cw+gu1+Htg== + password: 1234 hikari: connection-timeout: 60000 validation-timeout: 3000 @@ -49,3 +52,7 @@ logging: -com.guzi.sherly.modules.log.mapper: debug # knife4j日志 -springfox: warn + # flowable日志 + # -org.flowable.task.service.impl.persistence.entity.*: debug + # -org.flowable.engine.impl.persistence.entity.*: debug + -org.flowable.*: debug diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java index b41d8c1..89baaaf 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 李仁杰 * @date 2022/9/1 */ @Data +@EqualsAndHashCode(callSuper = true) public class ErrorCodePageDTO extends PageQuery { /** 错误代码 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java index c991ee6..be90705 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2022/7/15 */ @Data +@EqualsAndHashCode(callSuper = true) public class LoginLogPageDTO extends PageQuery { /** 登录账号 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java index ac14537..4e0488a 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java @@ -2,12 +2,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class NoticePageDTO extends PageQuery { /** 消息类型[enum] */ private Integer noticeType; diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java index 3798bbd..0c5d86b 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.List; * @date 2022/7/15 */ @Data +@EqualsAndHashCode(callSuper = true) public class OperationLogPageDTO extends PageQuery { /** 日志类型[enum] */ @ApiModelProperty(value = "日志类型[enum]") diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java index 9335971..dfcb5a6 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java @@ -2,11 +2,13 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/6/24 */ @Data +@EqualsAndHashCode(callSuper = true) public class OssConfigPageDTO extends PageQuery { } diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java index 98fcd51..b748204 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2022/6/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class OssFilePageDTO extends PageQuery { /** 配置编号 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java index fef2aff..5703b70 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/4/7 */ @Data +@EqualsAndHashCode(callSuper = true) public class RolePageDTO extends PageQuery { /** 角色名称 */ @ApiModelProperty(value = "角色名称") diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java index e3a1d67..fb8a3f4 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/12/27 */ @Data +@EqualsAndHashCode(callSuper = true) public class ScheduleTaskLogPageDTO extends PageQuery { /** 定时任务编号 */ @ApiModelProperty(value = "定时任务编号") diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java index 3d3e10e..1aa13e8 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java @@ -2,12 +2,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/12/6 */ @Data +@EqualsAndHashCode(callSuper = true) public class ScheduleTaskPageDTO extends PageQuery { } diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java index 1f53a23..daef495 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/11/15 */ @Data +@EqualsAndHashCode(callSuper = true) public class TenantPackagePageDTO extends PageQuery { /** 租户套餐名称 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java index 3eae4d8..8662e78 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2022/3/27 */ @Data +@EqualsAndHashCode(callSuper = true) public class TenantPageDTO extends PageQuery { /** 租户代码 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java index da5d9c8..dd1f25d 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.List; * @date 2022/4/9 */ @Data +@EqualsAndHashCode(callSuper = true) public class UserPageDTO extends PageQuery { /** 昵称 */ @ApiModelProperty(value = "昵称") -- Gitee From 420935208274b419dd3f63f14b2e16605f4fc3b7 Mon Sep 17 00:00:00 2001 From: yangzheng Date: Thu, 5 Jan 2023 16:01:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9yam?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sherly-admin/src/main/resources/application-develop.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sherly-admin/src/main/resources/application-develop.yml b/sherly-admin/src/main/resources/application-develop.yml index b98c3ed..5804b7b 100644 --- a/sherly-admin/src/main/resources/application-develop.yml +++ b/sherly-admin/src/main/resources/application-develop.yml @@ -27,12 +27,9 @@ spring: # mysql配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://123.249.17.195:3306/sherly?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true - url: jdbc:mysql://localhost:3306/sys?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true - # username: mpw:tNvIJM/7zuhDi3RoOr2KAA== - username: root -# password: mpw:svub+7BH4vk4cw+gu1+Htg== - password: 1234 + url: jdbc:mysql://123.249.17.195:3306/sherly?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true + username: mpw:tNvIJM/7zuhDi3RoOr2KAA== + password: mpw:svub+7BH4vk4cw+gu1+Htg== hikari: connection-timeout: 60000 validation-timeout: 3000 -- Gitee From 6a7928bb9f073b5ab5ed48adc0f23402f7ff2148 Mon Sep 17 00:00:00 2001 From: yangzheng Date: Thu, 5 Jan 2023 16:18:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sherly-admin/src/main/resources/application-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sherly-admin/src/main/resources/application-develop.yml b/sherly-admin/src/main/resources/application-develop.yml index 5804b7b..4f5d297 100644 --- a/sherly-admin/src/main/resources/application-develop.yml +++ b/sherly-admin/src/main/resources/application-develop.yml @@ -12,9 +12,9 @@ spring: # redis配置 redis: - host: 101.34.169.185 + host: 123.249.17.195 port: 6379 - password: mpw:tNvIJM/7zuhDi3RoOr2KAA== + password: mpw:svub+7BH4vk4cw+gu1+Htg== database: 0 lettuce: pool: -- Gitee From 4ab0c0d6503313fc2e3d3afde5ba5834fb30d194 Mon Sep 17 00:00:00 2001 From: yangzheng Date: Thu, 5 Jan 2023 16:22:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9yml2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sherly-admin/src/main/resources/application-develop.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sherly-admin/src/main/resources/application-develop.yml b/sherly-admin/src/main/resources/application-develop.yml index 4f5d297..6e840c1 100644 --- a/sherly-admin/src/main/resources/application-develop.yml +++ b/sherly-admin/src/main/resources/application-develop.yml @@ -49,7 +49,3 @@ logging: -com.guzi.sherly.modules.log.mapper: debug # knife4j日志 -springfox: warn - # flowable日志 - # -org.flowable.task.service.impl.persistence.entity.*: debug - # -org.flowable.engine.impl.persistence.entity.*: debug - -org.flowable.*: debug -- Gitee From 11d547de7953c698e125b3a62ba6808695076d4a Mon Sep 17 00:00:00 2001 From: yangzheng Date: Thu, 5 Jan 2023 16:55:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?com/guzi/sherly/model/admin=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/guzi/sherly/model/admin/Department.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/EmailConfig.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/ErrorCode.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/Menu.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/Module.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/OssConfig.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/OssFile.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/Role.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/RoleMenu.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/Tenant.java | 2 ++ .../main/java/com/guzi/sherly/model/admin/TenantPackage.java | 2 ++ .../java/com/guzi/sherly/model/admin/TenantPackageMenu.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/User.java | 2 ++ .../src/main/java/com/guzi/sherly/model/admin/UserRole.java | 2 ++ 14 files changed, 28 insertions(+) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java index b9dd265..31a9a6b 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_department") +@EqualsAndHashCode(callSuper = true) public class Department extends BaseModel { /** 部门编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java index db6141b..f61bade 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_email_config") +@EqualsAndHashCode(callSuper = true) public class EmailConfig extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java index 27588e6..97af77e 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_error_code") +@EqualsAndHashCode(callSuper = true) public class ErrorCode extends BaseModel { /** 错误编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java index e7e3814..2978982 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_menu") +@EqualsAndHashCode(callSuper = true) public class Menu extends BaseModel { /** 菜单编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java index dd399cd..9092438 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_module") +@EqualsAndHashCode(callSuper = true) public class Module extends BaseModel { /** 模块编号 */ diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java index b3f8377..94aa58f 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.guzi.sherly.model.BaseModel; import com.guzi.sherly.modules.storage.model.OssClientConfig; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -15,6 +16,7 @@ import lombok.Data; */ @Data @TableName(value = "sys_oss_config", autoResultMap = true) +@EqualsAndHashCode(callSuper = true) public class OssConfig extends BaseModel { /** 配置编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java index 43943b6..2a87d63 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_oss_file") +@EqualsAndHashCode(callSuper = true) public class OssFile extends BaseModel { /** 文件编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java index cc29b26..1c2ad10 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_role") +@EqualsAndHashCode(callSuper = true) public class Role extends BaseModel { /** 角色编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java index e0f36aa..6e5a776 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_role_menu") +@EqualsAndHashCode(callSuper = true) public class RoleMenu extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java index f403f3f..88d2860 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; */ @Data @TableName("ge_tenant") +@EqualsAndHashCode(callSuper = true) public class Tenant extends BaseModel { /** 租户编号 */ diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java index a12e456..2ba5456 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_tenant_package") +@EqualsAndHashCode(callSuper = true) public class TenantPackage extends BaseModel { /** 租户套餐编号 */ diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java index 7f30719..820f6c9 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_tenant_package_menu") +@EqualsAndHashCode(callSuper = true) public class TenantPackageMenu extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java index bfd949a..1e2caf6 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; */ @Data @TableName("sys_user") +@EqualsAndHashCode(callSuper = true) public class User extends BaseModel { /** 用户编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java index 966e1e4..cda7dc5 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -13,6 +14,7 @@ import lombok.Data; @Data @TableName("sys_user_role") +@EqualsAndHashCode(callSuper = true) public class UserRole extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) -- Gitee