😁1、修复身份证号邮箱掩码正则 2、关闭打包时默认开启可视化分析页面

Admin.NET/Admin.NET.Core/Attribute/MaskNewtonsoftJsonConverter.cs

@@ -55,21 +55,4 @@ public class MaskEmailNewtonsoftJsonConverter : JsonConverter<string>
     {
         writer.WriteValue(value?.ToString().MaskEmail());
     }
-}
-
-/// <summary>
-/// 银行卡号掩码
-/// </summary>
-[SuppressSniffer]
-public class MaskBankCardNewtonsoftJsonConverter : JsonConverter<string>
-{
-    public override string ReadJson(JsonReader reader, Type objectType, string existingValue, bool hasExistingValue, JsonSerializer serializer)
-    {
-        return reader.Value.ToString();
-    }
-
-    public override void WriteJson(JsonWriter writer, string value, JsonSerializer serializer)
-    {
-        writer.WriteValue(value?.ToString().MaskBankCard());
-    }
 }

Admin.NET/Admin.NET.Core/Attribute/MaskSystemTextJsonConverter.cs

@@ -56,21 +56,4 @@ public class MaskEmailSystemTextJsonConverter : JsonConverter<string>
     {
         writer.WriteStringValue(value?.ToString().MaskEmail());
     }
-}
-
-/// <summary>
-/// 银行卡号掩码
-/// </summary>
-[SuppressSniffer]
-public class MaskBankCardSystemTextJsonConverter : JsonConverter<string>
-{
-    public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-    {
-        return reader.GetString();
-    }
-
-    public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-    {
-        writer.WriteStringValue(value?.ToString().MaskBankCard());
-    }
 }

Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -296,7 +296,8 @@ public static partial class ObjectExtension
     {
         if (!idCard.TryValidate(ValidationTypes.IDCard).IsValid) return idCard;
 
-        return idCard.Replace("(?<=\\w{3})\\w(?=\\w{4})", $"{mask}");
+        var masks = mask.ToString().PadLeft(8, mask);
+        return Regex.Replace(idCard, @"^(.{6})(.*)(.{4})$", $"$1{masks}$3");
     }
 
     /// <summary>
@@ -310,20 +311,6 @@ public static partial class ObjectExtension
         if (!email.TryValidate(ValidationTypes.EmailAddress).IsValid) return email;
 
         var masks = mask.ToString().PadLeft(4, mask);
-        return email.Replace("(^\\w)[^@]*(@.*$)", $"$1{masks}$2");
-    }
-
-    /// <summary>
-    /// 银行卡号掩码
-    /// </summary>
-    /// <param name="bankCard">银行卡号</param>
-    /// <param name="mask">掩码符</param>
-    /// <returns></returns>
-    public static string MaskBankCard(this string bankCard, char mask = '*')
-    {
-        if (bankCard.Length < 10) return bankCard;
-
-        var masks = mask.ToString().PadLeft(4, mask);
-        return bankCard.Replace("(\\d{6})\\d{9}(\\d{4})", $"$1{masks}$2");
+        return email.Replace(@"^([^\.]+)\.?", $"$1{masks}$2");
     }
 }

Web/vite.config.ts

@@ -23,7 +23,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 	fs.writeFileSync('./public/config.js', `window.__env__ = ${JSON.stringify(env, null, 2)} `);
 	return {
 		plugins: [
-			visualizer({ open: true }), // 自动开启分析页面
+			visualizer({ open: false }), // 开启可视化分析页面
 			CodeInspectorPlugin({
 				bundler: 'vite',
 				hotKeys: ['shiftKey'],