From e1eba35e1328426ffa9f5cc5eaba51f6ff8a77eb Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 17 Sep 2020 15:11:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E6=94=AF=E6=8C=81=20Oracle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 5 +++++ .../src/business/components/api/test/model/ScenarioModel.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/pom.xml b/backend/pom.xml index 0094df67fd..a54a86c0df 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -183,6 +183,11 @@ 42.2.14 + + com.oracle.database.jdbc + ojdbc8 + 19.7.0.0 + diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js index bf54575528..8f8035efd7 100644 --- a/frontend/src/business/components/api/test/model/ScenarioModel.js +++ b/frontend/src/business/components/api/test/model/ScenarioModel.js @@ -546,7 +546,7 @@ export class ConfigCenter 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) { super(); From 5fd8a424d6f76e1eb55de00b83ee4d1d30d1343d Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 17 Sep 2020 15:16:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E9=A1=BA=E5=BA=8F=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/components/api/test/model/JMX.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/api/test/model/JMX.js b/frontend/src/business/components/api/test/model/JMX.js index dfedd58590..1e036808d0 100644 --- a/frontend/src/business/components/api/test/model/JMX.js +++ b/frontend/src/business/components/api/test/model/JMX.js @@ -185,7 +185,7 @@ export class TestPlan extends DefaultTestElement { props = props || {}; 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.stringProp("TestPlan.comments", props.comments); this.stringProp("TestPlan.user_define_classpath", props.classpath);