From b2203856c4a2927e4110711f73c034557d77f31c Mon Sep 17 00:00:00 2001 From: "zzzwangjun@gmail.com" <510423039@qq.com> Date: Thu, 13 Nov 2025 11:36:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4ef=20core=20=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ner.cs => 20251113033431_Init.Designer.cs} | 14 +++++---- ...8032622_Init.cs => 20251113033431_Init.cs} | 8 ++--- .../AbpProDbContextModelSnapshot.cs | 12 +++++--- .../AbpProFreeSqlRepositoryTestBase.cs | 18 ----------- .../AbpProFreeSqlRepositoryTestModule.cs | 30 ------------------- ...Lion.AbpPro.FreeSqlReppsitory.Tests.csproj | 13 -------- .../Users/UserFreeSqlBasicRepository_Tests.cs | 29 ------------------ 7 files changed, 21 insertions(+), 103 deletions(-) rename aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/{20250808032622_Init.Designer.cs => 20251113033431_Init.Designer.cs} (99%) rename aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/{20250808032622_Init.cs => 20251113033431_Init.cs} (99%) delete mode 100644 aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestBase.cs delete mode 100644 aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestModule.cs delete mode 100644 aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Lion.AbpPro.FreeSqlReppsitory.Tests.csproj delete mode 100644 aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Users/UserFreeSqlBasicRepository_Tests.cs diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20250808032622_Init.Designer.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20251113033431_Init.Designer.cs similarity index 99% rename from aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20250808032622_Init.Designer.cs rename to aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20251113033431_Init.Designer.cs index 74b6782a..0b3f3a53 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20250808032622_Init.Designer.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20251113033431_Init.Designer.cs @@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Lion.AbpPro.Migrations { [DbContext(typeof(AbpProDbContext))] - [Migration("20250808032622_Init")] + [Migration("20251113033431_Init")] partial class Init { /// @@ -99,7 +99,8 @@ namespace Lion.AbpPro.Migrations .HasColumnType("char(36)"); b.Property("Code") - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("CreationTime") .HasColumnType("datetime(6)") @@ -113,10 +114,12 @@ namespace Lion.AbpPro.Migrations .HasColumnType("char(36)"); b.Property("Description") - .HasColumnType("longtext"); + .HasMaxLength(1024) + .HasColumnType("varchar(1024)"); b.Property("DisplayText") - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("IsEnabled") .HasColumnType("tinyint(1)"); @@ -2020,7 +2023,8 @@ namespace Lion.AbpPro.Migrations .WithMany("Details") .HasForeignKey("DataDictionaryId") .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .IsRequired() + .HasConstraintName("FK_DictDetail_DictId"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20250808032622_Init.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20251113033431_Init.cs similarity index 99% rename from aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20250808032622_Init.cs rename to aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20251113033431_Init.cs index 56fab088..a45dadd2 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20250808032622_Init.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20251113033431_Init.cs @@ -674,10 +674,10 @@ namespace Lion.AbpPro.Migrations { Id = table.Column(type: "char(36)", nullable: false), DataDictionaryId = table.Column(type: "char(36)", nullable: false), - Code = table.Column(type: "longtext", nullable: true), + Code = table.Column(type: "varchar(64)", maxLength: 64, nullable: true), Order = table.Column(type: "int", nullable: false), - DisplayText = table.Column(type: "longtext", nullable: true), - Description = table.Column(type: "longtext", nullable: true), + DisplayText = table.Column(type: "varchar(64)", maxLength: 64, nullable: true), + Description = table.Column(type: "varchar(1024)", maxLength: 1024, nullable: true), IsEnabled = table.Column(type: "tinyint(1)", nullable: false), CreationTime = table.Column(type: "datetime(6)", nullable: false), CreatorId = table.Column(type: "char(36)", nullable: true), @@ -688,7 +688,7 @@ namespace Lion.AbpPro.Migrations { table.PrimaryKey("PK_AbpProDataDictionaryDetails", x => x.Id); table.ForeignKey( - name: "FK_AbpProDataDictionaryDetails_AbpProDataDictionaries_DataDicti~", + name: "FK_DictDetail_DictId", column: x => x.DataDictionaryId, principalTable: "AbpProDataDictionaries", principalColumn: "Id", diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs index 57213c5a..b9a177dc 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs @@ -96,7 +96,8 @@ namespace Lion.AbpPro.Migrations .HasColumnType("char(36)"); b.Property("Code") - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("CreationTime") .HasColumnType("datetime(6)") @@ -110,10 +111,12 @@ namespace Lion.AbpPro.Migrations .HasColumnType("char(36)"); b.Property("Description") - .HasColumnType("longtext"); + .HasMaxLength(1024) + .HasColumnType("varchar(1024)"); b.Property("DisplayText") - .HasColumnType("longtext"); + .HasMaxLength(64) + .HasColumnType("varchar(64)"); b.Property("IsEnabled") .HasColumnType("tinyint(1)"); @@ -2017,7 +2020,8 @@ namespace Lion.AbpPro.Migrations .WithMany("Details") .HasForeignKey("DataDictionaryId") .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .IsRequired() + .HasConstraintName("FK_DictDetail_DictId"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => diff --git a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestBase.cs b/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestBase.cs deleted file mode 100644 index 9b8c4455..00000000 --- a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestBase.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Lion.AbpPro.FreeSqlReppsitory.Tests; -using Lion.AbpPro.Localization; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Lion.AbpPro -{ - public abstract class AbpProFreeSqlRepositoryTestBase: AbpProTestBase - { - public AbpProFreeSqlRepositoryTestBase() - { - ServiceProvider.InitializeLocalization(); - } - } -} diff --git a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestModule.cs b/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestModule.cs deleted file mode 100644 index 848910b6..00000000 --- a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/AbpProFreeSqlRepositoryTestModule.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Modularity; - -namespace Lion.AbpPro.FreeSqlReppsitory.Tests; - -[DependsOn( - typeof(AbpProTestBaseModule), - typeof(AbpProFreeSqlModule) - )] - -public class AbpProFreeSqlRepositoryTestModule: AbpModule -{ - - //public override void ConfigureServices(ServiceConfigurationContext context) - //{ - - - - // var configuration = context.Services.GetConfiguration(); - // var connectionString = configuration.GetConnectionString("Default"); - // var freeSql = new FreeSql.FreeSqlBuilder() - // .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\document.db;Pooling=true;Max Pool Size=10") - // .UseAutoSyncStructure(true) - // .Build(); - - // context.Services.AddSingleton(freeSql); - //} - -} \ No newline at end of file diff --git a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Lion.AbpPro.FreeSqlReppsitory.Tests.csproj b/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Lion.AbpPro.FreeSqlReppsitory.Tests.csproj deleted file mode 100644 index 752d23e1..00000000 --- a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Lion.AbpPro.FreeSqlReppsitory.Tests.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - net6.0 - Lion.AbpPro - false - - - - - - - diff --git a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Users/UserFreeSqlBasicRepository_Tests.cs b/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Users/UserFreeSqlBasicRepository_Tests.cs deleted file mode 100644 index 64ae6f45..00000000 --- a/aspnet-core/services/test/Lion.AbpPro.FreeSqlReppsitory.Tests1/Users/UserFreeSqlBasicRepository_Tests.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace Lion.AbpPro.Users -{ - - - public class UserFreeSqlBasicRepository_Tests: AbpProFreeSqlRepositoryTestBase - { - //private readonly IUserFreeSqlBasicRepository _userFreeSqlBasicRepository; - //public UserFreeSqlBasicRepositoryTest() - //{ - // _userFreeSqlBasicRepository = GetRequiredService(); - //} - - [Fact] - public void Should_NotThrow_ListAsyncTest() - { - //var result = await _userFreeSqlBasicRepository.GetListAsync(); - var s = 1; - } - } - -}