mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2024-12-21 05:19:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: mockServer add crossRequest and change autoincrement num

Browse Source
This commit is contained in:
suxiaoxin 2017-07-31 10:15:16 +08:00
parent bd9d5b7381
commit def29288e7
6 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/middleware/mockServer.js
View File

@ -16,7 +16,6 @@ module.exports = async (ctx, next) => {
yapi.commons.log('MockServer Running...');
let projectInst = yapi.getInst(projectModel), projects;
try {
projects = await projectInst.getByDomain(hostname);
} catch (e) {
@ -46,9 +45,15 @@ module.exports = async (ctx, next) => {
let interfaceInst = yapi.getInst(interfaceModel);
try {
interfaceData = await interfaceInst.getByPath(project._id, ctx.path.substr(project.basepath.length));
interfaceData = await interfaceInst.getByPath(project._id, ctx.path.substr(project.basepath.length), ctx.method);
if (!interfaceData || interfaceData.length === 0) {
//非正常跨域预检请求回应
if(ctx.method === 'OPTIONS'){
ctx.set("Access-Control-Allow-Origin", "*")
ctx.set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE")
return ctx.body = 'ok'
}
return ctx.body = yapi.commons.resReturn(null, 404, '不存在的api');
}
@ -57,7 +62,7 @@ module.exports = async (ctx, next) => {
}
interfaceData = interfaceData[0];
ctx.set("Access-Control-Allow-Origin", "*")
if (interfaceData.res_body_type === 'json') {
return ctx.body = Mock.mock(
yapi.commons.json_parse(interfaceData.res_body)

2
server/models/base.js
View File

@ -16,7 +16,7 @@ class baseModel{
model: this.name,
field: this.getPrimaryKey(),
startAt: 101,
incrementBy: yapi.commons.rand(1, 100)
incrementBy: yapi.commons.rand(1, 10)
});
}

5
server/models/interface.js
View File

@ -47,10 +47,11 @@ class interfaceModel extends baseModel {
.exec();
}
getByPath(project_id, path) {
getByPath(project_id, path, method) {
return this.model.find({
project_id: project_id,
path: path
path: path,
method: method
})
.exec();
}

33
server_dist/middleware/mockServer.js
View File

@ -103,51 +103,62 @@ module.exports = function () {
interfaceInst = _yapi2.default.getInst(_interface2.default);
_context.prev = 25;
_context.next = 28;
return interfaceInst.getByPath(project._id, ctx.path.substr(project.basepath.length));
return interfaceInst.getByPath(project._id, ctx.path.substr(project.basepath.length), ctx.method);
case 28:
interfaceData = _context.sent;
if (!(!interfaceData || interfaceData.length === 0)) {
_context.next = 31;
_context.next = 35;
break;
}
if (!(ctx.method === 'OPTIONS')) {
_context.next = 34;
break;
}
ctx.set("Access-Control-Allow-Origin", "*");
ctx.set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE");
return _context.abrupt('return', ctx.body = 'ok');
case 34:
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 404, '不存在的api'));
case 31:
case 35:
if (!(interfaceData.length > 1)) {
_context.next = 33;
_context.next = 37;
break;
}
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 405, '存在多个api，请检查数据库'));
case 33:
case 37:
interfaceData = interfaceData[0];
ctx.set("Access-Control-Allow-Origin", "*");
if (!(interfaceData.res_body_type === 'json')) {
_context.next = 36;
_context.next = 41;
break;
}
return _context.abrupt('return', ctx.body = _mockjs2.default.mock(_yapi2.default.commons.json_parse(interfaceData.res_body)));
case 36:
case 41:
return _context.abrupt('return', ctx.body = interfaceData.res_body);
case 39:
_context.prev = 39;
case 44:
_context.prev = 44;
_context.t1 = _context['catch'](25);
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 409, _context.t1.message));
case 42:
case 47:
case 'end':
return _context.stop();
}
}
}, _callee, undefined, [[10, 16], [25, 39]]);
}, _callee, undefined, [[10, 16], [25, 44]]);
}));
return function (_x, _x2) {

2
server_dist/models/base.js
View File

@ -38,7 +38,7 @@ var baseModel = function () {
model: this.name,
field: this.getPrimaryKey(),
startAt: 101,
incrementBy: _yapi2.default.commons.rand(1, 100)
incrementBy: _yapi2.default.commons.rand(1, 10)
});
}

5
server_dist/models/interface.js
View File

@ -88,10 +88,11 @@ var interfaceModel = function (_baseModel) {
}
}, {
key: 'getByPath',
value: function getByPath(project_id, path) {
value: function getByPath(project_id, path, method) {
return this.model.find({
project_id: project_id,
path: path
path: path,
method: method
}).exec();
}
}, {