From f513d02486d135b6660bb8fd818c6490ba8cce62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com> Date: Sat, 1 May 2021 12:44:03 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E4=BF=AE=E5=A4=8D=201.vue=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E9=A1=B5=E9=9D=A2=E5=8F=91=E5=B8=83=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=202.=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyNameProjectNameHttpApiHostModule.cs | 2 +- .../Pages/Dtos/CustomeRequestDto.cs | 2 +- .../CompanyNameProjectNamePermissions.cs | 14 -------------- .../Roles/RoleAppService.cs | 2 +- .../Users/UserAppService.cs | 2 +- content/vue/.env.development | 2 +- content/vue/.env.production | 2 +- content/vue/src/views/admin/roles/EditAbpRole.vue | 2 +- .../src/views/admin/roles/PermissionAbpRole.vue | 14 +++++++------- 9 files changed, 14 insertions(+), 28 deletions(-) diff --git a/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyNameProjectNameHttpApiHostModule.cs b/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyNameProjectNameHttpApiHostModule.cs index 3ef36dfb..704c490b 100644 --- a/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyNameProjectNameHttpApiHostModule.cs +++ b/content/aspnetcore/host/CompanyName.ProjectName.HttpApi.Host/CompanyNameProjectNameHttpApiHostModule.cs @@ -70,7 +70,7 @@ namespace CompanyNameProjectName { Authorization = new[] { new CustomHangfireAuthorizeFilter() } }); - context.ServiceProvider.CreateRecurringJob(); + //context.ServiceProvider.CreateRecurringJob(); } public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Pages/Dtos/CustomeRequestDto.cs b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Pages/Dtos/CustomeRequestDto.cs index 5c0d6c1b..5f9cee76 100644 --- a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Pages/Dtos/CustomeRequestDto.cs +++ b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Pages/Dtos/CustomeRequestDto.cs @@ -5,7 +5,7 @@ /// /// 当前页面 /// - public int pageIndex { get; set; } = 1; + public int PageIndex { get; set; } = 1; /// /// 每页多少条 diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Permissions/CompanyNameProjectNamePermissions.cs b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Permissions/CompanyNameProjectNamePermissions.cs index c4bc8cc9..8d30de22 100644 --- a/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Permissions/CompanyNameProjectNamePermissions.cs +++ b/content/aspnetcore/src/CompanyName.ProjectName.Application.Contracts/Permissions/CompanyNameProjectNamePermissions.cs @@ -6,19 +6,5 @@ //Add your own permission names. Example: //public const string MyPermission1 = GroupName + ".MyPermission1"; - - public const string DicGroupName = "Dic"; - - /// - /// 字典权限 - /// - public static class Dic - { - public const string Default = GroupName + ".Dic"; - public const string Query = Default + ".Query"; - public const string Create = Default + ".Create"; - public const string Update = Default + ".Update"; - public const string Delete = Default + ".Delete"; - } } } \ No newline at end of file diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application/Roles/RoleAppService.cs b/content/aspnetcore/src/CompanyName.ProjectName.Application/Roles/RoleAppService.cs index d8961712..6cf4941c 100644 --- a/content/aspnetcore/src/CompanyName.ProjectName.Application/Roles/RoleAppService.cs +++ b/content/aspnetcore/src/CompanyName.ProjectName.Application/Roles/RoleAppService.cs @@ -42,7 +42,7 @@ namespace CompanyNameProjectName.Roles var request = new GetIdentityRolesInput(); request.Filter = input.filter?.Trim(); request.MaxResultCount = input.PageSize; - request.SkipCount = (input.pageIndex - 1) * input.PageSize; + request.SkipCount = (input.PageIndex - 1) * input.PageSize; return await _identityRoleAppService.GetListAsync(request); } diff --git a/content/aspnetcore/src/CompanyName.ProjectName.Application/Users/UserAppService.cs b/content/aspnetcore/src/CompanyName.ProjectName.Application/Users/UserAppService.cs index 48f15312..2ec2c220 100644 --- a/content/aspnetcore/src/CompanyName.ProjectName.Application/Users/UserAppService.cs +++ b/content/aspnetcore/src/CompanyName.ProjectName.Application/Users/UserAppService.cs @@ -30,7 +30,7 @@ namespace CompanyNameProjectName.Users var request = new GetIdentityUsersInput(); request.Filter = input.filter?.Trim(); request.MaxResultCount = input.PageSize; - request.SkipCount = (input.pageIndex - 1) * input.PageSize; + request.SkipCount = (input.PageIndex - 1) * input.PageSize; request.Sorting= " LastModificationTime desc"; return await _identityUserAppService.GetListAsync(request); } diff --git a/content/vue/.env.development b/content/vue/.env.development index babc4251..884acfb7 100644 --- a/content/vue/.env.development +++ b/content/vue/.env.development @@ -22,5 +22,5 @@ VITE_GLOB_UPLOAD_URL=/upload # Interface prefix VITE_GLOB_API_URL_PREFIX= - +VITE_BUILD_COMPRESS = 'none' VITE_API_URL=http://localhost:50010 diff --git a/content/vue/.env.production b/content/vue/.env.production index a0bdfb7f..e19a910b 100644 --- a/content/vue/.env.production +++ b/content/vue/.env.production @@ -24,7 +24,7 @@ VITE_GLOB_UPLOAD_URL=/upload # Interface prefix VITE_GLOB_API_URL_PREFIX= - +VITE_BUILD_COMPRESS = 'none' # Whether to enable image compression VITE_USE_IMAGEMIN= true diff --git a/content/vue/src/views/admin/roles/EditAbpRole.vue b/content/vue/src/views/admin/roles/EditAbpRole.vue index dca06cc5..d3fef86f 100644 --- a/content/vue/src/views/admin/roles/EditAbpRole.vue +++ b/content/vue/src/views/admin/roles/EditAbpRole.vue @@ -54,7 +54,7 @@ role.roleInfo = new IdentityRoleUpdateDto(); role.roleInfo.name = request.name; role.roleInfo.isDefault = request.isDefault == 1 ? true : false; - role.roleInfo.isPublic = currentRoleInfo.isDefault; + role.roleInfo.isPublic = currentRoleInfo.isPublic; role.roleInfo.concurrencyStamp = currentRoleInfo.concurrencyStamp; await updateRoleAsync({ request: role, changeOkLoading, validate, closeModal }); ctx.emit('reload'); diff --git a/content/vue/src/views/admin/roles/PermissionAbpRole.vue b/content/vue/src/views/admin/roles/PermissionAbpRole.vue index ff8f1718..6f3f9e05 100644 --- a/content/vue/src/views/admin/roles/PermissionAbpRole.vue +++ b/content/vue/src/views/admin/roles/PermissionAbpRole.vue @@ -4,13 +4,11 @@ :title="t('routes.admin.roleManagement_permission')" width="15%" > - - - + />