项目合并与重命名

aloux00 · Jul 24, 2021 · bb48f6b · bb48f6b
1 parent 5093e89
commit bb48f6b
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 47 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>1.0.9</Version>
+		<Version>1.1.0</Version>
 		<Nullable>enable</Nullable>
 		<Description>github加速神器</Description>
 		<Copyright>https://github.com/xljiulang/FastGithub</Copyright>

diff --git a/FastGithub.DnscryptProxy/DnscryptProxyServiceCollectionExtensions.cs b/FastGithub.DnscryptProxy/DnscryptProxyServiceCollectionExtensions.cs
diff --git a/FastGithub.DnscryptProxy/ControllState.cs → FastGithub.DomainResolve/ControllState.cs b/FastGithub.DnscryptProxy/ControllState.cs → FastGithub.DomainResolve/ControllState.cs
@@ -1,4 +1,4 @@
-namespace FastGithub.DnscryptProxy
+namespace FastGithub.DomainResolve
 {
     /// <summary>
     /// 服务控制状态

diff --git a/...scryptProxy/DnscryptProxyHostedService.cs → ...mainResolve/DnscryptProxyHostedService.cs b/...scryptProxy/DnscryptProxyHostedService.cs → ...mainResolve/DnscryptProxyHostedService.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastGithub.DnscryptProxy
+namespace FastGithub.DomainResolve
 {
     /// <summary>
     /// DnscryptProxy后台服务

diff --git a/...hub.DnscryptProxy/DnscryptProxyService.cs → ...hub.DomainResolve/DnscryptProxyService.cs b/...hub.DnscryptProxy/DnscryptProxyService.cs → ...hub.DomainResolve/DnscryptProxyService.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastGithub.DnscryptProxy
+namespace FastGithub.DomainResolve
 {
     /// <summary>
     /// DnscryptProxy服务

diff --git a/FastGithub.DomainResolve/DomainResolveServiceCollectionExtensions.cs b/FastGithub.DomainResolve/DomainResolveServiceCollectionExtensions.cs
@@ -0,0 +1,26 @@
+using FastGithub.DomainResolve;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace FastGithub
+{
+    /// <summary>
+    ///  域名解析相关服务注册扩展
+    /// </summary>
+    public static class DomainResolveServiceCollectionExtensions
+    {
+        /// <summary>
+        /// 注册域名解析相关服务
+        /// </summary>
+        /// <param name="services"></param> 
+        /// <returns></returns>
+        public static IServiceCollection AddDomainResolve(this IServiceCollection services)
+        {
+            services.AddMemoryCache();
+            services.TryAddSingleton<IDomainResolver, DomainResolver>();
+            services.AddSingleton<DnscryptProxyService>();
+            services.AddHostedService<DnscryptProxyHostedService>();
+            return services;
+        }
+    }
+}
diff --git a/FastGithub.Http/DomainResolver.cs → FastGithub.DomainResolve/DomainResolver.cs b/FastGithub.Http/DomainResolver.cs → FastGithub.DomainResolve/DomainResolver.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastGithub.Http
+namespace FastGithub.DomainResolve
 {
     /// <summary>
     /// 域名解析器

diff --git a/...ryptProxy/FastGithub.DnscryptProxy.csproj → ...inResolve/FastGithub.DomainResolve.csproj b/...ryptProxy/FastGithub.DnscryptProxy.csproj → ...inResolve/FastGithub.DomainResolve.csproj
@@ -5,6 +5,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="DNS" Version="6.1.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
 		<ProjectReference Include="..\FastGithub.Core\FastGithub.Core.csproj" />
 	</ItemGroup>

diff --git a/FastGithub.Http/IDomainResolver.cs → FastGithub.DomainResolve/IDomainResolver.cs b/FastGithub.Http/IDomainResolver.cs → FastGithub.DomainResolve/IDomainResolver.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastGithub.Http
+namespace FastGithub.DomainResolve
 {
     /// <summary>
     /// 域名解析器

diff --git a/FastGithub.DnscryptProxy/TomlUtil.cs → FastGithub.DomainResolve/TomlUtil.cs b/FastGithub.DnscryptProxy/TomlUtil.cs → FastGithub.DomainResolve/TomlUtil.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastGithub.DnscryptProxy
+namespace FastGithub.DomainResolve
 {
     /// <summary>
     /// doml配置工具

diff --git a/FastGithub.DnscryptProxy/dnscrypt-proxy → FastGithub.DomainResolve/dnscrypt-proxy b/FastGithub.DnscryptProxy/dnscrypt-proxy → FastGithub.DomainResolve/dnscrypt-proxy
diff --git a/FastGithub.DnscryptProxy/dnscrypt-proxy.exe → FastGithub.DomainResolve/dnscrypt-proxy.exe b/FastGithub.DnscryptProxy/dnscrypt-proxy.exe → FastGithub.DomainResolve/dnscrypt-proxy.exe
diff --git a/FastGithub.DnscryptProxy/dnscrypt-proxy.toml → FastGithub.DomainResolve/dnscrypt-proxy.toml b/FastGithub.DnscryptProxy/dnscrypt-proxy.toml → FastGithub.DomainResolve/dnscrypt-proxy.toml
diff --git a/FastGithub.Http/FastGithub.Http.csproj b/FastGithub.Http/FastGithub.Http.csproj
@@ -5,10 +5,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DNS" Version="6.1.0" />
 		<PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
 		<ProjectReference Include="..\FastGithub.Core\FastGithub.Core.csproj" />
+		<ProjectReference Include="..\FastGithub.DomainResolve\FastGithub.DomainResolve.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/FastGithub.Http/HttpClient.cs b/FastGithub.Http/HttpClient.cs
@@ -1,4 +1,5 @@
-using System;
+using FastGithub.DomainResolve;
+using System;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/FastGithub.Http/HttpClientFactory.cs b/FastGithub.Http/HttpClientFactory.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Options;
+using FastGithub.DomainResolve;
+using Microsoft.Extensions.Options;
 
 namespace FastGithub.Http
 {

diff --git a/FastGithub.Http/HttpClientHandler.cs b/FastGithub.Http/HttpClientHandler.cs
@@ -1,4 +1,5 @@
-using System;
+using FastGithub.DomainResolve;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/FastGithub.Http/HttpClientServiceCollectionExtensions.cs b/FastGithub.Http/HttpClientServiceCollectionExtensions.cs
@@ -16,8 +16,6 @@ public static class HttpClientServiceCollectionExtensions
         /// <returns></returns>
         public static IServiceCollection AddHttpClient(this IServiceCollection services)
         {
-            services.AddMemoryCache();
-            services.TryAddSingleton<IDomainResolver, DomainResolver>();
             services.TryAddSingleton<IHttpClientFactory, HttpClientFactory>();
             return services;
         }

diff --git a/FastGithub.ReverseProxy/ReverseProxyServiceCollectionExtensions.cs b/FastGithub.ReverseProxy/ReverseProxyServiceCollectionExtensions.cs
@@ -18,7 +18,6 @@ public static IServiceCollection AddReverseProxy(this IServiceCollection service
             return services
                 .AddMemoryCache()
                 .AddHttpForwarder()
-                .AddHttpClient()
                 .AddSingleton<RequestLoggingMilldeware>()
                 .AddSingleton<ReverseProxyMiddleware>()
                 .AddHostedService<ReverseProxyHostedService>();

diff --git a/FastGithub.Upgrade/UpgradeService.cs b/FastGithub.Upgrade/UpgradeService.cs
@@ -1,4 +1,5 @@
-using FastGithub.Http;
+using FastGithub.DomainResolve;
+using FastGithub.Http;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;

diff --git a/FastGithub.sln b/FastGithub.sln
@@ -13,10 +13,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastGithub.Upgrade", "FastG
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastGithub.ReverseProxy", "FastGithub.ReverseProxy\FastGithub.ReverseProxy.csproj", "{28326D0F-B0FB-4B6B-A65A-C69ACB72CAD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastGithub.DnscryptProxy", "FastGithub.DnscryptProxy\FastGithub.DnscryptProxy.csproj", "{26BB826F-4117-4746-9BD0-C6D8043E2808}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastGithub.Http", "FastGithub.Http\FastGithub.Http.csproj", "{B5DCB3E4-5094-4170-B844-6F395002CA42}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastGithub.DomainResolve", "FastGithub.DomainResolve\FastGithub.DomainResolve.csproj", "{5D26ABDD-F341-4EB7-9D08-FCB80F79B4B4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,14 +43,14 @@ Global
 		{28326D0F-B0FB-4B6B-A65A-C69ACB72CAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28326D0F-B0FB-4B6B-A65A-C69ACB72CAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28326D0F-B0FB-4B6B-A65A-C69ACB72CAD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26BB826F-4117-4746-9BD0-C6D8043E2808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26BB826F-4117-4746-9BD0-C6D8043E2808}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26BB826F-4117-4746-9BD0-C6D8043E2808}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26BB826F-4117-4746-9BD0-C6D8043E2808}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5DCB3E4-5094-4170-B844-6F395002CA42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5DCB3E4-5094-4170-B844-6F395002CA42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5DCB3E4-5094-4170-B844-6F395002CA42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5DCB3E4-5094-4170-B844-6F395002CA42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D26ABDD-F341-4EB7-9D08-FCB80F79B4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D26ABDD-F341-4EB7-9D08-FCB80F79B4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D26ABDD-F341-4EB7-9D08-FCB80F79B4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D26ABDD-F341-4EB7-9D08-FCB80F79B4B4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/FastGithub/FastGithub.csproj b/FastGithub/FastGithub.csproj
@@ -16,8 +16,8 @@
   <ItemGroup>
     <PackageReference Include="PInvoke.AdvApi32" Version="0.7.104" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
-    <ProjectReference Include="..\FastGithub.DnscryptProxy\FastGithub.DnscryptProxy.csproj" />
     <ProjectReference Include="..\FastGithub.Dns\FastGithub.Dns.csproj" />
+    <ProjectReference Include="..\FastGithub.DomainResolve\FastGithub.DomainResolve.csproj" />
     <ProjectReference Include="..\FastGithub.ReverseProxy\FastGithub.ReverseProxy.csproj" />
     <ProjectReference Include="..\FastGithub.Upgrade\FastGithub.Upgrade.csproj" />
   </ItemGroup>

diff --git a/FastGithub/Program.cs b/FastGithub/Program.cs
@@ -42,7 +42,8 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                 .ConfigureServices((ctx, services) =>
                 {
                     services.AddDnsServer();
-                    services.AddDnscryptProxy();
+                    services.AddDomainResolve();
+                    services.AddHttpClient();
                     services.AddAppUpgrade();
                     services.AddReverseProxy();
                     services.AddSingleton<FastGithubConfig>();