mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-01-30 13:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: merge

Browse Source
This commit is contained in:
zwjamnsss 2017-07-18 18:56:47 +08:00
commit 62a9f7ea8d
46 changed files with 2043 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -38,4 +38,3 @@ runtime/init.lock
runtime/log
prd/
dev/

2
client/ReduxContainer.js
View File

@ -4,12 +4,14 @@ import group from './reducer/group/group.js'
import project from './reducer/group/project.js'
import Interface from './reducer/Interface/InterfaceReducer.js'
import news from './reducer/news/news.js'
import user from './reducer/user/user.js'
export default {
group,
login,
LoginRedux,
Interface,
user,
project,
news
}

15
client/actions/project.js
View File

@ -1,17 +1,25 @@
import {
FETCH_PROJECT_LIST,
PROJECT_ADD
} from '../constants/action-types.js';
import axios from 'axios';
const fetchProjectList = (data) => {
return {
type: FETCH_PROJECT_LIST,
payload: axios.get('/project/list', {params: data})
}
}
const addProject = (data) => {
const { name, prd_host, basepath, desc } = data;
const { name, prd_host, basepath, desc, group_id } = data;
const param = {
name,
prd_host,
basepath,
desc
desc,
group_id
}
console.log(param);
return {
type: PROJECT_ADD,
// payload 可以返回 Promise，异步请求使用 axios 即可
@ -20,5 +28,6 @@ const addProject = (data) => {
}
export default {
fetchProjectList,
addProject
}

10
client/actions/user.js Normal file
View File

@ -0,0 +1,10 @@
import {
CHANGE_CUR_UID
} from '../constants/action-types.js'
export function changeCurUid(curUid) {
return {
type: CHANGE_CUR_UID,
data: curUid
}
}

5
client/common.js Normal file
View File

@ -0,0 +1,5 @@
import moment from 'moment'
exports.formatTime = (timestamp) => {
return moment.unix(timestamp).format("YYYY-MM-DD:HH:mm:ss")
}

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

@ -10,19 +10,20 @@ const { Header } = Layout;
const ToolUser = (props)=> (
<ul>
<li><Icon type="question-circle-o" />帮助</li>
<li><Icon type="user" />{ props.user }</li>
<li><Link to="/user" onClick={props.relieveLink}><Icon type="user" />{ props.user }</Link></li>
<li><Link to="/News" onClick={props.relieveLink}><Icon type="mail" />{ props.msg }</Link></li>
<li>退出</li>
</ul>
);
ToolUser.propTypes={
user:PropTypes.string,
msg:PropTypes.string
msg:PropTypes.string,
relieveLink:PropTypes.func
};
const ToolGuest = (props)=> (
const ToolGuest = ()=> (
<ul>
<li onClick={e => props.onLogin(e)}><Link to={`/Login`}>登录</Link></li>
<li onClick={e => props.onReg(e)}><Link to={`/Login`}>注册</Link></li>
<li><Icon type="question-circle-o" />帮助</li>
</ul>
);
ToolGuest.propTypes={
@ -33,6 +34,19 @@ ToolGuest.propTypes={
class HeaderCom extends Component {
constructor(props) {
super(props);
this.state = {
current : window.location.hash.split("#")[1]
}
}
linkTo = (e) =>{
this.setState({
current : e.key
})
}
relieveLink = () =>{
this.setState({
current : ""
})
}
handleLogin = (e) => {
e.preventDefault();
@ -57,20 +71,21 @@ class HeaderCom extends Component {
className="nav-toolbar"
theme="dark"
style={{ lineHeight : '.64rem'}}
defaultSelectedKeys={['1']}
onClick={this.linkTo}
selectedKeys={[this.state.current]}
>
<Menu.Item key="1">
<Link to={`/`}>首页</Link>
<Menu.Item key="/">
<Link to="/">首页</Link>
</Menu.Item>
<Menu.Item key="2">
<Link to={`/ProjectGroups`}>分组</Link>
<Menu.Item key="/ProjectGroups">
<Link to="/ProjectGroups">分组</Link>
</Menu.Item>
<Menu.Item key="3">
文档
<Menu.Item key="/Interface">
<Link to="/Interface">接口</Link>
</Menu.Item>
</Menu>
<div className="user-toolbar">
{login?<ToolUser user={user} msg={msg}/>:''}
{login?<ToolUser user={user} msg={msg} relieveLink={this.relieveLink}/>:<ToolGuest/>}
</div>
</div>
</Header>
@ -84,6 +99,7 @@ HeaderCom.propTypes={
user: PropTypes.string,
msg: PropTypes.string,
login:PropTypes.bool,
relieveLink:PropTypes.func,
loginTypeAction:PropTypes.func
};
@ -91,7 +107,7 @@ export default connect(
(state) => {
return{
user: state.login.userName,
msg: "暂无消息",
msg: null,
login:state.login.isLogin
}
},

18
client/components/Header/Header.scss
View File

@ -11,14 +11,13 @@ $color-black-light : #404040;
top: 0;
left: 0;
right: 0;
//line-height: .64rem;
font-size: 0.14rem;
color: $color-white;
z-index: 9999;
z-index: 99;
// 内容宽度
.content {
max-width: 10.3rem;
max-width: 11rem;
margin: 0 auto;
zoom: 1;
overflow: hidden;
@ -43,7 +42,6 @@ $color-black-light : #404040;
.nav-toolbar {
font-size: .15rem;
box-sizing: border-box;
float: left;
}
@ -63,6 +61,18 @@ $color-black-light : #404040;
}
&:hover{
color: $color-blue;
a{
color: $color-blue;
}
}
a{
color: $color-white;
&:hover{
color: $color-blue;
}
&:focus{
text-decoration: none;
}
}
i{
margin-right: .09rem;

3
client/constants/action-types.js
View File

@ -8,6 +8,7 @@ export const FETCH_GROUP_LIST = 'FETCH_GROUP_LIST'
export const SET_CURR_GROUP = 'SET_CURR_GROUP'
// project
export const FETCH_PROJECT_LIST = 'FETCH_PROJECT_LIST'
export const PROJECT_ADD = 'PROJECT_ADD'
// login
@ -21,3 +22,5 @@ export const LOGIN_TYPE = 'LOGIN_TYPE';
export const FETCH_NEWS_DATA = 'FETCH_NEWS_DATA';
export const FETCH_MORE_NEWS = 'FETCH_MORE_NEWS';
// User
export const CHANGE_CUR_UID = 'CHANGE_CUR_UID'

6
client/containers/Home/Home.js
View File

@ -32,7 +32,7 @@ class Home extends Component {
</Col>
<Col span={16} className="main-one-right">
<div className="img-container">
<img src="./static/image/demo-img.png"/>
<img src="./image/demo-img.png"/>
</div>
</Col>
</Row>
@ -61,7 +61,7 @@ Home.defaultProps={
{title:"接口管理",des:"强大的接口文档"},
{title:"接口管理",des:"强大的接口文档"}
],
img:"./static/image/demo-img.png"
img:"./image/demo-img.png"
},{
title:"接口管理",
des:"yapi将满足你的所有接口管理需求。不再需要 为每个项目搭建独立的接口管理平台和编写离线的接口文档",
@ -69,7 +69,7 @@ Home.defaultProps={
{title:"接口管理",des:"强大的接口文档"},
{title:"接口管理",des:"强大的接口文档"}
],
img:"./static/image/demo-img.png"
img:"./image/demo-img.png"
}
]
};

2
client/containers/Home/Home.scss
View File

@ -53,7 +53,7 @@ $color-black-lighter: #404040;
}
}
.container{
max-width: 10.3rem;
max-width: 11rem;
margin: 0 auto;
}
}

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

@ -5,8 +5,8 @@ import PropTypes from 'prop-types'
import InterfaceList from './InterfaceList/InterfaceList.js'
import InterfaceTable from './InterfaceTable/InterfaceTable.js'
import InterfaceMode from './InterfaceMode/InterfaceMode.js'
import Header from '../../components/Header/Header.js'
import {
import {
fetchInterfaceData,
projectMember,
closeProjectMember
@ -49,8 +49,6 @@ class Interface extends Component {
return (
<div>
<Header />
<section className="interface-box">
<InterfaceList projectMember={projectMember} />
<InterfaceMode modalVisible={modalVisible} closeProjectMember={this.props.closeProjectMember} />

2
client/containers/Interface/Interface.scss
View File

@ -3,7 +3,7 @@
max-width: 11rem;
display: -webkit-box;
-webkit-box-flex: 1;
margin: 15px auto 0 auto;
margin: .88rem auto 0 auto;
font-size: 0.14rem;
background: #FFF;

2
client/containers/News/News.scss
View File

@ -3,7 +3,7 @@
max-width: 11rem;
display: -webkit-box;
-webkit-box-flex: 1;
margin: 15px auto 0 auto;
margin: .88rem auto 0 auto;
font-size: 0.14rem;
background: #FFF;

3
client/containers/ProjectGroups/ProjectGroups.scss
View File

@ -1,5 +1,4 @@
.g-doc {
max-width: 11rem;
margin: .24rem auto;
margin-top: 88px;
margin: .88rem auto .24rem;
}

98
client/containers/ProjectGroups/ProjectList/index.js
View File

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Table, Button, Modal, Form, Input, Icon, Tooltip, Select } from 'antd';
import { addProject } from '../../../actions/project';
import { addProject, fetchProjectList } from '../../../actions/project';
const { TextArea } = Input;
const FormItem = Form.Item;
const Option = Select.Option;
@ -10,16 +10,20 @@ const Option = Select.Option;
import './ProjectList.scss'
const columns = [{
title: 'Name',
title: '项目名称',
dataIndex: 'name',
key: 'name',
render: text => <a href="#">{text}</a>
}, {
title: 'Age',
dataIndex: 'age',
key: 'age'
title: '创建人',
dataIndex: 'owner',
key: 'owner'
}, {
title: 'Action',
title: '创建时间',
dataIndex: 'add_time',
key: 'add_time'
}, {
title: '操作',
key: 'action',
render: () => (
<span>
@ -30,17 +34,6 @@ const columns = [{
)
}];
const data = [{
key: '1',
age: 32
}, {
key: '2',
age: 42
}, {
key: '3',
age: 32
}];
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@ -55,10 +48,12 @@ const formItemLayout = {
@connect(
state => {
return {
loginData: state.login
projectList: state.project.projectList,
currGroup: state.group.currGroup
}
},
{
fetchProjectList,
addProject
}
)
@ -67,12 +62,17 @@ class ProjectList extends Component {
super(props);
this.state = {
visible: false,
protocol: 'http:\/\/'
tabelLoading: true,
protocol: 'http:\/\/',
projectData: []
}
}
static propTypes = {
form: PropTypes.object,
addProject: PropTypes.func
fetchProjectList: PropTypes.func,
addProject: PropTypes.func,
projectList: PropTypes.array,
currGroup: PropTypes.object
}
addProject = () => {
this.setState({
@ -84,14 +84,38 @@ class ProjectList extends Component {
this.props.form.validateFields((err, values) => {
if (!err) {
values.prd_host = this.state.protocol + values.prd_host;
// 获取当前分组id传入values
values.group_id = this.props.currGroup._id;
console.log('Received values of form: ', values);
this.setState({
visible: false
visible: false,
tabelLoading: true
});
this.props.addProject(values);
this.props.addProject(values).then((res) => {
console.log(res);
// 添加项目成功后再次请求列表
this.props.fetchProjectList({
group_id: this.props.currGroup._id
}).then((res) => {
this.setState({
tabelLoading: false
});
console.log(117,res);
});
}).catch((err) => {
console.log(err);
this.setState({
tabelLoading: false
});
});
this.props.form.resetFields();
}
});
}
// 取消修改
handleCancel = () => {
this.props.form.resetFields();
this.setState({
@ -106,6 +130,33 @@ class ProjectList extends Component {
})
}
componentWillReceiveProps(nextProps){
// 切换分组
if (this.props.currGroup !== nextProps.currGroup) {
const param = {
group_id: nextProps.currGroup._id
};
this.props.fetchProjectList(param).then((res) => {
this.setState({
tabelLoading: false
});
console.log(res);
});
}
// 切换项目列表
if (this.props.projectList !== nextProps.projectList) {
// console.log(nextProps.projectList);
const data = nextProps.projectList.map((item, index) => {
item.key = index;
return item;
});
this.setState({
projectData: data
});
}
}
render() {
const { getFieldDecorator } = this.props.form;
return (
@ -184,8 +235,9 @@ class ProjectList extends Component {
</Modal>
<Table
loading={this.state.tabelLoading}
columns={columns}
dataSource={data}
dataSource={this.state.projectData}
title={() => <Button type="primary" onClick={this.addProject}>创建项目</Button>}
/>

47
client/containers/User/LeftMenu.js
View File

@ -1,44 +1,59 @@
import React, { Component } from 'react'
import { Link } from 'react-router-dom'
import {Input, Row, Col} from 'antd'
import { Input, Row, Col } from 'antd'
import { connect } from 'react-redux'
import PropTypes from 'prop-types'
@connect(
state => {
return {
curUid: state.user.curUid
}
}
)
class LeftMenu extends Component {
static propTypes = {
curUid: PropTypes.string
}
constructor(props) {
super(props)
this.state = {
curitem: 'profile'
}
console.log(this.props)
}
handleCurItem(curitem) {
return () => {
this.setState({
curitem: curitem
})
}
handleActive = () => {
this.setState({
______a: 1 //强制刷新
})
}
render() {
const menus = [{
title: '个人资料',
path: '/user/profile'
path: "/user/profile/" + this.props.curUid
}, {
title: '用户管理',
path: '/user/list'
path: '/user/list',
auth: (role) => {
if (role === 'admin') {
return true;
}
return false;
}
}
]
let content = menus.map((menu, index) => {
if (typeof menu.auth === 'function' && menu.auth('admin') === false) {
return '';
}
return (
<li key={index} className={location.hash === '#' + menu.path ? 'active' : ''}>
<li onClick={this.handleActive} key={index} className={location.hash === '#' + menu.path ? 'active' : ''}>
<Link to={menu.path} >{menu.title}</Link>
</li>
)
})
const Search = Input.Search;
return (<div>

94
client/containers/User/List.js
View File

@ -1,55 +1,81 @@
import React, { Component } from 'react'
import {formatTime} from '../../common.js'
import { Link } from 'react-router-dom'
//import PropTypes from 'prop-types'
import {
Table,
Button
} from 'antd'
import axios from 'axios';
const columns = [{
title: 'UID',
dataIndex: '_id',
key: '_id'
}, {
title: '用户名',
dataIndex: 'username',
key: 'username'
}, {
title: 'Email',
dataIndex: 'email',
key: 'email'
}, {
title: '用户角色',
dataIndex: 'role',
key: 'role'
}, {
title: '更新日期',
dataIndex: 'up_time',
key: 'up_time'
}, {
title: '功能',
key: 'action',
render: (item) => {
return (
<span>
<Button type="primary"><Link to={"/user/profile/"+item._id} > 查看 </Link></Button>
<Button type="danger">删除</Button>
</span>
)
}
}]
class List extends Component {
constructor(props) {
super(props)
this.state = {
data: []
}
}
getUserList() {
axios.get('/user/list').then((res) => {
let result = res.data;
if (result.errcode === 0) {
let list = result.data.list;
list.map( (item, index) => {
item.key = index;
item.up_time = formatTime(item.up_time)
} )
this.setState({
data: list
});
}
})
}
componentDidMount() {
this.getUserList()
}
render() {
const columns = [{
title: 'UID',
dataIndex: 'uid',
key: 'uid'
}, {
title: '用户名',
dataIndex: 'username',
key: 'username'
}, {
title: 'email',
dataIndex: 'email',
key: 'email'
}, {
title: '更新日期',
dataIndex: 'up_time',
key: 'up_time'
}, {
title: '功能',
key: 'action',
render: () => {
return (
<span>
<Button type="primary">编辑</Button>
<Button type="danger">删除</Button>
</span>
)
}
}]
const data = [
{ uid: 1, username: 'admin', email: 'admin@admin.com', up_time: '2017.07.01', key: 1 },
{ uid: 2, username: 'admin2', email: 'admin21113qq3ß@admin311.com', up_time: '2017.07.21', key: 2 }
];
const data = this.state.data;
return (
<section className="user-table">

215
client/containers/User/Profile.js
View File

@ -1,115 +1,244 @@
import React, { Component } from 'react'
import { Row, Col, Icon , Input, Button, Select} from 'antd'
import { Row, Col, Icon, Input, Button, Select, Message } from 'antd'
import axios from 'axios';
import { connect } from 'react-redux'
import {formatTime} from '../../common.js'
import {
changeCurUid
} from '../../actions/user.js'
import PropTypes from 'prop-types'
@connect(
state => ({
curUid: state.user.curUid
}),
{
changeCurUid
}
)
class Profile extends Component {
static propTypes = {
curUid: PropTypes.string,
changeCurUid: PropTypes.func,
match: PropTypes.object
}
constructor(props) {
super(props)
this.state = {
usernameEdit: false,
emailEdit: false,
secureEdit: false,
roleEdit: false
roleEdit: false,
userinfo: {
}
}
this.getUserInfo(101)
}
handleEdit = (key, val) =>{
componentDidMount(){
const uid = this.props.match.params.uid;
this.props.changeCurUid(uid)
this.getUserInfo(uid)
}
handleEdit = (key, val) => {
var s = {};
s[key] = val ;
s[key] = val;
this.setState(s)
}
getUserInfo = (id) => {
axios.get('/user/find', {
id: id
}).then((res) =>{
console.log(res)
var _this = this;
axios.get('/user/find?id=' + id).then((res) => {
_this.setState({
userinfo: res.data.data,
_userinfo: res.data.data
})
})
}
updateUserinfo = (name) =>{
var state = this.state;
let value = this.state._userinfo[name];
let params = {uid: state.userinfo.uid}
params[name] = value;
axios.post('/user/update', params).then( (res)=>{
let data = res.data;
if(data.errcode === 0){
let userinfo = this.state.userinfo;
userinfo[name] = value;
this.setState({
userinfo: userinfo
})
this.handleEdit(name + 'Edit', false)
Message.success('更新用户信息成功');
}else{
Message.error(data.errmsg)
}
}, (err) => {
Message.error(err.message)
} )
}
changeUserinfo = (e) =>{
let dom = e.target;
let name = dom.getAttribute("name");
let value = dom.value;
let userinfo = this.state._userinfo;
userinfo[name] = value;
this.setState({
_userinfo: userinfo
})
}
changeRole = (val) =>{
let userinfo = this.state.userinfo;
userinfo.role = val;
this.setState({
_userinfo: userinfo
})
this.updateUserinfo('role');
}
updatePassword = () =>{
let old_password = document.getElementById('old_password').value;
let password = document.getElementById('password').value;
let verify_pass = document.getElementById('verify_pass').value;
if(password != verify_pass){
return Message.error('两次输入的密码不一样');
}
let params = {
uid: this.state.userinfo.uid,
password: password,
old_password: old_password
}
axios.post('/user/change_password', params).then( (res)=>{
let data = res.data;
if(data.errcode === 0){
this.handleEdit('secureEdit', false)
Message.success('修改密码成功');
}else{
Message.error(data.errmsg)
}
}, (err) => {
Message.error(err.message)
} )
}
render() {
let ButtonGroup = Button.Group;
let userNameEditHtml, emailEditHtml,secureEditHtml, roleEditHtml;
let userNameEditHtml, emailEditHtml, secureEditHtml, roleEditHtml;
const Option = Select.Option;
if(this.state.usernameEdit === false){
let userinfo = this.state.userinfo;
let _userinfo = this.state._userinfo;
let roles = { admin: '管理员', member: '会员' }
if (this.state.usernameEdit === false) {
userNameEditHtml = <div >
<span className="text">xiaoming</span>&nbsp;&nbsp;
<span className="text-button" onClick={() => {this.handleEdit( 'usernameEdit', true)}}><Icon type="edit"/>修改</span>
<span className="text">{userinfo.username}</span>&nbsp;&nbsp;
<span className="text-button" onClick={() => { this.handleEdit('usernameEdit', true) }}><Icon type="edit" />修改</span>
</div>
}else{
} else {
userNameEditHtml = <div>
<Input placeholder="用户名" />
<Input value={_userinfo.username} name="username" onChange={this.changeUserinfo} placeholder="用户名" />
<ButtonGroup className="edit-buttons" >
<Button className="edit-button" onClick={() => {this.handleEdit( 'usernameEdit', false)}} >Cancel</Button>
<Button className="edit-button" type="primary">OK</Button>
<Button className="edit-button" onClick={() => { this.handleEdit('usernameEdit', false) }} >Cancel</Button>
<Button className="edit-button" onClick={ () => { this.updateUserinfo('username')} } type="primary">OK</Button>
</ButtonGroup>
</div>
}
if(this.state.emailEdit === false){
if (this.state.emailEdit === false) {
emailEditHtml = <div >
<span className="text">abc@qq.com</span>&nbsp;&nbsp;
<span className="text-button" onClick={() => {this.handleEdit( 'emailEdit', true)}} ><Icon type="edit"/>修改</span>
<span className="text">{userinfo.email}</span>&nbsp;&nbsp;
<span className="text-button" onClick={() => { this.handleEdit('emailEdit', true) }} ><Icon type="edit" />修改</span>
</div>
}else{
} else {
emailEditHtml = <div>
<Input placeholder="Email" />
<Input placeholder="Email" value={_userinfo.email} name="email" onChange={this.changeUserinfo} />
<ButtonGroup className="edit-buttons" >
<Button className="edit-button" onClick={() => {this.handleEdit( 'emailEdit', false)}} >Cancel</Button>
<Button className="edit-button" type="primary">OK</Button>
<Button className="edit-button" onClick={() => { this.handleEdit('emailEdit', false) }} >Cancel</Button>
<Button className="edit-button" type="primary" onClick={ () => { this.updateUserinfo('email')} }>OK</Button>
</ButtonGroup>
</div>
}
if(this.state.roleEdit === true){
if (this.state.roleEdit === false) {
roleEditHtml = <div>
<span className="text">管理员</span>&nbsp;&nbsp;
<span className="text-button" onClick={() => {this.handleEdit( 'roleEdit', true)}} ><Icon type="edit"/>修改</span>
<span className="text">{roles[userinfo.role]}</span>&nbsp;&nbsp;
<span className="text-button" onClick={() => { this.handleEdit('roleEdit', true) }} ><Icon type="edit" />修改</span>
</div>
}else{
roleEditHtml = <Select defaultValue="admin" style={{ width: 150 }} >
} else {
roleEditHtml = <Select defaultValue={_userinfo.role} onChange={ this.changeRole} style={{ width: 150 }} >
<Option value="admin">管理员</Option>
<Option value="member">会员</Option>
</Select>
}
if(this.state.secureEdit === false){
secureEditHtml = <Button type="primary" onClick={() => {this.handleEdit( 'secureEdit', true)}}>密码修改</Button>
}else{
</Select>
}
if (this.state.secureEdit === false) {
secureEditHtml = <Button type="primary" onClick={() => { this.handleEdit('secureEdit', true) }}>密码修改</Button>
} else {
secureEditHtml = <div>
<Input placeholder="旧的密码" />
<Input placeholder="新的密码" />
<Input style={{display: this.state.userinfo.role === 'admin' ? 'none': ''}} placeholder="旧的密码" type="password" name="old_password" id="old_password" />
<Input placeholder="新的密码" type="password" name="password" id="password" />
<Input placeholder="确认密码" type="password" name="verify_pass" id="verify_pass" />
<ButtonGroup className="edit-buttons" >
<Button className="edit-button" onClick={() => {this.handleEdit( 'secureEdit', false)}}>Cancel</Button>
<Button className="edit-button" type="primary">OK</Button>
<Button className="edit-button" onClick={() => { this.handleEdit('secureEdit', false) }}>Cancel</Button>
<Button className="edit-button" onClick={this.updatePassword} type="primary">OK</Button>
</ButtonGroup>
</div>
}
return <div className="user-profile">
<Row className="user-item" type="flex" justify="start">
<Row className="user-item" type="flex" justify="start">
<Col span={4}>用户id</Col>
<Col span={12}>
{userinfo.uid}
</Col>
</Row>
<Row className="user-item" type="flex" justify="start">
<Col span={4}>用户名</Col>
<Col span={12}>
{userNameEditHtml}
</Col>
</Row>
<Row className="user-item" type="flex" justify="start">
<Row className="user-item" type="flex" justify="start">
<Col span={4}>Email</Col>
<Col span={12}>
{emailEditHtml}
</Col>
</Row>
<Row className="user-item" type="flex" justify="start">
<Row className="user-item" style={{display: this.state.userinfo.role === 'admin'? '': 'none'}} type="flex" justify="start">
<Col span={4}>角色</Col>
<Col span={12}>
{roleEditHtml}
</Col>
</Row>
<Row className="user-item" type="flex" justify="start">
<Col span={4}>创建账号时间</Col>
<Col span={12}>
{formatTime(userinfo.add_time)}
</Col>
</Row>
<Row className="user-item" type="flex" justify="start">
<Col span={4}>更新账号时间</Col>
<Col span={12}>
{formatTime(userinfo.up_time)}
</Col>
</Row>
<Row className="user-item" type="flex" justify="start">
<Col span={4}>安全</Col>
<Col span={12}>

4
client/containers/User/User.js
View File

@ -30,8 +30,8 @@ class User extends Component {
<LeftMenu />
<Route path={this.props.match.path + '/list/:uid'} component={List} />
<Route path={this.props.match.path + '/profile'} component={Profile} />
<Route path={this.props.match.path + '/list'} component={List} />
<Route path={this.props.match.path + '/profile/:uid'} component={Profile} />
</section>
</div>
)

5
client/containers/User/index.scss
View File

@ -3,10 +3,11 @@
max-width: 11rem;
display: -webkit-box;
-webkit-box-flex: 1;
margin: 15px auto 0 auto;
margin: .88rem auto 0 auto;
font-size: 0.14rem;
background: #FFF;
min-height:500px;
margin-top: 64px;
.search{
height: 40px;
@ -53,7 +54,7 @@
.user-table {
-webkit-box-flex: 1;
margin: 0 0 0 20px;
padding-right: 15px;
.ant-table-wrapper table {
font-size: .14rem;

11
client/reducer/group/project.js
View File

@ -1,16 +1,21 @@
import {
FETCH_PROJECT_LIST,
PROJECT_ADD
} from '../../constants/action-types';
const initialState = {
groupList: [],
currGroup: 'MFE'
projectList: []
};
export default (state = initialState, action) => {
switch (action.type) {
case FETCH_PROJECT_LIST: {
return {
...state,
projectList: action.payload.data.data
};
}
case PROJECT_ADD: {
console.log(action.payload);
return state;
}
default:

21
client/reducer/user/user.js Normal file
View File

@ -0,0 +1,21 @@
import {
CHANGE_CUR_UID
} from '../../constants/action-types';
const initialState = {
curUid: "0"
};
export default (state = initialState, action) => {
switch (action.type) {
case CHANGE_CUR_UID: {
return {
...state,
curUid: action.data
};
}
default:
return state;
}
};

637
doc/build/api.html vendored
View File

@ -104,6 +104,10 @@
<a href="#-user-logout">/user/logout</a>
</li>
<li >
<a href="#-user-change_password">/user/change_password</a>
</li>
<li >
<a href="#-user-reg">/user/reg</a>
</li>
@ -113,12 +117,20 @@
</li>
<li >
<a href="#-user-list">/user/list</a>
<a href="#-user-find">/user/find</a>
</li>
<li >
<a href="#-user-del">/user/del</a>
</li>
<li >
<a href="#-user-update">/user/update</a>
</li>
<li >
<a href="#-user-search">/user/search</a>
</li>
</ul>
@ -142,6 +154,10 @@
<a href="#-project-del_member">/project/del_member</a>
</li>
<li >
<a href="#-project-get_member_list">/project/get_member_list</a>
</li>
<li >
<a href="#-project-get">/project/get</a>
</li>
@ -157,6 +173,10 @@
<li >
<a href="#-project-up">/project/up</a>
</li>
<li >
<a href="#-project-search">/project/search</a>
</li>
</ul>
@ -218,7 +238,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/group.js.html#13" target="_blank">./server/controllers/group.js:13</a>
<a href="./static/server/controllers/group.js.html#12" target="_blank">./server/controllers/group.js:12</a>
</p>
@ -301,7 +321,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/group.js.html#52" target="_blank">./server/controllers/group.js:52</a>
<a href="./static/server/controllers/group.js.html#51" target="_blank">./server/controllers/group.js:51</a>
</p>
@ -363,7 +383,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/group.js.html#72" target="_blank">./server/controllers/group.js:72</a>
<a href="./static/server/controllers/group.js.html#71" target="_blank">./server/controllers/group.js:71</a>
</p>
@ -435,7 +455,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/group.js.html#103" target="_blank">./server/controllers/group.js:103</a>
<a href="./static/server/controllers/group.js.html#102" target="_blank">./server/controllers/group.js:102</a>
</p>
@ -535,7 +555,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#11" target="_blank">./server/controllers/user.js:11</a>
<a href="./static/server/controllers/user.js.html#14" target="_blank">./server/controllers/user.js:14</a>
</p>
@ -595,6 +615,7 @@
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">{</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"email"</span><span class="token punctuation">:</span> <span class="token string">"admin@admin.com"</span><span class="token punctuation">,</span>
<span class="token string">"username"</span><span class="token punctuation">:</span> <span class="token string">"admin"</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1499762848</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1499762848</span>
<span class="token punctuation">}</span>
@ -621,7 +642,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#62" target="_blank">./server/controllers/user.js:62</a>
<a href="./static/server/controllers/user.js.html#58" target="_blank">./server/controllers/user.js:58</a>
</p>
@ -634,6 +655,102 @@
<span class="token punctuation">}</span></code></pre>
</div>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-user-change_password" class="page-header subject">
/user/change_password
<span class="ui-badge">POST</span>
<a class="hashlink" href="#-user-change_password">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
修改用户密码
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#151" target="_blank">./server/controllers/user.js:151</a>
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>uid</td>
<td>Number</td>
<td>用户ID</td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
<tr>
<td>old_password</td>
<td>Number</td>
<td>旧密码, 非admin用户必须传</td>
<td>
</td>
<td></td>
</tr>
<tr>
<td>password</td>
<td>Number</td>
<td>新密码</td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
</table>
</div>
<div>示例：</div>
<pre class="ydoc-example" ><code><span class="token punctuation">{</span>
<span class="token string">"errcode"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"errmsg"</span><span class="token punctuation">:</span> <span class="token string">"success"</span><span class="token punctuation">,</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">{</span>
<span class="token string">"n"</span><span class="token punctuation">:</span> <span class="token number">1</span><span class="token punctuation">,</span>
<span class="token string">"nModified"</span><span class="token punctuation">:</span> <span class="token number">1</span><span class="token punctuation">,</span>
<span class="token string">"ok"</span><span class="token punctuation">:</span> <span class="token number">1</span>
<span class="token punctuation">}</span>
<span class="token punctuation">}</span>
</code></pre>
</div>
<div class="con-list-item">
@ -654,7 +771,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#79" target="_blank">./server/controllers/user.js:79</a>
<a href="./static/server/controllers/user.js.html#215" target="_blank">./server/controllers/user.js:215</a>
</p>
@ -724,6 +841,7 @@
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">{</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"email"</span><span class="token punctuation">:</span> <span class="token string">"admin@admin.com"</span><span class="token punctuation">,</span>
<span class="token string">"username"</span><span class="token punctuation">:</span> <span class="token string">"admin"</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1499762848</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1499762848</span>
<span class="token punctuation">}</span>
@ -750,33 +868,77 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#136" target="_blank">./server/controllers/user.js:136</a>
<a href="./static/server/controllers/user.js.html#277" target="_blank">./server/controllers/user.js:277</a>
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>page</td>
<td>Number</td>
<td>分页页码</td>
<td>
</td>
<td></td>
</tr>
<tr>
<td>limit</td>
<td>Number</td>
<td>分页大小</td>
<td>
</td>
<td></td>
</tr>
</table>
</div>
</div>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-user-list" class="page-header subject">
/user/list
<h3 id="-user-find" class="page-header subject">
/user/find
<span class="ui-badge">GET</span>
<a class="hashlink" href="#-user-list">#</a>
<a class="hashlink" href="#-user-find">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
获取用户列表
获取用户个人信息
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#159" target="_blank">./server/controllers/user.js:159</a>
<a href="./static/server/controllers/user.js.html#309" target="_blank">./server/controllers/user.js:309</a>
</p>
@ -833,12 +995,12 @@
</blockquote>
<p>
<small class="text-muted">描述:</small>
获取用户列表,只有admin用户才有此权限
删除用户,只有admin用户才有此权限
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#184" target="_blank">./server/controllers/user.js:184</a>
<a href="./static/server/controllers/user.js.html#338" target="_blank">./server/controllers/user.js:338</a>
</p>
@ -880,6 +1042,175 @@
</div>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-user-update" class="page-header subject">
/user/update
<span class="ui-badge">POST</span>
<a class="hashlink" href="#-user-update">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
更新用户个人信息
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#362" target="_blank">./server/controllers/user.js:362</a>
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>uid</td>
<td></td>
<td>用户uid</td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
<tr>
<td>role</td>
<td></td>
<td>用户角色,只有管理员有权限修改</td>
<td>
</td>
<td></td>
</tr>
<tr>
<td>username</td>
<td></td>
<td>String</td>
<td>
</td>
<td></td>
</tr>
<tr>
<td>email</td>
<td></td>
<td>String</td>
<td>
</td>
<td></td>
</tr>
</table>
</div>
</div>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-user-search" class="page-header subject">
/user/search
<span class="ui-badge">GET</span>
<a class="hashlink" href="#-user-search">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
模糊搜索用户名或者email
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/user.js.html#408" target="_blank">./server/controllers/user.js:408</a>
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>q</td>
<td>String</td>
<td></td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
</table>
</div>
<div>示例：</div>
<pre class="ydoc-example" data-foldnumber=10><code><span class="token punctuation">{</span>
<span class="token string">"errcode"</span><span class="token punctuation">:</span> <span class="token number">200</span><span class="token punctuation">,</span>
<span class="token string">"errmsg"</span><span class="token punctuation">:</span> <span class="token string">"ok"</span><span class="token punctuation">,</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token punctuation">{</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"email"</span><span class="token punctuation">:</span> <span class="token string">"admin@admin.com"</span><span class="token punctuation">,</span>
<span class="token string">"role"</span><span class="token punctuation">:</span> <span class="token string">"admin"</span><span class="token punctuation">,</span>
<span class="token string">"addTime"</span><span class="token punctuation">:</span> <span class="token number">1499936103</span><span class="token punctuation">,</span>
<span class="token string">"upTime"</span><span class="token punctuation">:</span> <span class="token number">1499936103</span>
<span class="token punctuation">}</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span></code></pre>
</div>
@ -903,7 +1234,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#12" target="_blank">./server/controllers/project.js:12</a>
<a href="./static/server/controllers/project.js.html#15" target="_blank">./server/controllers/project.js:15</a>
</p>
@ -1032,7 +1363,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#74" target="_blank">./server/controllers/project.js:74</a>
<a href="./static/server/controllers/project.js.html#77" target="_blank">./server/controllers/project.js:77</a>
</p>
@ -1070,8 +1401,8 @@
</tr>
<tr>
<td>uid</td>
<td>member_uid</td>
<td>String</td>
<td>项目成员uid,不能为空</td>
<td>
@ -1116,7 +1447,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#106" target="_blank">./server/controllers/project.js:106</a>
<a href="./static/server/controllers/project.js.html#109" target="_blank">./server/controllers/project.js:109</a>
</p>
@ -1180,6 +1511,84 @@
<span class="token punctuation">}</span></code></pre>
</div>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-project-get_member_list" class="page-header subject">
/project/get_member_list
<span class="ui-badge">GET</span>
<a class="hashlink" href="#-project-get_member_list">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
获取项目成员列表
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#142" target="_blank">./server/controllers/project.js:142</a>
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>id</td>
<td>Number</td>
<td>项目id，不能为空</td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
</table>
</div>
<div>示例：</div>
<pre class="ydoc-example" data-foldnumber=10><code><span class="token punctuation">{</span>
<span class="token string">"errcode"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"errmsg"</span><span class="token punctuation">:</span> <span class="token string">"success"</span><span class="token punctuation">,</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"email"</span><span class="token punctuation">:</span> <span class="token string">"admin@admin.com"</span><span class="token punctuation">,</span>
<span class="token string">"role"</span><span class="token punctuation">:</span> <span class="token string">"admin"</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1499932673</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1499932673</span>
<span class="token punctuation">}</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span>
</code></pre>
</div>
<div class="con-list-item">
@ -1200,7 +1609,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#138" target="_blank">./server/controllers/project.js:138</a>
<a href="./static/server/controllers/project.js.html#181" target="_blank">./server/controllers/project.js:181</a>
</p>
@ -1283,7 +1692,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#162" target="_blank">./server/controllers/project.js:162</a>
<a href="./static/server/controllers/project.js.html#205" target="_blank">./server/controllers/project.js:205</a>
</p>
@ -1320,6 +1729,26 @@
<td></td>
</tr>
<tr>
<td>page</td>
<td>Number</td>
<td>分页页码</td>
<td>
</td>
<td></td>
</tr>
<tr>
<td>limit</td>
<td>Number</td>
<td>分页大小</td>
<td>
</td>
<td></td>
</tr>
</table>
</div>
@ -1328,38 +1757,37 @@
<pre class="ydoc-example" data-foldnumber=10><code><span class="token punctuation">{</span>
<span class="token string">"errcode"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"errmsg"</span><span class="token punctuation">:</span> <span class="token string">"success"</span><span class="token punctuation">,</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">7</span><span class="token punctuation">,</span>
<span class="token string">"name"</span><span class="token punctuation">:</span> <span class="token string">"project_a1"</span><span class="token punctuation">,</span>
<span class="token string">"desc"</span><span class="token punctuation">:</span> <span class="token string">"tttttt"</span><span class="token punctuation">,</span>
<span class="token string">"prd_host"</span><span class="token punctuation">:</span> <span class="token string">"project.a1.cc"</span><span class="token punctuation">,</span>
<span class="token string">"basepath"</span><span class="token punctuation">:</span> <span class="token string">"/a1"</span><span class="token punctuation">,</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"group_id"</span><span class="token punctuation">:</span> <span class="token number">1</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1499331378</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1499331378</span><span class="token punctuation">,</span>
<span class="token string">"__v"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"members"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token number">0</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span><span class="token punctuation">,</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">8</span><span class="token punctuation">,</span>
<span class="token string">"name"</span><span class="token punctuation">:</span> <span class="token string">"project_a2"</span><span class="token punctuation">,</span>
<span class="token string">"desc"</span><span class="token punctuation">:</span> <span class="token string">"tttttt"</span><span class="token punctuation">,</span>
<span class="token string">"prd_host"</span><span class="token punctuation">:</span> <span class="token string">"project.a2.cc"</span><span class="token punctuation">,</span>
<span class="token string">"basepath"</span><span class="token punctuation">:</span> <span class="token string">"/a1"</span><span class="token punctuation">,</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"group_id"</span><span class="token punctuation">:</span> <span class="token number">1</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1499331387</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1499331387</span><span class="token punctuation">,</span>
<span class="token string">"__v"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"members"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token number">0</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span>
<span class="token punctuation">]</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">{</span>
<span class="token string">"total"</span><span class="token punctuation">:</span> <span class="token number">2</span><span class="token punctuation">,</span>
<span class="token string">"list"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">133</span><span class="token punctuation">,</span>
<span class="token string">"name"</span><span class="token punctuation">:</span> <span class="token string">"project_a1"</span><span class="token punctuation">,</span>
<span class="token string">"prd_host"</span><span class="token punctuation">:</span> <span class="token string">"project.a2.cc"</span><span class="token punctuation">,</span>
<span class="token string">"basepath"</span><span class="token punctuation">:</span> <span class="token string">"/a1/"</span><span class="token punctuation">,</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"group_id"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1500004234</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1500004234</span><span class="token punctuation">,</span>
<span class="token string">"__v"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"env"</span><span class="token punctuation">:</span><span class="token punctuation">[</span><span class="token punctuation">]</span><span class="token punctuation">,</span>
<span class="token string">"members"</span><span class="token punctuation">:</span><span class="token punctuation">[</span><span class="token string">"101"</span><span class="token punctuation">]</span>
<span class="token punctuation">}</span><span class="token punctuation">,</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">163</span><span class="token punctuation">,</span>
<span class="token string">"name"</span><span class="token punctuation">:</span> <span class="token string">"project_a2"</span><span class="token punctuation">,</span>
<span class="token string">"prd_host"</span><span class="token punctuation">:</span> <span class="token string">"project.a2.cc"</span><span class="token punctuation">,</span>
<span class="token string">"basepath"</span><span class="token punctuation">:</span> <span class="token string">"/a2/"</span><span class="token punctuation">,</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"group_id"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"add_time"</span><span class="token punctuation">:</span> <span class="token number">1500006397</span><span class="token punctuation">,</span>
<span class="token string">"up_time"</span><span class="token punctuation">:</span> <span class="token number">1500006397</span><span class="token punctuation">,</span>
<span class="token string">"__v"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"env"</span><span class="token punctuation">:</span><span class="token punctuation">[</span><span class="token punctuation">]</span><span class="token punctuation">,</span>
<span class="token string">"members"</span><span class="token punctuation">:</span><span class="token punctuation">[</span><span class="token string">"101"</span><span class="token punctuation">]</span>
<span class="token punctuation">}</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span>
<span class="token punctuation">}</span></code></pre>
@ -1383,7 +1811,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#186" target="_blank">./server/controllers/project.js:186</a>
<a href="./static/server/controllers/project.js.html#239" target="_blank">./server/controllers/project.js:239</a>
</p>
@ -1442,7 +1870,7 @@
<h3 id="-project-up" class="page-header subject">
/project/up
<span class="ui-badge">GET</span>
<span class="ui-badge">POST</span>
<a class="hashlink" href="#-project-up">#</a>
@ -1455,7 +1883,7 @@
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#219" target="_blank">./server/controllers/project.js:219</a>
<a href="./static/server/controllers/project.js.html#272" target="_blank">./server/controllers/project.js:272</a>
</p>
@ -1595,6 +2023,101 @@
<span class="token punctuation">}</span></code></pre>
</div>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-project-search" class="page-header subject">
/project/search
<span class="ui-badge">GET</span>
<a class="hashlink" href="#-project-search">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
模糊搜索项目名称或者组名称
</p>
<p>
<small class="text-muted">源码位置:</small>
<a href="./static/server/controllers/project.js.html#333" target="_blank">./server/controllers/project.js:333</a>
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>q</td>
<td>String</td>
<td></td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
</table>
</div>
<div>示例：</div>
<pre class="ydoc-example" data-foldnumber=10><code><span class="token punctuation">{</span>
<span class="token string">"errcode"</span><span class="token punctuation">:</span> <span class="token number">200</span><span class="token punctuation">,</span>
<span class="token string">"errmsg"</span><span class="token punctuation">:</span> <span class="token string">"ok"</span><span class="token punctuation">,</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">{</span>
<span class="token string">"project"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"name"</span><span class="token punctuation">:</span> <span class="token string">"qav_project"</span><span class="token punctuation">,</span>
<span class="token string">"prdHost"</span><span class="token punctuation">:</span> <span class="token string">"xxx.qunar.com:8080"</span><span class="token punctuation">,</span>
<span class="token string">"basepath"</span><span class="token punctuation">:</span> <span class="token string">"/qav/"</span><span class="token punctuation">,</span>
<span class="token string">"addTime"</span><span class="token punctuation">:</span> <span class="token number">1500013365</span><span class="token punctuation">,</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">101</span><span class="token punctuation">,</span>
<span class="token string">"upTime"</span><span class="token punctuation">:</span> <span class="token number">1500013365</span><span class="token punctuation">,</span>
<span class="token string">"env"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span><span class="token punctuation">]</span><span class="token punctuation">,</span>
<span class="token string">"members"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token string">"101"</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span>
<span class="token punctuation">]</span><span class="token punctuation">,</span>
<span class="token string">"group"</span><span class="token punctuation">:</span> <span class="token punctuation">[</span>
<span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">193</span><span class="token punctuation">,</span>
<span class="token string">"groupName"</span><span class="token punctuation">:</span> <span class="token string">"qav"</span><span class="token punctuation">,</span>
<span class="token string">"groupDesc"</span><span class="token punctuation">:</span> <span class="token string">"project qav"</span><span class="token punctuation">,</span>
<span class="token string">"uid"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"addTime"</span><span class="token punctuation">:</span> <span class="token number">1500013066</span><span class="token punctuation">,</span>
<span class="token string">"upTime"</span><span class="token punctuation">:</span> <span class="token number">1500013066</span>
<span class="token punctuation">}</span>
<span class="token punctuation">]</span>
<span class="token punctuation">}</span>
<span class="token punctuation">}</span></code></pre>
</div>

13
doc/build/static/server/controllers/base.js.html vendored
View File

@ -33,7 +33,7 @@ const jwt = require('jsonwebtoken');
class baseController{
constructor(ctx){
this.ctx = ctx;
//网站上线后，role对象key是不能修改的，value可以修改
this.roles = {
admin: 'Admin',
@ -43,7 +43,14 @@ class baseController{
async init(ctx){
this.$user = null;
if(ctx.path === '/user/login' || ctx.path === '/user/reg' || ctx.path === '/user/status' || ctx.path === '/user/logout'){
let ignoreRouter = [
'/user/login_by_token',
'/user/login',
'/user/reg',
'/user/status',
'/user/logout'
]
if(ignoreRouter.indexOf(ctx.path) > -1){
this.$auth = true;
}else{
await this.checkLogin(ctx)
@ -77,7 +84,7 @@ class baseController{
}
async getLoginStatus(ctx){
if(await this.checkLogin(ctx) === true){
if(await this.checkLogin(ctx) === true){
return ctx.body = yapi.commons.resReturn(yapi.commons.fieldSelect(this.$user,['_id','username','email', 'up_time', 'add_time']));
}
return ctx.body = yapi.commons.resReturn(null, 300 , 'Please login.');

1
doc/build/static/server/controllers/group.js.html vendored
View File

@ -34,7 +34,6 @@ import projectModel from '../models/project.js'
class groupController extends baseController{
constructor(ctx){
super(ctx)
console.log('constructor....')
}

120
doc/build/static/server/controllers/project.js.html vendored
View File

@ -25,16 +25,19 @@
<div class="ydoc-container-content">
<div class="static-code-content" role="main">
<pre class="brush: js;">
import projectModel from '../models/project.js'
import projectModel from '../models/project.js'
import yapi from '../yapi.js'
import baseController from './base.js'
import interfaceModel from '../models/interface.js'
import groupModel from '../models/group'
import commons from '../utils/commons.js'
class projectController extends baseController {
constructor(ctx){
super(ctx)
this.Model = yapi.getInst(projectModel);
this.groupModel = yapi.getInst(groupModel);
}
/**
@ -106,7 +109,7 @@ class projectController extends baseController {
* @category project
* @foldnumber 10
* @param {Number} id 项目id，不能为空
* @param {member_uid} uid 项目成员uid,不能为空
* @param {String} member_uid 项目成员uid,不能为空
* @returns {Object}
* @example ./api/project/add_member.json
*/
@ -163,6 +166,46 @@ class projectController extends baseController {
ctx.body = yapi.commons.resReturn(null, 402, e.message)
}
}
/**
* 获取项目成员列表
* @interface /project/get_member_list
* @method GET
* @category project
* @foldnumber 10
* @param {Number} id 项目id，不能为空
* @return {Object}
* @example ./api/project/get_member_list.json
*/
async getMemberList(ctx) {
let params = ctx.request.query;
if(!params.id) {
return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
}
try {
let project = await this.Model.get(params.id);
let userInst = yapi.getInst(userModel);
let result = [];
for(let i of project.members) {
let user = await userInst.findById(i);
result.push({
_id: user._id,
email: user.email,
role: user.role,
add_time: user.add_time,
up_time: user.up_time
});
}
ctx.body = yapi.commons.resReturn(result);
} catch(e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
/**
* 添加项目
* @interface /project/get
@ -194,18 +237,28 @@ class projectController extends baseController {
* @category project
* @foldnumber 10
* @param {Number} group_id 项目group_id，不能为空
* @param {Number} [page] 分页页码
* @param {Number} [limit] 分页大小
* @returns {Object}
* @example ./api/project/list.json
*/
async list(ctx) {
let group_id = ctx.request.query.group_id;
let group_id = ctx.request.query.group_id,
page = ctx.request.query.page || 1,
limit = ctx.request.query.limit || 10;
if(!group_id){
return ctx.body = yapi.commons.resReturn(null, 400, '项目分组id不能为空');
}
try{
let result = await this.Model.list(group_id);
ctx.body = yapi.commons.resReturn(result)
let result = await this.Model.listWithPaging(group_id, page, limit);
let count = await this.Model.listCount();
ctx.body = yapi.commons.resReturn({
total: count,
list: result
})
}catch(err){
ctx.body = yapi.commons.resReturn(null, 402, e.message)
}
@ -247,7 +300,7 @@ class projectController extends baseController {
/**
* 编辑项目
* @interface /project/up
* @method GET
* @method POST
* @category project
* @foldnumber 10
* @param {Number} id 项目id，不能为空
@ -304,6 +357,61 @@ class projectController extends baseController {
ctx.body = yapi.commons.resReturn(null, 402, e.message)
}
}
/**
* 模糊搜索项目名称或者组名称
* @interface /project/search
* @method GET
* @category project
* @foldnumber 10
* @param {String} q
* @return {Object}
* @example ./api/project/search.json
*/
async search(ctx) {
const { q } = ctx.request.query;
if (!q) {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'No keyword.')
}
if (!yapi.commons.validateSearchKeyword(q)) {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'Bad query.')
}
let projectList = await this.Model.search(q);
let groupList = await this.groupModel.search(q);
let projectRules = [
'_id',
'name',
'basepath',
'uid',
'env',
'members',
{ key: 'group_id', alias: 'groupId' },
{ key: 'up_time', alias: 'upTime' },
{ key: 'prd_host', alias: 'prdHost' },
{ key: 'add_time', alias: 'addTime' }
];
let groupRules = [
'_id',
'uid',
{ key: 'group_name', alias: 'groupName'},
{ key: 'group_desc', alias: 'groupDesc' },
{ key: 'add_time', alias: 'addTime' },
{ key: 'up_time', alias: 'upTime' }
];
projectList = commons.filterRes(projectList, projectRules);
groupList = commons.filterRes(groupList, groupRules);
let queryList = {
project: projectList,
group: groupList
};
return ctx.body = yapi.commons.resReturn(queryList, 200, 'ok')
}
}
module.exports = projectController;

370
doc/build/static/server/controllers/user.js.html vendored
View File

@ -29,12 +29,15 @@
import yapi from '../yapi.js'
import baseController from './base.js'
import mongoose from 'mongoose'
import request from 'request'
import common from '../utils/commons.js'
const jwt = require('jsonwebtoken');
class userController extends baseController{
constructor(ctx){
class userController extends baseController {
constructor(ctx) {
super(ctx)
this.Model = yapi.getInst(userModel);
}
/**
* 用户登录接口
@ -47,42 +50,35 @@ class userController extends baseController{
* @returns {Object}
* @example ./api/user/login.json
*/
async login(ctx){ //登录
async login(ctx) { //登录
let userInst = yapi.getInst(userModel); //创建user实体
let email = ctx.request.body.email;
let password = ctx.request.body.password;
if(!email){
return ctx.body = yapi.commons.resReturn(null,400,'email不能为空');
if (!email) {
return ctx.body = yapi.commons.resReturn(null, 400, 'email不能为空');
}
if(!password){
return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
if (!password) {
return ctx.body = yapi.commons.resReturn(null, 400, '密码不能为空');
}
let result = await userInst.findByEmail(email);
if(!result){
return ctx.body = yapi.commons.resReturn(null,404,'该用户不存在');
}else if(yapi.commons.generatePassword(password, result.passsalt) === result.password){
let token = jwt.sign({uid: result._id},result.passsalt,{expiresIn: '7 days'});
ctx.cookies.set('_yapi_token', token, {
expires: yapi.commons.expireDate(7),
httpOnly: true
})
ctx.cookies.set('_yapi_uid', result._id, {
expires: yapi.commons.expireDate(7),
httpOnly: true
})
if (!result) {
return ctx.body = yapi.commons.resReturn(null, 404, '该用户不存在');
} else if (yapi.commons.generatePassword(password, result.passsalt) === result.password) {
this.setLoginCookie(result._id, result.passsalt)
return ctx.body = yapi.commons.resReturn({
username: result.username,
uid: result._id,
email: result.email,
add_time: result.add_time,
up_time: result.up_time
}, 0, 'logout success...');
}else{
}, 0, 'logout success...');
} else {
return ctx.body = yapi.commons.resReturn(null, 405, '密码错误');
}
}
@ -97,13 +93,153 @@ class userController extends baseController{
* @example ./api/user/logout.json
*/
async logout(ctx){
async logout(ctx) {
ctx.cookies.set('_yapi_token', null);
ctx.cookies.set('_yapi_uid', null);
ctx.body = yapi.commons.resReturn('ok');
}
/**
* 第三方登录需要提供一个request方法和 token字段，暂时只支持qunar第三方
* @return {email: String, username: String}
*/
thirdQunarLogin() {
return {
request: (token) => {
return new Promise((resolve, reject) => {
request('http://qsso.corp.qunar.com/api/verifytoken.php?token=' + token, function (error, response, body) {
if (!error && response.statusCode == 200) {
let result = JSON.parse(body);
if (result && result.ret === true) {
let ret = {
email: result.userId + '@qunar.com',
username: result.data.userInfo.name
}
resolve(ret)
} else {
reject(result)
}
}
reject(error)
})
})
},
tokenField: 'token',
}
}
async loginByToken(ctx) {
let config = this.thirdQunarLogin();
let token = ctx.request.body[config.tokenField] || ctx.request.query[config.tokenField];
try {
let ret = await config.request(token);
let login = await this.handleThirdLogin(ret.email, ret.username);
if (login === true) {
yapi.commons.log('login success');
ctx.redirect('/')
}
} catch (e) {
yapi.commons.log(e.message, 'error')
ctx.redirect('/')
}
}
async handleThirdLogin(email, username) {
let user, data, passsalt;
var userInst = yapi.getInst(userModel);
try {
user = await userInst.findByEmail(email);
if (!user || !user._id) {
passsalt = yapi.commons.randStr();
data = {
username: username,
password: yapi.commons.generatePassword(passsalt, passsalt),
email: email,
passsalt: passsalt,
role: 'member',
add_time: yapi.commons.time(),
up_time: yapi.commons.time()
}
user = await userInst.save(data);
}
this.setLoginCookie(user._id, user.passsalt)
return true;
} catch (e) {
console.error(e.message)
return false;
}
}
/**
* 修改用户密码
* @interface /user/change_password
* @method POST
* @category user
* @param {Number} uid 用户ID
* @param {Number} [old_password] 旧密码, 非admin用户必须传
* @param {Number} password 新密码
* @return {Object}
* @example ./api/user/change_password.json
*/
async changePassword(ctx) {
let params = ctx.request.body;
let userInst = yapi.getInst(userModel);
if (this.getRole() !== 'admin' && params.uid != this.getUid()) {
console.log(this.getRole(), this.getUid());
return ctx.body = yapi.commons.resReturn(null, 402, '没有权限');
}
if (this.getRole() !== 'admin') {
if (!params.old_password) {
return ctx.body = yapi.commons.resReturn(null, 400, '旧密码不能为空');
}
let user = await userInst.findById(params.uid);
if (yapi.commons.generatePassword(params.old_password, user.passsalt) !== user.password) {
return ctx.body = yapi.commons.resReturn(null, 402, '旧密码错误');
}
}
let passsalt = yapi.commons.randStr();
let data = {
up_time: yapi.commons.time(),
password: yapi.commons.generatePassword(params.password, passsalt),
passsalt: passsalt
};
try {
let result = await userInst.update(params.uid, data);
ctx.body = yapi.commons.resReturn(result);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 401, e.message);
}
}
async forgetPassword(ctx) {
}
async resetPassword(ctx) {
}
setLoginCookie(uid, passsalt) {
let token = jwt.sign({ uid: uid }, passsalt, { expiresIn: '7 days' });
this.ctx.cookies.set('_yapi_token', token, {
expires: yapi.commons.expireDate(7),
httpOnly: true
})
this.ctx.cookies.set('_yapi_uid', uid, {
expires: yapi.commons.expireDate(7),
httpOnly: true
})
}
/**
* 用户注册接口
* @interface /user/reg
@ -116,19 +252,19 @@ class userController extends baseController{
* @returns {Object}
* @example ./api/user/login.json
*/
async reg(ctx){ //注册
var userInst = yapi.getInst(userModel);
async reg(ctx) { //注册
var userInst = yapi.getInst(userModel);
let params = ctx.request.body; //获取请求的参数,检查是否存在用户名和密码
if(!params.email){
return ctx.body = yapi.commons.resReturn(null,400,'邮箱不能为空');
if (!params.email) {
return ctx.body = yapi.commons.resReturn(null, 400, '邮箱不能为空');
}
if(!params.password){
return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
if (!params.password) {
return ctx.body = yapi.commons.resReturn(null, 400, '密码不能为空');
}
var checkRepeat = await userInst.checkRepeat(params.email);//然后检查是否已经存在该用户
if(checkRepeat>0){
return ctx.body = yapi.commons.resReturn(null,401,'该email已经注册');
if (checkRepeat > 0) {
return ctx.body = yapi.commons.resReturn(null, 401, '该email已经注册');
}
let passsalt = yapi.commons.randStr();
@ -141,21 +277,26 @@ class userController extends baseController{
add_time: yapi.commons.time(),
up_time: yapi.commons.time()
}
try{
if (!data.username) {
data.username = data.email.substr(0, data.email.indexOf('@'));
}
try {
let user = await userInst.save(data);
this.setLoginCookie(user._id, user.passsalt)
ctx.body = yapi.commons.resReturn({
uid: user._id,
email: user.email,
username: user.username,
add_time: user.add_time,
up_time: user.up_time,
role: 'member',
role: 'member'
});
yapi.commons.sendMail({
to: params.email,
contents: `欢迎注册，您的账号 ${params.email} 已经注册成功`
})
}catch(e){
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 401, e.message);
}
}
@ -167,26 +308,35 @@ class userController extends baseController{
* @method GET
* @category user
* @foldnumber 10
* @param {Number} [page] 分页页码
* @param {Number} [limit] 分页大小
* @returns {Object}
* @example
*/
async list(ctx){
let page = ctx.request.query.page || 1,
limit = ctx.request.query.limit || 10;
if(this.getRole() !== 'admin'){
return ctx.body = yapi.commons.resReturn(null, 402, 'Without permission.');
}
var userInst = yapi.getInst(userModel);
try{
let user = await userInst.list();
return ctx.body = yapi.commons.resReturn(user);
}catch(e){
return ctx.body = yapi.commons.resReturn(null, 402, '没有权限');
}
const userInst = yapi.getInst(userModel);
try {
let user = await userInst.listWithPaging(page, limit);
let count = await userInst.listCount();
return ctx.body = yapi.commons.resReturn({
total: count,
list: user
});
} catch(e) {
return ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
/**
* 获取用户列表
* @interface /user/list
* 获取用户个人信息
* @interface /user/find
* @method GET
* @param id 用户uid
* @category user
@ -195,22 +345,26 @@ class userController extends baseController{
* @example
*/
async findById(ctx){ //根据id获取用户信息
try{
async findById(ctx) { //根据id获取用户信息
try {
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
if(this.getUid() != id){
return ctx.body = yapi.commons.resReturn(null, 402, 'Without permission.');
}
let id = ctx.request.query.id;
let result = await userInst.findById(id);
return ctx.body = yapi.commons.resReturn(result);
return ctx.body = yapi.commons.resReturn({
uid: result._id,
username: result.username,
email: result.email,
role: result.role,
add_time: result.add_time,
up_time: result.up_time
});
}catch(e){
return ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
/**
* 获取用户列表,只有admin用户才有此权限
* 删除用户,只有admin用户才有此权限
* @interface /user/del
* @method POST
* @param id 用户uid
@ -219,37 +373,113 @@ class userController extends baseController{
* @returns {Object}
* @example
*/
async del(ctx){ //根据id删除一个用户
try{
if(this.getRole() !== 'admin'){
async del(ctx) { //根据id删除一个用户
try {
if (this.getRole() !== 'admin') {
return ctx.body = yapi.commons.resReturn(null, 402, 'Without permission.');
}
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
let result = await userInst.del(id);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
ctx.body = yapi.commons.resReturn(null,402,e.message);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
/**
* 更新用户个人信息
* @interface /user/update
* @method POST
* @param uid 用户uid
* @param [role] 用户角色,只有管理员有权限修改
* @param [username] String
* @param [email] String
* @category user
* @foldnumber 10
* @returns {Object}
* @example
*/
async update(ctx){ //更新用户信息
try{
let params = ctx.request.body;
if(this.getRole() !== 'admin' && params.uid != this.getUid()){
return ctx.body = yapi.commons.resReturn(null,401,'没有权限');
}
var userInst = yapi.getInst(userModel);
let id = this.getUid();
let data ={};
ctx.request.body.username && (data.username = ctx.request.body.username)
ctx.request.body.email && (data.email = ctx.request.body.email)
let result = await userInst.update(id,data);
let id = params.uid;
let data ={
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)
if (data.email) {
var checkRepeat = await userInst.checkRepeat(data.email);//然后检查是否已经存在该用户
if (checkRepeat > 0) {
return ctx.body = yapi.commons.resReturn(null, 401, '该email已经注册');
}
}
let result = await userInst.update(id, data);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
ctx.body = yapi.commons.resReturn(null,402,e.message);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
/**
* 模糊搜索用户名或者email
* @interface /user/search
* @method GET
* @category user
* @foldnumber 10
* @param {String} q
* @return {Object}
* @example ./api/user/search.json
*/
async search(ctx) {
const { q } = ctx.request.query;
if (!q) {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'No keyword.');
}
if (!yapi.commons.validateSearchKeyword(q)) {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'Bad query.');
}
let queryList = await this.Model.search(q);
let rules = [
{
key: '_id',
alias: 'uid'
},
'email',
'role',
{
key: 'add_time',
alias: 'addTime'
},
{
key: 'up_time',
alias: 'upTime'
}
];
let filteredRes = common.filterRes(queryList, rules);
console.log(queryList)
return ctx.body = yapi.commons.resReturn(filteredRes, 200, 'ok');
}
}
module.exports = userController
module.exports = userController;
</pre>
</div>
</div>

5
exampleCode/api/project/get_member_list.json
View File

@ -5,12 +5,9 @@
{
"_id": 101,
"email": "admin@admin.com",
"password": "e00084747ecba89837affe8a048e83c751e44209",
"passsalt": "fmf3kytyysc4swwuqc15rk9",
"role": "admin",
"add_time": 1499932673,
"up_time": 1499932673,
"__v": 0
"up_time": 1499932673
}
]
}

63
exampleCode/api/project/list.json
View File

@ -1,36 +1,35 @@
{
"errcode": 0,
"errmsg": "success",
"data": [
{
"_id": 7,
"name": "project_a1",
"desc": "tttttt",
"prd_host": "project.a1.cc",
"basepath": "/a1",
"uid": 0,
"group_id": 1,
"add_time": 1499331378,
"up_time": 1499331378,
"__v": 0,
"members": [
0
]
},
{
"_id": 8,
"name": "project_a2",
"desc": "tttttt",
"prd_host": "project.a2.cc",
"basepath": "/a1",
"uid": 0,
"group_id": 1,
"add_time": 1499331387,
"up_time": 1499331387,
"__v": 0,
"members": [
0
]
}
]
"data": {
"total": 2,
"list": [
{
"_id": 133,
"name": "project_a1",
"prd_host": "project.a2.cc",
"basepath": "/a1/",
"uid": 101,
"group_id": 101,
"add_time": 1500004234,
"up_time": 1500004234,
"__v": 0,
"env":[],
"members":["101"]
},
{
"_id": 163,
"name": "project_a2",
"prd_host": "project.a2.cc",
"basepath": "/a2/",
"uid": 101,
"group_id": 101,
"add_time": 1500006397,
"up_time": 1500006397,
"__v": 0,
"env":[],
"members":["101"]
}
]
}
}

59
exampleCode/api/project/search.json
View File

@ -1,34 +1,31 @@
{
"errcode": 200,
"errmsg": "ok",
"data": {
"project": [
{
"_id": 101,
"name": "project yapi",
"prd_host": "yapi.qunar.com",
"basepath": "/yapi/",
"uid": 101,
"group_id": 193,
"add_time": 1500013365,
"up_time": 1500013365,
"__v": 0,
"env": [],
"members": [
"101"
"errcode": 200,
"errmsg": "ok",
"data": {
"project": [
{
"_id": 101,
"name": "qav_project",
"prdHost": "xxx.qunar.com:8080",
"basepath": "/qav/",
"addTime": 1500013365,
"uid": 101,
"upTime": 1500013365,
"env": [],
"members": [
"101"
]
}
],
"group": [
{
"_id": 193,
"groupName": "qav",
"groupDesc": "project qav",
"uid": 0,
"addTime": 1500013066,
"upTime": 1500013066
}
]
}
],
"group": [
{
"_id": 193,
"group_name": "yapi",
"group_desc": "group yapi",
"uid": 0,
"add_time": 1500013066,
"up_time": 1500013066,
"__v": 0
}
]
}
}
}

24
exampleCode/api/user/list.json Normal file
View File

@ -0,0 +1,24 @@
{
"errcode": 0,
"errmsg": "success",
"data":{
"total": 2,
"list":[
{
"_id": 101,
"email": "admin@admin.com",
"role": "admin",
"add_time": 1499932673,
"up_time": 1499932673
},
{
"_id": 263,
"username": "2515418556",
"email": "2515418556@qq.com",
"role": "member",
"add_time": 1500023432,
"up_time": 1500024967
}
]
}
}

9
exampleCode/api/user/search.json
View File

@ -3,14 +3,11 @@
"errmsg": "ok",
"data": [
{
"_id": 101,
"uid": 101,
"email": "admin@admin.com",
"password": "3d078af947521bb4a99c93f5e089fc2ac601fa09",
"passsalt": "qc8lnjpnbs9z1vodz4ynfjemi",
"role": "admin",
"add_time": 1499936103,
"up_time": 1499936103,
"__v": 0
"addTime": 1499936103,
"upTime": 1499936103
}
]
}

39
package.json
View File

@ -31,6 +31,7 @@
"koa-static": "^3.0.0",
"koa-views": "^5.2.0",
"mockjs": "^1.0.1-beta3",
"moment": "^2.18.1",
"mongoose": "4.10.8",
"mongoose-auto-increment": "^5.0.1",
"node-sass-china": "^4.5.0",
@ -89,26 +90,26 @@
"webpack-node-externals": "^1.6.0"
},
"config": {
"ghooks": {
"commit-msg": "validate-commit-msg"
},
"validate-commit-msg": {
"types": [
"feat",
"fix",
"docs",
"test",
"chore",
"refactor",
"opti"
],
"warnOnFail": false,
"maxSubjectLength": 100,
"subjectPattern": ".+",
"subjectPatternErrorMsg": "请输入message信息!",
"helpMessage": "Commit message 格式错误, \n请查看规范: http://wiki.corp.qunar.com/pages/viewpage.action?pageId=159698767"
}
"ghooks": {
"commit-msg": "validate-commit-msg"
},
"validate-commit-msg": {
"types": [
"feat",
"fix",
"docs",
"test",
"chore",
"refactor",
"opti"
],
"warnOnFail": false,
"maxSubjectLength": 100,
"subjectPattern": ".+",
"subjectPatternErrorMsg": "请输入message信息!",
"helpMessage": "Commit message 格式错误, \n请查看规范: http://wiki.corp.qunar.com/pages/viewpage.action?pageId=159698767"
}
},
"engines": {
"node": ">= 6.0.0",
"npm": ">= 3.0.0"

67
server/controllers/project.js
View File

@ -2,8 +2,8 @@ import projectModel from '../models/project.js'
import yapi from '../yapi.js'
import baseController from './base.js'
import interfaceModel from '../models/interface.js'
import userModel from '../models/user.js'
import groupModel from '../models/group'
import commons from '../utils/commons.js'
class projectController extends baseController {
@ -76,7 +76,7 @@ class projectController extends baseController {
}
/**
* 添加项目成员
* 添加项目
* @interface /project/add_member
* @method POST
* @category project
@ -108,7 +108,7 @@ class projectController extends baseController {
}
/**
* 删除项目成员
* 添加项目
* @interface /project/del_member
* @method POST
* @category project
@ -142,7 +142,7 @@ class projectController extends baseController {
/**
* 获取项目成员列表
* @interface /project/get_member_list.json
* @interface /project/get_member_list
* @method GET
* @category project
* @foldnumber 10
@ -164,7 +164,13 @@ class projectController extends baseController {
for(let i of project.members) {
let user = await userInst.findById(i);
result.push(user);
result.push({
_id: user._id,
email: user.email,
role: user.role,
add_time: user.add_time,
up_time: user.up_time
});
}
ctx.body = yapi.commons.resReturn(result);
@ -173,7 +179,6 @@ class projectController extends baseController {
}
}
/**
* 添加项目
* @interface /project/get
@ -205,18 +210,28 @@ class projectController extends baseController {
* @category project
* @foldnumber 10
* @param {Number} group_id 项目group_id，不能为空
* @param {Number} [page] 分页页码
* @param {Number} [limit] 分页大小
* @returns {Object}
* @example ./api/project/list.json
*/
async list(ctx) {
let group_id = ctx.request.query.group_id;
let group_id = ctx.request.query.group_id,
page = ctx.request.query.page || 1,
limit = ctx.request.query.limit || 10;
if(!group_id){
return ctx.body = yapi.commons.resReturn(null, 400, '项目分组id不能为空');
}
try{
let result = await this.Model.list(group_id);
ctx.body = yapi.commons.resReturn(result)
let result = await this.Model.listWithPaging(group_id, page, limit);
let count = await this.Model.listCount();
ctx.body = yapi.commons.resReturn({
total: count,
list: result
})
}catch(err){
ctx.body = yapi.commons.resReturn(null, 402, e.message)
}
@ -258,7 +273,7 @@ class projectController extends baseController {
/**
* 编辑项目
* @interface /project/up
* @method GET
* @method POST
* @category project
* @foldnumber 10
* @param {Number} id 项目id，不能为空
@ -337,10 +352,36 @@ class projectController extends baseController {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'Bad query.')
}
let projectList = await this.Model.search(q);
let groupList = await this.groupModel.search(q);
let projectRules = [
'_id',
'name',
'basepath',
'uid',
'env',
'members',
{ key: 'group_id', alias: 'groupId' },
{ key: 'up_time', alias: 'upTime' },
{ key: 'prd_host', alias: 'prdHost' },
{ key: 'add_time', alias: 'addTime' }
];
let groupRules = [
'_id',
'uid',
{ key: 'group_name', alias: 'groupName'},
{ key: 'group_desc', alias: 'groupDesc' },
{ key: 'add_time', alias: 'addTime' },
{ key: 'up_time', alias: 'upTime' }
];
projectList = commons.filterRes(projectList, projectRules);
groupList = commons.filterRes(groupList, groupRules);
let queryList = {
project: await this.Model.search(q),
group: await this.groupModel.search(q)
}
project: projectList,
group: groupList
};
return ctx.body = yapi.commons.resReturn(queryList, 200, 'ok')
}

239
server/controllers/user.js
View File

@ -3,11 +3,12 @@ import yapi from '../yapi.js'
import baseController from './base.js'
import mongoose from 'mongoose'
import request from 'request'
import common from '../utils/commons.js'
const jwt = require('jsonwebtoken');
class userController extends baseController{
constructor(ctx){
class userController extends baseController {
constructor(ctx) {
super(ctx)
this.Model = yapi.getInst(userModel);
}
@ -22,26 +23,26 @@ class userController extends baseController{
* @returns {Object}
* @example ./api/user/login.json
*/
async login(ctx){ //登录
async login(ctx) { //登录
let userInst = yapi.getInst(userModel); //创建user实体
let email = ctx.request.body.email;
let password = ctx.request.body.password;
if(!email){
return ctx.body = yapi.commons.resReturn(null,400,'email不能为空');
if (!email) {
return ctx.body = yapi.commons.resReturn(null, 400, 'email不能为空');
}
if(!password){
return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
if (!password) {
return ctx.body = yapi.commons.resReturn(null, 400, '密码不能为空');
}
let result = await userInst.findByEmail(email);
if(!result){
return ctx.body = yapi.commons.resReturn(null,404,'该用户不存在');
}else if(yapi.commons.generatePassword(password, result.passsalt) === result.password){
if (!result) {
return ctx.body = yapi.commons.resReturn(null, 404, '该用户不存在');
} else if (yapi.commons.generatePassword(password, result.passsalt) === result.password) {
this.setLoginCookie(result._id, result.passsalt)
return ctx.body = yapi.commons.resReturn({
username: result.username,
uid: result._id,
@ -49,8 +50,8 @@ class userController extends baseController{
add_time: result.add_time,
up_time: result.up_time
}, 0, 'logout success...');
}else{
}, 0, 'logout success...');
} else {
return ctx.body = yapi.commons.resReturn(null, 405, '密码错误');
}
}
@ -65,7 +66,7 @@ class userController extends baseController{
* @example ./api/user/logout.json
*/
async logout(ctx){
async logout(ctx) {
ctx.cookies.set('_yapi_token', null);
ctx.cookies.set('_yapi_uid', null);
ctx.body = yapi.commons.resReturn('ok');
@ -76,22 +77,22 @@ class userController extends baseController{
* 第三方登录需要提供一个request方法和 token字段，暂时只支持qunar第三方
* @return {email: String, username: String}
*/
thirdQunarLogin(){
thirdQunarLogin() {
return {
request: (token) => {
return new Promise((resolve, reject) =>{
request('http://qsso.corp.qunar.com/api/verifytoken.php?token=' + token ,function (error, response, body) {
return new Promise((resolve, reject) => {
request('http://qsso.corp.qunar.com/api/verifytoken.php?token=' + token, function (error, response, body) {
if (!error && response.statusCode == 200) {
let result = JSON.parse(body);
if(result && result.ret === true){
if (result && result.ret === true) {
let ret = {
email: result.userId + '@qunar.com',
username: result.data.userInfo.name
}
resolve(ret)
}else{
resolve(ret)
} else {
reject(result)
}
}
}
reject(error)
})
@ -103,30 +104,30 @@ class userController extends baseController{
async loginByToken(ctx){
async loginByToken(ctx) {
let config = this.thirdQunarLogin();
let token = ctx.request.body[config.tokenField] || ctx.request.query[config.tokenField];
try{
try {
let ret = await config.request(token);
let login = await this.handleThirdLogin(ret.email, ret.username);
if(login === true){
if (login === true) {
yapi.commons.log('login success');
ctx.redirect('/')
}
}catch(e){
} catch (e) {
yapi.commons.log(e.message, 'error')
ctx.redirect('/')
}
}
async handleThirdLogin(email, username){
let user, data, passsalt;
var userInst = yapi.getInst(userModel);
try{
async handleThirdLogin(email, username) {
let user, data, passsalt;
var userInst = yapi.getInst(userModel);
try {
user = await userInst.findByEmail(email);
if(!user || !user._id){
if (!user || !user._id) {
passsalt = yapi.commons.randStr();
data = {
username: username,
@ -139,10 +140,10 @@ class userController extends baseController{
}
user = await userInst.save(data);
}
this.setLoginCookie(user._id, user.passsalt)
return true;
}catch(e){
} catch (e) {
console.error(e.message)
return false;
}
@ -157,22 +158,22 @@ class userController extends baseController{
* @param {Number} [old_password] 旧密码, 非admin用户必须传
* @param {Number} password 新密码
* @return {Object}
* @example ./api/user/change_password
* @example ./api/user/change_password.json
*/
async changePassword(ctx){
async changePassword(ctx) {
let params = ctx.request.body;
let userInst = yapi.getInst(userModel);
if(this.getRole() !== 'admin' && params.uid != this.getUid()){
if (this.getRole() !== 'admin' && params.uid != this.getUid()) {
console.log(this.getRole(), this.getUid());
return ctx.body = yapi.commons.resReturn(null, 402, '没有权限');
}
if(this.getRole() !== 'admin') {
if(!params.old_password) {
if (this.getRole() !== 'admin') {
if (!params.old_password) {
return ctx.body = yapi.commons.resReturn(null, 400, '旧密码不能为空');
}
let user = await userInst.findById(params.uid);
if(yapi.commons.generatePassword(params.old_password, user.passsalt) !== user.password) {
if (yapi.commons.generatePassword(params.old_password, user.passsalt) !== user.password) {
return ctx.body = yapi.commons.resReturn(null, 402, '旧密码错误');
}
}
@ -183,24 +184,24 @@ class userController extends baseController{
password: yapi.commons.generatePassword(params.password, passsalt),
passsalt: passsalt
};
try{
try {
let result = await userInst.update(params.uid, data);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 401, e.message);
}
}
async forgetPassword(ctx){
}
async resetPassword(ctx){
async forgetPassword(ctx) {
}
setLoginCookie(uid, passsalt){
let token = jwt.sign({uid: uid},passsalt,{expiresIn: '7 days'});
async resetPassword(ctx) {
}
setLoginCookie(uid, passsalt) {
let token = jwt.sign({ uid: uid }, passsalt, { expiresIn: '7 days' });
this.ctx.cookies.set('_yapi_token', token, {
expires: yapi.commons.expireDate(7),
httpOnly: true
@ -224,19 +225,19 @@ class userController extends baseController{
* @returns {Object}
* @example ./api/user/login.json
*/
async reg(ctx){ //注册
var userInst = yapi.getInst(userModel);
async reg(ctx) { //注册
var userInst = yapi.getInst(userModel);
let params = ctx.request.body; //获取请求的参数,检查是否存在用户名和密码
if(!params.email){
return ctx.body = yapi.commons.resReturn(null,400,'邮箱不能为空');
if (!params.email) {
return ctx.body = yapi.commons.resReturn(null, 400, '邮箱不能为空');
}
if(!params.password){
return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
if (!params.password) {
return ctx.body = yapi.commons.resReturn(null, 400, '密码不能为空');
}
var checkRepeat = await userInst.checkRepeat(params.email);//然后检查是否已经存在该用户
if(checkRepeat>0){
return ctx.body = yapi.commons.resReturn(null,401,'该email已经注册');
if (checkRepeat > 0) {
return ctx.body = yapi.commons.resReturn(null, 401, '该email已经注册');
}
let passsalt = yapi.commons.randStr();
@ -249,13 +250,13 @@ class userController extends baseController{
add_time: yapi.commons.time(),
up_time: yapi.commons.time()
}
if(!data.username){
if (!data.username) {
data.username = data.email.substr(0, data.email.indexOf('@'));
}
try{
try {
let user = await userInst.save(data);
this.setLoginCookie(user._id, user.passsalt)
ctx.body = yapi.commons.resReturn({
uid: user._id,
email: user.email,
@ -268,7 +269,7 @@ class userController extends baseController{
to: params.email,
contents: `欢迎注册，您的账号 ${params.email} 已经注册成功`
})
}catch(e){
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 401, e.message);
}
}
@ -280,19 +281,25 @@ class userController extends baseController{
* @method GET
* @category user
* @foldnumber 10
* @param {Number} [page] 分页页码
* @param {Number} [limit] 分页大小
* @returns {Object}
* @example
*/
async list(ctx){
if(this.getRole() !== 'admin'){
return ctx.body = yapi.commons.resReturn(null, 402, '没有权限');
}
var userInst = yapi.getInst(userModel);
try{
let user = await userInst.list();
return ctx.body = yapi.commons.resReturn(user);
}catch(e){
let page = ctx.request.query.page || 1,
limit = ctx.request.query.limit || 10;
const userInst = yapi.getInst(userModel);
try {
let user = await userInst.listWithPaging(page, limit);
let count = await userInst.listCount();
return ctx.body = yapi.commons.resReturn({
total: count,
list: user
});
} catch(e) {
return ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
@ -308,12 +315,22 @@ class userController extends baseController{
* @example
*/
async findById(ctx){ //根据id获取用户信息
try{
async findById(ctx) { //根据id获取用户信息
try {
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
let id = ctx.request.query.id;
let result = await userInst.findById(id);
return ctx.body = yapi.commons.resReturn(result);
if(!result){
return ctx.body = yapi.commons.resReturn(null,402,"不存在的用户");
}
return ctx.body = yapi.commons.resReturn({
uid: result._id,
username: result.username,
email: result.email,
role: result.role,
add_time: result.add_time,
up_time: result.up_time
});
}catch(e){
return ctx.body = yapi.commons.resReturn(null,402,e.message);
}
@ -329,17 +346,17 @@ class userController extends baseController{
* @returns {Object}
* @example
*/
async del(ctx){ //根据id删除一个用户
try{
if(this.getRole() !== 'admin'){
async del(ctx) { //根据id删除一个用户
try {
if (this.getRole() !== 'admin') {
return ctx.body = yapi.commons.resReturn(null, 402, 'Without permission.');
}
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
let result = await userInst.del(id);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
ctx.body = yapi.commons.resReturn(null,402,e.message);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
@ -347,8 +364,10 @@ class userController extends baseController{
* 更新用户个人信息
* @interface /user/update
* @method POST
* @param username String
* @param email String
* @param uid 用户uid
* @param [role] 用户角色,只有管理员有权限修改
* @param [username] String
* @param [email] String
* @category user
* @foldnumber 10
* @returns {Object}
@ -356,26 +375,34 @@ class userController extends baseController{
*/
async update(ctx){ //更新用户信息
try{
let params = ctx.request.body;
if(this.getRole() !== 'admin' && params.uid != this.getUid()){
return ctx.body = yapi.commons.resReturn(null,401,'没有权限');
}
var userInst = yapi.getInst(userModel);
let id = this.getUid();
let id = params.uid;
let data ={
up_time: yapi.commons.time()
};
ctx.request.body.username && (data.username = ctx.request.body.username)
ctx.request.body.email && (data.email = ctx.request.body.email)
if(this.getRole() === 'admin'){
params.role && (data.role = params.role)
}
params.username && (data.username = params.username)
params.email && (data.email = params.email)
if(data.email){
if (data.email) {
var checkRepeat = await userInst.checkRepeat(data.email);//然后检查是否已经存在该用户
if(checkRepeat>0){
return ctx.body = yapi.commons.resReturn(null,401,'该email已经注册');
if (checkRepeat > 0) {
return ctx.body = yapi.commons.resReturn(null, 401, '该email已经注册');
}
}
let result = await userInst.update(id, data);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
ctx.body = yapi.commons.resReturn(null,402,e.message);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
@ -393,16 +420,36 @@ class userController extends baseController{
const { q } = ctx.request.query;
if (!q) {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'No keyword.')
return ctx.body = yapi.commons.resReturn(void 0, 400, 'No keyword.');
}
if (!yapi.commons.validateSearchKeyword(q)) {
return ctx.body = yapi.commons.resReturn(void 0, 400, 'Bad query.')
return ctx.body = yapi.commons.resReturn(void 0, 400, 'Bad query.');
}
let queryList = await this.Model.search(q);
return ctx.body = yapi.commons.resReturn(queryList, 200, 'ok')
let rules = [
{
key: '_id',
alias: 'uid'
},
'email',
'role',
{
key: 'add_time',
alias: 'addTime'
},
{
key: 'up_time',
alias: 'upTime'
}
];
let filteredRes = common.filterRes(queryList, rules);
console.log(queryList)
return ctx.body = yapi.commons.resReturn(filteredRes, 200, 'ok');
}
}
module.exports = userController
module.exports = userController;

12
server/models/project.js
View File

@ -66,6 +66,18 @@ class projectModel extends baseModel{
}).exec()
}
listWithPaging(group_id, page, limit) {
page = parseInt(page);
limit = parseInt(limit);
return this.model.find({
group_id: group_id
}).skip((page - 1) * limit).limit(limit).exec();
}
listCount() {
return this.model.count();
}
countByGroupId(group_id){
return this.model.count({
group_id: group_id

16
server/models/user.js
View File

@ -9,7 +9,10 @@ class userModel extends baseModel{
getSchema(){
return{
username: String,
username: {
type: String,
required: true
},
password:{
type:String,
required: true
@ -36,6 +39,14 @@ class userModel extends baseModel{
list(){
return this.model.find().select("_id username email role add_time up_time").exec() //显示id name email role
}
listWithPaging(page, limit) {
page = parseInt(page);
limit = parseInt(limit);
return this.model.find().skip((page - 1) * limit).limit(limit).select("_id username email role add_time up_time").exec();
}
listCount() {
return this.model.count();
}
findByEmail(email){
return this.model.findOne({email: email})
}
@ -60,6 +71,9 @@ class userModel extends baseModel{
{ email: new RegExp(keyword, 'i') },
{ username: new RegExp(keyword, 'i')}
]
}, {
passsalt: 0,
password: 0
}).limit(10)
}

2
server/router.js
View File

@ -56,7 +56,7 @@ createAction('project', 'up', 'post', 'up')
createAction('project', 'del', 'post', 'del')
createAction('project', 'add_member', 'post', 'addMember')
createAction('project', 'del_member', 'post', 'delMember')
createAction('project', 'get_member_list.json', 'get', 'getMemberList')
createAction('project', 'get_member_list', 'get', 'getMemberList')
createAction('project', 'search', 'get', 'search')
//interface

82
server/utils/commons.js
View File

@ -4,7 +4,7 @@ import path from 'path'
import yapi from '../yapi.js'
import sha1 from 'sha1'
exports.resReturn = (data, num, errmsg)=> {
exports.resReturn = (data, num, errmsg) => {
num = num || 0;
return {
errcode: num,
@ -14,42 +14,42 @@ exports.resReturn = (data, num, errmsg)=> {
}
const MSGTYPE = {
'log' : 'Log',
'warn' : 'warning',
'log': 'Log',
'warn': 'warning',
'error': 'Error'
}
exports.log = (msg, type) => {
if(!msg) return;
exports.log = (msg, type) => {
if (!msg) return;
type = type || 'log';
let f;
switch(type){
switch (type) {
case 'log': f = console.log; break;
case 'warn': f = console.warn; break;
case 'error': f= console.error; break;
default : f = console.log; break;
case 'error': f = console.error; break;
default: f = console.log; break;
}
f(type + ':', msg);
let date = new Date();
let year = date.getFullYear();
let month = date.getMonth();
let logfile = path.join(yapi.WEBROOT_LOG, year + '-' + month + '.log');
if(typeof msg === 'object'){
if(msg instanceof Error) msg = msg.message;
if (typeof msg === 'object') {
if (msg instanceof Error) msg = msg.message;
else msg = JSON.stringify(msg);
}
let data= (new Date).toLocaleTimeString() + "\t|\t" + type + "\t|\t" + msg;
let data = (new Date).toLocaleTimeString() + "\t|\t" + type + "\t|\t" + msg;
fs.writeFileSync(logfile, data, {
flag: 'w+'
});
}
exports.fileExist = (filePath) =>{
exports.fileExist = (filePath) => {
try {
return fs.statSync(filePath).isFile();
} catch (err) {
@ -58,31 +58,31 @@ exports.fileExist = (filePath) =>{
}
exports.time = () => {
return Date.parse(new Date())/1000;
return Date.parse(new Date()) / 1000;
}
exports.fieldSelect = (data, field)=>{
if(!data || !field || !Array.isArray(field)) return null;
exports.fieldSelect = (data, field) => {
if (!data || !field || !Array.isArray(field)) return null;
var arr = {};
field.forEach( (f) => {
field.forEach((f) => {
data[f] && (arr[f] = data[f]);
} )
})
return arr;
}
exports.rand =(min, max)=>{
exports.rand = (min, max) => {
return Math.floor(Math.random() * (max - min) + min);
}
exports.json_parse = (json)=>{
try{
exports.json_parse = (json) => {
try {
return JSON.parse(json);
}catch(e){
} catch (e) {
return json
}
}
exports.randStr = ()=> {
exports.randStr = () => {
return Math.random().toString(36).substr(2)
}
@ -96,20 +96,20 @@ exports.expireDate = (day) => {
return date;
}
exports.sendMail = (options,cb) => {
if(!yapi.mail) return false;
options.subject = options.subject? options.subject + '-yapi平台' : 'ypai平台';
cb = cb || function(err, info){
if(err){
yapi.commons.log('send mail ' + options.to +' error,'+ err.message, 'error');
}else{
yapi.commons.log('send mail ' + options.to +' success');
exports.sendMail = (options, cb) => {
if (!yapi.mail) return false;
options.subject = options.subject ? options.subject + '-yapi平台' : 'ypai平台';
cb = cb || function (err, info) {
if (err) {
yapi.commons.log('send mail ' + options.to + ' error,' + err.message, 'error');
} else {
yapi.commons.log('send mail ' + options.to + ' success');
}
}
yapi.mail.sendMail({
from: yapi.WEBCONFIG.mail.auth.user,
to : options.to,
to: options.to,
subject: 'yapi平台',
html: options.contents
}, cb)
@ -120,4 +120,18 @@ exports.validateSearchKeyword = keyword => {
return false;
}
return true;
}
exports.filterRes = (list, rules) => {
return list.map(item => {
let filteredRes = {};
rules.forEach(rule => {
if (typeof rule == 'string') {
filteredRes[rule] = item[rule];
} else if (typeof rule == 'object') {
filteredRes[rule.alias] = item[rule.key];
}
});
return filteredRes;
})
}

73
server_dist/controllers/project.js
View File

@ -48,14 +48,14 @@ var _interface = require('../models/interface.js');
var _interface2 = _interopRequireDefault(_interface);
var _user = require('../models/user.js');
var _user2 = _interopRequireDefault(_user);
var _group = require('../models/group');
var _group2 = _interopRequireDefault(_group);
var _commons = require('../utils/commons.js');
var _commons2 = _interopRequireDefault(_commons);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var projectController = function (_baseController) {
@ -201,7 +201,7 @@ var projectController = function (_baseController) {
return add;
}()
/**
* 添加项目成员
* 添加项目
* @interface /project/add_member
* @method POST
* @category project
@ -285,7 +285,7 @@ var projectController = function (_baseController) {
return addMember;
}()
/**
* 删除项目成员
* 添加项目
* @interface /project/del_member
* @method POST
* @category project
@ -371,7 +371,7 @@ var projectController = function (_baseController) {
/**
* 获取项目成员列表
* @interface /project/get_member_list.json
* @interface /project/get_member_list
* @method GET
* @category project
* @foldnumber 10
@ -406,7 +406,7 @@ var projectController = function (_baseController) {
case 6:
project = _context4.sent;
userInst = _yapi2.default.getInst(_user2.default);
userInst = _yapi2.default.getInst(userModel);
result = [];
_iteratorNormalCompletion = true;
_didIteratorError = false;
@ -427,7 +427,13 @@ var projectController = function (_baseController) {
case 18:
user = _context4.sent;
result.push(user);
result.push({
_id: user._id,
email: user.email,
role: user.role,
add_time: user.add_time,
up_time: user.up_time
});
case 20:
_iteratorNormalCompletion = true;
@ -564,6 +570,8 @@ var projectController = function (_baseController) {
* @category project
* @foldnumber 10
* @param {Number} group_id 项目group_id，不能为空
* @param {Number} [page] 分页页码
* @param {Number} [limit] 分页大小
* @returns {Object}
* @example ./api/project/list.json
*/
@ -572,12 +580,12 @@ var projectController = function (_baseController) {
key: 'list',
value: function () {
var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) {
var group_id, result;
var group_id, page, limit, result, count;
return _regenerator2.default.wrap(function _callee6$(_context6) {
while (1) {
switch (_context6.prev = _context6.next) {
case 0:
group_id = ctx.request.query.group_id;
group_id = ctx.request.query.group_id, page = ctx.request.query.page || 1, limit = ctx.request.query.limit || 10;
if (group_id) {
_context6.next = 3;
@ -589,27 +597,35 @@ var projectController = function (_baseController) {
case 3:
_context6.prev = 3;
_context6.next = 6;
return this.Model.list(group_id);
return this.Model.listWithPaging(group_id, page, limit);
case 6:
result = _context6.sent;
_context6.next = 9;
return this.Model.listCount();
ctx.body = _yapi2.default.commons.resReturn(result);
_context6.next = 13;
case 9:
count = _context6.sent;
ctx.body = _yapi2.default.commons.resReturn({
total: count,
list: result
});
_context6.next = 16;
break;
case 10:
_context6.prev = 10;
case 13:
_context6.prev = 13;
_context6.t0 = _context6['catch'](3);
ctx.body = _yapi2.default.commons.resReturn(null, 402, e.message);
case 13:
case 16:
case 'end':
return _context6.stop();
}
}
}, _callee6, this, [[3, 10]]);
}, _callee6, this, [[3, 13]]);
}));
function list(_x6) {
@ -713,7 +729,7 @@ var projectController = function (_baseController) {
/**
* 编辑项目
* @interface /project/up
* @method GET
* @method POST
* @category project
* @foldnumber 10
* @param {Number} id 项目id，不能为空
@ -852,7 +868,7 @@ var projectController = function (_baseController) {
key: 'search',
value: function () {
var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) {
var q, queryList;
var q, projectList, groupList, projectRules, groupRules, queryList;
return _regenerator2.default.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
@ -879,19 +895,26 @@ var projectController = function (_baseController) {
return this.Model.search(q);
case 7:
_context9.t0 = _context9.sent;
projectList = _context9.sent;
_context9.next = 10;
return this.groupModel.search(q);
case 10:
_context9.t1 = _context9.sent;
groupList = _context9.sent;
projectRules = ['_id', 'name', 'basepath', 'uid', 'env', 'members', { key: 'group_id', alias: 'groupId' }, { key: 'up_time', alias: 'upTime' }, { key: 'prd_host', alias: 'prdHost' }, { key: 'add_time', alias: 'addTime' }];
groupRules = ['_id', 'uid', { key: 'group_name', alias: 'groupName' }, { key: 'group_desc', alias: 'groupDesc' }, { key: 'add_time', alias: 'addTime' }, { key: 'up_time', alias: 'upTime' }];
projectList = _commons2.default.filterRes(projectList, projectRules);
groupList = _commons2.default.filterRes(groupList, groupRules);
queryList = {
project: _context9.t0,
group: _context9.t1
project: projectList,
group: groupList
};
return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(queryList, 200, 'ok'));
case 13:
case 17:
case 'end':
return _context9.stop();
}

159
server_dist/controllers/user.js
View File

@ -52,6 +52,10 @@ var _request2 = require('request');
var _request3 = _interopRequireDefault(_request2);
var _commons = require('../utils/commons.js');
var _commons2 = _interopRequireDefault(_commons);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var jwt = require('jsonwebtoken');
@ -353,7 +357,7 @@ var userController = function (_baseController) {
* @param {Number} [old_password] 旧密码, 非admin用户必须传
* @param {Number} password 新密码
* @return {Object}
* @example ./api/user/change_password
* @example ./api/user/change_password.json
*/
}, {
@ -618,6 +622,8 @@ var userController = function (_baseController) {
* @method GET
* @category user
* @foldnumber 10
* @param {Number} [page] 分页页码
* @param {Number} [limit] 分页大小
* @returns {Object}
* @example
*/
@ -626,39 +632,40 @@ var userController = function (_baseController) {
key: 'list',
value: function () {
var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(ctx) {
var userInst, user;
var page, limit, userInst, user, count;
return _regenerator2.default.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
case 0:
if (!(this.getRole() !== 'admin')) {
_context9.next = 2;
break;
}
return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, '没有权限'));
case 2:
page = ctx.request.query.page || 1, limit = ctx.request.query.limit || 10;
userInst = _yapi2.default.getInst(_user2.default);
_context9.prev = 3;
_context9.next = 6;
return userInst.list();
_context9.prev = 2;
_context9.next = 5;
return userInst.listWithPaging(page, limit);
case 6:
case 5:
user = _context9.sent;
return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(user));
_context9.next = 8;
return userInst.listCount();
case 10:
_context9.prev = 10;
_context9.t0 = _context9['catch'](3);
case 8:
count = _context9.sent;
return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn({
total: count,
list: user
}));
case 12:
_context9.prev = 12;
_context9.t0 = _context9['catch'](2);
return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, _context9.t0.message));
case 13:
case 15:
case 'end':
return _context9.stop();
}
}
}, _callee9, this, [[3, 10]]);
}, _callee9, this, [[2, 12]]);
}));
function list(_x10) {
@ -690,25 +697,41 @@ var userController = function (_baseController) {
case 0:
_context10.prev = 0;
userInst = _yapi2.default.getInst(_user2.default);
id = ctx.request.body.id;
id = ctx.request.query.id;
_context10.next = 5;
return userInst.findById(id);
case 5:
result = _context10.sent;
return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(result));
case 9:
_context10.prev = 9;
if (result) {
_context10.next = 8;
break;
}
return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, "不存在的用户"));
case 8:
return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn({
uid: result._id,
username: result.username,
email: result.email,
role: result.role,
add_time: result.add_time,
up_time: result.up_time
}));
case 11:
_context10.prev = 11;
_context10.t0 = _context10['catch'](0);
return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, _context10.t0.message));
case 12:
case 14:
case 'end':
return _context10.stop();
}
}
}, _callee10, this, [[0, 9]]);
}, _callee10, this, [[0, 11]]);
}));
function findById(_x11) {
@ -785,8 +808,10 @@ var userController = function (_baseController) {
* 更新用户个人信息
* @interface /user/update
* @method POST
* @param username String
* @param email String
* @param uid 用户uid
* @param [role] 用户角色,只有管理员有权限修改
* @param [username] String
* @param [email] String
* @category user
* @foldnumber 10
* @returns {Object}
@ -797,62 +822,76 @@ var userController = function (_baseController) {
key: 'update',
value: function () {
var _ref12 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee12(ctx) {
var userInst, id, data, checkRepeat, result;
var params, userInst, id, data, checkRepeat, result;
return _regenerator2.default.wrap(function _callee12$(_context12) {
while (1) {
switch (_context12.prev = _context12.next) {
case 0:
_context12.prev = 0;
userInst = _yapi2.default.getInst(_user2.default);
id = this.getUid();
data = {
up_time: _yapi2.default.commons.time()
};
params = ctx.request.body;
ctx.request.body.username && (data.username = ctx.request.body.username);
ctx.request.body.email && (data.email = ctx.request.body.email);
if (!data.email) {
_context12.next = 12;
if (!(this.getRole() !== 'admin' && params.uid != this.getUid())) {
_context12.next = 4;
break;
}
_context12.next = 9;
return _context12.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '没有权限'));
case 4:
userInst = _yapi2.default.getInst(_user2.default);
id = params.uid;
data = {
up_time: _yapi2.default.commons.time()
};
if (this.getRole() === 'admin') {
params.role && (data.role = params.role);
}
params.username && (data.username = params.username);
params.email && (data.email = params.email);
if (!data.email) {
_context12.next = 16;
break;
}
_context12.next = 13;
return userInst.checkRepeat(data.email);
case 9:
case 13:
checkRepeat = _context12.sent;
if (!(checkRepeat > 0)) {
_context12.next = 12;
_context12.next = 16;
break;
}
return _context12.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '该email已经注册'));
case 12:
_context12.next = 14;
case 16:
_context12.next = 18;
return userInst.update(id, data);
case 14:
case 18:
result = _context12.sent;
ctx.body = _yapi2.default.commons.resReturn(result);
_context12.next = 21;
_context12.next = 25;
break;
case 18:
_context12.prev = 18;
case 22:
_context12.prev = 22;
_context12.t0 = _context12['catch'](0);
ctx.body = _yapi2.default.commons.resReturn(null, 402, _context12.t0.message);
case 21:
case 25:
case 'end':
return _context12.stop();
}
}
}, _callee12, this, [[0, 18]]);
}, _callee12, this, [[0, 22]]);
}));
function update(_x13) {
@ -877,7 +916,7 @@ var userController = function (_baseController) {
key: 'search',
value: function () {
var _ref13 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee13(ctx) {
var q, queryList;
var q, queryList, rules, filteredRes;
return _regenerator2.default.wrap(function _callee13$(_context13) {
while (1) {
switch (_context13.prev = _context13.next) {
@ -905,9 +944,23 @@ var userController = function (_baseController) {
case 7:
queryList = _context13.sent;
return _context13.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(queryList, 200, 'ok'));
rules = [{
key: '_id',
alias: 'uid'
}, 'email', 'role', {
key: 'add_time',
alias: 'addTime'
}, {
key: 'up_time',
alias: 'upTime'
}];
filteredRes = _commons2.default.filterRes(queryList, rules);
case 9:
console.log(queryList);
return _context13.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(filteredRes, 200, 'ok'));
case 12:
case 'end':
return _context13.stop();
}

14
server_dist/models/project.js
View File

@ -106,6 +106,20 @@ var projectModel = function (_baseModel) {
group_id: group_id
}).exec();
}
}, {
key: 'listWithPaging',
value: function listWithPaging(group_id, page, limit) {
page = parseInt(page);
limit = parseInt(limit);
return this.model.find({
group_id: group_id
}).skip((page - 1) * limit).limit(limit).exec();
}
}, {
key: 'listCount',
value: function listCount() {
return this.model.count();
}
}, {
key: 'countByGroupId',
value: function countByGroupId(group_id) {

20
server_dist/models/user.js
View File

@ -51,7 +51,10 @@ var userModel = function (_baseModel) {
key: 'getSchema',
value: function getSchema() {
return {
username: String,
username: {
type: String,
required: true
},
password: {
type: String,
required: true
@ -84,6 +87,18 @@ var userModel = function (_baseModel) {
value: function list() {
return this.model.find().select("_id username email role add_time up_time").exec(); //显示id name email role
}
}, {
key: 'listWithPaging',
value: function listWithPaging(page, limit) {
page = parseInt(page);
limit = parseInt(limit);
return this.model.find().skip((page - 1) * limit).limit(limit).select("_id username email role add_time up_time").exec();
}
}, {
key: 'listCount',
value: function listCount() {
return this.model.count();
}
}, {
key: 'findByEmail',
value: function findByEmail(email) {
@ -115,6 +130,9 @@ var userModel = function (_baseModel) {
value: function search(keyword) {
return this.model.find({
$or: [{ email: new RegExp(keyword, 'i') }, { username: new RegExp(keyword, 'i') }]
}, {
passsalt: 0,
password: 0
}).limit(10);
}
}]);

2
server_dist/router.js
View File

@ -82,7 +82,7 @@ createAction('project', 'up', 'post', 'up');
createAction('project', 'del', 'post', 'del');
createAction('project', 'add_member', 'post', 'addMember');
createAction('project', 'del_member', 'post', 'delMember');
createAction('project', 'get_member_list.json', 'get', 'getMemberList');
createAction('project', 'get_member_list', 'get', 'getMemberList');
createAction('project', 'search', 'get', 'search');
//interface

14
server_dist/utils/commons.js
View File

@ -141,4 +141,18 @@ exports.validateSearchKeyword = function (keyword) {
return false;
}
return true;
};
exports.filterRes = function (list, rules) {
return list.map(function (item) {
var filteredRes = {};
rules.forEach(function (rule) {
if (typeof rule == 'string') {
filteredRes[rule] = item[rule];
} else if ((typeof rule === 'undefined' ? 'undefined' : (0, _typeof3.default)(rule)) == 'object') {
filteredRes[rule.alias] = item[rule.key];
}
});
return filteredRes;
});
};

1
ykit.hosts
View File

@ -1 +0,0 @@
[]