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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wenyann 2020-11-03 11:21:32 +08:00
parent 65872f1659 587f41b962
commit 4576b38f80
6 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/pom.xml
View File

@ -250,7 +250,7 @@
<dependency> <dependency>
<groupId>io.metersphere</groupId> <groupId>io.metersphere</groupId>
<artifactId>jmeter-plugins-dubbo</artifactId> <artifactId>jmeter-plugins-dubbo</artifactId>
<version>2.7.11</version> <version>2.7.12</version>
</dependency> </dependency>
<!-- LDAP Module --> <!-- LDAP Module -->
@ -362,14 +362,6 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.5.6</version> <version>4.5.6</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.3</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

4
backend/src/main/java/io/metersphere/api/parse/MsParser.java
View File

@ -61,7 +61,7 @@ public class MsParser extends ApiImportAbstractParser {
Object body = requestObject.get("body"); Object body = requestObject.get("body");
if (body instanceof JSONArray) { if (body instanceof JSONArray) {
JSONArray bodies = requestObject.getJSONArray("body"); JSONArray bodies = requestObject.getJSONArray("body");
if (StringUtils.equalsIgnoreCase(requestObject.getString("method"), "POST") && bodies != null) { if (bodies != null) {
StringBuilder bodyStr = new StringBuilder(); StringBuilder bodyStr = new StringBuilder();
for (int i = 0; i < bodies.size(); i++) { for (int i = 0; i < bodies.size(); i++) {
String tmp = bodies.getString(i); String tmp = bodies.getString(i);
@ -74,7 +74,7 @@ public class MsParser extends ApiImportAbstractParser {
} }
} else if (body instanceof JSONObject) { } else if (body instanceof JSONObject) {
JSONObject bodyObj = requestObject.getJSONObject("body"); JSONObject bodyObj = requestObject.getJSONObject("body");
if (StringUtils.equalsIgnoreCase(requestObject.getString("method"), "POST") && bodyObj != null) { if (bodyObj != null) {
JSONArray kvs = new JSONArray(); JSONArray kvs = new JSONArray();
bodyObj.keySet().forEach(key -> { bodyObj.keySet().forEach(key -> {
JSONObject kv = new JSONObject(); JSONObject kv = new JSONObject();

4
backend/src/main/resources/db/migration/V39__modify_message_task_create_time.sql
View File

@ -1,2 +1,2 @@
alter table message_task ALTER TABLE message_task
add create_time bigint(13) null; ADD create_time bigint(13) DEFAULT 0;

3
backend/src/main/resources/db/migration/V41__modify_message_task_set.sql
View File

@ -1,3 +0,0 @@
alter table message_task
alter column create_time set default 0;

6
frontend/src/business/components/api/test/components/request/ApiRequestConfig.vue
View File

@ -162,9 +162,11 @@ export default {
break; break;
} }
}, },
getColor(enable, method) { getColor(requestEnable, method) {
if (enable) { if (this.scenario.enable && requestEnable) {
return this.methodColorMap.get(method); return this.methodColorMap.get(method);
} else {
return '#909399';
} }
}, },
select(request) { select(request) {

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

@ -1363,16 +1363,20 @@ class JMXGenerator {
} }
addContentType(request, type) { addContentType(request, type) {
let hasContentType = false;
for (let index in request.headers) { for (let index in request.headers) {
if (request.headers.hasOwnProperty(index)) { if (request.headers.hasOwnProperty(index)) {
if (request.headers[index].name === 'Content-Type') { if (request.headers[index].name === 'Content-Type' && request.headers[index].enable != false) {
request.headers.splice(index, 1); request.headers.splice(index, 1);
hasContentType = true;
break; break;
} }
} }
} }
if (!hasContentType) {
request.headers.push(new KeyValue({name: 'Content-Type', value: type})); request.headers.push(new KeyValue({name: 'Content-Type', value: type}));
} }
}
addRequestArguments(httpSamplerProxy, request) { addRequestArguments(httpSamplerProxy, request) {
let args = this.filterKV(request.parameters); let args = this.filterKV(request.parameters);