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 67b2cddde..2a5626e6b 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 @@ -66,23 +66,23 @@ public class UserMenuAppService : [HttpGet("web-menu/{userId}")] public virtual async Task> GetWebMenusOfUserAsync(Guid? userId) { - //var permissions = await GetPermissionsAsync(userId.Value).ConfigureAwait(false); + var permissions = await GetPermissionsAsync(userId.Value).ConfigureAwait(false); - //var menus = await _menuRepository - // .GetListAsync(p => (permissions.Contains(p.Permission) || p.Permission == "skip") - // && p.Portal == WEB_PORTAL - // && p.Status == MenuStatus.Enable).ConfigureAwait(false); - //var dtos = ObjectMapper.Map, List>(menus); - var userMenus = await _repository - .GetListAsync(p => p.UserId == userId); + var menusEntity = await _menuRepository + .GetListAsync(p => (permissions.Contains(p.Permission) || p.Permission == "skip") + && p.Portal == WEB_PORTAL + && p.Status == MenuStatus.Enable).ConfigureAwait(false); + var menus = ObjectMapper.Map, List>(menusEntity); - userMenus = userMenus.Where(p => (int)p.Portal == (int)EnumPortal.Web).ToList(); + //var userMenus = await _repository + // .GetListAsync(p => p.UserId == userId); - var menuCodes = userMenus.Select(p => p.MenuCode).Distinct().ToList(); - var menus = await GetListByPortalAndCodesAsync(WEB_PORTAL, menuCodes); + //userMenus = userMenus.Where(p => (int)p.Portal == (int)EnumPortal.Web).ToList(); - var result = BuildMenuTree(menus); + //var menuCodes = userMenus.Select(p => p.MenuCode).Distinct().ToList(); + //var menus = await GetListByPortalAndCodesAsync(WEB_PORTAL, menuCodes); + var result = BuildMenuTree(menus); return result; } diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json index d238381b7..d2ed45fca 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/appsettings.json @@ -26,8 +26,8 @@ } }, "ConnectionStrings": { - "Default": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", - "Auth": "Server=dev.ccwin-in.com,13319;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" + "Default": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;", + "Auth": "Server=dev.ccwin-in.com,21195;Database=WmsAuth;uid=ccwin-in;pwd=Microsoft@2022;Packet Size=512;" }, "SwaggerAuthServer": { "Authority": "http://localhost:59093", diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotePermissions.cs index 11ba039c7..b459a3cbe 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotePermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotePermissions.cs @@ -14,6 +14,9 @@ public static class IssueNotePermissions //自动发料记录 public const string AutoIssueNote = StorePermissions.GroupName + "." + nameof(AutoIssueNote); + //直接发料 + public const string DirectIssueNote = StorePermissions.GroupName + "." + nameof(DirectIssueNote); + public static void AddIssueNotePermission(this PermissionGroupDefinition permissionGroup) { var issueNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(IssueNote))); @@ -22,5 +25,6 @@ public static class IssueNotePermissions issueNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); permissionGroup.AddPermission(AutoIssueNote, StorePermissionDefinitionProvider.L(nameof(AutoIssueNote))); + permissionGroup.AddPermission(DirectIssueNote, StorePermissionDefinitionProvider.L(nameof(DirectIssueNote))); } } diff --git a/build/src/docker/publish/settings/appsettings.Development.json b/build/src/docker/publish/settings/appsettings.Development.json index c5001b42c..112429fe5 100644 --- a/build/src/docker/publish/settings/appsettings.Development.json +++ b/build/src/docker/publish/settings/appsettings.Development.json @@ -53,25 +53,45 @@ "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;", + // "AbpBlobStoring": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpFeatureManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpIdentity": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpIdentityServer": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpPermissionManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpSettingManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "AbpTenantManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Auth": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Basedata": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "DataExchange": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "FileStorage": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Inventory": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Job": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Label": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Message": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + // "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" + // }, "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;", - "AbpBlobStoring": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "AbpFeatureManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "AbpIdentity": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "AbpIdentityServer": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "AbpPermissionManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "AbpSettingManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "AbpTenantManagement": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Auth": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Basedata": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "DataExchange": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "FileStorage": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Inventory": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Job": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Label": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Message": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", - "Store": "Server=localhost,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" + "AbpAuditLogging": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpBackgroundJobs": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpBlobStoring": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpFeatureManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpIdentity": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpIdentityServer": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpPermissionManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpSettingManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "AbpTenantManagement": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Auth": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Basedata": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "DataExchange": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "FileStorage": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Inventory": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Job": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Label": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Message": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", + "Store": "Server=dev.ccwin-in.com,21195;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" }, "IdentityClients": { "Default": { diff --git a/build/src/docker/publish/settings/appsettings.json b/build/src/docker/publish/settings/appsettings.json index 22c0da293..6dd1cb14f 100644 --- a/build/src/docker/publish/settings/appsettings.json +++ b/build/src/docker/publish/settings/appsettings.json @@ -1,5 +1,7 @@ { + //是否绕过权限验证 "AlwaysAllowAuthorization": "True", + //跨域 "App": { "CorsOrigins": [ "http://localhost:59080", @@ -43,6 +45,7 @@ "http://localhost:9527" ] }, + //ids4的建权服务端配置 "AuthServer": { "Audience": "Auth", "Authority": "http://localhost:21093/", @@ -53,6 +56,18 @@ "SwaggerClientSecret": "1q2w3e*", "UseAuth": "true" }, + //ids4的建权客户端配置 配置要和服务端对应 + "IdentityClients": { + "Default": { + "Authority": "http://localhost:59093", + "ClientId": "Auth_App", + "ClientSecret": "1q2w3E*", + "GrantType": "client_credentials", + "RequireHttps": "false", + "Scope": "Auth" + } + }, + //数据库连接 "Database": "SQLServer", "ConnectionStrings": { "AbpAuditLogging": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", @@ -74,21 +89,14 @@ "Message": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;", "Store": "Server=database,1433;Database=Wms;Uid=sa;Pwd=aA123456!;timeout=6000;" }, - "IdentityClients": { - "Default": { - "Authority": "http://localhost:59093", - "ClientId": "Auth_App", - "ClientSecret": "1q2w3E*", - "GrantType": "client_credentials", - "RequireHttps": "false", - "Scope": "Auth" - } - }, + //多租户 "IsMultiTenancy": "True", + //缓存服务器 "Redis": { "Configuration": "redis:6379", "KeyPrefix": "Wms:" }, + //转发地址配置 "RemoteServices": { "Auth": { "BaseUrl": "http://dev.ccwin-in.com:59093/" diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 839266d33..beaa0e2e6 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -1,12 +1,12 @@ // dev -window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' -window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' -window.SITE_CONFIG['print'] = 'print' -window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082' -window.SITE_CONFIG['warehouseCode'] = 'T8' -window.SITE_CONFIG['company'] = 'DongYang' -window.SITE_CONFIG['client_secret'] = '1q2w3e*' -window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' +// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' +// window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' +// window.SITE_CONFIG['print'] = 'print' +// window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082' +// window.SITE_CONFIG['warehouseCode'] = 'T8' +// window.SITE_CONFIG['company'] = 'DongYang' +// window.SITE_CONFIG['client_secret'] = '1q2w3e*' +// window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' // dev-new // window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' @@ -19,14 +19,14 @@ window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' // window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/' // localhost -// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:59099' -// window.SITE_CONFIG['user'] = 'user' -// window.SITE_CONFIG['print'] = 'print' -// window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082' -// window.SITE_CONFIG['warehouseCode'] = 'T8' -// window.SITE_CONFIG['company'] = 'DongYang' -// window.SITE_CONFIG['client_secret'] = '1q2w3e*' -// window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' +window.SITE_CONFIG['base'] = 'http://localhost:59095' +window.SITE_CONFIG['user'] = 'http://localhost:59093/api' +window.SITE_CONFIG['print'] = 'print' +window.SITE_CONFIG['largeScreen'] = 'http://localhost:59082' +window.SITE_CONFIG['warehouseCode'] = 'T8' +window.SITE_CONFIG['company'] = 'DongYang' +window.SITE_CONFIG['client_secret'] = '1q2w3e*' +window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' // mock // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33' diff --git a/fe/PC/src/views/systemManage/roleManage.vue b/fe/PC/src/views/systemManage/roleManage.vue index d5fcc9849..a9b6eb2e6 100644 --- a/fe/PC/src/views/systemManage/roleManage.vue +++ b/fe/PC/src/views/systemManage/roleManage.vue @@ -553,7 +553,7 @@ export default { }) putpermissionsRoles( - "/api/permission-management/permissions?providerName=R&providerKey=" + + "/permission-management/permissions?providerName=R&providerKey=" + this.multipleSelection[0].name, params ).then((response) => {