From 339d9e9a2dbe5a947160580a32e57833d366f161 Mon Sep 17 00:00:00 2001 From: AgAngle <1323481023@qq.com> Date: Fri, 22 Dec 2023 16:43:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=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 --- .../resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql | 5 +++++ .../framework/sdk/src/main/resources/i18n/bug.properties | 4 +++- .../sdk/src/main/resources/i18n/bug_en_US.properties | 1 + .../sdk/src/main/resources/i18n/bug_zh_CN.properties | 3 ++- .../sdk/src/main/resources/i18n/bug_zh_TW.properties | 3 ++- .../sdk/src/main/resources/i18n/commons.properties | 1 + .../sdk/src/main/resources/i18n/commons_en_US.properties | 3 ++- .../sdk/src/main/resources/i18n/commons_zh_CN.properties | 3 ++- .../sdk/src/main/resources/i18n/commons_zh_TW.properties | 3 ++- .../src/main/resources/permission.json | 9 +++++++++ 10 files changed, 29 insertions(+), 6 deletions(-) diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql index 9a98709496..87e7a423fd 100644 --- a/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql +++ b/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql @@ -67,6 +67,7 @@ INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'ORGANIZATION_TEMPLATE:READ+ADD'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'ORGANIZATION_TEMPLATE:READ+UPDATE'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'ORGANIZATION_TEMPLATE:READ+DELETE'); +INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_admin', 'ORGANIZATION_TEMPLATE:READ+ENABLE'); -- 组织成员权限 INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'org_member', 'ORGANIZATION_USER_ROLE:READ'); @@ -100,6 +101,9 @@ INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_FILE_MANAGEMENT:READ+DOWNLOAD'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_FILE_MANAGEMENT:READ+DELETE'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_TEMPLATE:READ'); +INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_TEMPLATE:READ+ADD'); +INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_TEMPLATE:READ+UPDATE'); +INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_TEMPLATE:READ+DELETE'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_MESSAGE:READ'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_MESSAGE:READ+ADD'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_MESSAGE:READ+UPDATE'); @@ -132,6 +136,7 @@ INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'BUG:READ+ADD'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'BUG:READ+UPDATE'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'BUG:READ+DELETE'); +INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'BUG:READ+EXPORT'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_BUG:READ+EXPORT'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_BASE_INFO:READ+UPDATE'); INSERT INTO user_role_permission (id, role_id, permission_id) VALUES (UUID_SHORT(), 'project_admin', 'PROJECT_API_DEBUG:READ'); diff --git a/backend/framework/sdk/src/main/resources/i18n/bug.properties b/backend/framework/sdk/src/main/resources/i18n/bug.properties index ab8d2faad1..c1ae3d1df4 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug.properties @@ -116,4 +116,6 @@ bug.export.system.other.columns.create_user=创建人 bug.export.system.other.columns.create_time=创建时间 bug.export.system.other.columns.case_count=用例数 bug.export.system.other.columns.comment=评论 -bug.export.system.other.columns.platform=所属平台 \ No newline at end of file +bug.export.system.other.columns.platform=所属平台 + +permission.bug.name=缺陷管理 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties index 507d13f8f3..f287dbe00a 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties @@ -117,3 +117,4 @@ bug.export.system.other.columns.create_time=Create time bug.export.system.other.columns.case_count=Case count bug.export.system.other.columns.comment=Comment bug.export.system.other.columns.platform=Platform +permission.bug.name=Bug management \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties index 75f326dd1a..25b4416ebb 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties @@ -116,4 +116,5 @@ bug.export.system.other.columns.create_user=创建人 bug.export.system.other.columns.create_time=创建时间 bug.export.system.other.columns.case_count=用例数 bug.export.system.other.columns.comment=评论 -bug.export.system.other.columns.platform=所属平台 \ No newline at end of file +bug.export.system.other.columns.platform=所属平台 +permission.bug.name=缺陷管理 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties index 759fd51b57..55f285de7b 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties @@ -117,4 +117,5 @@ bug.export.system.other.columns.create_user=創建人 bug.export.system.other.columns.create_time=創建時間 bug.export.system.other.columns.case_count=用例數 bug.export.system.other.columns.comment=評論 -bug.export.system.other.columns.platform=所屬平台 \ No newline at end of file +bug.export.system.other.columns.platform=所屬平台 +permission.bug.name=缺陷管理 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/commons.properties b/backend/framework/sdk/src/main/resources/i18n/commons.properties index 8062e5daa7..bf93a755e8 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons.properties @@ -489,3 +489,4 @@ priority_is_null=用例等级不能为空 apikey_has_expired=ApiKey 已过期 user_key.id.not_blank=ApiKey ID不能为空 expire_time_not_null=过期时间不能为空 +permission.organization.name=组织 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties index c231da98e3..3fc4c35a3e 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties @@ -498,4 +498,5 @@ status_is_null=Status is null priority_is_null=Priority is null apikey_has_expired=ApiKey has expired user_key.id.not_blank=User key id can not blank -expire_time_not_null=Expire time can not null \ No newline at end of file +expire_time_not_null=Expire time can not null +permission.organization.name=Organization \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties index a5db525667..7906ba8179 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties @@ -493,4 +493,5 @@ status_is_null=状态不能为空 priority_is_null=用例等级不能为空 apikey_has_expired=ApiKey 已过期 user_key.id.not_blank=ApiKey ID不能为空 -expire_time_not_null=过期时间不能为空 \ No newline at end of file +expire_time_not_null=过期时间不能为空 +permission.organization.name=组织 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties index b40144bb8f..5bf5677b31 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties @@ -494,4 +494,5 @@ status_is_null=狀態不能為空 priority_is_null=優先級不能為空 apikey_has_expired=ApiKey 已過期 user_key.id.not_blank=ApiKey ID不能为空 -expire_time_not_null=過期時間不能為空 \ No newline at end of file +expire_time_not_null=過期時間不能為空 +permission.organization.name=組織 \ No newline at end of file diff --git a/backend/services/project-management/src/main/resources/permission.json b/backend/services/project-management/src/main/resources/permission.json index 2cae02e764..b8d54f3b33 100644 --- a/backend/services/project-management/src/main/resources/permission.json +++ b/backend/services/project-management/src/main/resources/permission.json @@ -91,6 +91,15 @@ "permissions": [ { "id": "PROJECT_TEMPLATE:READ" + }, + { + "id": "PROJECT_TEMPLATE:READ+ADD" + }, + { + "id": "PROJECT_TEMPLATE:READ+UPDATE" + }, + { + "id": "PROJECT_TEMPLATE:READ+DELETE" } ] },