Skip to content

Commit 396e36d

Browse files
committed
1.0.3
1.修复了接口运行结果显示的样式问题 2.修复了测试接口不能自定义部分http headr问题 3.在新建运行的状态下不能进行mock
1 parent 5a2eea9 commit 396e36d

File tree

12 files changed

+74
-18
lines changed

12 files changed

+74
-18
lines changed

SBDoc/routes/proxy/net.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ var pass = require('stream').PassThrough;
77
var getHeader = function (req) {
88
var ret = {};
99
for (var i in req.headers) {
10-
if (!/host|connection|Access-|origin|referer|user-agent/i.test(i)) {
10+
if (!/host|connection|Access-|origin|referer|user-agent|__user|__path|__url|__method|__headers/i.test(i)) {
1111
ret[i] = req.headers[i];
1212
}
1313
}
14-
return ret;
14+
var headers=req.headers["__headers"];
15+
if(headers)
16+
{
17+
headers=JSON.parse(headers);
18+
for(var key in headers)
19+
{
20+
ret[key]=headers[key];
21+
}
22+
}
1523
};
1624

1725
var filterResHeader = function (headers) {

SBDoc/routes/proxy/proxy.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@ var run=require("../../model/runModel")
1010
var getHeader = function (req) {
1111
var ret = {};
1212
for (var i in req.headers) {
13-
if (!/host|connection|Access-|origin|referer|user-agent/i.test(i)) {
13+
if (!/host|connection|Access-|origin|referer|user-agent|__user|__path|__url|__method|__headers/i.test(i)) {
1414
ret[i] = req.headers[i];
1515
}
1616
}
17+
var headers=req.headers["__headers"];
18+
if(headers)
19+
{
20+
headers=JSON.parse(headers);
21+
for(var key in headers)
22+
{
23+
ret[key]=headers[key];
24+
}
25+
}
1726
return ret;
1827
};
1928

SBDocClient/dist/run.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/dist/run.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/dist/vendor.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/dist/vendor.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/web/common/common.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,17 @@ $.param=function (obj) {
316316
return arr.join("&");
317317
}
318318

319+
$.inArr=function (str,arr) {
320+
for(var i=0;i<arr.length;i++)
321+
{
322+
if(str.toLowerCase()==arr[i].toLowerCase())
323+
{
324+
return true;
325+
}
326+
}
327+
return false;
328+
}
329+
319330
module.exports=$;
320331

321332

SBDocClient/web/run/net.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ var pass = require('stream').PassThrough;
77
var getHeader = function (req) {
88
var ret = {};
99
for (var i in req.headers) {
10-
if (!/host|connection|Access-|origin|referer|user-agent/i.test(i)) {
10+
if (!/host|connection|Access-|origin|referer|user-agent|__user|__path|__url|__method|__headers/i.test(i)) {
1111
ret[i] = req.headers[i];
1212
}
1313
}
14-
return ret;
14+
var headers=req.headers["__headers"];
15+
if(headers)
16+
{
17+
headers=JSON.parse(headers);
18+
for(var key in headers)
19+
{
20+
ret[key]=headers[key];
21+
}
22+
}
1523
};
1624

1725
var filterResHeader = function (headers) {

SBDocClient/web/run/run.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,12 @@ var vue=new Vue({
170170
var results=_this.interface.baseUrl.map(function (obj) {
171171
return {value:obj}
172172
})
173-
results.push({
174-
value:"MockServer"
175-
})
173+
if(!store.state.hash)
174+
{
175+
results.push({
176+
value:"MockServer"
177+
})
178+
}
176179
if(queryString)
177180
{
178181
results=results.filter(function (obj) {

SBDocClient/web/run/store.js

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,17 +469,33 @@ module.exports=new Vuex.Store({
469469
{
470470
path=path+"?"+query;
471471
}
472-
var header={};
472+
var header={},arrHeaders=["host","connection","origin","referer","user-agent"],objHeaders={};
473473
context.getters.headerSave.forEach(function (obj) {
474474
if(obj.encrypt && obj.encrypt.type)
475475
{
476476
var value=helper.encrypt(obj.encrypt.type,obj.value,obj.encrypt.salt);
477477
var key=obj.name;
478-
header[key]=value;
478+
if($.inArr(key,arrHeaders))
479+
{
480+
objHeaders[key]=value;
481+
}
482+
else
483+
{
484+
header[key]=value;
485+
}
486+
479487
}
480488
else
481489
{
482-
header[obj.name]=obj.value;
490+
if($.inArr(obj.name,arrHeaders))
491+
{
492+
objHeaders[obj.name]=obj.value;
493+
}
494+
else
495+
{
496+
header[obj.name]=obj.value;
497+
}
498+
483499
}
484500
})
485501
var body={},bUpload=false;
@@ -570,6 +586,7 @@ module.exports=new Vuex.Store({
570586
header["__path"]=path;
571587
header["__method"]=method;
572588
header["__user"]=session.get("id");
589+
header["__headers"]=JSON.stringify(objHeaders);
573590
var proxyUrl="/proxy";
574591
var bNet=false;
575592
if(/10\./i.test(baseUrl) || /192\.168\./i.test(baseUrl) || /127\.0\.0\.1/i.test(baseUrl) || /172\.(16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)\./.test(baseUrl) || /localhost/i.test(baseUrl) && !bMock)

0 commit comments

Comments
 (0)