feat：

字符串非空判断改为@NotBlank

tr-framework/src/main/java/cn/tr/core/tree/TreeNode.java

@@ -2,11 +2,8 @@ package cn.tr.core.tree;
 
 import cn.tr.core.validation.Insert;
 import cn.tr.core.validation.Update;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2DTO.java

@@ -3,7 +3,7 @@ package cn.tr.module.sys.oauth2.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @ClassName : OAuth2DTO
@@ -14,10 +14,10 @@ import javax.validation.constraints.NotEmpty;
 @Data
 public class OAuth2DTO {
     @ApiModelProperty(value = "client_id",required = true)
-    @NotEmpty(message = "client_id不能为空")
+    @NotBlank(message = "client_id不能为空")
     private String client_id;
 
     @ApiModelProperty(value = "client_secret",required = true)
-    @NotEmpty(message = "client_secret不能为空")
+    @NotBlank(message = "client_secret不能为空")
     private String client_secret;
 }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2PswReqDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
@@ -20,7 +20,7 @@ import javax.validation.constraints.Pattern;
 public class OAuth2PswReqDTO extends OAuth2DTO {
 
 	@ApiModelProperty(value = "账号",required = true)
-	@NotEmpty(message = "账号不能为空")
+	@NotBlank(message = "账号不能为空")
 	@Length(min = 4, max = 16, message = "账号长度为 4-16 位")
 	@Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
 	private String username;
@@ -31,7 +31,7 @@ public class OAuth2PswReqDTO extends OAuth2DTO {
 
 
 	@ApiModelProperty(value = "密码",required = true)
-	@NotEmpty(message = "密码不能为空")
+	@NotBlank(message = "密码不能为空")
 	@Length(min = 4, max = 16, message = "密码长度为 4-16 位")
 	private String password;
 

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2UpdatePswDTO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -18,17 +18,17 @@ public class OAuth2UpdatePswDTO implements Serializable {
 
 
     @ApiModelProperty(value = "旧密码",required = true)
-    @NotEmpty(message = "旧密码不能为空")
+    @NotBlank(message = "旧密码不能为空")
     @Length(min = 6, max = 16, message = "旧密码长度为 6-16 位")
     private String oldPsw;
 
     @ApiModelProperty(value = "旧密码",required = true)
-    @NotEmpty(message = "新密码不能为空")
+    @NotBlank(message = "新密码不能为空")
     @Length(min = 6, max = 16, message = "新密码长度为 6-16 位")
     private String newPsw;
 
     @ApiModelProperty(value = "确认密码",required = true)
-    @NotEmpty(message = "确认密码不能为空")
+    @NotBlank(message = "确认密码不能为空")
     @Length(min = 6, max = 16, message = "新密码长度为 6-16 位")
     private String confirmPsw;
 }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/dto/SysTenantAddDTO.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
@@ -24,28 +24,28 @@ import java.io.Serializable;
 public class SysTenantAddDTO implements Serializable {
     private static final long serialVersionUID = 1841053739406204228L;
     @ApiModelProperty(value = "租户名称",required = true)
-    @NotEmpty(message = "名称不能为空",groups = {Integer.class, Update.class})
+    @NotBlank(message = "名称不能为空",groups = {Integer.class, Update.class})
     private String name;
 
     @ApiModelProperty(value = "租户套餐id",required = true)
-    @NotEmpty(message = "套餐不能为空",groups = {Integer.class, Update.class})
+    @NotBlank(message = "套餐不能为空",groups = {Integer.class, Update.class})
     private String packageId;
 
     @ApiModelProperty(value = "租户联系人",required = true)
-    @NotEmpty(message = "联系人不能为空",groups = {Integer.class, Update.class})
+    @NotBlank(message = "联系人不能为空",groups = {Integer.class, Update.class})
     private String contractUser;
 
     @ApiModelProperty(value = "租户类型",hidden = true)
     private String type;
 
     @ApiModelProperty(value = "管理账号",required = true)
-    @NotEmpty(message = "管理账号不能为空",groups = {Integer.class, Update.class})
+    @NotBlank(message = "管理账号不能为空",groups = {Integer.class, Update.class})
     @Length(min = 4,max = 16,message = "管理账号长度在4~16之间",groups = {Integer.class, Update.class})
     @Pattern(regexp = "^[A-Za-z0-9]+$", message = "管理账号格式为数字以及字母",groups = {Insert.class,Update.class})
     private String username;
 
-    @ApiModelProperty("联系人电话")
-    @NotEmpty(message = "联系人电话不能为空",groups = {Integer.class, Update.class})
+    @ApiModelProperty(value = "联系人电话",required = true)
+    @NotBlank(message = "联系人电话不能为空",groups = {Integer.class, Update.class})
     private String contactMobile;
 
     @ApiModelProperty("租户备注")

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/dto/SysTenantCommonDTO.java

@@ -10,7 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
@@ -26,15 +26,15 @@ import javax.validation.constraints.Pattern;
 public class SysTenantCommonDTO extends BaseDTO {
     private static final long serialVersionUID = 1841053739406204228L;
     @ApiModelProperty(value = "租户id",required = true)
-    @NotEmpty(message = "租户id不能为空",groups = {Update.class})
+    @NotBlank(message = "租户id不能为空",groups = {Update.class})
     private String id;
 
     @ApiModelProperty(value = "名称",required = true)
-    @NotEmpty(message = "名称不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "名称不能为空",groups = {Insert.class,Update.class})
     private String name;
 
     @ApiModelProperty(value = "套餐id",required = true)
-    @NotEmpty(message = "套餐不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "套餐不能为空",groups = {Insert.class,Update.class})
     private String packageId;
 
     @ApiModelProperty(value = "租户套餐名称",readOnly = true)
@@ -49,11 +49,11 @@ public class SysTenantCommonDTO extends BaseDTO {
     private String type;
 
     @ApiModelProperty(value = "联系人",required = true)
-    @NotEmpty(message = "联系人不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "联系人不能为空",groups = {Insert.class,Update.class})
     private String contractUser;
 
-    @ApiModelProperty("联系人电话")
-    @NotEmpty(message = "联系人电话不能为空",groups = {Insert.class,Update.class})
+    @ApiModelProperty(value = "联系人电话",required = true)
+    @NotBlank(message = "联系人电话不能为空",groups = {Insert.class,Update.class})
     private String contactMobile;
 
     @ApiModelProperty("租户备注")

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/dto/SysTenantPackageDTO.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
 /**
@@ -22,11 +22,11 @@ import javax.validation.constraints.Pattern;
 public class SysTenantPackageDTO extends BaseDTO {
     private static final long serialVersionUID = 4662146956169137606L;
     @ApiModelProperty("套餐id")
-    @NotEmpty(message = "套餐id不能为空",groups = {Update.class})
+    @NotBlank(message = "套餐id不能为空",groups = {Update.class})
     private String id;
 
     @ApiModelProperty(value = "套餐编码",required = true)
-    @NotEmpty(message = "套餐编码不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "套餐编码不能为空",groups = {Insert.class, Update.class})
     @Pattern(regexp = "^[A-Za-z0-9]+$", message = "套餐编码为数字以及字母",groups = {Insert.class,Update.class})
     private String packageCode;
 
@@ -34,7 +34,7 @@ public class SysTenantPackageDTO extends BaseDTO {
     private String type;
 
     @ApiModelProperty(value = "套餐名称",required = true)
-    @NotEmpty(message = "套餐名称不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "套餐名称不能为空",groups = {Insert.class, Update.class})
     private String packageName;
 
     @ApiModelProperty("套餐备注")

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/dto/SysTenantPackageMenuDTO.java

@@ -1,7 +1,7 @@
 package cn.tr.module.sys.tenant.dto;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @ClassName : SysRoleMenuPO
@@ -13,9 +13,9 @@ import javax.validation.constraints.NotEmpty;
 public class SysTenantPackageMenuDTO {
     private String id;
 
-    @NotEmpty(message = "套餐不能为空")
+    @NotBlank(message = "套餐不能为空")
     private String packageId;
 
-    @NotEmpty(message = "菜单不能为空")
+    @NotBlank(message = "菜单不能为空")
     private String menuId;
 }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/OnlineTokenQueryDTO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @ClassName : OnlineUserQueryDTO
@@ -16,10 +16,10 @@ import javax.validation.constraints.NotEmpty;
 @Data
 public class OnlineTokenQueryDTO {
     @ApiModelProperty("会话")
-    @NotEmpty(message = "会话不能为空")
+    @NotBlank(message = "会话不能为空")
     private String sessionId;
 
     @ApiModelProperty("账户体系")
-    @NotEmpty(message = "账户体系不能为空")
+    @NotBlank(message = "账户体系不能为空")
     private String loginType;
 }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysMenuDTO.java

@@ -6,10 +6,9 @@ import cn.tr.core.validation.Update;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.Objects;
@@ -27,19 +26,19 @@ public class SysMenuDTO extends TreeNode<String> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @NotEmpty(message = "菜单主键不能为空",groups = Update.class)
+    @NotBlank(message = "菜单主键不能为空",groups = Update.class)
     private String id;
 
     /**
      * {@link cn.tr.module.sys.user.enums.MenuEnum}
      */
     @ApiModelProperty(value = "菜单类型 dir目录；menu菜单；button按钮",required = true)
-    @NotEmpty(message = "菜单类型不能为空",groups = {Update.class, Insert.class})
+    @NotBlank(message = "菜单类型不能为空",groups = {Update.class, Insert.class})
     private String menuType;
 
 
     @ApiModelProperty(value = "菜单名称",required = true)
-    @NotEmpty(message = "菜单名称不能为空",groups = {Update.class, Insert.class})
+    @NotBlank(message = "菜单名称不能为空",groups = {Update.class, Insert.class})
     private String name;
 
     @ApiModelProperty(value = "路由地址")

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysPositionDTO.java

@@ -8,10 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
-import java.io.Serializable;
 
 /**
  * 岗位

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysRoleDTO.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.*;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserDTO.java

@@ -11,10 +11,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 /**

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserEditDTO.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysMenuServiceImpl.java

@@ -18,15 +18,12 @@ import cn.tr.core.enums.CreateEnum;
 import cn.tr.module.sys.user.po.SysMenuPO;
 import cn.tr.module.sys.user.repository.SysMenuRepository;
 import cn.tr.module.sys.user.service.*;
-import cn.tr.plugin.biz.tenant.utils.TenantUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.validation.constraints.NotEmpty;
 import java.util.*;
 import java.util.stream.Collectors;
 

tr-plugins/tr-spring-boot-starter-plugin-file/src/main/java/cn/tr/plugin/file/config/db/DbFileClientConfig.java

@@ -4,7 +4,7 @@ import cn.tr.plugin.file.config.FileClientConfig;
 import lombok.Data;
 import org.hibernate.validator.constraints.URL;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @ClassName : LocalFileClientConfig
@@ -17,7 +17,7 @@ public class DbFileClientConfig implements FileClientConfig {
     /**
      * 自定义域名
      */
-    @NotEmpty(message = "dbDomain 不能为空")
+    @NotBlank(message = "dbDomain 不能为空")
     @URL(message = "dbDomain 必须是 URL 格式")
     private String dbDomain;
 

tr-plugins/tr-spring-boot-starter-plugin-file/src/main/java/cn/tr/plugin/file/config/local/LocalFileClientConfig.java

@@ -4,7 +4,7 @@ import cn.tr.plugin.file.config.FileClientConfig;
 import lombok.Data;
 import org.hibernate.validator.constraints.URL;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @ClassName : LocalFileClientConfig
@@ -17,13 +17,13 @@ public class LocalFileClientConfig implements FileClientConfig {
     /**
      * 基础路径
      */
-    @NotEmpty(message = "基础路径不能为空")
+    @NotBlank(message = "基础路径不能为空")
     private String localBasePath;
 
     /**
      * 自定义域名
      */
-    @NotEmpty(message = "自定义域名 不能为空")
+    @NotBlank(message = "自定义域名 不能为空")
     @URL(message = "自定义域名 必须是 URL 格式")
     private String localDomain;
 

tr-plugins/tr-spring-boot-starter-plugin-file/src/main/java/cn/tr/plugin/file/config/minio/MinIoFileClientConfig.java

@@ -3,8 +3,7 @@ package cn.tr.plugin.file.config.minio;
 import cn.tr.plugin.file.config.FileClientConfig;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 
 /**
  * @ClassName : MinioFileClientConfig
@@ -17,25 +16,25 @@ public class MinIoFileClientConfig implements FileClientConfig {
     /**
      * minio上传地址
      */
-    @NotEmpty(message ="httpUrl不能为空" )
+    @NotBlank(message ="httpUrl不能为空" )
     private String minioHttpUrl;
 
     /**
      * accessKey
      */
-    @NotEmpty(message ="accessKey不能为空" )
+    @NotBlank(message ="accessKey不能为空" )
     private String minioAccessKey;
 
     /**
      * 秘钥
      */
-    @NotEmpty(message ="accessSecret不能为空" )
+    @NotBlank(message ="accessSecret不能为空" )
     private String minioAccessSecret;
 
     /**
      * 桶名称
      */
-    @NotEmpty(message ="桶名称不能为空" )
+    @NotBlank(message ="桶名称不能为空" )
     private String minioBucketName;
 
 }