Merge branch 'v1.3' into master

Dockerfile

@@ -6,11 +6,11 @@ ARG MS_VERSION=dev
 
 RUN mkdir -p /opt/apps && mkdir -p /opt/jmeter
 
-ADD backend/target/backend-1.1.jar /opt/apps
+ADD backend/target/backend-1.3.jar /opt/apps
 
 ADD backend/target/classes/jmeter/ /opt/jmeter/
 
-ENV JAVA_APP_JAR=/opt/apps/backend-1.1.jar
+ENV JAVA_APP_JAR=/opt/apps/backend-1.3.jar
 
 ENV AB_OFF=true
 

backend/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>metersphere-server</artifactId>
         <groupId>io.metersphere</groupId>
-        <version>1.1</version>
+        <version>1.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

frontend/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <artifactId>metersphere-server</artifactId>
     <groupId>io.metersphere</groupId>
-    <version>1.1</version>
+    <version>1.3</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue

@@ -96,8 +96,7 @@
             <div>{{ $t('load_test.response_timeout') }}</div>
           </el-form-item>
           <el-form-item>
-            <el-input-number :disabled="readOnly" size="mini" v-model="responseTimeout" :min="10"
-                             :max="100000"></el-input-number>
+            <el-input-number :disabled="readOnly" size="mini" v-model="responseTimeout"></el-input-number>
           </el-form-item>
           <el-form-item>
             ms

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.metersphere</groupId>
     <artifactId>metersphere-server</artifactId>
-    <version>1.1</version>
+    <version>1.3</version>
     <packaging>pom</packaging>
 
     <parent>