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

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

This commit is contained in:
Captain.B 2020-09-17 16:05:47 +08:00
parent f0198ccb68 5fd8a424d6
commit dd0b474959
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/pom.xml
View File

@ -183,6 +183,11 @@
<version>42.2.14</version> <version>42.2.14</version>
</dependency> </dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.7.0.0</version>
</dependency>
<!-- Zookeeper --> <!-- Zookeeper -->
<dependency> <dependency>

2
frontend/src/business/components/api/test/model/JMX.js
View File

@ -185,7 +185,7 @@ export class TestPlan extends DefaultTestElement {
props = props || {}; props = props || {};
this.boolProp("TestPlan.functional_mode", props.mode, false); this.boolProp("TestPlan.functional_mode", props.mode, false);
this.boolProp("TestPlan.serialize_threadgroups", props.stg, false); this.boolProp("TestPlan.serialize_threadgroups", props.stg, true);
this.boolProp("TestPlan.tearDown_on_shutdown", props.tos, true); this.boolProp("TestPlan.tearDown_on_shutdown", props.tos, true);
this.stringProp("TestPlan.comments", props.comments); this.stringProp("TestPlan.comments", props.comments);
this.stringProp("TestPlan.user_define_classpath", props.classpath); this.stringProp("TestPlan.user_define_classpath", props.classpath);

2
frontend/src/business/components/api/test/model/ScenarioModel.js
View File

@ -546,7 +546,7 @@ export class ConfigCenter extends BaseConfig {
} }
export class DatabaseConfig extends BaseConfig { export class DatabaseConfig extends BaseConfig {
static DRIVER_CLASS = ["com.mysql.jdbc.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "org.postgresql.Driver"]; static DRIVER_CLASS = ["com.mysql.jdbc.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "org.postgresql.Driver", "oracle.jdbc.OracleDriver"];
constructor(options) { constructor(options) {
super(); super();