From 62a0f5dc16f5a5eb90fc0334b90099a18dc8db6f Mon Sep 17 00:00:00 2001 From: WangJunZzz <510423039@qq.com> Date: Fri, 26 Mar 2021 23:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 3 +- content/aspnetcore/Zzz.sln | 1 + .../src/Zzz.HttpApi.Host/appsettings.Ali.json | 72 +++++++++++++++---- .../Zzz.HttpApi.Host/appsettings.Staging.json | 72 +++++++++++++++---- .../src/Zzz.HttpApi.Host/appsettings.json | 72 +++++++++++++++---- .../appsettings.Staging.json | 22 +++++- .../src/Zzz.PublicApi.Host/appsettings.json | 41 +++++++---- 7 files changed, 225 insertions(+), 58 deletions(-) diff --git a/Readme.md b/Readme.md index beb19ff2..6eddf0a8 100644 --- a/Readme.md +++ b/Readme.md @@ -20,9 +20,10 @@ - .Net Core5.0 - Abp Vnext 4.x , - Ant Design, Vue2.x -- Mysql,Redis,Hangfire,ES(日志可选),Nocas(可选,未集成,计划中),RabbitMq(未集成,计划中) +- Mysql,Redis,Hangfire,ES(日志可选),Nocas(可选,选择nocas分支),RabbitMq(未集成,计划中) - 微服务架构设计, DDD 实践 - 容器化 CI CD +- Xunit 单元测试 ### 系统功能 diff --git a/content/aspnetcore/Zzz.sln b/content/aspnetcore/Zzz.sln index b5ace9b0..2c9c8bb2 100644 --- a/content/aspnetcore/Zzz.sln +++ b/content/aspnetcore/Zzz.sln @@ -39,6 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject common.props = common.props NuGet.Config = NuGet.Config + ..\..\Readme.md = ..\..\Readme.md EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zzz.PublicApi.Host", "src\Zzz.PublicApi.Host\Zzz.PublicApi.Host.csproj", "{AA3C1547-1A82-470E-9EB7-1C9E9AA50136}" diff --git a/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Ali.json b/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Ali.json index c0ed8ac3..f9b76d7b 100644 --- a/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Ali.json +++ b/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Ali.json @@ -1,17 +1,61 @@ { - "NacosConfig": { - "Listeners": [ - { - "Optional": false, - "DataId": "Zzz", - "Group": "Ali" + "App": { + "SelfUrl": "https://localhost:44363", + "CorsOrigins": "https://*.Zzz.com,http://localhost:8083,http://localhost:8081,https://localhost:44307," + }, + "StringEncryption": { + "DefaultPassPhrase": "MY2bTgp2iaHUEp66" + }, + "Settings": { + "Abp.Mailing.Smtp.Host": "127.0.0.1", + "Abp.Mailing.Smtp.Port": "25", + "Abp.Mailing.Smtp.UserName": "", + "Abp.Mailing.Smtp.Password": "", + "Abp.Mailing.Smtp.Domain": "", + "Abp.Mailing.Smtp.EnableSsl": "false", + "Abp.Mailing.Smtp.UseDefaultCredentials": "true", + "Abp.Mailing.DefaultFromAddress": "noreply@abp.io", + "Abp.Mailing.DefaultFromDisplayName": "ABP application" + }, + "Serilog": { + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Information", + "Microsoft.AspNetCore": "Information", + "System": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.AspNetCore.Routing": "Information", + "Microsoft.AspNetCore.Hosting.Diagnostics": "Error" } - ], - "Optional": false, - "Tenant": "erp", - "ServerAddresses": [ "http://nacos.zzz.cn/" ], - "UserName": "erp.app", - "Password": "Yh@1234" + } + }, + "ConnectionStrings": { + "Default": "Data Source=mysql.development.cn;Database=zzz.db;uid=root;pwd=mysql@;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + }, + "Cache": { + "Redis": { + "ConnectionString": "redis.cn,password=OD5VbzIuAWsHOZV5ncYx9xaDsAMsKXn7", + "DatabaseId": 231 + } + }, + "AuthServer": { + "Authority": "https://localhost:44363", + "RequireHttpsMetadata": "false" + }, + "Jwt": { + "Audience": "http://localhost:5010", //ͻ˱ʶ + "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=", + "Issuer": "Zzz", //ǩ + "ExpirationTime": 2 //ʱ hour + }, + "LogToElasticSearch": { + "Enabled": "true", + "ElasticSearch": { + "Url": "http://es.cn", + "IndexFormat": "Zzz.admin.api.dev-{0:yyyy.MM.dd}", + "UserName": "Zzz", + "Password": "TCYobkZxWu0ELYZY" + } } - -} +} \ No newline at end of file diff --git a/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Staging.json b/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Staging.json index 37ce3463..f9b76d7b 100644 --- a/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Staging.json +++ b/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.Staging.json @@ -1,17 +1,61 @@ { - "NacosConfig": { - "Listeners": [ - { - "Optional": false, - "DataId": "Zzz", - "Group": "Staging" + "App": { + "SelfUrl": "https://localhost:44363", + "CorsOrigins": "https://*.Zzz.com,http://localhost:8083,http://localhost:8081,https://localhost:44307," + }, + "StringEncryption": { + "DefaultPassPhrase": "MY2bTgp2iaHUEp66" + }, + "Settings": { + "Abp.Mailing.Smtp.Host": "127.0.0.1", + "Abp.Mailing.Smtp.Port": "25", + "Abp.Mailing.Smtp.UserName": "", + "Abp.Mailing.Smtp.Password": "", + "Abp.Mailing.Smtp.Domain": "", + "Abp.Mailing.Smtp.EnableSsl": "false", + "Abp.Mailing.Smtp.UseDefaultCredentials": "true", + "Abp.Mailing.DefaultFromAddress": "noreply@abp.io", + "Abp.Mailing.DefaultFromDisplayName": "ABP application" + }, + "Serilog": { + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Information", + "Microsoft.AspNetCore": "Information", + "System": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.AspNetCore.Routing": "Information", + "Microsoft.AspNetCore.Hosting.Diagnostics": "Error" } - ], - "Optional": false, - "Tenant": "erp", - "ServerAddresses": [ "http://nacos.zzz.cn/" ], - "UserName": "erp.app", - "Password": "Yh@1234" + } + }, + "ConnectionStrings": { + "Default": "Data Source=mysql.development.cn;Database=zzz.db;uid=root;pwd=mysql@;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + }, + "Cache": { + "Redis": { + "ConnectionString": "redis.cn,password=OD5VbzIuAWsHOZV5ncYx9xaDsAMsKXn7", + "DatabaseId": 231 + } + }, + "AuthServer": { + "Authority": "https://localhost:44363", + "RequireHttpsMetadata": "false" + }, + "Jwt": { + "Audience": "http://localhost:5010", //ͻ˱ʶ + "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=", + "Issuer": "Zzz", //ǩ + "ExpirationTime": 2 //ʱ hour + }, + "LogToElasticSearch": { + "Enabled": "true", + "ElasticSearch": { + "Url": "http://es.cn", + "IndexFormat": "Zzz.admin.api.dev-{0:yyyy.MM.dd}", + "UserName": "Zzz", + "Password": "TCYobkZxWu0ELYZY" + } } - -} +} \ No newline at end of file diff --git a/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.json b/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.json index 6b8dbdb8..f9b76d7b 100644 --- a/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.json +++ b/content/aspnetcore/src/Zzz.HttpApi.Host/appsettings.json @@ -1,17 +1,61 @@ { - "NacosConfig": { - "Listeners": [ - { - "Optional": false, - "DataId": "Zzz", - "Group": "Development" + "App": { + "SelfUrl": "https://localhost:44363", + "CorsOrigins": "https://*.Zzz.com,http://localhost:8083,http://localhost:8081,https://localhost:44307," + }, + "StringEncryption": { + "DefaultPassPhrase": "MY2bTgp2iaHUEp66" + }, + "Settings": { + "Abp.Mailing.Smtp.Host": "127.0.0.1", + "Abp.Mailing.Smtp.Port": "25", + "Abp.Mailing.Smtp.UserName": "", + "Abp.Mailing.Smtp.Password": "", + "Abp.Mailing.Smtp.Domain": "", + "Abp.Mailing.Smtp.EnableSsl": "false", + "Abp.Mailing.Smtp.UseDefaultCredentials": "true", + "Abp.Mailing.DefaultFromAddress": "noreply@abp.io", + "Abp.Mailing.DefaultFromDisplayName": "ABP application" + }, + "Serilog": { + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Information", + "Microsoft.AspNetCore": "Information", + "System": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.AspNetCore.Routing": "Information", + "Microsoft.AspNetCore.Hosting.Diagnostics": "Error" } - ], - "Optional": false, - "Tenant": "erp", - "ServerAddresses": [ "http://nacos.zzz.cn/" ], - "UserName": "erp.app", - "Password": "Yh@1234" + } + }, + "ConnectionStrings": { + "Default": "Data Source=mysql.development.cn;Database=zzz.db;uid=root;pwd=mysql@;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + }, + "Cache": { + "Redis": { + "ConnectionString": "redis.cn,password=OD5VbzIuAWsHOZV5ncYx9xaDsAMsKXn7", + "DatabaseId": 231 + } + }, + "AuthServer": { + "Authority": "https://localhost:44363", + "RequireHttpsMetadata": "false" + }, + "Jwt": { + "Audience": "http://localhost:5010", //ͻ˱ʶ + "SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=", + "Issuer": "Zzz", //ǩ + "ExpirationTime": 2 //ʱ hour + }, + "LogToElasticSearch": { + "Enabled": "true", + "ElasticSearch": { + "Url": "http://es.cn", + "IndexFormat": "Zzz.admin.api.dev-{0:yyyy.MM.dd}", + "UserName": "Zzz", + "Password": "TCYobkZxWu0ELYZY" + } } - -} +} \ No newline at end of file diff --git a/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.Staging.json b/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.Staging.json index 8983e0fc..7c8195d3 100644 --- a/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.Staging.json +++ b/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.Staging.json @@ -5,5 +5,25 @@ "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" } + }, + "AllowedHosts": "*", + "LogToElasticSearch": { + "Enabled": "true", + "ElasticSearch": { + "Url": "http://es.platform.cn", + "IndexFormat": "Zzz.public.api.dev-{0:yyyy.MM.dd}", + "UserName": "erp", + "Password": "TCYobkZxWu0ELYZY" + } + }, + "AuthServer": { + "Authority": "http://sts.vnext.identity.development.cn", + "RequireHttpsMetadata": "false", + "ApiName": "ZzzPublicApi" + }, + "RemoteServices": { + "Zzz": { + "BaseUrl": "http://localhost:50000/" + } } -} +} \ No newline at end of file diff --git a/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.json b/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.json index d41e5173..7c8195d3 100644 --- a/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.json +++ b/content/aspnetcore/src/Zzz.PublicApi.Host/appsettings.json @@ -1,16 +1,29 @@ { - "NacosConfig": { - "Listeners": [ - { - "Optional": false, - "DataId": "ZzzPublicApiHost", - "Group": "Development" - } - ], - "Optional": false, - "Tenant": "erp", - "ServerAddresses": [ "http://nacos.platform.yhglobal.cn/" ], - "UserName": "erp.app", - "Password": "Yh@1234" + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "LogToElasticSearch": { + "Enabled": "true", + "ElasticSearch": { + "Url": "http://es.platform.cn", + "IndexFormat": "Zzz.public.api.dev-{0:yyyy.MM.dd}", + "UserName": "erp", + "Password": "TCYobkZxWu0ELYZY" + } + }, + "AuthServer": { + "Authority": "http://sts.vnext.identity.development.cn", + "RequireHttpsMetadata": "false", + "ApiName": "ZzzPublicApi" + }, + "RemoteServices": { + "Zzz": { + "BaseUrl": "http://localhost:50000/" + } } -} +} \ No newline at end of file