Просмотр исходного кода

统一字符串字段长度为2的幂次方

zuohuaijun 3 лет назад
Родитель
Сommit
d1fc4134cb

+ 2 - 2
Admin.NET/Admin.NET.Application/Entity/Student.cs

@@ -12,8 +12,8 @@ public class Student : EntityBase
     /// <summary>
     /// 姓名
     /// </summary>
-    [SugarColumn(ColumnDescription = "姓名", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "姓名", Length = 32)]
+    [Required, MaxLength(32)]
     public string Name { get; set; }
 
     /// <summary>

+ 2 - 2
Admin.NET/Admin.NET.Application/Entity/Test.cs

@@ -12,8 +12,8 @@ public class Test : EntityBase
     /// <summary>
     /// 姓名
     /// </summary>
-    [SugarColumn(ColumnDescription = "姓名", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "姓名", Length = 32)]
+    [Required, MaxLength(32)]
     public string Name { get; set; }
 
     /// <summary>

+ 3 - 3
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -337,7 +337,7 @@
         </member>
         <member name="P:Admin.NET.Core.SysCodeGenConfig.CodeGenId">
             <summary>
-            代码生成主表ID
+            代码生成主表Id
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysCodeGenConfig.ColumnName">
@@ -382,7 +382,7 @@
         </member>
         <member name="P:Admin.NET.Core.SysCodeGenConfig.DictTypeCode">
             <summary>
-            字典code
+            字典编码
             </summary>
         </member>
         <member name="P:Admin.NET.Core.SysCodeGenConfig.WhetherRetract">
@@ -1613,7 +1613,7 @@
         </member>
         <member name="P:Admin.NET.Core.WechatUser.ExpiresIn">
             <summary>
-            ExpiresIn
+            过期时间
             </summary>
         </member>
         <member name="T:Admin.NET.Core.CacheTypeEnum">

+ 20 - 20
Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs

@@ -9,71 +9,71 @@ public class SysCodeGen : EntityBase
     /// <summary>
     /// 作者姓名
     /// </summary>
-    [MaxLength(20)]
-    [SugarColumn(ColumnDescription = "作者姓名")]
+    [SugarColumn(ColumnDescription = "作者姓名", Length = 32)]
+    [MaxLength(32)]
     public string AuthorName { get; set; }
 
     /// <summary>
     /// 是否移除表前缀
     /// </summary>
-    [MaxLength(5)]
-    [SugarColumn(ColumnDescription = "是否移除表前缀")]
+    [SugarColumn(ColumnDescription = "是否移除表前缀", Length = 8)]
+    [MaxLength(8)]
     public string TablePrefix { get; set; }
 
     /// <summary>
     /// 生成方式
     /// </summary>
-    [MaxLength(20)]
-    [SugarColumn(ColumnDescription = "生成方式")]
+    [SugarColumn(ColumnDescription = "生成方式", Length = 32)]
+    [MaxLength(32)]
     public string GenerateType { get; set; }
 
     /// <summary>
     /// 库定位器名
     /// </summary>
-    [MaxLength(50)]
-    [SugarColumn(ColumnDescription = "库定位器名")]
+    [SugarColumn(ColumnDescription = "库定位器名", Length = 64)]
+    [MaxLength(64)]
     public string ConfigId { get; set; }
 
     /// <summary>
     /// 数据库名(保留字段)
     /// </summary>
-    [MaxLength(50)]
-    [SugarColumn(ColumnDescription = "数据库库名")]
+    [SugarColumn(ColumnDescription = "数据库库名", Length = 64)]
+    [MaxLength(64)]
     public string DbName { get; set; }
 
     /// <summary>
     /// 数据库类型
     /// </summary>
-    [MaxLength(50)]
-    [SugarColumn(ColumnDescription = "数据库类型")]
+    [SugarColumn(ColumnDescription = "数据库类型", Length = 64)]
+    [MaxLength(64)]
     public string DbType { get; set; }
 
     /// <summary>
     /// 数据库链接
     /// </summary>
-    [MaxLength(200)]
-    [SugarColumn(ColumnDescription = "数据库链接")]
+    [SugarColumn(ColumnDescription = "数据库链接", Length = 256)]
+    [MaxLength(256)]
     public string ConnectionString { get; set; }
 
     /// <summary>
     /// 数据库表名
     /// </summary>
-    [MaxLength(100)]
-    [SugarColumn(ColumnDescription = "数据库表名")]
+    [SugarColumn(ColumnDescription = "数据库表名", Length = 128)]
+    [MaxLength(128)]
     public string TableName { get; set; }
 
     /// <summary>
     /// 命名空间
     /// </summary>
-    [MaxLength(100)]
-    [SugarColumn(ColumnDescription = "命名空间")]
+    [SugarColumn(ColumnDescription = "命名空间", Length = 128)]
+    [MaxLength(128)]
     public string NameSpace { get; set; }
 
     /// <summary>
     /// 业务名
     /// </summary>
-    [MaxLength(100)]
-    [SugarColumn(ColumnDescription = "业务名")]
+    [SugarColumn(ColumnDescription = "业务名", Length = 128)]
+    [MaxLength(128)]
     public string BusName { get; set; }
 
     /// <summary>

+ 44 - 20
Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs

@@ -7,130 +7,154 @@
 public class SysCodeGenConfig : EntityBase
 {
     /// <summary>
-    /// 代码生成主表ID
+    /// 代码生成主表Id
     /// </summary>
+    [SugarColumn(ColumnDescription = "主表Id")]
     public long CodeGenId { get; set; }
 
     /// <summary>
     /// 数据库字段名
     /// </summary>
-    [Required, MaxLength(100)]
+    [SugarColumn(ColumnDescription = "字段名称", Length = 128)]
+    [Required, MaxLength(128)]
     public string ColumnName { get; set; }
 
     /// <summary>
     /// 字段描述
     /// </summary>
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "字段描述", Length = 128)]
+    [MaxLength(128)]
     public string ColumnComment { get; set; }
 
     /// <summary>
     /// .NET数据类型
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "NET数据类型", Length = 64)]
+    [MaxLength(64)]
     public string NetType { get; set; }
 
     /// <summary>
     /// 作用类型(字典)
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "作用类型", Length = 64)]
+    [MaxLength(64)]
     public string EffectType { get; set; }
 
     /// <summary>
     /// 外键实体名称
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "外键实体名称", Length = 64)]
+    [MaxLength(64)]
     public string FkEntityName { get; set; }
 
     /// <summary>
     /// 外键表名称
     /// </summary>
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "外键表名称", Length = 128)]
+    [MaxLength(128)]
     public string FkTableName { get; set; }
 
     /// <summary>
     /// 外键显示字段
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "外键显示字段", Length = 64)]
+    [MaxLength(64)]
     public string FkColumnName { get; set; }
 
     /// <summary>
     /// 外键显示字段.NET类型
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "外键显示字段.NET类型", Length = 64)]
+    [MaxLength(64)]
     public string FkColumnNetType { get; set; }
 
     /// <summary>
-    /// 字典code
+    /// 字典编码
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "字典编码", Length = 64)]
+    [MaxLength(64)]
     public string DictTypeCode { get; set; }
 
     /// <summary>
     /// 列表是否缩进(字典)
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "列表是否缩进", Length = 8)]
+    [MaxLength(8)]
     public string WhetherRetract { get; set; }
 
     /// <summary>
     /// 是否必填(字典)
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "是否必填", Length = 8)]
+    [MaxLength(8)]
     public string WhetherRequired { get; set; }
 
     /// <summary>
     /// 是否是查询条件
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "是否是查询条件", Length = 8)]
+    [MaxLength(8)]
     public string QueryWhether { get; set; }
 
     /// <summary>
     /// 查询方式
     /// </summary>
-    [MaxLength(10)]
+    [SugarColumn(ColumnDescription = "查询方式", Length = 16)]
+    [MaxLength(16)]
     public string QueryType { get; set; }
 
     /// <summary>
     /// 列表显示
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "列表显示", Length = 8)]
+    [MaxLength(8)]
     public string WhetherTable { get; set; }
 
     /// <summary>
     /// 增改
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "增改", Length = 8)]
+    [MaxLength(8)]
     public string WhetherAddUpdate { get; set; }
 
     /// <summary>
     /// 主键
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "主键", Length = 8)]
+    [MaxLength(8)]
     public string ColumnKey { get; set; }
 
     /// <summary>
     /// 数据库中类型(物理类型)
     /// </summary>
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "数据库中类型", Length = 64)]
+    [MaxLength(64)]
     public string DataType { get; set; }
 
     /// <summary>
     /// 是否通用字段
     /// </summary>
-    [MaxLength(5)]
+    [SugarColumn(ColumnDescription = "是否通用字段", Length = 8)]
+    [MaxLength(8)]
     public string WhetherCommon { get; set; }
 
     /// <summary>
     /// 显示文本字段
     /// </summary>
+    [SugarColumn(ColumnDescription = "显示文本字段", ColumnDataType = "longtext,text,clob")]
     public string DisplayColumn { get; set; }
 
     /// <summary>
     /// 选中值字段
     /// </summary>
+    [SugarColumn(ColumnDescription = "选中值字段", Length = 128)]
+    [MaxLength(128)]
     public string ValueColumn { get; set; }
 
     /// <summary>
     /// 父级字段
     /// </summary>
+    [SugarColumn(ColumnDescription = "父级字段", Length = 128)]
+    [MaxLength(128)]
     public string PidColumn { get; set; }
 }

+ 10 - 10
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -9,22 +9,22 @@ public class SysConfig : EntityBase
     /// <summary>
     /// 名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 50)]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "名称", Length = 64)]
+    [Required, MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "编码", Length = 64)]
+    [MaxLength(64)]
     public string Code { get; set; }
 
     /// <summary>
     /// 属性值
     /// </summary>
-    [SugarColumn(ColumnDescription = "属性值", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "属性值", Length = 64)]
+    [MaxLength(64)]
     public string Value { get; set; }
 
     /// <summary>
@@ -36,8 +36,8 @@ public class SysConfig : EntityBase
     /// <summary>
     /// 常量所属分类的编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "常量所属分类的编码", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "常量所属分类的编码", Length = 64)]
+    [MaxLength(64)]
     public string GroupCode { get; set; }
 
     /// <summary>
@@ -49,7 +49,7 @@ public class SysConfig : EntityBase
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 256)]
+    [MaxLength(256)]
     public string Remark { get; set; }
 }

+ 8 - 8
Admin.NET/Admin.NET.Core/Entity/SysDataResource.cs

@@ -15,22 +15,22 @@ public class SysDataResource : EntityBase
     /// <summary>
     /// 名称
     ///</summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 200)]
-    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "名称", Length = 128)]
+    [MaxLength(128)]
     public string Name { get; set; }
 
     /// <summary>
     /// 值
     ///</summary>
-    [SugarColumn(ColumnDescription = "值", Length = 200)]
-    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "值", Length = 256)]
+    [MaxLength(256)]
     public string Value { get; set; }
 
     /// <summary>
     /// 节点编码
     ///</summary>
-    [SugarColumn(ColumnDescription = "节点编码", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "节点编码", Length = 128)]
+    [MaxLength(128)]
     public string Code { get; set; }
 
     /// <summary>
@@ -42,8 +42,8 @@ public class SysDataResource : EntityBase
     /// <summary>
     /// 备注
     ///</summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 200)]
-    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "备注", Length = 256)]
+    [MaxLength(256)]
     public string Remark { get; set; }
 
     /// <summary>

+ 6 - 6
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -15,15 +15,15 @@ public class SysDictData : EntityBase
     /// <summary>
     /// 值
     /// </summary>
-    [SugarColumn(ColumnDescription = "值", Length = 100)]
-    [Required, MaxLength(100)]
+    [SugarColumn(ColumnDescription = "值", Length = 128)]
+    [Required, MaxLength(128)]
     public string Value { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 50)]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "编码", Length = 64)]
+    [Required, MaxLength(64)]
     public string Code { get; set; }
 
     /// <summary>
@@ -35,8 +35,8 @@ public class SysDictData : EntityBase
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 
     /// <summary>

+ 6 - 6
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs

@@ -9,15 +9,15 @@ public class SysDictType : EntityBase
     /// <summary>
     /// 名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 50)]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "名称", Length = 64)]
+    [Required, MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 50)]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "编码", Length = 64)]
+    [Required, MaxLength(64)]
     public string Code { get; set; }
 
     /// <summary>
@@ -29,8 +29,8 @@ public class SysDictType : EntityBase
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 256)]
+    [MaxLength(256)]
     public string Remark { get; set; }
 
     /// <summary>

+ 12 - 12
Admin.NET/Admin.NET.Core/Entity/SysFile.cs

@@ -9,42 +9,42 @@ public class SysFile : EntityBase
     /// <summary>
     /// 仓储名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "仓储名称", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "仓储名称", Length = 128)]
+    [MaxLength(128)]
     public string BucketName { get; set; }
 
     /// <summary>
     /// 文件名称(上传时名称)
     /// </summary>文件名称
-    [SugarColumn(ColumnDescription = "文件名称", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "文件名称", Length = 128)]
+    [MaxLength(128)]
     public string FileName { get; set; }
 
     /// <summary>
     /// 文件后缀
     /// </summary>
-    [SugarColumn(ColumnDescription = "文件后缀", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "文件后缀", Length = 16)]
+    [MaxLength(16)]
     public string Suffix { get; set; }
 
     /// <summary>
     /// 存储路径
     /// </summary>
-    [SugarColumn(ColumnDescription = "存储路径", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "存储路径", Length = 128)]
+    [MaxLength(128)]
     public string FilePath { get; set; }
 
     /// <summary>
     /// 文件大小KB
     /// </summary>
-    [SugarColumn(ColumnDescription = "文件大小KB", Length = 10)]
-    [MaxLength(10)]
+    [SugarColumn(ColumnDescription = "文件大小KB", Length = 16)]
+    [MaxLength(16)]
     public string SizeKb { get; set; }
 
     /// <summary>
     /// 文件大小信息-计算后的
     /// </summary>
-    [SugarColumn(ColumnDescription = "文件大小信息", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "文件大小信息", Length = 64)]
+    [MaxLength(64)]
     public string SizeInfo { get; set; }
 }

+ 10 - 10
Admin.NET/Admin.NET.Core/Entity/SysLogAudit.cs

@@ -9,27 +9,27 @@ public class SysLogAudit : EntityBase
     /// <summary>
     /// 表名
     /// </summary>
-    [SugarColumn(ColumnDescription = "表名", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "表名", Length = 64)]
+    [MaxLength(64)]
     public string TableName { get; set; }
 
     /// <summary>
     /// 列名
     /// </summary>
-    [SugarColumn(ColumnDescription = "列名", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "列名", Length = 64)]
+    [MaxLength(64)]
     public string ColumnName { get; set; }
 
     /// <summary>
     /// 新值
     /// </summary>
-    [SugarColumn(ColumnDescription = "新值")]
+    [SugarColumn(ColumnDescription = "新值", ColumnDataType = "longtext,text,clob")]
     public string NewValue { get; set; }
 
     /// <summary>
     /// 旧值
     /// </summary>
-    [SugarColumn(ColumnDescription = "旧值")]
+    [SugarColumn(ColumnDescription = "旧值", ColumnDataType = "longtext,text,clob")]
     public string OldValue { get; set; }
 
     /// <summary>
@@ -47,14 +47,14 @@ public class SysLogAudit : EntityBase
     /// <summary>
     /// 账号名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "账号名称", Length = 32)]
+    [MaxLength(32)]
     public string UserName { get; set; }
 
     /// <summary>
     /// 真实姓名
     /// </summary>
-    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
+    [MaxLength(32)]
     public string RealName { get; set; }
 }

+ 4 - 2
Admin.NET/Admin.NET.Core/Entity/SysLogEx.cs

@@ -9,13 +9,15 @@ public class SysLogEx : EntityBase
     /// <summary>
     /// 日志名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "日志名称", Length = 200)]
+    [SugarColumn(ColumnDescription = "日志名称", Length = 256)]
+    [MaxLength(256)]
     public string LogName { get; set; }
 
     /// <summary>
     /// 日志级别
     /// </summary>
-    [SugarColumn(ColumnDescription = "日志级别", Length = 20)]
+    [SugarColumn(ColumnDescription = "日志级别", Length = 16)]
+    [MaxLength(16)]
     public string LogLevel { get; set; }
 
     /// <summary>

+ 4 - 2
Admin.NET/Admin.NET.Core/Entity/SysLogOp.cs

@@ -9,13 +9,15 @@ public class SysLogOp : EntityBase
     /// <summary>
     /// 日志名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "日志名称", Length = 200)]
+    [SugarColumn(ColumnDescription = "日志名称", Length = 256)]
+    [MaxLength(256)]
     public string LogName { get; set; }
 
     /// <summary>
     /// 日志级别
     /// </summary>
-    [SugarColumn(ColumnDescription = "日志级别", Length = 20)]
+    [SugarColumn(ColumnDescription = "日志级别", Length = 16)]
+    [MaxLength(16)]
     public string LogLevel { get; set; }
 
     /// <summary>

+ 12 - 12
Admin.NET/Admin.NET.Core/Entity/SysLogVis.cs

@@ -21,29 +21,29 @@ public class SysLogVis : EntityBase
     /// <summary>
     /// IP地址
     /// </summary>
-    [SugarColumn(ColumnDescription = "IP地址", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "IP地址", Length = 16)]
+    [MaxLength(16)]
     public string Ip { get; set; }
 
     /// <summary>
     /// 地址
     /// </summary>
-    [SugarColumn(ColumnDescription = "地址", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "地址", Length = 128)]
+    [MaxLength(128)]
     public string Location { get; set; }
 
     /// <summary>
     /// 浏览器
     /// </summary>
-    [SugarColumn(ColumnDescription = "浏览器", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "浏览器", Length = 128)]
+    [MaxLength(128)]
     public string Browser { get; set; }
 
     /// <summary>
     /// 操作系统
     /// </summary>
-    [SugarColumn(ColumnDescription = "操作系统", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "操作系统", Length = 128)]
+    [MaxLength(128)]
     public string Os { get; set; }
 
     /// <summary>
@@ -55,14 +55,14 @@ public class SysLogVis : EntityBase
     /// <summary>
     /// 账号名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "账号名称", Length = 32)]
+    [MaxLength(32)]
     public string UserName { get; set; }
 
     /// <summary>
     /// 真实姓名
     /// </summary>
-    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
+    [MaxLength(32)]
     public string RealName { get; set; }
 }

+ 18 - 18
Admin.NET/Admin.NET.Core/Entity/SysMenu.cs

@@ -21,57 +21,57 @@ public class SysMenu : EntityBase
     /// <summary>
     /// 名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "名称", Length = 64)]
+    [MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 路由地址
     /// </summary>
-    [SugarColumn(ColumnDescription = "路由地址", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "路由地址", Length = 128)]
+    [MaxLength(128)]
     public string Path { get; set; }
 
     /// <summary>
     /// 组件路径
     /// </summary>
-    [SugarColumn(ColumnDescription = "组件路径", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "组件路径", Length = 128)]
+    [MaxLength(128)]
     public string Component { get; set; }
 
     /// <summary>
     /// 权限标识
     /// </summary>
-    [SugarColumn(ColumnDescription = "权限标识", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "权限标识", Length = 128)]
+    [MaxLength(128)]
     public string Permission { get; set; }
 
     /// <summary>
     /// 重定向
     /// </summary>
-    [SugarColumn(ColumnDescription = "重定向", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "重定向", Length = 128)]
+    [MaxLength(128)]
     public string Redirect { get; set; }
 
     /// <summary>
     /// 内嵌地址
     /// </summary>
-    [SugarColumn(ColumnDescription = "内嵌地址", Length = 100)]
-    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "内嵌地址", Length = 128)]
+    [MaxLength(128)]
     public string FrameSrc { get; set; }
 
     /// <summary>
     /// 标题
     /// </summary>
-    [SugarColumn(ColumnDescription = "标题", Length = 50)]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "标题", Length = 64)]
+    [Required, MaxLength(64)]
     public string Title { get; set; }
 
     /// <summary>
     /// 图标
     /// </summary>
-    [SugarColumn(ColumnDescription = "图标", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "图标", Length = 128)]
+    [MaxLength(128)]
     public string Icon { get; set; }
 
     /// <summary>
@@ -89,8 +89,8 @@ public class SysMenu : EntityBase
     /// <summary>
     /// 当前激活的菜单-用于配置详情页时左侧激活的菜单路径
     /// </summary>
-    [SugarColumn(ColumnDescription = "当前激活菜单", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "当前激活菜单", Length = 128)]
+    [MaxLength(128)]
     public string CurrentActiveMenu { get; set; }
 
     /// <summary>

+ 10 - 10
Admin.NET/Admin.NET.Core/Entity/SysOnlineUser.cs

@@ -21,15 +21,15 @@ public class SysOnlineUser : EntityBaseId
     /// <summary>
     /// 账号
     /// </summary>
-    [SugarColumn(ColumnDescription = "账号", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "账号", Length = 32)]
+    [Required, MaxLength(32)]
     public string Account { get; set; }
 
     /// <summary>
     /// 姓名
     /// </summary>
-    [SugarColumn(ColumnDescription = "姓名", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "姓名", Length = 32)]
+    [MaxLength(32)]
     public string Name { get; set; }
 
     /// <summary>
@@ -41,22 +41,22 @@ public class SysOnlineUser : EntityBaseId
     /// <summary>
     /// 最后登录IP
     /// </summary>
-    [SugarColumn(ColumnDescription = "最后登录IP", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "最后登录IP", Length = 16)]
+    [MaxLength(16)]
     public string LastLoginIp { get; set; }
 
     /// <summary>
     /// 最后登录浏览器
     /// </summary>
-    [SugarColumn(ColumnDescription = "最后登录浏览器", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "最后登录浏览器", Length = 32)]
+    [MaxLength(32)]
     public string LastLoginBrowser { get; set; }
 
     /// <summary>
     /// 最后登录所用系统
     /// </summary>
-    [SugarColumn(ColumnDescription = "最后登录系统", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "最后登录系统", Length = 32)]
+    [MaxLength(32)]
     public string LastLoginOs { get; set; }
 
     /// <summary>

+ 8 - 8
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs

@@ -15,15 +15,15 @@ public class SysOrg : EntityTenant
     /// <summary>
     /// 名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 100)]
-    [Required, MaxLength(100)]
+    [SugarColumn(ColumnDescription = "名称", Length = 64)]
+    [Required, MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "编码", Length = 64)]
+    [MaxLength(64)]
     public string Code { get; set; }
 
     /// <summary>
@@ -35,8 +35,8 @@ public class SysOrg : EntityTenant
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 
     /// <summary>
@@ -48,8 +48,8 @@ public class SysOrg : EntityTenant
     /// <summary>
     /// 级别 例如:省、市、县、区
     /// </summary>
-    [SugarColumn(ColumnDescription = "级别")]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "级别", Length = 16)]
+    [MaxLength(16)]
     public string Level { get; set; }
 
     /// <summary>

+ 6 - 6
Admin.NET/Admin.NET.Core/Entity/SysPos.cs

@@ -9,15 +9,15 @@ public class SysPos : EntityTenant
     /// <summary>
     /// 名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "名称", Length = 64)]
+    [Required, MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "编码", Length = 64)]
+    [MaxLength(64)]
     public string Code { get; set; }
 
     /// <summary>
@@ -29,8 +29,8 @@ public class SysPos : EntityTenant
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 
     /// <summary>

+ 6 - 6
Admin.NET/Admin.NET.Core/Entity/SysRole.cs

@@ -9,15 +9,15 @@ public class SysRole : EntityTenant
     /// <summary>
     /// 名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "名称", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "名称", Length = 64)]
+    [Required, MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "编码", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "编码", Length = 64)]
+    [MaxLength(64)]
     public string Code { get; set; }
 
     /// <summary>
@@ -35,8 +35,8 @@ public class SysRole : EntityTenant
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 
     /// <summary>

+ 16 - 16
Admin.NET/Admin.NET.Core/Entity/SysTenant.cs

@@ -9,56 +9,56 @@ public class SysTenant : EntityBase
     /// <summary>
     /// 公司名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "公司名称", Length = 30)]
-    [Required, MaxLength(30)]
+    [SugarColumn(ColumnDescription = "公司名称", Length = 64)]
+    [Required, MaxLength(64)]
     public string Name { get; set; }
 
     /// <summary>
     /// 管理员名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "管理员名称", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "管理员名称", Length = 32)]
+    [Required, MaxLength(32)]
     public string AdminName { get; set; }
 
     /// <summary>
     /// 主机
     /// </summary>
-    [SugarColumn(ColumnDescription = "主机", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "主机", Length = 128)]
+    [MaxLength(128)]
     public string Host { get; set; }
 
     /// <summary>
     /// 电子邮箱
     /// </summary>
-    [SugarColumn(ColumnDescription = "电子邮箱", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "电子邮箱", Length = 64)]
+    [MaxLength(64)]
     public string Email { get; set; }
 
     /// <summary>
     /// 电话
     /// </summary>
-    [SugarColumn(ColumnDescription = "电话", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "电话", Length = 16)]
+    [MaxLength(16)]
     public string Phone { get; set; }
 
     /// <summary>
     /// 数据库连接
     /// </summary>
-    [SugarColumn(ColumnDescription = "数据库连接", Length = 200)]
-    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "数据库连接", Length = 256)]
+    [MaxLength(256)]
     public string Connection { get; set; }
 
     /// <summary>
     /// 架构
     /// </summary>
-    [SugarColumn(ColumnDescription = "架构", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "架构", Length = 64)]
+    [MaxLength(64)]
     public string Schema { get; set; }
 
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 }

+ 8 - 8
Admin.NET/Admin.NET.Core/Entity/SysTimer.cs

@@ -9,8 +9,8 @@ public class SysTimer : EntityBase
     /// <summary>
     /// 任务名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "任务名称", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "任务名称", Length = 64)]
+    [Required, MaxLength(64)]
     public virtual string TimerName { get; set; }
 
     /// <summary>
@@ -41,8 +41,8 @@ public class SysTimer : EntityBase
     /// <summary>
     /// Cron表达式
     /// </summary>
-    [SugarColumn(ColumnDescription = "Cron表达式", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "Cron表达式", Length = 32)]
+    [MaxLength(32)]
     public string Cron { get; set; }
 
     /// <summary>
@@ -54,8 +54,8 @@ public class SysTimer : EntityBase
     /// <summary>
     /// 请求url
     /// </summary>
-    [SugarColumn(ColumnDescription = "请求url", Length = 200)]
-    [MaxLength(200)]
+    [SugarColumn(ColumnDescription = "请求url", Length = 256)]
+    [MaxLength(256)]
     public string RequestUrl { get; set; }
 
     /// <summary>
@@ -79,7 +79,7 @@ public class SysTimer : EntityBase
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 }

+ 24 - 24
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -9,29 +9,29 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 账号
     /// </summary>
-    [SugarColumn(ColumnDescription = "账号名称", Length = 20)]
-    [Required, MaxLength(20)]
+    [SugarColumn(ColumnDescription = "账号名称", Length = 32)]
+    [Required, MaxLength(32)]
     public virtual string UserName { get; set; }
 
     /// <summary>
     /// 密码(默认MD5加密)
     /// </summary>
-    [SugarColumn(ColumnDescription = "账号密码", Length = 50)]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "账号密码", Length = 64)]
+    [Required, MaxLength(64)]
     public string Password { get; set; }
 
     /// <summary>
     /// 昵称
     /// </summary>
-    [SugarColumn(ColumnDescription = "昵称", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "昵称", Length = 32)]
+    [MaxLength(32)]
     public string NickName { get; set; }
 
     /// <summary>
     /// 头像
     /// </summary>
-    [SugarColumn(ColumnDescription = "头像", Length = 255)]
-    [MaxLength(255)]
+    [SugarColumn(ColumnDescription = "头像", Length = 256)]
+    [MaxLength(256)]
     public string Avatar { get; set; }
 
     /// <summary>
@@ -49,43 +49,43 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 邮箱
     /// </summary>
-    [SugarColumn(ColumnDescription = "邮箱", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "邮箱", Length = 64)]
+    [MaxLength(64)]
     public string Email { get; set; }
 
     /// <summary>
     /// 手机号码
     /// </summary>
-    [SugarColumn(ColumnDescription = "手机号码", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "手机号码", Length = 16)]
+    [MaxLength(16)]
     public string Phone { get; set; }
 
     /// <summary>
     /// 真实姓名
     /// </summary>
-    [SugarColumn(ColumnDescription = "真实姓名", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
+    [MaxLength(32)]
     public string RealName { get; set; }
 
     /// <summary>
     /// 身份证号
     /// </summary>
-    [SugarColumn(ColumnDescription = "身份证号", Length = 20)]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "身份证号", Length = 32)]
+    [MaxLength(32)]
     public string IdCard { get; set; }
 
     /// <summary>
     /// 个性签名
     /// </summary>
-    [SugarColumn(ColumnDescription = "个性签名", Length = 50)]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "个性签名", Length = 64)]
+    [MaxLength(64)]
     public string Signature { get; set; }
 
     /// <summary>
     /// 个人简介
     /// </summary>
-    [SugarColumn(ColumnDescription = "个人简介", Length = 500)]
-    [MaxLength(500)]
+    [SugarColumn(ColumnDescription = "个人简介", Length = 512)]
+    [MaxLength(512)]
     public string Introduction { get; set; }
 
     /// <summary>
@@ -97,8 +97,8 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 备注
     /// </summary>
-    [SugarColumn(ColumnDescription = "备注", Length = 100)]
-    [MaxLength(100)]
+    [SugarColumn(ColumnDescription = "备注", Length = 128)]
+    [MaxLength(128)]
     public string Remark { get; set; }
 
     /// <summary>
@@ -136,8 +136,8 @@ public class SysUser : EntityTenant
     /// <summary>
     /// 工号
     /// </summary>
-    [SugarColumn(ColumnDescription = "工号", Length = 30)]
-    [MaxLength(30)]
+    [SugarColumn(ColumnDescription = "工号", Length = 32)]
+    [MaxLength(32)]
     public string JobNum { get; set; }
 
     /// <summary>

+ 23 - 23
Admin.NET/Admin.NET.Core/Entity/WechatUser.cs

@@ -27,43 +27,43 @@ public class WechatUser : EntityBase
     /// <summary>
     /// OpenId
     /// </summary>
-    [SugarColumn(ColumnDescription = "OpenId")]
-    [Required, MaxLength(50)]
+    [SugarColumn(ColumnDescription = "OpenId", Length = 64)]
+    [Required, MaxLength(64)]
     public string OpenId { get; set; }
 
     /// <summary>
     /// 缓存key
     /// </summary>
-    [SugarColumn(ColumnDescription = "缓存key")]
-    [MaxLength(255)]
+    [SugarColumn(ColumnDescription = "缓存key", Length = 256)]
+    [MaxLength(256)]
     public string SessionKey { get; set; }
 
     /// <summary>
     /// UnionId
     /// </summary>
-    [SugarColumn(ColumnDescription = "UnionId")]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "UnionId", Length = 64)]
+    [MaxLength(64)]
     public string UnionId { get; set; }
 
     /// <summary>
     /// 昵称
     /// </summary>
-    [SugarColumn(ColumnDescription = "昵称")]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "昵称", Length = 64)]
+    [MaxLength(64)]
     public string NickName { get; set; }
 
     /// <summary>
     /// 头像
     /// </summary>
-    [SugarColumn(ColumnDescription = "头像")]
-    [MaxLength(255)]
+    [SugarColumn(ColumnDescription = "头像", Length = 256)]
+    [MaxLength(256)]
     public string Avatar { get; set; }
 
     /// <summary>
     /// 手机号码
     /// </summary>
-    [SugarColumn(ColumnDescription = "手机号码")]
-    [MaxLength(20)]
+    [SugarColumn(ColumnDescription = "手机号码", Length = 16)]
+    [MaxLength(16)]
     public string Mobile { get; set; }
 
     /// <summary>
@@ -75,45 +75,45 @@ public class WechatUser : EntityBase
     /// <summary>
     /// 语言
     /// </summary>
-    [SugarColumn(ColumnDescription = "语言")]
-    [MaxLength(50)]
+    [SugarColumn(ColumnDescription = "语言", Length = 64)]
+    [MaxLength(64)]
     public string Language { get; set; }
 
     /// <summary>
     /// 城市
     /// </summary>
-    [SugarColumn(ColumnDescription = "城市")]
-    [MaxLength(80)]
+    [SugarColumn(ColumnDescription = "城市", Length = 64)]
+    [MaxLength(64)]
     public string City { get; set; }
 
     /// <summary>
     /// 省
     /// </summary>
-    [SugarColumn(ColumnDescription = "省")]
-    [MaxLength(80)]
+    [SugarColumn(ColumnDescription = "省", Length = 64)]
+    [MaxLength(64)]
     public string Province { get; set; }
 
     /// <summary>
     /// 国家
     /// </summary>
-    [SugarColumn(ColumnDescription = "国家")]
-    [MaxLength(80)]
+    [SugarColumn(ColumnDescription = "国家", Length = 64)]
+    [MaxLength(64)]
     public string Country { get; set; }
 
     /// <summary>
     /// AccessToken
     /// </summary>
-    [SugarColumn(ColumnDescription = "AccessToken")]
+    [SugarColumn(ColumnDescription = "AccessToken", ColumnDataType = "longtext,text,clob")]
     public string AccessToken { get; set; }
 
     /// <summary>
     /// RefreshToken
     /// </summary>
-    [SugarColumn(ColumnDescription = "RefreshToken")]
+    [SugarColumn(ColumnDescription = "RefreshToken", ColumnDataType = "longtext,text,clob")]
     public string RefreshToken { get; set; }
 
     /// <summary>
-    /// ExpiresIn
+    /// 过期时间
     /// </summary>
     [SugarColumn(ColumnDescription = "ExpiresIn")]
     public int ExpiresIn { get; set; }