Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8448123

Browse files
committed
Merge branch 'OpenIddictIntegration' into dev/yatou
# Conflicts:#src/Destiny.Core.Flow.API/Filters/PermissionAuthorizationFilter.cs#src/Destiny.Core.Flow.API/appsettings.Development.json#src/Destiny.Core.Flow.AuthenticationCenter/Destiny.Core.Flow.AuthenticationCenter.csproj#src/Destiny.Core.Flow.Model/Destiny.Core.Flow.Model.csproj#src/Destiny.Core.Flow.Services/Destiny.Core.Flow.Services.csproj
2 parentsa492b94 +2c04d03 commit8448123

File tree

56 files changed

+8588
-11765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+8588
-11765
lines changed

‎.gitignore‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@
113113
/src/Destiny.Core.Flow.TestBase/obj
114114
/src/Destiny.Core.Flow.Consul/bin
115115
/src/Destiny.Core.Flow.Consul/obj
116+
117+
**/Logs/*
118+
**/DestinyCoreDb.txt
116119
## Ignore Visual Studio temporary files, build results, and
117120
## files generated by popular Visual Studio add-ons.
118121

@@ -382,6 +385,6 @@ src/Destiny.Core.Flow.API/DestinyCoreMongoDb.txt
382385
/src/Destiny.Core.Flow.AuthenticationCenter/DestinyCoreMongoDb.txt
383386
/src/Destiny.Core.Flow.AuthenticationCenter/DestinyCoreRedis.txt
384387
/src/Destiny.Core.Flow.AuthenticationCenter/Logs
385-
Destiny.Core.Flow.OpenIddictServer/DestinyCoreDb.txt
386-
Destiny.Core.Flow.OpenIddictServer/DestinyCoreMongoDb.txt
387-
Destiny.Core.Flow.OpenIddictServer/DestinyCoreRedis.txt
388+
/src/Destiny.Core.Flow.OpenIddictServer/DestinyCoreDb.txt
389+
/src/Destiny.Core.Flow.OpenIddictServer/DestinyCoreMongoDb.txt
390+
/src/Destiny.Core.Flow.OpenIddictServer/DestinyCoreRedis.txt
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mongodb://1065.cloud:8890
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
47.100.213.49:8864,password=redis123,prefix=destinycoreflow_

‎src/Destiny.Core.Flow.API/Destiny.Core.Flow.API.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
<ItemGroup>
3333
<PackageReferenceInclude="AspectCore.Extensions.DependencyInjection"Version="2.2.0" />
3434
<PackageReferenceInclude="AspectCore.Extensions.Hosting"Version="2.2.0" />
35-
<PackageReferenceInclude="DestinyCore.AspNetCore"Version="1.0.1" />
36-
<PackageReferenceInclude="DestinyCore.MiniProfiler"Version="1.0.1" />
37-
<PackageReferenceInclude="DestinyCore.Swagger"Version="1.0.1" />
38-
<PackageReferenceInclude="Microsoft.AspNetCore.Authentication.JwtBearer"Version="5.0.6" />
39-
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.NewtonsoftJson"Version="5.0.6" />
40-
<PackageReferenceInclude="Microsoft.CodeAnalysis.CSharp"Version="3.9.0" />
35+
<PackageReferenceInclude="DestinyCore.AspNetCore"Version="1.0.3" />
36+
<PackageReferenceInclude="DestinyCore.MiniProfiler"Version="1.0.3" />
37+
<PackageReferenceInclude="DestinyCore.Swagger"Version="1.0.3" />
38+
<PackageReferenceInclude="Microsoft.AspNetCore.Authentication.JwtBearer"Version="5.0.7" />
39+
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.NewtonsoftJson"Version="5.0.7" />
40+
<PackageReferenceInclude="Microsoft.CodeAnalysis.CSharp"Version="3.10.0" />
4141
<PackageReferenceInclude="Microsoft.DotNet.PlatformAbstractions"Version="3.1.6" />
42-
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Tools"Version="5.0.6">
42+
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Tools"Version="5.0.7">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>

‎src/Destiny.Core.Flow.API/Filters/PermissionAuthorizationFilter.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
134134
if(!result1.Success)
135135
{
136136
////????不包含的时候怎么返回出去？这个请求终止掉
137-
_logger.LogError($"此{linkurl}地址没有权限");
137+
///
138+
//????不包含的时候怎么返回出去？这个请求终止掉
139+
// _logger.LogError($"此{linkurl}地址没有权限");
138140

139141
result.Message=MessageDefinitionType.Uncertified;
140142
result.Type=AjaxResultType.Uncertified;

‎src/Destiny.Core.Flow.AspNetCore/Destiny.Core.Flow.AspNetCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReferenceInclude="DestinyCore"Version="1.0.1" />
9-
<PackageReferenceInclude="DestinyCore.AspNetCore"Version="1.0.1" />
8+
<PackageReferenceInclude="DestinyCore"Version="1.0.3" />
9+
<PackageReferenceInclude="DestinyCore.AspNetCore"Version="1.0.3" />
1010
<PackageReferenceInclude="Microsoft.AspNetCore.Authorization"Version="5.0.7" />
1111
</ItemGroup>
1212

‎src/Destiny.Core.Flow.AuthenticationCenter/Destiny.Core.Flow.AuthenticationCenter.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReferenceInclude="AspNet.Security.OAuth.QQ"Version="5.0.5" />
12-
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"Version="5.0.6" />
13-
<PackageReferenceInclude="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"Version="1.10.13" />
11+
<PackageReferenceInclude="AspNet.Security.OAuth.QQ"Version="5.0.6" />
12+
<PackageReferenceInclude="DestinyCore.AspNetCore"Version="1.0.3" />
13+
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"Version="5.0.7" /> <PackageReferenceInclude="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"Version="1.10.13" />
1414
<PackageReferenceInclude="Pomelo.EntityFrameworkCore.MySql"Version="5.0.0" />
1515
</ItemGroup>
1616

‎src/Destiny.Core.Flow.Dtos/Destiny.Core.Flow.Dtos.csproj‎

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

1515
<ItemGroup>
16-
<PackageReferenceInclude="DestinyCore.FluentValidation"Version="1.0.1" />
16+
<PackageReferenceInclude="DestinyCore.FluentValidation"Version="1.0.3" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/Destiny.Core.Flow.EntityFrameworkCore/Destiny.Core.Flow.EntityFrameworkCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReferenceInclude="DestinyCore"Version="1.0.1" />
8-
<PackageReferenceInclude="DestinyCore.EntityFrameworkCore"Version="1.0.1" />
7+
<PackageReferenceInclude="DestinyCore"Version="1.0.3" />
8+
<PackageReferenceInclude="DestinyCore.EntityFrameworkCore"Version="1.0.3" />
99
</ItemGroup>
1010
</Project>

‎src/Destiny.Core.Flow.EntityFrameworkCore/IdentityServer4DefaultDbContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Destiny.Core.Flow.EntityFrameworkCore
1111
publicclassIdentityServer4DefaultDbContext:DbContextBase
1212
{
1313
publicIdentityServer4DefaultDbContext(DbContextOptions<IdentityServer4DefaultDbContext>options,IServiceProviderserviceProvider)
14-
:base(options,serviceProvider)
14+
:base(options,serviceProvider)
1515
{
1616

1717
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp