tsai
/
abp-next-admin
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #386 from colinin/4.4.2 

feat(identity): remove file AvatarUrl with IdentityUser
pull/396/head
yx lin 4 years ago
committed by GitHub
parent
2a1c0a74d5 0007720db6
commit
494afd1b48
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1875 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN/Abp/Identity/AbpIdentityApplicationModule.cs
  2. 14
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/ExtensionIdentityUserConsts.cs
  3. 30
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreModule.cs
  4. 1770
      aspnet-core/services/account/AuthServer.Host/Migrations/20211118030445_Remote-Field-AvatarUrl-With-IdentityUser.Designer.cs
  5. 25
      aspnet-core/services/account/AuthServer.Host/Migrations/20211118030445_Remote-Field-AvatarUrl-With-IdentityUser.cs
  6. 6
      aspnet-core/services/account/AuthServer.Host/Migrations/AuthServerHostMigrationsDbContextModelSnapshot.cs

39
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN/Abp/Identity/AbpIdentityApplicationModule.cs
View File

@ -1,9 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AutoMapper;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace LINGYUN.Abp.Identity
{
@ -13,7 +10,7 @@ namespace LINGYUN.Abp.Identity
typeof(AbpIdentityDomainModule))]
public class AbpIdentityApplicationModule : AbpModule
{
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
// private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddAutoMapperObjectMapper<AbpIdentityApplicationModule>();
@ -24,22 +21,22 @@ namespace LINGYUN.Abp.Identity
});
}
public override void PostConfigureServices(ServiceConfigurationContext context)
{
OneTimeRunner.Run(() =>
{
ObjectExtensionManager.Instance
.AddOrUpdateProperty<string>(
new[]
{
typeof(IdentityUserDto),
typeof(IdentityUserCreateDto),
typeof(IdentityUserUpdateDto),
typeof(ProfileDto),
typeof(UpdateProfileDto)
},
ExtensionIdentityUserConsts.AvatarUrlField);
});
}
//public override void PostConfigureServices(ServiceConfigurationContext context)
//{
// OneTimeRunner.Run(() =>
// {
// ObjectExtensionManager.Instance
// .AddOrUpdateProperty<string>(
// new[]
// {
// typeof(IdentityUserDto),
// typeof(IdentityUserCreateDto),
// typeof(IdentityUserUpdateDto),
// typeof(ProfileDto),
// typeof(UpdateProfileDto)
// },
// ExtensionIdentityUserConsts.AvatarUrlField);
// });
//}
}
}

14
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/ExtensionIdentityUserConsts.cs
View File

@ -1,14 +0,0 @@
namespace LINGYUN.Abp.Identity
{
public static class ExtensionIdentityUserConsts
{
/// <summary>
/// 头像字段
/// </summary>
public static string AvatarUrlField { get; set; } = "AvatarUrl";
/// <summary>
/// 头像字段最大长度
/// </summary>
public static int MaxAvatarUrlLength { get; set; } = 128;
}
}

30
aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/AbpIdentityEntityFrameworkCoreModule.cs
View File

@ -2,8 +2,6 @@
using Volo.Abp.Identity;
using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.Modularity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace LINGYUN.Abp.Identity.EntityFrameworkCore
{
@ -11,7 +9,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
[DependsOn(typeof(Volo.Abp.Identity.EntityFrameworkCore.AbpIdentityEntityFrameworkCoreModule))]
public class AbpIdentityEntityFrameworkCoreModule : AbpModule
{
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
// private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
public override void ConfigureServices(ServiceConfigurationContext context)
{
@ -22,18 +20,18 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
});
}
public override void PostConfigureServices(ServiceConfigurationContext context)
{
OneTimeRunner.Run(() =>
{
ObjectExtensionManager.Instance
.MapEfCoreProperty<IdentityUser, string>(
ExtensionIdentityUserConsts.AvatarUrlField,
(etb, prop) =>
{
prop.HasMaxLength(ExtensionIdentityUserConsts.MaxAvatarUrlLength);
});
});
}
//public override void PostConfigureServices(ServiceConfigurationContext context)
//{
// OneTimeRunner.Run(() =>
// {
// ObjectExtensionManager.Instance
// .MapEfCoreProperty<IdentityUser, string>(
// ExtensionIdentityUserConsts.AvatarUrlField,
// (etb, prop) =>
// {
// prop.HasMaxLength(ExtensionIdentityUserConsts.MaxAvatarUrlLength);
// });
// });
//}
}
}

1770
aspnet-core/services/account/AuthServer.Host/Migrations/20211118030445_Remote-Field-AvatarUrl-With-IdentityUser.Designer.cs
View File

File diff suppressed because it is too large

25
aspnet-core/services/account/AuthServer.Host/Migrations/20211118030445_Remote-Field-AvatarUrl-With-IdentityUser.cs
View File

@ -0,0 +1,25 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace AuthServer.Migrations
{
public partial class RemoteFieldAvatarUrlWithIdentityUser : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "AvatarUrl",
table: "AbpUsers");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "AvatarUrl",
table: "AbpUsers",
type: "varchar(128)",
maxLength: 128,
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
}
}
}

6
aspnet-core/services/account/AuthServer.Host/Migrations/AuthServerHostMigrationsDbContextModelSnapshot.cs
View File

@ -17,7 +17,7 @@ namespace AuthServer.Migrations
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("Relational:MaxIdentifierLength", 64)
.HasAnnotation("ProductVersion", "5.0.11");
.HasAnnotation("ProductVersion", "5.0.12");
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{
@ -256,10 +256,6 @@ namespace AuthServer.Migrations
.HasDefaultValue(0)
.HasColumnName("AccessFailedCount");
b.Property<string>("AvatarUrl")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)

Write Preview
Loading…
Cancel
Save