Merge pull request AlphaYu#70 from AlphaYu/dev

v0.9.3.2
asdlei99 · Oct 11, 2022 · 4406763 · 4406763
2 parents 8985320 + 8610a59
commit 4406763
Show file tree

Hide file tree

Showing 142 changed files with 2,509 additions and 2,366 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 
 ## 问题交流
 
-- 企&ensp;鹅&ensp;群：780634162
+- QQ群：780634162
 - 项目官网：<a target="_blank" href="https://aspdotnetcore.net">https://aspdotnetcore.net</a>
 - 博&ensp;&ensp;&ensp;&ensp;客：<a target="_blank" href="https://www.cnblogs.com/alphayu">https://www.cnblogs.com/alphayu</a></a>
 
@@ -33,8 +33,13 @@
 
 #### 如何手动部署到容器
 - 详细介绍如何使用docker安装配置consul集群、Skywalking系列组件、相关项目的dockerfile文件编写与配置以及如何将多个服务部署到服务器。<br/>
-[请点击链接，查看详细介绍](https://aspdotnetcore.net/docs/deploy-docker/)
+  [请点击链接，查看详细介绍](https://aspdotnetcore.net/docs/deploy-docker/)
 
+#### 如何使用jenkins+shell脚本自动化部署
+- 文档尚未完成
+
+#### 如何部署到K8S
+- 文档尚未完成
 
 #### 如何实现读写分离
 - 详细介绍为什么要通过中间件实现读写分离以及EFCore基于中间件如何写代码。<br/>
@@ -52,13 +57,31 @@
 - 详细介绍为什么要采用JwtBearer+Basic混合认证模式以及它们的实现逻辑，如何灵活配置与应用。  
 [请点击链接，查看详细介绍](https://aspdotnetcore.net/docs/claims-based-authentication/)
 #### 如何使用EFCore仓储
->详细介绍EFCore仓储基础功能、工作单元、CodeFirst，执行原生SQL等提供了丰富的演示代码以及演示代码对应的Sql语句。
+- 详细介绍EFCore仓储基础功能、工作单元、CodeFirst，执行原生SQL等提供了丰富的演示代码以及演示代码对应的Sql语句。
 1. [如何使用仓储(一)-基础功能](https://aspdotnetcore.net/docs/efcore-pemelo-grud/)<br/>
 1. [如何使用仓储(二)-分布式事务/本地事务](https://aspdotnetcore.net/docs/efcore-pemolo-unitofwork/)<br/>
 1. [如何使用仓储(三)-CodeFirst](https://aspdotnetcore.net/docs/efcore-pemelo-codefirst/)<br/>
 1. [如何使用仓储(四)-撸SQL](https://aspdotnetcore.net/docs/efcore-pemelo-sql/)<br/>
 1. [ 如何使用仓储(五)-切换数据库类型](https://aspdotnetcore.net/docs/efcore-pemelo-sqlserver/)<br/>
 
+#### 如何从零开发业务
+- 文档尚未完成
+
+#### 如何调用微服务
+- 文档尚未完成
+
+#### 如何配置网关
+- 文档尚未完成
+
+#### 如何使用注册/配置中心
+- 文档尚未完成
+
+#### 如何配置链路追踪
+- 文档尚未完成
+
+#### 如何配置健康检测
+- 文档尚未完成
+
 ## 总体结构设计
 - 经典三层
 ![.NET微服务开源框架-总体设计](https://aspdotnetcore.net/wp-content/uploads/2021/11/adnc-traditional.png)

diff --git a/src/ServerApi/Adnc.sln b/src/ServerApi/Adnc.sln
@@ -69,8 +69,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.UnitTest", "..\..\test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Infra.Mapper", "Infrastructures\Adnc.Infra.Mapper\Adnc.Infra.Mapper.csproj", "{C039D2A9-190D-441C-9701-C4C4FA2CD179}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Infra.Caching", "Infrastructures\Adnc.Infra.Caching\Adnc.Infra.Caching.csproj", "{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00.Shared", "00.Shared", "{1D4DB6DE-CDE0-4B60-A71D-DFD792C6D864}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Infra.Core", "Infrastructures\Adnc.Infra.Core\Adnc.Infra.Core.csproj", "{D54CDC48-F5C6-48DC-AB63-EFEC67E44E8C}"
@@ -127,6 +125,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Shared.Repository", "S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Infra.Job", "Infrastructures\Adnc.Infra.Job\Adnc.Infra.Job.csproj", "{CA0918A1-53AE-45DB-BE50-CD2D3CC87021}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Infra.Redis", "Infrastructures\Adnc.Infra.Redis\Adnc.Infra.Redis.csproj", "{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Adnc.Infra.Redis.Caching", "Infrastructures\Adnc.Infra.Redis.Caching\Adnc.Infra.Redis.Caching.csproj", "{E0C1112A-4BE0-41FA-A3DD-784DB410899B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -335,14 +337,6 @@ Global
 		{C039D2A9-190D-441C-9701-C4C4FA2CD179}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C039D2A9-190D-441C-9701-C4C4FA2CD179}.Release|x64.ActiveCfg = Release|Any CPU
 		{C039D2A9-190D-441C-9701-C4C4FA2CD179}.Release|x64.Build.0 = Release|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Release|x64.ActiveCfg = Release|Any CPU
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B}.Release|x64.Build.0 = Release|Any CPU
 		{D54CDC48-F5C6-48DC-AB63-EFEC67E44E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D54CDC48-F5C6-48DC-AB63-EFEC67E44E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D54CDC48-F5C6-48DC-AB63-EFEC67E44E8C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -527,6 +521,22 @@ Global
 		{CA0918A1-53AE-45DB-BE50-CD2D3CC87021}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA0918A1-53AE-45DB-BE50-CD2D3CC87021}.Release|x64.ActiveCfg = Release|Any CPU
 		{CA0918A1-53AE-45DB-BE50-CD2D3CC87021}.Release|x64.Build.0 = Release|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Debug|x64.Build.0 = Debug|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Release|x64.ActiveCfg = Release|Any CPU
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27}.Release|x64.Build.0 = Release|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -562,7 +572,6 @@ Global
 		{FD7D70F9-1FCA-4287-9FF8-18A333862FF0} = {F66B1CBA-1C4E-424B-B558-2BB9FD8797D2}
 		{CC0393F5-E809-4A53-B78F-665E3E1237ED} = {23D3D93F-CE63-41DD-BE55-95EAFBB3280C}
 		{C039D2A9-190D-441C-9701-C4C4FA2CD179} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
-		{D2D3485A-27E8-46AE-9E8D-A57E38AC5C5B} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
 		{1D4DB6DE-CDE0-4B60-A71D-DFD792C6D864} = {0CDC8FFF-393C-4C44-A2D8-996C24C51024}
 		{D54CDC48-F5C6-48DC-AB63-EFEC67E44E8C} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
 		{0F3C6418-FF43-45F5-A543-BFF6390C68CE} = {EB4CD5BA-9A74-4261-8CF3-28B8C7AE8D89}
@@ -587,6 +596,8 @@ Global
 		{37533E90-9599-4A36-8A47-85379A7004D5} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
 		{40BFB7DF-3924-4A17-A02D-6D04AF002CFD} = {1D4DB6DE-CDE0-4B60-A71D-DFD792C6D864}
 		{CA0918A1-53AE-45DB-BE50-CD2D3CC87021} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
+		{70DC6E1E-8364-4F2E-B059-00D8EE6D5C27} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
+		{E0C1112A-4BE0-41FA-A3DD-784DB410899B} = {3B899133-BEAC-4438-977F-B28FDFF3AE27}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3DED72E8-74C9-4A51-A9CE-62ECFEEA1921}

diff --git a/src/ServerApi/Gateways/Adnc.Gateway.Ocelot/Identity/JwtSecurityTokenHandlerExtension.cs b/src/ServerApi/Gateways/Adnc.Gateway.Ocelot/Identity/JwtSecurityTokenHandlerExtension.cs
@@ -5,7 +5,7 @@ namespace Adnc.Gateway.Ocelot.Identity;
 
 public static class JwtSecurityTokenHandlerExtension
 {
-    public static TokenValidationParameters GenarateTokenValidationParameters(JwtConfig tokenConfig) =>
+    public static TokenValidationParameters GenarateTokenValidationParameters(JWTOptions tokenConfig) =>
         new()
         {
             ValidateIssuer = tokenConfig.ValidateIssuer,

diff --git a/src/ServerApi/Gateways/Adnc.Gateway.Ocelot/Program.cs b/src/ServerApi/Gateways/Adnc.Gateway.Ocelot/Program.cs
@@ -1,3 +1,4 @@
+using Adnc.Infra.Consul.Configuration;
 using Adnc.Infra.Core.Configuration;
 
 namespace Adnc.Gateway.Ocelot;
@@ -20,7 +21,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
             if (env.IsProduction() || env.IsStaging())
             {
                 var configuration = config.Build();
-                var consulOption = configuration.GetSection(ConsulConfig.Name).Get<ConsulConfig>();
+                var consulOption = configuration.GetSection("Consul").Get<ConsulOptions>();
                 config.AddConsulConfiguration(consulOption, true);
             }
             else

diff --git a/src/ServerApi/Gateways/Adnc.Gateway.Ocelot/Startup.cs b/src/ServerApi/Gateways/Adnc.Gateway.Ocelot/Startup.cs
@@ -16,14 +16,14 @@ public class Startup
     public void ConfigureServices(IServiceCollection services)
     {
         var authenticationProviderKey = "mgmt";
-        var threadPoolConfig = Configuration.GetSection(ThreadPoolSettings.Name);
+        var threadPoolConfig = Configuration.GetSection("ThreadPoolSettings");
 
         services
             .Configure<ThreadPoolSettings>(threadPoolConfig)
             .AddAuthentication()
             .AddJwtBearer(authenticationProviderKey, options =>
             {
-                var bearerConfig = Configuration.GetSection(JwtConfig.Name).Get<JwtConfig>();
+                var bearerConfig = Configuration.GetSection("JWT").Get<JWTOptions>();
                 options.TokenValidationParameters = JwtSecurityTokenHandlerExtension.GenarateTokenValidationParameters(bearerConfig);
             })
             ;