test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.3' into master

This commit is contained in:
Captain.B 2020-09-22 10:41:20 +08:00
parent c347c1d56d 01cf93bf45
commit 81bf333e29
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -6,11 +6,11 @@ ARG MS_VERSION=dev
RUN mkdir -p /opt/apps && mkdir -p /opt/jmeter 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/ 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 ENV AB_OFF=true

2
backend/pom.xml
View File

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

2
frontend/pom.xml
View File

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

3
frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
View File

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

2
pom.xml
View File

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