From dd44159aadabdb13544f0b1f65b95e8721605c8a Mon Sep 17 00:00:00 2001 From: yangzheng Date: Thu, 5 Jan 2023 15:46:17 +0800 Subject: [PATCH 1/4] =?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/4] =?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/4] =?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/4] =?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