加密、解密 添加验证

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -752,30 +752,6 @@ namespace OASystem.API.Controllers
 
         #region 酒店资料数据
 
-
-        /// <summary>
-        /// 酒店信息查询 批量加密
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> QueryHotelDataBatchEncryption(QueryHotelDataDto dto)
-        {
-            var hotelData = await _sqlSugar.Queryable<Res_HotelData>().ToListAsync();
-            foreach (var item in hotelData)
-            {
-                EncryptionProcessor.EncryptProperties(item);
-            }
-
-            var total = await _sqlSugar.Updateable(hotelData).ExecuteCommandAsync();
-
-            return Ok(JsonView(true, "操作成功", new { }, total));
-
-
-        }
-
-
         /// <summary>
         /// 酒店信息查询 Page
         /// </summary>

OASystem/OASystem.Domain/AesEncryption/AesEncryptionHelper.cs

@@ -22,6 +22,8 @@ namespace OASystem.Domain.AesEncryption
         /// <returns></returns>
         public static string Encrypt(string plainText)
         {
+            if (string.IsNullOrEmpty(plainText)) return plainText;
+            if (!EncryptionProcessor.IsEncrypted(plainText)) return plainText;
             using var aes = Aes.Create();
             aes.Key = Encoding.UTF8.GetBytes(Key);
             aes.IV = Encoding.UTF8.GetBytes(IV);
@@ -38,6 +40,9 @@ namespace OASystem.Domain.AesEncryption
         /// <returns></returns>
         public static string Decrypt(string cipherText)
         {
+            if (string.IsNullOrEmpty(cipherText)) return cipherText;
+            if (!EncryptionProcessor.IsEncrypted(cipherText)) return cipherText;
+
             using var aes = Aes.Create();
             aes.Key = Encoding.UTF8.GetBytes(Key);
             aes.IV = Encoding.UTF8.GetBytes(IV);

OASystem/OASystem.Domain/AesEncryption/EncryptionProcessor.cs

@@ -49,7 +49,7 @@ namespace OASystem.Domain.AesEncryption
             foreach (var property in properties)
             {
                 var value = property.GetValue(obj) as string;
-                if (!string.IsNullOrEmpty(value) && IsEncrypted(value))
+                if (!string.IsNullOrEmpty(value))
                 {
                     var decryptedValue = AesEncryptionHelper.Decrypt(value);
                     property.SetValue(obj, decryptedValue);

OASystem/OASystem.Domain/Entities/Resource/Res_HotelData.cs

@@ -53,13 +53,13 @@ namespace OASystem.Domain.Entities.Resource
         /// 联系人
         /// </summary>
         [Encrypted]
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string Contact { get; set; }
         /// <summary>
         /// 联系方式
         /// </summary>
         [Encrypted]
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string ContactPhone { get; set; }
         /// <summary>
         /// 酒店其他信息