diff --git a/aspnet-core/configuration/account/AuthServer.Host/appsettings.Development.json b/aspnet-core/configuration/account/AuthServer.Host/appsettings.Development.json index 588a27b2f..e0914e0d8 100644 --- a/aspnet-core/configuration/account/AuthServer.Host/appsettings.Development.json +++ b/aspnet-core/configuration/account/AuthServer.Host/appsettings.Development.json @@ -2,13 +2,7 @@ "App": { "TrackingEntitiesChanged": true, "SelfUrl": "http://localhost:44385/", - "CorsOrigins": "http://localhost:4200,http://localhost:9528,http://127.0.0.1:63898", - "Forwarded": { - "ForwardedHeaders": 5, - "KnownProxies": [ - "127.0.0.1" - ] - } + "CorsOrigins": "http://localhost:4200,http://localhost:9528,http://127.0.0.1:63898" }, "AppSelfUrl": "http://localhost:44385/", "ConnectionStrings": { @@ -20,25 +14,6 @@ "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" }, - "Identity": { - "Password": { - "RequiredLength": 6, - "RequiredUniqueChars": 0, - "RequireNonAlphanumeric": false, - "RequireLowercase": false, - "RequireUppercase": false, - "RequireDigit": false - }, - "Lockout": { - "AllowedForNewUsers": false, - "LockoutDuration": 5, - "MaxFailedAccessAttempts": 5 - }, - "SignIn": { - "RequireConfirmedEmail": false, - "RequireConfirmedPhoneNumber": false - } - }, "CAP": { "EventBus": { "DefaultGroupName": "AuthServer", @@ -64,16 +39,6 @@ "Authority": "http://localhost:44385/", "ApiName": "lingyun-abp-application" }, - "WeChat": { - "Auth": { - "AppId": "微信AppId", - "AppSecret": "微信AppSecret" - }, - "Signature": { - "RequestPath": "微信开发者中心填写的验证地址", - "Token": "微信开发者中心填写的Token" - } - }, "IdentityServer": { "Clients": { "AuthManagement": { diff --git a/aspnet-core/configuration/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/configuration/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json index 01bde2715..d4653d066 100644 --- a/aspnet-core/configuration/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/configuration/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -1,13 +1,7 @@ { "App": { "TrackingEntitiesChanged": true, - "SelfUrl": "http://localhost:44385/", - "Forwarded": { - "ForwardedHeaders": 5, - "KnownProxies": [ - "127.0.0.1" - ] - } + "SelfUrl": "http://localhost:44385/" }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", diff --git a/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json b/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json index d18530077..7fd0398da 100644 --- a/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json +++ b/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json @@ -3,9 +3,8 @@ "AppId": "TEST-APP"//这里是用于Ocelot主机去API服务器获取参数的标识,指定需要获取什么类型的网关配置 }, "Redis": { - "Configuration": "127.0.0.1", - "InstanceName": "LINGYUN.AbpApplication", - "DefaultDatabase": 10 + "Configuration": "127.0.0.1,defaultDatabase=10", + "InstanceName": "LINGYUN.AbpApplication" }, "RemoteServices": { "ApiGateway": { diff --git a/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json b/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json index 191043b53..7a258c74d 100644 --- a/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json @@ -1,13 +1,7 @@ { "App": { "TrackingEntitiesChanged": true, - "SelfUrl": "http://localhost:44385/", - "Forwarded": { - "ForwardedHeaders": 5, - "KnownProxies": [ - "127.0.0.1" - ] - } + "SelfUrl": "http://localhost:44385/" }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=ApiGateway;User Id=root;Password=123456", @@ -17,9 +11,8 @@ "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" }, "Redis": { - "Configuration": "127.0.0.1", - "InstanceName": "LINGYUN.AbpApplication", - "DefaultDatabase": 10 + "Configuration": "127.0.0.1,defaultDatabase=10", + "InstanceName": "LINGYUN.AbpApplication" }, "CAP": { "EventBus": { diff --git a/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json b/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json index fe4c331bc..3d49240ca 100644 --- a/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json @@ -1,12 +1,6 @@ { "App": { - "TrackingEntitiesChanged": true, - "Forwarded": { - "ForwardedHeaders": 5, - "KnownProxies": [ - "127.0.0.1" - ] - } + "TrackingEntitiesChanged": true }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456", @@ -35,9 +29,8 @@ } }, "Redis": { - "Configuration": "127.0.0.1", - "InstanceName": "LINGYUN.AbpApplication", - "DefaultDatabase": 10 + "Configuration": "127.0.0.1,defaultDatabase=10", + "InstanceName": "LINGYUN.AbpApplication" }, "AuthServer": { "Authority": "http://localhost:44385/", diff --git a/aspnet-core/configuration/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json b/aspnet-core/configuration/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json index cff16ce44..feb326a3d 100644 --- a/aspnet-core/configuration/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/configuration/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json @@ -1,12 +1,6 @@ { "App": { - "CorsOrigins": "http://localhost:9527,http://127.0.0.1:30000", - "Forwarded": { - "ForwardedHeaders": 5, - "KnownProxies": [ - "127.0.0.1" - ] - } + "CorsOrigins": "http://localhost:9527,http://127.0.0.1:30000" }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Messages;User Id=root;Password=123456", @@ -16,9 +10,8 @@ "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456" }, "Redis": { - "Configuration": "127.0.0.1", - "InstanceName": "LINGYUN.AbpApplication", - "DefaultDatabase": 10 + "Configuration": "127.0.0.1,defaultDatabase=10", + "InstanceName": "LINGYUN.AbpApplication" }, "AuthServer": { "Authority": "http://localhost:44385/", @@ -30,12 +23,6 @@ "TablePrefix": "AppHangfire" } }, - "WeChat": { - "Auth": { - "AppId": "你自己的微信AppId", - "AppSecret": "你自己的微信AppSecret" - } - }, "Notifications": { "WeChat": { "WeApp": { diff --git a/aspnet-core/configuration/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json b/aspnet-core/configuration/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json index 5a75e60f6..0a87a944f 100644 --- a/aspnet-core/configuration/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/configuration/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json @@ -1,12 +1,6 @@ { "App": { - "CorsOrigins": "http://localhost:9527,http://127.0.0.1:30000", - "Forwarded": { - "ForwardedHeaders": 5, - "KnownProxies": [ - "127.0.0.1" - ] - } + "CorsOrigins": "http://localhost:9527,http://127.0.0.1:30000" }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456", @@ -57,9 +51,8 @@ } }, "Redis": { - "Configuration": "127.0.0.1", - "InstanceName": "LINGYUN.AbpApplication", - "DefaultDatabase": 10 + "Configuration": "127.0.0.1,defaultDatabase=10", + "InstanceName": "LINGYUN.AbpApplication" }, "AuthServer": { "Authority": "http://localhost:44385/", diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml index 7b5589b2f..307792fbf 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml @@ -188,7 +188,7 @@ CAP消息扩展 - + 尝试获取消息标头中的租户标识 diff --git a/build/build-aspnetcore-build.ps1 b/build/build-aspnetcore-build.ps1 new file mode 100644 index 000000000..22c750fbc --- /dev/null +++ b/build/build-aspnetcore-build.ps1 @@ -0,0 +1,22 @@ +. "./build-aspnetcore-common.ps1" + +# Build all solutions +foreach ($service in $serviceArray) { + $copyFromConfig = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($rootFolder + $service.ConfigPath + $service.ConfigFile) + if (Test-Path $copyFromConfig) + { + $copyToConfig = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($service.Path + $service.ConfigFile) + $configExists = Test-Path $copyToConfig + if ($configExists -eq $false) { + Write-host "" + Write-host "Coping appsettings.Development.json ..." -ForegroundColor red -BackgroundColor yellow + Write-host "" + Copy-Item $copyFromConfig $copyToConfig + } + } + + Set-Location $service.Path + dotnet build --no-cache +} + +Set-Location $rootFolder \ No newline at end of file diff --git a/build/build-aspnetcore-common.ps1 b/build/build-aspnetcore-common.ps1 index e88f0d814..4e134ddc4 100644 --- a/build/build-aspnetcore-common.ps1 +++ b/build/build-aspnetcore-common.ps1 @@ -5,14 +5,14 @@ $rootFolder = (Get-Item -Path "./" -Verbose).FullName # List of solutions used only in development mode [PsObject[]]$serviceArray = @() -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/account/AuthServer.Host"; Service = "identityserver" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host"; Service = "admin" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host"; Service = "identityserver4-admin" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host"; Service = "apigateway-host" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host"; Service = "apigateway-admin" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host"; Service = "messages" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host"; Service = "platform" } -$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host"; Service = "localization" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/account/AuthServer.Host/"; Service = "identityserver"; ConfigPath = "/../aspnet-core/configuration/account/AuthServer.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/"; Service = "admin"; ConfigPath = "/../aspnet-core/configuration/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/"; Service = "identityserver4-admin"; ConfigPath = "/../aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/"; Service = "apigateway-host"; ConfigPath = "/../aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/"; Service = "apigateway-admin"; ConfigPath = "/../aspnet-core/configuration/apigateway/LINGYUN.ApiGateway.HttpApi.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/"; Service = "messages"; ConfigPath = "/../aspnet-core/configuration/messages/LINGYUN.Abp.MessageService.HttpApi.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/"; Service = "platform"; ConfigPath = "/../aspnet-core/configuration/platform/LINGYUN.Platform.HttpApi.Host/"; ConfigFile = "appsettings.Development.json" } +$serviceArray += [PsObject]@{ Path = $rootFolder + "/../aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/"; Service = "localization"; ConfigPath = "/../aspnet-core/configuration/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/"; ConfigFile = "appsettings.Development.json" } Write-host "" Write-host ":::::::::::::: !!! You are in development mode !!! ::::::::::::::" -ForegroundColor red -BackgroundColor yellow