{this.confirm(item._id)}} okText="确定" cancelText="取消">
diff --git a/client/containers/index.js b/client/containers/index.js
index e4a2fc29..1b9f7fe0 100644
--- a/client/containers/index.js
+++ b/client/containers/index.js
@@ -1,21 +1,25 @@
import Header from '../components/Header/Header.js'
import Home from './Home/Home.js'
import Login from './Login/LoginWrap.js'
-import ProjectGroups from './ProjectGroups/ProjectGroups.js'
+import Group from './Group/Group.js'
import Interface from './Interface/Interface.js'
+import Project from './Project/Project.js'
import News from './News/News.js'
import AddInterface from './AddInterface/AddInterface.js'
import DevTools from './DevTools/DevTools.js'
import Follows from './Follows/Follows.js'
+import AddProject from './Project/AddProject/AddProject.js'
export {
Header,
Home,
Login,
- ProjectGroups,
+ Group,
Interface,
+ Project,
AddInterface,
News,
DevTools,
- Follows
+ Follows,
+ AddProject
}
diff --git a/client/reducer/modules/project.js b/client/reducer/modules/project.js
index e23a7600..8fcd6b02 100644
--- a/client/reducer/modules/project.js
+++ b/client/reducer/modules/project.js
@@ -17,7 +17,8 @@ const initialState = {
userInfo: {},
tableLoading: true,
total: 0,
- currPage: 1
+ currPage: 1,
+ curProject: {}
};
export default (state = initialState, action) => {
@@ -94,7 +95,6 @@ export function addProject(data) {
};
return {
type: PROJECT_ADD,
- // payload 可以返回 Promise，异步请求使用 axios 即可
payload: axios.post('/project/add', param)
};
}
@@ -112,7 +112,6 @@ export function updateProject(data) {
};
return {
type: PROJECT_UPDATE,
- // payload 可以返回 Promise，异步请求使用 axios 即可
payload: axios.post('/project/up', param)
};
}
@@ -121,7 +120,6 @@ export function delProject(id) {
const param = { id };
return {
type: PROJECT_DEL,
- // payload 可以返回 Promise，异步请求使用 axios 即可
payload: axios.post('/project/del', param)
};
}
diff --git a/client/reducer/modules/reducer.js b/client/reducer/modules/reducer.js
index fa0fe382..885d640d 100644
--- a/client/reducer/modules/reducer.js
+++ b/client/reducer/modules/reducer.js
@@ -1,5 +1,5 @@
import { combineReducers } from 'redux';
-import login from './login.js'
+import user from './user.js'
import group from './group.js'
import project from './project.js'
import Interface from './interface.js'
@@ -9,7 +9,7 @@ import menu from './menu.js'
export default combineReducers({
group,
- login,
+ user,
Interface,
project,
news,
diff --git a/client/reducer/modules/user.js b/client/reducer/modules/user.js
new file mode 100644
index 00000000..716f0606
--- /dev/null
+++ b/client/reducer/modules/user.js
@@ -0,0 +1,127 @@
+import axios from 'axios';
+
+// Actions
+const LOGIN = 'yapi/user/LOGIN';
+const LOGIN_OUT = 'yapi/user/LOGIN_OUT';
+const LOGIN_TYPE = 'yapi/user/LOGIN_TYPE';
+const GET_LOGIN_STATE = 'yapi/user/GET_LOGIN_STATE';
+const REGISTER = 'yapi/user/REGISTER';
+
+// Reducer
+const LOADING_STATUS = 0;
+const GUEST_STATUS = 1;
+const MEMBER_STATUS = 2;
+// Reducer user
+const initialState = {
+ isLogin: false,
+ userName: null,
+ uid: null,
+ email: '',
+ loginState: LOADING_STATUS,
+ loginWrapActiveKey: "1"
+};
+
+export default (state = initialState, action) => {
+ switch (action.type) {
+ case GET_LOGIN_STATE: {
+ console.log(action.payload.data);
+ return {
+ ...state,
+ isLogin: (action.payload.data.errcode == 0),
+ role: action.payload.data.data ? action.payload.data.data.role:null,
+ loginState: (action.payload.data.errcode == 0)?MEMBER_STATUS:GUEST_STATUS,
+ userName: action.payload.data.data ? action.payload.data.data.username : null,
+ uid: action.payload.data.data ? action.payload.data.data._id : null,
+ server_ip: action.payload.data.data ? action.payload.data.data.server_ip:null
+ };
+ }
+ case LOGIN: {
+ if (action.payload.data.errcode === 0) {
+ return {
+ ...state,
+ isLogin: true,
+ loginState: MEMBER_STATUS,
+ uid: action.payload.data.data.uid,
+ userName: action.payload.data.data.username,
+ server_ip: action.payload.data.data.server_ip
+ };
+ } else {
+ return state;
+ }
+ }
+ case LOGIN_OUT: {
+ return{
+ ...state,
+ isLogin: false,
+ loginState: GUEST_STATUS,
+ userName: null,
+ uid: null
+ }
+ }
+ case LOGIN_TYPE: {
+ return {
+ ...state,
+ loginWrapActiveKey: action.index
+ };
+ }
+ case REGISTER: {
+ return {
+ ...state,
+ isLogin: true,
+ loginState: MEMBER_STATUS,
+ uid: action.payload.data.data.uid,
+ userName: action.payload.data.data.username
+ };
+ }
+ default:
+ return state;
+ }
+};
+
+// Action Creators
+export function checkLoginState() {
+ return(dispatch)=> {
+ axios.get('/user/status').then((res) => {
+ dispatch({
+ type: GET_LOGIN_STATE,
+ payload: res
+ });
+ }).catch((err) => {
+ console.log(err);
+ })
+ }
+}
+
+export function loginActions(data) {
+ return {
+ type: LOGIN,
+ payload: axios.post('/user/login', data)
+ };
+}
+
+export function regActions(data) {
+ const { email, password, userName } = data;
+ const param = {
+ email,
+ password,
+ username: userName
+ };
+ return {
+ type: REGISTER,
+ payload: axios.post('/user/reg', param)
+ };
+}
+
+export function logoutActions() {
+ return {
+ type: LOGIN_OUT,
+ payload: axios.get('./user/logout')
+ }
+}
+
+export function loginTypeAction(index) {
+ return{
+ type: LOGIN_TYPE,
+ index
+ }
+}
diff --git a/client/styles/common.scss b/client/styles/common.scss
index 1f81e740..b25b779f 100644
--- a/client/styles/common.scss
+++ b/client/styles/common.scss
@@ -61,6 +61,7 @@ em {
padding: 0 .24rem;
}
-.nav-tooltip {
- color: red;
+.m-container {
+ margin: .24rem auto;
+ padding: .24rem;
}
diff --git a/server/controllers/base.js b/server/controllers/base.js
index 3cbc4f86..668f1dea 100644
--- a/server/controllers/base.js
+++ b/server/controllers/base.js
@@ -19,6 +19,7 @@ class baseController {
async init(ctx) {
this.$user = null;
+ console.log(111111)
let ignoreRouter = [
'/user/login_by_token',
'/user/login',
@@ -26,7 +27,7 @@ class baseController {
'/user/status',
'/user/logout'
];
- if (ignoreRouter.indexOf(ctx.path) > -1) {
+ if (ignoreRouter.indexOf(ctx.path) > -1) {
this.$auth = true;
} else {
await this.checkLogin(ctx);
@@ -61,10 +62,14 @@ class baseController {
}
}
+ /**
+ *
+ * @param {*} ctx
+ */
async getLoginStatus(ctx) {
if (await this.checkLogin(ctx) === true) {
- let result = yapi.commons.fieldSelect(this.$user, ['_id', 'username', 'email', 'up_time', 'add_time', 'role']);
+ let result = yapi.commons.fieldSelect(this.$user, ['_id', 'username', 'email', 'up_time', 'add_time', 'role', 'type']);
result.server_ip = yapi.WEBCONFIG.server_ip;
return ctx.body = yapi.commons.resReturn(result);
}
diff --git a/server/controllers/project.js b/server/controllers/project.js
index 9840f2c1..d50f664a 100644
--- a/server/controllers/project.js
+++ b/server/controllers/project.js
@@ -525,30 +525,60 @@ class projectController extends baseController {
* @param {String} project_id
*/
async download(ctx) {
- const project_id = ctx.request.query.project_id;
- let interfaceInst = yapi.getInst(interfaceModel);
- let count = await interfaceInst.list(project_id);
- console.log(count);
- const arr = JSON.stringify(count.map(function(item) {
- // 返回的json模板数据: item.res_body
- const mockData = Mock.mock(
- yapi.commons.json_parse(item.res_body)
- );
- return {
- path: item.path,
- mock: mockData
+ const project_id = ctx.request.query.project_id;
+ let interfaceInst = yapi.getInst(interfaceModel);
+ // 根据 project_id 获取接口数据
+ let count = await interfaceInst.list(project_id);
+
+ if (!project_id) {
+ return ctx.body = yapi.commons.resReturn(null, 405, '项目id不能为空');
+ } else if (!count) {
+ return ctx.body = yapi.commons.resReturn(null, 401, '项目id不存在');
}
- }));
- // console.log(arr);
- const fileName = 'mock.js';
- ctx.attachment(fileName);
- await send(ctx, fileName, { root: __dirname + '/public' });
+ const arr = JSON.stringify(count.map(function(item) {
+ // 返回的json模板数据: item.res_body
+ const mockData = Mock.mock(
+ yapi.commons.json_parse(item.res_body)
+ );
+ return {
+ path: item.path,
+ mock: mockData
+ }
+ }));
- const res = `
- var data = ${arr}`
- .trim();
- return ctx.body = res;
+ const fileName = 'mock.js';
+ ctx.attachment(fileName);
+ await send(ctx, fileName, { root: __dirname + '/public' });
+
+ const res = `
+ var Mock = require('mockjs');
+ var xhook = require('xhook');
+ var data = ${arr};
+ function run() {
+ xhook.before(function(request, callback) {
+ setTimeout(function() {
+ var res;
+ data.forEach((item) => {
+ // 请求的接口在 data 中存在
+ if(request.url === item.path) {
+ res = {
+ status: 200,
+ text: Mock.mock(item.mock)
+ }
+ }
+ });
+ if (res) {
+ callback(res);
+ }else {
+ callback({ status: 405, text: '接口不存在' });
+ }
+ }, 500);
+ });
+ }
+ module.exports = run;`
+ .trim();
+ return ctx.body = res;
}
}
diff --git a/server/controllers/user.js b/server/controllers/user.js
index 83eb4eec..783ba9d8 100644
--- a/server/controllers/user.js
+++ b/server/controllers/user.js
@@ -54,8 +54,8 @@ class userController extends baseController {
email: result.email,
add_time: result.add_time,
up_time: result.up_time,
- server_ip: yapi.WEBCONFIG.server_ip
-
+ server_ip: yapi.WEBCONFIG.server_ip,
+ type: 'site'
}, 0, 'logout success...');
} else {
return ctx.body = yapi.commons.resReturn(null, 405, '密码错误');
@@ -555,26 +555,24 @@ class userController extends baseController {
}
/**
- * 根据路由id获取面包屑数据
- * @interface /user/nav
+ * 根据路由id初始化项目数据
+ * @interface /user/project
* @method GET
* @category user
* @foldnumber 10
* @param {String} type 可选group|interface|project
* @param {Number} id
* @return {Object}
- * @example ./api/user/nav.json
+ * @example
*/
- async nav(ctx) {
+ async project(ctx) {
let { id, type } = ctx.request.query;
let result = {};
try {
if (type === 'interface') {
let interfaceInst = yapi.getInst(interfaceModel);
let interfaceData = await interfaceInst.get(id)
- result["interface_id"] = interfaceData._id;
- result["interface_name"] = interfaceData.path;
-
+ result.interface = interfaceData;
type = 'project';
id = interfaceData.project_id;
}
@@ -582,17 +580,38 @@ class userController extends baseController {
if (type === 'project') {
let projectInst = yapi.getInst(projectModel);
let projectData = await projectInst.get(id);
- result["project_id"] = projectData._id;
- result["project_name"] = projectData.prd_host + projectData.basepath;
+ result.project = projectData.toObject();
+ let ownerAuth = await this.checkAuth(id, 'project', 'danger'), devAuth;
+ if(ownerAuth){
+ result.project.role = 'owner'
+ }else{
+ devAuth = await this.checkAuth(id, 'project', 'site');
+ if(devAuth){
+ result.project.role = 'dev'
+ }else{
+ result.project.role = 'member'
+ }
+ }
type = 'group';
- id = projectData.group_id
+ id = projectData.group_id;
}
if (type === 'group') {
let groupInst = yapi.getInst(groupModel);
let groupData = await groupInst.get(id);
- result["group_id"] = groupData._id;
- result["group_name"] = groupData.group_name;
+ result.group = groupData.toObject();
+ let ownerAuth = await this.checkAuth(id, 'group', 'danger'), devAuth;
+ if(ownerAuth){
+ result.group.role = 'owner'
+ }else{
+ devAuth = await this.checkAuth(id, 'group', 'site');
+ if(devAuth){
+ result.group.role = 'dev'
+ }else{
+ result.group.role = 'member'
+ }
+ }
+
}
return ctx.body = yapi.commons.resReturn(result)
diff --git a/server/models/interface.js b/server/models/interface.js
index dc65feae..a5a4f6e7 100644
--- a/server/models/interface.js
+++ b/server/models/interface.js
@@ -74,7 +74,6 @@ class interfaceModel extends baseModel {
}
list(project_id) {
- console.log(project_id);
return this.model.find({
project_id: project_id
})
diff --git a/server/router.js b/server/router.js
index 0aebdb98..82e57a97 100644
--- a/server/router.js
+++ b/server/router.js
@@ -145,8 +145,8 @@ const routerConfig = {
"method": "get"
},
{
- "action": "nav",
- "path": "nav",
+ "action": "project",
+ "path": "project",
"method": "get"
},{
"action": "avatar",
diff --git a/server_dist/controllers/base.js b/server_dist/controllers/base.js
index ac2000d4..d8e5cef2 100644
--- a/server_dist/controllers/base.js
+++ b/server_dist/controllers/base.js
@@ -66,22 +66,23 @@ var baseController = function () {
switch (_context.prev = _context.next) {
case 0:
this.$user = null;
+ console.log(111111);
ignoreRouter = ['/user/login_by_token', '/user/login', '/user/reg', '/user/status', '/user/logout'];
if (!(ignoreRouter.indexOf(ctx.path) > -1)) {
- _context.next = 6;
+ _context.next = 7;
break;
}
this.$auth = true;
- _context.next = 8;
+ _context.next = 9;
break;
- case 6:
- _context.next = 8;
+ case 7:
+ _context.next = 9;
return this.checkLogin(ctx);
- case 8:
+ case 9:
case 'end':
return _context.stop();
}
@@ -162,6 +163,11 @@ var baseController = function () {
return checkLogin;
}()
+ /**
+ *
+ * @param {*} ctx
+ */
+
}, {
key: 'getLoginStatus',
value: function () {
@@ -182,7 +188,7 @@ var baseController = function () {
break;
}
- result = _yapi2.default.commons.fieldSelect(this.$user, ['_id', 'username', 'email', 'up_time', 'add_time', 'role']);
+ result = _yapi2.default.commons.fieldSelect(this.$user, ['_id', 'username', 'email', 'up_time', 'add_time', 'role', 'type']);
result.server_ip = _yapi2.default.WEBCONFIG.server_ip;
return _context3.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(result));
diff --git a/server_dist/controllers/project.js b/server_dist/controllers/project.js
index 5a575fc0..72adcd62 100644
--- a/server_dist/controllers/project.js
+++ b/server_dist/controllers/project.js
@@ -1192,13 +1192,30 @@ var projectController = function (_baseController) {
case 0:
project_id = ctx.request.query.project_id;
interfaceInst = _yapi2.default.getInst(_interface2.default);
+ // 根据 project_id 获取接口数据
+
_context12.next = 4;
return interfaceInst.list(project_id);
case 4:
count = _context12.sent;
- console.log(count);
+ if (project_id) {
+ _context12.next = 9;
+ break;
+ }
+
+ return _context12.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 405, '项目id不能为空'));
+
+ case 9:
+ if (count) {
+ _context12.next = 11;
+ break;
+ }
+
+ return _context12.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '项目id不存在'));
+
+ case 11:
arr = (0, _stringify2.default)(count.map(function (item) {
// 返回的json模板数据: item.res_body
var mockData = _mockjs2.default.mock(_yapi2.default.commons.json_parse(item.res_body));
@@ -1207,19 +1224,17 @@ var projectController = function (_baseController) {
mock: mockData
};
}));
- // console.log(arr);
-
fileName = 'mock.js';
ctx.attachment(fileName);
- _context12.next = 11;
+ _context12.next = 16;
return send(ctx, fileName, { root: __dirname + '/public' });
- case 11:
- res = ('\n var data = ' + arr).trim();
+ case 16:
+ res = ('\n var Mock = require(\'mockjs\');\n var xhook = require(\'xhook\');\n var data = ' + arr + ';\n function run() {\n xhook.before(function(request, callback) {\n setTimeout(function() {\n var res;\n data.forEach((item) => {\n // \u8BF7\u6C42\u7684\u63A5\u53E3\u5728 data \u4E2D\u5B58\u5728\n if(request.url === item.path) {\n res = {\n status: 200,\n text: Mock.mock(item.mock)\n }\n }\n });\n if (res) {\n callback(res);\n }else {\n callback({ status: 405, text: \'\u63A5\u53E3\u4E0D\u5B58\u5728\' });\n }\n }, 500);\n });\n }\n module.exports = run;').trim();
return _context12.abrupt('return', ctx.body = res);
- case 13:
+ case 18:
case 'end':
return _context12.stop();
}
diff --git a/server_dist/controllers/user.js b/server_dist/controllers/user.js
index 34a5bb3a..29da82bc 100644
--- a/server_dist/controllers/user.js
+++ b/server_dist/controllers/user.js
@@ -155,8 +155,8 @@ var userController = function (_baseController) {
email: result.email,
add_time: result.add_time,
up_time: result.up_time,
- server_ip: _yapi2.default.WEBCONFIG.server_ip
-
+ server_ip: _yapi2.default.WEBCONFIG.server_ip,
+ type: 'site'
}, 0, 'logout success...'));
case 19:
@@ -1157,22 +1157,22 @@ var userController = function (_baseController) {
}()
/**
- * 根据路由id获取面包屑数据
- * @interface /user/nav
+ * 根据路由id初始化项目数据
+ * @interface /user/project
* @method GET
* @category user
* @foldnumber 10
* @param {String} type 可选group|interface|project
* @param {Number} id
* @return {Object}
- * @example ./api/user/nav.json
+ * @example
*/
}, {
- key: 'nav',
+ key: 'project',
value: function () {
var _ref14 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee14(ctx) {
- var _ctx$request$query, id, type, result, interfaceInst, interfaceData, projectInst, projectData, groupInst, groupData;
+ var _ctx$request$query, id, type, result, interfaceInst, interfaceData, projectInst, projectData, ownerAuth, devAuth, groupInst, groupData, _ownerAuth, _devAuth;
return _regenerator2.default.wrap(function _callee14$(_context14) {
while (1) {
@@ -1183,7 +1183,7 @@ var userController = function (_baseController) {
_context14.prev = 2;
if (!(type === 'interface')) {
- _context14.next = 12;
+ _context14.next = 11;
break;
}
@@ -1194,67 +1194,121 @@ var userController = function (_baseController) {
case 7:
interfaceData = _context14.sent;
- result["interface_id"] = interfaceData._id;
- result["interface_name"] = interfaceData.path;
-
+ result.interface = interfaceData;
type = 'project';
id = interfaceData.project_id;
- case 12:
+ case 11:
if (!(type === 'project')) {
- _context14.next = 21;
+ _context14.next = 31;
break;
}
projectInst = _yapi2.default.getInst(_project2.default);
- _context14.next = 16;
+ _context14.next = 15;
return projectInst.get(id);
- case 16:
+ case 15:
projectData = _context14.sent;
- result["project_id"] = projectData._id;
- result["project_name"] = projectData.prd_host + projectData.basepath;
+ result.project = projectData.toObject();
+ _context14.next = 19;
+ return this.checkAuth(id, 'project', 'danger');
+
+ case 19:
+ ownerAuth = _context14.sent;
+ devAuth = void 0;
+
+ if (!ownerAuth) {
+ _context14.next = 25;
+ break;
+ }
+
+ result.project.role = 'owner';
+ _context14.next = 29;
+ break;
+
+ case 25:
+ _context14.next = 27;
+ return this.checkAuth(id, 'project', 'site');
+
+ case 27:
+ devAuth = _context14.sent;
+
+ if (devAuth) {
+ result.project.role = 'dev';
+ } else {
+ result.project.role = 'member';
+ }
+
+ case 29:
type = 'group';
id = projectData.group_id;
- case 21:
+ case 31:
if (!(type === 'group')) {
- _context14.next = 28;
+ _context14.next = 49;
break;
}
groupInst = _yapi2.default.getInst(_group2.default);
- _context14.next = 25;
+ _context14.next = 35;
return groupInst.get(id);
- case 25:
+ case 35:
groupData = _context14.sent;
- result["group_id"] = groupData._id;
- result["group_name"] = groupData.group_name;
+ result.group = groupData.toObject();
+ _context14.next = 39;
+ return this.checkAuth(id, 'group', 'danger');
- case 28:
+ case 39:
+ _ownerAuth = _context14.sent;
+ _devAuth = void 0;
+
+ if (!_ownerAuth) {
+ _context14.next = 45;
+ break;
+ }
+
+ result.group.role = 'owner';
+ _context14.next = 49;
+ break;
+
+ case 45:
+ _context14.next = 47;
+ return this.checkAuth(id, 'group', 'site');
+
+ case 47:
+ _devAuth = _context14.sent;
+
+ if (_devAuth) {
+ result.group.role = 'dev';
+ } else {
+ result.group.role = 'member';
+ }
+
+ case 49:
return _context14.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(result));
- case 31:
- _context14.prev = 31;
+ case 52:
+ _context14.prev = 52;
_context14.t0 = _context14['catch'](2);
return _context14.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(result, 422, _context14.t0.message));
- case 34:
+ case 55:
case 'end':
return _context14.stop();
}
}
- }, _callee14, this, [[2, 31]]);
+ }, _callee14, this, [[2, 52]]);
}));
- function nav(_x15) {
+ function project(_x15) {
return _ref14.apply(this, arguments);
}
- return nav;
+ return project;
}()
}]);
return userController;
diff --git a/server_dist/models/interface.js b/server_dist/models/interface.js
index 7caef0e3..d51903dd 100644
--- a/server_dist/models/interface.js
+++ b/server_dist/models/interface.js
@@ -117,7 +117,6 @@ var interfaceModel = function (_baseModel) {
}, {
key: 'list',
value: function list(project_id) {
- console.log(project_id);
return this.model.find({
project_id: project_id
}).sort({ _id: -1 }).exec();
diff --git a/server_dist/router.js b/server_dist/router.js
index 3d8a53e9..fcf42d42 100644
--- a/server_dist/router.js
+++ b/server_dist/router.js
@@ -162,8 +162,8 @@ var routerConfig = {
"path": "search",
"method": "get"
}, {
- "action": "nav",
- "path": "nav",
+ "action": "project",
+ "path": "project",
"method": "get"
}, {
"action": "avatar",
diff --git a/static/doc/api.html b/static/doc/api.html
index f587c9de..fb2d2110 100644
--- a/static/doc/api.html
+++ b/static/doc/api.html
@@ -191,6 +191,10 @@
/project/search
+
+
+ /project/download
+
@@ -227,13 +231,77 @@
- node
+ follow
+
+
+
+
+ col
+
+
+
+
+
+
+
+ log
+
+
+
@@ -266,7 +334,7 @@
源码位置:
- ./server/controllers/group.js:10
+ ./server/controllers/group.js:11
@@ -313,6 +381,18 @@
|
+
+ | owner_uid |
+ String |
+ 组长uid |
+
+
+
+
+ |
+ |
+
+
@@ -349,7 +429,7 @@
源码位置:
- ./server/controllers/group.js:64
+ ./server/controllers/group.js:184
@@ -411,7 +491,7 @@
源码位置:
- ./server/controllers/group.js:83
+ ./server/controllers/group.js:203
@@ -483,7 +563,7 @@
源码位置:
- ./server/controllers/group.js:120
+ ./server/controllers/group.js:240
@@ -583,7 +663,7 @@
源码位置:
- ./server/controllers/user.js:17
+ ./server/controllers/user.js:18
@@ -670,7 +750,7 @@
源码位置:
- ./server/controllers/user.js:63
+ ./server/controllers/user.js:64
@@ -703,7 +783,7 @@
源码位置:
- ./server/controllers/user.js:160
+ ./server/controllers/user.js:162
@@ -799,7 +879,7 @@
源码位置:
- ./server/controllers/user.js:229
+ ./server/controllers/user.js:227
@@ -896,7 +976,7 @@
源码位置:
- ./server/controllers/user.js:301
+ ./server/controllers/user.js:300
@@ -966,7 +1046,7 @@
源码位置:
- ./server/controllers/user.js:329
+ ./server/controllers/user.js:328
@@ -1028,7 +1108,7 @@
源码位置:
- ./server/controllers/user.js:367
+ ./server/controllers/user.js:366
@@ -1090,7 +1170,7 @@
源码位置:
- ./server/controllers/user.js:398
+ ./server/controllers/user.js:397
@@ -1182,7 +1262,7 @@
源码位置:
- ./server/controllers/user.js:457
+ ./server/controllers/user.js:511
@@ -1260,7 +1340,7 @@
源码位置:
- ./server/controllers/user.js:503
+ ./server/controllers/user.js:556
@@ -1351,7 +1431,7 @@
源码位置:
- ./server/controllers/project.js:35
+ ./server/controllers/project.js:37
@@ -1492,7 +1572,7 @@
源码位置:
- ./server/controllers/project.js:116
+ ./server/controllers/project.js:126
@@ -1576,7 +1656,7 @@
源码位置:
- ./server/controllers/project.js:148
+ ./server/controllers/project.js:169
@@ -1660,7 +1740,7 @@
源码位置:
- ./server/controllers/project.js:181
+ ./server/controllers/project.js:222
@@ -1738,7 +1818,7 @@
源码位置:
- ./server/controllers/project.js:209
+ ./server/controllers/project.js:247
@@ -1821,7 +1901,7 @@
源码位置:
- ./server/controllers/project.js:233
+ ./server/controllers/project.js:271
@@ -1858,26 +1938,6 @@
|
-
- | page |
- Number |
- 分页页码 |
-
-
- |
- |
-
-
-
- | limit |
- Number |
- 每页数据条目，默认为10 |
-
-
- |
- |
-
-
@@ -2068,7 +2128,7 @@
源码位置:
- ./server/controllers/project.js:279
+ ./server/controllers/project.js:312
@@ -2140,7 +2200,7 @@
源码位置:
- ./server/controllers/project.js:312
+ ./server/controllers/project.js:372
@@ -2300,7 +2360,7 @@
源码位置:
- ./server/controllers/project.js:404
+ ./server/controllers/project.js:463
@@ -2375,6 +2435,68 @@
}
+
+
+
+
+
+
+
+ 描述:
+ 下载项目的 Mock 数据
+
+
+
+ 源码位置:
+ ./server/controllers/project.js:518
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | project_id |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
-
描述:
- 获取节点列表
+ 获取关注项目列表
源码位置:
- ./server/controllers/log.js:12
+ ./server/controllers/follow.js:24
@@ -3209,169 +3331,926 @@
示例：
-
{
- "errcode": 0,
- "errmsg": "success",
- "data": {
- "total": 2,
- "list": [
- {
- "_id": 529,
- "name": "yapi",
- "desc": "aaa",
- "prd_host": "http://www.yapi.com",
- "basepath": "/a/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500465369,
- "up_time": 1500522419,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 558,
- "name": "12",
- "desc": "21\n",
- "prd_host": "http://11/",
- "basepath": "12/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500466250,
- "up_time": 1500466250,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 626,
- "name": "1233",
- "desc": "123",
- "prd_host": "http://1234/",
- "basepath": "1234/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500471230,
- "up_time": 1500471230,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 665,
- "name": "222",
- "desc": "222",
- "prd_host": "http://222/",
- "basepath": "222/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500471668,
- "up_time": 1500471668,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 704,
- "name": "333",
- "desc": "222333",
- "prd_host": "http://333/",
- "basepath": "333/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500471674,
- "up_time": 1500471674,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 743,
- "name": "444",
- "desc": "444",
- "prd_host": "https://444/",
- "basepath": "444/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500471695,
- "up_time": 1500471695,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 763,
- "name": "122333",
- "desc": "3/",
- "prd_host": "http://33/",
- "basepath": "33/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500481743,
- "up_time": 1500481743,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 778,
- "name": "555",
- "desc": "555",
- "prd_host": "https://555/",
- "basepath": "555/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500519203,
- "up_time": 1500519203,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- },
- {
- "_id": 823,
- "name": "5",
- "desc": "5",
- "prd_host": "http://5/",
- "basepath": "5/",
- "uid": 107,
- "group_id": 181,
- "add_time": 1500519769,
- "up_time": 1500519769,
- "__v": 0,
- "env": [],
- "members": [
- "107"
- ]
- }
- ],
- "userinfo": {
- "107": {
- "_id": 107,
- "username": "admin",
- "email": "admin@admin.com",
- "role": "admin",
- "add_time": 1500280333,
- "up_time": 1500373530
- }
- }
- }
-}
+
/follow/list
+
+
+
+
+
+
+
+
+
+ 描述:
+ 取消关注
+
+
+
+ 源码位置:
+ ./server/controllers/follow.js:60
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | id |
+ Number |
+ 关注id |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
示例：
+
/follow/del
+
+
+
+
+
+
+
+ 描述:
+ 添加关注
+
+
+
+ 源码位置:
+ ./server/controllers/follow.js:86
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | uid |
+ Number |
+ 用户id |
+
+
+
+
+ |
+ |
+
+
+
+ | projectid |
+ Number |
+ 项目id |
+
+
+
+
+ |
+ |
+
+
+
+ | projectname |
+ String |
+ 项目名 |
+
+
+
+
+ |
+ |
+
+
+
+ | icon |
+ String |
+ 项目icon |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
示例：
+
/follow/add
+
+
+
+
+
+
+
+ 描述:
+ 获取所有接口集
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:12
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | project_id |
+ String |
+ email名称，不能为空 |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 增加接口集
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:33
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | project_id |
+ Number |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | name |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | desc |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 获取一个接口集下的所有的接口用例
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:77
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | col_id |
+ String |
+ 接口集id |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 增加一个接口用例
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:99
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | casename |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | col_id |
+ Number |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | project_id |
+ Number |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | env |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | domain |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | path |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | method |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | req_query |
+ Object |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | req_headers |
+ Object |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | req_body_type |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | req_body_form |
+ Array |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | req_body_other |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 获取一个接口用例详情
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:164
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | caseid |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 更新一个接口集name或描述
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:185
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | name |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ | desc |
+ String |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 更新多个接口case index
+
+
+
+ 源码位置:
+ ./server/controllers/interfaceCol.js:211
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | id, index |
+ Array |
+ |
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ 描述:
+ 获取动态列表
+
+
+
+ 源码位置:
+ ./server/controllers/log.js:28
+
+
+
+
+ 参数:
+
+
+
+
+
+
+
+
+
+
+
+ | 参数名 |
+ 类型 |
+ 描述 |
+ 必选 |
+ 支持版本 |
+
+
+
+
+ | uid |
+ Number |
+ 用户id， 不能为空 |
+
+
+
+
+ |
+ |
+
+
+
+ | page |
+ Number |
+ 分页页码 |
+
+
+ |
+ |
+
+
+
+ | limit |
+ Number |
+ 分页大小 |
+
+
+ |
+ |
+
+
+
+
+
+
+
示例：
+
/log/list
+
+
+
+
YApi : ./server/controllers/follow.js
+
源代码
+
+
+
+
+
+
+ import yapi from '../yapi.js';
+import baseController from './base.js';
+import followModel from '../models/follow';
+
+class followController extends baseController {
+ constructor(ctx) {
+ super(ctx);
+ this.Model = yapi.getInst(followModel);
+ // try{
+ // var res = this.Model.save({
+ // uid: 107,
+ // projectid: 221,
+ // projectname: 'Flight',
+ // icon: 'code'
+ // });
+ // // var res = this.Model.del(107);
+ // ctx.body = yapi.commons.resReturn(null, 200,res);
+ // }catch(err){
+ // ctx.body = yapi.commons.resReturn(null, 402, err.message);
+ // }
+
+
+ }
+
+ /**
+ * 获取关注项目列表
+ * @interface /follow/list
+ * @method GET
+ * @category follow
+ * @foldnumber 10
+ * @param {Number} uid 用户id， 不能为空
+ * @param {Number} [page] 分页页码
+ * @param {Number} [limit] 分页大小
+ * @returns {Object}
+ * @example /follow/list
+ */
+
+ async list(ctx) {
+ let uid = ctx.request.query.uid,
+ page = ctx.request.query.page || 1,
+ limit = ctx.request.query.limit || 10;
+
+ if (!uid) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '用户id不能为空');
+ }
+
+ try {
+ let result = await this.Model.listWithPaging(uid, page, limit);
+ let count = await this.Model.listCount(uid);
+
+ ctx.body = yapi.commons.resReturn({
+ total: Math.ceil(count / limit),
+ list: result
+ });
+ } catch (err) {
+ ctx.body = yapi.commons.resReturn(null, 402, err.message);
+ }
+ }
+
+
+ /**
+ * 取消关注
+ * @interface /follow/list
+ * @method POST
+ * @category follow
+ * @foldnumber 10
+ * @param {Number} id 关注id
+ * @returns {Object}
+ * @example /follow/del
+ */
+
+ async del(ctx) {
+ let params = ctx.request.body;
+
+ if(params.followid){
+ return ctx.body = yapi.commons.resReturn(null, 400, '关注id不能为空');
+ }
+
+ try {
+ let result = await this.Model.del(params.id);
+ ctx.body = yapi.commons.resReturn(result);
+ } catch (e) {
+ ctx.body = yapi.commons.resReturn(null, 402, e.message);
+ }
+ }
+
+ /**
+ * 添加关注
+ * @interface /follow/list
+ * @method POST
+ * @category follow
+ * @foldnumber 10
+ * @param {Number} uid 用户id
+ * @param {Number} projectid 项目id
+ * @param {String} projectname 项目名
+ * @param {String} icon 项目icon
+ * @returns {Object}
+ * @example /follow/add
+ */
+
+ async add(ctx) {
+ let params = ctx.request.body;
+ params = yapi.commons.handleParams(params, {
+ uid: 'number',
+ projectid: 'number',
+ projectname: 'string',
+ icon: 'string'
+ });
+
+ if (!params.uid) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '用户id不为空');
+ }
+
+ if (!params.projectid) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
+ }
+
+ let checkRepeat = await this.Model.checkProjectRepeat(params.uid,params.projectid);
+ if (checkRepeat) {
+ return ctx.body = yapi.commons.resReturn(null, 401, '项目已关注');
+ }
+
+ if (!params.projectname) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '项目名不能为空');
+ }
+ if (!params.icon) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '项目图标标志不能为空');
+ }
+
+ let data = {
+ uid: params.uid,
+ projectid: params.projectid,
+ projectname: params.projectname,
+ icon: params.icon
+ };
+
+ try {
+ let result = await this.Model.save(data);
+ result = yapi.commons.fieldSelect(result, ['_id', 'uid', 'projectid', 'projectname', 'icon']);
+ ctx.body = yapi.commons.resReturn(result);
+ } catch (e) {
+ ctx.body = yapi.commons.resReturn(null, 402, e.message);
+ }
+ }
+
+}
+
+module.exports = followController;
+
+
+
+
+
+
+
+
+
+
+
+
+
YApi : ./server/controllers/interfaceCol.js
+
源代码
+
+
+
+
+
+
+ import interfaceColModel from '../models/interfaceCol.js';
+import interfaceCaseModel from '../models/interfaceCase.js';
+import baseController from './base.js';
+import yapi from '../yapi.js';
+
+class interfaceColController extends baseController{
+ constructor(ctx) {
+ super(ctx);
+ this.colModel = yapi.getInst(interfaceColModel);
+ this.caseModel = yapi.getInst(interfaceCaseModel);
+ }
+
+ /**
+ * 获取所有接口集
+ * @interface /col/list
+ * @method GET
+ * @category col
+ * @foldnumber 10
+ * @param {String} project_id email名称，不能为空
+ * @returns {Object}
+ * @example
+ */
+ async list(ctx){
+ try {
+ let id = ctx.query.project_id;
+ let inst = this.colModel(interfaceColModel);
+ let result = await inst.list(id);
+ ctx.body = yapi.commons.resReturn(result);
+ } catch (e) {
+ ctx.body = yapi.commons.resReturn(null, 402, e.message);
+ }
+ }
+
+ /**
+ * 增加接口集
+ * @interface /col/add_col
+ * @method POST
+ * @category col
+ * @foldnumber 10
+ * @param {Number} project_id
+ * @param {String} name
+ * @param {String} desc
+ * @returns {Object}
+ * @example
+ */
+
+ async addCol(ctx){
+ try{
+ let params = ctx.request.body;
+ params = yapi.commons.handleParams(params, {
+ name: 'string',
+ project_id: 'number',
+ desc: 'string'
+ });
+
+ if (!params.project_id) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
+ }
+ if(!params.name){
+ return ctx.body = yapi.commons.resReturn(null, 400, '名称不能为空');
+ }
+
+ let result = await this.colModel.save({
+ name: params.name,
+ project_id: params.project_id,
+ desc: params.desc,
+ uid: this.getUid(),
+ add_time: yapi.commons.time(),
+ up_time: yapi.commons.time()
+ })
+ ctx.body = yapi.commons.resReturn(result);
+
+ }catch(e){
+ ctx.body = yapi.commons.resReturn(null, 402, e.message);
+ }
+ }
+
+ /**
+ * 获取一个接口集下的所有的接口用例
+ * @interface /col/case_list
+ * @method GET
+ * @category col
+ * @foldnumber 10
+ * @param {String} col_id 接口集id
+ * @returns {Object}
+ * @example
+ */
+
+ async getCaseList(ctx){
+ try {
+ let id = ctx.query.col_id;
+ let inst = yapi.getInst(interfaceCaseModel);
+ let result = await inst.list(id);
+ ctx.body = yapi.commons.resReturn(result);
+ } catch (e) {
+ ctx.body = yapi.commons.resReturn(null, 402, e.message);
+ }
+ }
+
+ /**
+ * 增加一个接口用例
+ * @interface /col/add_case
+ * @method POST
+ * @category col
+ * @foldnumber 10
+ * @param {String} casename
+ * @param {Number} col_id
+ * @param {Number} project_id
+ * @param {String} env
+ * @param {String} domain
+ * @param {String} path
+ * @param {String} method
+ * @param {Object} req_query
+ * @param {Object} req_headers
+ * @param {String} req_body_type
+ * @param {Array} req_body_form
+ * @param {String} req_body_other
+ * @returns {Object}
+ * @example
+ */
+
+ async addCase(ctx){
+ try{
+ let params = ctx.request.body;
+ params = yapi.commons.handleParams(params, {
+ casename: 'string',
+ project_id: 'number',
+ col_id: 'number',
+ env: 'string',
+ domain: 'string',
+ method: 'string'
+ });
+
+ if (!params.project_id) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
+ }
+ if (!params.col_id) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
+ }
+ if (!params.env) {
+ return ctx.body = yapi.commons.resReturn(null, 400, '缺少环境配置');
+ }
+ if (!params.path) {
+ return ctx.body = yapi.commons.resReturn(null, 400, 'path 不能为空');
+ }
+
+
+ if(!params.casename){
+ return ctx.body = yapi.commons.resReturn(null, 400, '用例名称不能为空');
+ }
+
+ params.uid = this.getUid();
+ params.index = 0;
+ params.add_time = yapi.commons.time();
+ params.up_time = yapi.commons.time();
+ let result = await this.caseModel.save(params);
+
+ ctx.body = yapi.commons.resReturn(result);
+
+ }catch(e){
+ ctx.body = yapi.commons.resReturn(null, 402, e.message);
+ }
+ }
+
+ /**
+ * 获取一个接口用例详情
+ * @interface /col/case
+ * @method GET
+ * @category col
+ * @foldnumber 10
+ * @param {String} caseid
+ * @returns {Object}
+ * @example
+ */
+
+ async getCase(ctx){
+ try{
+ let id = ctx.query.caseid;
+ let result = await this.caseModel.get(id);
+ ctx.body = yapi.commons.resReturn(result);
+ }catch(e){
+ ctx.body = yapi.commons.resReturn(null, 400, e.message)
+ }
+ }
+
+ /**
+ * 更新一个接口集name或描述
+ * @interface /col/up_col
+ * @method POST
+ * @category col
+ * @foldnumber 10
+ * @param {String} name
+ * @param {String} desc
+ * @returns {Object}
+ * @example
+ */
+
+ async upCol(ctx){
+ try{
+ let params = ctx.request.body;
+ let result = await this.caseModel.up(params.col_id, {
+ name: params.col_name,
+ desc: params.col_desc,
+ up_time: yapi.commons.time()
+ })
+ ctx.body = yapi.commons.resReturn(result)
+ }catch(e){
+ ctx.body = yapi.commons.resReturn(null, 400, e.message)
+ }
+ }
+
+ /**
+ * 更新多个接口case index
+ * @interface /col/up_col_index
+ * @method POST
+ * @category col
+ * @foldnumber 10
+ * @param {Array} [id, index]
+ * @returns {Object}
+ * @example
+ */
+
+ async upCaseIndex(ctx){
+ try{
+ let params = ctx.request.body;
+ if(!params || !Array.isArray(params)){
+ ctx.body = yapi.commons.resReturn(null, 400, "请求参数必须是数组")
+ }
+ params.forEach((item) => {
+ if(item.id && item.index){
+ this.caseModel.upCaseIndex(item.id, item.index).then((res) => {}, (err) => {
+ yapi.commons.log(err.message, 'error')
+ })
+ }
+
+ })
+
+ return ctx.body = yapi.commons.resReturn('success')
+ }catch(e){
+ ctx.body = yapi.commons.resReturn(null, 400, e.message)
+ }
+ }
+
+ /**
+ * 删除一个接口集
+ * @interface /col/del_col
+ * @method GET
+ * @category col
+ * @foldnumber 10
+ * @param {String}
+ * @returns {Object}
+ * @example
+ */
+
+ async delCol(ctx){
+ try{
+ let id = ctx.request.body.colid;
+ let colData = await this.colModel.get(id);
+ if(!colData){
+ ctx.body = yapi.commons.resReturn(null, 400, "不存在的id")
+ }
+
+ if(colData.uid !== this.getUid()){
+ let auth = await this.checkAuth(colData.project_id, 'project', 'danger')
+ if(!auth){
+ return ctx.body = yapi.commons.resReturn(null, 400, '没有权限');
+ }
+ }
+
+ let result = await this.colModel.del(caseid);
+ return ctx.body = yapi.commons.resReturn(result);
+
+
+ }catch(e){
+ yapi.commons.resReturn(null, 400, e.message)
+ }
+ }
+
+ /**
+ *
+ * @param {*} ctx
+ */
+
+ async delCase(ctx){
+ try{
+ let caseid = ctx.request.body.caseid;
+ let caseData = await this.caseModel.get(caseid);
+ if(!caseData){
+ ctx.body = yapi.commons.resReturn(null, 400, "不存在的caseid")
+ }
+
+ if(caseData.uid !== this.getUid()){
+ let auth = await this.checkAuth(caseData.project_id, 'project', 'danger')
+ if(!auth){
+ return ctx.body = yapi.commons.resReturn(null, 400, '没有权限');
+ }
+ }
+
+ let result = await this.caseModel.del(caseid);
+ return ctx.body = yapi.commons.resReturn(result);
+
+
+ }catch(e){
+ yapi.commons.resReturn(null, 400, e.message)
+ }
+ }
+
+
+}
+
+module.exports = interfaceColController
+
+
+
+
+
+
+
+
+
亲爱的用户：
您好，感谢使用YApi,系统检测您是第一次用Qsso账号登录YApi服务,您的Email是： ${email} ，初始化密码为：${passsalt}
`
+ contents: `亲爱的用户：
您好，感谢使用YApi平台.
`
});
}
@@ -237,10 +239,6 @@ class userController extends baseController {
}
}
- async forgetPassword() { }
-
- async resetPassword() { }
-
setLoginCookie(uid, passsalt) {
let token = jwt.sign({ uid: uid }, passsalt, { expiresIn: '7 days' });
@@ -298,7 +296,8 @@ class userController extends baseController {
passsalt: passsalt,
role: 'member',
add_time: yapi.commons.time(),
- up_time: yapi.commons.time()
+ up_time: yapi.commons.time(),
+ type: "site"
};
if (!data.username) {
@@ -460,10 +459,6 @@ class userController extends baseController {
up_time: yapi.commons.time()
};
- if (this.getRole() === 'admin') {
- params.role && (data.role = params.role);
- }
-
params.username && (data.username = params.username);
params.email && (data.email = params.email);
@@ -482,6 +477,65 @@ class userController extends baseController {
}
}
+ /**
+ *
+ * @param {*} basecode base64编码，通过h5 api传给后端
+ */
+
+ async uploadAvatar(ctx) {
+ try {
+ let basecode = ctx.request.body.basecode;
+ if(!basecode){
+ return ctx.body = yapi.commons.resReturn(null, 400, 'basecode不能为空')
+ }
+ let pngPrefix = 'data:image/png;base64,';
+ let jpegPrefix = 'data:image/jpeg;base64,';
+ let type;
+ if(basecode.substr(0, pngPrefix.length ) === pngPrefix){
+ basecode = basecode.substr(pngPrefix.length);
+ type = 'image/png';
+ }else if(basecode.substr(0, jpegPrefix.length ) === jpegPrefix){
+ basecode = basecode.substr(jpegPrefix.length);
+ type = 'image/jpeg';
+ }else{
+ return ctx.body = yapi.commons.resReturn(null, 400, '仅支持jpeg和png格式的图片')
+ }
+ let strLength = basecode.length;
+ if(parseInt(strLength-(strLength/8)*2) > 200000){
+ return ctx.body = yapi.commons.resReturn(null, 400, '图片大小不能超过200kb');
+ }
+
+ let avatarInst = yapi.getInst(avatarModel);
+ let result = await avatarInst.up(this.getUid(), basecode, type)
+ ctx.body = yapi.commons.resReturn(result);
+
+ } catch (e) {
+ ctx.body = yapi.commons.resReturn(null, 401, e.message);
+ }
+
+ }
+
+ async avatar(ctx) {
+
+ try{
+ let avatarInst = yapi.getInst(avatarModel);
+ let data = await avatarInst.get(this.getUid());
+ let dataBuffer, type;
+ if(!data || !data.basecode){
+ dataBuffer = yapi.fs.readFileSync(yapi.path.join(yapi.WEBROOT, 'static/image/avatar.png'));
+ type = 'image/png'
+ }else{
+ type = data.type;
+ dataBuffer = new Buffer(data.basecode, 'base64');
+ }
+
+ ctx.set('Content-type', type);
+ ctx.body = dataBuffer;
+ }catch(err){
+ ctx.body = 'error:' + err.message
+ }
+ }
+
/**
* 模糊搜索用户名或者email
* @interface /user/search
@@ -523,7 +577,6 @@ class userController extends baseController {
];
let filteredRes = common.filterRes(queryList, rules);
- console.log(queryList); // eslint-disable-line
return ctx.body = yapi.commons.resReturn(filteredRes, 0, 'ok');
}
@@ -548,6 +601,7 @@ class userController extends baseController {
let interfaceData = await interfaceInst.get(id)
result["interface_id"] = interfaceData._id;
result["interface_name"] = interfaceData.path;
+
type = 'project';
id = interfaceData.project_id;
}
diff --git a/ykit.js b/ykit.js
index 7dacf0c1..7d3b2f98 100644
--- a/ykit.js
+++ b/ykit.js
@@ -6,6 +6,67 @@ var assetsPluginInstance = new AssetsPlugin({
return 'window.WEBPACK_ASSETS = ' + JSON.stringify(assets);
}
})
+
+function handleCommonsChunk(webpackConfig) {
+ var commonsChunk = {
+ //filename: 'scripts/[name]@[chunkhash][ext]',
+ vendors: {
+ lib: ['react', 'redux',
+ 'redux-thunk',
+ 'react-dom',
+ 'redux-promise',
+ 'react-router-dom',
+ 'prop-types'
+
+ ],
+ lib2: [
+ 'axios',
+ 'moment'
+ ]
+ }
+ },
+ chunks = [],
+ filenameTpl = webpackConfig.output[this.env],
+ vendors;
+
+
+
+ if (typeof commonsChunk === 'object' && commonsChunk !== undefined) {
+ if (typeof commonsChunk.name === 'string' && commonsChunk) {
+ chunks.push(commonsChunk.name);
+ }
+ vendors = commonsChunk.vendors;
+ if (typeof vendors === 'object' && vendors !== undefined) {
+ var i = 0;
+ for (var name in vendors) {
+ if (vendors.hasOwnProperty(name) && vendors[name]) {
+ i++;
+ chunks.push(name);
+ webpackConfig.entry[name] = Array.isArray(vendors[name]) ? vendors[name] : [vendors[name]];
+ }
+ }
+ if (i > 0) {
+ chunks.push('manifest');
+ }
+
+ }
+
+ if (chunks.length > 0) {
+ let chunkFilename = filenameTpl.filename
+ chunkFilename = chunkFilename.replace("[ext]", '.js')
+ webpackConfig.plugins.push(
+ new this.webpack.optimize.CommonsChunkPlugin({
+ name: chunks,
+ filename: chunkFilename,
+ minChunks: commonsChunk.minChunks ? commonsChunk.minChunks : 2
+ })
+ );
+
+ }
+ }
+}
+
+
module.exports = {
plugins: [{
name: 'antd',
@@ -28,45 +89,35 @@ module.exports = {
exports: [
'./index.js'
],
- commonsChunk: {
- //filename: 'scripts/[name]@[chunkhash][ext]',
- vendors: {
- lib: ['react', 'redux',
- 'redux-thunk',
- 'react-dom',
- 'redux-promise',
- 'react-router-dom',
- 'prop-types'
-
- ],
- lib2:[
- 'axios',
- 'moment'
- ]
- }
- },
modifyWebpackConfig: function (baseConfig) {
var ENV_PARAMS = {};
switch (this.env) {
case 'local':
- ENV_PARAMS = {development: true};
+ ENV_PARAMS = { development: true };
break;
case 'dev':
- ENV_PARAMS = {development: true};
+ ENV_PARAMS = { development: true };
break;
case 'prd':
- ENV_PARAMS = {development: false};
+ ENV_PARAMS = { development: false };
break;
default:
- }
+ }
+
baseConfig.plugins.push(new this.webpack.DefinePlugin({
- ENV_PARAMS: JSON.stringify(ENV_PARAMS)
+ ENV_PARAMS: JSON.stringify(ENV_PARAMS)
}))
+
+ //初始化配置
baseConfig.devtool = 'cheap-module-eval-source-map'
baseConfig.context = path.resolve(__dirname, "client");
baseConfig.output.prd.path = 'static/prd';
baseConfig.output.prd.publicPath = '';
baseConfig.output.prd.filename = '[name]@[chunkhash][ext]'
+
+ //commonsChunk
+ handleCommonsChunk.call(this, baseConfig)
+
baseConfig.module.loaders.push({
test: /\.(sass|scss)$/,
loader: ykit.ExtractTextPlugin.extract(
-
-#### 1.1 项目分组
-
-登录之后进到项目首页，左边侧边栏显示的即分组列表。
-
-
-
-管理员有权限添加或删除分组。
-
-
-
-> 分组名称具有唯一性
-
-#### 1.2 项目
-
-选中不同的分组，右边会显示该分组下的项目列表。
-
-
-
-创建项目需要填写项目名称，项目线上域名（添加完成后可配置项目其他环境域名），项目接口基本路径（接口路径前面相同的部分）以及项目描述。
-
-
-
-> 项目『线上域名 + 基本路径』具有唯一性
-
-#### 1.3 接口
-
-点击项目名称，进入该项目接口列表。
-
-
-
-点击编辑，进入接口详情页（之后接口详情页和编辑也会分开），可以编辑接口或者请求测试真实接口。
-
-
-
-
+## 二、特性
+* 完善的项目接口管理功能
+* 易用的MockServer
+* 类gitlab的用户管理和权限管理功能
+* 强大的接口集功能
-### 2 Mock功能
-