Merge branch 'master' of github.com:fit2cloudrd/metersphere-server

README.md

@@ -167,6 +167,11 @@ curl -sSL https://github.com/metersphere/metersphere/releases/latest/download/qu
 - 基础设施: [Docker](https://www.docker.com/), [Kubernetes](https://kubernetes.io/)
 - 测试引擎: [JMeter](https://jmeter.apache.org/)
 
+## 加入 MeterSphere 团队
+我们正在招聘 MeterSphere 技术布道师，一起打造开源明星项目，请发简历到 metersphere@fit2cloud.com
+
+点击查看 [岗位详情](https://www.zhipin.com/job_detail/b151c4b3d594688733Ny3dy1GFI~.html)
+
 ## 微信群
 
 ![wechat-group](https://metersphere.io/images/contact/wechat-group.png)

backend/src/main/java/io/metersphere/base/domain/TestCase.java

@@ -33,5 +33,7 @@ public class TestCase implements Serializable {
 
     private Integer sort;
 
+    private Integer num;
+
     private static final long serialVersionUID = 1L;
 }

backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java

@@ -1053,6 +1053,66 @@ public class TestCaseExample {
             addCriterion("sort not between", value1, value2, "sort");
             return (Criteria) this;
         }
+
+        public Criteria andNumIsNull() {
+            addCriterion("num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIsNotNull() {
+            addCriterion("num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumEqualTo(Integer value) {
+            addCriterion("num =", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotEqualTo(Integer value) {
+            addCriterion("num <>", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThan(Integer value) {
+            addCriterion("num >", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("num >=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThan(Integer value) {
+            addCriterion("num <", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThanOrEqualTo(Integer value) {
+            addCriterion("num <=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIn(List<Integer> values) {
+            addCriterion("num in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotIn(List<Integer> values) {
+            addCriterion("num not in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumBetween(Integer value1, Integer value2) {
+            addCriterion("num between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("num not between", value1, value2, "num");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml

@@ -16,6 +16,7 @@
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="test_id" jdbcType="VARCHAR" property="testId" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="num" jdbcType="INTEGER" property="num" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestCaseWithBLOBs">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -81,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`, 
-    prerequisite, create_time, update_time, test_id, sort
+    prerequisite, create_time, update_time, test_id, sort, num
   </sql>
   <sql id="Blob_Column_List">
     remark, steps
@@ -139,14 +140,14 @@
       project_id, `name`, `type`, 
       maintainer, priority, `method`, 
       prerequisite, create_time, update_time, 
-      test_id, sort, remark, 
+      test_id, sort, num, 
-      steps)
+      remark, steps)
     values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR}, 
       #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
       #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, 
       #{prerequisite,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{testId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{remark,jdbcType=LONGVARCHAR}, 
+      #{testId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, 
-      #{steps,jdbcType=LONGVARCHAR})
+      #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestCaseWithBLOBs">
     insert into test_case
@@ -193,6 +194,9 @@
       <if test="sort != null">
         sort,
       </if>
+      <if test="num != null">
+        num,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -243,6 +247,9 @@
       <if test="sort != null">
         #{sort,jdbcType=INTEGER},
       </if>
+      <if test="num != null">
+        #{num,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -302,6 +309,9 @@
       <if test="record.sort != null">
         sort = #{record.sort,jdbcType=INTEGER},
       </if>
+      <if test="record.num != null">
+        num = #{record.num,jdbcType=INTEGER},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -329,6 +339,7 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       test_id = #{record.testId,jdbcType=VARCHAR},
       sort = #{record.sort,jdbcType=INTEGER},
+      num = #{record.num,jdbcType=INTEGER},
       remark = #{record.remark,jdbcType=LONGVARCHAR},
       steps = #{record.steps,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -350,7 +361,8 @@
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       test_id = #{record.testId,jdbcType=VARCHAR},
-      sort = #{record.sort,jdbcType=INTEGER}
+      sort = #{record.sort,jdbcType=INTEGER},
+      num = #{record.num,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -397,6 +409,9 @@
       <if test="sort != null">
         sort = #{sort,jdbcType=INTEGER},
       </if>
+      <if test="num != null">
+        num = #{num,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -421,6 +436,7 @@
       update_time = #{updateTime,jdbcType=BIGINT},
       test_id = #{testId,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=INTEGER},
+      num = #{num,jdbcType=INTEGER},
       remark = #{remark,jdbcType=LONGVARCHAR},
       steps = #{steps,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -439,7 +455,8 @@
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       test_id = #{testId,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER}
+      sort = #{sort,jdbcType=INTEGER},
+      num = #{num,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -17,4 +17,6 @@ public interface ExtTestCaseMapper {
 
     List<TestCaseDTO> listBytestCaseIds(@Param("request")  QueryTestCaseRequest request);
 
+    TestCase getMaxNumByProjectId(@Param("projectId") String projectId);
+
 }

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

@@ -188,7 +188,8 @@
         </where>
     </select>
     <select id="listBytestCaseIds" resultType="io.metersphere.track.dto.TestCaseDTO">
-        select test_case.*,api_test.name as apiName,load_test.name AS performName from test_case  left join  api_test on test_case.test_id=api_test.id left join load_test on test_case.test_id=load_test.id
+        select test_case.*,api_test.name as apiName,load_test.name AS performName from test_case left join api_test on
+        test_case.test_id=api_test.id left join load_test on test_case.test_id=load_test.id
         <where>
             <if test="request.testCaseIds!=null and request.testCaseIds.size() > 0">
                 and test_case.id in
@@ -198,4 +199,8 @@
             </if>
         </where>
     </select>
+
+    <select id="getMaxNumByProjectId" resultType="io.metersphere.base.domain.TestCase">
+        select * from test_case where test_case.project_id = #{projectId} order by num desc limit 1;
+    </select>
 </mapper>

backend/src/main/java/io/metersphere/track/service/TestCaseService.java

@@ -84,6 +84,7 @@ public class TestCaseService {
         testCase.setId(UUID.randomUUID().toString());
         testCase.setCreateTime(System.currentTimeMillis());
         testCase.setUpdateTime(System.currentTimeMillis());
+        testCase.setNum(getNextNum(testCase.getProjectId()));
         testCaseMapper.insert(testCase);
     }
 
@@ -253,9 +254,12 @@ public class TestCaseService {
         TestCaseMapper mapper = sqlSession.getMapper(TestCaseMapper.class);
         if (!testCases.isEmpty()) {
             AtomicInteger sort = new AtomicInteger();
+            AtomicInteger num = new AtomicInteger();
+            num.set(getNextNum(projectId)+testCases.size());
             testCases.forEach(testcase -> {
                 testcase.setNodeId(nodePathMap.get(testcase.getNodePath()));
                 testcase.setSort(sort.getAndIncrement());
+                testcase.setNum(num.decrementAndGet());
                 mapper.insert(testcase);
             });
         }
@@ -429,4 +433,17 @@ public class TestCaseService {
             MSException.throwException(Translator.get("related_case_del_fail_prefix") + " " + str + " " + Translator.get("related_case_del_fail_suffix"));
         }
     }
+
+    /**
+     * 获取项目下一个num (页面展示的ID)
+     * @return
+     */
+    private int getNextNum(String projectId) {
+        TestCase testCase = extTestCaseMapper.getMaxNumByProjectId(projectId);
+        if (testCase == null) {
+            return 100001;
+        } else {
+            return Optional.ofNullable(testCase.getNum()+1).orElse(100001);
+        }
+    }
 }

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

@@ -0,0 +1,50 @@
+alter table test_case add num int null comment 'Manually controlled growth identifier';
+
+DROP PROCEDURE IF EXISTS test_cursor;
+DELIMITER //
+CREATE PROCEDURE test_cursor()
+BEGIN
+    DECLARE projectId VARCHAR(64);
+    DECLARE caseId VARCHAR(64);
+    DECLARE num INT;
+    DECLARE done INT DEFAULT 0;
+    DECLARE cursor1 CURSOR FOR (SELECT DISTINCT project_id
+                                FROM test_case
+                                WHERE num IS NULL);
+    DECLARE cursor2 CURSOR FOR (SELECT id
+                                FROM test_case
+                                WHERE project_id = projectId
+                                ORDER BY create_time);
+
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+    OPEN cursor1;
+    outer_loop:
+    LOOP
+        FETCH cursor1 INTO projectId;
+        IF done
+        THEN
+            LEAVE outer_loop;
+        END IF;
+        SET num = 100001;
+        OPEN cursor2;
+        inner_loop:
+        LOOP
+            FETCH cursor2 INTO caseId;
+            IF done
+            THEN
+                LEAVE inner_loop;
+            END IF;
+            UPDATE test_case
+            SET num = num
+            WHERE id = caseId;
+            SET num = num + 1;
+        END LOOP;
+        SET done = 0;
+        CLOSE cursor2;
+    END LOOP;
+    CLOSE cursor1;
+END //
+DELIMITER ;
+
+CALL test_cursor();
+DROP PROCEDURE IF EXISTS test_cursor;

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -255,7 +255,7 @@
         return this.test.isValid() && !this.change;
       },
       isDisabled() {
-        return !(this.test.isValid() && this.change)
+        return !(this.test.isValid())
       }
     },
 

frontend/src/business/components/api/test/components/ApiRequestForm.vue

@@ -90,14 +90,14 @@
         activeName: "parameters",
         rules: {
           name: [
-            {max: 100, message: this.$t('commons.input_limit', [0, 100]), trigger: 'blur'}
+            {max: 100, message: this.$t('commons.input_limit', [1, 100]), trigger: 'blur'}
           ],
           url: [
-            {max: 500, required: true, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
+            {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
             {validator: validateURL, trigger: 'blur'}
           ],
           path: [
-            {max: 500, required: true, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
+            {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
           ]
         }
       }
@@ -143,6 +143,7 @@
           this.$error(this.$t('api_test.request.please_add_environment_to_scenario'), 2000);
           this.request.useEnvironment = false;
         }
+        this.$refs["request"].clearValidate();
       },
       addProtocol(url) {
         if (url) {

frontend/src/business/components/api/test/components/ApiScenarioForm.vue

@@ -8,6 +8,11 @@
         <el-select :disabled="isReadOnly" v-model="scenario.environmentId" class="environment-select" @change="environmentChange" clearable>
           <el-option v-for="(environment, index) in environments" :key="index" :label="environment.name + ': ' + environment.protocol + '://' + environment.socket" :value="environment.id"/>
           <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">{{$t('api_test.environment.environment_config')}}</el-button>
+          <template v-slot:empty>
+            <div class="empty-environment">
+              <el-button class="environment-button" size="mini" type="primary" @click="openEnvironmentConfig">{{$t('api_test.environment.environment_config')}}</el-button>
+            </div>
+          </template>
         </el-select>
       </el-form-item>
 
@@ -65,18 +70,32 @@
         }
       }
     },
+    watch: {
+      projectId() {
+        this.getEnvironments();
+      }
+    },
     methods: {
       getEnvironments() {
         if (this.projectId) {
           this.result = this.$get('/api/environment/list/' + this.projectId, response => {
             this.environments = response.data;
+            let hasEnvironment = false;
             for (let i in this.environments) {
               if (this.environments[i].id === this.scenario.environmentId) {
                 this.scenario.environment = this.environments[i];
+                hasEnvironment = true;
                 break;
               }
             }
+            if (!hasEnvironment) {
+              this.scenario.environmentId = '';
+              this.scenario.environment = undefined;
+            }
           });
+        } else {
+          this.scenario.environmentId = '';
+          this.scenario.environment = undefined;
         }
       },
       environmentChange(value) {
@@ -97,6 +116,10 @@
         }
       },
       openEnvironmentConfig() {
+        if (!this.projectId) {
+          this.$error(this.$t('api_test.select_project'));
+          return;
+        }
         this.$refs.environmentConfig.open(this.projectId);
       },
       environmentConfigClose() {
@@ -117,4 +140,8 @@
     padding: 7px;
   }
 
+  .empty-environment {
+    padding: 10px 0px;
+  }
+
 </style>

frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue

@@ -61,7 +61,10 @@
         return {
           result: {},
           rules: {
-            name :[{required: true, message: this.$t('commons.input_name'), trigger: 'blur'}],
+            name :[
+              {required: true, message: this.$t('commons.input_name'), trigger: 'blur'},
+              {max: 64, message: this.$t('commons.input_limit', [1, 64]), trigger: 'blur'}
+            ],
             socket :[{required: true, validator: socketValidator, trigger: 'blur'}],
           },
         }
@@ -83,7 +86,9 @@
             url = '/api/environment/update';
           }
           this.result = this.$post(url, param,  response => {
+            if (!param.id) {
               this.environment.id = response.data;
+            }
             this.$success(this.$t('commons.save_success'));
           });
         },

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -169,9 +169,6 @@ export class Scenario extends BaseConfig {
         return false;
       }
     }
-    if (!this.name) {
-      return false;
-    }
     return true;
   }
 }
@@ -396,8 +393,6 @@ class JMXRequest {
   constructor(request) {
     if (request && request instanceof Request && (request.url || request.path)) {
       this.useEnvironment = request.useEnvironment;
-      this.environment = request.environment;
-      this.path = decodeURIComponent(request.path);
       this.method = request.method;
       if (!request.useEnvironment) {
         let url = new URL(request.url);
@@ -405,19 +400,28 @@ class JMXRequest {
         this.pathname = decodeURIComponent(url.pathname);
         this.port = url.port;
         this.protocol = url.protocol.split(":")[0];
+        this.pathname =  this.getPostQueryParameters(request, this.pathname);
+      } else {
+        this.environment = request.environment;
+        this.port = request.environment.port;
+        this.path = decodeURIComponent(request.path);
+        this.path =  this.getPostQueryParameters(request, this.path);
+      }
+    }
   }
 
+  getPostQueryParameters(request, path) {
     if (this.method.toUpperCase() !== "GET") {
-        // this.pathname += url.search.replace('&', '&');
+      path += '?';
-        this.pathname += '?';
       request.parameters.forEach(parameter => {
         if (parameter.name) {
-            this.pathname += (parameter.name + '=' + parameter.value + '&');
+          path += (parameter.name + '=' + parameter.value + '&');
         }
       });
     }
+    return path;
   }
-  }
+
 }
 
 class JMeterTestPlan extends Element {

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

@@ -38,6 +38,12 @@
         class="test-content">
         <el-table-column
           type="selection"/>
+        <el-table-column
+          prop="num"
+          sortable="custom"
+          :label="$t('commons.id')"
+          show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"
@@ -310,6 +316,10 @@
         this.initTableData();
       },
       sort(column) {
+        // 每次只对一个字段排序
+        if (this.condition.orders) {
+          this.condition.orders = [];
+        }
         _sort(column, this.condition);
         this.initTableData();
       }

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -33,7 +33,11 @@
 
         <el-table-column
           type="selection"></el-table-column>
-
+        <el-table-column
+          prop="num"
+          :label="$t('commons.id')"
+          show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"

frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultComponent.vue

@@ -5,6 +5,11 @@
       <el-table
         row-key="id"
         :data="failureTestCases">
+        <el-table-column
+          prop="num"
+          :label="$t('commons.id')"
+          show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"

frontend/src/i18n/en-US.js

@@ -103,6 +103,7 @@ export default {
     input_login_username: 'Please input the user ID or email',
     input_name: 'Please enter name',
     formatErr: 'Format Error',
+    id: 'ID',
     date: {
       select_date: 'Select date',
       start_date: 'Start date',

frontend/src/i18n/zh-CN.js

@@ -103,6 +103,7 @@ export default {
     input_login_username: '请输入用户 ID 或 邮箱',
     input_name: '请输入名称',
     formatErr: '格式错误',
+    id: 'ID',
     date: {
       select_date: '选择日期',
       start_date: '开始日期',

frontend/src/i18n/zh-TW.js

@@ -101,6 +101,7 @@ export default {
     delete_confirm: '請輸入以下內容，確認刪除：',
     input_name: '請輸入名稱',
     formatErr: '格式錯誤',
+    id: 'ID',
     date: {
       select_date: '選擇日期',
       start_date: '開始日期',