代码优化

src/platform/ZhonTai.Admin/Services/Api/ApiService.cs

@@ -211,7 +211,7 @@ namespace ZhonTai.Admin.Services.Api
                     {
                         labels = api.Label?.Split("\r\n")?.ToList();
                         label = labels != null && labels.Count > 0 ? labels[0] : string.Empty;
-                        desc = labels != null && labels.Count > 1 ? string.Join("\r\n", labels.GetRange(1, labels.Count() - 1)) : string.Empty;
+                        desc = labels != null && labels.Count > 1 ? string.Join("\r\n", labels.GetRange(1, labels.Count - 1)) : string.Empty;
                         a.ParentId = 0;
                         a.Label = label;
                         a.Description = desc;
@@ -235,7 +235,7 @@ namespace ZhonTai.Admin.Services.Api
                     {
                         labels = api.Label?.Split("\r\n")?.ToList();
                         label = labels != null && labels.Count > 0 ? labels[0] : string.Empty;
-                        desc = labels != null && labels.Count > 1 ? string.Join("\r\n", labels.GetRange(1, labels.Count() - 1)) : string.Empty;
+                        desc = labels != null && labels.Count > 1 ? string.Join("\r\n", labels.GetRange(1, labels.Count - 1)) : string.Empty;
 
                         a.ParentId = pa.Id;
                         a.Label = label;

src/platform/ZhonTai.Admin/Tools/Captcha/SlideJigsawCaptchaTool.cs

@@ -39,7 +39,7 @@ namespace ZhonTai.Admin.Tools.Captcha
         /// <param name="startNum"></param>
         /// <param name="endNum"></param>
         /// <returns></returns>
-		public int GetRandomInt(int startNum, int endNum)
+		private static int GetRandomInt(int startNum, int endNum)
         {
             return (endNum > startNum ? new Random().Next(endNum - startNum) : 0) + startNum;
         }
@@ -52,9 +52,9 @@ namespace ZhonTai.Admin.Tools.Captcha
         /// <param name="templateWidth"></param>
         /// <param name="templateHeight"></param>
         /// <returns></returns>
-        private PointModel GeneratePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight)
+        private static PointModel GeneratePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight)
         {
-            Random random = new Random();
+            var random = new Random();
             int widthDifference = originalWidth - templateWidth;
             int heightDifference = originalHeight - templateHeight;
             int x;
@@ -90,7 +90,7 @@ namespace ZhonTai.Admin.Tools.Captcha
         /// <param name="blockX"></param>
         /// <param name="blockY"></param>
         /// <returns></returns>
-        private PointModel GenerateInterferencePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight, int blockX, int blockY)
+        private static PointModel GenerateInterferencePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight, int blockX, int blockY)
         {
             int x;
             if (originalWidth - blockX - 5 > templateWidth * 2)

src/platform/ZhonTai.Common/Helpers/DESEncrypt.cs

@@ -79,17 +79,16 @@ namespace ZhonTai.Common.Helpers
             if (key.Length < 8)
                 throw new ArgumentException("秘钥长度为8位", nameof(key));
 
-            var keyBytes = Encoding.UTF8.GetBytes(key.Substring(0, 8));
+            var keyBytes = Encoding.UTF8.GetBytes(key[..8]);
             var inputByteArray = Encoding.UTF8.GetBytes(encryptString);
-            var provider = new DESCryptoServiceProvider
-            {
-                Mode = CipherMode.ECB,
-                Key = keyBytes,
-                Padding = PaddingMode.PKCS7
-            };
+
+            var des = DES.Create();
+            des.Mode = CipherMode.ECB;
+            des.Key = keyBytes;
+            des.Padding = PaddingMode.PKCS7;
 
             using var stream = new MemoryStream();
-            var cStream = new CryptoStream(stream, provider.CreateEncryptor(), CryptoStreamMode.Write);
+            var cStream = new CryptoStream(stream, des.CreateEncryptor(), CryptoStreamMode.Write);
             cStream.Write(inputByteArray, 0, inputByteArray.Length);
             cStream.FlushFinalBlock();
 
@@ -113,17 +112,16 @@ namespace ZhonTai.Common.Helpers
             if (key.Length < 8)
                 throw new ArgumentException("秘钥长度为8位", nameof(key));
 
-            var keyBytes = Encoding.UTF8.GetBytes(key.Substring(0, 8));
+            var keyBytes = Encoding.UTF8.GetBytes(key[..8]);
             var inputByteArray = hex ? decryptString.HexToBytes() : Convert.FromBase64String(decryptString);
-            var provider = new DESCryptoServiceProvider
-            {
-                Mode = CipherMode.ECB,
-                Key = keyBytes,
-                Padding = PaddingMode.PKCS7
-            };
+
+            var des = DES.Create();
+            des.Mode = CipherMode.ECB;
+            des.Key = keyBytes;
+            des.Padding = PaddingMode.PKCS7;
 
             using var mStream = new MemoryStream();
-            var cStream = new CryptoStream(mStream, provider.CreateDecryptor(), CryptoStreamMode.Write);
+            var cStream = new CryptoStream(mStream, des.CreateDecryptor(), CryptoStreamMode.Write);
             cStream.Write(inputByteArray, 0, inputByteArray.Length);
             cStream.FlushFinalBlock();
             return Encoding.UTF8.GetString(mStream.ToArray());