From ab518b056a1e2571713fc6ff1fa45dc7d5d3421d Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Tue, 16 Apr 2024 10:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Permissions=20=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PageLock/PageLockPermissions.cs | 8 ++------ .../ContainerNotes/ContainerNotePermissions.cs | 7 ------- .../Notes/MesNotes/MesNotePermissions.cs | 4 ---- .../Notes/MesNotes/MesRecordPermissions.cs | 4 ---- .../Notes/ScrapNotes/ScrapNotePermissions.cs | 4 ---- .../Win_in.Sfs.Wms.Store.Domain.csproj | 1 + .../conf/settings/appsettings.Development.json | 14 +++++++++----- 7 files changed, 12 insertions(+), 30 deletions(-) diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/PageLock/PageLockPermissions.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/PageLock/PageLockPermissions.cs index 9df8b09df..12520a9b4 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/PageLock/PageLockPermissions.cs +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/PageLock/PageLockPermissions.cs @@ -11,17 +11,13 @@ public static class PageLockPermissions public const string Update = Default + "." + AuthPermissions.UpdateStr; public const string Delete = Default + "." + AuthPermissions.DeleteStr; - //POA菜单 - public const string PageLock = AuthPermissions.GroupName + "." + nameof(PageLock); public static void AddPageLockPermission(this PermissionGroupDefinition permissionGroup) { - var PageLockPermission = permissionGroup.AddPermission(Default, AuthPermissionDefinitionProvider.L(nameof(PageLock))); + var PageLockPermission = + permissionGroup.AddPermission(Default, AuthPermissionDefinitionProvider.L(nameof(PageLock))); PageLockPermission.AddChild(Create, AuthPermissionDefinitionProvider.L(AuthPermissions.CreateStr)); PageLockPermission.AddChild(Update, AuthPermissionDefinitionProvider.L(AuthPermissions.UpdateStr)); PageLockPermission.AddChild(Delete, AuthPermissionDefinitionProvider.L(AuthPermissions.DeleteStr)); - - permissionGroup.AddPermission(PageLock, AuthPermissionDefinitionProvider.L(nameof(PageLock))); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs index 6b08a7689..b4e252c6d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ContainerNotes/ContainerNotePermissions.cs @@ -10,18 +10,11 @@ public static class ContainerNotePermissions public const string Update = Default + "." + StorePermissions.UpdateStr; public const string Delete = Default + "." + StorePermissions.DeleteStr; - - //器具呼叫记录 - public const string ContainerNote = StorePermissions.GroupName + "." + nameof(ContainerNote); - public static void AddContainerNotePermission(this PermissionGroupDefinition permissionGroup) { var ContainerNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ContainerNote))); ContainerNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); ContainerNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); ContainerNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(ContainerNote, StorePermissionDefinitionProvider.L(nameof(ContainerNote))); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesNotePermissions.cs index 42a48c72f..d98126ce2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesNotePermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesNotePermissions.cs @@ -22,9 +22,5 @@ public static class MesNotePermissions scrapNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L(nameof(ProductScrapNote))); - permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L(nameof(WipScrapNote))); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesRecordPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesRecordPermissions.cs index 22fee4186..8a947500f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesRecordPermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/MesNotes/MesRecordPermissions.cs @@ -22,9 +22,5 @@ public static class MesRecordPermissions scrapNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L(nameof(ProductScrapNote))); - permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L(nameof(WipScrapNote))); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs index 146780077..957de7382 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs @@ -22,9 +22,5 @@ public static class ScrapNotePermissions scrapNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L(nameof(ProductScrapNote))); - permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L(nameof(WipScrapNote))); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Win_in.Sfs.Wms.Store.Domain.csproj b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Win_in.Sfs.Wms.Store.Domain.csproj index 408c88456..d228424bd 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Win_in.Sfs.Wms.Store.Domain.csproj +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Win_in.Sfs.Wms.Store.Domain.csproj @@ -42,6 +42,7 @@ + diff --git a/build/src/docker/publish/conf/settings/appsettings.Development.json b/build/src/docker/publish/conf/settings/appsettings.Development.json index a8e489fe5..6bde764e0 100644 --- a/build/src/docker/publish/conf/settings/appsettings.Development.json +++ b/build/src/docker/publish/conf/settings/appsettings.Development.json @@ -45,7 +45,8 @@ }, "AuthServer": { "Audience": "Auth", - "Authority": "http://dev.ccwin-in.com:60083/", + //"Authority": "http://dev.ccwin-in.com:60083/", + "Authority": "http://localhost:59093/", "ClientId": "Auth_App", "ClientSecret": "1q2w3E*", "RequireHttpsMetadata": "false", @@ -95,7 +96,8 @@ }, "IdentityClients": { "Default": { - "Authority": "http://dev.ccwin-in.com:60083", + //"Authority": "http://dev.ccwin-in.com:60083", + "Authority": "http://localhost:59093", "ClientId": "Auth_App", "ClientSecret": "1q2w3E*", "GrantType": "client_credentials", @@ -111,14 +113,16 @@ }, "RemoteServices": { "Auth": { - "BaseUrl": "http://dev.ccwin-in.com:60083/" + //"BaseUrl": "http://dev.ccwin-in.com:60083/" + "BaseUrl": "http://localhost:59093/" }, "BaseData": { - "BaseUrl": "http://localhost:59094/" //"BaseUrl": "http://dev.ccwin-in.com:60084/" + "BaseUrl": "http://localhost:59094/" }, "Default": { - "BaseUrl": "http://dev.ccwin-in.com:60083/" + //"BaseUrl": "http://dev.ccwin-in.com:60083/" + "BaseUrl": "http://localhost:59093/" }, "FileStorage": { "BaseUrl": "http://dev.ccwin-in.com:60082/"