wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 16:03:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

【升级】升级Asp.Net 6.0.11 到 Asp.Net 7.0.0

Browse Source 
【升级】升级所有组建包，移除一些不用或者版本弃用的组建。
【优化】优化升级npoi最新版后，出现导出数据兼容性的问题。
【优化】使用新的【NLog.Database】nlog数据库链接组件,解决nlog升级到5.x以后版本记录到数据库日志失败的问题。
This commit is contained in:
大灰灰
2022-11-09 19:06:05 +08:00
parent 543bb281f4
commit 2313bf6ac9
58 changed files with 154 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Model/CoreCms.Net.Model.csproj
View File

@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="sqlSugarCore" Version="5.1.3.24" />
<PackageReference Include="sqlSugarCore" Version="5.1.3.32" />
</ItemGroup>
</Project>

4
CoreCms.Net.Model/FromBody/FMGoods.cs
View File

@@ -104,10 +104,10 @@ namespace CoreCms.Net.Model.FromBody
/// </summary>
public int[] ids { get; set; }
public List<labels> labels { get; set; }
public List<Labels> labels { get; set; }
}
public class labels
public class Labels
{
public string text { get; set; }
public string style { get; set; }

4
CoreCms.Net.Model/FromBody/FmPages.cs
View File

@@ -28,14 +28,14 @@ namespace CoreCms.Net.Model.FromBody
[Display(Name = "数据子集")]
[Required(ErrorMessage = "请输入{0}")]
public List<items> datalist { get; set; }
public List<Items> datalist { get; set; }
}
/// <summary>
/// 数据子集类型
/// </summary>
[Display(Name = "数据子集类型")]
public class items
public class Items
{
[Display(Name = "数据子集类型")]
[Required(ErrorMessage = "请输入{0}")]

4
CoreCms.Net.Model/ViewModels/DTO/BillPaymentsDto.cs
View File

@@ -21,10 +21,10 @@ namespace CoreCms.Net.Model.ViewModels.DTO
public decimal money { get; set; } = 0;
public List<rel> rel { get; set; } = new();
public List<Rel> rel { get; set; } = new();
}
public class rel
public class Rel
{
/// <summary>
/// 关联资源序列

8
CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionDto.cs
View File

@@ -28,20 +28,20 @@ namespace CoreCms.Net.Model.ViewModels.DTO.Distribution
/// <summary>
/// 分销级别一配置
/// </summary>
public commission commission_1 { get; set; }
public Commission commission_1 { get; set; }
/// <summary>
/// 分销级别二配置
/// </summary>
public commission commission_2 { get; set; }
public Commission commission_2 { get; set; }
/// <summary>
/// 分销级别三配置
/// </summary>
public commission commission_3 { get; set; }
public Commission commission_3 { get; set; }
}
public class commission
public class Commission
{
/// <summary>
/// 类型(百分比/固定金额)