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

2024-12-15 05:10:47 +08:00 · 2017-08-24 16:37:49 +08:00 · 2017-08-24 16:37:49 +08:00 · d9269efe64
commit d9269efe64
parent 3048ec09f2 ce91b182cf
19 changed files with 196 additions and 188 deletions
--- a/client/components/Footer/Footer.scss
+++ b/client/components/Footer/Footer.scss
@ -5,6 +5,8 @@
  border-top: 1px solid #ddd;
  height: 2.4rem;
  width: 100%;
+  background-color: $color-bg-dark;
+  overflow: hidden;
 }

 .footer-container{
@ -28,7 +30,7 @@
    line-height: .3rem;
    transition: color .2s;
    &:hover {
-      color: #2e2e5a;
+      color: $color-bg-gray;
    }
  }
 }
--- a/client/containers/Group/MemberList/MemberList.js
+++ b/client/containers/Group/MemberList/MemberList.js
@ -79,12 +79,11 @@ class MemberList extends Component {
  // 增 - 添加成员
  @autobind
  handleOk() {
-    console.log(this.props.currGroup._id, this.state.inputUid);
    this.props.addMember({
      id: this.props.currGroup._id,
-      member_uid: this.state.inputUid
+      member_uid: this.state.inputUid,
+      role: this.state.inputRole
    }).then((res) => {
-      console.log(res);
      if (!res.payload.data.errcode) {
        message.success('添加成功!');
        this.reFetchList(); // 添加成功后重新获取分组成员列表
@ -94,9 +93,9 @@ class MemberList extends Component {
  // 添加成员时 选择新增成员权限
  @autobind
  changeNewMemberRole(value) {
-    return () => {
-      console.log(this.props.currGroup._id, value);
-    }
+    this.setState({
+      inputRole: value
+    });
  }

  // 删 - 删除分组成员
@ -116,7 +115,6 @@ class MemberList extends Component {
  // 改 - 修改成员权限
  @autobind
  changeUserRole(e) {
-    console.log(e);
    const id = this.props.currGroup._id;
    const role = e.split('-')[0];
    const member_uid = e.split('-')[1];
@ -168,7 +166,6 @@ class MemberList extends Component {

  @autobind
  onUserSelect(childState) {
-    console.log(childState);
    this.setState({
      inputUid: childState.uid
    })
--- a/client/containers/Home/Home.js
+++ b/client/containers/Home/Home.js
@ -4,13 +4,10 @@ import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { Row, Col, Button, Icon, Card } from 'antd';
 import PropTypes from "prop-types";
+import { withRouter } from 'react-router';
 import { logoSVG } from '../../common.js';
-
-// import Intro from '../../components/Intro/Intro'
 import { changeMenuItem } from '../../reducer/modules/menu'

-// const oneAnim = { y: '+=30', opacity: 0, type: 'from', ease: 'easeOutQuad' };
-
 const HomeGuest = () => (
  <div className="g-body">
    <div className="m-bg">
@ -39,7 +36,7 @@ const HomeGuest = () => (
              <div className="detail">高效、易用、可部署的API管理平台<br/><span className="desc">旨在为开发、产品、测试人员提供更优雅的接口管理服务</span></div>
              <div className="btn-group">
                <Link to="/login"><Button type="primary" className="btn-home btn-login">登录 / 注册</Button></Link>
-                <Button className="btn-home btn-qsso" id="qsso-login">QSSO 登录</Button>
+                <Button className="btn-home btn-home-normal" id="qsso-login">QSSO 登录</Button>
              </div>
            </div>
          </Col>
@ -170,7 +167,7 @@ HomeGuest.propTypes ={
    changeMenuItem
  }
 )
-
+@withRouter
 class Home extends Component {
  constructor(props) {
    super(props)
@ -181,6 +178,7 @@ class Home extends Component {
  static propTypes = {
    introList: PropTypes.array,
    login : PropTypes.bool,
+    history: PropTypes.object,
    changeMenuItem : PropTypes.func
  }
  toStart = () =>{
@ -190,21 +188,21 @@ class Home extends Component {
    const { login } = this.props;
    return (
      <div className="home-main">
-        {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="/group" onClick={this.toStart}>开始</Link>
-                  </Button>
-                </div>
+        {login? this.props.history.push('/group') : <HomeGuest introList={this.props.introList}/>}
+        <div className="row-tip">
+          <div className="container">
+            <div className="tip-title">
+              <h3 className="title">准备好使用了吗？</h3>
+              <p className="desc">注册账号尽请使用吧，查看使用文档了解更多信息</p>
+            </div>
+            <div className="tip-btns">
+              <div className="btn-group">
+                <Link to="/login"><Button type="primary" className="btn-home btn-login">登录 / 注册</Button></Link>
+                <Button className="btn-home btn-home-normal"><a target="_blank" href="/doc/index.html" >使用文档</a></Button>
              </div>
            </div>
-          )
-          : <HomeGuest introList={this.props.introList}/>}
+          </div>
+        </div>
      </div>
    )
  }
--- a/client/containers/Home/Home.scss
+++ b/client/containers/Home/Home.scss
@ -27,6 +27,51 @@ $color-bg-lightblue: #c6e2ff;
    }
  }
 }
+
+// 按钮组
+.btn-group {
+  padding: .3rem .24rem;
+  .btn-home {
+    font-size: .15rem;
+    font-weight: 200;
+    letter-spacing: 1px;
+    border: none;
+    line-height: .4rem;
+    height: .4rem;
+    padding: 0 .24rem;
+    margin-right: .24rem;
+    box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08);
+    transform: translateY(0);
+    transition: all .2s;
+    &:hover {
+      transform: translateY(-1px);
+      box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
+    }
+    &:active {
+      transform: translateY(1px);
+    }
+  }
+  .btn-login {
+    background-color: #32325d;
+    &:hover {
+      background-color: #43459a;
+    }
+    &:active, &:focus {
+      color: #e6ebf1;
+      background-color: #32325d;
+    }
+  }
+  .btn-home-normal {
+    color: #43459a;
+    &:hover {
+      color: #7795f8;
+    }
+    &:hover, &:focus {
+      background-color: #f6f9fc;
+    }
+  }
+}
+
 .m-bg {
  position: absolute;
  left: 0;
@ -104,47 +149,6 @@ $color-bg-lightblue: #c6e2ff;
      .desc {
        font-size: .18rem;
      }
-      .btn-group {
-        padding: .3rem .24rem;
-        .btn-home {
-          font-size: .15rem;
-          font-weight: 200;
-          letter-spacing: 1px;
-          border: none;
-          line-height: .4rem;
-          height: .4rem;
-          padding: 0 .24rem;
-          margin-right: .24rem;
-          box-shadow: 0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08);
-          transform: translateY(0);
-          transition: all .2s;
-          &:hover {
-            transform: translateY(-1px);
-            box-shadow: 0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
-          }
-          &:active {
-            transform: translateY(1px);
-          }
-        }
-        .btn-login {
-          background-color: #43459a;
-          &:hover {
-            background-color: #555abf;
-          }
-          &:hover {
-            background-color: #32325d;
-          }
-        }
-        .btn-qsso {
-          color: #43459a;
-          &:hover {
-            color: #7795f8;
-          }
-          &:hover {
-            background-color: #f6f9fc;
-          }
-        }
-      }
    }
    .login-form{
      color: $color-white;
@ -470,8 +474,41 @@ $color-bg-lightblue: #c6e2ff;
  }
 }

+.row-tip {
+  margin-top: .48rem;
+  padding-top: .48rem;
+  padding-bottom: .24rem;
+  background-color: #ececec;
+  .container {
+    display: flex;
+    align-items: center;
+    .tip-title {
+      flex: 2;
+    }
+    .tip-btns {
+      flex: 1;
+    }
+  }
+  .btn-group {
+    white-space: nowrap;
+  }
+  .title {
+    -webkit-font-smoothing: antialiased;
+    padding-left: .24rem;
+    color: #2e2e5a;
+    line-height: .32rem;
+    margin-bottom: .08rem;
+    font-size: .24rem;
+  }
+  .desc {
+    -webkit-font-smoothing: antialiased;
+    padding-left: .24rem;
+    color: #6d7c90;
+    font-size: .16rem;
+  }
+}

-
+// LOGO 旋转动画
@keyframes spin
 {
  from {
--- a/client/containers/Project/Activity/Activity.scss
+++ b/client/containers/Project/Activity/Activity.scss
@ -80,14 +80,15 @@
        margin-left: 40px;
        padding: 0px;
        padding-bottom: 16px;
-        min-width: 300px;
-        max-width: 600px;
+        // min-width: 300px;
+        // max-width: 600px;
+        width: 625px;
        border-radius: 8px;
        
        .logMesHeade{
          color: white;
          padding: 16px 8px 8px 8px;
-          background-color: gray;
+          background-color: rgba(35, 149, 241, 0.88);
          border-top-left-radius: 8px;
          border-top-right-radius: 8px;
        }
@ -107,7 +108,7 @@
        padding: 0px;
        .ant-timeline-item-content{
          padding: 0px;
-          min-width: auto;
+          width: auto;
          margin-top: 15px;
          .loggetMore{
            margin: 0px;
--- a/client/containers/Project/Interface/InterfaceList/View.js
+++ b/client/containers/Project/Interface/InterfaceList/View.js
@ -173,7 +173,8 @@ class View extends Component {
          key: i,
          name: item.name,
          required: item.required,
-          value: item.value
+          value: item.value,
+          desc: item.desc
        })
      })
    }
@ -181,16 +182,23 @@ class View extends Component {
    const columns = [{
      title: '参数名称',
      dataIndex: 'name',
-      key: 'name'
+      key: 'name',
+      width: 2
    }, {
      title: '参数值',
      dataIndex: 'value',
-      key: 'value'
+      key: 'value',
+      width: 2
    }, {
-      title: '备注',
+      title: '是否必须',
      dataIndex: 'required',
      key: 'required',
-      width: '45%'
+      width: 1
+    },{
+      title: '备注',
+      dataIndex: 'desc',
+      key: 'desc',
+      width: 4
    }];
    let status = {
      undone: "未完成",
@ -208,6 +216,14 @@ class View extends Component {
      get: {
        bac: "#cfefdf",
        color: "#00a854"
+      },
+      input: {
+        bac: "#57cf27",
+        color: "#9c82a2"
+      },
+      delete: {
+        bac: "#57cf27",
+        color: "#57cf27"
      }
    }
    methodColor = methodColor[this.props.curData.method?this.props.curData.method.toLowerCase():"get"];
--- a/client/containers/Project/Setting/ProjectMember/ProjectMember.js
+++ b/client/containers/Project/Setting/ProjectMember/ProjectMember.js
@ -82,12 +82,11 @@ class ProjectMember extends Component {
  // 增 - 添加成员
  @autobind
  handleOk() {
-    console.log(this.props.projectId, this.state.inputUid);
    this.props.addMember({
      id: this.props.projectId,
-      member_uid: this.state.inputUid
+      member_uid: this.state.inputUid,
+      role: this.state.inputRole
    }).then((res) => {
-      console.log(res);
      if (!res.payload.data.errcode) {
        message.success('添加成功!');
        this.reFetchList(); // 添加成功后重新获取分组成员列表
@ -97,9 +96,9 @@ class ProjectMember extends Component {
  // 添加成员时 选择新增成员权限
  @autobind
  changeNewMemberRole(value) {
-    return () => {
-      console.log(this.props.projectId, value);
-    }
+    this.setState({
+      inputRole: value
+    });
  }

  // 删 - 删除分组成员
@ -119,7 +118,6 @@ class ProjectMember extends Component {
  // 改 - 修改成员权限
  @autobind
  changeUserRole(e) {
-    console.log(e);
    const id = this.props.projectId;
    const role = e.split('-')[0];
    const member_uid = e.split('-')[1];
--- a/client/containers/Project/Setting/Setting.scss
+++ b/client/containers/Project/Setting/Setting.scss
@ -35,6 +35,11 @@
  border-radius: 2px;
  .ant-card-head {
    background-color: #eee;
+      padding: 0 .08rem !important;
+  }
+  .ant-card-head-title {
+    font-size: .12rem;
+    float: inherit;
  }
  .ant-card-body {
    padding: 0;
--- a/client/containers/User/Profile.js
+++ b/client/containers/User/Profile.js
@ -3,7 +3,7 @@ import { Row, Col, Input, Button, Select, message, Upload, Tooltip} from 'antd'
 import axios from 'axios';
 import {formatTime} from '../../common.js'
 import PropTypes from 'prop-types'
-import { Link } from 'react-router-dom'
+// import { Link } from 'react-router-dom'
 import { connect } from 'react-redux'

@connect(state=>{
@ -40,7 +40,19 @@ class Profile extends Component {
  }

  componentDidMount(){
-    const uid = this.props.match.params.uid;
+    this._uid = this.props.match.params.uid;
+    this.handleUserinfo(this.props)
+  }
+
+  componentWillReceiveProps(nextProps){
+    if(!nextProps.match.params.uid) return;
+    if(this._uid !== nextProps.match.params.uid){
+      this.handleUserinfo(nextProps)
+    }
+  }
+
+  handleUserinfo(props){
+    const uid = props.match.params.uid;
    this.getUserInfo(uid)
  }

@ -253,33 +265,13 @@ class Profile extends Component {
        </ButtonGroup>
      </div>
    }
-    let bacToPer = "";
-    if(userinfo.uid != this.props.curUid){
-      bacToPer = <div className="bacToPer"><Link to={`/user/profile/${this.props.curUid}`}><Button onClick={()=>{this.getUserInfo(this.props.curUid)}}>返回到当前用户</Button></Link></div>
-    }
    return <div className="user-profile">
-      {
-        bacToPer
-      }
-      <Row  className="avatarCon" type="flex" justify="start">
-        <div className="m-bg">
-          <div className="m-bg-mask m-bg-mask0"></div>
-          <div className="m-bg-mask m-bg-mask1"></div>
-          <div className="m-bg-mask m-bg-mask2"></div>
-          <div className="m-bg-mask m-bg-mask3"></div>
-        </div>
-        <Col  span={24}>{userinfo.uid === this.props.curUid?<AvatarUpload uid={userinfo.uid}>点击上传头像</AvatarUpload>:<div className = "avatarImg"><img src = {`/api/user/avatar?uid=${userinfo.uid}`} /></div>}</Col>
-      </Row>
      <div className="user-item-body">
-        {/*<div className="user-item-mask-top"></div>
-        <div className="user-item-mask">
-          <div className="m-bg">
-            <div className="m-bg-mask m-bg-mask0"></div>
-            <div className="m-bg-mask m-bg-mask1"></div>
-            <div className="m-bg-mask m-bg-mask2"></div>
-            <div className="m-bg-mask m-bg-mask3"></div>
-          </div>
-        </div>*/}
+        {userinfo.uid === this.props.curUid?<h3>个人设置</h3>:<h3>{userinfo.username} 资料设置</h3>}
+        
+        <Row  className="avatarCon" type="flex" justify="start">
+          <Col  span={24}>{userinfo.uid === this.props.curUid?<AvatarUpload uid={userinfo.uid}>点击上传头像</AvatarUpload>:<div className = "avatarImg"><img src = {`/api/user/avatar?uid=${userinfo.uid}`} /></div>}</Col>
+        </Row>
        <Row className="user-item" type="flex" justify="start">
          <div className="maoboli"></div>
          <Col span={4}>用户id</Col>
@ -365,7 +357,7 @@ class AvatarUpload extends Component {
    // console.log(this.props.uid);
    
    return <div className="avatar-box">
-      <Tooltip placement="left" title={<div>点击头像更换 (只支持jpg、png格式且大小不超过200kb的图片)</div>}>
+      <Tooltip placement="right" title={<div>点击头像更换 (只支持jpg、png格式且大小不超过200kb的图片)</div>}>
        <div>
          <Upload
            className="avatar-uploader"
--- a/client/containers/User/index.scss
+++ b/client/containers/User/index.scss
@ -76,6 +76,11 @@
      padding: 32px;
      position: relative;
      // box-shadow: 0 4px 6px rgba(50, 50, 93, 0.3), 0 1px 3px rgba(0, 0, 0, 0.01);
+      h3{
+        font-size: 20px;
+        font-weight: 500;
+        margin-bottom: 16px;
+      }
      .user-item-mask-top{
        position: absolute;
        top: 0px;
@ -102,7 +107,7 @@
        padding: 8px 0px;
        
        .maoboli{
-          background-color: rgba(225,225,225,0.16);
+          // background-color: rgba(225,225,225,0.16);
          position: absolute;
          width: 100%;
          height: 100%;
@ -118,8 +123,6 @@
      line-height:35px;
      margin: 5px;
      margin-left: 0px;
-      margin-bottom: 16px;
-      padding-bottom: 16px;
      font-size: 14px;
      #old_password,#password,#verify_pass{
        margin-top: 20px;
@ -134,11 +137,13 @@
        }
      }
      .ant-col-4{
-        color: rgba(0,0,0,0.66);
+        color: rgba(71, 86, 99, .8);
+        font-weight: 500;
        padding: 0px 16px;
        text-indent: .7em;
        margin-right: 30px;
        white-space: nowrap;
+        text-align: right;
      }
      .text{
        padding-right: 15px;
@ -175,7 +180,6 @@
    overflow: hidden;
    height: 100px;
    background-color: white;
-    margin: 0px auto;
    box-shadow: 0 4px 6px rgba(50, 50, 93, 0.31), 0 1px 3px rgba(0, 0, 0, 0.08);
    img{
      width: 100%;
@ -191,57 +195,18 @@
  }
  .avatar-box{
    width: 100px;
-    margin: 0px auto;
    position: relative;
+    // margin-left: 160px;
  }
  .avatarCon{
-    background: gray;
+    // background: gray;
    padding: 16px 0px;
-    margin-bottom: 16px;
    width: 100%;
    overflow: hidden;
    position: relative;
    
  }
-  .m-bg {
-      position: absolute;
-      left: 0;
-      top: -300px;
-      height: 1200px;
-      width: 100%;
-      transform: skewY(-11deg);
-      background-image: linear-gradient(-20deg, #21d4fd 0%, #b721ff 100%);
-      .m-bg-mask {
-        position: absolute;
-        height: 180px;
-      }
-      .m-bg-mask0 {
-        bottom: 0;
-        left: 0;
-        width: 30%;
-        background-image: linear-gradient(120deg, #6ab3fd 0%, #8ba3fd 102%);
-      }
-      .m-bg-mask1 {
-        bottom: 180px;
-        right: 0;
-        width: 36%;
-        background-image: linear-gradient(120deg, #28c5f5 0%, #6682fe 100%);
-      }
-      .m-bg-mask2 {
-        bottom: 540px;
-        left: 0;
-        width: 20%;
-        height: 240px;
-        background-image: linear-gradient(120deg, #8121ff 0%, #5e5ef7 100%);
-      }
-      .m-bg-mask3 {
-        bottom: 540px;
-        left: 20%;
-        width: 70%;
-        height: 240px;
-        background-image: linear-gradient(-225deg, #5f2bff 0%, #6088fe 48%, #22ccf6 100%);
-      }
-    }
+  
  .avatar-uploader-trigger {
    display: table-cell;
    vertical-align: middle;
--- a/client/styles/mixin.scss
+++ b/client/styles/mixin.scss
@ -4,7 +4,7 @@ $color-blue : #108ee9;
 $color-blue-deeper: #34495E;
 $color-grey-deep : #929aac;
 $color-black-light : #404040;
-$color-bg-dark: #273848;            // 背景色 - 深蓝
+$color-bg-dark: #202d3a;            // 背景色 - 深蓝

@mixin row-width-limit {
  max-width: 12.2rem;
--- a/client/styles/theme.less
+++ b/client/styles/theme.less
@ -295,9 +295,6 @@
@card-head-height: 48px;
@card-head-color: @heading-color;
@card-head-background: @component-background;
-.ant-card-wider-padding .ant-card-body {
-    padding: 0;
-}

 // Tabs
 // ---
--- a/server_dist/app.js
+++ b/server_dist/app.js
@ -72,7 +72,7 @@ app.use(compress({
 }));

 app.use(function () {
-    var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx, next) {
+    var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) {
        return _regenerator2.default.wrap(function _callee$(_context) {
            while (1) {
                switch (_context.prev = _context.next) {
--- a/server_dist/controllers/base.js
+++ b/server_dist/controllers/base.js
@ -59,7 +59,7 @@ var baseController = function () {
    (0, _createClass3.default)(baseController, [{
        key: 'init',
        value: function () {
-            var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
+            var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) {
                var ignoreRouter;
                return _regenerator2.default.wrap(function _callee$(_context) {
                    while (1) {
@ -103,7 +103,7 @@ var baseController = function () {
    }, {
        key: 'checkLogin',
        value: function () {
-            var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) {
+            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) {
                var token, uid, userInst, result, decoded;
                return _regenerator2.default.wrap(function _callee2$(_context2) {
                    while (1) {
@ -170,7 +170,7 @@ var baseController = function () {
    }, {
        key: 'getLoginStatus',
        value: function () {
-            var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) {
+            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) {
                var result;
                return _regenerator2.default.wrap(function _callee3$(_context3) {
                    while (1) {
@ -222,7 +222,7 @@ var baseController = function () {
    }, {
        key: 'getProjectRole',
        value: function () {
-            var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(id, type) {
+            var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(id, type) {
                var _this = this;

                var result, interfaceInst, interfaceData, projectInst, projectData, memberData, groupInst, groupData, groupMemberData;
@ -379,7 +379,7 @@ var baseController = function () {
    }, {
        key: 'checkAuth',
        value: function () {
-            var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(id, type, action) {
+            var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(id, type, action) {
                var role;
                return _regenerator2.default.wrap(function _callee5$(_context5) {
                    while (1) {
--- a/server_dist/controllers/follow.js
+++ b/server_dist/controllers/follow.js
@ -74,7 +74,7 @@ var followController = function (_baseController) {
    (0, _createClass3.default)(followController, [{
        key: 'list',
        value: function () {
-            var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
+            var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) {
                var uid, page, limit, result;
                return _regenerator2.default.wrap(function _callee$(_context) {
                    while (1) {
@ -139,7 +139,7 @@ var followController = function (_baseController) {
    }, {
        key: 'del',
        value: function () {
-            var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) {
+            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) {
                var params, uid, checkRepeat, result;
                return _regenerator2.default.wrap(function _callee2$(_context2) {
                    while (1) {
@ -217,7 +217,7 @@ var followController = function (_baseController) {
    }, {
        key: 'add',
        value: function () {
-            var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(ctx) {
+            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) {
                var params, uid, checkRepeat, project, data, result;
                return _regenerator2.default.wrap(function _callee3$(_context3) {
                    while (1) {
--- a/server_dist/controllers/group.js
+++ b/server_dist/controllers/group.js
@ -88,7 +88,7 @@ var groupController = function (_baseController) {
    (0, _createClass3.default)(groupController, [{
        key: 'get',
        value: function () {
-            var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
+            var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) {
                var params, groupInst, result;
                return _regenerator2.default.wrap(function _callee$(_context) {
                    while (1) {
@ -160,7 +160,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'add',
        value: function () {
-            var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) {
+            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx) {
                var params, groupUserdata, groupInst, checkRepeat, data, result;
                return _regenerator2.default.wrap(function _callee2$(_context2) {
                    while (1) {
@ -272,7 +272,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'getUserdata',
        value: function () {
-            var _ref3 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3(uid, role) {
+            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(uid, role) {
                var userInst, userData;
                return _regenerator2.default.wrap(function _callee3$(_context3) {
                    while (1) {
@ -333,7 +333,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'addMember',
        value: function () {
-            var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(ctx) {
+            var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx) {
                var params, groupInst, check, groupUserdata, result;
                return _regenerator2.default.wrap(function _callee4$(_context4) {
                    while (1) {
@ -446,7 +446,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'changeMemberRole',
        value: function () {
-            var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee5(ctx) {
+            var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx) {
                var params, groupInst, check, result;
                return _regenerator2.default.wrap(function _callee5$(_context5) {
                    while (1) {
@ -547,7 +547,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'getMemberList',
        value: function () {
-            var _ref6 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee6(ctx) {
+            var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx) {
                var params, groupInst, group;
                return _regenerator2.default.wrap(function _callee6$(_context6) {
                    while (1) {
@ -611,7 +611,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'delMember',
        value: function () {
-            var _ref7 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee7(ctx) {
+            var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx) {
                var params, groupInst, check, result;
                return _regenerator2.default.wrap(function _callee7$(_context7) {
                    while (1) {
@ -709,7 +709,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'list',
        value: function () {
-            var _ref8 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee8(ctx) {
+            var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx) {
                var groupInst, result;
                return _regenerator2.default.wrap(function _callee8$(_context8) {
                    while (1) {
@ -762,7 +762,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'del',
        value: function () {
-            var _ref9 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee10(ctx) {
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx) {
                var _this2 = this;

                var groupInst, projectInst, interfaceInst, interfaceColInst, interfaceCaseInst, _id, projectList, result;
@ -802,7 +802,7 @@ var groupController = function (_baseController) {
                                projectList = _context10.sent;

                                projectList.forEach(function () {
-                                    var _ref10 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee9(p) {
+                                    var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(p) {
                                        return _regenerator2.default.wrap(function _callee9$(_context9) {
                                            while (1) {
                                                switch (_context9.prev = _context9.next) {
@ -881,7 +881,7 @@ var groupController = function (_baseController) {
    }, {
        key: 'up',
        value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee11(ctx) {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(ctx) {
                var groupInst, _id2, data, result;

                return _regenerator2.default.wrap(function _callee11$(_context11) {
--- a/server_dist/controllers/log.js
+++ b/server_dist/controllers/log.js
@ -75,7 +75,7 @@ var logController = function (_baseController) {
    (0, _createClass3.default)(logController, [{
        key: 'list',
        value: function () {
-            var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
+            var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) {
                var typeid, page, limit, type, result, count;
                return _regenerator2.default.wrap(function _callee$(_context) {
                    while (1) {
--- a/server_dist/middleware/mockServer.js
+++ b/server_dist/middleware/mockServer.js
@ -47,7 +47,7 @@ function matchApi(apiPath, apiRule) {
 }

 module.exports = function () {
-    var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx, next) {
+    var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) {
        var hostname, config, path, paths, projectId, projectInst, project, interfaceData, newData, newpath, interfaceInst, _newData, findInterface, res;

        return _regenerator2.default.wrap(function _callee$(_context) {
--- a/server_dist/websocket.js
+++ b/server_dist/websocket.js
@ -26,7 +26,7 @@ function websocket(app) {
    return next(ctx);
  });
  router.get('/api/interface/solve_conflict', function () {
-    var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
+    var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx) {
      var inst;
      return _regenerator2.default.wrap(function _callee$(_context) {
        while (1) {