添加codeFirst功能

This commit is contained in:
陈淳
2022-10-18 18:01:16 +08:00
parent dab4a092d9
commit ab8cdd88b9
25 changed files with 161 additions and 121 deletions

View File

@@ -272,7 +272,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
public Result SeedDb() public Result SeedDb()
{ {
var rep = _iUserService._repository; var rep = _iUserService._repository;
return Result.Success().SetStatus(DbSeedExtend.Invoer(rep._Db)); return Result.Success().SetStatus(DbSeedExtend.DataInvoer(rep._Db));
} }
/// <summary> /// <summary>

View File

@@ -43,9 +43,6 @@
<None Update="public.pem"> <None Update="public.pem">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="yi-sqlsugar-dev.db">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1,5 +1,5 @@
{ {
"StartUrl": "http://localohost:19001", "StartUrl": "http://*:19001",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
@@ -12,10 +12,13 @@
"SqlLog_Enable": false, "SqlLog_Enable": false,
"Consul_Enabled": false, "Consul_Enabled": false,
"DbCodeFirst_Enabled": false,
"DbSeed_Enabled": false,
"Apollo_Enabled": false, "Apollo_Enabled": false,
"HealthCheck_Enabled": false, "HealthCheck_Enabled": false,
"RabbitMQ_Enabled": false, "RabbitMQ_Enabled": false,
"Redis_Enabled": false, "Redis_Enabled": false,
"RedisSeed_Enabled": false,
"Kafka_Enabled": false, "Kafka_Enabled": false,
"ElasticSeach_Enabled": false, "ElasticSeach_Enabled": false,
"MutiDB_Enabled": false, "MutiDB_Enabled": false,
@@ -23,19 +26,16 @@
"CAP_Enabled": false, "CAP_Enabled": false,
"CAPDashboard_Enabled": false, "CAPDashboard_Enabled": false,
"DbSeed_Enabled": true,
"RedisSeed_Enabled": false,
"Cors_Enabled": true, "Cors_Enabled": true,
"DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
"DbSelect": "Sqlite", "DbSelect": "Sqlite",
"DbConn": { "DbConn": {
"WriteUrl": "DataSource=yi-sqlsugar-dev.db", "WriteUrl": "DataSource=yi-sqlsugar-dev.db",
//"WriteUrl": "server=119.91.207.67;port=3306;database=yi-sqlsugar-dev;user id=root;password=Qz52013142020.", //"WriteUrl": "[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]",
"ReadUrl": [ "ReadUrl": [
"server=119.91.207.67;port=3306;database=yi-sqlsugar-dev;user id=root;password=Qz52013142020.", "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]",
"server=119.91.207.67;port=3306;database=yi-sqlsugar-dev;user id=root;password=Qz52013142020.", "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]",
"server=119.91.207.67;port=3306;database=yi-sqlsugar-dev;user id=root;password=Qz52013142020." "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]"
] ]
}, },
"JwtAuthorize": { "JwtAuthorize": {
@@ -44,39 +44,39 @@
"PolicyName": "permission", "PolicyName": "permission",
"DefaultScheme": "Bearer", "DefaultScheme": "Bearer",
"IsHttps": false, "IsHttps": false,
"Expiration": 30, "Expiration": 300,
"ReExpiration": 3000 "ReExpiration": 3000
}, },
"RedisConnOptions": { "RedisConnOptions": {
"Host": "118.195.191.41", "Host": "[xxxx]",
"Prot": 6379, "Prot": 6379,
"DB": 1, "DB": 1,
"Password": "Qz52013142020." "Password": "[xxxx]"
}, },
"RabbitConn": { "RabbitConn": {
"HostName": "118.195.191.41", "HostName": "[xxxx]",
"UserName": "cc", "UserName": "[xxxx]",
"Password": "cc", "Password": "[xxxx]",
"Port": 5672 "Port": 5672
}, },
"ElasticSeachConn": { "ElasticSeachConn": {
"Url": "https://es-4zakkyyn.public.tencentelasticsearch.com:9200", "Url": "[xxxx]",
"IndexName": "yies", "IndexName": "[xxxx]",
"UserName": "elastic", "UserName": "[xxxx]",
"PassWord": "Qz52013142020." "PassWord": "[xxxx]"
}, },
"KafkaOptions": { "KafkaOptions": {
"BrokerList": "192.168.3.230:9092", "BrokerList": "[xxxx]",
"TopicName": "kafkalog" "TopicName": "[xxxx]"
}, },
"ConsulClientOption": { "ConsulClientOption": {
"IP": "118.195.191.41", "IP": "[xxxx]",
"Port": "8500", "Port": "[xxxx]",
"Datacenter": "dc1" "Datacenter": "[xxxx]"
}, },
"ConsulRegisterOption": { "ConsulRegisterOption": {
"IP": "118.195.191.41", "IP": "[xxxx]",
"Port": "19005", "Port": "19001",
"GroupName": "ApiMicroservice", "GroupName": "ApiMicroservice",
"HealthCheckUrl": "/Health", "HealthCheckUrl": "/Health",
"Interval": 10, "Interval": 10,
@@ -85,10 +85,10 @@
"Tag": "13" "Tag": "13"
}, },
"SMS": { "SMS": {
"ID": "LTAI5tJvjPaXCyyPMfXLNbVA", "ID": "[xxxx]",
"Secret": "fLQv7jjj57fUKLFK8REeAQPFVDjUYn", "Secret": "[xxxx]",
"Sign": "JiftCC", "Sign": "[xxxx]",
"Template": "SMS_221640732" "Template": "[xxxx]"
}, },
"IPLibraryServiceUrl": "http://gRPCIPLibraryService" "IPLibraryServiceUrl": "http://gRPCIPLibraryService"
} }

View File

@@ -12,6 +12,7 @@
"SqlLog_Enable": false, "SqlLog_Enable": false,
"Consul_Enabled": false, "Consul_Enabled": false,
"DbCodeFirst_Enabled": false,
"DbSeed_Enabled": false, "DbSeed_Enabled": false,
"Apollo_Enabled": false, "Apollo_Enabled": false,
"HealthCheck_Enabled": false, "HealthCheck_Enabled": false,
@@ -27,23 +28,24 @@
"Cors_Enabled": true, "Cors_Enabled": true,
"DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ], "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
"DbSelect": "Mysql", "DbSelect": "Sqlite",
"Pan": {
"ZipPath": "D:/AppWeb/test/zip"
},
"DbConn": { "DbConn": {
"WriteUrl": "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", "WriteUrl": "DataSource=yi-sqlsugar-dev.db",
//"WriteUrl": "[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]",
"ReadUrl": [ "ReadUrl": [
"server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]",
"server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]",
"server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]" "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]"
] ]
}, },
"JWTTokenOptions": { "JwtAuthorize": {
"Audience": "http://localhost:7000", "Issuer": "cc",
"Issuer": "http://localhost:7000", "Audience": "cc",
"SecurityKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI2a2EJ7m872v0afyoSDJT2o1+SitIeJSWtLJU8/Wz2m7gStexajkeD+Lka6DSTy8gt9UwfgVQo6uKjVLG5Ex7PiGOODVqAEghBuS7JzIYU5RvI543nNDAPfnJsas96mSA7L/mD7RTE2drj6hf3oZjJpMPZUQI/B1Qjb5H3K3PNwIDAQAB" "PolicyName": "permission",
"DefaultScheme": "Bearer",
"IsHttps": false,
"Expiration": 300,
"ReExpiration": 3000
}, },
"RedisConnOptions": { "RedisConnOptions": {
"Host": "[xxxx]", "Host": "[xxxx]",

View File

@@ -12,6 +12,7 @@
"SqlLog_Enable": false, "SqlLog_Enable": false,
"Consul_Enabled": false, "Consul_Enabled": false,
"DbCodeFirst_Enabled": false,
"DbSeed_Enabled": false, "DbSeed_Enabled": false,
"Apollo_Enabled": false, "Apollo_Enabled": false,
"HealthCheck_Enabled": false, "HealthCheck_Enabled": false,

View File

@@ -22,12 +22,12 @@ namespace Yi.Framework.Model.Models
/// 文章标题 /// 文章标题
///</summary> ///</summary>
[SugarColumn(ColumnName="Title" )] [SugarColumn(ColumnName="Title" )]
public string Title { get; set; } public string? Title { get; set; }
/// <summary> /// <summary>
/// 文章内容 /// 文章内容
///</summary> ///</summary>
[SugarColumn(ColumnName="Content" )] [SugarColumn(ColumnName="Content" )]
public string Content { get; set; } public string? Content { get; set; }
/// <summary> /// <summary>
/// 用户id /// 用户id
///</summary> ///</summary>
@@ -72,7 +72,7 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// 图片列表 /// 图片列表
///</summary> ///</summary>

View File

@@ -22,22 +22,22 @@ namespace Yi.Framework.Model.Models
/// 配置名称 /// 配置名称
///</summary> ///</summary>
[SugarColumn(ColumnName="ConfigName" )] [SugarColumn(ColumnName="ConfigName" )]
public string ConfigName { get; set; } public string? ConfigName { get; set; }
/// <summary> /// <summary>
/// 配置键 /// 配置键
///</summary> ///</summary>
[SugarColumn(ColumnName="ConfigKey" )] [SugarColumn(ColumnName="ConfigKey" )]
public string ConfigKey { get; set; } public string? ConfigKey { get; set; }
/// <summary> /// <summary>
/// 配置值 /// 配置值
///</summary> ///</summary>
[SugarColumn(ColumnName="ConfigValue" )] [SugarColumn(ColumnName="ConfigValue" )]
public string ConfigValue { get; set; } public string? ConfigValue { get; set; }
/// <summary> /// <summary>
/// 配置类别 /// 配置类别
///</summary> ///</summary>
[SugarColumn(ColumnName="ConfigType" )] [SugarColumn(ColumnName="ConfigType" )]
public string ConfigType { get; set; } public string? ConfigType { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -77,6 +77,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -22,17 +22,17 @@ namespace Yi.Framework.Model.Models
/// 部门名称 /// 部门名称
///</summary> ///</summary>
[SugarColumn(ColumnName="DeptName" )] [SugarColumn(ColumnName="DeptName" )]
public string DeptName { get; set; } public string? DeptName { get; set; }
/// <summary> /// <summary>
/// 部门编码 /// 部门编码
///</summary> ///</summary>
[SugarColumn(ColumnName="DeptCode" )] [SugarColumn(ColumnName="DeptCode" )]
public string DeptCode { get; set; } public string? DeptCode { get; set; }
/// <summary> /// <summary>
/// 负责人 /// 负责人
///</summary> ///</summary>
[SugarColumn(ColumnName="Leader" )] [SugarColumn(ColumnName="Leader" )]
public string Leader { get; set; } public string? Leader { get; set; }
/// <summary> /// <summary>
/// 父级id /// 父级id
///</summary> ///</summary>
@@ -77,6 +77,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -22,12 +22,12 @@ namespace Yi.Framework.Model.Models
/// 字典名称 /// 字典名称
///</summary> ///</summary>
[SugarColumn(ColumnName="DictName" )] [SugarColumn(ColumnName="DictName" )]
public string DictName { get; set; } public string? DictName { get; set; }
/// <summary> /// <summary>
/// 字典类型 /// 字典类型
///</summary> ///</summary>
[SugarColumn(ColumnName="DictType" )] [SugarColumn(ColumnName="DictType" )]
public string DictType { get; set; } public string? DictType { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -67,6 +67,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -22,17 +22,17 @@ namespace Yi.Framework.Model.Models
/// 字典类型 /// 字典类型
///</summary> ///</summary>
[SugarColumn(ColumnName="DictType" )] [SugarColumn(ColumnName="DictType" )]
public string DictType { get; set; } public string? DictType { get; set; }
/// <summary> /// <summary>
/// 字典标签 /// 字典标签
///</summary> ///</summary>
[SugarColumn(ColumnName="DictLabel" )] [SugarColumn(ColumnName="DictLabel" )]
public string DictLabel { get; set; } public string? DictLabel { get; set; }
/// <summary> /// <summary>
/// 字典值 /// 字典值
///</summary> ///</summary>
[SugarColumn(ColumnName="DictValue" )] [SugarColumn(ColumnName="DictValue" )]
public string DictValue { get; set; } public string? DictValue { get; set; }
/// <summary> /// <summary>
/// 是否为该类型的默认值 /// 是否为该类型的默认值
///</summary> ///</summary>
@@ -77,16 +77,16 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// tag类型 /// tag类型
///</summary> ///</summary>
[SugarColumn(ColumnName="ListClass" )] [SugarColumn(ColumnName="ListClass" )]
public string ListClass { get; set; } public string? ListClass { get; set; }
/// <summary> /// <summary>
/// tagClass /// tagClass
///</summary> ///</summary>
[SugarColumn(ColumnName="CssClass" )] [SugarColumn(ColumnName="CssClass" )]
public string CssClass { get; set; } public string? CssClass { get; set; }
} }
} }

View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.Model.Models
/// 文件类型 /// 文件类型
///</summary> ///</summary>
[SugarColumn(ColumnName="FileType" )] [SugarColumn(ColumnName="FileType" )]
public string FileType { get; set; } public string? FileType { get; set; }
/// <summary> /// <summary>
/// 文件大小 /// 文件大小
///</summary> ///</summary>
@@ -32,12 +32,12 @@ namespace Yi.Framework.Model.Models
/// 文件名 /// 文件名
///</summary> ///</summary>
[SugarColumn(ColumnName="FileName" )] [SugarColumn(ColumnName="FileName" )]
public string FileName { get; set; } public string? FileName { get; set; }
/// <summary> /// <summary>
/// 文件路径 /// 文件路径
///</summary> ///</summary>
[SugarColumn(ColumnName="FilePath" )] [SugarColumn(ColumnName="FilePath" )]
public string FilePath { get; set; } public string? FilePath { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -77,6 +77,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -43,7 +43,7 @@ namespace Yi.Framework.Model.Models
/// 消息 /// 消息
///</summary> ///</summary>
[SugarColumn(ColumnName="Message" )] [SugarColumn(ColumnName="Message" )]
public string Message { get; set; } public string? Message { get; set; }
/// <summary> /// <summary>
/// 排序字段 /// 排序字段
///</summary> ///</summary>
@@ -53,6 +53,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -22,32 +22,32 @@ namespace Yi.Framework.Model.Models
/// 登录用户 /// 登录用户
///</summary> ///</summary>
[SugarColumn(ColumnName="LoginUser" )] [SugarColumn(ColumnName="LoginUser" )]
public string LoginUser { get; set; } public string? LoginUser { get; set; }
/// <summary> /// <summary>
/// 登录地点 /// 登录地点
///</summary> ///</summary>
[SugarColumn(ColumnName="LoginLocation" )] [SugarColumn(ColumnName="LoginLocation" )]
public string LoginLocation { get; set; } public string? LoginLocation { get; set; }
/// <summary> /// <summary>
/// 登录Ip /// 登录Ip
///</summary> ///</summary>
[SugarColumn(ColumnName="LoginIp" )] [SugarColumn(ColumnName="LoginIp" )]
public string LoginIp { get; set; } public string? LoginIp { get; set; }
/// <summary> /// <summary>
/// 浏览器 /// 浏览器
///</summary> ///</summary>
[SugarColumn(ColumnName="Browser" )] [SugarColumn(ColumnName="Browser" )]
public string Browser { get; set; } public string? Browser { get; set; }
/// <summary> /// <summary>
/// 操作系统 /// 操作系统
///</summary> ///</summary>
[SugarColumn(ColumnName="Os" )] [SugarColumn(ColumnName="Os" )]
public string Os { get; set; } public string? Os { get; set; }
/// <summary> /// <summary>
/// 登录信息 /// 登录信息
///</summary> ///</summary>
[SugarColumn(ColumnName="LogMsg" )] [SugarColumn(ColumnName="LogMsg" )]
public string LogMsg { get; set; } public string? LogMsg { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -82,7 +82,7 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// 是否删除 /// 是否删除
///</summary> ///</summary>

View File

@@ -23,7 +23,7 @@ namespace Yi.Framework.Model.Models
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="MenuName" )] [SugarColumn(ColumnName="MenuName" )]
public string MenuName { get; set; } public string? MenuName { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
@@ -33,7 +33,7 @@ namespace Yi.Framework.Model.Models
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="PermissionCode" )] [SugarColumn(ColumnName="PermissionCode" )]
public string PermissionCode { get; set; } public string? PermissionCode { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
@@ -73,12 +73,12 @@ namespace Yi.Framework.Model.Models
/// 菜单图标 /// 菜单图标
///</summary> ///</summary>
[SugarColumn(ColumnName="MenuIcon" )] [SugarColumn(ColumnName="MenuIcon" )]
public string MenuIcon { get; set; } public string? MenuIcon { get; set; }
/// <summary> /// <summary>
/// 菜单组件路由 /// 菜单组件路由
///</summary> ///</summary>
[SugarColumn(ColumnName="Router" )] [SugarColumn(ColumnName="Router" )]
public string Router { get; set; } public string? Router { get; set; }
/// <summary> /// <summary>
/// 是否为外部链接 /// 是否为外部链接
///</summary> ///</summary>
@@ -103,16 +103,16 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// 组件路径 /// 组件路径
///</summary> ///</summary>
[SugarColumn(ColumnName="Component" )] [SugarColumn(ColumnName="Component" )]
public string Component { get; set; } public string? Component { get; set; }
/// <summary> /// <summary>
/// 路由参数 /// 路由参数
///</summary> ///</summary>
[SugarColumn(ColumnName="Query" )] [SugarColumn(ColumnName="Query" )]
public string Query { get; set; } public string? Query { get; set; }
} }
} }

View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.Model.Models
/// 操作模块 /// 操作模块
///</summary> ///</summary>
[SugarColumn(ColumnName="Title" )] [SugarColumn(ColumnName="Title" )]
public string Title { get; set; } public string? Title { get; set; }
/// <summary> /// <summary>
/// 操作类型 /// 操作类型
///</summary> ///</summary>
@@ -32,7 +32,7 @@ namespace Yi.Framework.Model.Models
/// 请求方法 /// 请求方法
///</summary> ///</summary>
[SugarColumn(ColumnName="RequestMethod" )] [SugarColumn(ColumnName="RequestMethod" )]
public string RequestMethod { get; set; } public string? RequestMethod { get; set; }
/// <summary> /// <summary>
/// 操作人员 /// 操作人员
///</summary> ///</summary>
@@ -42,27 +42,27 @@ namespace Yi.Framework.Model.Models
/// 操作Ip /// 操作Ip
///</summary> ///</summary>
[SugarColumn(ColumnName="OperIp" )] [SugarColumn(ColumnName="OperIp" )]
public string OperIp { get; set; } public string? OperIp { get; set; }
/// <summary> /// <summary>
/// 操作地点 /// 操作地点
///</summary> ///</summary>
[SugarColumn(ColumnName="OperLocation" )] [SugarColumn(ColumnName="OperLocation" )]
public string OperLocation { get; set; } public string? OperLocation { get; set; }
/// <summary> /// <summary>
/// 操作方法 /// 操作方法
///</summary> ///</summary>
[SugarColumn(ColumnName="Method" )] [SugarColumn(ColumnName="Method" )]
public string Method { get; set; } public string? Method { get; set; }
/// <summary> /// <summary>
/// 请求参数 /// 请求参数
///</summary> ///</summary>
[SugarColumn(ColumnName="RequestParam" )] [SugarColumn(ColumnName="RequestParam" )]
public string RequestParam { get; set; } public string? RequestParam { get; set; }
/// <summary> /// <summary>
/// 请求结果 /// 请求结果
///</summary> ///</summary>
[SugarColumn(ColumnName="RequestResult" )] [SugarColumn(ColumnName="RequestResult" )]
public string RequestResult { get; set; } public string? RequestResult { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -97,7 +97,7 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// 是否删除 /// 是否删除
///</summary> ///</summary>

View File

@@ -22,12 +22,12 @@ namespace Yi.Framework.Model.Models
/// 岗位编码 /// 岗位编码
///</summary> ///</summary>
[SugarColumn(ColumnName="PostCode" )] [SugarColumn(ColumnName="PostCode" )]
public string PostCode { get; set; } public string? PostCode { get; set; }
/// <summary> /// <summary>
/// 岗位名称 /// 岗位名称
///</summary> ///</summary>
[SugarColumn(ColumnName="PostName" )] [SugarColumn(ColumnName="PostName" )]
public string PostName { get; set; } public string? PostName { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -67,6 +67,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -67,6 +67,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -9,20 +9,20 @@ namespace Yi.Framework.Model.Models
/// 角色表 /// 角色表
///</summary> ///</summary>
[SugarTable("Role")] [SugarTable("Role")]
public partial class RoleEntity:IBaseModelEntity public partial class RoleEntity : IBaseModelEntity
{ {
public RoleEntity() public RoleEntity()
{ {
this.CreateTime = DateTime.Now; this.CreateTime = DateTime.Now;
} }
[JsonConverter(typeof(ValueToStringConverter))] [JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )] [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
public long Id { get; set; } public long Id { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="RoleName" )] [SugarColumn(ColumnName = "RoleName")]
public string RoleName { get; set; } public string? RoleName { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -57,7 +57,7 @@ namespace Yi.Framework.Model.Models
/// 角色编码 /// 角色编码
///</summary> ///</summary>
[SugarColumn(ColumnName="RoleCode" )] [SugarColumn(ColumnName="RoleCode" )]
public string RoleCode { get; set; } public string? RoleCode { get; set; }
/// <summary> /// <summary>
/// 排序字段 /// 排序字段
///</summary> ///</summary>
@@ -67,7 +67,7 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// 角色数据范围 /// 角色数据范围
///</summary> ///</summary>

View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.Model.Models
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="TenantName" )] [SugarColumn(ColumnName="TenantName" )]
public string TenantName { get; set; } public string? TenantName { get; set; }
/// <summary> /// <summary>
/// 创建者 /// 创建者
///</summary> ///</summary>
@@ -62,6 +62,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.Model.Models
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Name" )] [SugarColumn(ColumnName="Name" )]
public string Name { get; set; } public string? Name { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
@@ -72,42 +72,42 @@ namespace Yi.Framework.Model.Models
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Salt" )] [SugarColumn(ColumnName="Salt" )]
public string Salt { get; set; } public string? Salt { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Icon" )] [SugarColumn(ColumnName="Icon" )]
public string Icon { get; set; } public string? Icon { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Nick" )] [SugarColumn(ColumnName="Nick" )]
public string Nick { get; set; } public string? Nick { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Email" )] [SugarColumn(ColumnName="Email" )]
public string Email { get; set; } public string? Email { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Ip" )] [SugarColumn(ColumnName="Ip" )]
public string Ip { get; set; } public string? Ip { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Address" )] [SugarColumn(ColumnName="Address" )]
public string Address { get; set; } public string? Address { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Phone" )] [SugarColumn(ColumnName="Phone" )]
public string Phone { get; set; } public string? Phone { get; set; }
/// <summary> /// <summary>
/// ///
///</summary> ///</summary>
[SugarColumn(ColumnName="Introduction" )] [SugarColumn(ColumnName="Introduction" )]
public string Introduction { get; set; } public string? Introduction { get; set; }
/// <summary> /// <summary>
/// 排序字段 /// 排序字段
///</summary> ///</summary>
@@ -117,7 +117,7 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
/// <summary> /// <summary>
/// 部门id /// 部门id
///</summary> ///</summary>

View File

@@ -67,6 +67,6 @@ namespace Yi.Framework.Model.Models
/// 描述 /// 描述
///</summary> ///</summary>
[SugarColumn(ColumnName="Remark" )] [SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }

View File

@@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -13,7 +13,12 @@ namespace Yi.Framework.WebCore.DbExtend
{ {
public static class DbSeedExtend public static class DbSeedExtend
{ {
public static bool Invoer(ISqlSugarClient _Db) /// <summary>
/// 初始化数据
/// </summary>
/// <param name="_Db"></param>
/// <returns></returns>
public static bool DataInvoer(ISqlSugarClient _Db)
{ {
bool res = false; bool res = false;
var users = SeedFactory.GetUserSeed(); var users = SeedFactory.GetUserSeed();
@@ -87,14 +92,40 @@ namespace Yi.Framework.WebCore.DbExtend
return res; return res;
} }
/// <summary>
/// codeFirst初始化表
/// </summary>
/// <param name="_Db"></param>
/// <returns></returns>
public static void TableInvoer(ISqlSugarClient _Db)
{
//创建数据库
_Db.DbMaintenance.CreateDatabase();
var typeList = Common.Helper.AssemblyHelper.GetClass("Yi.Framework.Model");
foreach (var t in typeList)
{
//扫描如果存在SugarTable特性直接codefirst
if (t.GetCustomAttributes(false).Any(a => a.GetType().Equals(typeof(SugarTable))))
{
_Db.CodeFirst.SetStringDefaultLength(200).InitTables(t);//这样一个表就能成功创建了
}
}
}
public static void UseDbSeedInitService(this IApplicationBuilder app) public static void UseDbSeedInitService(this IApplicationBuilder app)
{ {
if (Appsettings.appBool("DbCodeFirst_Enabled"))
{
var _Db = app.ApplicationServices.GetRequiredService<ISqlSugarClient>();
TableInvoer(_Db);
}
if (Appsettings.appBool("DbSeed_Enabled")) if (Appsettings.appBool("DbSeed_Enabled"))
{ {
var _Db = app.ApplicationServices.GetRequiredService<ISqlSugarClient>(); var _Db = app.ApplicationServices.GetRequiredService<ISqlSugarClient>();
Invoer(_Db); DataInvoer(_Db);
} }
} }

View File

@@ -4,6 +4,7 @@ using SqlSugar;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Yi.Framework.Common.Models; using Yi.Framework.Common.Models;
@@ -50,9 +51,16 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
{ {
EntityService = (c, p) => EntityService = (c, p) =>
{ {
// int? decimal?这种 isnullable=true //// int? decimal?这种 isnullable=true
if (c.PropertyType.IsGenericType && //if (c.PropertyType.IsGenericType &&
c.PropertyType.GetGenericTypeDefinition() == typeof(Nullable<>)) //c.PropertyType.GetGenericTypeDefinition() == typeof(Nullable<>))
//{
// p.IsNullable = true;
//}
//高版C#写法 支持string?和string
if (new NullabilityInfoContext()
.Create(c).WriteState is NullabilityState.Nullable)
{ {
p.IsNullable = true; p.IsNullable = true;
} }