From e8720d4e1a38f7c94f09d051dc30575e336e2377 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Tue, 4 Apr 2023 19:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PDA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Accounts/AccountController.cs | 2 + .../Controllers/TestController.cs | 58 +++++++++++++++++++ .../PdaHttpApiHostModule.cs | 48 ++++++++++----- .../appsettings.Development.json | 30 +++++----- .../appsettings.Production.json | 13 ----- .../Win_in.Sfs.Wms.Pda.Host/appsettings.json | 47 +++++++++++++-- .../MessageApplicationAutoMapperProfile.cs | 2 +- .../NotifyMessageAutoMapperProfile.cs | 8 ++- .../NotifyMessages/NotifyMessageService.cs | 11 +++- .../settings/appsettings.Development.json | 11 ++++ 10 files changed, 178 insertions(+), 52 deletions(-) create mode 100644 be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/TestController.cs delete mode 100644 be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Production.json diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Accounts/AccountController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Accounts/AccountController.cs index 94fa1d3ff..57f3f8604 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Accounts/AccountController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Accounts/AccountController.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Volo.Abp.Account; using Volo.Abp.AspNetCore.Mvc; @@ -15,6 +16,7 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Accounts; /// /// /// +[AllowAnonymous] [ApiController] [Route($"{PdaHostConst.ROOT_ROUTE}account")] diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/TestController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/TestController.cs new file mode 100644 index 000000000..3c8af2a80 --- /dev/null +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/TestController.cs @@ -0,0 +1,58 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Account; +using Volo.Abp.Application.Services; +using Volo.Abp.AspNetCore.Mvc; +using Win_in.Sfs.Auth.Application.Contracts; +using Win_in.Sfs.Wms.Pda.Authenticaitons; +using Win_in.Sfs.Wms.Pda.Models; +using PdaMenuDto = Win_in.Sfs.Wms.Pda.Models.PdaMenuDto; +using PdaMenuGroupDto = Win_in.Sfs.Wms.Pda.Models.PdaMenuGroupDto; + +namespace Win_in.Sfs.Wms.Pda.Controllers.Accounts; + +/// +/// +/// +[AllowAnonymous] +[ApiController] +[Route($"{PdaHostConst.ROOT_ROUTE}asfasf")] + +public class TestController: AbpController +{ + //private readonly IProfileAppService _profileAppService; + //private readonly ITokenService _tokenService; + private readonly IUserMenuAppService _userMenuAppService; + //private readonly IUserWorkGroupAppService _userWorkGroupAppService; + + /// + /// + /// + /// + /// + /// + /// + public TestController( + IUserMenuAppService userMenuAppService + , IUserWorkGroupAppService userWorkGroupAppService + ) + { + //_profileAppService = profileAppService; + //_tokenService = tokenService; + _userMenuAppService = userMenuAppService; + //_userWorkGroupAppService = userWorkGroupAppService; + } + + /// + /// Test + /// + /// + [HttpGet("Test")] + public virtual async Task> Test() + { + return new List() { "sdfsdf'" }; + } +} diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs index ba84f6c2f..d419ffff3 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/PdaHttpApiHostModule.cs @@ -8,8 +8,10 @@ using Microsoft.AspNetCore.Cors; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.OpenApi.Models; using Polly; using Volo.Abp; +using Volo.Abp.Account; using Volo.Abp.AspNetCore.Mvc.AntiForgery; using Volo.Abp.AspNetCore.Mvc.Client; using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; @@ -149,6 +151,10 @@ public class PdaHttpApiHostModule : AbpModule typeof(AuthApplicationContractsModule).Assembly, "Auth" ); + context.Services.AddHttpClientProxies( + typeof(AbpAccountApplicationContractsModule).Assembly, + "Auth" + ); context.Services.AddHttpClientProxies( typeof(MessageApplicationContractsModule).Assembly, "Message" @@ -274,22 +280,32 @@ public class PdaHttpApiHostModule : AbpModule private void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) { - //context.Services.AddAbpSwaggerGenWithOAuth( - // configuration["IdentityClients:Default:Authority"], - // new Dictionary - // { - // {"Pda", "Pda API"} - // }, - // options => - // { - // options.SwaggerDoc("v1", new OpenApiInfo { Title = "Pda API", Version = "v1" }); - // options.DocInclusionPredicate((docName, description) => true); - // options.CustomSchemaIds(type => type.FullName); + context.Services.AddAbpSwaggerGenWithOAuth( + configuration["IdentityClients:Default:Authority"], + new Dictionary + { + {"Pda", "Pda API"} + }, + options => + { + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Pda API", Version = "v1" }); + options.DocInclusionPredicate((docName, description) => true); + options.CustomSchemaIds(type => type.FullName); - // GetXmlFiles().ForEach(file => - // { - // options.IncludeXmlComments(file); - // }); - // }); + GetXmlFiles().ForEach(file => + { + options.IncludeXmlComments(file); + }); + }); + } + /// + /// 获取当前目录下的xml文档 + /// + /// + private List GetXmlFiles() + { + var basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location); + var docXmlFiles = Directory.GetFiles(basePath, "*.xml"); + return docXmlFiles.ToList(); } } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json index 128b025c3..d0b1693c4 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Development.json @@ -1,10 +1,10 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://localhost:21092", - "env": "dev" - }, + //"AgileConfig": { + // "appId": "sfs", + // "secret": "sfs", + // "nodes": "http://localhost:21092", + // "env": "dev" + //}, "Urls": "http://localhost:59096", //"IdentityClients": { // "Default": { @@ -32,14 +32,14 @@ // //"Auth": { "BaseUrl": "http://dev.ccwin-in.com:59093/" } //} "RemoteServices": { - "Default": { "BaseUrl": "http://dev.ccwin-in.com:59093" }, - "BaseData": { "BaseUrl": "http://localhost:59094/" }, - "Store": { "BaseUrl": "http://localhost:59096/" }, - "Job": { "BaseUrl": "http://localhost:59096/" }, - "Inventory": { "BaseUrl": "http://localhost:59096/" }, - "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - "Message": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - "Label": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, - "Auth": { "BaseUrl": "http://dev.ccwin-in.com:59093/" } + "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }, + "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" }, + "Store": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + "Job": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + "Message": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + "Label": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/" } } } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Production.json b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Production.json deleted file mode 100644 index 7b48f1e71..000000000 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.Production.json +++ /dev/null @@ -1,13 +0,0 @@ -//{内网地址} -----内 网 地 址 -{ - "IdentityClients": { - "Default": { - "GrantType": "client_credentials", - "ClientId": "Auth_App", - "ClientSecret": "1q2w3e*", - "RequireHttps": "false", - "Authority": "http://{发布域名}:59093", - "Scope": "Auth" - } - } -} diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json index 37d0d28ba..d0b1693c4 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/appsettings.json @@ -1,8 +1,45 @@ { - "AgileConfig": { - "appId": "sfs", - "secret": "sfs", - "nodes": "http://config:8848", - "env": "prod" + //"AgileConfig": { + // "appId": "sfs", + // "secret": "sfs", + // "nodes": "http://localhost:21092", + // "env": "dev" + //}, + "Urls": "http://localhost:59096", + //"IdentityClients": { + // "Default": { + // "GrantType": "client_credentials", + // "ClientId": "Auth_App", + // "ClientSecret": "1q2w3e*", + // "RequireHttps": "false", + // "Authority": "http://dev.ccwin-in.com:59093", + // "Scope": "Auth" + // } + //}, + //"RemoteServices": { + // "Default": { "BaseUrl": "http://localhost:59093" }, + // "Auth": { "BaseUrl": "http://localhost:59093/" } + //} + //"RemoteServices": { + // //"Default": { "BaseUrl": "http://dev.ccwin-in.com:59093" }, + // //"BaseData": { "BaseUrl": "http://localhost:59094/" }, + // "Store": { "BaseUrl": "http://localhost:59096/" }, + // "Job": { "BaseUrl": "http://localhost:59096/" }, + // "Inventory": { "BaseUrl": "http://localhost:59096/" } + // //"FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, + // //"Message": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, + // // "Label": { "BaseUrl": "http://dev.ccwin-in.com:59092/" }, + // //"Auth": { "BaseUrl": "http://dev.ccwin-in.com:59093/" } + //} + "RemoteServices": { + "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }, + "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" }, + "Store": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + "Job": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + "Message": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + "Label": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/" } } } diff --git a/be/Modules/Message/src/Win_in.Sfs.Message.Application/MessageApplicationAutoMapperProfile.cs b/be/Modules/Message/src/Win_in.Sfs.Message.Application/MessageApplicationAutoMapperProfile.cs index 97d53fba1..2d5b76e71 100644 --- a/be/Modules/Message/src/Win_in.Sfs.Message.Application/MessageApplicationAutoMapperProfile.cs +++ b/be/Modules/Message/src/Win_in.Sfs.Message.Application/MessageApplicationAutoMapperProfile.cs @@ -11,6 +11,6 @@ public class MessageApplicationAutoMapperProfile : Profile * into multiple profile classes for a better organization. */ new MessageTypeAutoMapperProfile().MessageTypeAutoMapperProfileConfig(); - + new NotifyMessageAutoMapperProfile().NotifyMessageAutoMapperProfileConfig(); } } diff --git a/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageAutoMapperProfile.cs b/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageAutoMapperProfile.cs index b29e386c0..8df3f3732 100644 --- a/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageAutoMapperProfile.cs +++ b/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageAutoMapperProfile.cs @@ -8,7 +8,7 @@ namespace Win_in.Sfs.Message.Application; public class NotifyMessageAutoMapperProfile : Profile { - public NotifyMessageAutoMapperProfile() + public void NotifyMessageAutoMapperProfileConfig() { CreateMap() .IgnoreAuditedObjectProperties() @@ -24,6 +24,12 @@ public class NotifyMessageAutoMapperProfile : Profile .ReverseMap(); CreateMap() + .Ignore(x => x.ConcurrencyStamp) + .Ignore(x => x.ExtraProperties) + .Ignore(x => x.LastModificationTime) + .Ignore(x => x.LastModifierId) + .Ignore(x => x.CreationTime) + .Ignore(x => x.CreatorId) ; } } diff --git a/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageService.cs b/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageService.cs index 7269411a9..77a405f8f 100644 --- a/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageService.cs +++ b/be/Modules/Message/src/Win_in.Sfs.Message.Application/NotifyMessages/NotifyMessageService.cs @@ -28,8 +28,17 @@ public class NotifyMessageService : SfsMessageCrudAppServiceBase CreateAsync(NotifyMessageEditInput input) { var dto = await base.CreateAsync(input).ConfigureAwait(false); - var entity = ObjectMapper.Map(input); + //var entity = ObjectMapper.Map(input); + + var entity = new NotifyMessage(); + entity.MessageType = input.MessageType; + entity.Content=input.Content; + entity.MessageLevel=input.MessageLevel; + entity.Remark=input.Remark; + entity.Title=input.Title; + entity.SendTime=input.SendTime; entity.SetId(dto.Id); + await _userNotifyMessageManager.AddManyAsync(entity).ConfigureAwait(false); return dto; } diff --git a/build/src/docker/publish/settings/appsettings.Development.json b/build/src/docker/publish/settings/appsettings.Development.json index b07d270f1..826168f7c 100644 --- a/build/src/docker/publish/settings/appsettings.Development.json +++ b/build/src/docker/publish/settings/appsettings.Development.json @@ -108,6 +108,17 @@ "Configuration": "dev.ccwin-in.com:21194", "KeyPrefix": "Wms:" }, + // "RemoteServices": { + // "Default": { "BaseUrl": "http://dev.ccwin-in.com:21293/" }, + // "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" }, + // "Store": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + // "Job": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + // "Inventory": { "BaseUrl": "http://dev.ccwin-in.com:21295/" }, + // "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + // "Message": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + // "Label": { "BaseUrl": "http://dev.ccwin-in.com:21292/" }, + // "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/" } + // }, "RemoteServices": { "Auth": { "BaseUrl": "http://dev.ccwin-in.com:21293/"