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

fix: fix project interface bug and change app.js to App.js

Browse Source
This commit is contained in:
sean 2017-07-21 10:03:34 +08:00
parent 2f8a53d139
commit 6d4948503e
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/index.js
View File

@ -3,7 +3,7 @@ import 'babel-polyfill'
import thunkMiddleware from 'redux-thunk' import thunkMiddleware from 'redux-thunk'
import promiseMiddleware from 'redux-promise'; import promiseMiddleware from 'redux-promise';
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import App from './App' import App from './app'
import { createStore, combineReducers, applyMiddleware } from 'redux' import { createStore, combineReducers, applyMiddleware } from 'redux'
import { Provider } from 'react-redux' import { Provider } from 'react-redux'
import ReduxContainer from './ReduxContainer.js' import ReduxContainer from './ReduxContainer.js'

5
server/controllers/project.js
View File

@ -25,7 +25,7 @@ class projectController extends baseController {
} }
verifyPath(path){ verifyPath(path){
if(/^[a-zA-Z0-9\-\/_:]+$/.test(basepath)){ if(/^[a-zA-Z0-9\-\/_:]+$/.test(path)){
return true; return true;
}else{ }else{
return false; return false;
@ -78,7 +78,7 @@ class projectController extends baseController {
return ctx.body = yapi.commons.resReturn(null, 400, '项目domain不能为空'); return ctx.body = yapi.commons.resReturn(null, 400, '项目domain不能为空');
} }
if(params.basepath = (this.handleBasepath(params.basepath)) === false){ if((params.basepath = this.handleBasepath(params.basepath)) === false){
return ctx.body = yapi.commons.resReturn(null, 401, 'basepath格式有误') return ctx.body = yapi.commons.resReturn(null, 401, 'basepath格式有误')
} }
@ -90,7 +90,6 @@ class projectController extends baseController {
if(checkRepeatDomain > 0){ if(checkRepeatDomain > 0){
return ctx.body = yapi.commons.resReturn(null, 401, '已存在domain和basepath'); return ctx.body = yapi.commons.resReturn(null, 401, '已存在domain和basepath');
} }
let data = { let data = {
name: params.name, name: params.name,

1
server/models/project.js
View File

@ -12,6 +12,7 @@ class projectModel extends baseModel{
name: {type: String, required: true}, name: {type: String, required: true},
basepath: {type: String, required: true, validate: { basepath: {type: String, required: true, validate: {
validator: (v) => { validator: (v) => {
console.log('basepath: ', v)
return v && v[0] === '/' return v && v[0] === '/'
}, },
message: 'basepath必须是/开头' message: 'basepath必须是/开头'

4
server_dist/controllers/project.js
View File

@ -85,7 +85,7 @@ var projectController = function (_baseController) {
}, { }, {
key: 'verifyPath', key: 'verifyPath',
value: function verifyPath(path) { value: function verifyPath(path) {
if (/^[a-zA-Z0-9\-\/_:]+$/.test(basepath)) { if (/^[a-zA-Z0-9\-\/_:]+$/.test(path)) {
return true; return true;
} else { } else {
return false; return false;
@ -174,7 +174,7 @@ var projectController = function (_baseController) {
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '项目domain不能为空')); return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '项目domain不能为空'));
case 14: case 14:
if (!(params.basepath = this.handleBasepath(params.basepath) === false)) { if (!((params.basepath = this.handleBasepath(params.basepath)) === false)) {
_context.next = 16; _context.next = 16;
break; break;
} }

1
server_dist/models/project.js
View File

@ -51,6 +51,7 @@ var projectModel = function (_baseModel) {
name: { type: String, required: true }, name: { type: String, required: true },
basepath: { type: String, required: true, validate: { basepath: { type: String, required: true, validate: {
validator: function validator(v) { validator: function validator(v) {
console.log('basepath: ', v);
return v && v[0] === '/'; return v && v[0] === '/';
}, },
message: 'basepath必须是/开头' message: 'basepath必须是/开头'