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

Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

Browse Source
This commit is contained in:
zwjamnsss 2017-07-26 18:24:14 +08:00
commit db66f448d2
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/containers/AddInterface/AddInterface.js
View File

@ -254,9 +254,6 @@ class AddInterface extends Component {
<Result isSave={isSave} mockJson={mockJson} />
<MockUrl mockURL={mockURL} />
</TabPane>
{
// <TabPane tab="Mock" key="2">mock</TabPane>
}
<TabPane tab="请求接口" key="3">
<InterfaceTest />
</TabPane>

6
client/containers/Interface/InterfaceTable/InterfaceTable.js
View File

@ -65,10 +65,14 @@ class InterfaceTable extends Component {
title: '接口名称',
dataIndex: 'title',
key: 'title'
}, {
},{
title: '接口URL',
dataIndex: 'path',
key: 'path'
},{
title: '请求方式',
dataIndex: 'method',
key: 'method'
},{
title: '更新日期',
dataIndex: 'add_time',

6
server/controllers/interface.js
View File

@ -38,6 +38,7 @@ class interfaceController extends baseController{
async add(ctx){
let params = ctx.request.body;
params = yapi.commons.handleParams(params, {
project_id: 'number',
title: 'string',
path: 'string',
method: 'string',
@ -57,8 +58,9 @@ class interfaceController extends baseController{
if(!yapi.commons.verifyPath(params.path)){
return ctx.body = yapi.commons.resReturn(null, 400, '接口path第一位必须是/，最后一位不能为/')
}
let checkRepeat = await this.Model.checkRepeat(params.project_id, params.path, params.method);
let checkRepeat = await this.Model.checkRepeat(params.path, params.method);
if(checkRepeat > 0){
return ctx.body = yapi.commons.resReturn(null, 401, '已存在的接口:' + params.path + '[' + params.method + ']');
}
@ -184,7 +186,7 @@ class interfaceController extends baseController{
}
if(params.path && params.path !== interfaceData.path && params.method !== interfaceData.method){
let checkRepeat = await this.Model.checkRepeat(params.path, params.method);
let checkRepeat = await this.Model.checkRepeat(interfaceData.project_id,params.path, params.method);
if(checkRepeat > 0){
return ctx.body = yapi.commons.resReturn(null, 401, '已存在的接口:' + params.path + '[' + params.method + ']');
}

3
server/models/interface.js
View File

@ -54,8 +54,9 @@ class interfaceModel extends baseModel{
}).exec()
}
checkRepeat(path, method){
checkRepeat(id, path, method){
return this.model.count({
project_id: id,
path: path,
method: method
})

5
server_dist/controllers/interface.js
View File

@ -95,6 +95,7 @@ var interfaceController = function (_baseController) {
params = ctx.request.body;
params = _yapi2.default.commons.handleParams(params, {
project_id: 'number',
title: 'string',
path: 'string',
method: 'string',
@ -129,7 +130,7 @@ var interfaceController = function (_baseController) {
case 11:
_context.next = 13;
return this.Model.checkRepeat(params.path, params.method);
return this.Model.checkRepeat(params.project_id, params.path, params.method);
case 13:
checkRepeat = _context.sent;
@ -393,7 +394,7 @@ var interfaceController = function (_baseController) {
}
_context4.next = 15;
return this.Model.checkRepeat(params.path, params.method);
return this.Model.checkRepeat(interfaceData.project_id, params.path, params.method);
case 15:
checkRepeat = _context4.sent;

3
server_dist/models/interface.js
View File

@ -96,8 +96,9 @@ var interfaceModel = function (_baseModel) {
}
}, {
key: 'checkRepeat',
value: function checkRepeat(path, method) {
value: function checkRepeat(id, path, method) {
return this.model.count({
project_id: id,
path: path,
method: method
});