From 0a9efb4f0b8df3b2802dd15df46102e7c44649b3 Mon Sep 17 00:00:00 2001
From: Space Time <Zeus6_6@163.com>
Date: Sun, 20 Oct 2024 16:17:24 +0800
Subject: [PATCH] =?UTF-8?q?1.1.2=20->=201.1.3=20=E7=AC=AC12=E6=AC=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Consts/MainMultilangConst.Designer.cs |  2 +-
 Consts/MainMultilangConst.resx        |  2 +-
 Wins/MainWin.xaml.cs                  | 32 +++++++++++----------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Consts/MainMultilangConst.Designer.cs b/Consts/MainMultilangConst.Designer.cs
index edceacc..e45ea05 100644
--- a/Consts/MainMultilangConst.Designer.cs
+++ b/Consts/MainMultilangConst.Designer.cs
@@ -448,7 +448,7 @@ namespace Sheas_Cealer.Consts {
         }
         
         /// <summary>
-        ///   查找类似 Donot click the button 的本地化字符串。
+        ///   查找类似 Do not click the button 的本地化字符串。
         /// </summary>
         public static string NoClickButtonIsStoppedToolTip {
             get {
diff --git a/Consts/MainMultilangConst.resx b/Consts/MainMultilangConst.resx
index 54efb8a..7b8a72a 100644
--- a/Consts/MainMultilangConst.resx
+++ b/Consts/MainMultilangConst.resx
@@ -199,7 +199,7 @@
     <value>No Clicking</value>
   </data>
   <data name="NoClickButtonIsStoppedToolTip" xml:space="preserve">
-    <value>Donot click the button</value>
+    <value>Do not click the button</value>
   </data>
   <data name="SettingsBoxBrowserPathToolTip" xml:space="preserve">
     <value>Fill in a Chromium-based browser path</value>
diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs
index 16db9db..d072b00 100644
--- a/Wins/MainWin.xaml.cs
+++ b/Wins/MainWin.xaml.cs
@@ -217,28 +217,22 @@ public partial class MainWin : Window
                 foreach ((List<(string cealHostIncludeDomain, string cealHostExcludeDomain)> cealHostDomainPairs, _, _) in cealHostRules)
                     foreach ((string cealHostIncludeDomain, _) in cealHostDomainPairs)
                     {
-                        // 配置证书 SAN
-                        if (cealHostIncludeDomain.StartsWith("*."))
-                        {
-                            childCertSanBuilder.AddDnsName("*" + cealHostIncludeDomain.Replace("*", string.Empty));
+                        string cealHostIncludeDomainWithoutWildcard = cealHostIncludeDomain.TrimStart('*').TrimStart('.');
+
+                        if (cealHostIncludeDomain.StartsWith('#') || cealHostIncludeDomainWithoutWildcard.Contains('*'))
                             continue;
-                        }
-                        else if (cealHostIncludeDomain.StartsWith('*'))
-                            childCertSanBuilder.AddDnsName("*." + cealHostIncludeDomain.Replace("*", string.Empty));
-
-                        childCertSanBuilder.AddDnsName(cealHostIncludeDomain.Replace("*", string.Empty));
-
-                        // 配置 hosts
-                        string cealHostIncludeDomainWithoutWildcard = cealHostIncludeDomain.Replace("*", string.Empty);
-
-                        if (cealHostIncludeDomainWithoutWildcard.StartsWith('^') || cealHostIncludeDomainWithoutWildcard.EndsWith('^') ||
-                            cealHostIncludeDomainWithoutWildcard.StartsWith('.') || cealHostIncludeDomainWithoutWildcard.EndsWith('.'))
-                            continue;
-
-                        hostsConfAppendContent += $"127.0.0.1 {cealHostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n";
 
                         if (cealHostIncludeDomain.StartsWith('*'))
-                            hostsConfAppendContent += $"127.0.0.1 www.{cealHostIncludeDomainWithoutWildcard.Split('^', 2)[0]}\n";
+                        {
+                            childCertSanBuilder.AddDnsName($"*.{cealHostIncludeDomainWithoutWildcard}");
+                            hostsConfAppendContent += $"127.0.0.1 www.{cealHostIncludeDomainWithoutWildcard}\n";
+
+                            if (cealHostIncludeDomain.StartsWith("*."))
+                                continue;
+                        }
+
+                        childCertSanBuilder.AddDnsName(cealHostIncludeDomainWithoutWildcard);
+                        hostsConfAppendContent += $"127.0.0.1 {cealHostIncludeDomainWithoutWildcard}\n";
                     }
 
             childCertRequest.CertificateExtensions.Add(childCertSanBuilder.Build());