feat - 合并最新代码 解决冲突

.gitignore

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

client/App.js

@@ -1,9 +1,86 @@
 import React, { Component } from 'react'
-import Routes from './routes'
+import axios from 'axios';
+import { Route, HashRouter, Redirect } from 'react-router-dom'
+import { Home, ProjectGroups, Interface, News } from './containers/index'
+import User from './containers/User/User.js'
+import Header from './components/Header/Header'
+
+const LOADING_STATUS = 0;
+const GUEST_STATUS = 1;
+const MEMBER_STATUS = 2;
 
 class App extends Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      login: LOADING_STATUS
+    }
+  }
+
+  route = (status) => {
+    let r;
+    if (status === LOADING_STATUS) {
+      return <span>loading...</span>
+    } else if (status === GUEST_STATUS) {
+      r = (
+        <HashRouter>
+
+          <div className="router-main">
+            <Header />
+            <Route path="/" component={Home} exact />
+            <Redirect to="/" />
+          </div>
+
+
+        </HashRouter>
+      )
+    } else {
+      r = (
+        <HashRouter>
+          <div className="router-main">
+            <Header />
+            <Route path="/" component={ProjectGroups} exact />
+            <Route path="/ProjectGroups" component={ProjectGroups} />
+            <Route path="/Interface" component={Interface} />
+            <Route path="/user" component={User} />
+            <Route path="/News" component={News} />
+          </div>
+
+        </HashRouter>
+      )
+    }
+    return r
+
+  }
+
+  componentDidMount() {
+    console.log('app.js init')
+    axios.get('/user/status').then((res) => {
+      if (res.data.errcode === 0 && res.data.data._id > 0) {
+        this.setState({
+          login: MEMBER_STATUS
+        })
+      } else {
+        this.setState({
+          login: GUEST_STATUS
+        })
+      }
+    }, (err) => {
+      this.setState({
+        login: GUEST_STATUS
+      })
+      console.log(err.message)
+    })
+
+  }
+
   render() {
-    return <Routes />
+    console.log(MEMBER_STATUS)
+    console.log(this.route(this.state.login))
+    return this.route(this.state.login)
+
+
   }
 }
 

client/ReduxContainer.js

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

client/actions/group.js

@@ -17,18 +17,3 @@ export function setCurrGroup(group) {
     payload: group
   }
 }
-
-export function addGroup(groupName) {
-  return function(dispatch, getState) {
-    const group = getState().group;
-    const groupList = group.groupList || [];
-    const newGroupList = groupList.concat([{ group_name: groupName + groupList.length }]);
-    dispatch({
-      type: FETCH_GROUP_LIST,
-      payload: { data: {
-        data: newGroupList,
-        errcode: 0
-      }}
-    });
-  }
-}

client/actions/login.js

@@ -1,22 +1,30 @@
 import {
   LOGIN,
-  LOGIN_TYPE
+  LOGIN_OUT,
+  LOGIN_TYPE,
+  GET_LOGIN_STATE
 } from '../constants/action-types.js';
 import axios from 'axios';
-import Cookies from 'universal-cookie';
-const cookies = new Cookies();
+
+const checkLoginState = () => {
+  return {
+    type: GET_LOGIN_STATE,
+    // payload 可以返回 Promise，异步请求使用 axios 即可
+    payload: axios.get('/user/status')
+  };
+}
 
 const loginActions = (data) => {
   return (dispatch) => {
     axios.post('/user/login', data).then((res) => {
       if (res.data.errcode === 0) {
-        cookies.set(data.email, data.password);
         dispatch({
           type: LOGIN,
           payload: {
             data: res
           }
         });
+        location.reload()
       } else {
         console.log('登录失败,errcode不为0');
       }
@@ -42,6 +50,21 @@ const regActions = (data) => {
   }
 }
 
+const logoutActions = () => {
+  return(dispatch)=>{
+    axios.get('./user/logout').then((res) => {
+      console.log(res);
+      if(res.data.errcode === 0){
+        dispatch({
+          type: LOGIN_OUT
+        })
+      }
+    }).catch((err) => {
+      console.log(err);
+    })
+  }
+}
+
 const loginTypeAction = (index) => {
   return{
     type: LOGIN_TYPE,
@@ -52,5 +75,7 @@ const loginTypeAction = (index) => {
 export default {
   loginActions,
   regActions,
-  loginTypeAction
+  logoutActions,
+  loginTypeAction,
+  checkLoginState
 }

client/actions/news.js

@@ -4,19 +4,11 @@ import {
 } from '../constants/action-types.js';
 
 export function fetchNewsData () {
-  const data = [{
-    name: 'John Brown',
-    date: '2015-11-11 13:00:15',
-    desc: '创建服务现场'
-  }, {
-    name: 'John Brown1',
-    date: '2015-11-11 13:00:15',
-    desc: '技术测试异常'
-  }, {
-    name: 'John Brown2',
-    date: '2015-11-11 13:00:15',
-    desc: '网络异常正在修复'
-  }]
+  const data = [
+    { key: 1, type: 'John Brown', news: '您好！亲爱的用户：您已成功申请接口：实时空气质量数据查询，请于两个月内进行应用验证，逾期接口将不能正常使用。如果您在使用的过程中遇到任何问题，欢迎前往交流社区反馈意见，谢谢！',time: '2014-12-01' },
+    { key: 2, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' },
+    { key: 3, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' }
+  ];
 
   return {
     type: FETCH_NEWS_DATA,
@@ -25,19 +17,11 @@ export function fetchNewsData () {
 }
 
 export function fetchViewedNews () {
-  const data = [{
-    name: 'John Brown21',
-    date: '2015-11-11 13:00:15',
-    desc: '创建服务现场'
-  }, {
-    name: 'John Brown12',
-    date: '2015-11-11 13:00:15',
-    desc: '技术测试异常'
-  }, {
-    name: 'John Brown22',
-    date: '2015-11-11 13:00:15',
-    desc: '网络异常正在修复'
-  }]
+  const data = [
+    { key: 1, type: 'John Brown1', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' },
+    { key: 2, type: 'John Brown2', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' },
+    { key: 3, type: 'John Brown3å', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' }
+  ];
 
   return {
     type: FETCH_NEWS_DATA,
@@ -46,19 +30,11 @@ export function fetchViewedNews () {
 }
 
 export function fetchNotVieweNews () {
-  const data = [{
-    name: 'John Brown22',
-    date: '2015-11-11 13:00:15',
-    desc: '创建服务现场'
-  }, {
-    name: 'John Brown12',
-    date: '2015-11-11 13:00:15',
-    desc: '技术测试异常'
-  }, {
-    name: 'John Brown22',
-    date: '2015-11-11 13:00:15',
-    desc: '网络异常正在修复'
-  }]
+  const data = [
+    { key: 1, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2015-11-11 13:00:15' },
+    { key: 2, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2015-11-11 13:00:15' },
+    { key: 3, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2015-11-11 13:00:15' }
+  ];
 
   return {
     type: FETCH_NEWS_DATA,
@@ -68,19 +44,11 @@ export function fetchNotVieweNews () {
 
 export function fetchMoreNews () {
   return (dispatch)=>{
-    const data = [{
-      name: 'John Brown2212',
-      date: '2015-11-11 13:00:15',
-      desc: '创建服务现场'
-    }, {
-      name: 'John Brown1132',
-      date: '2015-11-11 13:00:15',
-      desc: '技术测试异常'
-    }, {
-      name: 'John Brown23212',
-      date: '2015-11-11 13:00:15',
-      desc: '网络异常正在修复'
-    }]
+    const data = [
+      { key: 1, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' },
+      { key: 2, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' },
+      { key: 3, type: 'John Brown', news: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.',time: '2014-12-01' }
+    ];
 
     dispatch({
       type: FETCH_MORE_NEWS,

client/actions/project.js

@@ -1,24 +1,87 @@
 import {
-  PROJECT_ADD
+  FETCH_PROJECT_LIST,
+  PROJECT_ADD,
+  PROJECT_DEL,
+  CHANGE_UPDATE_MODAL,
+  PROJECT_UPDATE,
+  CHANGE_TABLE_LOADING
 } from '../constants/action-types.js';
 import axios from 'axios';
+import variable from '../constants/variable';
+
+const fetchProjectList = (id, pageNum) => {
+  return {
+    type: FETCH_PROJECT_LIST,
+    payload: axios.get('/project/list', {
+      params: {
+        group_id: id,
+        page: pageNum,
+        limit: variable.PAGE_LIMIT
+      }
+    })
+  };
+};
+
+const changeUpdateModal = (data, index) => {
+  return {
+    type: CHANGE_UPDATE_MODAL,
+    payload: { data, index }
+  };
+};
+
+const changeTableLoading = (data) => {
+  return {
+    type: CHANGE_TABLE_LOADING,
+    payload: 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
-  }
-  console.log(param);
+    desc,
+    group_id
+  };
   return {
     type: PROJECT_ADD,
     // payload 可以返回 Promise，异步请求使用 axios 即可
     payload: axios.post('/project/add', param)
-  }
-}
+  };
+};
+
+const updateProject = (data) => {
+  const { name, prd_host, basepath, desc, group_id } = data;
+  const param = {
+    name,
+    prd_host,
+    basepath,
+    desc,
+    group_id
+  };
+  return {
+    type: PROJECT_UPDATE,
+    // payload 可以返回 Promise，异步请求使用 axios 即可
+    payload: axios.post('/project/up', param)
+  };
+};
+
+const delProject = (id) => {
+  const param = { id };
+  return {
+    type: PROJECT_DEL,
+    // payload 可以返回 Promise，异步请求使用 axios 即可
+    payload: axios.post('/project/del', param)
+  };
+};
 
 export default {
-  addProject
-}
+  fetchProjectList,
+  addProject,
+  delProject,
+  changeUpdateModal,
+  updateProject,
+  changeTableLoading
+};

client/actions/user.js

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

client/app.js

@@ -1,9 +1,86 @@
 import React, { Component } from 'react'
-import Routes from './routes'
+import axios from 'axios';
+import { Route, HashRouter, Redirect } from 'react-router-dom'
+import { Home, ProjectGroups, Interface, News } from './containers/index'
+import User from './containers/User/User.js'
+import Header from './components/Header/Header'
+
+const LOADING_STATUS = 0;
+const GUEST_STATUS = 1;
+const MEMBER_STATUS = 2;
 
 class App extends Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      login: LOADING_STATUS
+    }
+  }
+
+  route = (status) => {
+    let r;
+    if (status === LOADING_STATUS) {
+      return <span>loading...</span>
+    } else if (status === GUEST_STATUS) {
+      r = (
+        <HashRouter>
+
+          <div className="router-main">
+            <Header />
+            <Route path="/" component={Home} exact />
+            <Redirect to="/" />
+          </div>
+
+
+        </HashRouter>
+      )
+    } else {
+      r = (
+        <HashRouter>
+          <div className="router-main">
+            <Header />
+            <Route path="/" component={ProjectGroups} exact />
+            <Route path="/ProjectGroups" component={ProjectGroups} />
+            <Route path="/Interface" component={Interface} />
+            <Route path="/user" component={User} />
+            <Route path="/News" component={News} />
+          </div>
+
+        </HashRouter>
+      )
+    }
+    return r
+
+  }
+
+  componentDidMount() {
+    console.log('app.js init')
+    axios.get('/user/status').then((res) => {
+      if (res.data.errcode === 0 && res.data.data._id > 0) {
+        this.setState({
+          login: MEMBER_STATUS
+        })
+      } else {
+        this.setState({
+          login: GUEST_STATUS
+        })
+      }
+    }, (err) => {
+      this.setState({
+        login: GUEST_STATUS
+      })
+      console.log(err.message)
+    })
+
+  }
+
   render() {
-    return <Routes />
+    console.log(MEMBER_STATUS)
+    console.log(this.route(this.state.login))
+    return this.route(this.state.login)
+
+
   }
 }
 

client/common.js

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

client/components/Header/Header.js

@@ -4,35 +4,61 @@ import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { Link } from 'react-router-dom'
 import { Icon, Layout, Menu} from 'antd'
-import loginTypeAction from '../../actions/login';
+import { checkLoginState, logoutActions, loginTypeAction} from '../../actions/login'
+import { withRouter } from 'react-router';
 
 const { Header } = Layout;
 const ToolUser = (props)=> (
   <ul>
-    <li><Icon type="question-circle-o" />帮助</li>
-    <li><Icon type="user" />{ props.user }</li>
-    <li>退出</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 onClick={props.logout}>退出</li>
   </ul>
 );
 ToolUser.propTypes={
   user:PropTypes.string,
-  msg:PropTypes.string
+  msg:PropTypes.string,
+  relieveLink:PropTypes.func,
+  logout:PropTypes.func
 };
 
-const ToolGuest = (props)=> (
-  <ul>
-    <li onClick={e => props.onLogin(e)}><Link to={`/Login`}>登录</Link></li>
-    <li onClick={e => props.onReg(e)}><Link to={`/Login`}>注册</Link></li>
-  </ul>
-);
-ToolGuest.propTypes={
-  onLogin:PropTypes.func,
-  onReg:PropTypes.func
-}
-
+@withRouter
 class HeaderCom extends Component {
   constructor(props) {
     super(props);
+    this.state = {
+      current : window.location.hash.split("#")[1]
+    }
+  }
+  static propTypes ={
+    router: PropTypes.object,
+    user: PropTypes.string,
+    msg: PropTypes.string,
+    login:PropTypes.bool,
+    relieveLink:PropTypes.func,
+    logoutActions:PropTypes.func,
+    checkLoginState:PropTypes.func,
+    loginTypeAction:PropTypes.func,
+    history: PropTypes.object,
+    location: PropTypes.object
+  }
+  componentDidMount() {
+    const { router } = this.props;
+    console.log(router);
+  }
+  linkTo = (e) =>{
+    this.setState({
+      current : e.key
+    })
+  }
+  relieveLink = () => {
+    this.setState({
+      current : ""
+    })
+  }
+  logout = (e) => {
+    e.preventDefault();
+    this.props.logoutActions();
   }
   handleLogin = (e) => {
     e.preventDefault();
@@ -42,7 +68,17 @@ class HeaderCom extends Component {
     e.preventDefault();
     this.props.loginTypeAction("2");
   }
+  checkLoginState = () => {
+    this.props.checkLoginState().then((res) => {
+      if (res.payload.data.errcode !== 0) {
+        this.props.history.push('/');
+      }
+    }).catch((err) => {
+      console.log(err);
+    })
+  }
   render () {
+    this.checkLoginState();
     const { login, user, msg } = this.props;
     return (
       <acticle className="header-box">
@@ -57,20 +93,24 @@ 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.Item key="/doc">
+                  <a>文档</a>
                 </Menu.Item>
               </Menu>
               <div className="user-toolbar">
-                {login?<ToolUser user={user} msg={msg}/>:''}
+                {login?<ToolUser user={user} msg={msg} relieveLink={this.relieveLink} logout={this.logout}/>:""}
               </div>
             </div>
           </Header>
@@ -80,21 +120,17 @@ class HeaderCom extends Component {
   }
 }
 
-HeaderCom.propTypes={
-  user: PropTypes.string,
-  msg: PropTypes.string,
-  login:PropTypes.bool,
-  loginTypeAction:PropTypes.func
-};
-
 export default connect(
   (state) => {
     return{
       user: state.login.userName,
-      msg: "暂无消息",
+      msg: null,
       login:state.login.isLogin
     }
   },
-  {loginTypeAction}
+  {
+    loginTypeAction,
+    logoutActions,
+    checkLoginState
+  }
 )(HeaderCom)
-

client/components/Header/Header.scss

@@ -7,18 +7,12 @@ $color-black-light : #404040;
 /* .header-box.css */
 .header-box {
   display: block;
-  // position: fixed;
-  // 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 +37,6 @@ $color-black-light : #404040;
 
   .nav-toolbar {
     font-size: .15rem;
-    box-sizing: border-box;
     float: left;
   }
 
@@ -63,9 +56,21 @@ $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;
+        margin-right: .03rem;
       }
     }
   }

client/constants/action-types.js

@@ -20,16 +20,26 @@ export const FETCH_GROUP_LIST = 'FETCH_GROUP_LIST'
 export const SET_CURR_GROUP = 'SET_CURR_GROUP'
 
 // project
-export const PROJECT_ADD = 'PROJECT_ADD'
+export const CHANGE_TABLE_LOADING = 'CHANGE_TABLE_LOADING'  // 控制表格的Loading状态
+export const CHANGE_UPDATE_MODAL = 'CHANGE_UPDATE_MODAL'    // 控制模态框 - 修改项目
+export const OPRATE_ADD_MODAL = 'OPRATE_ADD_MODAL'          // 控制模态框 - 创建项目
+export const FETCH_PROJECT_LIST = 'FETCH_PROJECT_LIST'      // 获取项目列表
+export const PROJECT_ADD = 'PROJECT_ADD'                    // 添加项目
+export const PROJECT_UPDATE = 'PROJECT_UPDATE'              // 修改项目
+export const PROJECT_DEL = 'PROJECT_DEL'                    // 删除项目
 
 // login
-export const LOGIN = 'LOGIN';
-export const REGISTER = 'REGISTER';
+export const LOGIN = 'LOGIN';                               // 登录
+export const GET_LOGIN_STATE = 'GET_LOGIN_STATE';           // 获取登录信息
+export const REGISTER = 'REGISTER';                         // 注册
 
 //header
 export const LOGIN_TYPE = 'LOGIN_TYPE';
+export const LOGIN_OUT = 'LOGIN_OUT';
 
 //  News
 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'

client/constants/variable.js

@@ -0,0 +1,3 @@
+export default {
+  PAGE_LIMIT: 10 // 默认每页展示10条数据
+}

client/containers/Home/Home.js

@@ -1,52 +1,86 @@
 import './Home.scss'
 import React, { Component } from 'react'
-import { Row, Col } from 'antd'
+import { connect } from 'react-redux'
+import { Link } from 'react-router-dom'
+import { Row, Col, Button } from 'antd'
 import PropTypes from "prop-types"
-import Login from '../Login/login-wrap'
+import Login from '../Login/LoginWrap'
 import Intro from '../../components/Intro/Intro'
+import Footer from "../../components/Footer/Footer";
 
+const HomeGuest = (props) => (
+  <div>
+    <div className="main-one">
+      <div className="container">
+        <Row>
+          <Col span={24}>
+            <div className="home-des">
+              <p className="title">YAPI</p>
+              <div className="detail">一个高效，易用，功能强大的api管理系统</div>
+            </div>
+          </Col>
+        </Row>
+        <Row>
+          <Col span={8} className="main-one-left">
+            <Login/>
+          </Col>
+          <Col span={16} className="main-one-right">
+            <div className="img-container">
+              <img src="./image/demo-img.png"/>
+            </div>
+          </Col>
+        </Row>
+      </div>
+    </div>
+    { props.introList.map(function(intro,i){
+      return (
+        <div className="main-part" key={i}>
+          <div className="container">
+            <Intro intro={intro}/>
+          </div>
+        </div>
+      )
+    })}
+  </div>
+);
+HomeGuest.propTypes ={
+  introList: PropTypes.array
+}
+
+@connect(
+  state => ({
+    login: state.login.isLogin
+  })
+)
 
 class Home extends Component {
   constructor(props) {
     super(props)
   }
   static propTypes = {
-    introList:PropTypes.array
+    introList: PropTypes.array,
+    login : PropTypes.bool
   }
   render () {
+    const { login } = this.props;
     return (
       <div className="home-main">
-        <div className="main-one">
-          <div className="container">
-            <Row>
-              <Col span={24}>
-                <div className="home-des">
-                  <p className="title">YAPI</p>
-                  <div className="detail">一个高效，易用，功能强大的api管理系统</div>
+        {login?
+          (
+            <div className="user-home">
+              <div className="user-des">
+                <p className="title">YAPI</p>
+                <p className="des">一个高效，易用，功能强大的api管理系统</p>
+                <div className="btn">
+                  <Button type="primary" size="large">
+                    <Link to="/ProjectGroups" onClick={this.toStart}>开始</Link>
+                  </Button>
                 </div>
-              </Col>
-            </Row>
-            <Row>
-              <Col span={8} className="main-one-left">
-                <Login/>
-              </Col>
-              <Col span={16} className="main-one-right">
-                <div className="img-container">
-                  <img src="./static/image/demo-img.png"/>
-                </div>
-              </Col>
-            </Row>
-          </div>
-        </div>
-        { this.props.introList.map(function(intro,i){
-          return (
-            <div className="main-part" key={i}>
-              <div className="container">
-                <Intro intro={intro}/>
               </div>
             </div>
           )
-        })}
+          : <HomeGuest introList={this.props.introList}/>}
+        <Footer/>
       </div>
     )
   }
@@ -61,7 +95,7 @@ Home.defaultProps={
       {title:"接口管理",des:"强大的接口文档"},
       {title:"接口管理",des:"强大的接口文档"}
     ],
-    img:"./static/image/demo-img.png"
+    img:"./image/demo-img.png"
   },{
     title:"接口管理",
     des:"yapi将满足你的所有接口管理需求。不再需要 为每个项目搭建独立的接口管理平台和编写离线的接口文档",
@@ -69,7 +103,7 @@ Home.defaultProps={
       {title:"接口管理",des:"强大的接口文档"},
       {title:"接口管理",des:"强大的接口文档"}
     ],
-    img:"./static/image/demo-img.png"
+    img:"./image/demo-img.png"
   }
   ]
 };

client/containers/Home/Home.scss

@@ -43,6 +43,31 @@ $color-black-lighter: #404040;
       padding-left: .15rem;
     }
   }
+  .user-home{
+    height:calc(100% - .64rem);
+    padding: .5rem .5rem 0 .5rem;
+    .user-des{
+      max-width: 11rem;
+      margin: 0 auto .5rem;
+      text-align: center;
+      .title{
+        font-size: .8rem;
+        margin-bottom: .2rem;
+      }
+      .des{
+        font-size: .25rem;
+        margin-bottom: .3rem;
+      }
+      .btn{
+        button{
+          font-size: .2rem;
+          line-height: .2rem;
+          height: .5rem;
+          padding: .15rem .5rem;
+        }
+      }
+    }
+  }
   .main-part{
     padding: .9rem .5rem;
     &:nth-child(odd){
@@ -53,7 +78,7 @@ $color-black-lighter: #404040;
     }
   }
   .container{
-    max-width: 10.3rem;
+    max-width: 11rem;
     margin: 0 auto;
   }
 }

client/containers/Interface/Interface.js

@@ -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} />

client/containers/Interface/Interface.scss

@@ -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;
 

client/containers/Login/Login.js

@@ -1,94 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { Form, Button, Input, Icon, Checkbox } from 'antd';
-import { loginActions } from  '../../actions/login';
-import Cookies from 'universal-cookie';
-const cookies = new Cookies();
-const FormItem = Form.Item;
-@connect(
-  state => {
-    return {
-      loginData: state.login
-    }
-  },
-  {
-    loginActions
-  }
-)
-
-class Login extends Component {
-  constructor(props) {
-    super(props)
-  }
-
-  static propTypes = {
-    form: PropTypes.object,
-    loginActions: PropTypes.func
-  }
-
-  handleSubmit = (e) => {
-    e.preventDefault();
-    const form = this.props.form;
-    form.validateFields((err, values) => {
-      if (!err) {
-        this.props.loginActions(values);
-      }
-    });
-  }
-
-  handleChange = (value) => {
-    if (cookies.get(value)) {
-      this.props.form.setFieldsValue({
-        password: cookies.get(value)
-      });
-    }
-  }
-
-  render() {
-    const { getFieldDecorator } = this.props.form;
-    const that = this;
-    return (
-      <Form onSubmit={this.handleSubmit}>
-
-        {/* 用户名 (Email) */}
-        <FormItem>
-          {getFieldDecorator('email', {
-            rules: [{ required: true, message: '请输入email!' }],
-            onChange(e) {
-              that.handleChange(e.target.value);
-            }
-          })(
-            <Input prefix={<Icon type="user" style={{ fontSize: 13 }} />} placeholder="Email" />
-          )}
-        </FormItem>
-
-        {/* 密码 */}
-        <FormItem>
-          {getFieldDecorator('password', {
-            rules: [{ required: true, message: '请输入密码!' }]
-          })(
-            <Input prefix={<Icon type="lock" style={{ fontSize: 13 }} />} type="password" placeholder="Password" />
-          )}
-        </FormItem>
-
-
-        {/* 登录按钮 */}
-        <FormItem>
-          <Button type="primary" htmlType="submit" className="login-form-button">登录</Button>
-        </FormItem>
-
-        {/* 记住密码 */}
-        {getFieldDecorator('remember', {
-          valuePropName: 'checked',
-          initialValue: true
-        })(
-          <Checkbox>记住密码</Checkbox>
-        )}
-
-      </Form>
-    )
-  }
-}
-const LoginForm = Form.create()(Login);
-export default LoginForm;

client/containers/Login/LoginWrap.js

@@ -1,10 +1,10 @@
-import './login.scss'
+import './Login.scss'
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
 import { Tabs } from 'antd';
-import LoginForm from './login';
-import RegForm from './reg';
+import LoginForm from './Login';
+import RegForm from './Reg';
 const TabPane = Tabs.TabPane;
 
 

client/containers/Login/login.js

@@ -1,94 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { Form, Button, Input, Icon, Checkbox } from 'antd';
-import { loginActions } from  '../../actions/login';
-import Cookies from 'universal-cookie';
-const cookies = new Cookies();
-const FormItem = Form.Item;
-@connect(
-  state => {
-    return {
-      loginData: state.login
-    }
-  },
-  {
-    loginActions
-  }
-)
-
-class Login extends Component {
-  constructor(props) {
-    super(props)
-  }
-
-  static propTypes = {
-    form: PropTypes.object,
-    loginActions: PropTypes.func
-  }
-
-  handleSubmit = (e) => {
-    e.preventDefault();
-    const form = this.props.form;
-    form.validateFields((err, values) => {
-      if (!err) {
-        this.props.loginActions(values);
-      }
-    });
-  }
-
-  handleChange = (value) => {
-    if (cookies.get(value)) {
-      this.props.form.setFieldsValue({
-        password: cookies.get(value)
-      });
-    }
-  }
-
-  render() {
-    const { getFieldDecorator } = this.props.form;
-    const that = this;
-    return (
-      <Form onSubmit={this.handleSubmit}>
-
-        {/* 用户名 (Email) */}
-        <FormItem>
-          {getFieldDecorator('email', {
-            rules: [{ required: true, message: '请输入email!' }],
-            onChange(e) {
-              that.handleChange(e.target.value);
-            }
-          })(
-            <Input prefix={<Icon type="user" style={{ fontSize: 13 }} />} placeholder="Email" />
-          )}
-        </FormItem>
-
-        {/* 密码 */}
-        <FormItem>
-          {getFieldDecorator('password', {
-            rules: [{ required: true, message: '请输入密码!' }]
-          })(
-            <Input prefix={<Icon type="lock" style={{ fontSize: 13 }} />} type="password" placeholder="Password" />
-          )}
-        </FormItem>
-
-
-        {/* 登录按钮 */}
-        <FormItem>
-          <Button type="primary" htmlType="submit" className="login-form-button">登录</Button>
-        </FormItem>
-
-        {/* 记住密码 */}
-        {getFieldDecorator('remember', {
-          valuePropName: 'checked',
-          initialValue: true
-        })(
-          <Checkbox>记住密码</Checkbox>
-        )}
-
-      </Form>
-    )
-  }
-}
-const LoginForm = Form.create()(Login);
-export default LoginForm;

client/containers/News/News.js

@@ -4,7 +4,7 @@ import NewsTimeline from './NewsTimeline/NewsTimeline'
 import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
 import NewsList from './NewsList/NewsList.js'
-import { fetchNewsData } from '../../actions/news.js'
+import { fetchNotVieweNews } from '../../actions/news.js'
 
 
 @connect(
@@ -14,7 +14,7 @@ import { fetchNewsData } from '../../actions/news.js'
     }
   },
   {
-    fetchNewsData: fetchNewsData
+    fetchNotVieweNews: fetchNotVieweNews
   }
 )
 
@@ -24,10 +24,10 @@ class News extends Component {
   }
   static propTypes = {
     newsData: PropTypes.array,
-    fetchNewsData: PropTypes.func
+    fetchNotVieweNews: PropTypes.func
   }
   componentWillMount(){
-    this.props.fetchNewsData()
+    this.props.fetchNotVieweNews()
   }
   render () {
     const data = this.props.newsData

client/containers/News/News.scss

@@ -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;
 
@@ -29,6 +29,50 @@
 .news-timeline{
   margin-left: 30px;
   margin-top: 30px;
+  .removeAllNews{
+    background-color: #f7f7f7;
+    padding: 7px;
+    display: inline-block;
+    overflow: hidden;
+    margin-bottom: 5px;
+    border-radius: 5px;
+    cursor: pointer;
+    color: #a09f9f;
+
+    &:hover,&:active{
+      background-color: #333;
+      color: white;
+    }
+  }
+  .ant-table-wrapper{
+    width: 822px;
+  }
+  .ant-table-row{
+    max-width: 80%;
+  }
+  .newsDesc{
+    padding-right: 15px;
+
+    p{
+      text-indent: 2em;
+      color: #333;
+      font-size: 14px;
+      line-height: 30px;;
+    }
+    span{
+      font-size: 14px;
+      margin-top: 15px;
+      display: inline-block;
+      color: #999;
+      cursor: pointer;
+      i{
+        margin-right: 5px;
+      }
+      &:hover, &.active {
+        color: #333;
+      }
+    }
+  }
 }
 
 .ant-timeline-item-content{

client/containers/News/NewsList/NewsList.js

@@ -66,9 +66,9 @@ class NewsList extends Component {
   render () {
     return (
       <ul onClick = {this.fetchData.bind(this)} className="news-list">
-        <li className="active allnews">全部消息</li>
+        {/*<li className="allnews">全部消息</li>*/}
+        <li className='active notview'>未读消息</li>
         <li className='viewednews'>已读消息</li>
-        <li className='notview'>未读消息</li>
       </ul>
     )
   }

client/containers/News/NewsTimeline/NewsTimeline.js

@@ -1,8 +1,13 @@
 import React, { Component } from 'react'
-import { Timeline } from 'antd'
+import { Table, Icon, Popconfirm } from 'antd'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { fetchMoreNews } from '../../../actions/news.js'
+
+const removeConfirm = function(e){
+  console.log(e);
+}
+
 @connect(
   state=>{
     return state;
@@ -11,35 +16,41 @@ import { fetchMoreNews } from '../../../actions/news.js'
     fetchMoreNews: fetchMoreNews
   }
 )
+
+
 class NewsTimeline extends Component {
   static propTypes = {
     newsData: PropTypes.array,
     fetchMoreNews: PropTypes.func
   }
-
+  
   constructor(props) {
     super(props);
   }
-
+  removeOneNews(id){
+    return ()=>{
+      console.log(id);
+    }
+  }
   render () {
+    const columns = [
+      { title: '类型',width:100, dataIndex: 'type', key: 'type' },
+      { title: '消息', dataIndex: 'news', key: 'news' },
+      { title: '发布时间',width:150, dataIndex: 'time', key: 'time' }
+    ];
     const data = this.props.newsData;
     return (
       <section className="news-timeline">
-        <Timeline pending={<a onClick = {this.props.fetchMoreNews}>See more</a>}>
-          { 
-            data.map(function(item,i){
-              return (
-                <Timeline.Item color = 'green' key = {i} >
-                  <div>
-                    <span className='timelineDate'>{item.date}</span>
-                    <span className='timelineName'>{item.name}</span>
-                  </div>
-                  <p>{item.desc}</p>
-                </Timeline.Item>
-              )
-            })
-           }
-        </Timeline>
+        <span className='removeAllNews'>
+          <Popconfirm title="你确定要清空所有消息吗?" onConfirm={removeConfirm} okText="删除" cancelText="取消">
+            清空消息
+          </Popconfirm>
+        </span>
+        <Table
+          columns={columns}
+          expandedRowRender={record => <div className='newsDesc'><p>{record.news}</p><span onClick = {this.removeOneNews(record.key)} ><Icon type="delete" />删除</span></div>}
+          dataSource={data}
+        />
       </section>
     )
   }

client/containers/ProjectGroups/GroupList/GroupList.js

@@ -1,13 +1,18 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
-import { Card, Button } from 'antd'
+import { Button, Icon, Modal, Input, message, Menu, Row, Col } from 'antd'
 import { autobind } from 'core-decorators';
+import axios from 'axios';
+
+const Search = Input.Search;
+const confirm = Modal.confirm;
+const TYPE_EDIT = 'edit';
 
 import {
   fetchGroupList,
   setCurrGroup,
-  addGroup
+  setGroupList
 } from '../../../actions/group.js'
 
 import './GroupList.scss'
@@ -20,7 +25,7 @@ import './GroupList.scss'
   {
     fetchGroupList,
     setCurrGroup,
-    addGroup
+    setGroupList
   }
 )
 export default class GroupList extends Component {
@@ -28,9 +33,19 @@ export default class GroupList extends Component {
   static propTypes = {
     groupList: PropTypes.array,
     currGroup: PropTypes.object,
-    addGroup: PropTypes.func,
     fetchGroupList: PropTypes.func,
-    setCurrGroup: PropTypes.func
+    setCurrGroup: PropTypes.func,
+    setGroupList: PropTypes.func
+  }
+
+  state = {
+    addGroupModalVisible: false,
+    editGroupModalVisible: false,
+    newGroupName: '',
+    newGroupDesc: '',
+    currGroupName: '',
+    currGroupDesc: '',
+    groupList: []
   }
 
   constructor(props) {
@@ -39,29 +54,206 @@ export default class GroupList extends Component {
 
   componentWillMount() {
     this.props.fetchGroupList().then(() => {
-      const currGroup = this.props.groupList[0] || { group_name: '' };
+      const currGroup = this.props.groupList[0] || { group_name: '', group_desc: '' };
+      this.setState({groupList: this.props.groupList});
       this.props.setCurrGroup(currGroup)
     });
   }
 
+  @autobind
+  showModal(type) {
+    if (type === 'edit') {
+      const { currGroup } = this.props;
+      this.setState({
+        currGroupName: currGroup.group_name,
+        currGroupDesc: currGroup.group_desc,
+        editGroupModalVisible: true
+      });
+    } else {
+      this.setState({
+        addGroupModalVisible: true
+      });
+    }
+  }
+  @autobind
+  hideModal(type) {
+    if (type === TYPE_EDIT) {
+      this.setState({
+        editGroupModalVisible: false
+      });
+    } else {
+      this.setState({
+        addGroupModalVisible: false
+      });
+    }
+  }
   @autobind
   addGroup() {
-    this.props.addGroup('group');
+    const { newGroupName: group_name, newGroupDesc: group_desc } = this.state;
+    axios.post('/group/add', { group_name, group_desc }).then(res => {
+      if (res.data.errcode) {
+        message.error(res.data.errmsg);
+      } else {
+        this.setState({
+          addGroupModalVisible: false
+        });
+        this.props.fetchGroupList().then(() => {
+          this.setState({groupList: this.props.groupList});
+        })
+        this.props.setCurrGroup(res.data.data)
+      }
+    });
+  }
+  @autobind
+  editGroup() {
+    const { currGroupName: group_name, currGroupDesc: group_desc } = this.state;
+    const id = this.props.currGroup._id;
+    axios.post('/group/up', { group_name, group_desc, id }).then(res => {
+      if (res.data.errcode) {
+        message.error(res.data.errmsg);
+      } else {
+        this.setState({
+          editGroupModalVisible: false
+        });
+        this.props.setCurrGroup({ group_name, group_desc, _id: id });
+      }
+    });
+  }
+  @autobind
+  inputNewGroupName(e, type) {
+    if (type === TYPE_EDIT) {
+      this.setState({ currGroupName: e.target.value})
+    } else {
+      this.setState({newGroupName: e.target.value});
+    }
+  }
+  @autobind
+  inputNewGroupDesc(e, type) {
+    if (type === TYPE_EDIT) {
+      this.setState({ currGroupDesc: e.target.value})
+    } else {
+      this.setState({newGroupDesc: e.target.value});
+    }
+  }
+
+  @autobind
+  selectGroup(e) {
+    const groupId = e.key;
+    const currGroup = this.props.groupList.find((group) => { return +group._id === +groupId });
+    this.props.setCurrGroup(currGroup);
+  }
+
+  @autobind
+  deleteGroup() {
+    const self = this;
+    const { currGroup } = self.props;
+    confirm({
+      title: `你确定要删除分组 ${currGroup.group_name}？`,
+      content: `分组简介：${currGroup.group_desc}`,
+      onOk() {
+        axios.post('/group/del', {id: currGroup._id}).then(res => {
+          if (res.data.errcode) {
+            message.error(res.data.errmsg);
+          } else {
+            message.success('删除成功');
+            self.props.fetchGroupList().then(() => {
+              const currGroup = self.props.groupList[0] || { group_name: '', group_desc: '' };
+              self.setState({groupList: self.props.groupList});
+              self.props.setCurrGroup(currGroup)
+            });
+          }
+        });
+      }
+    });
+  }
+
+  @autobind
+  searchGroup(e, value) {
+    const v = value || e.target.value;
+    const { groupList } = this.props;
+    if (v === '') {
+      this.setState({groupList})
+    } else {
+      this.setState({groupList: groupList.filter(group => new RegExp(v, 'i').test(group.group_name))})
+    }
   }
 
   render () {
-    const { groupList, currGroup } = this.props;
+    const { currGroup } = this.props;
 
     return (
-      <Card title="Groups">
-        <Button type="primary" onClick={this.addGroup}>添加分组</Button>
-        <div>{currGroup.group_name}</div>
-        {
-          groupList.map((group, index) => (
-            <div key={index}>{group.group_name}</div>
-          ))
-        }
-      </Card>
+      <div>
+        <div className="group-bar">
+          <div className="curr-group">
+            <div className="curr-group-name">
+              {currGroup.group_name}
+              <Icon className="edit-group" type="edit" title="编辑分组" onClick={() => this.showModal(TYPE_EDIT)}/>
+              <Icon className="delete-group" type="delete" title="删除分组" onClick={this.deleteGroup}/>
+            </div>
+            <div className="curr-group-desc">简介：{currGroup.group_desc}</div>
+          </div>
+          <div className="group-operate">
+            <div className="search">
+              <Search onChange={this.searchGroup} onSearch={(v) => this.searchGroup(null, v)}/>
+            </div>
+            <Button type="primary" onClick={this.showModal}>添加分组</Button>
+          </div>
+          <Menu
+            className="group-list"
+            mode="inline"
+            onClick={this.selectGroup}
+            selectedKeys={[`${currGroup._id}`]}
+          >
+            {
+              this.state.groupList.map((group) => (
+                <Menu.Item key={`${group._id}`} className="group-item">
+                  <Icon type="folder-open" />{group.group_name}
+                </Menu.Item>
+              ))
+            }
+          </Menu>
+        </div>
+        <Modal
+          title="添加分组"
+          visible={this.state.addGroupModalVisible}
+          onOk={this.addGroup}
+          onCancel={this.hideModal}
+          className="add-group-modal"
+        >
+          <Row gutter={6} className="modal-input">
+            <Col span="5"><div className="label">分组名：</div></Col>
+            <Col span="15">
+              <Input placeholder="请输入分组名称" onChange={this.inputNewGroupName}></Input>
+            </Col>
+          </Row>
+          <Row gutter={6} className="modal-input">
+            <Col span="5"><div className="label">简介：</div></Col>
+            <Col span="15">
+              <Input placeholder="请输入分组描述" onChange={this.inputNewGroupDesc}></Input>
+            </Col>
+          </Row>
+        </Modal>
+        <Modal
+          title="编辑分组"
+          visible={this.state.editGroupModalVisible}
+          onOk={this.editGroup}
+          onCancel={() => this.hideModal(TYPE_EDIT)}
+          className="add-group-modal"
+        >
+          <Row gutter={6} className="modal-input">
+            <Col span="5"><div className="label">分组名：</div></Col>
+            <Col span="15">
+              <Input placeholder="请输入分组名称" value={this.state.currGroupName} onChange={(e) => this.inputNewGroupName(e, TYPE_EDIT)}></Input>
+            </Col>
+          </Row>
+          <Row gutter={6} className="modal-input">
+            <Col span="5"><div className="label">简介：</div></Col>
+            <Col span="15">
+              <Input placeholder="请输入分组描述" value={this.state.currGroupDesc} onChange={(e) => this.inputNewGroupDesc(e, TYPE_EDIT)}></Input>
+            </Col>
+          </Row>
+        </Modal>
+      </div>
     )
   }
 }

client/containers/ProjectGroups/GroupList/GroupList.scss

@@ -0,0 +1,69 @@
+.group-bar {
+  .curr-group {
+    background: #34495E;
+    box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20);
+    border-radius: 4px 4px 0 0;
+    padding: 32px 24px;
+    .curr-group-name {
+      color: #fff;
+      font-size: 24px;
+    }
+    .curr-group-desc {
+      color: #fff;
+      font-size: 12px;
+    }
+    .delete-group, .edit-group {
+      font-size: 18px;
+      margin-left: 12px;
+      cursor: pointer;
+    }
+    .delete-group:hover, .edit-group:hover {
+      color: #ccc;
+    }
+  }
+  .group-operate {
+    height: 48px;
+    padding: 10px 6px;
+    background: #fff;
+    .search {
+      display: inline-block;
+      margin-right: 6px;
+    }
+  }
+  .group-list {
+    max-height: 650px;
+    overflow: scroll;
+    border-bottom: 1px solid #e9e9e9;
+    padding-bottom: 24px;
+    border-radius: 0 0 6px 6px;
+    .group-item {
+      // height: 48px;
+      // line-height: 48px;
+      // padding: 0 24px;
+      font-size: 14px;
+    }
+    .group-item:hover {
+      // background: #34495E;
+      // color: #fff;
+    }
+    .group-item.selected {
+      // background: #34495E;
+    }
+    .group-name {
+      float: left;
+    }
+    .group-edit {
+      float: right;
+      font-size: 18px;
+    }
+  }
+}
+.add-group-modal {
+  .modal-input {
+    margin: 24px;
+  }
+  .label {
+    text-align: right;
+    line-height: 28px;
+  }
+}

client/containers/ProjectGroups/ProjectGroups.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import GroupList from './GroupList/GroupList.js';
-import ProjectList from './ProjectList';
+import ProjectList from './ProjectList/ProjectList.js';
 import { Row, Col } from 'antd';
 
 import './ProjectGroups.scss'

client/containers/ProjectGroups/ProjectGroups.scss

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

client/containers/ProjectGroups/ProjectList/ProjectList.js

@@ -0,0 +1,305 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { Table, Button, Modal, Form, Input, Icon, Tooltip, Select, Popconfirm, message } from 'antd';
+import { addProject, fetchProjectList, delProject, changeUpdateModal, changeTableLoading } from  '../../../actions/project';
+import UpDateModal from './UpDateModal';
+import variable from '../../../constants/variable';
+import { autobind } from 'core-decorators';
+const { TextArea } = Input;
+const FormItem = Form.Item;
+const Option = Select.Option;
+
+import './ProjectList.scss'
+
+const deleteConfirm = (id, handleDelete, currGroupId, handleFetchList) => {
+  const test = () => {
+    handleDelete(id).then((res) => {
+      console.log(res);
+      console.log(handleFetchList, currGroupId);
+      handleFetchList(currGroupId).then((res) => {
+        console.log(res);
+      });
+    });
+  }
+  return test;
+};
+
+const getColumns = (data, handleDelete, currGroupId, handleFetchList, handleUpdateModal) => {
+  return [{
+    title: '项目名称',
+    dataIndex: 'name',
+    key: 'name',
+    render: text => <a href="#">{text}</a>
+  }, {
+    title: '创建人',
+    dataIndex: 'owner',
+    key: 'owner'
+  }, {
+    title: '创建时间',
+    dataIndex: 'add_time',
+    key: 'add_time'
+  }, {
+    title: '操作',
+    key: 'action',
+    render: (text, record, index) => {
+      const id = record._id;
+      return (
+        <span>
+          <a onClick={() => handleUpdateModal(true, index)}>修改</a>
+          <span className="ant-divider" />
+          <Popconfirm title="你确定要删除项目吗?" onConfirm={deleteConfirm(id, handleDelete, currGroupId, handleFetchList)} okText="删除" cancelText="取消">
+            <a href="#">删除</a>
+          </Popconfirm>
+        </span>
+      )}
+  }];
+}
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 14 }
+  }
+};
+
+@connect(
+  state => {
+    return {
+      projectList: state.project.projectList,
+      tableLoading: state.project.tableLoading,
+      currGroup: state.group.currGroup,
+      total: state.project.total,
+      currPage: state.project.currPage
+    }
+  },
+  {
+    fetchProjectList,
+    addProject,
+    delProject,
+    changeUpdateModal,
+    changeTableLoading
+  }
+)
+class ProjectList extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      visible: false,
+      protocol: 'http:\/\/',
+      projectData: []
+    }
+  }
+  static propTypes = {
+    form: PropTypes.object,
+    fetchProjectList: PropTypes.func,
+    addProject: PropTypes.func,
+    delProject: PropTypes.func,
+    changeUpdateModal: PropTypes.func,
+    changeTableLoading: PropTypes.func,
+    projectList: PropTypes.array,
+    tableLoading: PropTypes.bool,
+    currGroup: PropTypes.object,
+    total: PropTypes.number,
+    currPage: PropTypes.number
+  }
+
+  // 显示模态框 - 创建项目
+  @autobind
+  showAddProjectModal() {
+    this.setState({
+      visible: true
+    });
+  }
+
+  // 确认修改
+  @autobind
+  handleOk(e) {
+    const { form, currGroup, changeTableLoading, addProject, fetchProjectList } = this.props;
+    const that = this;
+    e.preventDefault();
+    form.validateFields((err, values) => {
+      if (!err) {
+        values.prd_host = this.state.protocol + values.prd_host;
+        // 获取当前分组id传入values
+        values.group_id = currGroup._id;
+
+        changeTableLoading(true);
+        addProject(values).then((res) => {
+          console.log(res);
+          // 添加项目成功后再次请求列表
+          if (res.payload.data.errcode == 0) {
+            that.setState({
+              visible: false
+            });
+            form.resetFields();
+            message.success('创建成功! ');
+            fetchProjectList(currGroup._id, this.props.currPage).then((res) => {
+              changeTableLoading(false);
+              console.log(131,res);
+            });
+          } else {
+            changeTableLoading(false);
+            message.error(res.payload.data.errmsg);
+          }
+        }).catch((err) => {
+          console.log(err);
+          changeTableLoading(false);
+        });
+      }
+    });
+  }
+
+  // 取消修改
+  @autobind
+  handleCancel() {
+    this.props.form.resetFields();
+    this.setState({
+      visible: false
+    });
+  }
+
+  // 修改线上域名的协议类型 (http/https)
+  @autobind
+  protocolChange(value) {
+    this.setState({
+      protocol: value
+    })
+  }
+
+  // 分页逻辑
+  @autobind
+  paginationChange(pageNum) {
+    this.props.fetchProjectList(this.props.currGroup._id, pageNum).then((res) => {
+      if (res.payload.data.errcode) {
+        message.error(res.payload.data.errmsg);
+      } else {
+        this.props.changeTableLoading(false);
+      }
+    });
+  }
+
+  componentWillReceiveProps(nextProps) {
+    // 切换分组
+    if (this.props.currGroup !== nextProps.currGroup) {
+      this.props.fetchProjectList(nextProps.currGroup._id, this.props.currPage).then((res) => {
+        if (res.payload.data.errcode) {
+          message.error(res.payload.data.errmsg);
+        } else {
+          this.props.changeTableLoading(false);
+        }
+      });
+    }
+
+    // 切换项目列表
+    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 (
+      <div className="m-container">
+        <Modal
+          title="创建项目"
+          visible={this.state.visible}
+          onOk={this.handleOk}
+          onCancel={this.handleCancel}
+        >
+          <Form>
+
+            <FormItem
+              {...formItemLayout}
+              label="项目名称"
+            >
+              {getFieldDecorator('name', {
+                rules: [{
+                  required: true, message: '请输入项目名称!'
+                }]
+              })(
+                <Input />
+              )}
+            </FormItem>
+
+            <FormItem
+              {...formItemLayout}
+              label={(
+                <span>
+                  线上域名&nbsp;
+                  <Tooltip title="将根据配置的线上域名访问mock数据">
+                    <Icon type="question-circle-o" />
+                  </Tooltip>
+                </span>
+              )}
+            >
+              {getFieldDecorator('prd_host', {
+                rules: [{
+                  required: true, message: '请输入项目线上域名!'
+                }]
+              })(
+                <Input addonBefore={(
+                  <Select defaultValue="http://" onChange={this.protocolChange}>
+                    <Option value="http://">{'http:\/\/'}</Option>
+                    <Option value="https://">{'https:\/\/'}</Option>
+                  </Select>)} />
+              )}
+            </FormItem>
+
+            <FormItem
+              {...formItemLayout}
+              label="基本路径"
+            >
+              {getFieldDecorator('basepath', {
+                rules: [{
+                  required: true, message: '请输入项目基本路径!'
+                }]
+              })(
+                <Input />
+              )}
+            </FormItem>
+
+            <FormItem
+              {...formItemLayout}
+              label="描述"
+            >
+              {getFieldDecorator('desc', {
+                rules: [{
+                  required: true, message: '请输入描述!'
+                }]
+              })(
+                <TextArea rows={4} />
+              )}
+            </FormItem>
+          </Form>
+        </Modal>
+        <UpDateModal/>
+        <Table
+          loading={this.props.tableLoading}
+          columns={getColumns(this.state.projectData, this.props.delProject, this.props.currGroup._id, this.props.fetchProjectList, this.props.changeUpdateModal)}
+          dataSource={this.state.projectData}
+          pagination={{
+            total: this.props.total * variable.PAGE_LIMIT,
+            defaultPageSize: variable.PAGE_LIMIT,
+            onChange: this.paginationChange
+          }}
+          title={() => <Button type="primary" onClick={this.showAddProjectModal}>创建项目</Button>}
+        />
+
+      </div>
+    );
+  }
+}
+
+export default Form.create()(ProjectList);

client/containers/ProjectGroups/ProjectList/ProjectList.scss

@@ -0,0 +1,26 @@
+.m-container{
+  background-color: #fff;
+  padding: 16px 24px;
+  box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20);
+  border-radius: 4px;
+}
+
+.ant-input-group-wrapper {
+  width: 100%;
+}
+
+.dynamic-delete-button {
+  cursor: pointer;
+  position: relative;
+  top: 4px;
+  font-size: 24px;
+  color: #999;
+  transition: all .3s;
+}
+.dynamic-delete-button:hover {
+  color: #777;
+}
+.dynamic-delete-button[disabled] {
+  cursor: not-allowed;
+  opacity: 0.5;
+}

client/containers/ProjectGroups/ProjectList/UpDateModal.js

@@ -0,0 +1,305 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { Modal, Form, Input, Icon, Tooltip, Select, message, Button } from 'antd';
+import { updateProject, fetchProjectList, delProject, changeUpdateModal, changeTableLoading } from  '../../../actions/project';
+const { TextArea } = Input;
+const FormItem = Form.Item;
+const Option = Select.Option;
+
+import './ProjectList.scss'
+
+// layout
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 14 }
+  }
+};
+const formItemLayoutWithOutLabel = {
+  wrapperCol: {
+    xs: { span: 24, offset: 0 },
+    sm: { span: 20, offset: 4 }
+  }
+};
+let uuid = 0;
+
+@connect(
+  state => {
+    return {
+      projectList: state.project.projectList,
+      isUpdateModalShow: state.project.isUpdateModalShow,
+      handleUpdateIndex: state.project.handleUpdateIndex,
+      tableLoading: state.project.tableLoading,
+      currGroup: state.group.currGroup
+    }
+  },
+  {
+    fetchProjectList,
+    updateProject,
+    delProject,
+    changeUpdateModal,
+    changeTableLoading
+  }
+)
+class UpDateModal extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      protocol: 'http:\/\/'
+    }
+  }
+  static propTypes = {
+    form: PropTypes.object,
+    fetchProjectList: PropTypes.func,
+    updateProject: PropTypes.func,
+    delProject: PropTypes.func,
+    changeUpdateModal: PropTypes.func,
+    changeTableLoading: PropTypes.func,
+    projectList: PropTypes.array,
+    currGroup: PropTypes.object,
+    isUpdateModalShow: PropTypes.bool,
+    handleUpdateIndex: PropTypes.number
+  }
+
+  // 修改线上域名的协议类型 (http/https)
+  protocolChange = (value) => {
+    this.setState({
+      protocol: value
+    })
+  }
+
+  handleCancel = () => {
+    this.props.form.resetFields();
+    this.props.changeUpdateModal(false, -1);
+  }
+
+  handleOk = (e) => {
+    e.preventDefault();
+    const { form, updateProject, changeUpdateModal, currGroup, projectList, handleUpdateIndex, fetchProjectList, changeTableLoading } = this.props;
+    form.validateFields((err, values) => {
+      if (!err) {
+        console.log(values);
+        let assignValue = Object.assign(projectList[handleUpdateIndex], values);
+        assignValue.prd_host = this.state.protocol + assignValue.prd_host;
+        assignValue.env = assignValue.envs.map((item) => {
+          console.log(assignValue);
+          const arr = assignValue['envs-'+item].split(',');
+          if (arr.length === 2) {
+            return {
+              host: arr[0],
+              name: arr[1]
+            }
+          }
+        });
+        console.log(assignValue);
+
+        changeTableLoading(true);
+        updateProject(assignValue).then((res) => {
+          if (res.payload.data.errcode == 0) {
+            changeUpdateModal(false, -1);
+            message.success('修改成功! ');
+            fetchProjectList(currGroup._id).then((res) => {
+              console.log(res);
+              changeTableLoading(false);
+            });
+          } else {
+            changeTableLoading(false);
+            message.error(res.payload.data.errmsg);
+          }
+        }).catch((err) => {
+          console.log(err);
+          changeTableLoading(false);
+        });
+        form.resetFields();
+      }
+    });
+  }
+
+  remove = (k) => {
+    const { form } = this.props;
+    // can use data-binding to get
+    const envs = form.getFieldValue('envs');
+    // We need at least one passenger
+    if (envs.length === 1) {
+      return;
+    }
+
+    // can use data-binding to set
+    form.setFieldsValue({
+      envs: envs.filter(key => key !== k)
+    });
+  }
+
+  add = () => {
+    uuid++;
+    const { form } = this.props;
+    // can use data-binding to get
+    const envs = form.getFieldValue('envs');
+    const nextKeys = envs.concat(uuid);
+    // can use data-binding to set
+    // important! notify form to detect changes
+    form.setFieldsValue({
+      envs: nextKeys
+    });
+  }
+
+  handleSubmit = (e) => {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+      }
+    });
+  }
+
+  render() {
+    const { getFieldDecorator, getFieldValue } = this.props.form;
+    // const that = this;
+    const { isUpdateModalShow, projectList, handleUpdateIndex } = this.props;
+    let initFormValues = {};
+    let envMessage = [];
+    // 如果列表存在且用户点击修改按钮时，设置表单默认值
+    if (projectList.length !== 0 && handleUpdateIndex !== -1 ) {
+      // console.log(projectList[handleUpdateIndex]);
+      const { name, basepath, desc, env } = projectList[handleUpdateIndex];
+      initFormValues = { name, basepath, desc, env };
+      if (env) {
+        envMessage = env.map((item) => {
+          return item.host + ',' + item.name;
+        })
+      }
+      initFormValues.prd_host = projectList[handleUpdateIndex].prd_host.split('\/\/')[1];
+      initFormValues.prd_protocol = projectList[handleUpdateIndex].prd_host.split('\/\/')[0] + '\/\/';
+    }
+
+    getFieldDecorator('envs', { initialValue: envMessage });
+    const envs = getFieldValue('envs');
+    const formItems = envs.map((k, index) => {
+      return (
+        <FormItem
+          {...(index === 0 ? formItemLayout : formItemLayoutWithOutLabel)}
+          label={index === 0 ? (
+            <span>环境配置&nbsp;
+              <Tooltip title="依次输入环境域名(host)与环境名称，以英文逗号分隔">
+                <Icon type="question-circle-o" />
+              </Tooltip>
+            </span>) : ''}
+          required={false}
+          key={k}
+        >
+          {getFieldDecorator(`envs-${k}`, {
+            validateTrigger: ['onChange', 'onBlur'],
+            initialValue: envMessage.length !== 0 ? k : '',
+            rules: [{
+              required: false,
+              whitespace: true,
+              message: "请输入环境配置，放弃配置请清空输入框"
+            }]
+          })(
+            <Input placeholder="请输入环境配置" style={{ width: '60%', marginRight: 8 }} />
+          )}
+          {envs.length > 1 ? (
+            <Icon
+              className="dynamic-delete-button"
+              type="minus-circle-o"
+              disabled={envs.length === 1}
+              onClick={() => this.remove(k)}
+            />
+          ) : null}
+        </FormItem>
+      );
+    });
+    return (
+      <Modal
+        title="修改项目"
+        visible={isUpdateModalShow}
+        onOk={this.handleOk}
+        onCancel={this.handleCancel}
+      >
+        <Form>
+
+          <FormItem
+            {...formItemLayout}
+            label="项目名称"
+          >
+            {getFieldDecorator('name', {
+              initialValue: initFormValues.name,
+              rules: [{
+                required: true, message: '请输入项目名称!'
+              }]
+            })(
+              <Input />
+            )}
+          </FormItem>
+
+          <FormItem
+            {...formItemLayout}
+            label={(
+              <span>
+                线上域名&nbsp;
+                <Tooltip title="将根据配置的线上域名访问mock数据">
+                  <Icon type="question-circle-o" />
+                </Tooltip>
+              </span>
+            )}
+          >
+            {getFieldDecorator('prd_host', {
+              initialValue: initFormValues.prd_host,
+              rules: [{
+                required: true, message: '请输入项目线上域名!'
+              }]
+            })(
+              <Input addonBefore={(
+                <Select defaultValue={initFormValues.prd_protocol} onChange={this.protocolChange}>
+                  <Option value="http://">{'http:\/\/'}</Option>
+                  <Option value="https://">{'https:\/\/'}</Option>
+                </Select>)} />
+            )}
+          </FormItem>
+
+          <FormItem
+            {...formItemLayout}
+            label="基本路径"
+          >
+            {getFieldDecorator('basepath', {
+              initialValue: initFormValues.basepath,
+              rules: [{
+                required: true, message: '请输入项目基本路径!'
+              }]
+            })(
+              <Input />
+            )}
+          </FormItem>
+
+          <FormItem
+            {...formItemLayout}
+            label="描述"
+          >
+            {getFieldDecorator('desc', {
+              initialValue: initFormValues.desc,
+              rules: [{
+                required: true, message: '请输入描述!'
+              }]
+            })(
+              <TextArea rows={4} />
+            )}
+          </FormItem>
+
+          {formItems}
+          <FormItem {...formItemLayoutWithOutLabel}>
+            <Button type="dashed" onClick={this.add} style={{ width: '60%' }}>
+              <Icon type="plus" /> 添加环境配置
+            </Button>
+          </FormItem>
+        </Form>
+      </Modal>
+    );
+  }
+}
+
+export default Form.create()(UpDateModal);

client/containers/ProjectGroups/ProjectList/index.js

@@ -1,184 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { Table, Button, Modal, Form, Input, Icon, Tooltip } from 'antd';
-import { addProject } from  '../../../actions/project';
-const { TextArea } = Input;
-const FormItem = Form.Item;
-
-const columns = [{
-  title: 'Name',
-  dataIndex: 'name',
-  key: 'name',
-  render: text => <a href="#">{text}</a>
-}, {
-  title: 'Age',
-  dataIndex: 'age',
-  key: 'age'
-}, {
-  title: 'Action',
-  key: 'action',
-  render: () => (
-    <span>
-      <a href="#">修改</a>
-      <span className="ant-divider" />
-      <a href="#">删除</a>
-    </span>
-  )
-}];
-
-const data = [{
-  key: '1',
-  age: 32
-}, {
-  key: '2',
-  age: 42
-}, {
-  key: '3',
-  age: 32
-}];
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 }
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 14 }
-  }
-};
-
-@connect(
-  state => {
-    return {
-      loginData: state.login
-    }
-  },
-  {
-    addProject
-  }
-)
-
-class ProjectList extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      visible: false
-    }
-  }
-  static propTypes = {
-    form: PropTypes.object,
-    addProject: PropTypes.func
-  }
-  addProject = () => {
-    this.setState({
-      visible: true
-    });
-  }
-  handleOk = (e) => {
-    e.preventDefault();
-    this.props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('Received values of form: ', values);
-        this.setState({
-          visible: false
-        });
-        this.props.addProject(values);
-      }
-    });
-  }
-  handleCancel = () => {
-    this.props.form.resetFields();
-    this.setState({
-      visible: false
-    });
-  }
-  handleSubmit = (e) => {
-    console.log(e);
-  }
-  render() {
-    const { getFieldDecorator } = this.props.form;
-    return (
-      <div>
-        <Modal
-          title="创建项目"
-          visible={this.state.visible}
-          onOk={this.handleOk}
-          onCancel={this.handleCancel}
-        >
-          <Form onSubmit={this.handleSubmit}>
-
-            <FormItem
-              {...formItemLayout}
-              label="项目名称"
-            >
-              {getFieldDecorator('name', {
-                rules: [{
-                  required: true, message: '请输入项目名称!'
-                }]
-              })(
-                <Input />
-              )}
-            </FormItem>
-
-            <FormItem
-              {...formItemLayout}
-              label={(
-                <span>
-                  线上域名&nbsp;
-                  <Tooltip title="将根据配置的线上域名访问mock数据">
-                    <Icon type="question-circle-o" />
-                  </Tooltip>
-                </span>
-              )}
-            >
-              {getFieldDecorator('prd_host', {
-                rules: [{
-                  required: true, message: '请输入项目线上域名!'
-                }]
-              })(
-                <Input />
-              )}
-            </FormItem>
-
-            <FormItem
-              {...formItemLayout}
-              label="URL"
-            >
-              {getFieldDecorator('basepath', {
-                rules: [{
-                  required: true, message: '请输入项目基本路径!'
-                }]
-              })(
-                <Input />
-              )}
-            </FormItem>
-
-            <FormItem
-              {...formItemLayout}
-              label="描述"
-            >
-              {getFieldDecorator('desc', {
-                rules: [{
-                  required: true, message: '请输入描述!'
-                }]
-              })(
-                <TextArea rows={4} />
-              )}
-            </FormItem>
-          </Form>
-        </Modal>
-
-        <Table
-          columns={columns}
-          dataSource={data}
-          title={() => <Button type="primary" onClick={this.addProject}>创建项目</Button>}
-        />
-
-      </div>
-    );
-  }
-}
-
-export default Form.create()(ProjectList);

client/containers/User/LeftMenu.js

@@ -1,59 +1,94 @@
 import React, { Component } from 'react'
 import { Link } from 'react-router-dom'
-import {Input, Row, Col} from 'antd'
+import { Row, Col, Menu, AutoComplete, Input, Icon } from 'antd'
+import axios from 'axios'
+
+const Option = AutoComplete.Option;
 
 class LeftMenu extends Component {
-
-
   constructor(props) {
     super(props)
     this.state = {
-      curitem: 'profile'
+      dataSource: []
     }
-    console.log(this.props)
+    this.searchSign = 0;
+    this._searchSign = 0;
+    this.interval = null;
   }
 
-  handleCurItem(curitem) {
-    return () => {
-      this.setState({
-        curitem: curitem
-      })
-    }
+
+  //延迟搜索
+  handleSearch = (value) => {
+    if(!value || value.length < 1) return ;
+    this.searchSign = this.searchSign + 1;
+    this.interval && clearInterval(this.interval)
+    this.interval = setInterval(() => {
+      if (this.searchSign === this._searchSign) {
+        this.interval = clearInterval(this.interval)
+        axios.get('/user/search?q=' + value).then((res) => {          
+          if (res.data.errcode === 0) {
+            this.setState({
+              dataSource: res.data.data
+            })
+          }
+        })
+
+      } else {
+        this._searchSign = this.searchSign;
+      }
+    }, 600)
+
+  }
+
+  renderOption = (item) => {
+    return (
+      <Option key={item.uid} text={item.username} >
+        <Link to={"/user/profile/" + item.uid} > {item.username} </Link>
+      </Option>
+    )
   }
 
   render() {
     const menus = [{
       title: '个人资料',
-      path: '/user/profile'
+      path: "/user/profile/" + 107
     }, {
       title: '用户管理',
       path: '/user/list'
     }
     ]
 
-    let content = menus.map((menu, index) => {
+    let content = menus.map((menu) => {
       return (
-        <li key={index} className={location.hash === '#' + menu.path ? 'active' : ''}>
+        <Menu.Item key={'#' + menu.path} >
           <Link to={menu.path} >{menu.title}</Link>
-        </li>
+        </Menu.Item>
       )
     })
 
-    const Search = Input.Search;
-
-    return (<div>
+    const { dataSource } = this.state;
+    return (<div className="user-list">
       <Row type="flex" justify="start" className="search">
         <Col span="24">
-          <Search
-            placeholder="搜索用户"
-            onSearch={value => console.log(value)}
-          />
+          <div className="certain-category-search-wrapper" style={{ width: "100%" }}>
+            <AutoComplete
+              className="certain-category-search"
+              dropdownClassName="certain-category-search-dropdown"
+              size="large"
+              style={{ width: '100%' }}
+              dataSource={dataSource.map(this.renderOption)}
+              onSearch={this.handleSearch}
+              placeholder="input here"
+              optionLabelProp="text"
+            >
+              <Input suffix={<Icon type="search" className="certain-category-icon" />} />
+            </AutoComplete>
+          </div>
         </Col>
-
       </Row>
-      <ul className="user-list">
+      <Menu defaultSelectedKeys={[location.hash]}>
         {content}
-      </ul>
+      </Menu>
     </div>
     )
   }

client/containers/User/List.js

@@ -1,33 +1,85 @@
 import React, { Component } from 'react'
+import { formatTime } from '../../common.js'
+import { Link } from 'react-router-dom'
 //import PropTypes from 'prop-types'
 import {
   Table,
-  Button
+  Button,
+  Popconfirm,
+  message
 } from 'antd'
-
-
+import axios from 'axios';
 
 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()
+  }
+
+  confirm = (uid) =>{
+    axios.post('/user/del', {
+      id: uid
+    }).then( (res)=>{
+      if(res.data.errcode === 0){
+        message.success('已删除此用户');
+        let userlist = this.state.data;
+        userlist = userlist.filter( (item)=>{
+          return item._id != uid
+        } )
+        this.setState({
+          data: userlist
+        })
+      }else{
+        message.error(res.data.errmsg);
+      }
+    }, (err) => {
+      message.error(err.message);
+    } )
   }
 
   render() {
-
-    const columns = [{
+    const role = 'admin'
+    const data = this.state.data;
+    let columns = [{
       title: 'UID',
-      dataIndex: 'uid',
-      key: 'uid'
+      dataIndex: '_id',
+      key: '_id'
     }, {
       title: '用户名',
       dataIndex: 'username',
       key: 'username'
     }, {
-      title: 'email',
+      title: 'Email',
       dataIndex: 'email',
       key: 'email'
+    }, {
+      title: '用户角色',
+      dataIndex: 'role',
+      key: 'role'
     }, {
       title: '更新日期',
       dataIndex: 'up_time',
@@ -35,21 +87,24 @@ class List extends Component {
     }, {
       title: '功能',
       key: 'action',
-      render: () => {
+      render: (item) => {
         return (
-          <span>
-            <Button type="primary">编辑</Button>
-            <Button type="danger">删除</Button>
+          <span>            
+            <Button type="primary"><Link to={"/user/profile/" + item._id} > 查看 </Link></Button>
+            <Popconfirm placement="leftTop" title="确认删除此用户?"  onConfirm={() => {this.confirm(item._id)}} okText="Yes" cancelText="No">
+              <Button type="danger">删除</Button>
+            </Popconfirm>
           </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 }
-    ];
+    columns = columns.filter( (item)=>{
+      if(item.key === 'action' && role !== 'admin'){
+        return false;
+      }
+      return true;
+    } )
 
     return (
       <section className="user-table">

client/containers/User/Profile.js

@@ -1,115 +1,229 @@
 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 {formatTime} from '../../common.js'
+import PropTypes from 'prop-types'
+
 
 class Profile extends Component {
 
+  static propTypes = {
+    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.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}>

client/containers/User/User.js

@@ -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>
     )   

client/containers/User/index.scss

@@ -3,58 +3,25 @@
   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: 84px;
 
-  .search{
-    height: 40px;
-    padding: 5px;
-    background: #f9f9f9;
-
-    input{
-      background: #f9f9f9;
-      line-height: 40px;
-      height: 40px;
-      border: 0;
-      font-size: 14px;
-    }
-
-    input:focus{
-      outline:0;
-      border-color:0;
-      box-shadow: none
-    }
-
-
-
-  }
+  ul{border:none}
 
   .user-list {
     width: 216px;
-    line-height: 45px;
-    background: #f9fafe;
-    
-    li {
-      padding: 0 0 0 30px;
-      a{
-        color: #344562;
-      }
-      
-      &.active,&.active a {
-        background: #657289;
-        color: #FFF;
-        text-decoration: none;
-      }
-
+    .search{
+      margin: 5px;    
     }
   }
 
   .user-table {
     -webkit-box-flex: 1;
-    margin: 0 0 0 20px;
-
+    padding-right: 15px;
+    margin-left: 15px;   
     .ant-table-wrapper table {
       font-size: .14rem;
 

client/containers/index.js

@@ -1,6 +1,6 @@
 import Header from '../components/Header/Header.js'
 import Home from './Home/Home.js'
-import Login from './Login/login-wrap.js'
+import Login from './Login/LoginWrap.js'
 import ProjectGroups from './ProjectGroups/ProjectGroups.js'
 import Interface from './Interface/Interface.js'
 import News from './News/News.js'

client/reducer/Login/login.js

@@ -1,6 +1,8 @@
 import {
   LOGIN,
-  LOGIN_TYPE
+  LOGIN_OUT,
+  LOGIN_TYPE,
+  GET_LOGIN_STATE
 } from '../../constants/action-types';
 
 const initialState = {
@@ -12,14 +14,28 @@ const initialState = {
 
 export default (state = initialState, action) => {
   switch (action.type) {
+    case GET_LOGIN_STATE: {
+      return {
+        ...state,
+        isLogin: (action.payload.data.errcode == 0),
+        userName: action.payload.data.data ? action.payload.data.data.username : null
+      };
+    }
     case LOGIN: {
-      console.log(action);
       return {
         ...state,
         isLogin: true,
         userName: action.payload.data.userName
       };
     }
+    case LOGIN_OUT: {
+      return{
+        ...state,
+        isLogin: false,
+        userName: null,
+        uid: null
+      }
+    }
     case LOGIN_TYPE: {
       return {
         ...state,

client/reducer/group/group.js

@@ -2,6 +2,7 @@ import {
   FETCH_GROUP_LIST,
   SET_CURR_GROUP
 } from '../../constants/action-types';
+import { message } from 'antd'
 
 const initialState = {
   groupList: [],
@@ -11,7 +12,9 @@ const initialState = {
 export default (state = initialState, action) => {
   switch (action.type) {
     case FETCH_GROUP_LIST: {
-      if (!action.payload.data.errcode) {
+      if (action.payload.data.errcode) {
+        message.error(action.payload.data.errmsg);
+      } else {
         return {
           ...state,
           groupList: action.payload.data.data

client/reducer/group/project.js

@@ -1,16 +1,46 @@
 import {
-  PROJECT_ADD
+  FETCH_PROJECT_LIST,
+  PROJECT_ADD,
+  PROJECT_DEL,
+  CHANGE_UPDATE_MODAL,
+  CHANGE_TABLE_LOADING
 } from '../../constants/action-types';
 
 const initialState = {
-  groupList: [],
-  currGroup: 'MFE'
+  isUpdateModalShow: false,
+  handleUpdateIndex: -1,
+  projectList: [],
+  tableLoading: true,
+  total: 0,
+  currPage: 1
 };
 
 export default (state = initialState, action) => {
   switch (action.type) {
+    case CHANGE_UPDATE_MODAL: {
+      return {
+        ...state,
+        isUpdateModalShow: action.payload.data,
+        handleUpdateIndex: action.payload.index
+      };
+    }
+    case CHANGE_TABLE_LOADING: {
+      return {
+        ...state,
+        tableLoading: action.payload
+      }
+    }
+    case FETCH_PROJECT_LIST: {
+      return {
+        ...state,
+        projectList: action.payload.data.data.list,
+        total: action.payload.data.data.total
+      };
+    }
     case PROJECT_ADD: {
-      console.log(action.payload);
+      return state;
+    }
+    case PROJECT_DEL: {
       return state;
     }
     default:

client/reducer/login/login.js

@@ -1,6 +1,8 @@
 import {
   LOGIN,
-  LOGIN_TYPE
+  LOGIN_OUT,
+  LOGIN_TYPE,
+  GET_LOGIN_STATE
 } from '../../constants/action-types';
 
 const initialState = {
@@ -12,14 +14,28 @@ const initialState = {
 
 export default (state = initialState, action) => {
   switch (action.type) {
+    case GET_LOGIN_STATE: {
+      return {
+        ...state,
+        isLogin: (action.payload.data.errcode == 0),
+        userName: action.payload.data.data ? action.payload.data.data.username : null
+      };
+    }
     case LOGIN: {
-      console.log(action);
       return {
         ...state,
         isLogin: true,
         userName: action.payload.data.userName
       };
     }
+    case LOGIN_OUT: {
+      return{
+        ...state,
+        isLogin: false,
+        userName: null,
+        uid: null
+      }
+    }
     case LOGIN_TYPE: {
       return {
         ...state,

client/reducer/user/user.js

@@ -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;
+  }
+};

doc/build/api.html

@@ -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#224" target="_blank">./server/controllers/user.js:224</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#286" target="_blank">./server/controllers/user.js:286</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#315" target="_blank">./server/controllers/user.js:315</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#350" target="_blank">./server/controllers/user.js:350</a>
     </p>
     
     
@@ -880,6 +1042,176 @@
     
     
     
+</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#377" target="_blank">./server/controllers/user.js:377</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#426" target="_blank">./server/controllers/user.js:426</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">0</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">"username"</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 +1235,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 +1364,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 +1402,8 @@
             </tr>
             
             <tr>
-                <td>uid</td>
                 <td>member_uid</td>
+                <td>String</td>
                 <td>项目成员uid,不能为空</td>
                 <td>
                     
@@ -1116,7 +1448,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 +1512,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 +1610,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 +1693,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 +1730,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 +1758,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 +1812,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 +1871,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 +1884,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 +2024,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">0</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>
 
 

doc/build/static/server/controllers/base.js.html

@@ -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.');

doc/build/static/server/controllers/group.js.html

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

doc/build/static/server/controllers/project.js.html

@@ -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, 0, 'ok')
+    }
 }
 
 module.exports = projectController;

doc/build/static/server/controllers/user.js.html

@@ -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,162 @@ 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 (!params.uid) {
+            return ctx.body = yapi.commons.resReturn(null, 400, 'uid不能为空');
+        }
+
+        if (!params.password) {
+            return ctx.body = yapi.commons.resReturn(null, 400, '密码不能为空');
+        }
+
+
+        if (this.getRole() !== 'admin' && params.uid != 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 +261,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 +286,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 +317,32 @@ 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, 'Without permission.');
-            }
-        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);
         }
     }
 
     /**
-     * 获取用户列表
-     * @interface /user/list
+     * 获取用户个人信息
+     * @interface /user/find
      * @method GET
      * @param id 用户uid
      * @category user
@@ -195,22 +351,32 @@ 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;
+            if (!id) {
+                return ctx.body = yapi.commons.resReturn(null, 400, 'uid不能为空');
             }
             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);
         }
     }
 
     /**
-     * 获取用户列表,只有admin用户才有此权限
+     * 删除用户,只有admin用户才有此权限
      * @interface /user/del
      * @method POST
      * @param id 用户uid
@@ -219,37 +385,120 @@ 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;
+            if (!id) {
+                return ctx.body = yapi.commons.resReturn(null, 400, 'uid不能为空');
+            }
             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;
+            if (!id) {
+                return ctx.body = yapi.commons.resReturn(null, 400, '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'
+            },
+            'username',
+            '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, 0, 'ok');
+    }
 }
 
-module.exports = userController
+module.exports = userController;
                 </pre>
                 </div>
             </div>

exampleCode/api/project/get_member_list.json

@@ -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
         }
     ]
 }

exampleCode/api/project/list.json

@@ -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"]
+            }
+        ]
+    }
 }

exampleCode/api/project/search.json

@@ -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": 0,
+    "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
-      }
-    ]
-  }
+    }
 }

exampleCode/api/user/list.json

@@ -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
+            }
+        ]
+    }
+}

exampleCode/api/user/search.json

@@ -1,16 +1,14 @@
 {
-    "errcode": 200,
+    "errcode": 0,
     "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
+            "username": "admin",
+            "addTime": 1499936103,
+            "upTime": 1499936103
         }
     ]
 }

package.json

@@ -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",

server/controllers/group.js

@@ -23,6 +23,9 @@ class groupController extends baseController{
      */
     async add(ctx) {
         let params = ctx.request.body;
+        if(this.getRole() !== 'admin'){
+            return ctx.body = yapi.commons.resReturn(null,401,'没有权限');
+        }
         if(!params.group_name){
             return ctx.body = yapi.commons.resReturn(null, 400, '项目分组名不能为空');
         }
@@ -80,7 +83,10 @@ class groupController extends baseController{
      * @example ./api/group/del.json
      */
 
-    async del(ctx){   
+    async del(ctx){
+        if(this.getRole() !== 'admin'){
+            return ctx.body = yapi.commons.resReturn(null,401,'没有权限');
+        }   
         try{
             var groupInst = yapi.getInst(groupModel);
             var projectInst = yapi.getInst(projectModel);
@@ -88,7 +94,7 @@ class groupController extends baseController{
             if(!id){
                 return ctx.body = yapi.commons.resReturn(null, 402, 'id不能为空');
             }
-            let count = projectInst.countByGroupId(id);
+            let count = await  projectInst.countByGroupId(id);
             if(count > 0){
                 return ctx.body = yapi.commons.resReturn(null, 403, '请先删除该分组下的项目');
             }
@@ -114,13 +120,16 @@ class groupController extends baseController{
      */
 
     async up(ctx){
+        if(this.getRole() !== 'admin'){
+            return ctx.body = yapi.commons.resReturn(null,401,'没有权限');
+        }
         try{
             var groupInst = yapi.getInst(groupModel);
             let id = ctx.request.body.id;
             let data = {};
             ctx.request.body.group_name && (data.group_name = ctx.request.body.group_name)
             ctx.request.body.group_desc && (data.group_desc = ctx.request.body.group_desc)
-            if(Object.keys(data).length ===0){
+            if(Object.keys(data).length === 0 ){
                 ctx.body = yapi.commons.resReturn(null, 404, '分组名和分组描述不能为空');
             }
             let result = await groupInst.up(id, data);

server/controllers/project.js

@@ -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(group_id);
+            ctx.body = yapi.commons.resReturn({
+                total: Math.ceil(count / limit),
+                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,12 +352,38 @@ class projectController extends baseController {
             return ctx.body = yapi.commons.resReturn(void 0, 400, 'Bad query.')
         }
 
-        let queryList = {
-            project: await this.Model.search(q),
-            group: await this.groupModel.search(q)
-        }
+        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' }
+        ];
         
-        return ctx.body = yapi.commons.resReturn(queryList, 200, 'ok')
+        projectList = commons.filterRes(projectList, projectRules);
+        groupList = commons.filterRes(groupList, groupRules);
+
+        let queryList = {
+            project: projectList,
+            group: groupList
+        };
+        
+        return ctx.body = yapi.commons.resReturn(queryList, 0, 'ok')
     }
 }
 

server/controllers/user.js

@@ -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,31 @@ 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()){
-            console.log(this.getRole(), this.getUid());
+
+        if (!params.uid) {
+            return ctx.body = yapi.commons.resReturn(null, 400, 'uid不能为空');
+        }
+
+        if (!params.password) {
+            return ctx.body = yapi.commons.resReturn(null, 400, '密码不能为空');
+        }
+
+
+        if (this.getRole() !== 'admin' && params.uid != 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 +193,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 +234,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 +259,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 +278,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 +290,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: Math.ceil(count / limit),
+                list: user
+            });
+        } catch(e) {
             return ctx.body = yapi.commons.resReturn(null,402,e.message);
         }
     }
@@ -308,12 +324,25 @@ 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;
+            if (!id) {
+                return ctx.body = yapi.commons.resReturn(null, 400, 'uid不能为空');
+            }
             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 +358,20 @@ 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;
+            if (!id) {
+                return ctx.body = yapi.commons.resReturn(null, 400, 'uid不能为空');
+            }
             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 +379,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 +390,37 @@ 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;
+            if (!id) {
+                return ctx.body = yapi.commons.resReturn(null, 400, '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 +438,37 @@ 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'
+            },
+            'username',
+            '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, 0, 'ok');
     }
 }
 
-module.exports = userController
+module.exports = userController;

server/models/project.js

@@ -66,6 +66,20 @@ 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(group_id) {
+        return this.model.count({
+            group_id: group_id
+        });
+    }
+
     countByGroupId(group_id){
         return this.model.count({
             group_id: group_id

server/models/user.js

@@ -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)
     }
 

server/router.js

@@ -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

server/utils/commons.js

@@ -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;
+    })
 }

server_dist/controllers/group.js

@@ -83,29 +83,37 @@ var groupController = function (_baseController) {
                             case 0:
                                 params = ctx.request.body;
 
-                                if (params.group_name) {
+                                if (!(this.getRole() !== 'admin')) {
                                     _context.next = 3;
                                     break;
                                 }
 
+                                return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '没有权限'));
+
+                            case 3:
+                                if (params.group_name) {
+                                    _context.next = 5;
+                                    break;
+                                }
+
                                 return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '项目分组名不能为空'));
 
-                            case 3:
+                            case 5:
                                 groupInst = _yapi2.default.getInst(_group2.default);
-                                _context.next = 6;
+                                _context.next = 8;
                                 return groupInst.checkRepeat(params.group_name);
 
-                            case 6:
+                            case 8:
                                 checkRepeat = _context.sent;
 
                                 if (!(checkRepeat > 0)) {
-                                    _context.next = 9;
+                                    _context.next = 11;
                                     break;
                                 }
 
                                 return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '项目分组名已存在'));
 
-                            case 9:
+                            case 11:
                                 data = {
                                     group_name: params.group_name,
                                     group_desc: params.group_desc,
@@ -113,30 +121,30 @@ var groupController = function (_baseController) {
                                     add_time: _yapi2.default.commons.time(),
                                     up_time: _yapi2.default.commons.time()
                                 };
-                                _context.prev = 10;
-                                _context.next = 13;
+                                _context.prev = 12;
+                                _context.next = 15;
                                 return groupInst.save(data);
 
-                            case 13:
+                            case 15:
                                 result = _context.sent;
 
                                 result = _yapi2.default.commons.fieldSelect(result, ['_id', 'group_name', 'group_desc', 'uid']);
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context.next = 21;
+                                _context.next = 23;
                                 break;
 
-                            case 18:
-                                _context.prev = 18;
-                                _context.t0 = _context['catch'](10);
+                            case 20:
+                                _context.prev = 20;
+                                _context.t0 = _context['catch'](12);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 402, _context.t0.message);
 
-                            case 21:
+                            case 23:
                             case 'end':
                                 return _context.stop();
                         }
                     }
-                }, _callee, this, [[10, 18]]);
+                }, _callee, this, [[12, 20]]);
             }));
 
             function add(_x) {
@@ -218,51 +226,63 @@ var groupController = function (_baseController) {
                     while (1) {
                         switch (_context3.prev = _context3.next) {
                             case 0:
-                                _context3.prev = 0;
+                                if (!(this.getRole() !== 'admin')) {
+                                    _context3.next = 2;
+                                    break;
+                                }
+
+                                return _context3.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '没有权限'));
+
+                            case 2:
+                                _context3.prev = 2;
                                 groupInst = _yapi2.default.getInst(_group2.default);
                                 projectInst = _yapi2.default.getInst(_project2.default);
                                 id = ctx.request.body.id;
 
                                 if (id) {
-                                    _context3.next = 6;
+                                    _context3.next = 8;
                                     break;
                                 }
 
                                 return _context3.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, 'id不能为空'));
 
-                            case 6:
-                                count = projectInst.countByGroupId(id);
+                            case 8:
+                                _context3.next = 10;
+                                return projectInst.countByGroupId(id);
+
+                            case 10:
+                                count = _context3.sent;
 
                                 if (!(count > 0)) {
-                                    _context3.next = 9;
+                                    _context3.next = 13;
                                     break;
                                 }
 
                                 return _context3.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 403, '请先删除该分组下的项目'));
 
-                            case 9:
-                                _context3.next = 11;
+                            case 13:
+                                _context3.next = 15;
                                 return groupInst.del(id);
 
-                            case 11:
+                            case 15:
                                 result = _context3.sent;
 
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context3.next = 18;
+                                _context3.next = 22;
                                 break;
 
-                            case 15:
-                                _context3.prev = 15;
-                                _context3.t0 = _context3['catch'](0);
+                            case 19:
+                                _context3.prev = 19;
+                                _context3.t0 = _context3['catch'](2);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 402, e.message);
 
-                            case 18:
+                            case 22:
                             case 'end':
                                 return _context3.stop();
                         }
                     }
-                }, _callee3, this, [[0, 15]]);
+                }, _callee3, this, [[2, 19]]);
             }));
 
             function del(_x3) {
@@ -294,7 +314,15 @@ var groupController = function (_baseController) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
                             case 0:
-                                _context4.prev = 0;
+                                if (!(this.getRole() !== 'admin')) {
+                                    _context4.next = 2;
+                                    break;
+                                }
+
+                                return _context4.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '没有权限'));
+
+                            case 2:
+                                _context4.prev = 2;
                                 groupInst = _yapi2.default.getInst(_group2.default);
                                 id = ctx.request.body.id;
                                 data = {};
@@ -304,28 +332,28 @@ var groupController = function (_baseController) {
                                 if ((0, _keys2.default)(data).length === 0) {
                                     ctx.body = _yapi2.default.commons.resReturn(null, 404, '分组名和分组描述不能为空');
                                 }
-                                _context4.next = 9;
+                                _context4.next = 11;
                                 return groupInst.up(id, data);
 
-                            case 9:
+                            case 11:
                                 result = _context4.sent;
 
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context4.next = 16;
+                                _context4.next = 18;
                                 break;
 
-                            case 13:
-                                _context4.prev = 13;
-                                _context4.t0 = _context4['catch'](0);
+                            case 15:
+                                _context4.prev = 15;
+                                _context4.t0 = _context4['catch'](2);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 402, e.message);
 
-                            case 16:
+                            case 18:
                             case 'end':
                                 return _context4.stop();
                         }
                     }
-                }, _callee4, this, [[0, 13]]);
+                }, _callee4, this, [[2, 15]]);
             }));
 
             function up(_x4) {

server_dist/controllers/project.js

@@ -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(group_id);
 
-                                ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context6.next = 13;
+                            case 9:
+                                count = _context6.sent;
+
+                                ctx.body = _yapi2.default.commons.resReturn({
+                                    total: Math.ceil(count / limit),
+                                    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;
-                                queryList = {
-                                    project: _context9.t0,
-                                    group: _context9.t1
-                                };
-                                return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(queryList, 200, 'ok'));
+                                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' }];
 
-                            case 13:
+
+                                projectList = _commons2.default.filterRes(projectList, projectRules);
+                                groupList = _commons2.default.filterRes(groupList, groupRules);
+
+                                queryList = {
+                                    project: projectList,
+                                    group: groupList
+                                };
+                                return _context9.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(queryList, 0, 'ok'));
+
+                            case 17:
                             case 'end':
                                 return _context9.stop();
                         }

server_dist/controllers/user.js

@@ -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
          */
 
     }, {
@@ -368,71 +372,86 @@ var userController = function (_baseController) {
                                 params = ctx.request.body;
                                 userInst = _yapi2.default.getInst(_user2.default);
 
-                                if (!(this.getRole() !== 'admin' && params.uid != this.getUid())) {
-                                    _context5.next = 5;
+                                if (params.uid) {
+                                    _context5.next = 4;
+                                    break;
+                                }
+
+                                return _context5.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, 'uid不能为空'));
+
+                            case 4:
+                                if (params.password) {
+                                    _context5.next = 6;
+                                    break;
+                                }
+
+                                return _context5.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '密码不能为空'));
+
+                            case 6:
+                                if (!(this.getRole() !== 'admin' && params.uid != this.getUid())) {
+                                    _context5.next = 8;
                                     break;
                                 }
 
-                                console.log(this.getRole(), this.getUid());
                                 return _context5.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, '没有权限'));
 
-                            case 5:
+                            case 8:
                                 if (!(this.getRole() !== 'admin')) {
-                                    _context5.next = 13;
+                                    _context5.next = 16;
                                     break;
                                 }
 
                                 if (params.old_password) {
-                                    _context5.next = 8;
+                                    _context5.next = 11;
                                     break;
                                 }
 
                                 return _context5.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '旧密码不能为空'));
 
-                            case 8:
-                                _context5.next = 10;
+                            case 11:
+                                _context5.next = 13;
                                 return userInst.findById(params.uid);
 
-                            case 10:
+                            case 13:
                                 user = _context5.sent;
 
                                 if (!(_yapi2.default.commons.generatePassword(params.old_password, user.passsalt) !== user.password)) {
-                                    _context5.next = 13;
+                                    _context5.next = 16;
                                     break;
                                 }
 
                                 return _context5.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, '旧密码错误'));
 
-                            case 13:
+                            case 16:
                                 passsalt = _yapi2.default.commons.randStr();
                                 data = {
                                     up_time: _yapi2.default.commons.time(),
                                     password: _yapi2.default.commons.generatePassword(params.password, passsalt),
                                     passsalt: passsalt
                                 };
-                                _context5.prev = 15;
-                                _context5.next = 18;
+                                _context5.prev = 18;
+                                _context5.next = 21;
                                 return userInst.update(params.uid, data);
 
-                            case 18:
+                            case 21:
                                 result = _context5.sent;
 
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context5.next = 25;
+                                _context5.next = 28;
                                 break;
 
-                            case 22:
-                                _context5.prev = 22;
-                                _context5.t0 = _context5['catch'](15);
+                            case 25:
+                                _context5.prev = 25;
+                                _context5.t0 = _context5['catch'](18);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 401, _context5.t0.message);
 
-                            case 25:
+                            case 28:
                             case 'end':
                                 return _context5.stop();
                         }
                     }
-                }, _callee5, this, [[15, 22]]);
+                }, _callee5, this, [[18, 25]]);
             }));
 
             function changePassword(_x6) {
@@ -618,6 +637,8 @@ var userController = function (_baseController) {
          * @method GET
          * @category user
          * @foldnumber 10
+         * @param {Number} [page] 分页页码
+         * @param {Number} [limit] 分页大小
          * @returns {Object} 
          * @example 
          */
@@ -626,39 +647,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: Math.ceil(count / limit),
+                                    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 +712,50 @@ var userController = function (_baseController) {
                             case 0:
                                 _context10.prev = 0;
                                 userInst = _yapi2.default.getInst(_user2.default);
-                                id = ctx.request.body.id;
-                                _context10.next = 5;
-                                return userInst.findById(id);
+                                id = ctx.request.query.id;
+
+                                if (id) {
+                                    _context10.next = 5;
+                                    break;
+                                }
+
+                                return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, 'uid不能为空'));
 
                             case 5:
-                                result = _context10.sent;
-                                return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(result));
+                                _context10.next = 7;
+                                return userInst.findById(id);
 
-                            case 9:
-                                _context10.prev = 9;
+                            case 7:
+                                result = _context10.sent;
+
+                                if (result) {
+                                    _context10.next = 10;
+                                    break;
+                                }
+
+                                return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, "不存在的用户"));
+
+                            case 10:
+                                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 13:
+                                _context10.prev = 13;
                                 _context10.t0 = _context10['catch'](0);
                                 return _context10.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 402, _context10.t0.message));
 
-                            case 12:
+                            case 16:
                             case 'end':
                                 return _context10.stop();
                         }
                     }
-                }, _callee10, this, [[0, 9]]);
+                }, _callee10, this, [[0, 13]]);
             }));
 
             function findById(_x11) {
@@ -750,28 +797,37 @@ var userController = function (_baseController) {
                             case 3:
                                 userInst = _yapi2.default.getInst(_user2.default);
                                 id = ctx.request.body.id;
-                                _context11.next = 7;
-                                return userInst.del(id);
+
+                                if (id) {
+                                    _context11.next = 7;
+                                    break;
+                                }
+
+                                return _context11.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, 'uid不能为空'));
 
                             case 7:
+                                _context11.next = 9;
+                                return userInst.del(id);
+
+                            case 9:
                                 result = _context11.sent;
 
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context11.next = 14;
+                                _context11.next = 16;
                                 break;
 
-                            case 11:
-                                _context11.prev = 11;
+                            case 13:
+                                _context11.prev = 13;
                                 _context11.t0 = _context11['catch'](0);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 402, _context11.t0.message);
 
-                            case 14:
+                            case 16:
                             case 'end':
                                 return _context11.stop();
                         }
                     }
-                }, _callee11, this, [[0, 11]]);
+                }, _callee11, this, [[0, 13]]);
             }));
 
             function del(_x12) {
@@ -785,8 +841,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 +855,85 @@ 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;
+
+                                if (id) {
+                                    _context12.next = 8;
+                                    break;
+                                }
+
+                                return _context12.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, 'uid不能为空'));
+
+                            case 8:
+                                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 = 18;
+                                    break;
+                                }
+
+                                _context12.next = 15;
                                 return userInst.checkRepeat(data.email);
 
-                            case 9:
+                            case 15:
                                 checkRepeat = _context12.sent;
 
                                 if (!(checkRepeat > 0)) {
-                                    _context12.next = 12;
+                                    _context12.next = 18;
                                     break;
                                 }
 
                                 return _context12.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '该email已经注册'));
 
-                            case 12:
-                                _context12.next = 14;
+                            case 18:
+                                _context12.next = 20;
                                 return userInst.update(id, data);
 
-                            case 14:
+                            case 20:
                                 result = _context12.sent;
 
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context12.next = 21;
+                                _context12.next = 27;
                                 break;
 
-                            case 18:
-                                _context12.prev = 18;
+                            case 24:
+                                _context12.prev = 24;
                                 _context12.t0 = _context12['catch'](0);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 402, _context12.t0.message);
 
-                            case 21:
+                            case 27:
                             case 'end':
                                 return _context12.stop();
                         }
                     }
-                }, _callee12, this, [[0, 18]]);
+                }, _callee12, this, [[0, 24]]);
             }));
 
             function update(_x13) {
@@ -877,7 +958,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 +986,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'
+                                }, 'username', '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, 0, 'ok'));
+
+                            case 12:
                             case 'end':
                                 return _context13.stop();
                         }

server_dist/models/project.js

@@ -106,6 +106,22 @@ 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(group_id) {
+            return this.model.count({
+                group_id: group_id
+            });
+        }
     }, {
         key: 'countByGroupId',
         value: function countByGroupId(group_id) {

server_dist/models/user.js

@@ -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);
         }
     }]);

server_dist/router.js

@@ -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

server_dist/utils/commons.js

@@ -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;
+    });
 };

ykit.hosts

@@ -1 +0,0 @@
-[]