From 3d8f6f56b5a741e6cb9c7c3a95053f33d178f2f1 Mon Sep 17 00:00:00 2001 From: Soar360 Date: Fri, 20 Sep 2024 16:15:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- XUnitTest.XCode/Code/BuildTT/UserTT.cs | 10 ++ XUnitTest.XCode/Code/Dtos/UserDto.cs | 6 ++ .../Code/Entity/\345\234\260\345\214\272.cs" | 36 +++---- ...27\345\205\270\345\217\202\346\225\260.cs" | 46 ++++---- ...20\345\221\230\346\227\245\345\277\227.cs" | 38 +++---- .../Code/Entity/\346\227\245\345\277\227.cs" | 36 +++---- .../Code/Entity/\347\224\250\346\210\267.cs" | 68 ++++++------ ...50\346\210\267\346\227\245\345\277\227.cs" | 38 +++---- .../Code/Entity/\347\247\237\346\210\267.cs" | 34 +++--- ...37\346\210\267\345\205\263\347\263\273.cs" | 26 ++--- .../Code/Entity/\350\217\234\345\215\225.cs" | 54 +++++----- .../Code/Entity/\350\247\222\350\211\262.cs" | 42 ++++---- .../Code/Entity/\351\203\250\351\227\250.cs" | 52 ++++----- XUnitTest.XCode/Code/Models/UserModel.cs | 6 ++ XUnitTest.XCode/Code/class_user_baseclass.cs | 10 ++ XUnitTest.XCode/Code/class_user_extend.cs | 12 +++ XUnitTest.XCode/Code/class_user_extend2.cs | 10 ++ XUnitTest.XCode/Code/class_user_interface.cs | 6 ++ XUnitTest.XCode/Code/class_user_normal.cs | 10 ++ XUnitTest.XCode/Code/class_user_pure.cs | 8 ++ XUnitTest.XCode/Code/class_user_save.cs | 6 ++ XUnitTest.XCode/Code/entity_log_normal.cs | 36 +++---- XUnitTest.XCode/Code/entity_user_normal.cs | 100 ++++++++++++------ .../Code/entity_user_normal_biz.cs | 2 + XUnitTest.XCode/Model/Code/entity_city.cs | 38 +++---- 25 files changed, 424 insertions(+), 306 deletions(-) diff --git a/XUnitTest.XCode/Code/BuildTT/UserTT.cs b/XUnitTest.XCode/Code/BuildTT/UserTT.cs index bd0a03b61..59da4820a 100644 --- a/XUnitTest.XCode/Code/BuildTT/UserTT.cs +++ b/XUnitTest.XCode/Code/BuildTT/UserTT.cs @@ -44,11 +44,21 @@ public partial class UserTT [DisplayName("邮件")] public String Mail { get; set; } + /// 邮箱是否验证。 + [Description("邮箱是否验证。")] + [DisplayName("邮箱是否验证")] + public Boolean MailVerified { get; set; } + /// 手机。支持登录 [Description("手机。支持登录")] [DisplayName("手机")] public String Mobile { get; set; } + /// 手机是否验证。 + [Description("手机是否验证。")] + [DisplayName("手机是否验证")] + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 [Description("代码。身份证、员工编码等，支持登录")] [DisplayName("代码")] diff --git a/XUnitTest.XCode/Code/Dtos/UserDto.cs b/XUnitTest.XCode/Code/Dtos/UserDto.cs index cf798c5ba..f8899bc29 100644 --- a/XUnitTest.XCode/Code/Dtos/UserDto.cs +++ b/XUnitTest.XCode/Code/Dtos/UserDto.cs @@ -29,9 +29,15 @@ public partial class UserDto /// 邮件。支持登录 public String? Mail { get; set; } + /// 邮箱是否验证。 + public Boolean MailVerified { get; set; } + /// 手机。支持登录 public String? Mobile { get; set; } + /// 手机是否验证。 + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 public String? Code { get; set; } diff --git "a/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs" "b/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs" index c51b90b02..d6a4cea99 100644 --- "a/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs" +++ "b/XUnitTest.XCode/Code/Entity/\345\234\260\345\214\272.cs" @@ -233,24 +233,24 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "Name": _Name = Convert.ToString(value); break; - case "FullName": _FullName = Convert.ToString(value); break; - case "ParentID": _ParentID = value.ToInt(); break; - case "Level": _Level = value.ToInt(); break; - case "Kind": _Kind = Convert.ToString(value); break; - case "English": _English = Convert.ToString(value); break; - case "PinYin": _PinYin = Convert.ToString(value); break; - case "JianPin": _JianPin = Convert.ToString(value); break; - case "TelCode": _TelCode = Convert.ToString(value); break; - case "ZipCode": _ZipCode = Convert.ToString(value); break; - case "Longitude": _Longitude = value.ToDouble(); break; - case "Latitude": _Latitude = value.ToDouble(); break; - case "GeoHash": _GeoHash = Convert.ToString(value); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "FullName": _FullName = ValidHelper.ToString(value); break; + case "ParentID": _ParentID = ValidHelper.ToInt32(value); break; + case "Level": _Level = ValidHelper.ToInt32(value); break; + case "Kind": _Kind = ValidHelper.ToString(value); break; + case "English": _English = ValidHelper.ToString(value); break; + case "PinYin": _PinYin = ValidHelper.ToString(value); break; + case "JianPin": _JianPin = ValidHelper.ToString(value); break; + case "TelCode": _TelCode = ValidHelper.ToString(value); break; + case "ZipCode": _ZipCode = ValidHelper.ToString(value); break; + case "Longitude": _Longitude = ValidHelper.ToDouble(value); break; + case "Latitude": _Latitude = ValidHelper.ToDouble(value); break; + case "GeoHash": _GeoHash = ValidHelper.ToString(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs" "b/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs" index 598a4d0ac..947436c8f 100644 --- "a/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs" +++ "b/XUnitTest.XCode/Code/Entity/\345\255\227\345\205\270\345\217\202\346\225\260.cs" @@ -292,29 +292,29 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "UserID": _UserID = value.ToInt(); break; - case "Category": _Category = Convert.ToString(value); break; - case "Name": _Name = Convert.ToString(value); break; - case "Value": _Value = Convert.ToString(value); break; - case "LongValue": _LongValue = Convert.ToString(value); break; - case "Kind": _Kind = (XCode.Membership.ParameterKinds)value.ToInt(); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = Convert.ToDecimal(value); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserID": _UpdateUserID = value.ToInt(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "UserID": _UserID = ValidHelper.ToInt32(value); break; + case "Category": _Category = ValidHelper.ToString(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "Value": _Value = ValidHelper.ToString(value); break; + case "LongValue": _LongValue = ValidHelper.ToString(value); break; + case "Kind": _Kind = ValidHelper.ToEnum(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToDecimal(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserID": _UpdateUserID = ValidHelper.ToInt32(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs" "b/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs" index 4be3bd788..2915499c2 100644 --- "a/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs" +++ "b/XUnitTest.XCode/Code/Entity/\346\210\220\345\221\230\346\227\245\345\277\227.cs" @@ -246,25 +246,25 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToLong(); break; - case "Ds": _Ds = Convert.ToString(value); break; - case "Category": _Category = Convert.ToString(value); break; - case "Action": _Action = Convert.ToString(value); break; - case "LinkID": _LinkID = value.ToInt(); break; - case "Success": _Success = value.ToBoolean(); break; - case "UserName": _UserName = Convert.ToString(value); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "TraceId": _TraceId = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt64(value); break; + case "Ds": _Ds = ValidHelper.ToString(value); break; + case "Category": _Category = ValidHelper.ToString(value); break; + case "Action": _Action = ValidHelper.ToString(value); break; + case "LinkID": _LinkID = ValidHelper.ToInt32(value); break; + case "Success": _Success = ValidHelper.ToBoolean(value); break; + case "UserName": _UserName = ValidHelper.ToString(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "TraceId": _TraceId = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs" "b/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs" index 31c231ea2..64003ef9a 100644 --- "a/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs" +++ "b/XUnitTest.XCode/Code/Entity/\346\227\245\345\277\227.cs" @@ -238,24 +238,24 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToLong(); break; - case "Category": _Category = Convert.ToString(value); break; - case "Action": _Action = Convert.ToString(value); break; - case "LinkID": _LinkID = value.ToInt(); break; - case "Success": _Success = value.ToBoolean(); break; - case "UserName": _UserName = Convert.ToString(value); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "TraceId": _TraceId = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt64(value); break; + case "Category": _Category = ValidHelper.ToString(value); break; + case "Action": _Action = ValidHelper.ToString(value); break; + case "LinkID": _LinkID = ValidHelper.ToInt32(value); break; + case "Success": _Success = ValidHelper.ToBoolean(value); break; + case "UserName": _UserName = ValidHelper.ToString(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "TraceId": _TraceId = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs" "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs" index 9a105ce6d..605bb8a5a 100644 --- "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs" +++ "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267.cs" @@ -409,40 +409,40 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "Name": _Name = Convert.ToString(value); break; - case "Password": _Password = Convert.ToString(value); break; - case "DisplayName": _DisplayName = Convert.ToString(value); break; - case "Sex": _Sex = (XCode.Membership.SexKinds)value.ToInt(); break; - case "Mail": _Mail = Convert.ToString(value); break; - case "Mobile": _Mobile = Convert.ToString(value); break; - case "Code": _Code = Convert.ToString(value); break; - case "AreaId": _AreaId = value.ToInt(); break; - case "Avatar": _Avatar = Convert.ToString(value); break; - case "RoleID": _RoleID = value.ToInt(); break; - case "RoleIds": _RoleIds = Convert.ToString(value); break; - case "DepartmentID": _DepartmentID = value.ToInt(); break; - case "Online": _Online = value.ToBoolean(); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "Age": _Age = value.ToInt(); break; - case "Birthday": _Birthday = value.ToDateTime(); break; - case "Logins": _Logins = value.ToInt(); break; - case "LastLogin": _LastLogin = value.ToDateTime(); break; - case "LastLoginIP": _LastLoginIP = Convert.ToString(value); break; - case "RegisterTime": _RegisterTime = value.ToDateTime(); break; - case "RegisterIP": _RegisterIP = Convert.ToString(value); break; - case "OnlineTime": _OnlineTime = value.ToInt(); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserID": _UpdateUserID = value.ToInt(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "Password": _Password = ValidHelper.ToString(value); break; + case "DisplayName": _DisplayName = ValidHelper.ToString(value); break; + case "Sex": _Sex = ValidHelper.ToEnum(value); break; + case "Mail": _Mail = ValidHelper.ToString(value); break; + case "Mobile": _Mobile = ValidHelper.ToString(value); break; + case "Code": _Code = ValidHelper.ToString(value); break; + case "AreaId": _AreaId = ValidHelper.ToInt32(value); break; + case "Avatar": _Avatar = ValidHelper.ToString(value); break; + case "RoleID": _RoleID = ValidHelper.ToInt32(value); break; + case "RoleIds": _RoleIds = ValidHelper.ToString(value); break; + case "DepartmentID": _DepartmentID = ValidHelper.ToInt32(value); break; + case "Online": _Online = ValidHelper.ToBoolean(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "Age": _Age = ValidHelper.ToInt32(value); break; + case "Birthday": _Birthday = ValidHelper.ToDateTime(value); break; + case "Logins": _Logins = ValidHelper.ToInt32(value); break; + case "LastLogin": _LastLogin = ValidHelper.ToDateTime(value); break; + case "LastLoginIP": _LastLoginIP = ValidHelper.ToString(value); break; + case "RegisterTime": _RegisterTime = ValidHelper.ToDateTime(value); break; + case "RegisterIP": _RegisterIP = ValidHelper.ToString(value); break; + case "OnlineTime": _OnlineTime = ValidHelper.ToInt32(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserID": _UpdateUserID = ValidHelper.ToInt32(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs" "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs" index 8f7f32a06..cbbc14def 100644 --- "a/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs" +++ "b/XUnitTest.XCode/Code/Entity/\347\224\250\346\210\267\346\227\245\345\277\227.cs" @@ -248,25 +248,25 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToLong(); break; - case "DataTime": _DataTime = value.ToDateTime(); break; - case "Category": _Category = Convert.ToString(value); break; - case "Action": _Action = Convert.ToString(value); break; - case "LinkID": _LinkID = value.ToInt(); break; - case "Success": _Success = value.ToBoolean(); break; - case "UserName": _UserName = Convert.ToString(value); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "TraceId": _TraceId = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt64(value); break; + case "DataTime": _DataTime = ValidHelper.ToDateTime(value); break; + case "Category": _Category = ValidHelper.ToString(value); break; + case "Action": _Action = ValidHelper.ToString(value); break; + case "LinkID": _LinkID = ValidHelper.ToInt32(value); break; + case "Success": _Success = ValidHelper.ToBoolean(value); break; + case "UserName": _UserName = ValidHelper.ToString(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "TraceId": _TraceId = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs" "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs" index 76e5f87f2..c8424788f 100644 --- "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs" +++ "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267.cs" @@ -216,23 +216,23 @@ public override Object? this[String name] { switch (name) { - case "Id": _Id = value.ToInt(); break; - case "Code": _Code = Convert.ToString(value); break; - case "Name": _Name = Convert.ToString(value); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "ManagerId": _ManagerId = value.ToInt(); break; - case "RoleIds": _RoleIds = Convert.ToString(value); break; - case "Logo": _Logo = Convert.ToString(value); break; - case "DatabaseName": _DatabaseName = Convert.ToString(value); break; - case "TableName": _TableName = Convert.ToString(value); break; - case "Expired": _Expired = value.ToDateTime(); break; - case "CreateUserId": _CreateUserId = value.ToInt(); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "UpdateUserId": _UpdateUserId = value.ToInt(); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "Id": _Id = ValidHelper.ToInt32(value); break; + case "Code": _Code = ValidHelper.ToString(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "ManagerId": _ManagerId = ValidHelper.ToInt32(value); break; + case "RoleIds": _RoleIds = ValidHelper.ToString(value); break; + case "Logo": _Logo = ValidHelper.ToString(value); break; + case "DatabaseName": _DatabaseName = ValidHelper.ToString(value); break; + case "TableName": _TableName = ValidHelper.ToString(value); break; + case "Expired": _Expired = ValidHelper.ToDateTime(value); break; + case "CreateUserId": _CreateUserId = ValidHelper.ToInt32(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "UpdateUserId": _UpdateUserId = ValidHelper.ToInt32(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs" "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs" index 1da2fa42e..7e675feb3 100644 --- "a/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs" +++ "b/XUnitTest.XCode/Code/Entity/\347\247\237\346\210\267\345\205\263\347\263\273.cs" @@ -177,19 +177,19 @@ public override Object? this[String name] { switch (name) { - case "Id": _Id = value.ToInt(); break; - case "TenantId": _TenantId = value.ToInt(); break; - case "UserId": _UserId = value.ToInt(); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "RoleId": _RoleId = value.ToInt(); break; - case "RoleIds": _RoleIds = Convert.ToString(value); break; - case "CreateUserId": _CreateUserId = value.ToInt(); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "UpdateUserId": _UpdateUserId = value.ToInt(); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "Id": _Id = ValidHelper.ToInt32(value); break; + case "TenantId": _TenantId = ValidHelper.ToInt32(value); break; + case "UserId": _UserId = ValidHelper.ToInt32(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "RoleId": _RoleId = ValidHelper.ToInt32(value); break; + case "RoleIds": _RoleIds = ValidHelper.ToString(value); break; + case "CreateUserId": _CreateUserId = ValidHelper.ToInt32(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "UpdateUserId": _UpdateUserId = ValidHelper.ToInt32(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs" "b/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs" index e6d88712e..dbcdc0e32 100644 --- "a/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs" +++ "b/XUnitTest.XCode/Code/Entity/\350\217\234\345\215\225.cs" @@ -331,33 +331,33 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "Name": _Name = Convert.ToString(value); break; - case "DisplayName": _DisplayName = Convert.ToString(value); break; - case "FullName": _FullName = Convert.ToString(value); break; - case "ParentID": _ParentID = value.ToInt(); break; - case "Url": _Url = Convert.ToString(value); break; - case "Sort": _Sort = value.ToInt(); break; - case "Icon": _Icon = Convert.ToString(value); break; - case "Visible": _Visible = value.ToBoolean(); break; - case "Necessary": _Necessary = value.ToBoolean(); break; - case "NewWindow": _NewWindow = value.ToBoolean(); break; - case "Permission": _Permission = Convert.ToString(value); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserID": _UpdateUserID = value.ToInt(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "DisplayName": _DisplayName = ValidHelper.ToString(value); break; + case "FullName": _FullName = ValidHelper.ToString(value); break; + case "ParentID": _ParentID = ValidHelper.ToInt32(value); break; + case "Url": _Url = ValidHelper.ToString(value); break; + case "Sort": _Sort = ValidHelper.ToInt32(value); break; + case "Icon": _Icon = ValidHelper.ToString(value); break; + case "Visible": _Visible = ValidHelper.ToBoolean(value); break; + case "Necessary": _Necessary = ValidHelper.ToBoolean(value); break; + case "NewWindow": _NewWindow = ValidHelper.ToBoolean(value); break; + case "Permission": _Permission = ValidHelper.ToString(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserID": _UpdateUserID = ValidHelper.ToInt32(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\350\247\222\350\211\262.cs" "b/XUnitTest.XCode/Code/Entity/\350\247\222\350\211\262.cs" index 2321e5b6e..f9a487065 100644 --- "a/XUnitTest.XCode/Code/Entity/\350\247\222\350\211\262.cs" +++ "b/XUnitTest.XCode/Code/Entity/\350\247\222\350\211\262.cs" @@ -270,27 +270,27 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "Name": _Name = Convert.ToString(value); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "IsSystem": _IsSystem = value.ToBoolean(); break; - case "Permission": _Permission = Convert.ToString(value); break; - case "Sort": _Sort = value.ToInt(); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserID": _UpdateUserID = value.ToInt(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "IsSystem": _IsSystem = ValidHelper.ToBoolean(value); break; + case "Permission": _Permission = ValidHelper.ToString(value); break; + case "Sort": _Sort = ValidHelper.ToInt32(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserID": _UpdateUserID = ValidHelper.ToInt32(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git "a/XUnitTest.XCode/Code/Entity/\351\203\250\351\227\250.cs" "b/XUnitTest.XCode/Code/Entity/\351\203\250\351\227\250.cs" index 163f0bce9..d65d8d3dd 100644 --- "a/XUnitTest.XCode/Code/Entity/\351\203\250\351\227\250.cs" +++ "b/XUnitTest.XCode/Code/Entity/\351\203\250\351\227\250.cs" @@ -324,32 +324,32 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "TenantId": _TenantId = value.ToInt(); break; - case "Code": _Code = Convert.ToString(value); break; - case "Name": _Name = Convert.ToString(value); break; - case "FullName": _FullName = Convert.ToString(value); break; - case "ParentID": _ParentID = value.ToInt(); break; - case "Level": _Level = value.ToInt(); break; - case "Sort": _Sort = value.ToInt(); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "Visible": _Visible = value.ToBoolean(); break; - case "ManagerId": _ManagerId = value.ToInt(); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserID": _UpdateUserID = value.ToInt(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "TenantId": _TenantId = ValidHelper.ToInt32(value); break; + case "Code": _Code = ValidHelper.ToString(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "FullName": _FullName = ValidHelper.ToString(value); break; + case "ParentID": _ParentID = ValidHelper.ToInt32(value); break; + case "Level": _Level = ValidHelper.ToInt32(value); break; + case "Sort": _Sort = ValidHelper.ToInt32(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "Visible": _Visible = ValidHelper.ToBoolean(value); break; + case "ManagerId": _ManagerId = ValidHelper.ToInt32(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserID": _UpdateUserID = ValidHelper.ToInt32(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git a/XUnitTest.XCode/Code/Models/UserModel.cs b/XUnitTest.XCode/Code/Models/UserModel.cs index 405b537fd..342ca2e39 100644 --- a/XUnitTest.XCode/Code/Models/UserModel.cs +++ b/XUnitTest.XCode/Code/Models/UserModel.cs @@ -29,9 +29,15 @@ public partial class UserModel /// 邮件。支持登录 public String? Mail { get; set; } + /// 邮箱是否验证。 + public Boolean MailVerified { get; set; } + /// 手机。支持登录 public String? Mobile { get; set; } + /// 手机是否验证。 + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 public String? Code { get; set; } diff --git a/XUnitTest.XCode/Code/class_user_baseclass.cs b/XUnitTest.XCode/Code/class_user_baseclass.cs index ce4432141..04391aef5 100644 --- a/XUnitTest.XCode/Code/class_user_baseclass.cs +++ b/XUnitTest.XCode/Code/class_user_baseclass.cs @@ -44,11 +44,21 @@ public partial class User : MyEntityBase [DisplayName("邮件")] public String Mail { get; set; } + /// 邮箱是否验证。 + [Description("邮箱是否验证。")] + [DisplayName("邮箱是否验证")] + public Boolean MailVerified { get; set; } + /// 手机。支持登录 [Description("手机。支持登录")] [DisplayName("手机")] public String Mobile { get; set; } + /// 手机是否验证。 + [Description("手机是否验证。")] + [DisplayName("手机是否验证")] + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 [Description("代码。身份证、员工编码等，支持登录")] [DisplayName("代码")] diff --git a/XUnitTest.XCode/Code/class_user_extend.cs b/XUnitTest.XCode/Code/class_user_extend.cs index f7f76d0e6..025c45d13 100644 --- a/XUnitTest.XCode/Code/class_user_extend.cs +++ b/XUnitTest.XCode/Code/class_user_extend.cs @@ -31,9 +31,15 @@ public partial class ExtendUser : Object, IxxUser, IModel /// 邮件。支持登录 public String Mail { get; set; } + /// 邮箱是否验证。 + public Boolean MailVerified { get; set; } + /// 手机。支持登录 public String Mobile { get; set; } + /// 手机是否验证。 + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 public String Code { get; set; } @@ -120,7 +126,9 @@ public virtual Object this[String name] "DisplayName" => DisplayName, "Sex" => Sex, "Mail" => Mail, + "MailVerified" => MailVerified, "Mobile" => Mobile, + "MobileVerified" => MobileVerified, "Code" => Code, "AreaId" => AreaId, "Avatar" => Avatar, @@ -157,7 +165,9 @@ public virtual Object this[String name] case "DisplayName": DisplayName = Convert.ToString(value); break; case "Sex": Sex = (XCode.Membership.SexKinds)value.ToInt(); break; case "Mail": Mail = Convert.ToString(value); break; + case "MailVerified": MailVerified = value.ToBoolean(); break; case "Mobile": Mobile = Convert.ToString(value); break; + case "MobileVerified": MobileVerified = value.ToBoolean(); break; case "Code": Code = Convert.ToString(value); break; case "AreaId": AreaId = value.ToInt(); break; case "Avatar": Avatar = Convert.ToString(value); break; @@ -198,7 +208,9 @@ public void Copy(ExtendUser model) DisplayName = model.DisplayName; Sex = model.Sex; Mail = model.Mail; + MailVerified = model.MailVerified; Mobile = model.Mobile; + MobileVerified = model.MobileVerified; Code = model.Code; AreaId = model.AreaId; Avatar = model.Avatar; diff --git a/XUnitTest.XCode/Code/class_user_extend2.cs b/XUnitTest.XCode/Code/class_user_extend2.cs index 5b55deb05..e76c13f3e 100644 --- a/XUnitTest.XCode/Code/class_user_extend2.cs +++ b/XUnitTest.XCode/Code/class_user_extend2.cs @@ -31,9 +31,15 @@ public partial class ExtendUser2 : IModel /// 邮件。支持登录 public String Mail { get; set; } + /// 邮箱是否验证。 + public Boolean MailVerified { get; set; } + /// 手机。支持登录 public String Mobile { get; set; } + /// 手机是否验证。 + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 public String Code { get; set; } @@ -120,7 +126,9 @@ public virtual Object this[String name] "DisplayName" => DisplayName, "Sex" => Sex, "Mail" => Mail, + "MailVerified" => MailVerified, "Mobile" => Mobile, + "MobileVerified" => MobileVerified, "Code" => Code, "AreaId" => AreaId, "Avatar" => Avatar, @@ -157,7 +165,9 @@ public virtual Object this[String name] case "DisplayName": DisplayName = Convert.ToString(value); break; case "Sex": Sex = (XCode.Membership.SexKinds)value.ToInt(); break; case "Mail": Mail = Convert.ToString(value); break; + case "MailVerified": MailVerified = value.ToBoolean(); break; case "Mobile": Mobile = Convert.ToString(value); break; + case "MobileVerified": MobileVerified = value.ToBoolean(); break; case "Code": Code = Convert.ToString(value); break; case "AreaId": AreaId = value.ToInt(); break; case "Avatar": Avatar = Convert.ToString(value); break; diff --git a/XUnitTest.XCode/Code/class_user_interface.cs b/XUnitTest.XCode/Code/class_user_interface.cs index 2978c2946..22895cb3a 100644 --- a/XUnitTest.XCode/Code/class_user_interface.cs +++ b/XUnitTest.XCode/Code/class_user_interface.cs @@ -29,9 +29,15 @@ public partial interface IxxUser : NewLife.Data.IModel /// 邮件。支持登录 String? Mail { get; set; } + /// 邮箱是否验证。 + Boolean MailVerified { get; set; } + /// 手机。支持登录 String? Mobile { get; set; } + /// 手机是否验证。 + Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 String? Code { get; set; } diff --git a/XUnitTest.XCode/Code/class_user_normal.cs b/XUnitTest.XCode/Code/class_user_normal.cs index aaf5a190d..24df6e08e 100644 --- a/XUnitTest.XCode/Code/class_user_normal.cs +++ b/XUnitTest.XCode/Code/class_user_normal.cs @@ -45,11 +45,21 @@ public partial class User [DisplayName("邮件")] public String Mail { get; set; } + /// 邮箱是否验证。 + [Description("邮箱是否验证。")] + [DisplayName("邮箱是否验证")] + public Boolean MailVerified { get; set; } + /// 手机。支持登录 [Description("手机。支持登录")] [DisplayName("手机")] public String Mobile { get; set; } + /// 手机是否验证。 + [Description("手机是否验证。")] + [DisplayName("手机是否验证")] + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 [Description("代码。身份证、员工编码等，支持登录")] [DisplayName("代码")] diff --git a/XUnitTest.XCode/Code/class_user_pure.cs b/XUnitTest.XCode/Code/class_user_pure.cs index 5e4296dc5..f2cc6e1c0 100644 --- a/XUnitTest.XCode/Code/class_user_pure.cs +++ b/XUnitTest.XCode/Code/class_user_pure.cs @@ -29,9 +29,15 @@ public partial class PureUser : Object, IxxUser /// 邮件。支持登录 public String Mail { get; set; } + /// 邮箱是否验证。 + public Boolean MailVerified { get; set; } + /// 手机。支持登录 public String Mobile { get; set; } + /// 手机是否验证。 + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 public String Code { get; set; } @@ -113,7 +119,9 @@ public void Copy(IxxUser model) DisplayName = model.DisplayName; Sex = model.Sex; Mail = model.Mail; + MailVerified = model.MailVerified; Mobile = model.Mobile; + MobileVerified = model.MobileVerified; Code = model.Code; AreaId = model.AreaId; Avatar = model.Avatar; diff --git a/XUnitTest.XCode/Code/class_user_save.cs b/XUnitTest.XCode/Code/class_user_save.cs index 3a7ed5f0f..a3bbcbea5 100644 --- a/XUnitTest.XCode/Code/class_user_save.cs +++ b/XUnitTest.XCode/Code/class_user_save.cs @@ -29,9 +29,15 @@ public partial class User /// 邮件。支持登录 public String Mail { get; set; } + /// 邮箱是否验证。 + public Boolean MailVerified { get; set; } + /// 手机。支持登录 public String Mobile { get; set; } + /// 手机是否验证。 + public Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 public String Code { get; set; } diff --git a/XUnitTest.XCode/Code/entity_log_normal.cs b/XUnitTest.XCode/Code/entity_log_normal.cs index f0e7efbf6..734cb4645 100644 --- a/XUnitTest.XCode/Code/entity_log_normal.cs +++ b/XUnitTest.XCode/Code/entity_log_normal.cs @@ -211,24 +211,24 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToLong(); break; - case "Category": _Category = Convert.ToString(value); break; - case "Action": _Action = Convert.ToString(value); break; - case "LinkID": _LinkID = value.ToLong(); break; - case "Success": _Success = value.ToBoolean(); break; - case "UserName": _UserName = Convert.ToString(value); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "TraceId": _TraceId = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserID": _CreateUserID = value.ToInt(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt64(value); break; + case "Category": _Category = ValidHelper.ToString(value); break; + case "Action": _Action = ValidHelper.ToString(value); break; + case "LinkID": _LinkID = ValidHelper.ToInt64(value); break; + case "Success": _Success = ValidHelper.ToBoolean(value); break; + case "UserName": _UserName = ValidHelper.ToString(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "TraceId": _TraceId = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserID": _CreateUserID = ValidHelper.ToInt32(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } diff --git a/XUnitTest.XCode/Code/entity_user_normal.cs b/XUnitTest.XCode/Code/entity_user_normal.cs index bd901174e..f0afe4292 100644 --- a/XUnitTest.XCode/Code/entity_user_normal.cs +++ b/XUnitTest.XCode/Code/entity_user_normal.cs @@ -77,6 +77,14 @@ public partial class User [BindColumn("Mail", "邮件。支持登录", "", ItemType = "mail")] public String? Mail { get => _Mail; set { if (OnPropertyChanging("Mail", value)) { _Mail = value; OnPropertyChanged("Mail"); } } } + private Boolean _MailVerified; + /// 邮箱是否验证。 + [DisplayName("邮箱是否验证")] + [Description("邮箱是否验证。")] + [DataObjectField(false, false, false, 0)] + [BindColumn("MailVerified", "邮箱是否验证。", "")] + public Boolean MailVerified { get => _MailVerified; set { if (OnPropertyChanging("MailVerified", value)) { _MailVerified = value; OnPropertyChanged("MailVerified"); } } } + private String? _Mobile; /// 手机。支持登录 [DisplayName("手机")] @@ -85,6 +93,14 @@ public partial class User [BindColumn("Mobile", "手机。支持登录", "", ItemType = "mobile")] public String? Mobile { get => _Mobile; set { if (OnPropertyChanging("Mobile", value)) { _Mobile = value; OnPropertyChanged("Mobile"); } } } + private Boolean _MobileVerified; + /// 手机是否验证。 + [DisplayName("手机是否验证")] + [Description("手机是否验证。")] + [DataObjectField(false, false, false, 0)] + [BindColumn("MobileVerified", "手机是否验证。", "")] + public Boolean MobileVerified { get => _MobileVerified; set { if (OnPropertyChanging("MobileVerified", value)) { _MobileVerified = value; OnPropertyChanged("MobileVerified"); } } } + private String? _Code; /// 代码。身份证、员工编码等，支持登录 [DisplayName("代码")] @@ -339,7 +355,9 @@ public override Object? this[String name] "DisplayName" => _DisplayName, "Sex" => _Sex, "Mail" => _Mail, + "MailVerified" => _MailVerified, "Mobile" => _Mobile, + "MobileVerified" => _MobileVerified, "Code" => _Code, "AreaId" => _AreaId, "Avatar" => _Avatar, @@ -373,40 +391,42 @@ public override Object? this[String name] { switch (name) { - case "ID": _ID = value.ToInt(); break; - case "Name": _Name = Convert.ToString(value); break; - case "Password": _Password = Convert.ToString(value); break; - case "DisplayName": _DisplayName = Convert.ToString(value); break; - case "Sex": _Sex = (XCode.Membership.SexKinds)value.ToInt(); break; - case "Mail": _Mail = Convert.ToString(value); break; - case "Mobile": _Mobile = Convert.ToString(value); break; - case "Code": _Code = Convert.ToString(value); break; - case "AreaId": _AreaId = value.ToInt(); break; - case "Avatar": _Avatar = Convert.ToString(value); break; - case "RoleID": _RoleID = value.ToInt(); break; - case "RoleIds": _RoleIds = Convert.ToString(value); break; - case "DepartmentID": _DepartmentID = value.ToInt(); break; - case "Online": _Online = value.ToBoolean(); break; - case "Enable": _Enable = value.ToBoolean(); break; - case "Age": _Age = value.ToInt(); break; - case "Birthday": _Birthday = value.ToDateTime(); break; - case "Logins": _Logins = value.ToInt(); break; - case "LastLogin": _LastLogin = value.ToDateTime(); break; - case "LastLoginIP": _LastLoginIP = Convert.ToString(value); break; - case "RegisterTime": _RegisterTime = value.ToDateTime(); break; - case "RegisterIP": _RegisterIP = Convert.ToString(value); break; - case "OnlineTime": _OnlineTime = value.ToInt(); break; - case "Ex1": _Ex1 = value.ToInt(); break; - case "Ex2": _Ex2 = value.ToInt(); break; - case "Ex3": _Ex3 = value.ToDouble(); break; - case "Ex4": _Ex4 = Convert.ToString(value); break; - case "Ex5": _Ex5 = Convert.ToString(value); break; - case "Ex6": _Ex6 = Convert.ToString(value); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserID": _UpdateUserID = value.ToInt(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "ID": _ID = ValidHelper.ToInt32(value); break; + case "Name": _Name = ValidHelper.ToString(value); break; + case "Password": _Password = ValidHelper.ToString(value); break; + case "DisplayName": _DisplayName = ValidHelper.ToString(value); break; + case "Sex": _Sex = ValidHelper.ToEnum(value); break; + case "Mail": _Mail = ValidHelper.ToString(value); break; + case "MailVerified": _MailVerified = ValidHelper.ToBoolean(value); break; + case "Mobile": _Mobile = ValidHelper.ToString(value); break; + case "MobileVerified": _MobileVerified = ValidHelper.ToBoolean(value); break; + case "Code": _Code = ValidHelper.ToString(value); break; + case "AreaId": _AreaId = ValidHelper.ToInt32(value); break; + case "Avatar": _Avatar = ValidHelper.ToString(value); break; + case "RoleID": _RoleID = ValidHelper.ToInt32(value); break; + case "RoleIds": _RoleIds = ValidHelper.ToString(value); break; + case "DepartmentID": _DepartmentID = ValidHelper.ToInt32(value); break; + case "Online": _Online = ValidHelper.ToBoolean(value); break; + case "Enable": _Enable = ValidHelper.ToBoolean(value); break; + case "Age": _Age = ValidHelper.ToInt32(value); break; + case "Birthday": _Birthday = ValidHelper.ToDateTime(value); break; + case "Logins": _Logins = ValidHelper.ToInt32(value); break; + case "LastLogin": _LastLogin = ValidHelper.ToDateTime(value); break; + case "LastLoginIP": _LastLoginIP = ValidHelper.ToString(value); break; + case "RegisterTime": _RegisterTime = ValidHelper.ToDateTime(value); break; + case "RegisterIP": _RegisterIP = ValidHelper.ToString(value); break; + case "OnlineTime": _OnlineTime = ValidHelper.ToInt32(value); break; + case "Ex1": _Ex1 = ValidHelper.ToInt32(value); break; + case "Ex2": _Ex2 = ValidHelper.ToInt32(value); break; + case "Ex3": _Ex3 = ValidHelper.ToDouble(value); break; + case "Ex4": _Ex4 = ValidHelper.ToString(value); break; + case "Ex5": _Ex5 = ValidHelper.ToString(value); break; + case "Ex6": _Ex6 = ValidHelper.ToString(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserID": _UpdateUserID = ValidHelper.ToInt32(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } @@ -563,9 +583,15 @@ public partial class _ /// 邮件。支持登录 public static readonly Field Mail = FindByName("Mail"); + /// 邮箱是否验证。 + public static readonly Field MailVerified = FindByName("MailVerified"); + /// 手机。支持登录 public static readonly Field Mobile = FindByName("Mobile"); + /// 手机是否验证。 + public static readonly Field MobileVerified = FindByName("MobileVerified"); + /// 代码。身份证、员工编码等，支持登录 public static readonly Field Code = FindByName("Code"); @@ -671,9 +697,15 @@ public partial class __ /// 邮件。支持登录 public const String Mail = "Mail"; + /// 邮箱是否验证。 + public const String MailVerified = "MailVerified"; + /// 手机。支持登录 public const String Mobile = "Mobile"; + /// 手机是否验证。 + public const String MobileVerified = "MobileVerified"; + /// 代码。身份证、员工编码等，支持登录 public const String Code = "Code"; diff --git a/XUnitTest.XCode/Code/entity_user_normal_biz.cs b/XUnitTest.XCode/Code/entity_user_normal_biz.cs index 7ee56ce95..f64e55db9 100644 --- a/XUnitTest.XCode/Code/entity_user_normal_biz.cs +++ b/XUnitTest.XCode/Code/entity_user_normal_biz.cs @@ -101,7 +101,9 @@ public override Boolean Valid(DataMethod method) // entity.DisplayName = "abc"; // entity.Sex = 0; // entity.Mail = "abc"; + // entity.MailVerified = true; // entity.Mobile = "abc"; + // entity.MobileVerified = true; // entity.Code = "abc"; // entity.AreaId = 0; // entity.Avatar = "abc"; diff --git a/XUnitTest.XCode/Model/Code/entity_city.cs b/XUnitTest.XCode/Model/Code/entity_city.cs index ce6b642e6..4d3df5495 100644 --- a/XUnitTest.XCode/Model/Code/entity_city.cs +++ b/XUnitTest.XCode/Model/Code/entity_city.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; @@ -201,24 +201,24 @@ public override Object? this[String name] { switch (name) { - case "PersonID": _PersonID = value.ToInt(); break; - case "Pname": _Pname = Convert.ToString(value); break; - case "Psex": _Psex = value.ToInt(); break; - case "CreditNo": _CreditNo = Convert.ToString(value); break; - case "Mobile": _Mobile = Convert.ToString(value); break; - case "BuildID": _BuildID = value.ToInt(); break; - case "Build_ID": _Build_ID = value.ToInt(); break; - case "UnitNum": _UnitNum = Convert.ToString(value); break; - case "HouseNum": _HouseNum = Convert.ToString(value); break; - case "CreateUser": _CreateUser = Convert.ToString(value); break; - case "CreateUserId": _CreateUserId = value.ToInt(); break; - case "CreateTime": _CreateTime = value.ToDateTime(); break; - case "CreateIP": _CreateIP = Convert.ToString(value); break; - case "UpdateUser": _UpdateUser = Convert.ToString(value); break; - case "UpdateUserId": _UpdateUserId = value.ToInt(); break; - case "UpdateTime": _UpdateTime = value.ToDateTime(); break; - case "UpdateIP": _UpdateIP = Convert.ToString(value); break; - case "Remark": _Remark = Convert.ToString(value); break; + case "PersonID": _PersonID = ValidHelper.ToInt32(value); break; + case "Pname": _Pname = ValidHelper.ToString(value); break; + case "Psex": _Psex = ValidHelper.ToInt32(value); break; + case "CreditNo": _CreditNo = ValidHelper.ToString(value); break; + case "Mobile": _Mobile = ValidHelper.ToString(value); break; + case "BuildID": _BuildID = ValidHelper.ToInt32(value); break; + case "Build_ID": _Build_ID = ValidHelper.ToInt32(value); break; + case "UnitNum": _UnitNum = ValidHelper.ToString(value); break; + case "HouseNum": _HouseNum = ValidHelper.ToString(value); break; + case "CreateUser": _CreateUser = ValidHelper.ToString(value); break; + case "CreateUserId": _CreateUserId = ValidHelper.ToInt32(value); break; + case "CreateTime": _CreateTime = ValidHelper.ToDateTime(value); break; + case "CreateIP": _CreateIP = ValidHelper.ToString(value); break; + case "UpdateUser": _UpdateUser = ValidHelper.ToString(value); break; + case "UpdateUserId": _UpdateUserId = ValidHelper.ToInt32(value); break; + case "UpdateTime": _UpdateTime = ValidHelper.ToDateTime(value); break; + case "UpdateIP": _UpdateIP = ValidHelper.ToString(value); break; + case "Remark": _Remark = ValidHelper.ToString(value); break; default: base[name] = value; break; } } From d6147f374827b3b49d8fdccb89362c03a4be09d6 Mon Sep 17 00:00:00 2001 From: Soar360 Date: Fri, 20 Sep 2024 16:32:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20Byte[]=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=A2=AB=E9=94=99=E8=AF=AF=E8=AF=86=E5=88=AB=E4=B8=BA?= =?UTF-8?q?=E6=95=B0=E7=BB=84=E9=80=A0=E6=88=90=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs | 2 +- XUnitTest.XCode/Code/Dtos/IUser.cs | 6 ++++++ XUnitTest.XCode/Code/Models/IUserModel.cs | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs b/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs index 8e338f7ff..ce8fbf7c6 100644 --- a/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs +++ b/XCode/DataAccessLayer/MetaData/DbMetaData_Positive.cs @@ -405,7 +405,7 @@ protected virtual List> FieldTypeMaps if (type == null) return null; //处理数组 - if (type.IsArray) type = type.GetElementType(); + if (field.IsArray && type.IsArray) type = type.GetElementType(); // 处理枚举 if (type.IsEnum) type = typeof(Int32); diff --git a/XUnitTest.XCode/Code/Dtos/IUser.cs b/XUnitTest.XCode/Code/Dtos/IUser.cs index 51bcab9ca..abf406164 100644 --- a/XUnitTest.XCode/Code/Dtos/IUser.cs +++ b/XUnitTest.XCode/Code/Dtos/IUser.cs @@ -29,9 +29,15 @@ public partial interface IUser /// 邮件。支持登录 String? Mail { get; set; } + /// 邮箱是否验证。 + Boolean MailVerified { get; set; } + /// 手机。支持登录 String? Mobile { get; set; } + /// 手机是否验证。 + Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 String? Code { get; set; } diff --git a/XUnitTest.XCode/Code/Models/IUserModel.cs b/XUnitTest.XCode/Code/Models/IUserModel.cs index 7010c31cd..4f54ce5f9 100644 --- a/XUnitTest.XCode/Code/Models/IUserModel.cs +++ b/XUnitTest.XCode/Code/Models/IUserModel.cs @@ -29,9 +29,15 @@ public partial interface IUserModel /// 邮件。支持登录 String? Mail { get; set; } + /// 邮箱是否验证。 + Boolean MailVerified { get; set; } + /// 手机。支持登录 String? Mobile { get; set; } + /// 手机是否验证。 + Boolean MobileVerified { get; set; } + /// 代码。身份证、员工编码等，支持登录 String? Code { get; set; } From 2c609cc67418d62367c425678f6e705827e576eb Mon Sep 17 00:00:00 2001 From: Soar360 Date: Fri, 20 Sep 2024 17:11:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=20[fix]=20SqlTests=20[fix]=20NegativeTests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataAccessLayer/NegativeTests.cs | 18 ++++++++++++++++++ XUnitTest.XCode/EntityTests/SqlTests.cs | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/XUnitTest.XCode/DataAccessLayer/NegativeTests.cs b/XUnitTest.XCode/DataAccessLayer/NegativeTests.cs index 38ebd8776..2e40e658d 100644 --- a/XUnitTest.XCode/DataAccessLayer/NegativeTests.cs +++ b/XUnitTest.XCode/DataAccessLayer/NegativeTests.cs @@ -25,7 +25,9 @@ PASSWORD nvarchar(200) NULL COLLATE NOCASE, DISPLAYNAME nvarchar(50) NULL COLLATE NOCASE, SEX int NOT NULL DEFAULT 0, MAIL nvarchar(50) NULL COLLATE NOCASE, + MAILVERIFIED bit NOT NULL DEFAULT 0, MOBILE nvarchar(50) NULL COLLATE NOCASE, + MOBILEVERIFIED bit NOT NULL DEFAULT 0, CODE nvarchar(50) NULL COLLATE NOCASE, AREAID int NOT NULL DEFAULT 0, AVATAR nvarchar(200) NULL COLLATE NOCASE, @@ -74,7 +76,9 @@ password nvarchar(200) NULL COLLATE NOCASE, displayname nvarchar(50) NULL COLLATE NOCASE, sex int NOT NULL DEFAULT 0, mail nvarchar(50) NULL COLLATE NOCASE, + mailverified bit NOT NULL DEFAULT 0, mobile nvarchar(50) NULL COLLATE NOCASE, + mobileverified bit NOT NULL DEFAULT 0, code nvarchar(50) NULL COLLATE NOCASE, areaid int NOT NULL DEFAULT 0, avatar nvarchar(200) NULL COLLATE NOCASE, @@ -123,7 +127,9 @@ password nvarchar(200) NULL COLLATE NOCASE, display_name nvarchar(50) NULL COLLATE NOCASE, sex int NOT NULL DEFAULT 0, mail nvarchar(50) NULL COLLATE NOCASE, + mail_verified bit NOT NULL DEFAULT 0, mobile nvarchar(50) NULL COLLATE NOCASE, + mobile_verified bit NOT NULL DEFAULT 0, code nvarchar(50) NULL COLLATE NOCASE, area_id int NOT NULL DEFAULT 0, avatar nvarchar(200) NULL COLLATE NOCASE, @@ -184,7 +190,9 @@ PASSWORD VARCHAR(200) COMMENT '密码', DISPLAYNAME VARCHAR(50) COMMENT '昵称', SEX INT NOT NULL DEFAULT 0 COMMENT '性别。未知、男、女', MAIL VARCHAR(50) COMMENT '邮件。支持登录', + MAILVERIFIED TINYINT NOT NULL DEFAULT 0 COMMENT '邮箱是否验证。', MOBILE VARCHAR(50) COMMENT '手机。支持登录', + MOBILEVERIFIED TINYINT NOT NULL DEFAULT 0 COMMENT '手机是否验证。', CODE VARCHAR(50) COMMENT '代码。身份证、员工编码等，支持登录', AREAID INT NOT NULL DEFAULT 0 COMMENT '地区。省市区', AVATAR VARCHAR(200) COMMENT '头像', @@ -234,7 +242,9 @@ password VARCHAR(200) COMMENT '密码', displayname VARCHAR(50) COMMENT '昵称', sex INT NOT NULL DEFAULT 0 COMMENT '性别。未知、男、女', mail VARCHAR(50) COMMENT '邮件。支持登录', + mailverified TINYINT NOT NULL DEFAULT 0 COMMENT '邮箱是否验证。', mobile VARCHAR(50) COMMENT '手机。支持登录', + mobileverified TINYINT NOT NULL DEFAULT 0 COMMENT '手机是否验证。', code VARCHAR(50) COMMENT '代码。身份证、员工编码等，支持登录', areaid INT NOT NULL DEFAULT 0 COMMENT '地区。省市区', avatar VARCHAR(200) COMMENT '头像', @@ -284,7 +294,9 @@ password VARCHAR(200) COMMENT '密码', display_name VARCHAR(50) COMMENT '昵称', sex INT NOT NULL DEFAULT 0 COMMENT '性别。未知、男、女', mail VARCHAR(50) COMMENT '邮件。支持登录', + mail_verified TINYINT NOT NULL DEFAULT 0 COMMENT '邮箱是否验证。', mobile VARCHAR(50) COMMENT '手机。支持登录', + mobile_verified TINYINT NOT NULL DEFAULT 0 COMMENT '手机是否验证。', code VARCHAR(50) COMMENT '代码。身份证、员工编码等，支持登录', area_id INT NOT NULL DEFAULT 0 COMMENT '地区。省市区', avatar VARCHAR(200) COMMENT '头像', @@ -334,7 +346,9 @@ PASSWORD nvarchar(200) NULL, DISPLAYNAME nvarchar(50) NULL, SEX int NOT NULL DEFAULT 0, MAIL nvarchar(50) NULL, + MAILVERIFIED bit NOT NULL DEFAULT 0, MOBILE nvarchar(50) NULL, + MOBILEVERIFIED bit NOT NULL DEFAULT 0, CODE nvarchar(50) NULL, AREAID int NOT NULL DEFAULT 0, AVATAR nvarchar(200) NULL, @@ -383,7 +397,9 @@ password nvarchar(200) NULL, displayname nvarchar(50) NULL, sex int NOT NULL DEFAULT 0, mail nvarchar(50) NULL, + mailverified bit NOT NULL DEFAULT 0, mobile nvarchar(50) NULL, + mobileverified bit NOT NULL DEFAULT 0, code nvarchar(50) NULL, areaid int NOT NULL DEFAULT 0, avatar nvarchar(200) NULL, @@ -432,7 +448,9 @@ password nvarchar(200) NULL, display_name nvarchar(50) NULL, sex int NOT NULL DEFAULT 0, mail nvarchar(50) NULL, + mail_verified bit NOT NULL DEFAULT 0, mobile nvarchar(50) NULL, + mobile_verified bit NOT NULL DEFAULT 0, code nvarchar(50) NULL, area_id int NOT NULL DEFAULT 0, avatar nvarchar(200) NULL, diff --git a/XUnitTest.XCode/EntityTests/SqlTests.cs b/XUnitTest.XCode/EntityTests/SqlTests.cs index fb1bd1362..29e24b200 100644 --- a/XUnitTest.XCode/EntityTests/SqlTests.cs +++ b/XUnitTest.XCode/EntityTests/SqlTests.cs @@ -48,7 +48,7 @@ public void InsertTestSQLite() }; var sql = factory.Persistence.GetSql(session, user, DataObjectMethodType.Insert); - Assert.Equal(@"Insert Into User(Name,DisplayName,Sex,AreaId,RoleID,DepartmentID,Online,Enable,Age,Logins,RegisterTime,OnlineTime,Ex1,Ex2,Ex3,UpdateUser,UpdateUserID,UpdateTime) Values('Stone','大石头',0,0,0,0,0,1,0,0,'2020-08-22 00:00:00',0,0,0,0,'newlife',0,'2020-09-01 00:00:00')", sql); + Assert.Equal(@"Insert Into User(Name,DisplayName,Sex,MailVerified,MobileVerified,AreaId,RoleID,DepartmentID,Online,Enable,Age,Logins,RegisterTime,OnlineTime,Ex1,Ex2,Ex3,UpdateUser,UpdateUserID,UpdateTime) Values('Stone','大石头',0,0,0,0,0,0,0,1,0,0,'2020-08-22 00:00:00',0,0,0,0,'newlife',0,'2020-09-01 00:00:00')", sql); } [TestOrder(10)] @@ -75,7 +75,7 @@ public void InsertTestMySqlUnderline() }; var sql = factory.Persistence.GetSql(session, user, DataObjectMethodType.Insert); - Assert.Equal(@"Insert Into `user`(name,display_name,sex,area_id,role_id,department_id,online,enable,age,logins,register_time,online_time,ex1,ex2,ex3,update_user,update_user_id,update_time) Values('Stone','大石头',0,0,0,0,0,1,0,0,'2020-08-22 00:00:00',0,0,0,0,'newlife',0,'2020-09-01 00:00:00')", sql); + Assert.Equal(@"Insert Into `user`(name,display_name,sex,mail_verified,mobile_verified,area_id,role_id,department_id,online,enable,age,logins,register_time,online_time,ex1,ex2,ex3,update_user,update_user_id,update_time) Values('Stone','大石头',0,0,0,0,0,0,0,1,0,0,'2020-08-22 00:00:00',0,0,0,0,'newlife',0,'2020-09-01 00:00:00')", sql); } [TestOrder(20)]