From a00ca7498c201a306fb3ff388ffef1ef50eb8a2d Mon Sep 17 00:00:00 2001 From: TT Date: Mon, 27 Jul 2020 14:57:48 +0800 Subject: [PATCH] update to abp 3.0.4 --- .../app/identity/store/permissions.service.ts | 4 +-- .../TT.Abp.AccountManagement.csproj | 8 +++--- .../TT.Abp.AppManagement.csproj | 10 +++---- .../TT.Abp.AuditManagement.csproj | 8 +++--- backEnd/modules/TT.Abp.Cms/TT.Abp.Cms.csproj | 2 +- .../modules/TT.Abp.Core/TT.Abp.Core.csproj | 28 +++++++++---------- .../TT.Abp.FormManagement.csproj | 6 ++-- .../Addresses/AddressAppService.cs | 10 +++++-- .../Application/Comments/CommentAppService.cs | 11 ++++++-- .../Application/Coupons/CouponAppService.cs | 10 +++++-- .../Coupons/UserCouponAppService.cs | 13 +++++++-- .../Orders/ProductOrderAppService.cs | 8 ++++-- .../modules/TT.Abp.Mall/TT.Abp.Mall.csproj | 10 +++---- .../TT.Abp.OssManagement.csproj | 4 +-- .../modules/TT.Abp.Shops/TT.Abp.Shops.csproj | 14 +++++----- .../TT.Abp.VisitorManagement.csproj | 10 +++---- .../TT.Abp.Weixin/TT.Abp.Weixin.csproj | 16 +++++------ .../TT.Extensions/TT.Extensions.csproj | 4 +-- .../TT.HttpClient.Weixin.csproj | 4 +-- .../modules/TT.RabbitMq/TT.RabbitMq.csproj | 4 +-- .../TT.SoMall.Application.Contracts.csproj | 10 +++---- .../TT.SoMall.Application.csproj | 12 ++++---- .../TT.SoMall.DbMigrator.csproj | 4 +-- .../TT.SoMall.Domain.Shared.csproj | 16 +++++------ .../TT.SoMall.Domain/TT.SoMall.Domain.csproj | 18 ++++++------ ...ll.EntityFrameworkCore.DbMigrations.csproj | 2 +- .../TT.SoMall.EntityFrameworkCore.csproj | 18 ++++++------ .../TT.SoMall.HttpApi.Client.csproj | 10 +++---- backEnd/src/TT.SoMall.HttpApi.Host/Program.cs | 2 -- backEnd/src/TT.SoMall.HttpApi.Host/Startup.cs | 13 +++------ .../TT.SoMall.HttpApi.Host.csproj | 28 +++++++++---------- .../TT.SoMall.HttpApi.csproj | 10 +++---- .../src/TT.SoMall.IdentityServer/Startup.cs | 2 +- .../TT.SoMall.IdentityServer.csproj | 24 ++++++++-------- .../src/TT.SoMall.Web/TT.SoMall.Web.csproj | 28 +++++++++---------- ...TT.SoMall.EntityFrameworkCore.Tests.csproj | 4 +-- .../TT.SoMall.TestBase.csproj | 8 +++--- 37 files changed, 205 insertions(+), 188 deletions(-) diff --git a/angular/src/app/identity/store/permissions.service.ts b/angular/src/app/identity/store/permissions.service.ts index 5218520e..07164010 100644 --- a/angular/src/app/identity/store/permissions.service.ts +++ b/angular/src/app/identity/store/permissions.service.ts @@ -14,7 +14,7 @@ export class PermissionsService { } getPermissions(params = {}): Observable { - return this.http.request('get', "/api/abp/permissions/get", { params }) + return this.http.request('get', "/api/permission-management/permissions", { params }) .pipe( tap(res => { console.log(res.groups) @@ -29,6 +29,6 @@ export class PermissionsService { params: { providerKey: params.providerKey, providerName: params.providerName }, body: params.body }; - return this.http.request('put', "/api/abp/permissions/update", options); + return this.http.request('put', "/api/permission-management/permissions", options); } } \ No newline at end of file diff --git a/backEnd/modules/TT.Abp.AccountManagement/TT.Abp.AccountManagement.csproj b/backEnd/modules/TT.Abp.AccountManagement/TT.Abp.AccountManagement.csproj index aea780a8..a4198886 100644 --- a/backEnd/modules/TT.Abp.AccountManagement/TT.Abp.AccountManagement.csproj +++ b/backEnd/modules/TT.Abp.AccountManagement/TT.Abp.AccountManagement.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/backEnd/modules/TT.Abp.AppManagement/TT.Abp.AppManagement.csproj b/backEnd/modules/TT.Abp.AppManagement/TT.Abp.AppManagement.csproj index dbbff39c..1513c94e 100644 --- a/backEnd/modules/TT.Abp.AppManagement/TT.Abp.AppManagement.csproj +++ b/backEnd/modules/TT.Abp.AppManagement/TT.Abp.AppManagement.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/backEnd/modules/TT.Abp.Audit/TT.Abp.AuditManagement.csproj b/backEnd/modules/TT.Abp.Audit/TT.Abp.AuditManagement.csproj index dcfeb29d..9163c128 100644 --- a/backEnd/modules/TT.Abp.Audit/TT.Abp.AuditManagement.csproj +++ b/backEnd/modules/TT.Abp.Audit/TT.Abp.AuditManagement.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/backEnd/modules/TT.Abp.Cms/TT.Abp.Cms.csproj b/backEnd/modules/TT.Abp.Cms/TT.Abp.Cms.csproj index 60bc807d..86b8cd97 100644 --- a/backEnd/modules/TT.Abp.Cms/TT.Abp.Cms.csproj +++ b/backEnd/modules/TT.Abp.Cms/TT.Abp.Cms.csproj @@ -12,7 +12,7 @@ - + diff --git a/backEnd/modules/TT.Abp.Core/TT.Abp.Core.csproj b/backEnd/modules/TT.Abp.Core/TT.Abp.Core.csproj index 24f8c364..5c304486 100644 --- a/backEnd/modules/TT.Abp.Core/TT.Abp.Core.csproj +++ b/backEnd/modules/TT.Abp.Core/TT.Abp.Core.csproj @@ -4,21 +4,21 @@ Library - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/backEnd/modules/TT.Abp.FormManagement/TT.Abp.FormManagement.csproj b/backEnd/modules/TT.Abp.FormManagement/TT.Abp.FormManagement.csproj index 2b3ab4a5..c66c73c5 100644 --- a/backEnd/modules/TT.Abp.FormManagement/TT.Abp.FormManagement.csproj +++ b/backEnd/modules/TT.Abp.FormManagement/TT.Abp.FormManagement.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/backEnd/modules/TT.Abp.Mall/Application/Addresses/AddressAppService.cs b/backEnd/modules/TT.Abp.Mall/Application/Addresses/AddressAppService.cs index 9c8c025f..789e9957 100644 --- a/backEnd/modules/TT.Abp.Mall/Application/Addresses/AddressAppService.cs +++ b/backEnd/modules/TT.Abp.Mall/Application/Addresses/AddressAppService.cs @@ -13,6 +13,7 @@ using TT.Abp.Mall.Domain.Addresses; using TT.Abp.Mall.Domain.Users; using Volo.Abp.EventBus.Local; +using Volo.Abp.Linq; namespace TT.Abp.Mall.Application.Addresses { @@ -29,14 +30,17 @@ public interface IAddressAppService : ICrudAppService< public class AddressAppService : CrudAppService, IAddressAppService { + private readonly IAsyncQueryableExecuter _asyncQueryableExecuter; protected IMallUserLookupService UserLookupService { get; } public AddressAppService( IRepository repository, - IMallUserLookupService userLookupService + IMallUserLookupService userLookupService, + IAsyncQueryableExecuter asyncQueryableExecuter ) : base(repository) { + _asyncQueryableExecuter = asyncQueryableExecuter; UserLookupService = userLookupService; base.CreatePolicyName = MallPermissions.Addresses.Create; @@ -50,12 +54,12 @@ public override async Task> GetListAsync(PagedAndSort var query = CreateFilteredQuery(input); - var totalCount = await AsyncQueryableExecuter.CountAsync(query); + var totalCount = await _asyncQueryableExecuter.CountAsync(query); query = ApplySorting(query, input); query = ApplyPaging(query, input); - var entities = await AsyncQueryableExecuter.ToListAsync(query); + var entities = await _asyncQueryableExecuter.ToListAsync(query); var addresslist = new PagedResultDto( totalCount, diff --git a/backEnd/modules/TT.Abp.Mall/Application/Comments/CommentAppService.cs b/backEnd/modules/TT.Abp.Mall/Application/Comments/CommentAppService.cs index cc87ab4c..b467aea9 100644 --- a/backEnd/modules/TT.Abp.Mall/Application/Comments/CommentAppService.cs +++ b/backEnd/modules/TT.Abp.Mall/Application/Comments/CommentAppService.cs @@ -9,6 +9,7 @@ using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using TT.Abp.Mall.Domain.Comments; +using Volo.Abp.Linq; namespace TT.Abp.Mall.Application.Comments @@ -22,8 +23,14 @@ public class CommentAppService : CrudAppService, ICommentAppService { - public CommentAppService(IRepository repository) : base(repository) + private readonly IAsyncQueryableExecuter _asyncQueryableExecuter; + + public CommentAppService( + IRepository repository, + IAsyncQueryableExecuter asyncQueryableExecuter + ) : base(repository) { + _asyncQueryableExecuter = asyncQueryableExecuter; } [Authorize] @@ -83,7 +90,7 @@ public async Task> GetPublishListAsync(MallRequestDto query = query.PageBy(input); - var entities = await AsyncQueryableExecuter.ToListAsync(query); + var entities = await _asyncQueryableExecuter.ToListAsync(query); return new PagedResultDto( totalCount, diff --git a/backEnd/modules/TT.Abp.Mall/Application/Coupons/CouponAppService.cs b/backEnd/modules/TT.Abp.Mall/Application/Coupons/CouponAppService.cs index 7cc39872..97b14636 100644 --- a/backEnd/modules/TT.Abp.Mall/Application/Coupons/CouponAppService.cs +++ b/backEnd/modules/TT.Abp.Mall/Application/Coupons/CouponAppService.cs @@ -7,6 +7,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; +using Volo.Abp.Linq; namespace TT.Abp.Mall.Application.Coupons { @@ -18,13 +19,16 @@ public interface ICouponAppService public class CouponAppService : CrudAppService, ICouponAppService { private readonly IRepository _userCouponRepository; + private readonly IAsyncQueryableExecuter _asyncQueryableExecuter; public CouponAppService( IRepository repository, - IRepository userCouponRepository + IRepository userCouponRepository, + IAsyncQueryableExecuter asyncQueryableExecuter ) : base(repository) { _userCouponRepository = userCouponRepository; + _asyncQueryableExecuter = asyncQueryableExecuter; base.GetListPolicyName = MallPermissions.Coupons.Default; base.CreatePolicyName = MallPermissions.Coupons.Create; base.UpdatePolicyName = MallPermissions.Coupons.Update; @@ -36,11 +40,11 @@ public async Task> GetPublishListAsync(MallRequestDto i { var query = base.CreateFilteredQuery(input); - var totalCount = await AsyncQueryableExecuter.CountAsync(query); + var totalCount = await _asyncQueryableExecuter.CountAsync(query); query = ApplySorting(query, input); - var entities = await AsyncQueryableExecuter.ToListAsync(query); + var entities = await _asyncQueryableExecuter.ToListAsync(query); var result = new ListResultDto( entities.Select(MapToGetListOutputDto).ToList() diff --git a/backEnd/modules/TT.Abp.Mall/Application/Coupons/UserCouponAppService.cs b/backEnd/modules/TT.Abp.Mall/Application/Coupons/UserCouponAppService.cs index 89442b9c..572e3e0a 100644 --- a/backEnd/modules/TT.Abp.Mall/Application/Coupons/UserCouponAppService.cs +++ b/backEnd/modules/TT.Abp.Mall/Application/Coupons/UserCouponAppService.cs @@ -7,6 +7,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; +using Volo.Abp.Linq; namespace TT.Abp.Mall.Application.Coupons { @@ -17,8 +18,14 @@ public interface IUserCouponAppService public class UserCouponAppService : CrudAppService, IUserCouponAppService { - public UserCouponAppService(IRepository repository) : base(repository) + private readonly IAsyncQueryableExecuter _asyncQueryableExecuter; + + public UserCouponAppService( + IRepository repository, + IAsyncQueryableExecuter asyncQueryableExecuter + ) : base(repository) { + _asyncQueryableExecuter = asyncQueryableExecuter; } public override Task> GetListAsync(CouponResultRequestDto input) @@ -33,11 +40,11 @@ public async Task> GetPublicListAsync(CouponResultR var query = base.CreateFilteredQuery(input) .Where(x => x.OwnerUserId == CurrentUser.Id); - var totalCount = await AsyncQueryableExecuter.CountAsync(query); + var totalCount = await _asyncQueryableExecuter.CountAsync(query); query = ApplySorting(query, input); - var entities = await AsyncQueryableExecuter.ToListAsync(query); + var entities = await _asyncQueryableExecuter.ToListAsync(query); return new ListResultDto( entities.Select(MapToGetListOutputDto).ToList() diff --git a/backEnd/modules/TT.Abp.Mall/Application/Orders/ProductOrderAppService.cs b/backEnd/modules/TT.Abp.Mall/Application/Orders/ProductOrderAppService.cs index ff403323..8b9d9ff1 100644 --- a/backEnd/modules/TT.Abp.Mall/Application/Orders/ProductOrderAppService.cs +++ b/backEnd/modules/TT.Abp.Mall/Application/Orders/ProductOrderAppService.cs @@ -23,6 +23,7 @@ using TT.RabbitMQ; using Volo.Abp; using Volo.Abp.Domain.Repositories; +using Volo.Abp.Linq; using Volo.Abp.Settings; namespace TT.Abp.Mall.Application.Orders @@ -43,6 +44,7 @@ public class ProductOrderAppService : private readonly ISettingProvider _setting; private readonly IHttpContextAccessor _httpContext; private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IAsyncQueryableExecuter _asyncQueryableExecuter; private readonly IAppProvider _appProvider; private readonly RabbitMqPublisher _rabbit; private readonly IMediator _mediator; @@ -56,6 +58,7 @@ public ProductOrderAppService( ISettingProvider setting, IHttpContextAccessor httpContext, IHttpContextAccessor httpContextAccessor, + IAsyncQueryableExecuter asyncQueryableExecuter, IAppProvider appProvider, RabbitMqPublisher rabbit, IMediator mediator @@ -67,6 +70,7 @@ IMediator mediator _setting = setting; _httpContext = httpContext; _httpContextAccessor = httpContextAccessor; + _asyncQueryableExecuter = asyncQueryableExecuter; _appProvider = appProvider; _rabbit = rabbit; _mediator = mediator; @@ -222,13 +226,13 @@ public async Task> GetPublicListAsync(MallReques .WhereIf(input.State.HasValue && input.State == 4, x => x.PayType != MallEnums.PayType.未支付 && x.State == MallEnums.OrderState.售后) ; - var totalCount = await AsyncQueryableExecuter.CountAsync(query); + var totalCount = await _asyncQueryableExecuter.CountAsync(query); query = ApplySorting(query, input); query = ApplyPaging(query, input); - var entities = await AsyncQueryableExecuter.ToListAsync(query); + var entities = await _asyncQueryableExecuter.ToListAsync(query); var result = new PagedResultDto( totalCount, diff --git a/backEnd/modules/TT.Abp.Mall/TT.Abp.Mall.csproj b/backEnd/modules/TT.Abp.Mall/TT.Abp.Mall.csproj index 818b2850..98803ab9 100644 --- a/backEnd/modules/TT.Abp.Mall/TT.Abp.Mall.csproj +++ b/backEnd/modules/TT.Abp.Mall/TT.Abp.Mall.csproj @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/backEnd/modules/TT.Abp.OssManagement/TT.Abp.OssManagement.csproj b/backEnd/modules/TT.Abp.OssManagement/TT.Abp.OssManagement.csproj index 004e4f72..4b2ad8c1 100644 --- a/backEnd/modules/TT.Abp.OssManagement/TT.Abp.OssManagement.csproj +++ b/backEnd/modules/TT.Abp.OssManagement/TT.Abp.OssManagement.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/backEnd/modules/TT.Abp.Shops/TT.Abp.Shops.csproj b/backEnd/modules/TT.Abp.Shops/TT.Abp.Shops.csproj index fa9ba72e..858290bd 100644 --- a/backEnd/modules/TT.Abp.Shops/TT.Abp.Shops.csproj +++ b/backEnd/modules/TT.Abp.Shops/TT.Abp.Shops.csproj @@ -7,12 +7,12 @@ - - - - - - - + + + + + + + diff --git a/backEnd/modules/TT.Abp.VisitorManagement/TT.Abp.VisitorManagement.csproj b/backEnd/modules/TT.Abp.VisitorManagement/TT.Abp.VisitorManagement.csproj index a40f1c98..d651801b 100644 --- a/backEnd/modules/TT.Abp.VisitorManagement/TT.Abp.VisitorManagement.csproj +++ b/backEnd/modules/TT.Abp.VisitorManagement/TT.Abp.VisitorManagement.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/backEnd/modules/TT.Abp.Weixin/TT.Abp.Weixin.csproj b/backEnd/modules/TT.Abp.Weixin/TT.Abp.Weixin.csproj index 5e69db6a..2e4a99b1 100644 --- a/backEnd/modules/TT.Abp.Weixin/TT.Abp.Weixin.csproj +++ b/backEnd/modules/TT.Abp.Weixin/TT.Abp.Weixin.csproj @@ -10,14 +10,14 @@ - - - - - - - - + + + + + + + + diff --git a/backEnd/modules/TT.Extensions/TT.Extensions.csproj b/backEnd/modules/TT.Extensions/TT.Extensions.csproj index 528169ac..cbb3ae2d 100644 --- a/backEnd/modules/TT.Extensions/TT.Extensions.csproj +++ b/backEnd/modules/TT.Extensions/TT.Extensions.csproj @@ -5,9 +5,9 @@ TT.Extensions - + - + diff --git a/backEnd/modules/TT.HttpClient.Weixin/TT.HttpClient.Weixin.csproj b/backEnd/modules/TT.HttpClient.Weixin/TT.HttpClient.Weixin.csproj index 8b5f7066..92b1c586 100644 --- a/backEnd/modules/TT.HttpClient.Weixin/TT.HttpClient.Weixin.csproj +++ b/backEnd/modules/TT.HttpClient.Weixin/TT.HttpClient.Weixin.csproj @@ -7,10 +7,10 @@ - + - + diff --git a/backEnd/modules/TT.RabbitMq/TT.RabbitMq.csproj b/backEnd/modules/TT.RabbitMq/TT.RabbitMq.csproj index 9ae93240..c4c05b3e 100644 --- a/backEnd/modules/TT.RabbitMq/TT.RabbitMq.csproj +++ b/backEnd/modules/TT.RabbitMq/TT.RabbitMq.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/backEnd/src/TT.SoMall.Application.Contracts/TT.SoMall.Application.Contracts.csproj b/backEnd/src/TT.SoMall.Application.Contracts/TT.SoMall.Application.Contracts.csproj index a602af43..504f0b06 100644 --- a/backEnd/src/TT.SoMall.Application.Contracts/TT.SoMall.Application.Contracts.csproj +++ b/backEnd/src/TT.SoMall.Application.Contracts/TT.SoMall.Application.Contracts.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/backEnd/src/TT.SoMall.Application/TT.SoMall.Application.csproj b/backEnd/src/TT.SoMall.Application/TT.SoMall.Application.csproj index f2761c5e..87354646 100644 --- a/backEnd/src/TT.SoMall.Application/TT.SoMall.Application.csproj +++ b/backEnd/src/TT.SoMall.Application/TT.SoMall.Application.csproj @@ -15,12 +15,12 @@ - - - - - - + + + + + + diff --git a/backEnd/src/TT.SoMall.DbMigrator/TT.SoMall.DbMigrator.csproj b/backEnd/src/TT.SoMall.DbMigrator/TT.SoMall.DbMigrator.csproj index 6c260257..80290090 100644 --- a/backEnd/src/TT.SoMall.DbMigrator/TT.SoMall.DbMigrator.csproj +++ b/backEnd/src/TT.SoMall.DbMigrator/TT.SoMall.DbMigrator.csproj @@ -22,11 +22,11 @@ - + - + diff --git a/backEnd/src/TT.SoMall.Domain.Shared/TT.SoMall.Domain.Shared.csproj b/backEnd/src/TT.SoMall.Domain.Shared/TT.SoMall.Domain.Shared.csproj index da31c284..79dc5ec6 100644 --- a/backEnd/src/TT.SoMall.Domain.Shared/TT.SoMall.Domain.Shared.csproj +++ b/backEnd/src/TT.SoMall.Domain.Shared/TT.SoMall.Domain.Shared.csproj @@ -8,14 +8,14 @@ - - - - - - - - + + + + + + + + diff --git a/backEnd/src/TT.SoMall.Domain/TT.SoMall.Domain.csproj b/backEnd/src/TT.SoMall.Domain/TT.SoMall.Domain.csproj index 3864972f..56138a1e 100644 --- a/backEnd/src/TT.SoMall.Domain/TT.SoMall.Domain.csproj +++ b/backEnd/src/TT.SoMall.Domain/TT.SoMall.Domain.csproj @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/backEnd/src/TT.SoMall.EntityFrameworkCore.DbMigrations/TT.SoMall.EntityFrameworkCore.DbMigrations.csproj b/backEnd/src/TT.SoMall.EntityFrameworkCore.DbMigrations/TT.SoMall.EntityFrameworkCore.DbMigrations.csproj index 7a3522f0..815b5e2f 100644 --- a/backEnd/src/TT.SoMall.EntityFrameworkCore.DbMigrations/TT.SoMall.EntityFrameworkCore.DbMigrations.csproj +++ b/backEnd/src/TT.SoMall.EntityFrameworkCore.DbMigrations/TT.SoMall.EntityFrameworkCore.DbMigrations.csproj @@ -17,7 +17,7 @@ - + diff --git a/backEnd/src/TT.SoMall.EntityFrameworkCore/TT.SoMall.EntityFrameworkCore.csproj b/backEnd/src/TT.SoMall.EntityFrameworkCore/TT.SoMall.EntityFrameworkCore.csproj index 13979115..b7b24e43 100644 --- a/backEnd/src/TT.SoMall.EntityFrameworkCore/TT.SoMall.EntityFrameworkCore.csproj +++ b/backEnd/src/TT.SoMall.EntityFrameworkCore/TT.SoMall.EntityFrameworkCore.csproj @@ -19,15 +19,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/backEnd/src/TT.SoMall.HttpApi.Client/TT.SoMall.HttpApi.Client.csproj b/backEnd/src/TT.SoMall.HttpApi.Client/TT.SoMall.HttpApi.Client.csproj index 35c87007..5d89bf66 100644 --- a/backEnd/src/TT.SoMall.HttpApi.Client/TT.SoMall.HttpApi.Client.csproj +++ b/backEnd/src/TT.SoMall.HttpApi.Client/TT.SoMall.HttpApi.Client.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/backEnd/src/TT.SoMall.HttpApi.Host/Program.cs b/backEnd/src/TT.SoMall.HttpApi.Host/Program.cs index 826b8c0c..fb4c271a 100644 --- a/backEnd/src/TT.SoMall.HttpApi.Host/Program.cs +++ b/backEnd/src/TT.SoMall.HttpApi.Host/Program.cs @@ -1,5 +1,4 @@ using System; -using Elastic.Apm.SerilogEnricher; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; @@ -26,7 +25,6 @@ public static int Main(string[] args) .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .Enrich.FromLogContext() - .Enrich.WithElasticApmCorrelationInfo() .Enrich.WithExceptionDetails() .WriteTo.Console() .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(elasticsearch)) diff --git a/backEnd/src/TT.SoMall.HttpApi.Host/Startup.cs b/backEnd/src/TT.SoMall.HttpApi.Host/Startup.cs index ec63759a..8c626408 100644 --- a/backEnd/src/TT.SoMall.HttpApi.Host/Startup.cs +++ b/backEnd/src/TT.SoMall.HttpApi.Host/Startup.cs @@ -1,10 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using DotNetCore.CAP; -using Elastic.Apm.AspNetCore; -using Elastic.Apm.DiagnosticSource; -using Elastic.Apm.EntityFrameworkCore; -using Elastic.Apm.NetCoreAll; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.IdentityModel.Logging; @@ -55,11 +51,10 @@ public void ConfigureServices(IServiceCollection services) public void Configure(IApplicationBuilder app) { - app.UseElasticApm(Configuration, - new HttpDiagnosticsSubscriber(), /* Enable tracing of outgoing HTTP requests */ - new EfCoreDiagnosticsSubscriber()); /* Enable tracing of database calls through EF Core*/ - - + // app.UseElasticApm(Configuration, + // new HttpDiagnosticsSubscriber(), /* Enable tracing of outgoing HTTP requests */ + // new EfCoreDiagnosticsSubscriber()); /* Enable tracing of database calls through EF Core*/ + IdentityModelEventSource.ShowPII = true; app.UseForwardedHeaders(new ForwardedHeadersOptions diff --git a/backEnd/src/TT.SoMall.HttpApi.Host/TT.SoMall.HttpApi.Host.csproj b/backEnd/src/TT.SoMall.HttpApi.Host/TT.SoMall.HttpApi.Host.csproj index dbc55399..53f75958 100644 --- a/backEnd/src/TT.SoMall.HttpApi.Host/TT.SoMall.HttpApi.Host.csproj +++ b/backEnd/src/TT.SoMall.HttpApi.Host/TT.SoMall.HttpApi.Host.csproj @@ -19,27 +19,25 @@ - - - - - + + + - + - + - - - - - - - - + + + + + + + + diff --git a/backEnd/src/TT.SoMall.HttpApi/TT.SoMall.HttpApi.csproj b/backEnd/src/TT.SoMall.HttpApi/TT.SoMall.HttpApi.csproj index faf974ca..d9266e1a 100644 --- a/backEnd/src/TT.SoMall.HttpApi/TT.SoMall.HttpApi.csproj +++ b/backEnd/src/TT.SoMall.HttpApi/TT.SoMall.HttpApi.csproj @@ -14,11 +14,11 @@ - - - - - + + + + + diff --git a/backEnd/src/TT.SoMall.IdentityServer/Startup.cs b/backEnd/src/TT.SoMall.IdentityServer/Startup.cs index 0b27171a..9ecfc598 100644 --- a/backEnd/src/TT.SoMall.IdentityServer/Startup.cs +++ b/backEnd/src/TT.SoMall.IdentityServer/Startup.cs @@ -21,7 +21,7 @@ public void ConfigureServices(IServiceCollection services) services.PostConfigure(options => { - options.PublicOrigin = config["AuthServer:Authority"]; + // options.PublicOrigin = config["AuthServer:Authority"]; options.IssuerUri = config["AuthServer:Authority"]; }); diff --git a/backEnd/src/TT.SoMall.IdentityServer/TT.SoMall.IdentityServer.csproj b/backEnd/src/TT.SoMall.IdentityServer/TT.SoMall.IdentityServer.csproj index 97b6d431..d10df49a 100644 --- a/backEnd/src/TT.SoMall.IdentityServer/TT.SoMall.IdentityServer.csproj +++ b/backEnd/src/TT.SoMall.IdentityServer/TT.SoMall.IdentityServer.csproj @@ -40,26 +40,26 @@ - - + + - + - - - + + + - - + + - - - - + + + + diff --git a/backEnd/src/TT.SoMall.Web/TT.SoMall.Web.csproj b/backEnd/src/TT.SoMall.Web/TT.SoMall.Web.csproj index a2894f84..d6985944 100644 --- a/backEnd/src/TT.SoMall.Web/TT.SoMall.Web.csproj +++ b/backEnd/src/TT.SoMall.Web/TT.SoMall.Web.csproj @@ -16,28 +16,28 @@ - + - - - - - + + + + + - - - + + + - - + + - - - + + + diff --git a/backEnd/test/TT.SoMall.EntityFrameworkCore.Tests/TT.SoMall.EntityFrameworkCore.Tests.csproj b/backEnd/test/TT.SoMall.EntityFrameworkCore.Tests/TT.SoMall.EntityFrameworkCore.Tests.csproj index 81c1c965..cde3d4e0 100644 --- a/backEnd/test/TT.SoMall.EntityFrameworkCore.Tests/TT.SoMall.EntityFrameworkCore.Tests.csproj +++ b/backEnd/test/TT.SoMall.EntityFrameworkCore.Tests/TT.SoMall.EntityFrameworkCore.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/backEnd/test/TT.SoMall.TestBase/TT.SoMall.TestBase.csproj b/backEnd/test/TT.SoMall.TestBase/TT.SoMall.TestBase.csproj index 8ab1d3b3..04e83566 100644 --- a/backEnd/test/TT.SoMall.TestBase/TT.SoMall.TestBase.csproj +++ b/backEnd/test/TT.SoMall.TestBase/TT.SoMall.TestBase.csproj @@ -9,9 +9,9 @@ - - - + + + @@ -19,7 +19,7 @@ - +