diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..24f0cc4 Binary files /dev/null and b/.DS_Store differ diff --git a/common.props b/common.props index 57f1ae1..b6fbb64 100644 --- a/common.props +++ b/common.props @@ -1,13 +1,13 @@ latest - 0.9.3 + 0.9.4 https://raw.githubusercontent.com/realliangshiwei/Lsw.Abp.AntDesignUI/main/icon.png https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI MIT git https://github.com/realLiangshiwei/Lsw.Abp.AntDesignUI - 8.1.*-* + 8.2.*-* 8.0.* \ No newline at end of file diff --git a/nuget/0 b/nuget/0 new file mode 100644 index 0000000..573541a --- /dev/null +++ b/nuget/0 @@ -0,0 +1 @@ +0 diff --git a/samples/BookStore/common.props b/samples/BookStore/common.props index b9efc29..c91d913 100644 --- a/samples/BookStore/common.props +++ b/samples/BookStore/common.props @@ -4,7 +4,7 @@ 1.0.0 $(NoWarn);CS1591 app - 8.1.*-* + 8.2.*-* diff --git a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj index e74f61b..54cc6ec 100644 --- a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj +++ b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs index bea418f..6a34097 100644 --- a/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs +++ b/samples/BookStore/src/BookStore.BlazorServer/BookStoreBlazorModule.cs @@ -145,9 +145,9 @@ public class BookStoreBlazorModule : AbpModule options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); options.Languages.Add(new LanguageInfo("ru", "ru", "Русский")); @@ -155,7 +155,7 @@ public class BookStoreBlazorModule : AbpModule options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe")); options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文")); - options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de")); + options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch")); options.Languages.Add(new LanguageInfo("es", "es", "Español")); }); } diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs index 724ddf4..ea5b905 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreDbContext.cs @@ -46,6 +46,7 @@ public class BookStoreDbContext : public DbSet SecurityLogs { get; set; } public DbSet LinkUsers { get; set; } public DbSet UserDelegations { get; set;} + public DbSet Sessions { get; set; } // Tenant Management public DbSet Tenants { get; set; } diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240413031317_init.Designer.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240706082705_Initial.Designer.cs similarity index 98% rename from samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240413031317_init.Designer.cs rename to samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240706082705_Initial.Designer.cs index ff1753c..015ce0a 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240413031317_init.Designer.cs +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240706082705_Initial.Designer.cs @@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore; namespace BookStore.Migrations { [DbContext(typeof(BookStoreDbContext))] - [Migration("20240413031317_init")] - partial class init + [Migration("20240706082705_Initial")] + partial class Initial { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -22,7 +22,7 @@ namespace BookStore.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("ProductVersion", "8.0.4") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -703,6 +703,57 @@ namespace BookStore.Migrations b.ToTable("AbpSecurityLogs", (string)null); }); + modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClientId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Device") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("DeviceInfo") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("IpAddresses") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("LastAccessed") + .HasColumnType("datetime2"); + + b.Property("SessionId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("SignedIn") + .HasColumnType("datetime2"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Device"); + + b.HasIndex("SessionId"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpSessions", (string)null); + }); + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240413031317_init.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240706082705_Initial.cs similarity index 97% rename from samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240413031317_init.cs rename to samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240706082705_Initial.cs index aa9cabb..c73d0c6 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240413031317_init.cs +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/20240706082705_Initial.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace BookStore.Migrations { /// - public partial class init : Migration + public partial class Initial : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -276,6 +276,26 @@ namespace BookStore.Migrations table.PrimaryKey("PK_AbpSecurityLogs", x => x.Id); }); + migrationBuilder.CreateTable( + name: "AbpSessions", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + SessionId = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), + Device = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), + DeviceInfo = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), + UserId = table.Column(type: "uniqueidentifier", nullable: false), + ClientId = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + IpAddresses = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), + SignedIn = table.Column(type: "datetime2", nullable: false), + LastAccessed = table.Column(type: "datetime2", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpSessions", x => x.Id); + }); + migrationBuilder.CreateTable( name: "AbpSettingDefinitions", columns: table => new @@ -1288,6 +1308,21 @@ namespace BookStore.Migrations table: "AbpSecurityLogs", columns: new[] { "TenantId", "UserId" }); + migrationBuilder.CreateIndex( + name: "IX_AbpSessions_Device", + table: "AbpSessions", + column: "Device"); + + migrationBuilder.CreateIndex( + name: "IX_AbpSessions_SessionId", + table: "AbpSessions", + column: "SessionId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpSessions_TenantId_UserId", + table: "AbpSessions", + columns: new[] { "TenantId", "UserId" }); + migrationBuilder.CreateIndex( name: "IX_AbpSettingDefinitions_Name", table: "AbpSettingDefinitions", @@ -1433,6 +1468,9 @@ namespace BookStore.Migrations migrationBuilder.DropTable( name: "AbpSecurityLogs"); + migrationBuilder.DropTable( + name: "AbpSessions"); + migrationBuilder.DropTable( name: "AbpSettingDefinitions"); diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs index 5aa0b00..f3e47fd 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/Migrations/BookStoreDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace BookStore.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("ProductVersion", "8.0.4") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -700,6 +700,57 @@ namespace BookStore.Migrations b.ToTable("AbpSecurityLogs", (string)null); }); + modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClientId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Device") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("DeviceInfo") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("IpAddresses") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("LastAccessed") + .HasColumnType("datetime2"); + + b.Property("SessionId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("SignedIn") + .HasColumnType("datetime2"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Device"); + + b.HasIndex("SessionId"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpSessions", (string)null); + }); + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") diff --git a/samples/BookStore/src/BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore/src/BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs index 8baf37c..c047fcc 100644 --- a/samples/BookStore/src/BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs +++ b/samples/BookStore/src/BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs @@ -157,9 +157,9 @@ public class BookStoreHttpApiHostModule : AbpModule options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); @@ -168,8 +168,8 @@ public class BookStoreHttpApiHostModule : AbpModule options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe")); options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文")); - options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch", "de")); - options.Languages.Add(new LanguageInfo("es", "es", "Español", "es")); + options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsch")); + options.Languages.Add(new LanguageInfo("es", "es", "Español")); }); } diff --git a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj index 23f944e..e59ef79 100644 --- a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj +++ b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj @@ -9,7 +9,7 @@ - +