diff --git a/backend/pom.xml b/backend/pom.xml
index 28caf81dc7..8fb1f34a93 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -171,6 +171,13 @@
${jmeter.version}
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 7.4.1.jre8
+
+
+
org.apache.dubbo
diff --git a/frontend/src/business/components/api/test/components/ApiScenarioForm.vue b/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
index fdc167dffd..ae4345a615 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioForm.vue
@@ -9,7 +9,7 @@
{{ $t('api_test.environment.environment_config') }}
diff --git a/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue b/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
index c9a8353c5c..a2b6e16462 100644
--- a/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
+++ b/frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
@@ -148,7 +148,7 @@ export default {
if (!this.request.path) return;
let url = this.getURL(this.displayUrl);
let urlStr = url.origin + url.pathname;
- let envUrl = this.request.environment.protocol + '://' + this.request.environment.socket;
+ let envUrl = this.request.environment.config.httpConfig.protocol + '://' + this.request.environment.config.httpConfig.socket;
this.request.path = decodeURIComponent(urlStr.substring(envUrl.length, urlStr.length));
},
getURL(urlStr) {
@@ -194,7 +194,8 @@ export default {
return this.request.method !== "GET";
},
displayUrl() {
- return this.request.environment ? this.request.environment.protocol + '://' + this.request.environment.socket + (this.request.path ? this.request.path : '') : '';
+ return this.request.environment.config.httpConfig.socket ? this.request.environment.config.httpConfig.protocol + '://'
+ + this.request.environment.config.httpConfig.socket + (this.request.path ? this.request.path : '') : '';
}
}
}
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index ae3d3ef83f..df02972df9 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"];
+ static DRIVER_CLASS = ["com.mysql.jdbc.Driver","com.microsoft.sqlserver.jdbc.SQLServerDriver"];
constructor(options) {
super();
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 55715e20d0..619d479765 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -536,7 +536,7 @@ export default {
form_description: "如果当前配置项无值,则取场景配置项的值",
},
sql: {
- dataSource: "数据源",
+ dataSource: "数据源名称",
sql_script: "SQL脚本",
timeout: "超时时间(ms)",
database_driver: "数据库驱动",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a6994e4daf..ffed703ea6 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -536,7 +536,7 @@ export default {
form_description: "如果當前配置項無值,則取場景配置項的值",
},
sql: {
- dataSource: "數據源",
+ dataSource: "數據源名稱",
sql_script: "SQL腳本",
timeout: "超時時間(ms)",
database_driver: "數據庫驅動",