Merge branch 'dev' into pr@dev@feat_测试计划支持允许重复关联用例

backend/src/main/resources/db/migration/V98__v1.14.1_release.sql

@@ -1,4 +1,3 @@
-
 ALTER TABLE mock_expect_config ADD COLUMN expect_num varchar(50);
 
 ALTER TABLE test_plan ADD COLUMN repeat_case TINYINT(1) DEFAULT 0 COMMENT '是否允许重复添加用例';
@@ -6,3 +5,8 @@ ALTER TABLE test_plan_api_case DROP INDEX plan_id_case_id;
 ALTER TABLE test_plan_load_case DROP INDEX plan_load_case_id;
 ALTER TABLE test_plan_api_scenario DROP INDEX plan_id_scenario_id;
 
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR', 'WORKSPACE_PROJECT_MANAGER');
+insert into user_group_permission (id, group_id, permission_id, module_id)
+values (UUID(), 'ws_member', 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR', 'WORKSPACE_PROJECT_MANAGER');
+

backend/src/main/resources/permission.json

@@ -195,6 +195,11 @@
       "name": "删除项目",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
+    {
+      "id": "WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR",
+      "name": "上传jar包",
+      "resourceId": "WORKSPACE_PROJECT_MANAGER"
+    },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ",
       "name": "查询环境",

frontend/src/business/components/settings/workspace/MsProject.vue

@@ -6,7 +6,7 @@
                          @search="search" @create="create"
                          :create-tip="btnTips" :title="$t('commons.project')">
           <template v-slot:button>
-            <ms-table-button icon="el-icon-box"
+            <ms-table-button icon="el-icon-box" v-permission="['WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR']"
                              :content="$t('api_test.jar_config.title')" @click="openJarConfig"/>
           </template>
         </ms-table-header>