This commit is contained in:
chenjianxing 2020-10-21 18:26:09 +08:00
commit 4a07f74706
7 changed files with 11 additions and 11 deletions

View File

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

View File

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

View File

@ -100,6 +100,7 @@
parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
select test_plan.*, user.name as user_name from test_plan
LEFT JOIN user ON user.id = test_plan.principal
JOIN test_plan_project on test_plan.id = test_plan_id JOIN project on project.id = project_id
<where>
<if test="request.combine != null">
<include refid="combine">

View File

@ -1,5 +1,4 @@
alter table message_task
add identification varchar(255) not null;
alter table message_task
add result boolean not null;
alter table message_task change result is_Set tinyint(1) not null;
ALTER TABLE message_task
ADD identification varchar(255) NOT NULL;
ALTER TABLE message_task
ADD is_set tinyint(1) NOT NULL;

View File

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

View File

@ -152,7 +152,7 @@ export class Test extends BaseConfig {
constructor(options) {
super();
this.type = "MS API CONFIG";
this.version = '1.3.0';
this.version = '1.4.0';
this.id = uuid();
this.name = undefined;
this.projectId = undefined;

View File

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