Skip to content

Commit

Permalink
Merge pull request #60 from bing-framework/dev_3.1
Browse files Browse the repository at this point in the history
发布 2.2.4
  • Loading branch information
jianxuanbing authored Sep 15, 2022
2 parents 575d679 + d7f77fd commit 6cffb34
Show file tree
Hide file tree
Showing 322 changed files with 6,857 additions and 2,652 deletions.
87 changes: 65 additions & 22 deletions Bing.All.sln
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,6 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.MiniProfiler", "framework\src\Bing.MiniProfiler\Bing.MiniProfiler.csproj", "{43BE3B85-AA7B-47B5-AC09-EE66B52358EA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_SolutionItems", "{2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
common.props = common.props
Directory.Build.targets = Directory.Build.targets
framework.props = framework.props
LICENSE = LICENSE
README.md = README.md
version.dev.props = version.dev.props
version.props = version.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6690993E-6659-451F-907C-A48FE1121D40}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -89,9 +77,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01-admin", "01-admin", "{BDBABE46-FAAE-459D-BC78-B5BA6503EBBA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-tests", "02-tests", "{5C7976B4-C243-41B9-8303-8E8FAE099D31}"
ProjectSection(SolutionItems) = preProject
framework\tests\Directory.Build.props = framework\tests\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.AutoMapper.Tests", "framework\tests\Bing.AutoMapper.Tests\Bing.AutoMapper.Tests.csproj", "{741EE94D-5F03-426E-9D34-CBDA41671742}"
EndProject
Expand All @@ -111,8 +96,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Ddd.Application", "fra
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Ddd.Application.Contracts", "framework\src\Bing.Ddd.Application.Contracts\Bing.Ddd.Application.Contracts.csproj", "{577D3EA3-5342-4E0D-AE51-39CBEE217089}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Validation.Abstractions", "framework\src\Bing.Validation.Abstractions\Bing.Validation.Abstractions.csproj", "{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Auditing", "framework\src\Bing.Auditing\Bing.Auditing.csproj", "{F084AFFB-9136-43CE-874C-777DBA4D5205}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Emailing", "framework\src\Bing.Emailing\Bing.Emailing.csproj", "{5D81881D-FF17-4902-8BEB-A1D58D0EF688}"
Expand Down Expand Up @@ -190,6 +173,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{D77F42E0
ProjectSection(SolutionItems) = preProject
asset\props\misc.props = asset\props\misc.props
asset\props\package.props = asset\props\package.props
asset\props\sourcelink.env.props = asset\props\sourcelink.env.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Admin.Data.FreeSQL", "modules\admin\src\Bing.Admin.Data.FreeSQL\Bing.Admin.Data.FreeSQL.csproj", "{05DFA67F-C861-48F9-BBD9-7777972A918F}"
Expand Down Expand Up @@ -242,6 +226,45 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Logging.Tests", "frame
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Logging.Serilog.Tests", "framework\tests\Bing.Logging.Serilog.Tests\Bing.Logging.Serilog.Tests.csproj", "{857BF156-74BE-4D71-8814-A1ECAA958C2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Validation.Abstractions", "framework\src\Bing.Validation.Abstractions\Bing.Validation.Abstractions.csproj", "{19A3A852-6F7B-4864-8F53-AE91A04D0732}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Aop.AspectCore", "framework\src\Bing.Aop.AspectCore\Bing.Aop.AspectCore.csproj", "{E7D1CB89-9657-44EC-8531-4C1B956D190E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02-tests", "02-tests", "{FA7995A9-43C6-405A-B924-E4F182C245C2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bing.Biz.Payments.Tests", "components\tests\Bing.Biz.Payments.Tests\Bing.Biz.Payments.Tests.csproj", "{F41CF4E3-DB29-42C2-8999-39880376D862}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{3EE7B5A9-FF9B-4786-9E0F-AFD2BED68CC2}"
ProjectSection(SolutionItems) = preProject
asset\images\icon.png = asset\images\icon.png
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7ABB7FBC-A1B9-432F-BCC5-53B9FD0172D8}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{4A87040E-99A6-4A3F-BD6D-D2A3C3663012}"
ProjectSection(SolutionItems) = preProject
framework\Publish.bat = framework\Publish.bat
framework\UnPublish.bat = framework\UnPublish.bat
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{B6E2B626-F561-4B47-8CFE-E8A305696522}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
common.props = common.props
common.tests.props = common.tests.props
framework.props = framework.props
LICENSE = LICENSE
version.dev.props = version.dev.props
version.props = version.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bing.Uow", "framework\src\Bing.Uow\Bing.Uow.csproj", "{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -396,10 +419,6 @@ Global
{577D3EA3-5342-4E0D-AE51-39CBEE217089}.Debug|Any CPU.Build.0 = Debug|Any CPU
{577D3EA3-5342-4E0D-AE51-39CBEE217089}.Release|Any CPU.ActiveCfg = Release|Any CPU
{577D3EA3-5342-4E0D-AE51-39CBEE217089}.Release|Any CPU.Build.0 = Release|Any CPU
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446}.Release|Any CPU.Build.0 = Release|Any CPU
{F084AFFB-9136-43CE-874C-777DBA4D5205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F084AFFB-9136-43CE-874C-777DBA4D5205}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F084AFFB-9136-43CE-874C-777DBA4D5205}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -552,6 +571,22 @@ Global
{857BF156-74BE-4D71-8814-A1ECAA958C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{857BF156-74BE-4D71-8814-A1ECAA958C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{857BF156-74BE-4D71-8814-A1ECAA958C2D}.Release|Any CPU.Build.0 = Release|Any CPU
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19A3A852-6F7B-4864-8F53-AE91A04D0732}.Release|Any CPU.Build.0 = Release|Any CPU
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7D1CB89-9657-44EC-8531-4C1B956D190E}.Release|Any CPU.Build.0 = Release|Any CPU
{F41CF4E3-DB29-42C2-8999-39880376D862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F41CF4E3-DB29-42C2-8999-39880376D862}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F41CF4E3-DB29-42C2-8999-39880376D862}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F41CF4E3-DB29-42C2-8999-39880376D862}.Release|Any CPU.Build.0 = Release|Any CPU
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -599,7 +634,6 @@ Global
{25107D91-1E7D-422C-8B03-B1C94EE3A1B5} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
{CAC738F2-8F95-4940-90D2-76DABF403581} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
{577D3EA3-5342-4E0D-AE51-39CBEE217089} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
{DB0D25EE-7489-4DD1-8CF9-A8F839B58446} = {472FFE79-B8B1-41A1-91F2-CFA0F8406BC9}
{F084AFFB-9136-43CE-874C-777DBA4D5205} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
{5D81881D-FF17-4902-8BEB-A1D58D0EF688} = {B8142AAE-3792-44C0-9197-0F14A9749E33}
{256EB128-60DC-406C-BED0-9D0013A6B49A} = {052D4342-8B65-4836-A9B6-681A7812760E}
Expand Down Expand Up @@ -659,6 +693,15 @@ Global
{C7E17279-AAEB-4A58-BBBB-AF443F924D9E} = {33F6CAB3-FD8A-4B91-9B94-A1E2DBC2759B}
{73871EF9-9CF6-479F-BC1C-AD443CE037AE} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
{857BF156-74BE-4D71-8814-A1ECAA958C2D} = {5C7976B4-C243-41B9-8303-8E8FAE099D31}
{19A3A852-6F7B-4864-8F53-AE91A04D0732} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
{E7D1CB89-9657-44EC-8531-4C1B956D190E} = {C6B2743E-B7EE-418C-9F9B-79976B71C46B}
{FA7995A9-43C6-405A-B924-E4F182C245C2} = {8E2070BF-F6CF-47CC-8DB8-56B74EDFA7EB}
{F41CF4E3-DB29-42C2-8999-39880376D862} = {FA7995A9-43C6-405A-B924-E4F182C245C2}
{3EE7B5A9-FF9B-4786-9E0F-AFD2BED68CC2} = {F40A8736-2FEC-446A-99FD-3660729893FC}
{7ABB7FBC-A1B9-432F-BCC5-53B9FD0172D8} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
{4A87040E-99A6-4A3F-BD6D-D2A3C3663012} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
{B6E2B626-F561-4B47-8CFE-E8A305696522} = {2BA5C677-C0B9-458B-8A6D-D3E74B6F60EA}
{659C6450-6A39-44A3-A1A5-449ECAA1AFBE} = {AED4D92B-5196-47E9-BD2C-84D4077F5A70}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C1202A0F-83CC-4602-BCE5-20CB640BCAD4}
Expand Down
16 changes: 0 additions & 16 deletions Directory.Build.targets

This file was deleted.

17 changes: 17 additions & 0 deletions asset/props/sourcelink.env.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>

<ItemGroup>
<PackageReference Include="DotNetCore.SourceLink.Environment">
<Version Condition=" '$(TargetFramework)' == 'net48' ">2.2.0</Version>
<Version Condition=" '$(TargetFramework)' == 'net472' ">2.2.0</Version>
<Version Condition=" '$(TargetFramework)' == 'net462' ">2.2.0</Version>
<Version Condition=" '$(TargetFramework)' == 'net452' ">2.2.0</Version>
<Version Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.2.0</Version>
<Version Condition=" '$(TargetFramework)' == 'netstandard2.1' ">2.2.0</Version>
<Version Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.0</Version>
<Version Condition=" '$(TargetFramework)' == 'net5.0' ">3.1.0</Version>
<Version Condition=" '$(TargetFramework)' == 'net6.0' ">3.1.0</Version>
</PackageReference>
</ItemGroup>

</Project>
6 changes: 4 additions & 2 deletions common.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>

<PropertyGroup>
<RootNamespace/>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<NoWarn Condition=" '$(Configuration)' == 'Debug' ">$(NoWarn);NETSDK1138</NoWarn>
<NoWarn Condition=" '$(Configuration)' == 'Release' ">$(NoWarn);CS1591;NETSDK1138</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -22,6 +22,8 @@
<DocumentationFile>$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>

<Import Project="asset/props/sourcelink.env.props"/>

<Import Project="asset/props/package.props"/>

<Import Project="asset/props/misc.props"/>
Expand Down
23 changes: 23 additions & 0 deletions common.tests.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<IsPackable>false</IsPackable>
</PropertyGroup>

<!--单元测试基础配置-->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio">
<Version Condition=" '$(TargetFramework)' != 'net452' ">2.4.5</Version>
<Version Condition=" '$(TargetFramework)' == 'net452' ">2.4.3</Version>
<Version Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">2.4.3</Version>
<Version Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.4.3</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<Import Project="asset/props/sourcelink.env.props"/>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Bing是一个.net core平台下的应用框架,旨在于提升小型团队的
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bing.Utils.Http" Version="1.2.2" />
<PackageReference Include="Bing.Utils.Http" Version="1.4.0-preview-20220831-2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\framework\src\Bing.AutoMapper\Bing.AutoMapper.csproj" />
<ProjectReference Include="..\..\..\framework\src\Bing.Logs\Bing.Logs.csproj" />
<ProjectReference Include="..\..\..\framework\src\Bing.Validation\Bing.Validation.csproj" />
<ProjectReference Include="..\..\..\framework\src\Bing\Bing.csproj" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions components/src/Bing.Biz.OAuthLogin/Core/AccessTokenParam.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Bing.Exceptions;
using Bing.Validations;
using Bing.Validation;

namespace Bing.Biz.OAuthLogin.Core
{
/// <summary>
/// 访问令牌参数
/// </summary>
public class AccessTokenParam : IValidation
public class AccessTokenParam : IVerifyModel
{
/// <summary>
/// 授权类型
Expand All @@ -31,7 +31,7 @@ public class AccessTokenParam : IValidation
/// <summary>
/// 验证
/// </summary>
public virtual ValidationResultCollection Validate()
public virtual IValidationResult Validate()
{
var result = DataAnnotationValidation.Validate(this);
if (result.IsValid)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Bing.Exceptions;
using Bing.Validations;
using Bing.Validation;

namespace Bing.Biz.OAuthLogin.Core
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using System.Linq;
using Bing.Exceptions;
using Bing.ObjectMapping;
using Bing.Validations;
using Bing.Validation;

namespace Bing.Biz.OAuthLogin.Core
{
/// <summary>
/// 授权参数基类
/// </summary>
public class AuthorizationParamBase : IValidation
public class AuthorizationParamBase : IVerifyModel
{
/// <summary>
/// 授权类型
Expand Down Expand Up @@ -45,7 +45,7 @@ private void InitState()
/// <summary>
/// 验证
/// </summary>
public virtual ValidationResultCollection Validate()
public virtual IValidationResult Validate()
{
var result = DataAnnotationValidation.Validate(this);
if (result.IsValid)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
using System.Linq;
using Bing.Exceptions;
using Bing.ObjectMapping;
using Bing.Validations;
using Bing.Validation;

namespace Bing.Biz.OAuthLogin.Core
{
/// <summary>
/// 授权用户参数基类
/// </summary>
public class AuthorizationUserParamBase : IValidation
public class AuthorizationUserParamBase : IVerifyModel
{
/// <summary>
/// 访问令牌
Expand All @@ -20,7 +20,7 @@ public class AuthorizationUserParamBase : IValidation
/// <summary>
/// 验证
/// </summary>
public ValidationResultCollection Validate()
public IValidationResult Validate()
{
var result = DataAnnotationValidation.Validate(this);
if (result.IsValid)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ public class MeiliShuoAuthorizationConfig : AuthorizationConfigBase
/// 应用标识
/// </summary>
[Required(ErrorMessage = "应用标识[AppId]不能为空")]
public string AppId { get; set; }
public override string AppId { get; set; }

/// <summary>
/// 应用密钥
/// </summary>
[Required(ErrorMessage = "应用密钥[AppKey]不能为空")]
public string AppKey { get; set; }
public override string AppKey { get; set; }

/// <summary>
/// 回调地址
/// </summary>
[Required(ErrorMessage = "回调地址[CallbackUrl]不能为空")]
public string CallbackUrl { get; set; }
public override string CallbackUrl { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public interface IAlipayAppPayService
/// 支付
/// </summary>
/// <param name="request">支付参数</param>
/// <returns></returns>
Task<string> PayAsync(AlipayAppPayRequest request);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Bing.Validations;
using Bing.Validation;

namespace Bing.Biz.Payments.Alipay.Abstractions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Bing.Exceptions;
using Bing.Validations;
using Bing.Validation;

namespace Bing.Biz.Payments.Alipay.Configs
{
Expand All @@ -19,7 +19,7 @@ public class AlipayConfig
/// <summary>
/// 应用标识
/// </summary>
[Required(ErrorMessage = "应用标识[AppId]不能为空")]
[Required(ErrorMessage = "应用标识[GetAppId]不能为空")]
public string AppId { get; set; }

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Bing.Extensions;
using Bing.Parameters;
using Bing.Utils.Parameters;
using Bing.Validation;
using Bing.Validations;

namespace Bing.Biz.Payments.Alipay.Services
Expand Down
Loading

0 comments on commit 6cffb34

Please sign in to comment.