*

Masuit.Tools.Abstractions/DateTimeExt/TimeHelper.cs

@@ -304,70 +304,56 @@ namespace Masuit.Tools.DateTimeExt
             return dateDiff;
         }
 
-        /// <summary>
-        /// 时间差
-        /// </summary>
-        /// <param name="beginTime">开始时间</param>
-        /// <param name="endTime">结束时间</param>
-        /// <returns>时间差</returns>
-        public static string GetDiffTime(this DateTime beginTime, DateTime endTime)
-        {
-            int i = 0;
-            return GetDiffTime(beginTime, endTime, ref i);
-        }
-
         /// <summary>
         /// 计算2个时间差
         /// </summary>
         /// <param name="beginTime">开始时间</param>
         /// <param name="endTime">结束时间</param>
-        /// <param name="mindTime">中间的时间</param>
         /// <returns>时间差</returns>
-        public static string GetDiffTime(this DateTime beginTime, DateTime endTime, ref int mindTime)
+        public static string GetDiffTime(this DateTime beginTime, DateTime endTime)
         {
             string strResout = string.Empty;
             //获得2时间的时间间隔秒计算
             TimeSpan span = endTime.Subtract(beginTime);
-            int iTatol = Convert.ToInt32(span.TotalSeconds);
-            int iMinutes = 1 * 60;
-            int iHours = iMinutes * 60;
-            int iDay = iHours * 24;
-            int iMonth = iDay * 30;
-            int iYear = iMonth * 12;
+            int sec = Convert.ToInt32(span.TotalSeconds);
+            int minutes = 1 * 60;
+            int hours = minutes * 60;
+            int day = hours * 24;
+            int month = day * 30;
+            int year = month * 12;
 
             //提醒时间,到了返回1,否则返回0
-            mindTime = mindTime > iTatol && iTatol > 0 ? 1 : 0;
-            if (iTatol > iYear)
+            if (sec > year)
             {
-                strResout += iTatol / iYear + "年";
-                iTatol %= iYear; //剩余
+                strResout += sec / year + "年";
+                sec %= year; //剩余
             }
 
-            if (iTatol > iMonth)
+            if (sec > month)
             {
-                strResout += iTatol / iMonth + "月";
-                iTatol %= iMonth;
+                strResout += sec / month + "月";
+                sec %= month;
             }
 
-            if (iTatol > iDay)
+            if (sec > day)
             {
-                strResout += iTatol / iDay + "天";
-                iTatol %= iDay;
+                strResout += sec / day + "天";
+                sec %= day;
             }
 
-            if (iTatol > iHours)
+            if (sec > hours)
             {
-                strResout += iTatol / iHours + "小时";
-                iTatol %= iHours;
+                strResout += sec / hours + "小时";
+                sec %= hours;
             }
 
-            if (iTatol > iMinutes)
+            if (sec > minutes)
             {
-                strResout += iTatol / iMinutes + "分";
-                iTatol %= iMinutes;
+                strResout += sec / minutes + "分";
+                sec %= minutes;
             }
 
-            strResout += iTatol + "秒";
+            strResout += sec + "秒";
             return strResout;
         }
 

Masuit.Tools.Abstractions/Extensions/BaseType/IPAddressExtensions.cs

@@ -13,6 +13,7 @@ namespace Masuit.Tools
         public static bool IsPrivateIP(this IPAddress ip)
         {
             if (IPAddress.IsLoopback(ip)) return true;
+            ip = ip.IsIPv4MappedToIPv6 ? ip.MapToIPv4() : ip;
             byte[] bytes = ip.GetAddressBytes();
             return ip.AddressFamily switch
             {

Masuit.Tools.Abstractions/Extensions/BaseType/StringExtensions.cs

@@ -154,12 +154,12 @@ namespace Masuit.Tools
             string masks = mask.ToString().PadLeft(4, mask);
             return s.Length switch
             {
-                _ when s.Length >= 11 => Regex.Replace(s, @"(.{3}).*(.{4})", $"$1{masks}$2"),
-                _ when s.Length == 10 => Regex.Replace(s, @"(.{3}).*(.{3})", $"$1{masks}$2"),
-                _ when s.Length == 9 => Regex.Replace(s, @"(.{2}).*(.{3})", $"$1{masks}$2"),
-                _ when s.Length == 8 => Regex.Replace(s, @"(.{2}).*(.{2})", $"$1{masks}$2"),
-                _ when s.Length == 7 => Regex.Replace(s, @"(.{1}).*(.{2})", $"$1{masks}$2"),
-                _ when s.Length >= 2 && s.Length < 7 => Regex.Replace(s, @"(.{1}).*(.{1})", $"$1{masks}$2"),
+                _ when s.Length >= 11 => Regex.Replace(s, "(.{3}).*(.{4})", $"$1{masks}$2"),
+                _ when s.Length == 10 => Regex.Replace(s, "(.{3}).*(.{3})", $"$1{masks}$2"),
+                _ when s.Length == 9 => Regex.Replace(s, "(.{2}).*(.{3})", $"$1{masks}$2"),
+                _ when s.Length == 8 => Regex.Replace(s, "(.{2}).*(.{2})", $"$1{masks}$2"),
+                _ when s.Length == 7 => Regex.Replace(s, "(.{1}).*(.{2})", $"$1{masks}$2"),
+                _ when s.Length >= 2 && s.Length < 7 => Regex.Replace(s, "(.{1}).*(.{1})", $"$1{masks}$2"),
                 _ => s + masks
             };
         }

Masuit.Tools.Core/AspNetCore/ServiceCollectionExtensions.cs

@@ -36,8 +36,7 @@ namespace Masuit.Tools.Core.AspNetCore
         /// <returns></returns>
         public static IServiceCollection AddSevenZipCompressor(this IServiceCollection services)
         {
-            services.AddHttpClient();
-            services.TryAddTransient<ISevenZipCompressor, SevenZipCompressor>();
+            services.AddHttpClient<ISevenZipCompressor, SevenZipCompressor>();
             return services;
         }
 

Masuit.Tools.Core/Files/SevenZipCompressor.cs

@@ -26,10 +26,10 @@ namespace Masuit.Tools.Files
         /// <summary>
         ///
         /// </summary>
-        /// <param name="httpClientFactory"></param>
-        public SevenZipCompressor(IHttpClientFactory httpClientFactory)
+        /// <param name="httpClient"></param>
+        public SevenZipCompressor(HttpClient httpClient)
         {
-            _httpClient = httpClientFactory.CreateClient();
+            _httpClient = httpClient;
         }
 
         /// <summary>

Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -440,10 +440,10 @@
   <ItemGroup>
     <PackageReference Include="DnsClient" Version="1.3.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
-    <PackageReference Include="HtmlSanitizer" Version="5.0.343" />
+    <PackageReference Include="HtmlSanitizer" Version="5.0.353" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />