代码同步 02.18

yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/businessinfo/vo/BusinessInfoBaseVO.java

@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.basic.controller.admin.businessinfo.vo;
 
-import lombok.*;
+import io.swagger.annotations.ApiModelProperty;
-import java.util.*;
+import lombok.Data;
-import io.swagger.annotations.*;
+import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.*;
+
+import javax.validation.constraints.NotBlank;
 
 /**
 * 商户 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -13,11 +14,13 @@ import javax.validation.constraints.*;
 public class BusinessInfoBaseVO {
 
     @ApiModelProperty(value = "商户名称", required = true)
-    @NotNull(message = "商户名称不能为空")
+    @NotBlank(message = "商户名称不能为空")
+    @Length(max = 64, message = "商户名称长度必须是1~64位之间")
     private String businessName;
 
     @ApiModelProperty(value = "企业名称", required = true)
-    @NotNull(message = "企业名称不能为空")
+    @NotBlank(message = "企业名称不能为空")
+    @Length(max = 64, message = "企业名称长度必须是1~64位之间")
     private String companiesName;
 
     @ApiModelProperty(value = "备注")

yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/businessinfo/vo/BusinessInfoCreateReqVO.java

@@ -1,9 +1,13 @@
 package cn.iocoder.yudao.module.basic.controller.admin.businessinfo.vo;
 
-import lombok.*;
+import io.swagger.annotations.ApiModel;
-import java.util.*;
+import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.*;
+import lombok.Data;
-import javax.validation.constraints.*;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
 
 @ApiModel("管理后台 - 商户创建 Request VO")
 @Data
@@ -18,14 +22,18 @@ public class BusinessInfoCreateReqVO extends BusinessInfoBaseVO {
     private byte verifyState;
 
     @ApiModelProperty(value = "法人姓名")
+    @Length(max = 64, message = "法人姓名长度必须是0~64位之间")
     private String legalName;
 
     @ApiModelProperty(value = "法人身份证")
     private String legalIdCard;
 
     @ApiModelProperty(value = "所属行政区,例如福建省/福州市/鼓楼区")
+    @NotBlank(message = "所属行政区不能为空")
+    @Length(max = 12, message = "所属行政区长度必须是1~12位之间")
     private String area;
 
     @ApiModelProperty(value = "商户统一信用代码")
+    @Length(max = 20, message = "统一信用代码长度必须是0~20位之间")
     private String businessCode;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java

@@ -1,10 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant;
 
-import lombok.*;
+import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.*;
+import lombok.Data;
-import org.hibernate.validator.constraints.URL;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -29,10 +28,6 @@ public class TenantBaseVO {
     @NotNull(message = "租户状态")
     private Integer status;
 
-    @ApiModelProperty(value = "绑定域名", example = "https://www.iocoder.cn")
-    @URL(message = "绑定域名的地址非 URL 格式")
-    private String domain;
-
     @ApiModelProperty(value = "租户套餐编号", required = true, example = "1024")
     @NotNull(message = "租户套餐编号不能为空")
     private Long packageId;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java

@@ -57,12 +57,6 @@ public class TenantDO extends BaseDO {
      * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
-    /**
-     * 绑定域名
-     *
-     * TODO 芋艿：目前是预留字段，未来会支持根据域名，自动查询到对应的租户。等等
-     */
-    private String domain;
     /**
      * 租户套餐编号
      *