Merge branch 'master' of https://github.com/metersphere/metersphere

.github/ISSUE_TEMPLATE/v1.6.1-issue.md

@@ -1,8 +1,8 @@
 ---
-name: v1.6.1 问题
-about: 提交关于 v1.6.1 的缺陷与建议，赢取Lv同款鼠标垫！马克杯！文化衫！
-title: "[v1.6.1]"
-labels: v1.6.1
+name: v1.6反馈
+about: 提交关于 v1.6的缺陷与建议，赢取Lv同款鼠标垫！马克杯！文化衫！
+title: "[v1.6]"
+labels: v1.6
 assignees: luty2018
 
 ---

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

@@ -181,11 +181,13 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         }
         // 请求体
         if (!StringUtils.equals(this.getMethod(), "GET")) {
-            List<KeyValue> bodyParams = this.body.getBodyParams(sampler, this.getId());
-            if (this.body.getType().equals("Form Data")) {
-                sampler.setDoMultipart(true);
+            if (this.body != null) {
+                List<KeyValue> bodyParams = this.body.getBodyParams(sampler, this.getId());
+                if (StringUtils.isNotEmpty(this.body.getType()) && this.body.getType().equals("Form Data")) {
+                    sampler.setDoMultipart(true);
+                }
+                sampler.setArguments(httpArguments(bodyParams));
             }
-            sampler.setArguments(httpArguments(bodyParams));
         }
 
         final HashTree httpSamplerTree = tree.add(sampler);

backend/src/main/resources/db/migration/V59__test_plan_add_project_id.sql

@@ -1,4 +1,5 @@
 alter table test_plan add project_id varchar(50) null comment '测试计划所属项目';
+ALTER TABLE api_test_case MODIFY COLUMN name varchar(255) NOT NULL COMMENT 'Test name';
 
 DROP PROCEDURE IF EXISTS test_cursor;
 DELIMITER //

frontend/src/business/components/api/definition/components/response/RequestMetric.vue

@@ -27,7 +27,7 @@
 
     computed: {
       error() {
-        return this.response.responseCode >= 400;
+        return this.response && this.response.responseCode && this.response.responseCode >= 400;
       }
     }
   }

frontend/src/business/components/api/definition/components/response/ResponseResult.vue

@@ -41,7 +41,7 @@
         </div>
         <div class="ms-div">
           Body :
-          <pre>{{response.body}}</pre>
+          <pre>{{response.body ? response.body:""}}</pre>
         </div>
 
       </el-tab-pane>

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -307,7 +307,7 @@ export default {
       rules: {
         name: [
           {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
-          {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
+          {max: 255, message: this.$t('test_track.length_less_than') + '255', trigger: 'blur'}
         ],
         module: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
         maintainer: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],