Skip to content

Commit

Permalink
从.net core 2.2升级到.net core 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@liukuo362573
liukuo362573 committed Feb 19, 2020
1 parent 9255722 commit b8e8ad7
Show file tree
Hide file tree
Showing 83 changed files with 596 additions and 716 deletions.
6 changes: 3 additions & 3 deletions Document/DatabaseScript/mysql.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4001,9 +4001,9 @@ INSERT INTO `sys_menu` (`id`, `base_is_delete`, `base_create_time`, `base_modify
(16508640061130112, 0, '2018-12-27 18:23:18', '2018-12-27 18:23:18', 0, 0, 0, 16508640061130078, '地区修改', '', '', '', 3, 3, 1, 'system:area:edit', ''),
(16508640061130113, 0, '2018-12-27 18:23:38', '2018-12-27 18:23:38', 0, 0, 0, 16508640061130078, '地区删除', '', '', '', 4, 3, 1, 'system:area:delete', ''),
(16508640061130114, 0, '2018-12-27 18:24:24', '2018-12-27 18:24:39', 0, 0, 0, 16508640061130082, '登录日志查询', '', '', '', 1, 3, 1, 'system:loglogin:search', ''),
(16508640061130115, 0, '2018-12-27 18:24:58', '2018-12-27 18:24:58', 0, 0, 0, 16508640061130082, '登录日志删除', '', '', '', 2, 3, 1, 'system:loglogin:search', ''),
(16508640061130116, 0, '2018-12-27 18:25:27', '2018-12-27 18:25:27', 0, 0, 0, 16508640061130082, '操作日志查询', '', '', '', 1, 3, 1, 'system:logoperate:search', ''),
(16508640061130117, 0, '2018-12-27 18:25:49', '2018-12-27 18:25:49', 0, 0, 0, 16508640061130082, '操作日志删除', '', '', '', 2, 3, 1, 'system:logoperate:delete', ''),
(16508640061130115, 0, '2018-12-27 18:24:58', '2018-12-27 18:24:58', 0, 0, 0, 16508640061130082, '登录日志删除', '', '', '', 2, 3, 1, 'system:loglogin:delete', ''),
(16508640061130116, 0, '2018-12-27 18:25:27', '2018-12-27 18:25:27', 0, 0, 0, 16508640061130081, '操作日志查询', '', '', '', 1, 3, 1, 'system:logoperate:search', ''),
(16508640061130117, 0, '2018-12-27 18:25:49', '2018-12-27 18:25:49', 0, 0, 0, 16508640061130081, '操作日志删除', '', '', '', 2, 3, 1, 'system:logoperate:delete', ''),
(16508640061130118, 0, '2018-12-27 18:26:21', '2018-12-27 18:26:21', 0, 0, 0, 16508640061130079, ' 数据表查询', '', '', '', 1, 3, 1, 'system:datatable:search', ''),
(16508640061130119, 0, '2018-12-27 18:27:07', '2018-12-27 18:50:53', 0, 0, 0, 16508640061130080, '代码生成新增', '', '', '', 2, 3, 1, 'tool:codegenerator:add', ''),
(16508640061130120, 0, '2018-12-27 18:50:25', '2018-12-27 19:15:37', 0, 0, 0, 16508640061130080, '代码生成查询', '', '', '', 1, 3, 1, 'tool:codegenerator:search', ''),
Expand Down
6 changes: 3 additions & 3 deletions Document/DatabaseScript/sqlserver.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4375,9 +4375,9 @@ INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modif
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130112, 0, CAST(0x0000A9C3012F07C8 AS DateTime), CAST(0x0000A9C3012F07C8 AS DateTime), 0, 0, 0, 16508640061130078, N'地区修改', N'', N'', N'', 3, 3, 1, N'system:area:edit', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130113, 0, CAST(0x0000A9C3012F1F38 AS DateTime), CAST(0x0000A9C3012F1F38 AS DateTime), 0, 0, 0, 16508640061130078, N'地区删除', N'', N'', N'', 4, 3, 1, N'system:area:delete', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130114, 0, CAST(0x0000A9C3012F5520 AS DateTime), CAST(0x0000A9C3012F66B4 AS DateTime), 0, 0, 0, 16508640061130082, N'登录日志查询', N'', N'', N'', 1, 3, 1, N'system:loglogin:search', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130115, 0, CAST(0x0000A9C3012F7CF8 AS DateTime), CAST(0x0000A9C3012F7CF8 AS DateTime), 0, 0, 0, 16508640061130082, N'登录日志删除', N'', N'', N'', 2, 3, 1, N'system:loglogin:search', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130116, 0, CAST(0x0000A9C3012F9EF4 AS DateTime), CAST(0x0000A9C3012F9EF4 AS DateTime), 0, 0, 0, 16508640061130082, N'操作日志查询', N'', N'', N'', 1, 3, 1, N'system:logoperate:search', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130117, 0, CAST(0x0000A9C3012FB8BC AS DateTime), CAST(0x0000A9C3012FB8BC AS DateTime), 0, 0, 0, 16508640061130082, N'操作日志删除', N'', N'', N'', 2, 3, 1, N'system:logoperate:delete', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130115, 0, CAST(0x0000A9C3012F7CF8 AS DateTime), CAST(0x0000A9C3012F7CF8 AS DateTime), 0, 0, 0, 16508640061130082, N'登录日志删除', N'', N'', N'', 2, 3, 1, N'system:loglogin:delete', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130116, 0, CAST(0x0000A9C3012F9EF4 AS DateTime), CAST(0x0000A9C3012F9EF4 AS DateTime), 0, 0, 0, 16508640061130081, N'操作日志查询', N'', N'', N'', 1, 3, 1, N'system:logoperate:search', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130117, 0, CAST(0x0000A9C3012FB8BC AS DateTime), CAST(0x0000A9C3012FB8BC AS DateTime), 0, 0, 0, 16508640061130081, N'操作日志删除', N'', N'', N'', 2, 3, 1, N'system:logoperate:delete', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130118, 0, CAST(0x0000A9C3012FDE3C AS DateTime), CAST(0x0000A9C3012FDE3C AS DateTime), 0, 0, 0, 16508640061130079, N' 数据表查询', N'', N'', N'', 1, 3, 1, N'system:datatable:search', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130119, 0, CAST(0x0000A9C301301424 AS DateTime), CAST(0x0000A9C301369B3C AS DateTime), 0, 0, 0, 16508640061130080, N'代码生成新增', N'', N'', N'', 2, 3, 1, N'tool:codegenerator:add', N'')
INSERT [dbo].[sys_menu] ([id], [base_is_delete], [base_create_time], [base_modify_time], [base_creator_id], [base_modifier_id], [base_version], [parent_id], [menu_name], [menu_icon], [menu_url], [menu_target], [menu_sort], [menu_type], [menu_status], [authorize], [remark]) VALUES (16508640061130120, 0, CAST(0x0000A9C301367A6C AS DateTime), CAST(0x0000A9C3013D664C AS DateTime), 0, 0, 0, 16508640061130080, N'代码生成查询', N'', N'', N'', 1, 3, 1, N'tool:codegenerator:search', N'')
Expand Down
2 changes: 1 addition & 1 deletion YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion YiSha.Business/YiSha.Business/YiSha.Business.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions YiSha.Business/YiSha.Service/OrganizationManage/DepartmentService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ public async Task SaveForm(DepartmentEntity entity)

public async Task DeleteForm(string ids)
{
var db = this.BaseRepository().BeginTrans();
var db = await this.BaseRepository().BeginTrans();
try
{
long[] idArr = TextHelper.SplitToArray<long>(ids, ',');
await db.Delete<DepartmentEntity>(idArr);
await db.Commit();
await db.CommitTrans();
}
catch
{
db.Rollback();
await db.RollbackTrans();
throw;
}
}
Expand Down
12 changes: 6 additions & 6 deletions YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public async Task UpdateUser(UserEntity entity)

public async Task SaveForm(UserEntity entity)
{
var db = this.BaseRepository().BeginTrans();
var db = await this.BaseRepository().BeginTrans();
try
{
if (entity.Id.IsNullOrZero())
Expand Down Expand Up @@ -124,28 +124,28 @@ public async Task SaveForm(UserEntity entity)
await db.Insert(departmentBelongEntity);
}
}
await db.Commit();
await db.CommitTrans();
}
catch
{
db.Rollback();
await db.RollbackTrans();
throw;
}
}

public async Task DeleteForm(string ids)
{
var db = this.BaseRepository().BeginTrans();
var db = await this.BaseRepository().BeginTrans();
try
{
long[] idArr = TextHelper.SplitToArray<long>(ids, ',');
await db.Delete<UserEntity>(idArr);
await db.Delete<UserBelongEntity>(t => idArr.Contains(t.UserId.Value));
await db.Commit();
await db.CommitTrans();
}
catch
{
db.Rollback();
await db.RollbackTrans();
throw;
}
}
Expand Down
6 changes: 3 additions & 3 deletions YiSha.Business/YiSha.Service/SystemManage/DataDictService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public bool ExistDictDetail(string dictType)
#region 提交数据
public async Task SaveForm(DataDictEntity entity)
{
var db = this.BaseRepository().BeginTrans();
var db = await this.BaseRepository().BeginTrans();
try
{
if (!entity.Id.IsNullOrZero())
Expand All @@ -100,11 +100,11 @@ public async Task SaveForm(DataDictEntity entity)
await entity.Create();
await db.Insert<DataDictEntity>(entity);
}
await db.Commit();
await db.CommitTrans();
}
catch
{
db.Rollback();
await db.RollbackTrans();
throw;
}
}
Expand Down
6 changes: 3 additions & 3 deletions YiSha.Business/YiSha.Service/SystemManage/RoleService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public bool ExistRoleName(RoleEntity entity)
#region 提交数据
public async Task SaveForm(RoleEntity entity)
{
var db = this.BaseRepository().BeginTrans();
var db = await this.BaseRepository().BeginTrans();
try
{
if (entity.Id.IsNullOrZero())
Expand All @@ -89,11 +89,11 @@ public async Task SaveForm(RoleEntity entity)
await db.Insert(menuAuthorizeEntity);
}
}
await db.Commit();
await db.CommitTrans();
}
catch
{
db.Rollback();
await db.RollbackTrans();
throw;
}
}
Expand Down
2 changes: 1 addition & 1 deletion YiSha.Business/YiSha.Service/YiSha.Service.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

</Project>
10 changes: 2 additions & 8 deletions YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\YiSha.Util\YiSha.Util\YiSha.Util.csproj" />
<ProjectReference Include="..\YiSha.Cache.Interface\YiSha.Cache.Interface.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.Extensions.Caching.Abstractions">
<HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.caching.abstractions\2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
</Reference>
</ItemGroup>

</Project>
Loading

0 comments on commit b8e8ad7

Please sign in to comment.