Cms Kit: Use the first available style for reCaptcha

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20221223083811_Added_EntityVersion.cs

@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Volo.CmsKit.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedEntityVersion : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "EntityVersion",
+                table: "AbpUsers",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EntityVersion",
+                table: "AbpTenants",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EntityVersion",
+                table: "AbpRoles",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "EntityVersion",
+                table: "AbpOrganizationUnits",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EntityVersion",
+                table: "AbpUsers");
+
+            migrationBuilder.DropColumn(
+                name: "EntityVersion",
+                table: "AbpTenants");
+
+            migrationBuilder.DropColumn(
+                name: "EntityVersion",
+                table: "AbpRoles");
+
+            migrationBuilder.DropColumn(
+                name: "EntityVersion",
+                table: "AbpOrganizationUnits");
+        }
+    }
+}

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs

@@ -19,7 +19,7 @@ namespace Volo.CmsKit.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("ProductVersion", "7.0.0")
+                .HasAnnotation("ProductVersion", "7.0.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -567,6 +567,9 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnType("nvarchar(40)")
                         .HasColumnName("ConcurrencyStamp");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -753,6 +756,9 @@ namespace Volo.CmsKit.Migrations
                         .HasDefaultValue(false)
                         .HasColumnName("EmailConfirmed");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -1031,6 +1037,9 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnType("nvarchar(128)")
                         .HasColumnName("DisplayName");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
@@ -1268,6 +1277,9 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnType("datetime2")
                         .HasColumnName("DeletionTime");
 
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("int");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");

modules/cms-kit/src/Volo.CmsKit.Public.Web/Security/Captcha/CaptchaOptions.cs

@@ -6,11 +6,6 @@ namespace Volo.CmsKit.Public.Web.Security.Captcha;
 
 public class CaptchaOptions
 {
-    /// <summary>
-    /// Default fonts are  "Arial", "Verdana", "Times New Roman" in Windows. These fonts must exist in the target OS.
-    /// </summary>
-    public string[] FontFamilies { get; set; } = new string[] { "Arial", "Verdana", "Times New Roman" };
-
     public Color[] TextColor { get; set; } = new Color[]
     {
         Color.Blue, Color.Black, Color.Black, Color.Brown, Color.Gray, Color.Green

modules/cms-kit/src/Volo.CmsKit.Public.Web/Security/Captcha/SimpleMathsCaptchaGenerator.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.Fonts;
@@ -99,9 +100,9 @@ public class SimpleMathsCaptchaGenerator : ISingletonDependency
             var random = new Random();
             var startWith = (byte)random.Next(5, 10);
             image.Mutate(ctx => ctx.BackgroundColor(Color.Transparent));
-            var fontName = options.FontFamilies[random.Next(0, options.FontFamilies.Length)];
-            var font = SystemFonts.CreateFont(fontName, options.FontSize, options.FontStyle);
-
+            var fontFamily = SystemFonts.Families.FirstOrDefault(x => x.IsStyleAvailable(options.FontStyle))?.Name ?? SystemFonts.Families.First().Name;
+            var font = SystemFonts.CreateFont(fontFamily, options.FontSize, options.FontStyle);
+            
             foreach (var character in stringText)
             {
                 var text = character.ToString();