msb_6557
/
opsli-boot
mirror of https://github.com/hiparker/opsli-boot.git
1
1
Code Issues Projects Releases Wiki Activity

删除无用代码注释

Browse Source
v1.4.1
Parker 4 years ago
parent 1a89fcadb6
commit dc389f8051
26 changed files with 18 additions and 150 deletions
Show Stats Download Patch File Download Diff File

5
opsli-api/src/main/java/org/opsli/api/wrapper/gentest/carinfo/TestCarModel.java
Unescape View File

@ -43,7 +43,6 @@ public class TestCarModel extends ApiWrapper {
@ApiModelProperty(value = "汽车名称")
@ExcelProperty(value = "汽车名称", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(20)
private String carName;
@ -52,7 +51,6 @@ public class TestCarModel extends ApiWrapper {
@ApiModelProperty(value = "汽车类型")
@ExcelProperty(value = "汽车类型", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(20)
private String carType;
@ -61,7 +59,6 @@ public class TestCarModel extends ApiWrapper {
@ApiModelProperty(value = "汽车品牌")
@ExcelProperty(value = "汽车品牌", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String carBrand;
@ -70,7 +67,6 @@ public class TestCarModel extends ApiWrapper {
@ApiModelProperty(value = "生产日期")
@ExcelProperty(value = "生产日期", order = 4)
@ExcelInfo
// 验证器
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date produceData;
@ -79,7 +75,6 @@ public class TestCarModel extends ApiWrapper {
@ApiModelProperty(value = "是否启用")
@ExcelProperty(value = "是否启用", order = 5)
@ExcelInfo( dictType = "no_yes" )
// 验证器
@ValidationArgsLenMax(1)
private String izUsable;

5
opsli-api/src/main/java/org/opsli/api/wrapper/gentest/user/TestUserModel.java
Unescape View File

@ -44,7 +44,6 @@ public class TestUserModel extends ApiWrapper {
@ApiModelProperty(value = "名称")
@ExcelProperty(value = "名称", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String name;
@ -53,7 +52,6 @@ public class TestUserModel extends ApiWrapper {
@ApiModelProperty(value = "金钱")
@ExcelProperty(value = "金钱", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_MONEY})
@ValidationArgsLenMax(8)
private Double money;
@ -62,7 +60,6 @@ public class TestUserModel extends ApiWrapper {
@ApiModelProperty(value = "年龄")
@ExcelProperty(value = "年龄", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_NUMBER})
@ValidationArgsLenMax(5)
private Integer age;
@ -71,7 +68,6 @@ public class TestUserModel extends ApiWrapper {
@ApiModelProperty(value = "生日")
@ExcelProperty(value = "生日", order = 4)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, })
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ -81,7 +77,6 @@ public class TestUserModel extends ApiWrapper {
@ApiModelProperty(value = "是否启用")
@ExcelProperty(value = "是否启用", order = 5)
@ExcelInfo( dictType = "no_yes" )
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, })
@ValidationArgsLenMax(1)
private String izUsable;

3
opsli-api/src/main/java/org/opsli/api/wrapper/system/area/SysAreaModel.java
Unescape View File

@ -41,7 +41,6 @@ public class SysAreaModel extends ApiWrapper {
@ApiModelProperty(value = "父级主键")
@ExcelProperty(value = "父级主键", order = 1)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(19)
private String parentId;
@ -49,7 +48,6 @@ public class SysAreaModel extends ApiWrapper {
@ApiModelProperty(value = "地域编号")
@ExcelProperty(value = "地域编号", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_NUMBER})
@ValidationArgsLenMax(40)
private String areaCode;
@ -58,7 +56,6 @@ public class SysAreaModel extends ApiWrapper {
@ApiModelProperty(value = "地域名称")
@ExcelProperty(value = "地域名称", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(40)
private String areaName;

6
opsli-api/src/main/java/org/opsli/api/wrapper/system/dict/DictDetailModel.java
Unescape View File

@ -47,7 +47,6 @@ public class DictDetailModel extends ApiWrapper {
/** 类型编号 - 冗余 */
@ApiModelProperty(value = "字典类型Code")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(120)
private String typeCode;
@ -56,7 +55,6 @@ public class DictDetailModel extends ApiWrapper {
@ApiModelProperty(value = "字典名称")
@ExcelProperty(value = "字典名称", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(120)
private String dictName;
@ -65,7 +63,6 @@ public class DictDetailModel extends ApiWrapper {
@ApiModelProperty(value = "字典值")
@ExcelProperty(value = "字典值", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(120)
private String dictValue;
@ -74,7 +71,6 @@ public class DictDetailModel extends ApiWrapper {
@ApiModelProperty(value = "是否内置数据 0是 1否")
@ExcelProperty(value = "是否内置数据", order = 2)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String izLock;
@ -83,7 +79,6 @@ public class DictDetailModel extends ApiWrapper {
@ApiModelProperty(value = "排序")
@ExcelProperty(value = "排序", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_NUMBER})
@ValidationArgsLenMax(10)
private Integer sortNo;
@ -92,7 +87,6 @@ public class DictDetailModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 2)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;

4
opsli-api/src/main/java/org/opsli/api/wrapper/system/dict/DictModel.java
Unescape View File

@ -42,7 +42,6 @@ public class DictModel extends ApiWrapper {
@ApiModelProperty(value = "字典类型编号")
@ExcelProperty(value = "字典类型编号", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(120)
private String typeCode;
@ -51,7 +50,6 @@ public class DictModel extends ApiWrapper {
@ApiModelProperty(value = "字典类型名称")
@ExcelProperty(value = "字典类型名称", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(120)
private String typeName;
@ -60,7 +58,6 @@ public class DictModel extends ApiWrapper {
@ApiModelProperty(value = "是否内置数据 0是 1否")
@ExcelProperty(value = "是否内置数据", order = 3)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgs(ValiArgsType.IS_NOT_NULL)
@ValidationArgsLenMax(1)
private String izLock;
@ -69,7 +66,6 @@ public class DictModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 4)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;

10
opsli-api/src/main/java/org/opsli/api/wrapper/system/menu/MenuModel.java
Unescape View File

@ -40,7 +40,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "父级主键")
@ExcelProperty(value = "父级主键", order = 1)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(20)
private String parentId;
@ -48,7 +47,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "编号")
@ExcelProperty(value = "编号", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(50)
private String menuCode;
@ -57,7 +55,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "名称")
@ExcelProperty(value = "名称", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String menuName;
@ -66,7 +63,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "图标")
@ExcelProperty(value = "图标", order = 4)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(50)
private String icon;
@ -74,7 +70,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "项目类型")
@ExcelProperty(value = "项目类型", order = 5)
@ExcelInfo(dictType = "menu_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(20)
private String type;
@ -83,7 +78,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "url地址")
@ExcelProperty(value = "url地址", order = 6)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(200)
private String url;
@ -91,7 +85,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "组件")
@ExcelProperty(value = "组件", order = 7)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(200)
private String component;
@ -99,7 +92,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "重定向")
@ExcelProperty(value = "重定向", order = 8)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(200)
private String redirect;
@ -107,7 +99,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "排序")
@ExcelProperty(value = "排序", order = 8)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
private Integer sortNo;
@ -115,7 +106,6 @@ public class MenuModel extends ApiWrapper {
@ApiModelProperty(value = "是否隐藏")
@ExcelProperty(value = "是否隐藏", order = 8)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
private String hidden;

6
opsli-api/src/main/java/org/opsli/api/wrapper/system/org/SysOrgModel.java
Unescape View File

@ -45,7 +45,6 @@ public class SysOrgModel extends ApiWrapper {
@ApiModelProperty(value = "父级主键")
@ExcelProperty(value = "父级主键", order = 1)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(19)
private String parentId;
@ -53,7 +52,6 @@ public class SysOrgModel extends ApiWrapper {
@ApiModelProperty(value = "组织机构编号")
@ExcelProperty(value = "组织机构编号", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(120)
private String orgCode;
@ -62,7 +60,6 @@ public class SysOrgModel extends ApiWrapper {
@ApiModelProperty(value = "组织机构名称")
@ExcelProperty(value = "组织机构名称", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(120)
private String orgName;
@ -71,7 +68,6 @@ public class SysOrgModel extends ApiWrapper {
@ApiModelProperty(value = "组织机构类型")
@ExcelProperty(value = "组织机构类型", order = 4)
@ExcelInfo( dictType = "org_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(3)
private String orgType;
@ -80,14 +76,12 @@ public class SysOrgModel extends ApiWrapper {
@ApiModelProperty(value = "排序")
@ExcelProperty(value = "排序", order = 5)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(10)
private Integer sortNo;
/** 多租户字段 */
@ApiModelProperty(value = "多租户ID")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(20)
private String tenantId;

2
opsli-api/src/main/java/org/opsli/api/wrapper/system/role/RoleMenuRefModel.java
Unescape View File

@ -39,14 +39,12 @@ public class RoleMenuRefModel implements Serializable {
/** 角色ID */
@ApiModelProperty(value = "角色ID")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(50)
private String roleId;
/** 权限数组 */
@ApiModelProperty(value = "权限数组")
// 验证器
private String[] permsIds;
}

5
opsli-api/src/main/java/org/opsli/api/wrapper/system/role/RoleModel.java
Unescape View File

@ -43,7 +43,6 @@ public class RoleModel extends ApiWrapper {
@ApiModelProperty(value = "角色编码")
@ExcelProperty(value = "角色编码", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(50)
private String roleCode;
@ -52,7 +51,6 @@ public class RoleModel extends ApiWrapper {
@ApiModelProperty(value = "角色编码")
@ExcelProperty(value = "角色编码", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String roleName;
@ -61,7 +59,6 @@ public class RoleModel extends ApiWrapper {
@ApiModelProperty(value = "是否内置数据 0是 1否")
@ExcelProperty(value = "是否内置数据", order = 3)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String izLock;
@ -70,7 +67,6 @@ public class RoleModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 4)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;
@ -78,7 +74,6 @@ public class RoleModel extends ApiWrapper {
/** 多租户字段 */
@ApiModelProperty(value = "多租户ID")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(20)
private String tenantId;

3
opsli-api/src/main/java/org/opsli/api/wrapper/system/tenant/TenantModel.java
Unescape View File

@ -41,7 +41,6 @@ public class TenantModel extends ApiWrapper {
@ApiModelProperty(value = "租户名称")
@ExcelProperty(value = "租户名称", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String tenantName;
@ -50,7 +49,6 @@ public class TenantModel extends ApiWrapper {
@ApiModelProperty(value = "是否启用")
@ExcelProperty(value = "是否启用", order = 2)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String izUsable;
@ -59,7 +57,6 @@ public class TenantModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 3)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;

13
opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserAndOrgModel.java
Unescape View File

@ -42,7 +42,6 @@ public class UserAndOrgModel extends ApiWrapper {
/** 登录账户 */
@ApiModelProperty(value = "登录账户")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(32)
private String username;
@ -50,7 +49,6 @@ public class UserAndOrgModel extends ApiWrapper {
/** 登录密码 */
@ApiModelProperty(value = "登录密码")
@ExcelIgnore
// 验证器
@ValidationArgsLenMin(6)
@ValidationArgsLenMax(50)
private String password;
@ -58,14 +56,12 @@ public class UserAndOrgModel extends ApiWrapper {
/** 盐值，密码秘钥 */
@ApiModelProperty(value = "盐值，密码秘钥")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(50)
private String secretkey;
/** 是否锁定 */
@ApiModelProperty(value = "是否锁定")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String locked;
@ -74,7 +70,6 @@ public class UserAndOrgModel extends ApiWrapper {
@ApiModelProperty(value = "真实姓名")
@ExcelProperty(value = "真实姓名", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String realName;
@ -83,7 +78,6 @@ public class UserAndOrgModel extends ApiWrapper {
@ApiModelProperty(value = "手机")
@ExcelProperty(value = "手机", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_MOBILE})
private String mobile;
@ -91,7 +85,6 @@ public class UserAndOrgModel extends ApiWrapper {
@ApiModelProperty(value = "邮箱")
@ExcelProperty(value = "邮箱", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_EMAIL})
@ValidationArgsLenMax(100)
private String email;
@ -100,7 +93,6 @@ public class UserAndOrgModel extends ApiWrapper {
@ApiModelProperty(value = "工号")
@ExcelProperty(value = "工号", order = 4)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(32)
private String no;
@ -108,14 +100,12 @@ public class UserAndOrgModel extends ApiWrapper {
/** 头像 */
@ApiModelProperty(value = "头像")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(255)
private String avatar;
/** 最后登陆IP */
@ApiModelProperty(value = "最后登陆IP")
@ExcelIgnore
// 验证器
@ValidationArgs(ValiArgsType.IS_IPV4)
private String loginIp;
@ -123,7 +113,6 @@ public class UserAndOrgModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 5)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;
@ -131,7 +120,6 @@ public class UserAndOrgModel extends ApiWrapper {
@ApiModelProperty(value = "签名")
@ExcelProperty(value = "签名", order = 5)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String sign;
@ -139,7 +127,6 @@ public class UserAndOrgModel extends ApiWrapper {
/** 多租户字段 */
@ApiModelProperty(value = "多租户ID")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(20)
private String tenantId;

8
opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserInfo.java
Unescape View File

@ -42,54 +42,46 @@ public class UserInfo extends ApiWrapper {
/** 登录账户 */
@ApiModelProperty(value = "登录账户")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(32)
private String username;
/** 真实姓名 */
@ApiModelProperty(value = "真实姓名")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String realName;
/** 手机 */
@ApiModelProperty(value = "手机")
// 验证器
@ValidationArgs({ValiArgsType.IS_MOBILE})
private String mobile;
/** 邮箱 */
@ApiModelProperty(value = "邮箱")
@ExcelProperty(value = "邮箱", order = 3)
// 验证器
@ValidationArgs({ValiArgsType.IS_EMAIL})
private String email;
/** 工号 */
@ApiModelProperty(value = "工号")
@ExcelProperty(value = "工号", order = 4)
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(32)
private String no;
/** 头像 */
@ApiModelProperty(value = "头像")
// 验证器
@ValidationArgsLenMax(255)
private String avatar;
/** 备注 */
@ApiModelProperty(value = "备注")
// 验证器
@ValidationArgsLenMax(255)
private String remark;
/** 签名 */
@ApiModelProperty(value = "签名")
// 验证器
@ValidationArgsLenMax(255)
private String sign;

13
opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java
Unescape View File

@ -42,7 +42,6 @@ public class UserModel extends ApiWrapper {
/** 登录账户 */
@ApiModelProperty(value = "登录账户")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(32)
private String username;
@ -50,7 +49,6 @@ public class UserModel extends ApiWrapper {
/** 登录密码 */
@ApiModelProperty(value = "登录密码")
@ExcelIgnore
// 验证器
@ValidationArgsLenMin(6)
@ValidationArgsLenMax(50)
private String password;
@ -58,14 +56,12 @@ public class UserModel extends ApiWrapper {
/** 盐值，密码秘钥 */
@ApiModelProperty(value = "盐值，密码秘钥")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(50)
private String secretkey;
/** 是否锁定 */
@ApiModelProperty(value = "是否锁定")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String locked;
@ -74,7 +70,6 @@ public class UserModel extends ApiWrapper {
@ApiModelProperty(value = "真实姓名")
@ExcelProperty(value = "真实姓名", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL,ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String realName;
@ -83,7 +78,6 @@ public class UserModel extends ApiWrapper {
@ApiModelProperty(value = "手机")
@ExcelProperty(value = "手机", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_MOBILE})
private String mobile;
@ -91,7 +85,6 @@ public class UserModel extends ApiWrapper {
@ApiModelProperty(value = "邮箱")
@ExcelProperty(value = "邮箱", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_EMAIL})
@ValidationArgsLenMax(100)
private String email;
@ -100,7 +93,6 @@ public class UserModel extends ApiWrapper {
@ApiModelProperty(value = "工号")
@ExcelProperty(value = "工号", order = 4)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(32)
private String no;
@ -108,14 +100,12 @@ public class UserModel extends ApiWrapper {
/** 头像 */
@ApiModelProperty(value = "头像")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(255)
private String avatar;
/** 最后登陆IP */
@ApiModelProperty(value = "最后登陆IP")
@ExcelIgnore
// 验证器
@ValidationArgs(ValiArgsType.IS_IPV4)
private String loginIp;
@ -123,7 +113,6 @@ public class UserModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 5)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;
@ -131,7 +120,6 @@ public class UserModel extends ApiWrapper {
@ApiModelProperty(value = "签名")
@ExcelProperty(value = "签名", order = 5)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String sign;
@ -139,7 +127,6 @@ public class UserModel extends ApiWrapper {
/** 多租户字段 */
@ApiModelProperty(value = "多租户ID")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(20)
private String tenantId;

7
opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserOrgRefModel.java
Unescape View File

@ -39,37 +39,30 @@ public class UserOrgRefModel implements Serializable {
/** 用户ID */
@ApiModelProperty(value = "用户ID")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(50)
private String userId;
@ApiModelProperty(value = "公司")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(19)
private String companyId;
@ApiModelProperty(value = "公司名称")
// 验证器
private String companyName;
@ApiModelProperty(value = "部门ID")
// 验证器
@ValidationArgsLenMax(19)
private String departmentId;
@ApiModelProperty(value = "部门名称")
// 验证器
private String departmentName;
@ApiModelProperty(value = "岗位ID")
// 验证器
@ValidationArgsLenMax(19)
private String postId;
@ApiModelProperty(value = "岗位名称")
// 验证器
private String postName;
}

3
opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserPassword.java
Unescape View File

@ -47,7 +47,6 @@ public class UserPassword implements Serializable {
/** 旧密码 */
@ApiModelProperty(value = "旧密码")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMin(6)
@ValidationArgsLenMax(50)
@ -55,7 +54,6 @@ public class UserPassword implements Serializable {
/** 新密码 */
@ApiModelProperty(value = "新密码")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMin(6)
@ValidationArgsLenMax(50)
@ -64,7 +62,6 @@ public class UserPassword implements Serializable {
/** 盐值，密码秘钥 */
@ApiModelProperty(value = "盐值，密码秘钥")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(50)
private String salt;

2
opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserRoleRefModel.java
Unescape View File

@ -39,14 +39,12 @@ public class UserRoleRefModel implements Serializable {
/** 用户ID */
@ApiModelProperty(value = "用户ID")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(50)
private String userId;
/** 角色数组 */
@ApiModelProperty(value = "权限数组")
// 验证器
private String[] roleIds;
}

5
opsli-api/src/main/java/org/opsli/api/wrapper/testt/Test3Model.java
Unescape View File

@ -43,7 +43,6 @@ public class Test3Model extends ApiWrapper {
@ApiModelProperty(value = "金钱")
@ExcelProperty(value = "金钱", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_MONEY})
@ValidationArgsLenMax(10)
private Double money;
@ -52,7 +51,6 @@ public class Test3Model extends ApiWrapper {
@ApiModelProperty(value = "年龄")
@ExcelProperty(value = "年龄", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_NUMBER})
@ValidationArgsLenMax(3)
private Integer age;
@ -61,7 +59,6 @@ public class Test3Model extends ApiWrapper {
@ApiModelProperty(value = "名称")
@ExcelProperty(value = "名称", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_CHINESE})
@ValidationArgsLenMax(50)
private String name;
@ -70,7 +67,6 @@ public class Test3Model extends ApiWrapper {
@ApiModelProperty(value = "生日")
@ExcelProperty(value = "生日", order = 4)
@ExcelInfo
// 验证器
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date birth;
@ -79,7 +75,6 @@ public class Test3Model extends ApiWrapper {
@ApiModelProperty(value = "是否启用")
@ExcelProperty(value = "是否启用", order = 5)
@ExcelInfo( dictType = "no_yes" )
// 验证器
@ValidationArgsLenMax(1)
private String izUsable;

18
opsli-base-support/opsli-core/src/main/java/org/opsli/core/base/service/impl/CrudServiceImpl.java
Unescape View File

@ -257,8 +257,8 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
/**
* 转化 entity 为 model
* @param entity
* @return
* @param entity entity
* @return E
*/
protected E transformT2M(T entity){
return WrapperUtil.transformInstance(entity, modelClazz);
@ -267,8 +267,8 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
/**
* 集合对象
* 转化 entitys 为 models
* @param entitys
* @return
* @param entitys entitys
* @return List<E>
*/
protected List<E> transformTs2Ms(List<T> entitys){
return WrapperUtil.transformInstance(entitys, modelClazz);
@ -277,8 +277,8 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
/**
* 转化 model 为 entity
* @param model
* @return
* @param model model
* @return T
*/
protected T transformM2T(E model){
return WrapperUtil.transformInstance(model, entityClazz);
@ -287,8 +287,8 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
/**
* 集合对象
* 转化 models 为 entitys
* @param models
* @return
* @param models models
* @return List<T>
*/
protected List<T> transformMs2Ts(List<E> models){
return WrapperUtil.transformInstance(models, entityClazz);
@ -324,6 +324,7 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
* 内部获得 Model 泛型 Clazz
* @return Class<E>
*/
@SuppressWarnings("unchecked")
public Class<E> getInnerModelClazz(){
String typeName = "E";
Class<E> tClass = null;
@ -352,6 +353,7 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
* 内部获得 Entity 泛型 Clazz
* @return Class<T>
*/
@SuppressWarnings("unchecked")
private Class<T> getInnerEntityClazz(){
String typeName = "T";
Class<T> tClass = null;

3
opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/InterfaceCryptoAop.java
Unescape View File

@ -59,8 +59,9 @@ public class InterfaceCryptoAop {
/**
* 切如 post 请求
* @param point
* @param point point
*/
@SuppressWarnings("unchecked")
@Around("encryptAndDecrypt()")
public Object encryptAndDecryptHandle(ProceedingJoinPoint point) throws Throwable {
// 获得请求参数

12
opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/CaptchaUtil.java
Unescape View File

@ -74,8 +74,7 @@ public class CaptchaUtil {
/**
* 获得验证码
*
* @param uuid
* @return
* @param uuid UUID
*/
public static void createCaptcha(String uuid, OutputStream out) {
if (StringUtils.isBlank(uuid)) {
@ -102,9 +101,8 @@ public class CaptchaUtil {
/**
* 校验验证码
*
* @param uuid
* @param code
* @return
* @param uuid UUID
* @param code 验证码
*/
public static void validate(String uuid, String code) {
// 判断UUID 是否为空
@ -134,8 +132,8 @@ public class CaptchaUtil {
/**
* 删除验证码
*
* @param uuid
* @return
* @param uuid UUID
* @return boolean
*/
public static boolean delCaptcha(String uuid) {
if (StringUtils.isEmpty(uuid)) {

2
opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/DictUtil.java
Unescape View File

@ -18,7 +18,6 @@ package org.opsli.core.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@ -27,7 +26,6 @@ import org.opsli.api.web.system.dict.DictDetailApi;
import org.opsli.api.wrapper.system.dict.DictDetailModel;
import org.opsli.api.wrapper.system.dict.DictWrapper;
import org.opsli.common.constants.DictConstants;
import org.opsli.common.enums.CacheType;
import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.msg.CoreMsg;
import org.opsli.plugins.redis.RedisPlugin;

13
opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/wrapper/CreaterTableColumnModel.java
Unescape View File

@ -46,7 +46,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "字段名称")
@ExcelProperty(value = "字段名称", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(100)
private String fieldName;
@ -55,7 +54,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "字段类型")
@ExcelProperty(value = "字段类型", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(100)
private String fieldType;
@ -76,7 +74,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "字段描述")
@ExcelProperty(value = "字段描述", order = 6)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(200)
private String fieldComments;
@ -85,7 +82,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "是否主键")
@ExcelProperty(value = "是否主键", order = 7)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
private String izPk;
@ -93,7 +89,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "是否可为空")
@ExcelProperty(value = "是否可为空", order = 8)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
private String izNotNull;
@ -101,7 +96,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "是否列表显示")
@ExcelProperty(value = "是否列表显示", order = 9)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
private String izShowList;
@ -109,7 +103,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "是否表单显示")
@ExcelProperty(value = "是否表单显示", order = 10)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
private String izShowForm;
@ -117,7 +110,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "Java字段类型")
@ExcelProperty(value = "Java字段类型", order = 11)
@ExcelInfo(dictType = "java_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(50)
private String javaType;
@ -126,7 +118,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "字段生成方案")
@ExcelProperty(value = "字段生成方案", order = 12)
@ExcelInfo(dictType = "show_type")
// 验证器
@ValidationArgsLenMax(1)
private String showType;
@ -134,7 +125,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "字典类型编号")
@ExcelProperty(value = "字典类型编号", order = 13)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(100)
private String dictTypeCode;
@ -143,7 +133,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "排序")
@ExcelProperty(value = "排序", order = 14)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(6)
private Integer sort;
@ -152,7 +141,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "验证类别")
@ExcelProperty(value = "验证类别", order = 15)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(500)
private String validateType;
@ -160,7 +148,6 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ApiModelProperty(value = "检索类别")
@ExcelProperty(value = "检索类别", order = 16)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(100)
private String queryType;

7
opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/wrapper/CreaterLogsModel.java
Unescape View File

@ -39,7 +39,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 归属表ID */
@ApiModelProperty(value = "归属表ID")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(19)
private String tableId;
@ -48,7 +47,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 包名 */
@ApiModelProperty(value = "包名")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(255)
private String packageName;
@ -56,7 +54,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 模块名 */
@ApiModelProperty(value = "模块名")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(40)
private String moduleName;
@ -64,7 +61,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 子模块名 */
@ApiModelProperty(value = "子模块名")
@ExcelIgnore
// 验证器
@ValidationArgsLenMax(40)
private String subModuleName;
@ -72,7 +68,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 代码标题 */
@ApiModelProperty(value = "代码标题")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(100)
private String codeTitle;
@ -80,7 +75,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 代码标题简介 */
@ApiModelProperty(value = "代码标题简介")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(100)
private String codeTitleBrief;
@ -88,7 +82,6 @@ public class CreaterLogsModel extends ApiWrapper {
/** 作者名 */
@ApiModelProperty(value = "作者名")
@ExcelIgnore
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(64)
private String authorName;

6
opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/table/wrapper/CreaterTableAndColumnModel.java
Unescape View File

@ -58,7 +58,6 @@ public class CreaterTableAndColumnModel extends ApiWrapper {
@ApiModelProperty(value = "表类型")
@ExcelProperty(value = "表类型", order = 2)
@ExcelInfo(dictType = "table_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String tableType;
@ -67,7 +66,6 @@ public class CreaterTableAndColumnModel extends ApiWrapper {
@ApiModelProperty(value = "数据库类型")
@ExcelProperty(value = "数据库类型", order = 3)
@ExcelInfo(dictType = "jdbc_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(30)
private String jdbcType;
@ -76,7 +74,6 @@ public class CreaterTableAndColumnModel extends ApiWrapper {
@ApiModelProperty(value = "描述")
@ExcelProperty(value = "描述", order = 4)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(200)
private String comments;
@ -84,7 +81,6 @@ public class CreaterTableAndColumnModel extends ApiWrapper {
@ApiModelProperty(value = "同步")
@ExcelProperty(value = "是否同步", order = 5)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
private String izSync;
@ -92,7 +88,6 @@ public class CreaterTableAndColumnModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 6)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;
@ -101,7 +96,6 @@ public class CreaterTableAndColumnModel extends ApiWrapper {
@ApiModelProperty(value = "表结构")
@ExcelProperty(value = "表结构", order = 7)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
private List<CreaterTableColumnModel> columnList;

6
opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/table/wrapper/CreaterTableModel.java
Unescape View File

@ -42,7 +42,6 @@ public class CreaterTableModel extends ApiWrapper {
@ApiModelProperty(value = "表名称")
@ExcelProperty(value = "表名称", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL})
@ValidationArgsLenMax(100)
private String tableName;
@ -56,7 +55,6 @@ public class CreaterTableModel extends ApiWrapper {
@ApiModelProperty(value = "表类型")
@ExcelProperty(value = "表类型", order = 2)
@ExcelInfo(dictType = "table_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1)
private String tableType;
@ -65,7 +63,6 @@ public class CreaterTableModel extends ApiWrapper {
@ApiModelProperty(value = "数据库类型")
@ExcelProperty(value = "数据库类型", order = 3)
@ExcelInfo(dictType = "jdbc_type")
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(30)
private String jdbcType;
@ -74,7 +71,6 @@ public class CreaterTableModel extends ApiWrapper {
@ApiModelProperty(value = "描述")
@ExcelProperty(value = "描述", order = 4)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(200)
private String comments;
@ -82,7 +78,6 @@ public class CreaterTableModel extends ApiWrapper {
@ApiModelProperty(value = "同步")
@ExcelProperty(value = "是否同步", order = 5)
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
private String izSync;
@ -90,7 +85,6 @@ public class CreaterTableModel extends ApiWrapper {
@ApiModelProperty(value = "备注")
@ExcelProperty(value = "备注", order = 6)
@ExcelInfo
// 验证器
@ValidationArgsLenMax(255)
private String remark;

1
opsli-plugins/opsli-plugins-waf/src/main/java/org/opsli/plugins/waf/util/XSSFilterKit.java
Unescape View File

@ -108,5 +108,6 @@ public final class XSSFilterKit {
}
// ====================
private XSSFilterKit(){}
}

Write Preview
Loading…
Cancel
Save