chore: 合并

Author: sangyuxiaowu

SangServerTool.sln

@@ -5,6 +5,11 @@ VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SangServerTool", "SangServerTool\SangServerTool.csproj", "{E65ECACB-940B-4317-81D7-47BAFE201651}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{9E02EE0C-5F1F-4B11-9D3E-59C2F2F3413D}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

SangServerTool/Program.cs

@@ -49,6 +49,27 @@
 });
 rootCommand.AddCommand(ddnsCommand);
 
+// 定义IP获取命令
+var ipCommand = new Command("ip", "Get IP.");
+ipCommand.AddOption(new Option<bool>("--web", () => false, "Is check from 'https://ifconfig.me/ip' to get you Internet IP?"));
+ipCommand.Handler = CommandHandler.Create<bool>((web) =>
+{
+    var logger = loggerFactory.CreateLogger("SangServerTool_IP");
+    if (web)
+    {
+        logger.LogInformation(Utils.CurrentIPAddressByWeb());
+        logger.LogInformation(Utils.CurrentIPAddressByWeb(true));
+        return 0;
+    }
+    else
+    {
+        logger.LogInformation(Utils.CurrentIPAddress());
+        logger.LogInformation(Utils.CurrentIPAddress(true));
+        return 0;
+    }
+});
+rootCommand.AddCommand(ipCommand);
+
 // 定义获取 https 站点证书命令
 var getcertCommand = new Command("sync", "Get SSL Cert from https site.");
 getcertCommand.AddOption(new Option<string>(new[] { "--config", "-c" }, "Set config json file.") { IsRequired = true });

SangServerTool/Properties/launchSettings.json

@@ -2,7 +2,8 @@
   "profiles": {
     "SangServerTool": {
       "commandName": "Project",
-      "commandLineArgs": "sync -c \"test.json\""
+      //"commandLineArgs": "sync -c \"test.json\""
+      "commandLineArgs": "ip"
     }
   }
 }

SangServerTool/Utils.cs

@@ -37,14 +37,23 @@ public static bool isCerWillExp(string certFilePath)
             .Where(p => !exps.Contains(p.Name)) // 排除docker、lo等
             .Select(p => p.GetIPProperties())
             .SelectMany(p => p.UnicastAddresses)
-            .Where(p => p.Address.AddressFamily == family && !IPAddress.IsLoopback(p.Address));
-            //IPv6 时去除本地的
-            if (family == AddressFamily.InterNetworkV6)
-            {
-                ips = ips.Where(p => !p.Address.IsIPv6LinkLocal);
-            }
+            .Where(p => p.Address.AddressFamily == family && !IPAddress.IsLoopback(p.Address) &&
+                (family == AddressFamily.InterNetwork || !IsNotGoodIPv6(p))
+            );
             return ips.FirstOrDefault()?.Address.ToString();
         }
+
+        /// <summary>
+        /// 判断IPv6地址是否不太可用
+        /// 排除Dhcp,本地和随机的临时地址
+        /// </summary>
+        /// <param name="unicastAddress">单播地址信息</param>
+        /// <returns>不用则返回true</returns>
+        private static bool IsNotGoodIPv6(UnicastIPAddressInformation unicastAddress)
+        {
+            return unicastAddress.Address.IsIPv6LinkLocal || unicastAddress.PrefixOrigin == PrefixOrigin.Dhcp || unicastAddress.SuffixOrigin == SuffixOrigin.Random;
+        }
+
         /// <summary>
         /// 获取电脑外网IP
         /// </summary>