diff --git a/src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs b/src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs index b70e6b1..76539dc 100644 --- a/src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs +++ b/src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs @@ -86,7 +86,8 @@ namespace BaseService.Systems.UserManagement [AllowAnonymous] public async Task GetCurrentUserAsync() { - var id = CurrentUser.GetId(); + Guid id; + id = CurrentUser.GetId(); var currentUser = await UserManager.GetByIdAsync(id); var dto = ObjectMapper.Map(currentUser); diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 45b9d5b..e60cb39 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -13,6 +13,7 @@ using Volo.Abp.IdentityServer.Clients; using Volo.Abp.IdentityServer.IdentityResources; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; +using Volo.Abp.Security.Claims; using Volo.Abp.Uow; using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource; using ApiScope = Volo.Abp.IdentityServer.ApiScopes.ApiScope; @@ -77,7 +78,9 @@ namespace WY.NewJit.IdentityServer "name", "phone_number", "phone_number_verified", - "role" + "role", + AbpClaimTypes.UserId, + AbpClaimTypes.UserName }; await CreateApiResourceAsync("NewJit", commonApiUserClaims); diff --git a/vue/node_modules.rar b/vue/node_modules.rar new file mode 100644 index 0000000..eac49df Binary files /dev/null and b/vue/node_modules.rar differ