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:
Captain.B 2020-06-29 13:40:37 +08:00
parent 910ce17270 62c720f0a9
commit dfb1eb0224
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,10 +224,10 @@ export class HTTPSamplerProxy extends DefaultTestElement {
constructor(testName, request) {
super('HTTPSamplerProxy', 'HttpTestSampleGui', 'HTTPSamplerProxy', testName);
this.request = request || {};
this.stringProp("HTTPSampler.domain", this.request.hostname);
this.stringProp("HTTPSampler.protocol", this.request.protocol.split(":")[0]);
this.stringProp("HTTPSampler.path", this.request.pathname);
// this.stringProp("HTTPSampler.domain", this.request.hostname);
// this.stringProp("HTTPSampler.protocol", this.request.protocol.split(":")[0]);
//主机名和端口添加在 path 中，支持变量的形式
this.stringProp("HTTPSampler.path", this.request.url);
this.stringProp("HTTPSampler.method", this.request.method);
this.stringProp("HTTPSampler.contentEncoding", this.request.encoding, "UTF-8");
if (!this.request.port) {

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

@ -393,6 +393,7 @@ class JMXRequest {
this.pathname = decodeURIComponent(url.pathname);
this.port = url.port;
this.protocol = url.protocol.split(":")[0];
this.url = request.url;
if (this.method.toUpperCase() !== "GET") {
this.pathname += url.search.replace('&', '&');
}