Browse Source
Merge pull request #502 from colinin/fix-abpidentity-connect-string
fix(settings): fix AbpIdentity connection string.
pull/533/head
yx lin
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
7 additions and
7 deletions
-
aspnet-core/LINGYUN.MicroService.All.sln
-
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.QQ/Microsoft/AspNetCore/Authentication/QQAuthenticationExtensions.cs
-
aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json
|
|
|
@ -382,9 +382,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OssManagement.T |
|
|
|
EndProject |
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.IdentityServer.LinkUser", "modules\identityServer\LINGYUN.Abp.IdentityServer.LinkUser\LINGYUN.Abp.IdentityServer.LinkUser.csproj", "{25378F9D-2A66-4568-AAC6-E9282ACA3DD3}" |
|
|
|
EndProject |
|
|
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.IdentityServer.QQ", "modules\identityServer\LINGYUN.Abp.IdentityServer.QQ\LINGYUN.Abp.IdentityServer.QQ.csproj", "{A34CCD3F-28A1-4BAD-A995-EB8720CE4105}" |
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.IdentityServer.QQ", "modules\identityServer\LINGYUN.Abp.IdentityServer.QQ\LINGYUN.Abp.IdentityServer.QQ.csproj", "{A34CCD3F-28A1-4BAD-A995-EB8720CE4105}" |
|
|
|
EndProject |
|
|
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Tencent.QQ", "modules\cloud-tencent\LINGYUN.Abp.Tencent.QQ\LINGYUN.Abp.Tencent.QQ.csproj", "{3FCB1BCD-34BC-4F66-968F-38DB28371D0F}" |
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Tencent.QQ", "modules\cloud-tencent\LINGYUN.Abp.Tencent.QQ\LINGYUN.Abp.Tencent.QQ.csproj", "{3FCB1BCD-34BC-4F66-968F-38DB28371D0F}" |
|
|
|
EndProject |
|
|
|
Global |
|
|
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
|
|
|
|
|
|
|
@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Authentication |
|
|
|
/// </summary>
|
|
|
|
public static AuthenticationBuilder AddQQConnect( |
|
|
|
this AuthenticationBuilder builder, |
|
|
|
Action<QQOAuthOptions> configureOptions) |
|
|
|
Action<QQConnectOAuthOptions> configureOptions) |
|
|
|
{ |
|
|
|
return builder |
|
|
|
.AddQQConnect( |
|
|
|
@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Authentication |
|
|
|
public static AuthenticationBuilder AddQQConnect( |
|
|
|
this AuthenticationBuilder builder, |
|
|
|
string authenticationScheme, |
|
|
|
Action<QQOAuthOptions> configureOptions) |
|
|
|
Action<QQConnectOAuthOptions> configureOptions) |
|
|
|
{ |
|
|
|
return builder |
|
|
|
.AddQQConnect( |
|
|
|
@ -51,10 +51,10 @@ namespace Microsoft.AspNetCore.Authentication |
|
|
|
this AuthenticationBuilder builder, |
|
|
|
string authenticationScheme, |
|
|
|
string displayName, |
|
|
|
Action<QQOAuthOptions> configureOptions) |
|
|
|
Action<QQConnectOAuthOptions> configureOptions) |
|
|
|
{ |
|
|
|
return builder |
|
|
|
.AddOAuth<QQOAuthOptions, QQOAuthHandler>( |
|
|
|
.AddOAuth<QQConnectOAuthOptions, QQConnectOAuthHandler>( |
|
|
|
authenticationScheme, |
|
|
|
displayName, |
|
|
|
configureOptions); |
|
|
|
|
|
|
|
@ -25,7 +25,7 @@ |
|
|
|
"ConnectionStrings": { |
|
|
|
"Default": "Server=localhost;Database=Messages;User Id=root;Password=123456", |
|
|
|
"MessageService": "Server=localhost;Database=Messages;User Id=root;Password=123456", |
|
|
|
"AbpIdentity": "Server=localhost;Database=Messages;User Id=root;Password=123456", |
|
|
|
"AbpIdentity": "Server=localhost;Database=IdentityServer;User Id=root;Password=123456", |
|
|
|
"AbpTenantManagement": "Server=localhost;Database=Platform;User Id=root;Password=123456", |
|
|
|
"AbpSettingManagement": "Server=localhost;Database=Platform;User Id=root;Password=123456", |
|
|
|
"AbpPermissionManagement": "Server=localhost;Database=Platform;User Id=root;Password=123456", |
|
|
|
|