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

2025-03-07 14:16:52 +08:00 · 2017-08-17 11:41:04 +08:00 · 2017-08-17 11:41:04 +08:00 · 3e46079446
commit 3e46079446
parent e1c4f8c55a f064df4863
23 changed files with 376 additions and 111 deletions
--- a/client/containers/Project/Interface/Interface.js
+++ b/client/containers/Project/Interface/Interface.js
@ -1,6 +1,8 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { Row, Col, Tabs } from 'antd';
+import { Route } from 'react-router-dom';
+
 import './interface.scss'

 import InterfaceMenu from './InterfaceList/InterfaceMenu.js'
@ -9,37 +11,46 @@ import InterfaceContent from './InterfaceList/InterfaceContent.js'
 import InterfaceColMenu from './InterfaceCol/InterfaceColMenu.js'
 import InterfaceColContent from './InterfaceCol/InterfaceColContent.js'

+const InterfaceRoute = (props) => {
+  let C;
+  if (props.match.params.action === 'api') {
+    C = InterfaceContent;
+  } else if (props.match.params.action === 'col') {
+    C = InterfaceColContent;
+  }
+  return <C />
+}
+
+InterfaceRoute.propTypes = {
+  match: PropTypes.object
+}
+
+
 class Interface extends Component {
  static propTypes = {
    match: PropTypes.object
  }

  constructor(props) {
-    super(props)    
+    super(props)
    this.state = {
-      contentView: 'list'
+      curkey: this.props.match.params.action
    }
  }

-  handleTab = (key) => {
+  onChange = (key) => {
    this.setState({
-      contentView: key
+      curkey: key
    })
  }

  render() {
-    const {contentView} = this.state;
-    let content;
-    content = contentView === 'list' ? 
-      <InterfaceContent />
-      :
-      <InterfaceColContent />
    return <div className="web-content g-row" style={{ marginBottom: "15px" }}>
      <Row gutter={16} >
        <Col span={6}>
          <div className="left-menu">
-            <Tabs defaultActiveKey="list" type="card" onChange={this.handleTab}>
-              <Tabs.TabPane tab="接口列表" key="list">
+            <Tabs type="card" activeKey={this.state.curkey} onChange={this.onChange}>
+              <Tabs.TabPane tab="接口列表" key="api">
                <InterfaceMenu projectId={this.props.match.params.id} />
              </Tabs.TabPane>
              <Tabs.TabPane tab="接口集合" key="col" >
@ -48,10 +59,11 @@ class Interface extends Component {
            </Tabs>
          </div>

+
        </Col>
        <Col span={18} >
          <div className="right-content">
-            {content}
+            <Route path="/project/:id/interface/:action/:actionId" component={InterfaceRoute} />
          </div>
        </Col>
      </Row>
@ -59,4 +71,6 @@ class Interface extends Component {
  }
 }

+
+
 export default Interface
--- a/client/containers/Project/Interface/InterfaceList/Edit.js
+++ b/client/containers/Project/Interface/InterfaceList/Edit.js
@ -44,6 +44,28 @@ class InterfaceEdit extends Component{
    }    
  }

+  componentWillMount(){
+    let s = new WebSocket('ws://yapi.local.qunar.com:3000/api/interface/solve_conflict?id=1');
+    s.onopen = (e)=>{
+      console.log('open',e)
+      s.send('abc')
+    }
+
+    s.onclose = (e)=>{
+      console.log('close',e)
+    }
+
+    s.onmessage = (e)=>{
+      console.log('message',e)
+    }
+
+    s.onerror = (e)=>{
+      console.log('error',e)
+    }
+
+
+  }
+
  render(){
    return <div className="interface-edit">
      <InterfaceEditForm mockUrl={this.state.mockUrl} basepath={this.props.currProject.basepath} onSubmit={this.onSubmit} curdata={this.props.curdata} />
--- a/client/containers/Project/Interface/InterfaceList/InterfaceContent.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceContent.js
@ -1,25 +1,93 @@
-import React from 'react'
+import React, { Component } from 'react'
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types'
 import { Tabs } from 'antd';
 import Edit from './Edit.js'
 import View from './View.js'
+
+import { fetchInterfaceData } from '../../../../reducer/modules/interface.js';
+import { withRouter } from 'react-router-dom';
 import Run from './Run/Run.js'

-const TabPane = Tabs.TabPane;

-const Content = () => {
-  return <div className="interface-content">
-    <Tabs defaultActiveKey="1"   >
-      <TabPane tab="预览" key="1">
-        <View />
+const TabPane = Tabs.TabPane;
+@connect(
+  state => {
+    return {
+      curdata: state.inter.curdata,
+      list: state.inter.list
+    }
+  },
+  {
+    fetchInterfaceData    
+  }
+)
+class Content extends Component {
+  static propTypes = {
+    match: PropTypes.object,
+    list: PropTypes.array,
+    curdata: PropTypes.object,
+    fetchInterfaceData: PropTypes.func
+  }
+  constructor(props) {
+    super(props)
+    this.state = {
+      curtab: 'view'
+    }
+    this._actionId = 0;
+  }
+
+  componentWillReceiveProps(nextProps){
+    this.handleRequest(nextProps)
+  }
+
+  handleRequest(nextProps){
+    let matchParams = nextProps.match.params;
+    let _actionId;
+    _actionId = matchParams.actionId;    
+    _actionId = parseInt(matchParams.actionId, 10);
+    if(!nextProps.curdata)return;
+    if(this._actionId !== _actionId){
+      this._actionId = _actionId;
+      this.props.fetchInterfaceData(_actionId)
+    }
+    this.setState({
+      curtab: 'view'
+    })
+  }
+
+  onChange = (key)=>{
+    this.setState({
+      curtab: key
+    })
+  }
+
+  render() {
+    const tabs = <Tabs onChange={this.onChange} activeKey={this.state.curtab} defaultActiveKey="view"   >
+      <TabPane tab="预览" key="view">
+        {/* <View /> */}
      </TabPane>
-      <TabPane tab="编辑" key="2">
-        <Edit />
+      <TabPane tab="编辑" key="edit">
+
      </TabPane>
-      <TabPane tab="运行" key="3">
-        <Run />
+      <TabPane tab="运行" key="run">
+        {/* <Run /> */}
      </TabPane>
-    </Tabs>
-  </div>
+    </Tabs>;
+    let tabContent;
+    if (this.state.curtab === 'view') {
+      tabContent = <View />;
+    } else if (this.state.curtab === 'edit') {
+      tabContent = <Edit />
+    } else if (this.state.curtab === 'run') {
+      tabContent = <Run />
+    }
+
+    return <div className="interface-content">
+      {tabs}
+      {tabContent}
+    </div>
+  }
 }

-export default Content
+export default withRouter(Content)
--- a/client/containers/Project/Interface/InterfaceList/InterfaceMenu.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceMenu.js
@ -1,10 +1,11 @@
 import React, { Component } from 'react'
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types'
-import { fetchInterfaceList, fetchInterfaceData, changeInterfaceId, addInterfaceData, deleteInterfaceData } from '../../../../reducer/modules/interface.js';
+import { fetchInterfaceList, fetchInterfaceData,  addInterfaceData, deleteInterfaceData } from '../../../../reducer/modules/interface.js';
 import { Menu, Input, Icon, Tag, Modal, message } from 'antd';
 import AddInterfaceForm from './AddInterfaceForm';
 import axios from 'axios'
+import { Link,withRouter } from 'react-router-dom';

 const confirm = Modal.confirm;

@ -14,29 +15,27 @@ const confirm = Modal.confirm;
  state => {
    return {
      list: state.inter.list,
-      curProject: state.project.curProject,
-      interfaceId: state.inter.interfaceId
+      curProject: state.project.curProject
    }
  },
  {
    fetchInterfaceList,
    fetchInterfaceData,
-    changeInterfaceId,
    addInterfaceData,
    deleteInterfaceData
  }
 )
 class InterfaceMenu extends Component {
  static propTypes = {
+    match: PropTypes.object,
    projectId: PropTypes.string,
-    interfaceId: PropTypes.number,
    list: PropTypes.array,
    fetchInterfaceList: PropTypes.func,
    curProject: PropTypes.object,
    fetchInterfaceData: PropTypes.func,
-    changeInterfaceId: PropTypes.func,
    addInterfaceData: PropTypes.func,
-    deleteInterfaceData: PropTypes.func
+    deleteInterfaceData: PropTypes.func,
+    history: PropTypes.object
  }

  showModal = () => {
@ -59,26 +58,21 @@ class InterfaceMenu extends Component {
      delIcon: null,
      filter: ''
    }
+    
  }

  async handleRequest() {
    let result = await this.props.fetchInterfaceList(this.props.projectId);
-    let interfaces = result.payload.data;
-    if (interfaces.length > 0) {
-      this.props.changeInterfaceId(interfaces[0]._id)
-      await this.props.fetchInterfaceData(interfaces[0]._id)
+    let params = this.props.match.params;
+    if(!params.actionId){
+      this.props.history.replace('/project/'+params.id + '/interface/api/' + result.payload.data[0]._id)
    }
  }

  componentWillMount() {
    this.handleRequest()
  }
-
-  onSelect = (item) => {
-    this.props.changeInterfaceId(parseInt(item.key, 10))
-    this.props.fetchInterfaceData(parseInt(item.key, 10))
-  }
-
+  
  handleAddInterface = (data) => {
    data.project_id = this.props.projectId;
    axios.post('/api/interface/add', data).then((res) => {
@ -127,6 +121,7 @@ class InterfaceMenu extends Component {

  render() {
    const items = [];
+    const matchParams = this.props.match.params;
    this.props.list.forEach((item) => {
      let color, filter = this.state.filter;
      if(filter && item.title.indexOf(filter) === -1 && item.path.indexOf(filter) === -1){
@ -141,9 +136,10 @@ class InterfaceMenu extends Component {
      }

      items.push(
+
        <Menu.Item onMouseEnter={this.enterItem} onMouseLeave={this.leaveItem} key={"" + item._id}>
          <Tag className="btn-http" color={color}>{item.method}  </Tag>
-          {item.title}
+          <Link className="interface-item" to={"/project/" + matchParams.id + "/interface/api/" + item._id} >{item.title}</Link>
          <Icon type="delete" onClick={()=> {this.showConfirm(item._id)}} style={{ display: this.state.delIcon == item._id ? 'block' : 'none' }} className="interface-delete-icon" />
        </Menu.Item>
      )
@ -163,7 +159,7 @@ class InterfaceMenu extends Component {
          <AddInterfaceForm onCancel={this.handleCancel} onSubmit={this.handleAddInterface} />
        </Modal>
      </div>
-      <Menu selectedKeys={[this.props.interfaceId + ""]} className="interface-list" onSelect={this.onSelect}>
+      <Menu selectedKeys={[this.props.match.params.actionId + ""]} className="interface-list">
        {items}
      </Menu>
    </div>
@ -171,4 +167,4 @@ class InterfaceMenu extends Component {
  }
 }

-export default InterfaceMenu
+export default withRouter(InterfaceMenu)
--- a/client/containers/Project/Interface/interface.scss
+++ b/client/containers/Project/Interface/interface.scss
@ -45,6 +45,9 @@
                padding: 0 5px;
                width: 40px;
            }
+            .interface-item{
+                display: inline
+            }

            .interface-delete-icon{
                position: absolute;
--- a/client/containers/Project/Project.js
+++ b/client/containers/Project/Project.js
@ -43,7 +43,7 @@ export default class Project extends Component {
          default={'动态'}
          data={[{
            name: '接口',
-            path: `/project/${match.params.id}/interface`
+            path: `/project/${match.params.id}/interface/api`
          }, {
            name: '设置',
            path: `/project/${match.params.id}/setting`
@ -54,7 +54,7 @@ export default class Project extends Component {
        <Switch>
          <Redirect exact from="/project/:id" to={`/project/${match.params.id}/activity`}/>
          <Route path="/project/:id/activity" component={Activity} />
-          <Route path="/project/:id/interface" component={Interface} />
+          <Route path="/project/:id/interface/:action" component={Interface} />
          <Route path="/project/:id/setting" component={Setting} />
        </Switch>
      </div>
--- a/client/reducer/middleware/messageMiddleware.js
+++ b/client/reducer/middleware/messageMiddleware.js
@ -1,6 +1,7 @@
 import { message } from 'antd';

 export default () => next => action => {
+  if(!action) return;
  if (action.error) {
    message.error((action.payload && action.payload.message) || '服务器错误');
  } else if (action.payload && action.payload.data && action.payload.data.errcode && action.payload.data.errcode !== 40011) {
--- a/client/reducer/modules/interface.js
+++ b/client/reducer/modules/interface.js
@ -2,7 +2,6 @@ import axios from 'axios'
 // Actions
 const FETCH_INTERFACE_DATA = 'yapi/interface/FETCH_INTERFACE_DATA';
 const FETCH_INTERFACE_LIST = 'yapi/interface/FETCH_INTERFACE_LIST';
-const CHANGE_INTERFACE_ID = 'yapi/interface/CHANGE_INTERFACE_ID';
 const ADD_INTERFACE_DATA = 'yapi/interface/ADD_INTERFACE_DATA';
 const DELETE_INTERFACE_DATA = 'yapi/interface/DELETE_INTERFACE_DATA';
 const UPDATE_INTERFACE_DATA = 'yapi/interface/UPDATE_INTERFACE_DATA';
@ -11,7 +10,6 @@ const UPDATE_INTERFACE_DATA = 'yapi/interface/UPDATE_INTERFACE_DATA';

 // Reducer
 const initialState = {
-  interfaceId: 0,
  curdata: {},
  list: []
 }
@ -26,20 +24,17 @@ export default (state = initialState, action) => {
    case DELETE_INTERFACE_DATA:
      return (() => {

-        let newlist = state.list.filter(data => data._id !== action.payload), newid, curdata;
+        let newlist = state.list.filter(data => data._id !== action.payload), curdata;

-        if (state.interfaceId === action.payload && state.list.length > 0) {
-          newid = state.list[0]._id
+        if (state.list.length > 0) {
          curdata = state.list[0]
        } else if (state.list.length == 0) {
-          newid = 0;
          curdata = {}
        }

        return {
          ...state,
          curdata: curdata,
-          interfaceId: newid,
          list: newlist
        }
      })()
@ -48,13 +43,7 @@ export default (state = initialState, action) => {
      return {
        ...state,
        curdata: action.payload,
-        list: [].concat(state.list, action.payload),
-        interfaceId: action.payload._id
-      }
-    case CHANGE_INTERFACE_ID:
-      return {
-        ...state,
-        interfaceId: action.payload
+        list: [].concat(state.list, action.payload)
      }
    case FETCH_INTERFACE_DATA:
      return {
@ -65,20 +54,13 @@ export default (state = initialState, action) => {
      return {
        ...state,
        list: action.payload.data,
-        curdata: action.payload.data.length > 0 ? action.payload.data[0] :  {}
+        curdata: {}
      }
    default:
      return state
  }
 }

-export function changeInterfaceId(id) {
-  return {
-    type: CHANGE_INTERFACE_ID,
-    payload: id
-  }
-}
-
 export function updateInterfaceData(updata) {

  return {
@ -94,13 +76,14 @@ export async function deleteInterfaceData(id) {
  await axios.post('/api/interface/del', { id: id })
  return {
    type: DELETE_INTERFACE_DATA,
-    payload: id
+    payload: true
  }
 }

 // Action Creators
 export async function fetchInterfaceData(interfaceId) {
  let result = await axios.get('/api/interface/get?id=' + interfaceId);
+  
  return {
    type: FETCH_INTERFACE_DATA,
    payload: result.data
--- a/package.json
+++ b/package.json
@ -64,6 +64,7 @@
    "koa-session-minimal": "^3.0.3",
    "koa-static": "^3.0.0",
    "koa-views": "^5.2.0",
+    "koa-websocket": "^4.0.0",
    "mock": "^0.1.1",
    "mockjs": "^1.0.1-beta3",
    "moment": "^2.18.1",
--- a/server/app.js
+++ b/server/app.js
@ -7,9 +7,12 @@ import Koa from 'koa';
 import koaStatic from 'koa-static';
 import bodyParser from 'koa-bodyparser';
 import router from './router.js';
+import websockify from 'koa-websocket';
+import websocket from './websocket.js'
+

 yapi.connect = dbModule.connect();    
-const app = new Koa();
+const app = websockify(new Koa());
 let indexFile = process.argv[2] === 'dev' ? 'dev.html' : 'index.html';


@ -18,7 +21,7 @@ app.use(bodyParser());
 app.use(router.routes());
 app.use(router.allowedMethods());

-
+websocket(app);

 app.use( async (ctx, next) => {
    if( /^\/(?!api)[a-zA-Z0-9\/\-]*$/.test(ctx.path) ){
--- a/server/controllers/group.js
+++ b/server/controllers/group.js
@ -127,6 +127,7 @@ class groupController extends baseController {
     * @foldnumber 10
     * @param {String} id 项目分组id
     * @param {String} member_uid 项目分组成员uid
+     * @param {String} role 成员角色，owner or dev
     * @returns {Object}
     * @example
     */
@ -144,11 +145,13 @@ class groupController extends baseController {
            return ctx.body = yapi.commons.resReturn(null, 400, '分组id不能为空');
        }

+        params.role = params.role === 'owner' ? 'owner' : 'dev';
+
        var check = await groupInst.checkMemberRepeat(params.id, params.member_uid);
        if (check > 0) {
            return ctx.body = yapi.commons.resReturn(null, 400, '成员已存在');
        }
-        let groupUserdata = await this.getUserdata(params.member_uid);
+        let groupUserdata = await this.getUserdata(params.member_uid, params.role);
        if (groupUserdata === null) {
            return ctx.body = yapi.commons.resReturn(null, 400, '组长uid不存在')
        }
--- a/server/controllers/interface.js
+++ b/server/controllers/interface.js
@ -304,6 +304,17 @@ class interfaceController extends baseController {
            ctx.body = yapi.commons.resReturn(null, 402, err.message);
        }
    }
+
+    async solveConflict(ctx) {
+        let id = parseInt(ctx.query.id, 10);
+        if(!id) return ctx.websocket.send("id 参数有误");
+
+        ctx.websocket.send('Hello World');
+        ctx.websocket.on('message', function (message) {
+            // do something with the message from client 
+            console.log(message);
+        });
+    }
 }

 module.exports = interfaceController;
--- a/server/controllers/project.js
+++ b/server/controllers/project.js
@ -141,7 +141,9 @@ class projectController extends baseController {
            return ctx.body = yapi.commons.resReturn(null, 400, '项目成员已存在');
        }

-        let userdata = await this.getUserdata(params.member_uid);
+        params.role = params.role === 'owner' ? 'owner' : 'dev';
+
+        let userdata = await this.getUserdata(params.member_uid, params.role);
        if(userdata === null){
            return ctx.body = yapi.commons.resReturn(null, 400, '成员uid不存在')
        }
--- a/server/models/interface.js
+++ b/server/models/interface.js
@ -13,6 +13,7 @@ class interfaceModel extends baseModel {
            path: { type: String, required: true },
            method: { type: String, required: true },
            project_id: { type: Number, required: true },
+            edit_uid: {type: Number},
            status: {type: String, enum: ['undone', 'done'], default: 'undone'},
            desc: String,
            add_time: Number,
--- a/server/models/interfaceCase.js
+++ b/server/models/interfaceCase.js
@ -19,6 +19,9 @@ class interfaceCase extends baseModel {
            domain: {type: String },
            path: { type: String },
            method: { type: String },
+            req_params: [{
+                name: String, value: String
+            }],
            req_query: [{
                name: String, value: String
            }],
--- a/server/websocket.js
+++ b/server/websocket.js
@ -0,0 +1,23 @@
+import koaRouter from 'koa-router';
+const route = require('koa-route');
+import interfaceController from './controllers/interface.js';
+
+
+function websocket(app) {
+  console.log('load websocket...')
+  app.ws.use(function (ctx, next) {
+    return next(ctx);
+  });
+  app.ws.use(route.all('/api/interface/solve_conflict', async function (ctx) {
+    let inst = new interfaceController(ctx);
+    await inst.init(ctx);
+    if (inst.$auth === true) {
+      await inst.solveConflict.call(inst, ctx);
+    } else {
+      ctx.ws.send('请登录...');
+    }
+  }));
+
+}
+
+module.exports = websocket
--- a/server_dist/app.js
+++ b/server_dist/app.js
@ -40,13 +40,21 @@ var _router = require('./router.js');

 var _router2 = _interopRequireDefault(_router);

+var _koaWebsocket = require('koa-websocket');
+
+var _koaWebsocket2 = _interopRequireDefault(_koaWebsocket);
+
+var _websocket = require('./websocket.js');
+
+var _websocket2 = _interopRequireDefault(_websocket);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

 _yapi2.default.commons = _commons2.default;


 _yapi2.default.connect = _db2.default.connect();
-var app = new _koa2.default();
+var app = (0, _koaWebsocket2.default)(new _koa2.default());
 var indexFile = process.argv[2] === 'dev' ? 'dev.html' : 'index.html';

 app.use(_mockServer2.default);
@ -54,6 +62,8 @@ app.use((0, _koaBodyparser2.default)());
 app.use(_router2.default.routes());
 app.use(_router2.default.allowedMethods());

+(0, _websocket2.default)(app);
+
 app.use(function () {
    var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx, next) {
        return _regenerator2.default.wrap(function _callee$(_context) {
--- a/server_dist/controllers/group.js
+++ b/server_dist/controllers/group.js
@ -325,6 +325,7 @@ var groupController = function (_baseController) {
         * @foldnumber 10
         * @param {String} id 项目分组id
         * @param {String} member_uid 项目分组成员uid
+         * @param {String} role 成员角色，owner or dev
         * @returns {Object}
         * @example
         */
@ -357,66 +358,69 @@ var groupController = function (_baseController) {
                                return _context4.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '分组id不能为空'));

                            case 6:
-                                _context4.next = 8;
+
+                                params.role = params.role === 'owner' ? 'owner' : 'dev';
+
+                                _context4.next = 9;
                                return groupInst.checkMemberRepeat(params.id, params.member_uid);

-                            case 8:
+                            case 9:
                                check = _context4.sent;

                                if (!(check > 0)) {
-                                    _context4.next = 11;
+                                    _context4.next = 12;
                                    break;
                                }

                                return _context4.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '成员已存在'));

-                            case 11:
-                                _context4.next = 13;
-                                return this.getUserdata(params.member_uid);
+                            case 12:
+                                _context4.next = 14;
+                                return this.getUserdata(params.member_uid, params.role);

-                            case 13:
+                            case 14:
                                groupUserdata = _context4.sent;

                                if (!(groupUserdata === null)) {
-                                    _context4.next = 16;
+                                    _context4.next = 17;
                                    break;
                                }

                                return _context4.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '组长uid不存在'));

-                            case 16:
+                            case 17:
                                if (!(groupUserdata._role === 'admin')) {
-                                    _context4.next = 18;
+                                    _context4.next = 19;
                                    break;
                                }

                                return _context4.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '不能邀请管理员'));

-                            case 18:
+                            case 19:
                                delete groupUserdata._role;
-                                _context4.prev = 19;
-                                _context4.next = 22;
+                                _context4.prev = 20;
+                                _context4.next = 23;
                                return groupInst.addMember(params.id, groupUserdata);

-                            case 22:
+                            case 23:
                                result = _context4.sent;

                                ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context4.next = 29;
+                                _context4.next = 30;
                                break;

-                            case 26:
-                                _context4.prev = 26;
-                                _context4.t0 = _context4['catch'](19);
+                            case 27:
+                                _context4.prev = 27;
+                                _context4.t0 = _context4['catch'](20);

                                ctx.body = _yapi2.default.commons.resReturn(null, 402, _context4.t0.message);

-                            case 29:
+                            case 30:
                            case 'end':
                                return _context4.stop();
                        }
                    }
-                }, _callee4, this, [[19, 26]]);
+                }, _callee4, this, [[20, 27]]);
            }));

            function addMember(_x5) {
--- a/server_dist/controllers/interface.js
+++ b/server_dist/controllers/interface.js
@ -589,6 +589,46 @@ var interfaceController = function (_baseController) {

            return del;
        }()
+    }, {
+        key: 'solveConflict',
+        value: function () {
+            var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) {
+                var id;
+                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                    while (1) {
+                        switch (_context6.prev = _context6.next) {
+                            case 0:
+                                id = parseInt(ctx.query.id, 10);
+
+                                if (id) {
+                                    _context6.next = 3;
+                                    break;
+                                }
+
+                                return _context6.abrupt('return', ctx.websocket.send("id 参数有误"));
+
+                            case 3:
+
+                                ctx.websocket.send('Hello World');
+                                ctx.websocket.on('message', function (message) {
+                                    // do something with the message from client 
+                                    console.log(message);
+                                });
+
+                            case 5:
+                            case 'end':
+                                return _context6.stop();
+                        }
+                    }
+                }, _callee6, this);
+            }));
+
+            function solveConflict(_x6) {
+                return _ref6.apply(this, arguments);
+            }
+
+            return solveConflict;
+        }()
    }]);
    return interfaceController;
 }(_base2.default);
--- a/server_dist/controllers/project.js
+++ b/server_dist/controllers/project.js
@ -313,25 +313,28 @@ var projectController = function (_baseController) {
                                return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '项目成员已存在'));

                            case 15:
-                                _context2.next = 17;
-                                return this.getUserdata(params.member_uid);

-                            case 17:
+                                params.role = params.role === 'owner' ? 'owner' : 'dev';
+
+                                _context2.next = 18;
+                                return this.getUserdata(params.member_uid, params.role);
+
+                            case 18:
                                userdata = _context2.sent;

                                if (!(userdata === null)) {
-                                    _context2.next = 20;
+                                    _context2.next = 21;
                                    break;
                                }

                                return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '成员uid不存在'));

-                            case 20:
-                                _context2.prev = 20;
-                                _context2.next = 23;
+                            case 21:
+                                _context2.prev = 21;
+                                _context2.next = 24;
                                return this.Model.addMember(params.id, userdata);

-                            case 23:
+                            case 24:
                                result = _context2.sent;
                                username = this.getUsername();

@ -343,21 +346,21 @@ var projectController = function (_baseController) {
                                    typeid: params.id
                                });
                                ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context2.next = 32;
+                                _context2.next = 33;
                                break;

-                            case 29:
-                                _context2.prev = 29;
-                                _context2.t1 = _context2['catch'](20);
+                            case 30:
+                                _context2.prev = 30;
+                                _context2.t1 = _context2['catch'](21);

                                ctx.body = _yapi2.default.commons.resReturn(null, 402, _context2.t1.message);

-                            case 32:
+                            case 33:
                            case 'end':
                                return _context2.stop();
                        }
                    }
-                }, _callee2, this, [[20, 29]]);
+                }, _callee2, this, [[21, 30]]);
            }));

            function addMember(_x2) {
--- a/server_dist/models/interface.js
+++ b/server_dist/models/interface.js
@ -52,6 +52,7 @@ var interfaceModel = function (_baseModel) {
                path: { type: String, required: true },
                method: { type: String, required: true },
                project_id: { type: Number, required: true },
+                edit_uid: { type: Number },
                status: { type: String, enum: ['undone', 'done'], default: 'undone' },
                desc: String,
                add_time: Number,
--- a/server_dist/models/interfaceCase.js
+++ b/server_dist/models/interfaceCase.js
@ -58,6 +58,9 @@ var interfaceCase = function (_baseModel) {
                domain: { type: String },
                path: { type: String },
                method: { type: String },
+                req_params: [{
+                    name: String, value: String
+                }],
                req_query: [{
                    name: String, value: String
                }],
--- a/server_dist/websocket.js
+++ b/server_dist/websocket.js
@ -0,0 +1,70 @@
+'use strict';
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _koaRouter = require('koa-router');
+
+var _koaRouter2 = _interopRequireDefault(_koaRouter);
+
+var _interface = require('./controllers/interface.js');
+
+var _interface2 = _interopRequireDefault(_interface);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var route = require('koa-route');
+
+
+function websocket(app) {
+  console.log('load websocket...');
+  app.ws.use(function (ctx, next) {
+    return next(ctx);
+  });
+  app.ws.use(route.all('/api/interface/solve_conflict', function () {
+    var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
+      var inst;
+      return _regenerator2.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              inst = new _interface2.default(ctx);
+              _context.next = 3;
+              return inst.init(ctx);
+
+            case 3:
+              if (!(inst.$auth === true)) {
+                _context.next = 8;
+                break;
+              }
+
+              _context.next = 6;
+              return inst.solveConflict.call(inst, ctx);
+
+            case 6:
+              _context.next = 9;
+              break;
+
+            case 8:
+              ctx.ws.send('请登录...');
+
+            case 9:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }()));
+}
+
+module.exports = websocket;