From 13cef627b6230294822986182ea17abf63c8c2d8 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Fri, 7 Apr 2023 17:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=8E=B7=E5=8F=96pda?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserMenus/UserMenuAppService.cs | 4 +-- .../appsettings.Development.json | 22 ++++++------ .../settings/appsettings.Development.json | 36 +++++++++---------- .../publish/conf/settings/appsettings.json | 6 ++-- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/UserMenus/UserMenuAppService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/UserMenus/UserMenuAppService.cs index 7f955d101..b4ca5d730 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/UserMenus/UserMenuAppService.cs +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/UserMenus/UserMenuAppService.cs @@ -57,7 +57,7 @@ public class UserMenuAppService : public virtual async Task> GetPdaMenusOfUserAsync(Guid? userId) { var userMenus = await _repository - .GetListAsync(p => p.UserId == userId && p.Portal == PDA_PORTAL).ConfigureAwait(false); + .GetListAsync(p => p.UserId == userId && p.Portal == EnumPortal.Pda).ConfigureAwait(false); var menuCodes = userMenus.Select(p => p.MenuCode).Distinct().ToList(); @@ -155,7 +155,7 @@ public class UserMenuAppService : var entities = await _menuRepository .GetListAsync(p => menuCodes.Contains(p.Code)); - entities = entities.Where(p => p.Status == MenuStatus.Enable && p.Portal == EnumPortal.Web).ToList(); + entities = entities.Where(p => p.Status == MenuStatus.Enable && p.Portal == EnumPortal.Pda).ToList(); return ObjectMapper.Map, List>(entities); } 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 aa423658a..10fb7993c 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,13 +1,13 @@ { - "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": { + // "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/build/src/docker/publish/conf/settings/appsettings.Development.json b/build/src/docker/publish/conf/settings/appsettings.Development.json index 38d969c76..c1be1336a 100644 --- a/build/src/docker/publish/conf/settings/appsettings.Development.json +++ b/build/src/docker/publish/conf/settings/appsettings.Development.json @@ -43,16 +43,16 @@ "http://localhost:9527" ] }, - "AuthServer": { - "Audience": "Auth", - "Authority": "http://dev.ccwin-in.com:21293/", - "ClientId": "Auth_App", - "ClientSecret": "1q2w3E*", - "RequireHttpsMetadata": "false", - "SwaggerClientId": "Auth_App", - "SwaggerClientSecret": "1q2w3e*", - "UseAuth": "true" - }, + "AuthServer": { + "Audience": "Auth", + "Authority": "http://dev.ccwin-in.com:21293/", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "Auth_App", + "SwaggerClientSecret": "1q2w3e*", + "UseAuth": "true" + }, // "ConnectionStrings": { // "AbpAuditLogging": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", // "AbpBackgroundJobs": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", @@ -95,12 +95,12 @@ }, "IdentityClients": { "Default": { - "Authority": "http://dev.ccwin-in.com:21293", - "ClientId": "Auth_App", - "ClientSecret": "1q2w3E*", - "GrantType": "client_credentials", - "RequireHttps": "false", - "Scope": "Auth" + "Authority": "http://dev.ccwin-in.com:21293", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "GrantType": "client_credentials", + "RequireHttps": "false", + "Scope": "Auth" } }, "IsMultiTenancy": "True", @@ -110,13 +110,13 @@ }, "RemoteServices": { "Auth": { - "BaseUrl": "http://dev.ccwin-in.com:21293/" + "BaseUrl": "http://dev.ccwin-in.com:21293/" }, "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:21294/" }, "Default": { - "BaseUrl": "http://dev.ccwin-in.com:21293/" + "BaseUrl": "http://dev.ccwin-in.com:21293/" }, "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:21292/" diff --git a/build/src/docker/publish/conf/settings/appsettings.json b/build/src/docker/publish/conf/settings/appsettings.json index 315fb9b4b..dd6801411 100644 --- a/build/src/docker/publish/conf/settings/appsettings.json +++ b/build/src/docker/publish/conf/settings/appsettings.json @@ -48,7 +48,7 @@ //ids4的建权服务端配置 "AuthServer": { "Audience": "Auth", - "Authority": "http://dev.ccwin-in.com:21293/", + "Authority": "http://localhost:59093", "ClientId": "Auth_App", "ClientSecret": "1q2w3E*", "RequireHttpsMetadata": "false", @@ -100,13 +100,13 @@ //转发地址配置 "RemoteServices": { "Auth": { - "BaseUrl": "http://dev.ccwin-in.com:59093/" + "BaseUrl": "http://localhost:59093/" }, "BaseData": { "BaseUrl": "http://dev.ccwin-in.com:59094/" }, "Default": { - "BaseUrl": "http://dev.ccwin-in.com:59093" + "BaseUrl": "http://localhost:59093/" }, "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:59092/"