mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-31 14:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

opti: 优化 restful api 动态路由匹配算法，增加权重计算

Browse Source
This commit is contained in:
suwenxiong 2019-02-13 14:56:05 +08:00
parent 8b8ea3c2c6
commit c813e9cb4f
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/middleware/mockServer.js
View File

@ -14,7 +14,10 @@ const variable = require('../../client/constants/variable.js')
function matchApi(apiPath, apiRule) {
let apiRules = apiRule.split('/');
let apiPaths = apiPath.split('/');
let pathRules = {};
let pathParams = {
__weight: 0
};
if (apiPaths.length !== apiRules.length) {
return false;
}
@ -29,9 +32,9 @@ function matchApi(apiPath, apiRule) {
apiRules[i][0] === '{' &&
apiRules[i][apiRules[i].length - 1] === '}'
) {
pathRules[apiRules[i].substr(1, apiRules[i].length - 2)] = apiPaths[i];
pathParams[apiRules[i].substr(1, apiRules[i].length - 2)] = apiPaths[i];
} else if (apiRules[i].indexOf(':') === 0) {
pathRules[apiRules[i].substr(1)] = apiPaths[i];
pathParams[apiRules[i].substr(1)] = apiPaths[i];
} else if (
apiRules[i].length > 2 &&
apiRules[i].indexOf('{') > -1 &&
@ -40,7 +43,7 @@ function matchApi(apiPath, apiRule) {
let params = [];
apiRules[i] = apiRules[i].replace(/\{(.+?)\}/g, function(src, match) {
params.push(match);
return '(.+)';
return '([^\\/\\s]+)';
});
apiRules[i] = new RegExp(apiRules[i]);
if (!apiRules[i].test(apiPaths[i])) {
@ -50,15 +53,17 @@ function matchApi(apiPath, apiRule) {
let matchs = apiPaths[i].match(apiRules[i]);
params.forEach((item, index) => {
pathRules[item] = matchs[index + 1];
pathParams[item] = matchs[index + 1];
});
} else {
if (apiRules[i] !== apiPaths[i]) {
return false;
}else{
pathParams.__weight++;
}
}
}
return pathRules;
return pathParams;
}
function parseCookie(str) {
@ -220,9 +225,16 @@ module.exports = async (ctx, next) => {
//处理动态路由
if (!interfaceData || interfaceData.length === 0) {
let newData = await interfaceInst.getVar(project._id, ctx.method);
let findInterface = _.find(newData, item => {
let findInterface;
let weight = 0;
_.each(newData, item => {
let m = matchApi(newpath, item.path);
if (m !== false) {
if(m.__weight >= weight){
findInterface = item;
}
delete m.__weight;
ctx.request.query = Object.assign(m, ctx.request.query);
return true;
}

15
test/server/mockServer.test.js
View File

@ -28,14 +28,25 @@ test('matchApi', t => {
let r5 = matchApi('/user/ac/ttt/bd', apiRule_5);
t.deepEqual(r5, {
aaa: 'ac',
bbbb: 'bd'
bbbb: 'bd',
__weight: 2
});
const apiRule_6 = '/user/a1={aaa}/ttt/b1={bbbb}';
let r6 = matchApi('/user/a1=aaa/ttt/b1=111q', apiRule_6);
t.deepEqual(r6, {
aaa: 'aaa',
bbbb: '111q'
bbbb: '111q',
__weight: 2
});
const apiRule_7 = '/user/a1={aaa}/ttt/b1={bbbb}/xxx/yyy';
let r7 = matchApi('/user/a1=aaa/ttt/b1=111q/xxx/yyy', apiRule_7);
t.deepEqual(r7, {
aaa: 'aaa',
bbbb: '111q',
__weight: 4
});
});