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

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

Browse Source
This commit is contained in:
waliang.wang 2017-07-26 18:24:55 +08:00
commit abc947df2c
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/AuthenticatedComponent.js
View File

@ -2,7 +2,6 @@ import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { changeMenuItem } from '../actions/menu' import { changeMenuItem } from '../actions/menu'
import { message } from 'antd'
export function requireAuthentication(Component) { export function requireAuthentication(Component) {
@ -27,7 +26,6 @@ export function requireAuthentication(Component) {
if( !this.props.isAuthenticated ){ if( !this.props.isAuthenticated ){
this.props.history.push('/'); this.props.history.push('/');
this.props.changeMenuItem('/'); this.props.changeMenuItem('/');
message.info('请先登录',1);
} }
} }
render() { render() {

3
client/components/Header/Header.js
View File

@ -88,6 +88,9 @@ class HeaderCom extends Component {
} }
linkTo = (e) =>{ linkTo = (e) =>{
this.props.changeMenuItem(e.key); this.props.changeMenuItem(e.key);
if(!this.props.login){
message.info('请先登录',1);
}
} }
relieveLink = () => { relieveLink = () => {
this.props.changeMenuItem(""); this.props.changeMenuItem("");

6
server/controllers/interface.js
View File

@ -38,6 +38,7 @@ class interfaceController extends baseController{
async add(ctx){ async add(ctx){
let params = ctx.request.body; let params = ctx.request.body;
params = yapi.commons.handleParams(params, { params = yapi.commons.handleParams(params, {
project_id: 'number',
title: 'string', title: 'string',
path: 'string', path: 'string',
method: 'string', method: 'string',
@ -58,7 +59,8 @@ class interfaceController extends baseController{
return ctx.body = yapi.commons.resReturn(null, 400, '接口path第一位必须是/，最后一位不能为/') return ctx.body = yapi.commons.resReturn(null, 400, '接口path第一位必须是/，最后一位不能为/')
} }
let checkRepeat = await this.Model.checkRepeat(params.path, params.method); let checkRepeat = await this.Model.checkRepeat(params.project_id, params.path, params.method);
if(checkRepeat > 0){ if(checkRepeat > 0){
return ctx.body = yapi.commons.resReturn(null, 401, '已存在的接口:' + params.path + '[' + params.method + ']'); 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){ 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){ if(checkRepeat > 0){
return ctx.body = yapi.commons.resReturn(null, 401, '已存在的接口:' + params.path + '[' + params.method + ']'); 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() }).exec()
} }
checkRepeat(path, method){ checkRepeat(id, path, method){
return this.model.count({ return this.model.count({
project_id: id,
path: path, path: path,
method: method method: method
}) })

5
server_dist/controllers/interface.js
View File

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

3
server_dist/models/interface.js
View File

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