基础服务代码20220902新git

src/Modules/BaseService/BaseService.Application.Contracts/HbDtoExtensions.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Identity;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.Threading;
+
+namespace BaseService
+{
+    public static class HbDtoExtensions
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                /* You can add extension properties to DTOs
+                 * defined in the depended modules.
+                 *
+                 * Example:
+                 *
+                 * ObjectExtensionManager.Instance
+                 *   .AddOrUpdateProperty<IdentityRoleDto, string>("Title");
+                 *
+                 * See the documentation for more:
+                 * https://docs.abp.io/en/abp/latest/Object-Extensions
+                 */
+                ObjectExtensionManager.Instance
+                  .AddOrUpdateProperty<string>(
+                    new[]
+                    {
+                        typeof(IdentityUserDto),
+                        typeof(IdentityUserCreateDto),
+                        typeof(IdentityUserUpdateDto),
+                        typeof(UpdateProfileDto)
+                    },
+                    "CodeNum"
+                );
+            });
+        }
+    }
+}

src/Modules/BaseService/BaseService.Application/BaseServiceApplicationAutoMapperProfile.cs

@@ -9,6 +9,8 @@ using BaseService.BaseData.BranchManagement.Dto;
 using BaseService.BaseData.UserBranchRoleManagement.Dto;
 using BaseService.RelationData.Dto;
 
+using Volo.Abp.Identity;
+
 namespace BaseService
 {
     public class BaseServiceApplicationAutoMapperProfile : Profile
@@ -24,6 +26,8 @@ namespace BaseService
 
             //分支--角色
             CreateMap<BranchRole, BranchRoleDto>();
+
+            CreateMap<IdentityUser, IdentityUserDto>().MapExtraProperties();
         }
     }
 }

src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs

@@ -22,6 +22,7 @@ using Volo.Abp.ObjectExtending;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.Users;
 using IdentityUser = Volo.Abp.Identity.IdentityUser;
+using Volo.Abp.Data;
 
 namespace BaseService.Systems.UserManagement
 {
@@ -122,6 +123,13 @@ namespace BaseService.Systems.UserManagement
         public async Task<IdentityUserDto> UpdateAsync(Guid id, IdentityUserUpdateDto input)
         {
             var user = await UserManager.GetByIdAsync(id);
+           // user.SetProperty("Title", "My custom title value!");
+           //var gettitle= user.GetProperty<string>("Title");
+           // if(string.IsNullOrEmpty(gettitle))
+           // {
+           //     throw new BusinessException("用户标题不能为空");
+           // }
+
             user.ConcurrencyStamp = input.ConcurrencyStamp;
 
             (await UserManager.SetUserNameAsync(user, input.UserName)).CheckErrors();
@@ -138,6 +146,7 @@ namespace BaseService.Systems.UserManagement
             }
 
             var dto = ObjectMapper.Map<IdentityUser, IdentityUserDto>(user);
+            
 
             await CurrentUnitOfWork.SaveChangesAsync();
 

src/Modules/BaseService/BaseService.Domain/Users/AppUser.cs

@@ -32,7 +32,7 @@ namespace BaseService.Users
 
         #endregion
 
-
+        public string CodeNum { get; set; }
         //public Guid BranchId { get; set; }
 
         //public bool Enable { get; set; }

src/Modules/BaseService/BaseService.EntityFrameworkCore/EntityFrameworkCore/BaseEfCoreEntityExtensionMappings.cs

@@ -14,6 +14,15 @@ namespace BaseService.EntityFrameworkCore
         {
             BaseServiceModuleExtensionConfigurator.Configure();
 
+            ObjectExtensionManager.Instance
+                     .MapEfCoreProperty<IdentityUser, string>(
+                         "CodeNum",
+                         (entityBuilder, propertyBuilder) =>
+                         {
+                             
+                         }
+                     );
+
             //OneTimeRunner.Run(() =>
             //{
             //    ObjectExtensionManager.Instance

src/Modules/BaseService/BaseService.Host/BaseService.Host.csproj

@@ -30,7 +30,7 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <!-- <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" /> -->
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="SettleAccount.HttpApi" Version="1.0.21" />
+    <PackageReference Include="SettleAccount.HttpApi" Version="1.0.25" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="4.3.3" />
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.3.3" />

src/Modules/BaseService/BaseService.Host/FileStorage/Migrations/BaseServiceMigrationDbContextModelSnapshot.cs

@@ -19,7 +19,7 @@ namespace FileStorage.Migrations
                 .UseIdentityColumns()
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("ProductVersion", "5.0.1");
+                .HasAnnotation("ProductVersion", "5.0.7");
 
             modelBuilder.Entity("BaseService.BaseData.Branch", b =>
                 {
@@ -653,6 +653,9 @@ namespace FileStorage.Migrations
                         .HasDefaultValue(0)
                         .HasColumnName("AccessFailedCount");
 
+                    b.Property<string>("CodeNum")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(40)