Merge branch 'master' into production

SageTools.Console/Program.cs

@@ -1,8 +1,8 @@
-using System;
+using SageTools.Extension;
+using System;
 using System.IO;
 using System.Linq;
 using System.Xml;
-using SageTools.Extension;
 
 namespace SageTools.Console
 {

SageTools/Extension/DateTime.cs

@@ -166,7 +166,7 @@ private static string ToRelativeTimeSimple(TimeSpan ts, string sign)
         public static string ToRFC1123String(this DateTime @this, CultureInfo culture) => @this.ToString("r", (IFormatProvider)culture);
 
         /// <summary>
-        /// 获取时间戳
+        /// 获取时间戳(秒)
         /// </summary>
         /// <param name="this"></param>
         /// <returns></returns>

SageTools/Extension/String.cs

@@ -51,7 +51,7 @@ public static bool ToBool(this string str)
         /// <summary>
         /// string.Format()拓展
         /// </summary>
-        public static string Format(this string str, params object[] args) => string.Format(str, args);
+        public static string FormatWith(this string str, params object[] args) => string.Format(str, args);
 
         /// <summary>
         /// string.Join()拓展

SageTools/Utils/RsaDecryptUtils.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace SageTools.Utils
+{
+    /// <summary>
+    /// RSA非对称算法加/解密工具类
+    /// </summary>
+    public static class RsaDecryptUtils
+    {
+        /// <summary>
+        /// 生成一组公钥和私钥
+        /// </summary>
+        /// <param name="publicKey">公钥</param>
+        /// <param name="privateKey">私钥</param>
+        public static void GenerateKeys(out string publicKey, out string privateKey)
+        {
+            using var rsa = new RSACryptoServiceProvider();
+            publicKey = Convert.ToBase64String(rsa.ExportCspBlob(false));
+            privateKey = Convert.ToBase64String(rsa.ExportCspBlob(true));
+        }
+
+        /// <summary>
+        /// 加密
+        /// </summary>
+        /// <param name="originalText">原文</param>
+        /// <param name="publicKey">公钥</param>
+        /// <returns></returns>
+        public static string Encrypt(string originalText, string publicKey)
+        {
+            var dataBytes = Encoding.UTF8.GetBytes(originalText);
+            using var rsa = new RSACryptoServiceProvider();
+            rsa.ImportCspBlob(Convert.FromBase64String(publicKey));
+            var encryptedData = rsa.Encrypt(dataBytes, false);
+            return Convert.ToBase64String(encryptedData);
+        }
+
+        /// <summary>
+        /// 解密
+        /// </summary>
+        /// <param name="encryptedData">密文</param>
+        /// <param name="privateKey">私钥</param>
+        /// <returns></returns>
+        public static string Decrypt(string encryptedData, string privateKey)
+        {
+            var encryptedDataBytes = Convert.FromBase64String(encryptedData);
+            using var rsa = new RSACryptoServiceProvider();
+            rsa.ImportCspBlob(Convert.FromBase64String(privateKey));
+            var decryptedDataBytes = rsa.Decrypt(encryptedDataBytes, false);
+            return Encoding.UTF8.GetString(decryptedDataBytes);
+        }
+    }
+}