Merge branch 'dev' into pr@dev@fix_文件上传接口优化

backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java

@@ -11,6 +11,7 @@ import io.metersphere.api.dto.definition.request.MsScenario;
 import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.definition.request.assertions.*;
 import io.metersphere.api.dto.definition.request.controller.MsLoopController;
+import io.metersphere.api.dto.definition.request.controller.MsTransactionController;
 import io.metersphere.api.dto.definition.request.controller.loop.CountController;
 import io.metersphere.api.dto.definition.request.controller.loop.MsForEachController;
 import io.metersphere.api.dto.definition.request.controller.loop.MsWhileController;
@@ -53,6 +54,7 @@ import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.control.ForeachController;
 import org.apache.jmeter.control.LoopController;
+import org.apache.jmeter.control.TransactionController;
 import org.apache.jmeter.control.WhileController;
 import org.apache.jmeter.extractor.JSR223PostProcessor;
 import org.apache.jmeter.extractor.RegexExtractor;
@@ -742,6 +744,12 @@ public class MsJmeterParser extends ApiImportAbstractParser<ScenarioImport> {
                 countController.setInputVal(foreachController.getInputValString());
                 countController.setReturnVal(foreachController.getReturnValString());
                 ((MsLoopController) elementNode).setForEachController(countController);
+            }else if(key instanceof TransactionController){
+                TransactionController transactionController = (TransactionController) key;
+                elementNode = new MsTransactionController();
+                elementNode.setName(transactionController.getName());
+                ((MsTransactionController)elementNode).setGenerateParentSample(transactionController.isGenerateParentSample());
+                ((MsTransactionController)elementNode).setIncludeTimers(transactionController.isIncludeTimers());
             }
             // 平台不能识别的Jmeter步骤
             else {

backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java

@@ -197,6 +197,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         }
 
         compatible(config);
+
         HttpConfig httpConfig = null;
         try {
             if (config.isEffective(this.getProjectId())) {
@@ -204,6 +205,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 if (httpConfig == null && !isURL(this.getUrl())) {
                     MSException.throwException("未匹配到环境，请检查环境配置");
                 }
+                if(StringUtils.isEmpty(httpConfig.getProtocol())){
+                    MSException.throwException(this.getName() +"接口，对应的环境无协议，请完善环境信息");
+                }
                 if (StringUtils.isEmpty(this.useEnvironment)) {
                     this.useEnvironment = config.getConfig().get(this.getProjectId()).getApiEnvironmentid();
                 }
@@ -428,11 +432,11 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         }
 
         // 数据兼容处理
-        if (config.getConfig() != null && config.getConfig().containsKey(getParentProjectId())) {
+        if (config.getConfig() != null && StringUtils.isNotEmpty(this.getProjectId()) && config.getConfig().containsKey(this.getProjectId())) {
+            // 1.8 之后 当前正常数据
+        } else if (config.getConfig() != null && config.getConfig().containsKey(getParentProjectId())) {
             // 1.8 前后 混合数据
             this.setProjectId(getParentProjectId());
-        } else if (config.getConfig() != null && StringUtils.isNotEmpty(this.getProjectId()) && config.getConfig().containsKey(this.getProjectId())) {
-            // 1.8 之后 当前正常数据
         } else {
             // 1.8 之前 数据
             if (config.getConfig() != null) {

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -883,7 +883,6 @@ public class ApiAutomationService {
             request.setTriggerMode(ReportTriggerMode.MANUAL.name());
         }
         String reportId = request.getId();
-
         Map<APIScenarioReportResult, HashTree> map = new LinkedHashMap<>();
         List<String> scenarioIds = new ArrayList<>();
         StringBuilder scenarioNames = new StringBuilder();

backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java

@@ -568,9 +568,11 @@ public class ApiDefinitionService {
         Map<String, String> map = request.getEnvironmentMap();
         if (map != null && map.size() > 0) {
             ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(request.getProjectId()));
-            EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
-            envConfig.put(request.getProjectId(), env);
-            config.setConfig(envConfig);
+            if (environment != null) {
+                EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+                envConfig.put(request.getProjectId(), env);
+                config.setConfig(envConfig);
+            }
         }
 
         if (CollectionUtils.isNotEmpty(bodyFiles)) {

backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java

@@ -326,8 +326,12 @@ public class ApiScenarioReportService {
      */
     private void updateScenarioStatus(String reportId) {
         if (StringUtils.isNotEmpty(reportId)) {
-            List<String> list = new ArrayList<>();
-            list.add(reportId);
+            List<String> list = new LinkedList<>();
+            try {
+                list = JSON.parseObject(reportId, List.class);
+            } catch (Exception e) {
+                list.add(reportId);
+            }
             ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample();
             scenarioReportExample.createCriteria().andIdIn(list);
             List<ApiScenarioReport> reportList = apiScenarioReportMapper.selectByExample(scenarioReportExample);
@@ -336,7 +340,7 @@ public class ApiScenarioReportService {
             if (CollectionUtils.isNotEmpty(reportList)) {
                 reportList.forEach(report -> {
                     report.setUpdateTime(System.currentTimeMillis());
-                    String status = "Success";
+                    String status = "Error";
                     report.setStatus(status);
                     scenarioReportMapper.updateByPrimaryKeySelective(report);
                     // 把上一条调试的数据内容清空

backend/src/main/java/io/metersphere/api/service/task/ParallelScenarioExecTask.java

@@ -3,7 +3,6 @@
  */
 package io.metersphere.api.service.task;
 
-import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.commons.exception.MSException;
@@ -28,7 +27,7 @@ public class ParallelScenarioExecTask<T> implements Callable<T> {
     @Override
     public T call() {
         try {
-            jMeterService.runSerial(JSON.toJSONString(id), hashTree, request.getReportId(), request.getRunMode(), request.getConfig());
+            jMeterService.runSerial(id, hashTree, request.getReportId(), request.getRunMode(), request.getConfig());
             return null;
         } catch (Exception ex) {
             LogUtil.error(ex.getMessage());

backend/src/main/java/io/metersphere/api/service/task/SerialScenarioExecTask.java

@@ -3,7 +3,6 @@
  */
 package io.metersphere.api.service.task;
 
-import com.alibaba.fastjson.JSON;
 import io.metersphere.api.dto.automation.RunScenarioRequest;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.ApiScenarioReport;
@@ -34,7 +33,7 @@ public class SerialScenarioExecTask<T> implements Callable<T> {
     @Override
     public T call() {
         try {
-            jMeterService.runSerial(JSON.toJSONString(id), hashTree, request.getReportId(), request.getRunMode(), request.getConfig());
+            jMeterService.runSerial(id, hashTree, request.getReportId(), request.getRunMode(), request.getConfig());
             // 轮询查看报告状态，最多200次，防止死循环
             int index = 1;
             while (index < 200) {

backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.java

@@ -13,4 +13,6 @@ public interface ExtProjectMapper {
     List<String> getProjectIdByWorkspaceId(String workspaceId);
 
     int removeIssuePlatform(@Param("platform") String platform, @Param("orgId") String orgId);
+
+    List<ProjectDTO> getSwitchProject(@Param("proRequest") ProjectRequest request);
 }

backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml

@@ -82,6 +82,17 @@
           from project
           where workspace_id = #{workspaceId}
     </select>
+    <select id="getSwitchProject" resultType="io.metersphere.dto.ProjectDTO">
+        select distinct p.* from `group` g join user_group ug on g.id = ug.group_id
+        join project p on p.id = ug.source_id
+        <where>
+            g.type = 'PROJECT' and ug.user_id = #{proRequest.userId}
+            and p.workspace_id = #{proRequest.workspaceId}
+            <if test="proRequest.name != null and proRequest.name != ''">
+                and p.name like #{proRequest.name, jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
 
     <update id="removeIssuePlatform">
         update project

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml

@@ -126,7 +126,7 @@
     </select>
 
     <select id="getTestCaseNames" resultType="io.metersphere.base.domain.TestCase">
-        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status
+        select test_case.id, test_case.name, test_case.priority, test_case.type, test_case.review_status,test_case.num,test_case.custom_num
         from test_case
         <where>
             <if test="request.combine != null">

backend/src/main/java/io/metersphere/commons/constants/OperLogConstants.java

 package io.metersphere.commons.constants;
 
 public enum OperLogConstants {
-    CREATE, DELETE, GC, RESTORE, DEBUG, UPDATE, BATCH_DEL, BATCH_UPDATE, BATCH_ADD, BATCH_RESTORE, BATCH_GC, IMPORT, EXPORT, ASSOCIATE_CASE, UN_ASSOCIATE_CASE, REVIEW, COPY, EXECUTE, SHARE, LOGIN, CREATE_PRE_TEST, OTHER
+    CREATE, DELETE, GC, RESTORE, DEBUG, UPDATE, BATCH_DEL, BATCH_UPDATE, BATCH_ADD, BATCH_RESTORE, BATCH_GC, IMPORT, EXPORT, ASSOCIATE_CASE, ASSOCIATE_ISSUE, UN_ASSOCIATE_CASE, REVIEW, COPY, EXECUTE, SHARE, LOGIN, CREATE_PRE_TEST, OTHER
 }

backend/src/main/java/io/metersphere/controller/OrganizationController.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.Organization;
 import io.metersphere.commons.constants.OperLogConstants;
-import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.OrganizationRequest;
@@ -13,8 +12,6 @@ import io.metersphere.dto.OrganizationResource;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.service.OrganizationService;
 import io.metersphere.service.UserService;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -67,7 +64,7 @@ public class OrganizationController {
     }
 
     @PostMapping("/member/update")
-    @MsAuditLog(module = "organization_member", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#memberDTO.id)", content = "#msClass.getLogDetails(#memberDTO.id)", msClass = OrganizationService.class)
+    @MsAuditLog(module = "organization_member", type = OperLogConstants.UPDATE, content = "#msClass.getLogDetails(#memberDTO)", msClass = OrganizationService.class)
     public void updateOrgMember(@RequestBody OrganizationMemberDTO memberDTO) {
         organizationService.updateOrgMember(memberDTO);
     }

backend/src/main/java/io/metersphere/controller/ProjectController.java

@@ -90,6 +90,18 @@ public class ProjectController {
         return PageUtils.setPageInfo(page, projectService.getProjectList(request));
     }
 
+    /**
+     * 切换项目
+     * @param request
+     * @return
+     */
+    @PostMapping("/list/related")
+    public List<ProjectDTO> getSwitchProject(@RequestBody ProjectRequest request) {
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return projectService.getSwitchProject(request);
+    }
+
+
     @GetMapping("/delete/{projectId}")
     @MsAuditLog(module = "project_project_manager", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#projectId)", msClass = ProjectService.class)
     public void deleteProject(@PathVariable(value = "projectId") String projectId) {

backend/src/main/java/io/metersphere/controller/UserController.java

@@ -83,7 +83,7 @@ public class UserController {
     }
 
     @PostMapping("/special/update")
-    @MsAuditLog(module = "system_user", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#user.id)", content = "#msClass.getLogDetails(#user.id)", msClass = UserService.class)
+    @MsAuditLog(module = "system_user", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#user)", content = "#msClass.getLogDetails(#user)", msClass = UserService.class)
     public void updateUser(@RequestBody UserRequest user) {
         userService.updateUserRole(user);
     }
@@ -254,7 +254,7 @@ public class UserController {
      * 添加组织成员
      */
     @PostMapping("/org/member/add")
-    @MsAuditLog(module = "organization_member", type = OperLogConstants.CREATE, title = "添加组织成员")
+    @MsAuditLog(module = "organization_member", type = OperLogConstants.CREATE, title = "'添加组织成员-'+#request.userIds")
     public void addOrganizationMember(@RequestBody AddOrgMemberRequest request) {
         organizationService.checkOrgOwner(request.getOrganizationId());
         userService.addOrganizationMember(request);
@@ -331,6 +331,7 @@ public class UserController {
     }
 
     @PostMapping("/import/{userId}")
+    @MsAuditLog(module = "system_user", type = OperLogConstants.IMPORT)
     public ExcelResponse testCaseImport(MultipartFile file, @PathVariable String userId, HttpServletRequest request) {
         return userService.userImport(file, userId, request);
     }

backend/src/main/java/io/metersphere/controller/WorkspaceController.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.Workspace;
 import io.metersphere.commons.constants.OperLogConstants;
-import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
 import io.metersphere.commons.utils.SessionUtils;
@@ -15,8 +14,6 @@ import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.service.OrganizationService;
 import io.metersphere.service.UserService;
 import io.metersphere.service.WorkspaceService;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -65,7 +62,7 @@ public class WorkspaceController {
     }
 
     @GetMapping("special/delete/{workspaceId}")
-    @MsAuditLog(module = "system_workspace", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#workspaceId)",  msClass = WorkspaceService.class)
+    @MsAuditLog(module = "system_workspace", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#workspaceId)", msClass = WorkspaceService.class)
     public void deleteWorkspaceByAdmin(@PathVariable String workspaceId) {
         userService.refreshSessionUser("workspace", workspaceId);
         workspaceService.deleteWorkspace(workspaceId);
@@ -104,7 +101,7 @@ public class WorkspaceController {
     }
 
     @PostMapping("/member/update")
-    @MsAuditLog(module = "workspace_member", type = OperLogConstants.UPDATE, title = "#memberDTO.name")
+    @MsAuditLog(module = "workspace_member", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#memberDTO)", content = "#msClass.getLogDetails(#memberDTO)", msClass = WorkspaceService.class)
     public void updateOrgMember(@RequestBody WorkspaceMemberDTO memberDTO) {
         workspaceService.updateWorkspaceMember(memberDTO);
     }

backend/src/main/java/io/metersphere/controller/request/ProjectRequest.java

@@ -11,6 +11,7 @@ import java.util.Map;
 public class ProjectRequest {
     private String workspaceId;
     private String projectId;
+    private String userId;
     private String name;
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;

backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelData.java

@@ -4,10 +4,15 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Getter
 @Setter
 public class TestCaseExcelData {
 
+    private String id;
+
     @ExcelIgnore
     private Integer num;
     @ExcelIgnore
@@ -32,4 +37,14 @@ public class TestCaseExcelData {
     private String stepResult;
     @ExcelIgnore
     private String stepModel;
+
+    public Set<String> getExcludeColumnFiledNames(boolean needNum){
+        Set<String> excludeColumnFiledNames = new HashSet<>();
+        if(!needNum){
+            excludeColumnFiledNames.add("num");
+        }
+        excludeColumnFiledNames.add("customNum");
+
+        return excludeColumnFiledNames;
+    }
 }

backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java

@@ -13,12 +13,12 @@ import javax.validation.constraints.Pattern;
 @ColumnWidth(15)
 public class TestCaseExcelDataCn extends TestCaseExcelData {
 
-    @ExcelProperty("ID")
-    @NotRequired
-    private Integer num;
+//    @ExcelProperty("ID")
+//    @NotRequired
+//    private Integer num;
 
     @ColumnWidth(50)
-    @ExcelProperty("自定义ID")
+    @ExcelProperty("ID")
     @NotRequired
     private String customNum;
 

backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataFactory.java

@@ -15,4 +15,14 @@ public class TestCaseExcelDataFactory implements ExcelDataFactory {
         }
         return TestCaseExcelDataCn.class;
     }
+
+    public TestCaseExcelData getTestCaseExcelDataLocal(){
+        Locale locale = LocaleContextHolder.getLocale();
+        if (Locale.US.toString().equalsIgnoreCase(locale.toString())) {
+            return new TestCaseExcelDataUs();
+        } else if (Locale.TRADITIONAL_CHINESE.toString().equalsIgnoreCase(locale.toString())) {
+            return new TestCaseExcelDataTw();
+        }
+        return new TestCaseExcelDataCn();
+    }
 }

backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataTw.java

@@ -13,12 +13,12 @@ import javax.validation.constraints.Pattern;
 @ColumnWidth(15)
 public class TestCaseExcelDataTw extends TestCaseExcelData {
 
-    @ExcelProperty("ID")
-    @NotRequired
-    private Integer num;
+//    @ExcelProperty("ID")
+//    @NotRequired
+//    private Integer num;
 
     @ColumnWidth(50)
-    @ExcelProperty("自定義ID")
+    @ExcelProperty("ID")
     @NotRequired
     private String customNum;