From 95bd402a51deb957a5260b7e08f704ac0367fef3 Mon Sep 17 00:00:00 2001
From: 51mono <46481080+zhishile@users.noreply.github.com>
Date: Thu, 14 May 2020 07:52:47 +0800
Subject: [PATCH 1/3] Add docs module client proxies

---
 .../Volo.Docs.Admin.HttpApi.Client.csproj            |  2 ++
 .../Volo/Docs/Admin/DocsHttpApiClientModule.cs       | 12 +++++++++---
 .../Volo.Docs.HttpApi.Client.csproj                  |  1 +
 .../Volo/Docs/DocsHttpApiClientModule.cs             | 12 ++++++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
index 50e135a237..076bc1d37a 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo.Docs.Admin.HttpApi.Client.csproj
@@ -12,6 +12,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Docs.Admin.Application.Contracts\Volo.Docs.Admin.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
+
   </ItemGroup>
 
 </Project>
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
index bcab405f63..e6aa9c260d 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
@@ -1,11 +1,17 @@
-using Volo.Abp.Modularity;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Http.Client;
+using Volo.Abp.Modularity;
 
 namespace Volo.Docs.Admin
 {
     [DependsOn(
-        typeof(DocsAdminApplicationContractsModule))]
+        typeof(DocsAdminApplicationContractsModule),
+        typeof(AbpHttpClientModule))]
     public class DocsAdminHttpApiClientModule : AbpModule
     {
-        //TODO: Create client proxies!
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddHttpClientProxies(typeof(DocsAdminApplicationContractsModule).Assembly);
+        }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
index 5df5515e32..ed9acfaf20 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo.Docs.HttpApi.Client.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Docs.Application.Contracts\Volo.Docs.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
index 1c208c6195..97389a9fa3 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
@@ -1,11 +1,19 @@
-using Volo.Abp.Modularity;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Http.Client;
+using Volo.Abp.Modularity;
 
 namespace Volo.Docs
 {
     [DependsOn(
-        typeof(DocsApplicationContractsModule))]
+        typeof(DocsApplicationContractsModule),
+        typeof(AbpHttpClientModule)
+    )]
     public class DocsHttpApiClientModule : AbpModule
     {
         //TODO: Create client proxies
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddHttpClientProxies(typeof(DocsApplicationContractsModule).Assembly);
+        }
     }
 }

From db5f2ca9ca994a3cd548f63b3db2c64801486c61 Mon Sep 17 00:00:00 2001
From: 51mono <46481080+zhishile@users.noreply.github.com>
Date: Thu, 14 May 2020 10:47:08 +0800
Subject: [PATCH 2/3] Remove the Todo comment

---
 .../Volo/Docs/DocsHttpApiClientModule.cs                         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
index 97389a9fa3..5f0d86bc98 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
@@ -10,7 +10,6 @@ namespace Volo.Docs
     )]
     public class DocsHttpApiClientModule : AbpModule
     {
-        //TODO: Create client proxies
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddHttpClientProxies(typeof(DocsApplicationContractsModule).Assembly);

From a4b79212dbe72c05f4ff260bc5c0bb4e04fef02b Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 18 May 2020 10:50:31 +0800
Subject: [PATCH 3/3] Add docs module RemoteServiceName.

---
 .../Volo/Docs/Admin/DocsAdminRemoteServiceConsts.cs        | 7 +++++++
 .../Volo/Docs/Admin/DocsHttpApiClientModule.cs             | 2 +-
 .../Volo/Docs/DocsRemoteServiceConsts.cs                   | 7 +++++++
 .../Volo/Docs/DocsHttpApiClientModule.cs                   | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminRemoteServiceConsts.cs
 create mode 100644 modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsRemoteServiceConsts.cs

diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminRemoteServiceConsts.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminRemoteServiceConsts.cs
new file mode 100644
index 0000000000..8f29237bb0
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminRemoteServiceConsts.cs
@@ -0,0 +1,7 @@
+namespace Volo.Docs.Admin
+{
+    public static class DocsAdminRemoteServiceConsts
+    {
+        public const string RemoteServiceName = "AbpDocsAdmin";
+    }
+}
diff --git a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
index e6aa9c260d..284d5b4fbf 100644
--- a/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
+++ b/modules/docs/src/Volo.Docs.Admin.HttpApi.Client/Volo/Docs/Admin/DocsHttpApiClientModule.cs
@@ -11,7 +11,7 @@ namespace Volo.Docs.Admin
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddHttpClientProxies(typeof(DocsAdminApplicationContractsModule).Assembly);
+            context.Services.AddHttpClientProxies(typeof(DocsAdminApplicationContractsModule).Assembly, DocsAdminRemoteServiceConsts.RemoteServiceName);
         }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsRemoteServiceConsts.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsRemoteServiceConsts.cs
new file mode 100644
index 0000000000..5c84ad5c46
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsRemoteServiceConsts.cs
@@ -0,0 +1,7 @@
+namespace Volo.Docs
+{
+    public static class DocsRemoteServiceConsts
+    {
+        public const string RemoteServiceName = "AbpDocs";
+    }
+}
diff --git a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
index 5f0d86bc98..174b4570c2 100644
--- a/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
+++ b/modules/docs/src/Volo.Docs.HttpApi.Client/Volo/Docs/DocsHttpApiClientModule.cs
@@ -12,7 +12,7 @@ namespace Volo.Docs
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddHttpClientProxies(typeof(DocsApplicationContractsModule).Assembly);
+            context.Services.AddHttpClientProxies(typeof(DocsApplicationContractsModule).Assembly, DocsRemoteServiceConsts.RemoteServiceName);
         }
     }
 }