!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性

Merge pull request !469 from xingyu/fix/vue3_codegen

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java

@@ -10,11 +10,11 @@ import java.util.List;
 @Data
 public class CodegenCreateListReqVO {
 
-    @Schema(description = "数据源配置的编号", required = true, example = "1")
+    @Schema(description = "数据源配置的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "数据源配置的编号不能为空")
     private Long dataSourceConfigId;
 
-    @Schema(description = "表名数组", required = true, example = "[1, 2, 3]")
+    @Schema(description = "表名数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2, 3]")
     @NotNull(message = "表名数组不能为空")
     private List<String> tableNames;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java

@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 public class CodegenPreviewRespVO {
 
-    @Schema(description = "文件路径", required = true, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java")
+    @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java")
     private String filePath;
 
-    @Schema(description = "代码", required = true, example = "Hello World")
+    @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED, example = "Hello World")
     private String code;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java

@@ -33,7 +33,7 @@ public class CodegenUpdateReqVO {
     @Valid
     public static class Table extends CodegenTableBaseVO {
 
-        @Schema(description = "编号", required = true, example = "1")
+        @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
         private Long id;
 
         @AssertTrue(message = "上级菜单不能为空，请前往 [修改生成配置 -> 生成信息] 界面，设置“上级菜单”字段")
@@ -51,7 +51,7 @@ public class CodegenUpdateReqVO {
     @ToString(callSuper = true)
     public static class Column extends CodegenColumnBaseVO {
 
-        @Schema(description = "编号", required = true, example = "1")
+        @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
         private Long id;
 
     }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,43 +12,43 @@ import javax.validation.constraints.NotNull;
 @Data
 public class CodegenColumnBaseVO {
 
-    @Schema(description = "表编号", required = true, example = "1")
+    @Schema(description = "表编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "表编号不能为空")
     private Long tableId;
 
-    @Schema(description = "字段名", required = true, example = "user_age")
+    @Schema(description = "字段名", requiredMode = Schema.RequiredMode.REQUIRED, example = "user_age")
     @NotNull(message = "字段名不能为空")
     private String columnName;
 
-    @Schema(description = "字段类型", required = true, example = "int(11)")
+    @Schema(description = "字段类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "int(11)")
     @NotNull(message = "字段类型不能为空")
     private String dataType;
 
-    @Schema(description = "字段描述", required = true, example = "年龄")
+    @Schema(description = "字段描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "年龄")
     @NotNull(message = "字段描述不能为空")
     private String columnComment;
 
-    @Schema(description = "是否允许为空", required = true, example = "true")
+    @Schema(description = "是否允许为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否允许为空不能为空")
     private Boolean nullable;
 
-    @Schema(description = "是否主键", required = true, example = "false")
+    @Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @NotNull(message = "是否主键不能为空")
     private Boolean primaryKey;
 
-    @Schema(description = "是否自增", required = true, example = "true")
+    @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否自增不能为空")
     private String autoIncrement;
 
-    @Schema(description = "排序", required = true, example = "10")
+    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @NotNull(message = "排序不能为空")
     private Integer ordinalPosition;
 
-    @Schema(description = "Java 属性类型", required = true, example = "userAge")
+    @Schema(description = "Java 属性类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "userAge")
     @NotNull(message = "Java 属性类型不能为空")
     private String javaType;
 
-    @Schema(description = "Java 属性名", required = true, example = "Integer")
+    @Schema(description = "Java 属性名", requiredMode = Schema.RequiredMode.REQUIRED, example = "Integer")
     @NotNull(message = "Java 属性名不能为空")
     private String javaField;
 
@@ -57,27 +58,27 @@ public class CodegenColumnBaseVO {
     @Schema(description = "数据示例", example = "1024")
     private String example;
 
-    @Schema(description = "是否为 Create 创建操作的字段", required = true, example = "true")
+    @Schema(description = "是否为 Create 创建操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否为 Create 创建操作的字段不能为空")
     private Boolean createOperation;
 
-    @Schema(description = "是否为 Update 更新操作的字段", required = true, example = "false")
+    @Schema(description = "是否为 Update 更新操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @NotNull(message = "是否为 Update 更新操作的字段不能为空")
     private Boolean updateOperation;
 
-    @Schema(description = "是否为 List 查询操作的字段", required = true, example = "true")
+    @Schema(description = "是否为 List 查询操作的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否为 List 查询操作的字段不能为空")
     private Boolean listOperation;
 
-    @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", required = true, example = "LIKE")
+    @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
     @NotNull(message = "List 查询操作的条件类型不能为空")
     private String listOperationCondition;
 
-    @Schema(description = "是否为 List 查询操作的返回字段", required = true, example = "true")
+    @Schema(description = "是否为 List 查询操作的返回字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否为 List 查询操作的返回字段不能为空")
     private Boolean listOperationResult;
 
-    @Schema(description = "显示类型", required = true, example = "input")
+    @Schema(description = "显示类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "input")
     @NotNull(message = "显示类型不能为空")
     private String htmlType;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java

@@ -13,10 +13,10 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class CodegenColumnRespVO extends CodegenColumnBaseVO {
 
-    @Schema(description = "编号", required = true, example = "1")
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java

@@ -1,56 +1,57 @@
 package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
 /**
-    * 代码生成 Base VO，提供给添加、修改、详细的子 VO 使用
-    * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-    */
+ * 代码生成 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class CodegenTableBaseVO {
 
-    @Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", required = true, example = "1")
+    @Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "导入类型不能为空")
     private Integer scene;
 
-    @Schema(description = "表名称", required = true, example = "yudao")
+    @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao")
     @NotNull(message = "表名称不能为空")
     private String tableName;
 
-    @Schema(description = "表描述", required = true, example = "芋道")
+    @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
     @NotNull(message = "表描述不能为空")
     private String tableComment;
 
     @Schema(description = "备注", example = "我是备注")
     private String remark;
 
-    @Schema(description = "模块名", required = true, example = "system")
+    @Schema(description = "模块名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system")
     @NotNull(message = "模块名不能为空")
     private String moduleName;
 
-    @Schema(description = "业务名", required = true, example = "codegen")
+    @Schema(description = "业务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "codegen")
     @NotNull(message = "业务名不能为空")
     private String businessName;
 
-    @Schema(description = "类名称", required = true, example = "CodegenTable")
+    @Schema(description = "类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "CodegenTable")
     @NotNull(message = "类名称不能为空")
     private String className;
 
-    @Schema(description = "类描述", required = true, example = "代码生成器的表定义")
+    @Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
     @NotNull(message = "类描述不能为空")
     private String classComment;
 
-    @Schema(description = "作者", required = true, example = "芋道源码")
+    @Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
     @NotNull(message = "作者不能为空")
     private String author;
 
-    @Schema(description = "模板类型，参见 CodegenTemplateTypeEnum 枚举", required = true, example = "1")
+    @Schema(description = "模板类型，参见 CodegenTemplateTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "模板类型不能为空")
     private Integer templateType;
 
-    @Schema(description = "前端类型，参见 CodegenFrontTypeEnum 枚举", required = true, example = "20")
+    @Schema(description = "前端类型，参见 CodegenFrontTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
     @NotNull(message = "前端类型不能为空")
     private Integer frontType;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java

@@ -13,16 +13,16 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class CodegenTableRespVO extends CodegenTableBaseVO {
 
-    @Schema(description = "编号", required = true, example = "1")
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
 
-    @Schema(description = "主键编号", required = true, example = "1024")
+    @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Integer dataSourceConfigId;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
-    @Schema(description = "更新时间", required = true)
+    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime updateTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java

@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 public class DatabaseTableRespVO {
 
-    @Schema(description = "表名称", required = true, example = "yuanma")
+    @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yuanma")
     private String name;
 
-    @Schema(description = "表描述", required = true, example = "芋道源码")
+    @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
     private String comment;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.config.vo;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -14,22 +15,22 @@ import javax.validation.constraints.Size;
 @Data
 public class ConfigBaseVO {
 
-    @Schema(description = "参数分组", required = true, example = "biz")
+    @Schema(description = "参数分组", requiredMode = Schema.RequiredMode.REQUIRED, example = "biz")
     @NotEmpty(message = "参数分组不能为空")
     @Size(max = 50, message = "参数名称不能超过50个字符")
     private String category;
 
-    @Schema(description = "参数名称", required = true, example = "数据库名")
+    @Schema(description = "参数名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "数据库名")
     @NotBlank(message = "参数名称不能为空")
     @Size(max = 100, message = "参数名称不能超过100个字符")
     private String name;
 
-    @Schema(description = "参数键值", required = true, example = "1024")
+    @Schema(description = "参数键值", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotBlank(message = "参数键值不能为空")
     @Size(max = 500, message = "参数键值长度不能超过500个字符")
     private String value;
 
-    @Schema(description = "是否可见", required = true, example = "true")
+    @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否可见不能为空")
     private Boolean visible;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 @EqualsAndHashCode(callSuper = true)
 public class ConfigCreateReqVO extends ConfigBaseVO {
 
-    @Schema(description = "参数键名", required = true, example = "yunai.db.username")
+    @Schema(description = "参数键名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yunai.db.username")
     @NotBlank(message = "参数键名长度不能为空")
     @Size(max = 100, message = "参数键名长度不能超过100个字符")
     private String key;

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java

@@ -13,18 +13,18 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class ConfigRespVO extends ConfigBaseVO {
 
-    @Schema(description = "参数配置序号", required = true, example = "1024")
+    @Schema(description = "参数配置序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "参数键名", required = true, example = "yunai.db.username")
+    @Schema(description = "参数键名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yunai.db.username")
     @NotBlank(message = "参数键名长度不能为空")
     @Size(max = 100, message = "参数键名长度不能超过100个字符")
     private String key;
 
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", required = true, example = "1")
+    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
 
-    @Schema(description = "创建时间", required = true, example = "时间戳格式")
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class ConfigUpdateReqVO extends ConfigBaseVO {
 
-    @Schema(description = "参数配置序号", required = true, example = "1024")
+    @Schema(description = "参数配置序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "参数配置编号不能为空")
     private Long id;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java

@@ -10,15 +10,15 @@ import javax.validation.constraints.*;
 @Data
 public class DataSourceConfigBaseVO {
 
-    @Schema(description = "数据源名称", required = true, example = "test")
+    @Schema(description = "数据源名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "test")
     @NotNull(message = "数据源名称不能为空")
     private String name;
 
-    @Schema(description = "数据源连接", required = true, example = "jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro")
+    @Schema(description = "数据源连接", requiredMode = Schema.RequiredMode.REQUIRED, example = "jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro")
     @NotNull(message = "数据源连接不能为空")
     private String url;
 
-    @Schema(description = "用户名", required = true, example = "root")
+    @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "root")
     @NotNull(message = "用户名不能为空")
     private String username;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import javax.validation.constraints.*;
@@ -9,7 +10,7 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class DataSourceConfigCreateReqVO extends DataSourceConfigBaseVO {
 
-    @Schema(description = "密码", required = true, example = "123456")
+    @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
     @NotNull(message = "密码不能为空")
     private String password;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,10 +11,10 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class DataSourceConfigRespVO extends DataSourceConfigBaseVO {
 
-    @Schema(description = "主键编号", required = true, example = "1024")
+    @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Integer id;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.db.vo;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import javax.validation.constraints.*;
@@ -9,11 +10,11 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class DataSourceConfigUpdateReqVO extends DataSourceConfigBaseVO {
 
-    @Schema(description = "主键编号", required = true, example = "1024")
+    @Schema(description = "主键编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "主键编号不能为空")
     private Long id;
 
-    @Schema(description = "密码", required = true, example = "123456")
+    @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
     @NotNull(message = "密码不能为空")
     private String password;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class FileConfigBaseVO {
 
-    @Schema(description = "配置名", required = true, example = "S3 - 阿里云")
+    @Schema(description = "配置名", requiredMode = Schema.RequiredMode.REQUIRED, example = "S3 - 阿里云")
     @NotNull(message = "配置名不能为空")
     private String name;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java

@@ -14,11 +14,11 @@ import java.util.Map;
 @ToString(callSuper = true)
 public class FileConfigCreateReqVO extends FileConfigBaseVO {
 
-    @Schema(description = "存储器,参见 FileStorageEnum 枚举类参见 FileStorageEnum 枚举类", required = true, example = "1")
+    @Schema(description = "存储器,参见 FileStorageEnum 枚举类参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "存储器不能为空")
     private Integer storage;
 
-    @Schema(description = "存储配置,配置是动态参数，所以使用 Map 接收", required = true)
+    @Schema(description = "存储配置,配置是动态参数，所以使用 Map 接收", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "存储配置不能为空")
     private Map<String, Object> config;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java

@@ -15,21 +15,21 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class FileConfigRespVO extends FileConfigBaseVO {
 
-    @Schema(description = "编号", required = true, example = "1")
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
 
-    @Schema(description = "存储器,参见 FileStorageEnum 枚举类", required = true, example = "1")
+    @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "存储器不能为空")
     private Integer storage;
 
-    @Schema(description = "是否为主配置", required = true, example = "true")
+    @Schema(description = "是否为主配置", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "是否为主配置不能为空")
     private Boolean master;
 
-    @Schema(description = "存储配置", required = true)
+    @Schema(description = "存储配置", requiredMode = Schema.RequiredMode.REQUIRED)
     private FileClientConfig config;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java

@@ -14,11 +14,11 @@ import java.util.Map;
 @ToString(callSuper = true)
 public class FileConfigUpdateReqVO extends FileConfigBaseVO {
 
-    @Schema(description = "编号", required = true, example = "1")
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "编号不能为空")
     private Long id;
 
-    @Schema(description = "存储配置,配置是动态参数，所以使用 Map 接收", required = true)
+    @Schema(description = "存储配置,配置是动态参数，所以使用 Map 接收", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "存储配置不能为空")
     private Map<String, Object> config;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java

@@ -9,28 +9,28 @@ import java.time.LocalDateTime;
 @Data
 public class FileRespVO {
 
-    @Schema(description = "文件编号", required = true, example = "1024")
+    @Schema(description = "文件编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "配置编号", required = true, example = "11")
+    @Schema(description = "配置编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
     private Long configId;
 
-    @Schema(description = "文件路径", required = true, example = "yudao.jpg")
+    @Schema(description = "文件路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao.jpg")
     private String path;
 
-    @Schema(description = "原文件名", required = true, example = "yudao.jpg")
+    @Schema(description = "原文件名", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao.jpg")
     private String name;
 
-    @Schema(description = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg")
+    @Schema(description = "文件 URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/yudao.jpg")
     private String url;
 
     @Schema(description = "文件MIME类型", example = "application/octet-stream")
     private String type;
 
-    @Schema(description = "文件大小", example = "2048", required = true)
+    @Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer size;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class FileUploadReqVO {
 
-    @Schema(description = "文件附件", required = true)
+    @Schema(description = "文件附件", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "文件附件不能为空")
     private MultipartFile file;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobBaseVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.job.vo.job;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,22 +12,22 @@ import javax.validation.constraints.NotNull;
 @Data
 public class JobBaseVO {
 
-    @Schema(description = "任务名称", required = true, example = "测试任务")
+    @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试任务")
     @NotNull(message = "任务名称不能为空")
     private String name;
 
     @Schema(description = "处理器的参数", example = "yudao")
     private String handlerParam;
 
-    @Schema(description = "CRON 表达式", required = true, example = "0/10 * * * * ? *")
+    @Schema(description = "CRON 表达式", requiredMode = Schema.RequiredMode.REQUIRED, example = "0/10 * * * * ? *")
     @NotNull(message = "CRON 表达式不能为空")
     private String cronExpression;
 
-    @Schema(description = "重试次数", required = true, example = "3")
+    @Schema(description = "重试次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "3")
     @NotNull(message = "重试次数不能为空")
     private Integer retryCount;
 
-    @Schema(description = "重试间隔", required = true, example = "1000")
+    @Schema(description = "重试间隔", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
     @NotNull(message = "重试间隔不能为空")
     private Integer retryInterval;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobCreateReqVO.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class JobCreateReqVO extends JobBaseVO {
 
-    @Schema(description = "处理器的名字", required = true, example = "sysUserSessionTimeoutJob")
+    @Schema(description = "处理器的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "sysUserSessionTimeoutJob")
     @NotNull(message = "处理器的名字不能为空")
     private String handlerName;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobRespVO.java

@@ -14,17 +14,17 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class JobRespVO extends JobBaseVO {
 
-    @Schema(description = "任务编号", required = true, example = "1024")
+    @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "任务状态", required = true, example = "1")
+    @Schema(description = "任务状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
 
-    @Schema(description = "处理器的名字", required = true, example = "sysUserSessionTimeoutJob")
+    @Schema(description = "处理器的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "sysUserSessionTimeoutJob")
     @NotNull(message = "处理器的名字不能为空")
     private String handlerName;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobUpdateReqVO.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class JobUpdateReqVO extends JobBaseVO {
 
-    @Schema(description = "任务编号", required = true, example = "1024")
+    @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "任务编号不能为空")
     private Long id;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogBaseVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.job.vo.log;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,22 +16,22 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class JobLogBaseVO {
 
-    @Schema(description = "任务编号", required = true, example = "1024")
+    @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "任务编号不能为空")
     private Long jobId;
 
-    @Schema(description = "处理器的名字", required = true, example = "sysUserSessionTimeoutJob")
+    @Schema(description = "处理器的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "sysUserSessionTimeoutJob")
     @NotNull(message = "处理器的名字不能为空")
     private String handlerName;
 
     @Schema(description = "处理器的参数", example = "yudao")
     private String handlerParam;
 
-    @Schema(description = "第几次执行", required = true, example = "1")
+    @Schema(description = "第几次执行", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "第几次执行不能为空")
     private Integer executeIndex;
 
-    @Schema(description = "开始执行时间", required = true)
+    @Schema(description = "开始执行时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "开始执行时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime beginTime;
@@ -42,7 +43,7 @@ public class JobLogBaseVO {
     @Schema(description = "执行时长", example = "123")
     private Integer duration;
 
-    @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举", required = true, example = "1")
+    @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "任务状态不能为空")
     private Integer status;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogRespVO.java

@@ -13,10 +13,10 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class JobLogRespVO extends JobLogBaseVO {
 
-    @Schema(description = "日志编号", required = true, example = "1024")
+    @Schema(description = "日志编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java

@@ -1,4 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,56 +16,56 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class ApiAccessLogBaseVO {
 
-    @Schema(description = "链路追踪编号", required = true, example = "66600cb6-7852-11eb-9439-0242ac130002")
+    @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "66600cb6-7852-11eb-9439-0242ac130002")
     @NotNull(message = "链路追踪编号不能为空")
     private String traceId;
 
-    @Schema(description = "用户编号", required = true, example = "666")
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     @NotNull(message = "用户编号不能为空")
     private Long userId;
 
-    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", required = true, example = "2")
+    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "用户类型不能为空")
     private Integer userType;
 
-    @Schema(description = "应用名", required = true, example = "dashboard")
+    @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
     @NotNull(message = "应用名不能为空")
     private String applicationName;
 
-    @Schema(description = "请求方法名", required = true, example = "GET")
+    @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET")
     @NotNull(message = "请求方法名不能为空")
     private String requestMethod;
 
-    @Schema(description = "请求地址", required = true, example = "/xxx/yyy")
+    @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xxx/yyy")
     @NotNull(message = "请求地址不能为空")
     private String requestUrl;
 
     @Schema(description = "请求参数")
     private String requestParams;
 
-    @Schema(description = "用户 IP", required = true, example = "127.0.0.1")
+    @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
     @NotNull(message = "用户 IP不能为空")
     private String userIp;
 
-    @Schema(description = "浏览器 UA", required = true, example = "Mozilla/5.0")
+    @Schema(description = "浏览器 UA", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0")
     @NotNull(message = "浏览器 UA不能为空")
     private String userAgent;
 
-    @Schema(description = "开始请求时间", required = true)
+    @Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "开始请求时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime beginTime;
 
-    @Schema(description = "结束请求时间", required = true)
+    @Schema(description = "结束请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "结束请求时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime endTime;
 
-    @Schema(description = "执行时长", required = true, example = "100")
+    @Schema(description = "执行时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     @NotNull(message = "执行时长不能为空")
     private Integer duration;
 
-    @Schema(description = "结果码", required = true, example = "0")
+    @Schema(description = "结果码", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @NotNull(message = "结果码不能为空")
     private Integer resultCode;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java

@@ -13,10 +13,10 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class ApiAccessLogRespVO extends ApiAccessLogBaseVO {
 
-    @Schema(description = "日志主键", required = true, example = "1024")
+    @Schema(description = "日志主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java

@@ -15,80 +15,80 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class ApiErrorLogBaseVO {
 
-    @Schema(description = "链路追踪编号", required = true, example = "66600cb6-7852-11eb-9439-0242ac130002")
+    @Schema(description = "链路追踪编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "66600cb6-7852-11eb-9439-0242ac130002")
     @NotNull(message = "链路追踪编号不能为空")
     private String traceId;
 
-    @Schema(description = "用户编号", required = true, example = "666")
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     @NotNull(message = "用户编号不能为空")
     private Integer userId;
 
-    @Schema(description = "用户类型", required = true, example = "1")
+    @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "用户类型不能为空")
     private Integer userType;
 
-    @Schema(description = "应用名", required = true, example = "dashboard")
+    @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
     @NotNull(message = "应用名不能为空")
     private String applicationName;
 
-    @Schema(description = "请求方法名", required = true, example = "GET")
+    @Schema(description = "请求方法名", requiredMode = Schema.RequiredMode.REQUIRED, example = "GET")
     @NotNull(message = "请求方法名不能为空")
     private String requestMethod;
 
-    @Schema(description = "请求地址", required = true, example = "/xx/yy")
+    @Schema(description = "请求地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "/xx/yy")
     @NotNull(message = "请求地址不能为空")
     private String requestUrl;
 
-    @Schema(description = "请求参数", required = true)
+    @Schema(description = "请求参数", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "请求参数不能为空")
     private String requestParams;
 
-    @Schema(description = "用户 IP", required = true, example = "127.0.0.1")
+    @Schema(description = "用户 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "127.0.0.1")
     @NotNull(message = "用户 IP不能为空")
     private String userIp;
 
-    @Schema(description = "浏览器 UA", required = true, example = "Mozilla/5.0")
+    @Schema(description = "浏览器 UA", requiredMode = Schema.RequiredMode.REQUIRED, example = "Mozilla/5.0")
     @NotNull(message = "浏览器 UA不能为空")
     private String userAgent;
 
-    @Schema(description = "异常发生时间", required = true)
+    @Schema(description = "异常发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常发生时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime exceptionTime;
 
-    @Schema(description = "异常名", required = true)
+    @Schema(description = "异常名", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常名不能为空")
     private String exceptionName;
 
-    @Schema(description = "异常导致的消息", required = true)
+    @Schema(description = "异常导致的消息", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常导致的消息不能为空")
     private String exceptionMessage;
 
-    @Schema(description = "异常导致的根消息", required = true)
+    @Schema(description = "异常导致的根消息", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常导致的根消息不能为空")
     private String exceptionRootCauseMessage;
 
-    @Schema(description = "异常的栈轨迹", required = true)
+    @Schema(description = "异常的栈轨迹", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常的栈轨迹不能为空")
     private String exceptionStackTrace;
 
-    @Schema(description = "异常发生的类全名", required = true)
+    @Schema(description = "异常发生的类全名", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常发生的类全名不能为空")
     private String exceptionClassName;
 
-    @Schema(description = "异常发生的类文件", required = true)
+    @Schema(description = "异常发生的类文件", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常发生的类文件不能为空")
     private String exceptionFileName;
 
-    @Schema(description = "异常发生的方法名", required = true)
+    @Schema(description = "异常发生的方法名", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常发生的方法名不能为空")
     private String exceptionMethodName;
 
-    @Schema(description = "异常发生的方法所在行", required = true)
+    @Schema(description = "异常发生的方法所在行", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常发生的方法所在行不能为空")
     private Integer exceptionLineNumber;
 
-    @Schema(description = "处理状态", required = true, example = "0")
+    @Schema(description = "处理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @NotNull(message = "处理状态不能为空")
     private Integer processStatus;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java

@@ -13,13 +13,13 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class ApiErrorLogRespVO extends ApiErrorLogBaseVO {
 
-    @Schema(description = "编号", required = true, example = "1024")
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Integer id;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
-    @Schema(description = "处理时间", required = true)
+    @Schema(description = "处理时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime processTime;
 
     @Schema(description = "处理用户编号", example = "233")

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java

@@ -14,22 +14,22 @@ import java.time.Duration;
 @AllArgsConstructor
 public class RedisKeyDefineRespVO {
 
-    @Schema(description = "Key 模板", required = true, example = "login_user:%s")
+    @Schema(description = "Key 模板", requiredMode = Schema.RequiredMode.REQUIRED, example = "login_user:%s")
     private String keyTemplate;
 
-    @Schema(description = "Key 类型的枚举", required = true, example = "String")
+    @Schema(description = "Key 类型的枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
     private RedisKeyDefine.KeyTypeEnum keyType;
 
-    @Schema(description = "Value 类型", required = true, example = "java.lang.String")
+    @Schema(description = "Value 类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "java.lang.String")
     private Class<?> valueType;
 
-    @Schema(description = "超时类型", required = true, example = "1")
+    @Schema(description = "超时类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private RedisKeyDefine.TimeoutTypeEnum timeoutType;
 
-    @Schema(description = "过期时间，单位：毫秒", required = true, example = "1024")
+    @Schema(description = "过期时间，单位：毫秒", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Duration timeout;
 
-    @Schema(description = "备注", required = true, example = "啦啦啦啦~")
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "啦啦啦啦~")
     private String memo;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java

@@ -9,10 +9,10 @@ import lombok.Data;
 @AllArgsConstructor
 public class RedisKeyValueRespVO {
 
-    @Schema(description = "c5f6990767804a928f4bb96ca249febf", required = true, example = "String")
+    @Schema(description = "c5f6990767804a928f4bb96ca249febf", requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
     private String key;
 
-    @Schema(required = true, example = "String")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, example = "String")
     private String value;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java

@@ -14,13 +14,13 @@ import java.util.Properties;
 @AllArgsConstructor
 public class RedisMonitorRespVO {
 
-    @Schema(description = "Redis info 指令结果,具体字段，查看 Redis 文档", required = true)
+    @Schema(description = "Redis info 指令结果,具体字段，查看 Redis 文档", requiredMode = Schema.RequiredMode.REQUIRED)
     private Properties info;
 
-    @Schema(description = "Redis key 数量", required = true, example = "1024")
+    @Schema(description = "Redis key 数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long dbSize;
 
-    @Schema(description = "CommandStat 数组", required = true)
+    @Schema(description = "CommandStat 数组", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<CommandStat> commandStats;
 
     @Schema(description = "Redis 命令统计结果")
@@ -29,13 +29,13 @@ public class RedisMonitorRespVO {
     @AllArgsConstructor
     public static class CommandStat {
 
-        @Schema(description = "Redis 命令", required = true, example = "get")
+        @Schema(description = "Redis 命令", requiredMode = Schema.RequiredMode.REQUIRED, example = "get")
         private String command;
 
-        @Schema(description = "调用次数", required = true, example = "1024")
+        @Schema(description = "调用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
         private Long calls;
 
-        @Schema(description = "消耗 CPU 秒数", required = true, example = "666")
+        @Schema(description = "消耗 CPU 秒数", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
         private Long usec;
 
     }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoBaseVO.java

@@ -10,19 +10,19 @@ import javax.validation.constraints.*;
 @Data
 public class TestDemoBaseVO {
 
-    @Schema(description = "名字", required = true)
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "名字不能为空")
     private String name;
 
-    @Schema(description = "状态", required = true)
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "状态不能为空")
     private Integer status;
 
-    @Schema(description = "类型", required = true)
+    @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "类型不能为空")
     private Integer type;
 
-    @Schema(description = "分类", required = true)
+    @Schema(description = "分类", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "分类不能为空")
     private Integer category;
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoRespVO.java

@@ -10,10 +10,10 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class TestDemoRespVO extends TestDemoBaseVO {
 
-    @Schema(description = "编号", required = true)
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long id;
 
-    @Schema(description = "创建时间", required = true)
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class TestDemoUpdateReqVO extends TestDemoBaseVO {
 
-    @Schema(description = "编号", required = true)
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "编号不能为空")
     private Long id;
 

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm

@@ -17,7 +17,7 @@ public class ${sceneEnum.prefixClass}${table.className}RespVO extends ${sceneEnu
 
 #foreach ($column in $columns)
 #if (${column.listOperationResult} && (!${column.createOperation} || !${column.updateOperation}))##不是通用字段
-    @Schema(description = "${column.columnComment}"#if (!${column.nullable}), required = true#end#if ("$!column.example" != ""), example = "${column.example}"#end)
+    @Schema(description = "${column.columnComment}"#if (!${column.nullable}), requiredMode = Schema.RequiredMode.REQUIRED#end#if ("$!column.example" != ""), example = "${column.example}"#end)
     private ${column.javaType} ${column.javaField};
 
 #end

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm

@@ -16,7 +16,7 @@ export interface ${simpleClassName}VO {
 }
 
 // 查询${table.classComment}列表
-export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => {
+export const get${simpleClassName}Page = async (params) => {
   return await request.get({ url: `${baseURL}/page`, params })
 }
 

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/api/api.ts.vm

@@ -16,7 +16,7 @@ export interface ${simpleClassName}VO {
 }
 
 // 查询${table.classComment}列表
-export const get${simpleClassName}Page = async (params: ${simpleClassName}PageReqVO) => {
+export const get${simpleClassName}Page = async (params) => {
   return await request.get({ url: '${baseURL}/page', params })
 }
 

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm

@@ -1,5 +1,5 @@
 import { BasicColumn, FormSchema, useRender } from '@/components/Table'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 
 export const columns: BasicColumn[] = [
 #foreach($column in $columns)
@@ -53,7 +53,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       #if ("" != $dictType)## 设置了 dictType 数据字典的情况
-        options: getIntDictOptions(DICT_TYPE.$dictType.toUpperCase())
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase())
       #else## 未设置 dictType 数据字典的情况
         options: []
       #end
@@ -67,7 +67,7 @@ export const searchFormSchema: FormSchema[] = [
 #end
 ]
 
-export const formSchema: FormSchema[] = [
+export const createFormSchema: FormSchema[] = [
   {
     label: '编号',
     field: 'id',
@@ -75,7 +75,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input'
   },
 #foreach($column in $columns)
-#if ($column.createOperation || $column.updateOperation)
+#if ($column.createOperation)
   #set ($dictType = $column.dictType)
   #set ($javaField = $column.javaField)
   #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -90,16 +90,24 @@ export const formSchema: FormSchema[] = [
   #if ($column.htmlType == "input")
     component: 'Input'
   #elseif($column.htmlType == "imageUpload")## 图片上传
-    component: 'Upload'
+    component: 'FileUpload',
+    componentProps: {
+      fileType: 'file',
+      maxCount: 1
+    }
   #elseif($column.htmlType == "fileUpload")## 文件上传
-    component: 'Upload'
+    component: 'FileUpload',
+    componentProps: {
+      fileType: 'image',
+      maxCount: 1
+    }
   #elseif($column.htmlType == "editor")## 文本编辑器
-    component: 'InputTextArea'
+    component: 'Editor'
   #elseif($column.htmlType == "select")## 下拉框
     component: 'Select',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
       #else##没数据字典
         options:[]
       #end
@@ -108,7 +116,7 @@ export const formSchema: FormSchema[] = [
     component: 'Checkbox',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
       #else##没数据字典
         options:[]
       #end
@@ -117,7 +125,7 @@ export const formSchema: FormSchema[] = [
     component: 'Radio',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
       #else##没数据字典
         options:[]
       #end
@@ -132,3 +140,69 @@ export const formSchema: FormSchema[] = [
 #end
 #end
 ]
+
+export const updateFormSchema: FormSchema[] = [
+  {
+    label: '编号',
+    field: 'id',
+    show: false,
+    component: 'Input'
+  },
+#foreach($column in $columns)
+#if ($column.updateOperation)
+#set ($dictType = $column.dictType)
+#set ($javaField = $column.javaField)
+#set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set ($comment = $column.columnComment)
+#if (!$column.primaryKey)## 忽略主键，不用在表单里
+  {
+    label: '${comment}',
+    field: '${javaField}',
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+    required: true,
+    #end
+    #if ($column.htmlType == "input")
+    component: 'Input'
+    #elseif($column.htmlType == "imageUpload")## 图片上传
+    component: 'Upload'
+    #elseif($column.htmlType == "fileUpload")## 文件上传
+    component: 'Upload'
+    #elseif($column.htmlType == "editor")## 文本编辑器
+    component: 'Editor'
+    #elseif($column.htmlType == "select")## 下拉框
+    component: 'Select',
+    componentProps: {
+      #if ("" != $dictType)## 有数据字典
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
+      #else##没数据字典
+        options:[]
+      #end
+    }
+    #elseif($column.htmlType == "checkbox")## 多选框
+    component: 'Checkbox',
+    componentProps: {
+      #if ("" != $dictType)## 有数据字典
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
+      #else##没数据字典
+        options:[]
+      #end
+    }
+    #elseif($column.htmlType == "radio")## 单选框
+    component: 'Radio',
+    componentProps: {
+      #if ("" != $dictType)## 有数据字典
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), 'number')
+      #else##没数据字典
+        options:[]
+      #end
+    }
+    #elseif($column.htmlType == "datetime")## 时间框
+    component: 'DatePicker'
+    #elseif($column.htmlType == "textarea")## 文本域
+    component: 'InputTextArea'
+    #end
+  },
+#end
+#end
+#end
+]

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm

@@ -1,49 +1,56 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? t('action.edit') : t('action.create')" @ok="handleSubmit">
     <BasicForm @register="registerForm" />
   </BasicModal>
 </template>
-<script lang="ts" setup name="${table.className}Modal">
-  import { ref, unref } from 'vue'
-  import { BasicModal, useModalInner } from '@/components/Modal'
-  import { BasicForm, useForm } from '@/components/Form'
-  import { formSchema } from './${classNameVar}.data'
-  import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '@/api/${table.moduleName}/${classNameVar}'
+<script lang="ts" setup>
+import { ref, unref } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { BasicForm, useForm } from '@/components/Form'
+import { BasicModal, useModalInner } from '@/components/Modal'
+import { createFormSchema, updateFormSchema } from './${classNameVar}.data'
+import { create${simpleClassName}, get${simpleClassName}, update${simpleClassName} } from '@/api/${table.moduleName}/${classNameVar}'
 
-  const emit = defineEmits(['success', 'register'])
-  const isUpdate = ref(true)
+defineOptions({ name: '${table.className}Modal' })
 
-  const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
-    labelWidth: 120,
-    baseColProps: { span: 24 },
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    actionColOptions: { span: 23 }
-  })
+const { t } = useI18n()
+const { createMessage } = useMessage()
+const emit = defineEmits(['success', 'register'])
+const isUpdate = ref(true)
 
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    resetFields()
-    setModalProps({ confirmLoading: false })
-    isUpdate.value = !!data?.isUpdate
-    if (unref(isUpdate)) {
-      const res = await get${simpleClassName}(data.record.id)
-      setFieldsValue({ ...res })
-    }
-  })
+const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+  labelWidth: 120,
+  baseColProps: { span: 24 },
+  schemas: isUpdate? updateFormSchema : createFormSchema,
+  showActionButtonGroup: false,
+  actionColOptions: { span: 23 }
+})
 
-  async function handleSubmit() {
-    try {
-      const values = await validate()
-      setModalProps({ confirmLoading: true })
-      if (unref(isUpdate)) {
-        await update${simpleClassName}(values)
-      } else {
-        await create${simpleClassName}(values)
-      }
-      closeModal()
-      emit('success')
-    } finally {
-      setModalProps({ confirmLoading: false })
-    }
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+  resetFields()
+  setModalProps({ confirmLoading: false })
+  isUpdate.value = !!data?.isUpdate
+  if (unref(isUpdate)) {
+    const res = await get${simpleClassName}(data.record.id)
+    setFieldsValue({ ...res })
   }
+})
+
+async function handleSubmit() {
+  try {
+    const values = await validate()
+    setModalProps({ confirmLoading: true })
+    if (unref(isUpdate)) {
+      await update${simpleClassName}(values)
+    } else {
+      await create${simpleClassName}(values)
+    }
+    closeModal()
+    emit('success')
+    createMessage.success(t('common.saveSuccessText'))
+  } finally {
+    setModalProps({ confirmLoading: false })
+  }
+}
 </script>

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm

@@ -33,58 +33,60 @@
     <${simpleClassName}Modal @register="registerModal" @success="reload()" />
   </div>
 </template>
-<script lang="ts" setup name="${table.className}">
-  import { useI18n } from '@/hooks/web/useI18n'
-  import { useMessage } from '@/hooks/web/useMessage'
-  import { useModal } from '@/components/Modal'
-  import ${simpleClassName}Modal from './${simpleClassName}Modal.vue'
-  import { IconEnum } from '@/enums/appEnum'
-  import { BasicTable, useTable, TableAction } from '@/components/Table'
-  import { delete${simpleClassName}, export${simpleClassName}, get${simpleClassName}Page } from '@/api/${table.moduleName}/${classNameVar}'
-  import { columns, searchFormSchema } from './${classNameVar}.data'
+<script lang="ts" setup>
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { useModal } from '@/components/Modal'
+import ${simpleClassName}Modal from './${simpleClassName}Modal.vue'
+import { IconEnum } from '@/enums/appEnum'
+import { BasicTable, useTable, TableAction } from '@/components/Table'
+import { delete${simpleClassName}, export${simpleClassName}, get${simpleClassName}Page } from '@/api/${table.moduleName}/${classNameVar}'
+import { columns, searchFormSchema } from './${classNameVar}.data'
 
-  const { t } = useI18n()
-  const { createConfirm, createMessage } = useMessage()
-  const [registerModal, { openModal }] = useModal()
+defineOptions({ name: '${table.className}' })
 
-  const [registerTable, { getForm, reload }] = useTable({
-    title: '${table.classComment}列表',
-    api: get${simpleClassName}Page,
-    columns,
-    formConfig: { labelWidth: 120, schemas: searchFormSchema },
-    useSearchForm: true,
-    showTableSetting: true,
-    actionColumn: {
-      width: 140,
-      title: t('common.action'),
-      dataIndex: 'action',
-      fixed: 'right'
+const { t } = useI18n()
+const { createConfirm, createMessage } = useMessage()
+const [registerModal, { openModal }] = useModal()
+
+const [registerTable, { getForm, reload }] = useTable({
+  title: '${table.classComment}列表',
+  api: get${simpleClassName}Page,
+  columns,
+  formConfig: { labelWidth: 120, schemas: searchFormSchema },
+  useSearchForm: true,
+  showTableSetting: true,
+  actionColumn: {
+    width: 140,
+    title: t('common.action'),
+    dataIndex: 'action',
+    fixed: 'right'
+  }
+})
+
+function handleCreate() {
+  openModal(true, { isUpdate: false })
+}
+
+function handleEdit(record: Recordable) {
+  openModal(true, { record, isUpdate: true })
+}
+
+async function handleExport() {
+  createConfirm({
+    title: t('common.exportTitle'),
+    iconType: 'warning',
+    content: t('common.exportMessage'),
+    async onOk() {
+      await export${simpleClassName}(getForm().getFieldsValue())
+      createMessage.success(t('common.exportSuccessText'))
     }
   })
+}
 
-  function handleCreate() {
-    openModal(true, { isUpdate: false })
-  }
-
-  function handleEdit(record: Recordable) {
-    openModal(true, { record, isUpdate: true })
-  }
-
-  async function handleExport() {
-    createConfirm({
-      title: t('common.exportTitle'),
-      iconType: 'warning',
-      content: t('common.exportMessage'),
-      async onOk() {
-        await export${simpleClassName}(getForm().getFieldsValue())
-        createMessage.success(t('common.exportSuccessText'))
-      }
-    })
-  }
-
-  async function handleDelete(record: Recordable) {
-    await delete${simpleClassName}(record.id)
-    createMessage.success(t('common.delSuccessText'))
-    reload()
-  }
+async function handleDelete(record: Recordable) {
+  await delete${simpleClassName}(record.id)
+  createMessage.success(t('common.delSuccessText'))
+  reload()
+}
 </script>