From e9f960e8e8844250bab885ff92483cbacd7e8b92 Mon Sep 17 00:00:00 2001
From: xljiulang <366193849@qq.com>
Date: Sun, 18 Jul 2021 13:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8CACert=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KestrelServerOptionsExtensions.cs                    | 9 ++++++---
 FastGithub/Program.cs                                    | 2 +-
 FastGithub/README.MD                                     | 6 +++---
 FastGithub/README.html                                   | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
index 68c060a..0e5fb63 100644
--- a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
+++ b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
@@ -30,13 +30,16 @@ namespace FastGithub
         /// 监听https的反向代理
         /// </summary>
         /// <param name="kestrel"></param>
-        /// <param name="caPublicCerPath"></param>
-        /// <param name="caPrivateKeyPath"></param>
-        public static void ListenHttpsReverseProxy(this KestrelServerOptions kestrel, string caPublicCerPath, string caPrivateKeyPath)
+        public static void ListenHttpsReverseProxy(this KestrelServerOptions kestrel)
         {
             var loggerFactory = kestrel.ApplicationServices.GetRequiredService<ILoggerFactory>();
             var logger = loggerFactory.CreateLogger($"{nameof(FastGithub)}.{nameof(ReverseProxy)}");
 
+            const string CAPATH = "CACert";
+            Directory.CreateDirectory(CAPATH);
+            var caPublicCerPath = $"{CAPATH}/{Environment.MachineName}.cer";
+            var caPrivateKeyPath = $"{CAPATH}/{Environment.MachineName}.key";
+
             GeneratorCaCert(caPublicCerPath, caPrivateKeyPath);
             InstallCaCert(caPublicCerPath, logger);
 
diff --git a/FastGithub/Program.cs b/FastGithub/Program.cs
index 524414c..d1c2720 100644
--- a/FastGithub/Program.cs
+++ b/FastGithub/Program.cs
@@ -52,7 +52,7 @@ namespace FastGithub
                 .ConfigureWebHostDefaults(web =>
                 {
                     web.Configure(app => app.UseHttpsReverseProxy("README.html"));
-                    web.UseKestrel(kestrel => kestrel.ListenHttpsReverseProxy($"FastGithub_{Environment.MachineName}.cer", $"FastGithub_{Environment.MachineName}.key"));
+                    web.UseKestrel(kestrel => kestrel.ListenHttpsReverseProxy());
                 });
         }
     }
diff --git a/FastGithub/README.MD b/FastGithub/README.MD
index a9fd2f5..a0ed72e 100644
--- a/FastGithub/README.MD
+++ b/FastGithub/README.MD
@@ -2,14 +2,14 @@
 github加速神器
 
 ### 本机使用[推荐]
-* 运行FastGithub程序，自动本机的网络适配器的dns会为127.0.0.1和安装FastGithub.cer
+* 运行FastGithub程序，自动本机的网络适配器的dns会为127.0.0.1和安装CA证书
 * 如果网络适配器的dns没有变成127.0.0.1，请手工修改网络适配器的dns
-* 如果浏览器提示无效的证书，请手工安装FastGithub.cer到`将所有的证书都放入下载存储\受信任的根证书颁发机构`
+* 如果浏览器提示无效的证书，请手工安装CA证书到`将所有的证书都放入下载存储\受信任的根证书颁发机构`
 
 ### 局域网服务器使用 
 * 在局域网服务器运行FastGithub程序
 * 手工修改你电脑的网络适配器的dns，值为局域网服务器的ip
-* 在你的电脑安装FastGithub.cer到`将所有的证书都放入下载存储\受信任的根证书颁发机构`
+* 在你的电脑安装CA证书到`将所有的证书都放入下载存储\受信任的根证书颁发机构`
 
 ### 以windows服务运行
 * FastGithub.exe start // 安装并启动服务
diff --git a/FastGithub/README.html b/FastGithub/README.html
index 660f516..468027f 100644
--- a/FastGithub/README.html
+++ b/FastGithub/README.html
@@ -16,11 +16,11 @@
 
         <h3>本机使用[推荐]</h3>
 
-        <ul><li>运行FastGithub程序，自动本机的网络适配器的dns会为127.0.0.1和安装FastGithub.cer</li><li>如果网络适配器的dns没有变成127.0.0.1，请手工修改网络适配器的dns</li><li>如果浏览器提示无效的证书，请手工安装FastGithub.cer到<code>将所有的证书都放入下载存储\受信任的根证书颁发机构</code></li></ul>
+        <ul><li>运行FastGithub程序，自动本机的网络适配器的dns会为127.0.0.1和安装CA证书</li><li>如果网络适配器的dns没有变成127.0.0.1，请手工修改网络适配器的dns</li><li>如果浏览器提示无效的证书，请手工安装CA证书到<code>将所有的证书都放入下载存储\受信任的根证书颁发机构</code></li></ul>
 
         <h3>局域网服务器使用</h3>
 
-        <ul><li>在局域网服务器运行FastGithub程序</li><li>手工修改你电脑的网络适配器的dns，值为局域网服务器的ip</li><li>在你的电脑安装FastGithub.cer到<code>将所有的证书都放入下载存储\受信任的根证书颁发机构</code></li></ul>
+        <ul><li>在局域网服务器运行FastGithub程序</li><li>手工修改你电脑的网络适配器的dns，值为局域网服务器的ip</li><li>在你的电脑安装CA证书到<code>将所有的证书都放入下载存储\受信任的根证书颁发机构</code></li></ul>
 
         <h3>以windows服务运行</h3>