diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java index 2da9f09..3dc50a7 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java @@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data +@Schema(description = "实体创建通用参数") public abstract class BaseCreateDto { @Schema(description = "排序") diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BasePageDto.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BasePageDto.java index 08e5d34..6e88d5a 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BasePageDto.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BasePageDto.java @@ -10,7 +10,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; @Data -@Schema(description = "分页查询参数") +@Schema(description = "分页查询通用参数") public abstract class BasePageDto { @NotNull(message = "页码不能为空") @Min(value = 1, message = "页码不能小于1") diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java index d84c0d5..aaa2f72 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java @@ -6,6 +6,7 @@ import jakarta.validation.constraints.NotBlank; import lombok.Data; @Data +@Schema(description = "实体更新通用参数") public abstract class BaseUpdateDto { @Schema(description = "主键") @@ -18,7 +19,6 @@ public abstract class BaseUpdateDto { @Schema(description = "描述") private String description; - /** * CreateDto转Entity * diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java index 759428c..7df3014 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java @@ -4,13 +4,16 @@ import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; @Data -@MappedSuperclass() +@MappedSuperclass public abstract class BaseEntity implements Serializable { @Id @TableId(value = "id", type = IdType.ASSIGN_UUID) diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java index 4249d2d..be7f01e 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java @@ -3,14 +3,13 @@ package com.bgasol.common.core.base.entity; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import java.util.List; @EqualsAndHashCode(callSuper = true) @Data -@MappedSuperclass() +@MappedSuperclass public abstract class BaseTreeEntity> extends BaseEntity { @Schema(description = "父id") @TableField("parent_id") diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/BaseVo.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/BaseVo.java index b358a2a..d90b8f7 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/BaseVo.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/BaseVo.java @@ -1,13 +1,19 @@ package com.bgasol.common.core.base.vo; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; import java.util.List; @Data @Schema(description = "基础响应数据") +@Builder +@NoArgsConstructor +@AllArgsConstructor public class BaseVo { @Schema(description = "响应码") private Integer code; diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/PageVo.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/PageVo.java index 37a4b76..72b786a 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/PageVo.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/PageVo.java @@ -1,12 +1,18 @@ package com.bgasol.common.core.base.vo; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @Data @Schema(description = "分页响应数据") +@Builder +@NoArgsConstructor +@AllArgsConstructor public class PageVo { @Schema(description = "总条数") private Long total; diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/ResponseType.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/ResponseType.java index 0e6bb07..896b565 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/ResponseType.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/ResponseType.java @@ -1,10 +1,12 @@ package com.bgasol.common.core.base.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor +@Schema(description = "响应类型") public enum ResponseType { SUCCESS("success"), diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/VerificationResult.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/VerificationResult.java index 19b139c..2c4cae7 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/VerificationResult.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/VerificationResult.java @@ -1,10 +1,16 @@ package com.bgasol.common.core.base.vo; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data @Schema(description = "参数校验结果") +@Builder +@NoArgsConstructor +@AllArgsConstructor public class VerificationResult { @Schema(description = "校验结果") private boolean result; diff --git a/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java b/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java index 82f18b9..7e80429 100644 --- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java +++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java @@ -14,6 +14,7 @@ import lombok.EqualsAndHashCode; @Schema(description = "菜单实体") @TableName("t_menu") + public class MenuEntity extends BaseTreeEntity { @Schema(description = "菜单名") diff --git a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/vo/VerificationVo.java b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/vo/VerificationVo.java index f18e00e..6b3394a 100644 --- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/vo/VerificationVo.java +++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/vo/VerificationVo.java @@ -1,10 +1,16 @@ package com.bgasol.model.system.user.vo; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data @Schema(description = "验证码结果") +@Builder +@NoArgsConstructor +@AllArgsConstructor public class VerificationVo { @Schema(description = "验证码图片的base64编码") diff --git a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/user/service/LoginService.java b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/user/service/LoginService.java index f9e85c5..b393fa7 100644 --- a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/user/service/LoginService.java +++ b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/user/service/LoginService.java @@ -47,11 +47,9 @@ public class LoginService { String key = UUID.randomUUID().toString(); // 生成验证码的key captchaCache.saveCaptcha(key, text); // 保存到缓存 - VerificationVo verificationVo = new VerificationVo(); - verificationVo.setVerificationCode(captcha.toBase64()); - verificationVo.setVerificationId(key); - - return verificationVo; + return VerificationVo.builder() + .verificationCode(captcha.toBase64()) + .verificationId(key).build(); } public void logout() {