Skip to content

Commit 85a9f61

Browse files
jianxuanbingjianxuanbing
committed
fix: 合并分支并更新版本
2 parents e64328c + 7d0635e commit 85a9f61

File tree

10 files changed

+62
-20
lines changed

10 files changed

+62
-20
lines changed

‎components/src/Bing.Biz.OAuthLogin/Bing.Biz.OAuthLogin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bing是一个.net core平台下的应用框架，旨在于提升小型团队的
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Bing.Utils.Http" Version="1.2.2-preview-20201103-1" />
10+
<PackageReference Include="Bing.Utils.Http" Version="1.2.2" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎components/src/Bing.Biz.Payments/Bing.Biz.Payments.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Bing是一个.net core平台下的应用框架，旨在于提升小型团队的
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Bing.Utils.Http" Version="1.2.2-preview-20201103-1" />
11+
<PackageReference Include="Bing.Utils.Http" Version="1.2.2" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎framework/src/Bing.AspNetCore.Mvc.UI/Bing.AspNetCore.Mvc.UI._shared.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Bing.Utils.Http" Version="1.2.2-preview-20201103-1" />
13+
<PackageReference Include="Bing.Utils.Http" Version="1.2.2" />
1414
</ItemGroup>
1515

1616
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

‎framework/src/Bing.Datas.EntityFramework/Core/UnitOfWorkBase.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,9 @@ public int Commit()
318318
{
319319
try
320320
{
321-
var changed = ChangeTracker.Entries().Any();
322-
if (!changed)
323-
return 0;
321+
//var changed = ChangeTracker.Entries().Any();
322+
//if (!changed)
323+
// return 0;
324324
return SaveChanges();
325325
}
326326
catch (DbUpdateConcurrencyException ex)
@@ -340,9 +340,9 @@ public async Task<int> CommitAsync()
340340
{
341341
try
342342
{
343-
var changed = ChangeTracker.Entries().Any();
344-
if (!changed)
345-
return 0;
343+
//var changed = ChangeTracker.Entries().Any();
344+
//if (!changed)
345+
// return 0;
346346
return await SaveChangesAsync();
347347
}
348348
catch (DbUpdateConcurrencyException ex)

‎framework/src/Bing.Events/Cap/MessageEventBus.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ private void WriteLog(string name, object data,string callback)
8686
if (log.IsDebugEnabled == false)
8787
return;
8888
log.Tag(name)
89-
.Caption("Cap已发送事件")
89+
.Caption($"Cap已发送事件-{name}")
9090
.Content($"消息名称: {name}")
9191
.AddExtraProperty("event_data", data.ToJson())
92-
.Debug();
92+
.Trace();
9393
}
9494

9595
/// <summary>

‎framework/src/Bing/Bing._shared.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
<ItemGroup>
99
<PackageReference Include="AspectCore.Extensions.AspectScope" Version="2.1.0" />
1010
<PackageReference Include="AspectCore.Extensions.Configuration" Version="2.1.0" />
11+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
1112
<PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="2.1.0" />
1213
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
1314
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
1415
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.5" />
1516
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
1617
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.10" />
17-
<PackageReference Include="Bing.Utils" Version="1.2.2-preview-20201103-1" />
18+
<PackageReference Include="Bing.Utils" Version="1.2.2" />
1819
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
1920
</ItemGroup>
2021

‎framework/src/Bing/Bing/Threading/CallContext.cs‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
using System.Collections.Concurrent;
2+
using System.Threading;
3+
4+
namespace Bing.Threading
5+
{
6+
/// <summary>
7+
/// 调用上下文
8+
/// </summary>
9+
public static class CallContext
10+
{
11+
/// <summary>
12+
/// 状态字典
13+
/// </summary>
14+
private static readonly ConcurrentDictionary<string, AsyncLocal<object>> _state = new ConcurrentDictionary<string, AsyncLocal<object>>();
15+
16+
/// <summary>
17+
/// 设置值
18+
/// </summary>
19+
/// <param name="name">键名</param>
20+
/// <param name="data">数据</param>
21+
public static void SetValue(string name, object data) => _state.GetOrAdd(name, _ => new AsyncLocal<object>()).Value = data;
22+
23+
/// <summary>
24+
/// 获取值
25+
/// </summary>
26+
/// <param name="name">键名</param>
27+
/// <returns>如果指定键名不存在，则返回 null。</returns>
28+
public static object GetValue(string name) => _state.TryGetValue(name, out var data) ? data.Value : null;
29+
30+
/// <summary>
31+
/// 移除
32+
/// </summary>
33+
/// <param name="name">键名</param>
34+
public static void Remove(string name) => _state.TryRemove(name, out _);
35+
36+
/// <summary>
37+
/// 清空
38+
/// </summary>
39+
public static void Clear() => _state.Clear();
40+
}
41+
}

‎modules/admin/src/Bing.Admin.Infrastructure/Bing.Admin.Infrastructure.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Bing.Utils.Http" Version="1.2.2-preview-20201103-1" />
17+
<PackageReference Include="Bing.Utils.Http" Version="1.2.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎modules/admin/src/Bing.Admin/Modules/LogModule.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public class LogModule : AspNetCoreBingModule
3131
/// <param name="services">服务集合</param>
3232
public override IServiceCollection AddServices(IServiceCollection services)
3333
{
34-
services.AddNLog();
35-
//services.AddExceptionless(o =>
36-
//{
37-
// o.ApiKey = "FKLLqe2hMowxb1udH8w76DaGjUxFw04BZv3P0AOO";
38-
// o.ServerUrl = "http://106.12.130.45:50000";
39-
//});
34+
//services.AddNLog();
35+
services.AddExceptionless(o =>
36+
{
37+
o.ApiKey = "ez9jumyxVxjTxqSm0oUQhCML3OGCkDfMGyW1hfmn";
38+
o.ServerUrl = "http://10.186.132.40:5100";
39+
});
4040
return services;
4141
}
4242
}

‎version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<VersionMajor>1</VersionMajor>
44
<VersionMinor>2</VersionMinor>
55
<VersionPatch>2</VersionPatch>
6-
<VersionQuality>20201207-1</VersionQuality>
6+
<VersionQuality>20201217-1</VersionQuality>
77
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
88
<VersionSuffix>preview-$(VersionQuality)</VersionSuffix>
99
</PropertyGroup>

0 commit comments

Comments
 (0)