From 239ae0bfe1fb6dc5132bc3b10fcf8e6308950b0d Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Mon, 22 Nov 2021 18:17:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=EF=BC=88X-PACK=EF=BC=89):=20=E9=A1=B9=E7=9B=AE=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 项目报告增加权限配置 --- .../constants/PermissionConstants.java | 17 +++++++++----- backend/src/main/java/io/metersphere/xpack | 2 +- backend/src/main/resources/permission.json | 22 +++++++++---------- frontend/src/business/components/xpack | 2 +- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java b/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java index 6050569a44..9fee89f756 100644 --- a/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java +++ b/backend/src/main/java/io/metersphere/commons/constants/PermissionConstants.java @@ -8,12 +8,12 @@ public class PermissionConstants { public static final String SYSTEM_USER_READ_EDIT = "SYSTEM_USER:READ+EDIT"; public static final String SYSTEM_USER_READ_DELETE = "SYSTEM_USER:READ+DELETE"; public static final String SYSTEM_USER_READ_EDIT_PASSWORD = "SYSTEM_USER:READ+EDIT_PASSWORD"; - + public static final String SYSTEM_ORGANIZATION_READ = "SYSTEM_ORGANIZATION:READ"; public static final String SYSTEM_ORGANIZATION_READ_CREATE = "SYSTEM_ORGANIZATION:READ+CREATE"; public static final String SYSTEM_ORGANIZATION_READ_EDIT = "SYSTEM_ORGANIZATION:READ+EDIT"; public static final String SYSTEM_ORGANIZATION_READ_DELETE = "SYSTEM_ORGANIZATION:READ+DELETE"; - + public static final String SYSTEM_WORKSPACE_READ = "SYSTEM_WORKSPACE:READ"; public static final String SYSTEM_WORKSPACE_READ_CREATE = "SYSTEM_WORKSPACE:READ+CREATE"; public static final String SYSTEM_WORKSPACE_READ_EDIT = "SYSTEM_WORKSPACE:READ+EDIT"; @@ -29,7 +29,7 @@ public class PermissionConstants { public static final String SYSTEM_GROUP_READ_EDIT = "SYSTEM_GROUP:READ+EDIT"; public static final String SYSTEM_GROUP_READ_SETTING_PERMISSION = "SYSTEM_GROUP:READ+SETTING_PERMISSION"; public static final String SYSTEM_GROUP_READ_DELETE = "SYSTEM_GROUP:READ+DELETE"; - + public static final String SYSTEM_SETTING_READ = "SYSTEM_SETTING:READ"; public static final String SYSTEM_SETTING_READ_EDIT = "SYSTEM_SETTING:READ+EDIT"; public static final String SYSTEM_SETTING_READ_AUTH_MANAGE = "SYSTEM_SETTING:READ+AUTH_MANAGE"; @@ -38,13 +38,13 @@ public class PermissionConstants { public static final String SYSTEM_AUTH_READ = "SYSTEM_AUTH:READ"; public static final String SYSTEM_AUTH_READ_EDIT = "SYSTEM_AUTH:READ+EDIT"; - + public static final String WORKSPACE_SERVICE_READ = "WORKSPACE_SERVICE:READ"; public static final String WORKSPACE_SERVICE_READ_EDIT = "WORKSPACE_SERVICE:READ+EDIT"; public static final String WORKSPACE_MESSAGE_READ = "WORKSPACE_MESSAGE:READ"; public static final String WORKSPACE_MESSAGE_READ_EDIT = "WORKSPACE_MESSAGE:READ+EDIT"; - - + + public static final String WORKSPACE_USER_READ = "WORKSPACE_USER:READ"; public static final String WORKSPACE_USER_READ_CREATE = "WORKSPACE_USER:READ+CREATE"; public static final String WORKSPACE_USER_READ_EDIT = "WORKSPACE_USER:READ+EDIT"; @@ -171,4 +171,9 @@ public class PermissionConstants { public static final String PROJECT_PERFORMANCE_REPORT_READ_DELETE = "PROJECT_PERFORMANCE_REPORT:READ+DELETE"; public static final String PROJECT_PERFORMANCE_REPORT_READ_EXPORT = "PROJECT_PERFORMANCE_REPORT:READ+EXPORT"; + public static final String PROJECT_ENTERPRISE_REPORT_EXPORT = "PROJECT_ENTERPRISE_REPORT:READ+EXPORT"; + public static final String PROJECT_ENTERPRISE_REPORT_CREATE = "PROJECT_ENTERPRISE_REPORT:READ+CREATE"; + public static final String PROJECT_ENTERPRISE_REPORT_EDIT = "PROJECT_ENTERPRISE_REPORT:READ+EDIT"; + public static final String PROJECT_ENTERPRISE_REPORT_DELETE = "PROJECT_ENTERPRISE_REPORT:READ+DELETE"; + public static final String PROJECT_ENTERPRISE_REPORT_COPY = "PROJECT_ENTERPRISE_REPORT:READ+COPY"; } diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index da4f782aa0..563795dead 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit da4f782aa0541e7278a960ba7acf793106783288 +Subproject commit 563795dead1d056385eafd68e68e307dbf4e82e8 diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json index 53e509d8b4..d0fe818b00 100644 --- a/backend/src/main/resources/permission.json +++ b/backend/src/main/resources/permission.json @@ -840,33 +840,33 @@ "resourceId": "SYSTEM_PLUGIN" }, { - "id": "ENTERPRISE_REPORT:READ+EXPORT", + "id": "PROJECT_ENTERPRISE_REPORT:READ+EXPORT", "name": "发送邮件", - "resourceId": "ENTERPRISE_REPORT", + "resourceId": "PROJECT_ENTERPRISE_REPORT", "license": true }, { - "id": "ENTERPRISE_REPORT:READ+CREATE", + "id": "PROJECT_ENTERPRISE_REPORT:READ+CREATE", "name": "创建报告", - "resourceId": "ENTERPRISE_REPORT", + "resourceId": "PROJECT_ENTERPRISE_REPORT", "license": true }, { - "id": "ENTERPRISE_REPORT:READ+DELETE", + "id": "PROJECT_ENTERPRISE_REPORT:READ+DELETE", "name": "删除报告", - "resourceId": "ENTERPRISE_REPORT", + "resourceId": "PROJECT_ENTERPRISE_REPORT", "license": true }, { - "id": "ENTERPRISE_REPORT:READ+COPY", + "id": "PROJECT_ENTERPRISE_REPORT:READ+COPY", "name": "复制报告", - "resourceId": "ENTERPRISE_REPORT", + "resourceId": "PROJECT_ENTERPRISE_REPORT", "license": true }, { - "id": "ENTERPRISE_REPORT:READ+EDIT", + "id": "PROJECT_ENTERPRISE_REPORT:READ+EDIT", "name": "修改报告", - "resourceId": "ENTERPRISE_REPORT", + "resourceId": "PROJECT_ENTERPRISE_REPORT", "license": true } ], @@ -1004,7 +1004,7 @@ "name": "报表" }, { - "id": "ENTERPRISE_REPORT", + "id": "PROJECT_ENTERPRISE_REPORT", "name": "项目报告" }, { diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index d1b44c0a5f..3da00ab5e5 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit d1b44c0a5f6dfabf791a7c3176b3f8422236b547 +Subproject commit 3da00ab5e55cf0dffc26e6230fbd9db4bde1e47e