fix: 私有项目有权限查看的bug

2024-12-21 05:19:42 +08:00 · 2017-09-14 18:14:48 +08:00 · 2017-09-14 18:14:48 +08:00 · f2f0d98ce5
commit f2f0d98ce5
parent 93ae9cabd5
8 changed files with 215 additions and 139 deletions
--- a/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
+++ b/client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js
@ -52,8 +52,11 @@ export default class InterfaceColContent extends Component {
                result.payload.data.data.find(item => +item._id === +currColId) && +currColId ||
                result.payload.data.data[0]._id;
    this.props.history.push('/project/' + params.id + '/interface/col/' + currColId)
-    this.props.fetchCaseList(currColId);
-    this.props.setColData({currColId: +currColId, isShowCol: true})
+    if(currColId && currColId != 0){
+      this.props.fetchCaseList(currColId);
+      this.props.setColData({currColId: +currColId, isShowCol: true})
+    }
+    
  }

  componentWillReceiveProps(nextProps) {
@ -63,8 +66,11 @@ export default class InterfaceColContent extends Component {
    if (!interfaceColList.find(item => +item._id === +newColId)) {
      this.props.history.push('/project/' + id + '/interface/col/' + interfaceColList[0]._id)
    } else if (oldColId !== newColId) {
-      this.props.fetchCaseList(newColId);
-      this.props.setColData({currColId: +newColId, isShowCol: true})
+      if(newColId && newColId != 0){
+        this.props.fetchCaseList(newColId);
+        this.props.setColData({currColId: +newColId, isShowCol: true})
+      }
+      
    }
  }

--- a/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
+++ b/client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js
@ -4,13 +4,15 @@ import _ from 'underscore'
 import constants from '../../../../constants/variable.js'
 import { handlePath, nameLengthLimit } from '../../../../common.js'
 import json5 from 'json5'
-import {message} from 'antd'
+import { message, Tabs } from 'antd'
+import Editor from  'wangeditor'
+const TabPane = Tabs.TabPane;

-const validJson = (json)=>{
-  try{
+const validJson = (json) => {
+  try {
    json5.parse(json);
    return true;
-  }catch(e){
+  } catch (e) {
    return false;
  }
 }
@ -90,34 +92,33 @@ class InterfaceEditForm extends Component {
      res_body: '',
      desc: '',
      res_body_mock: '',
+      jsonType: 'tpl',
      mockUrl: this.props.mockUrl
    }, curdata)
  }

  handleSubmit = (e) => {
    e.preventDefault();
-
    this.props.form.validateFields((err, values) => {
-      if (!err) {
+      if (!err) {        
+        values.desc = this.editor.txt.html();
        if (values.res_body_type === 'json') {
-          if(this.state.res_body && validJson(this.state.res_body) === false){
+          if (this.state.res_body && validJson(this.state.res_body) === false) {
            return message.error('返回body json格式有问题，请检查！')
          }
          values.res_body = this.state.res_body;
        }
        if (values.req_body_type === 'json') {
-          if(this.state.req_body_other && validJson(this.state.req_body_other) === false){
+          if (this.state.req_body_other && validJson(this.state.req_body_other) === false) {
            return message.error('响应Body json格式有问题，请检查！');
          }
          values.req_body_other = this.state.req_body_other;
        }

-
-
        values.method = this.state.method;
        values.req_params = values.req_params || [];
        let isfile = false, isHavaContentType = false;
-        if (values.req_body_type === 'form') {
+        if (values.req_body_type === 'form') {          
          values.req_body_form.forEach((item) => {
            if (item.type === 'file') {
              isfile = true;
@ -179,7 +180,7 @@ class InterfaceEditForm extends Component {
      container: 'res_body_json',
      data: that.state.res_body,
      onChange: function (d) {
-        if (d.format === true){
+        if (d.format === true) {
          mockPreview.editor.setValue(d.mockText)
        }
        that.setState({
@ -194,6 +195,9 @@ class InterfaceEditForm extends Component {
      data: resBodyEditor.curData.mockText,
      readOnly: true
    })
+
+    let editor = this.editor = new Editor('#desc');
+    editor.create();
  }

  addParams = (name, data) => {
@ -214,6 +218,13 @@ class InterfaceEditForm extends Component {
    this.setState(newValue)
  }

+  handleJsonType = (key)=>{
+    key = key || 'tpl';
+    this.setState({
+      jsonType: key
+    })
+  }
+
  handlePath = (e) => {
    let val = e.target.value, queue = [];
    val = handlePath(val)
@ -481,16 +492,6 @@ class InterfaceEditForm extends Component {
          )}
        </FormItem>

-        <FormItem
-          className="interface-edit-item"
-          {...formItemLayout}
-          label="接口描述"
-        >
-          {getFieldDecorator('desc', { initialValue: this.state.desc })(
-            <Input.TextArea placeholder="接口描述" />
-          )}
-        </FormItem>
-
        <FormItem
          className="interface-edit-item"
          {...formItemLayout}
@ -606,35 +607,28 @@ class InterfaceEditForm extends Component {
            )}

        </FormItem>
-        <Row className="interface-edit-item" style={{ display: this.props.form.getFieldValue('res_body_type') === 'json' ? 'block' : 'none' }}>

-          <Col span={17} offset={4} >
-            <h3>基于mockjs和json5,可直接写mock模板和注释,具体使用方法请查看文档</h3>
-            <div id="res_body_json" style={{ minHeight: "300px" }}  ></div>
+
+        <Row className="interface-edit-item" style={{ display: this.props.form.getFieldValue('res_body_type') === 'json' ? 'block' : 'none' }}>
+          <Col span={18} offset={4} >
+            <Tabs defaultActiveKey="tpl" onChange={this.handleJsonType} >
+              <TabPane tab="模板" key="tpl">
+
+              </TabPane>
+              <TabPane tab="预览" key="preview">
+
+              </TabPane>
+
+            </Tabs>
+            <div>
+              <h3 style={{padding: '10px 0'}}>基于mockjs和json5,可直接写mock模板和注释,具体使用方法请查看文档</h3>
+              <div  id="res_body_json" style={{ minHeight: "300px", display: this.state.jsonType === 'tpl'? 'block': 'none' }}  ></div>
+              <div id="mock-preview" style={{ backgroundColor: "#eee", lineHeight: "20px", minHeight: "300px", display: this.state.jsonType === 'preview'? 'block': 'none' }}></div>
+            </div>
+
          </Col>
        </Row>

-        <FormItem
-          style={{ display: this.props.form.getFieldValue('res_body_type') === 'json' ? 'block' : 'none' }}
-          className="interface-edit-item"
-          {...formItemLayout}
-          label="mock地址"
-        >
-          <Input disabled onChange={() => { }} value={this.state.mockUrl} />
-        </FormItem>
-
-        <FormItem
-          style={{ display: this.props.form.getFieldValue('res_body_type') === 'json' ? 'block' : 'none' }}
-          className="interface-edit-item"
-          {...formItemLayout}
-          label="预览"
-        >
-          <div id="mock-preview" style={{ backgroundColor: "#eee", lineHeight: "20px", minHeight: "300px" }}>
-
-          </div>
-        </FormItem>
-
-
        <Row className="interface-edit-item" style={{ display: this.props.form.getFieldValue('res_body_type') === 'raw' ? 'block' : 'none' }}>
          <Col span={18} offset={4} >
            {getFieldDecorator('res_body', { initialValue: this.state.res_body })(
@ -645,12 +639,27 @@ class InterfaceEditForm extends Component {

        </Row>

+
+        <FormItem
+          className="interface-edit-item"
+          {...formItemLayout}
+          label="备注"
+        >
+          <div id="desc" ></div>
+          {/* {getFieldDecorator('desc', { initialValue: this.state.desc })(
+            <Input.TextArea style={{minHeight: '200px'}} placeholder="接口备注信息" />
+          )} */}
+        </FormItem>
+
+
+       
+
        <FormItem
          className="interface-edit-item"
          {...formItemLayout}
          label="是否开启邮件通知"
        >
-          {getFieldDecorator('switch_notice', { valuePropName: 'checked', initialValue: false })(
+          {getFieldDecorator('switch_notice', { valuePropName: 'checked', initialValue: true })(
            <Switch checkedChildren="开" unCheckedChildren="关" />
          )}
        </FormItem>
--- a/client/containers/Project/Interface/InterfaceList/View.js
+++ b/client/containers/Project/Interface/InterfaceList/View.js
@ -278,8 +278,8 @@ class View extends Component {
        <span className="colValue">{location.protocol + '//' + location.hostname + (location.port !== "" ? ":" + location.port : "") + `/mock/${this.props.currProject._id}${this.props.currProject.basepath}${this.props.curData.path}`}</span>
      </div>
      {this.props.curData.desc?<div className="colDesc">
-        <span className="colKey">接口描述：</span>
-        <span className="colValue">{this.props.curData.desc}</span>
+        <span className="colKey">接口备注：</span>
+        <span className="colValue" dangerouslySetInnerHTML={{__html: this.props.curData.desc}}></span>
      </div>:""}
      {req_dataSource.length?<div className="colHeader">
        <span className="colKey">路径参数：</span>
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@ -240,7 +240,7 @@
    },
    "are-we-there-yet": {
      "version": "1.1.4",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
      "requires": {
        "delegates": "1.0.0",
@ -428,7 +428,7 @@
    },
    "async-foreach": {
      "version": "0.1.3",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/async-foreach/-/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
    },
    "async-validator": {
@ -1664,7 +1664,7 @@
    },
    "block-stream": {
      "version": "0.0.9",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/block-stream/-/block-stream-0.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
      "requires": {
        "inherits": "2.0.3"
@ -2168,7 +2168,7 @@
    },
    "cli-source-preview": {
      "version": "1.1.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/cli-source-preview/-/cli-source-preview-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/cli-source-preview/-/cli-source-preview-1.1.0.tgz",
      "integrity": "sha1-BTA6sSeakJPq0aODez7iMfMAZUQ=",
      "requires": {
        "chalk": "1.1.3"
@ -2176,7 +2176,7 @@
      "dependencies": {
        "chalk": {
          "version": "1.1.3",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
          "requires": {
            "ansi-styles": "2.2.1",
@ -2492,7 +2492,7 @@
    },
    "console-control-strings": {
      "version": "1.1.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
    "consolidate": {
@ -2707,7 +2707,7 @@
    },
    "cross-spawn": {
      "version": "3.0.1",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/cross-spawn/-/cross-spawn-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
      "requires": {
        "lru-cache": "4.1.1",
@ -4495,7 +4495,7 @@
    },
    "fs-promise": {
      "version": "0.5.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/fs-promise/-/fs-promise-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.5.0.tgz",
      "integrity": "sha1-Q0fWv2JGVacGGkMZITw5MnatPvM=",
      "requires": {
        "any-promise": "1.3.0",
@ -4506,7 +4506,7 @@
      "dependencies": {
        "fs-extra": {
          "version": "0.26.7",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/fs-extra/-/fs-extra-0.26.7.tgz",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
          "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
          "requires": {
            "graceful-fs": "4.1.11",
@ -5296,14 +5296,6 @@
            }
          }
        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
        "string-width": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@ -5314,6 +5306,14 @@
            "strip-ansi": "3.0.1"
          }
        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
        "stringstream": {
          "version": "0.0.5",
          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@ -5428,7 +5428,7 @@
    },
    "fstream": {
      "version": "1.0.11",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/fstream/-/fstream-1.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
      "requires": {
        "graceful-fs": "4.1.11",
@ -5444,7 +5444,7 @@
    },
    "gauge": {
      "version": "2.7.4",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/gauge/-/gauge-2.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
      "requires": {
        "aproba": "1.1.2",
@ -6111,7 +6111,7 @@
    },
    "has-unicode": {
      "version": "2.0.1",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/has-unicode/-/has-unicode-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
    },
    "hash-base": {
@ -6464,7 +6464,7 @@
    },
    "in-publish": {
      "version": "2.0.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/in-publish/-/in-publish-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
    },
    "indent-string": {
@ -8190,7 +8190,7 @@
    },
    "lodash.clonedeep": {
      "version": "4.5.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
    },
    "lodash.cond": {
@ -8312,7 +8312,7 @@
    },
    "lodash.mergewith": {
      "version": "4.6.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU="
    },
    "lodash.once": {
@ -8948,7 +8948,7 @@
    },
    "node-gyp": {
      "version": "3.6.2",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/node-gyp/-/node-gyp-3.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
      "requires": {
        "fstream": "1.0.11",
@ -8968,7 +8968,7 @@
      "dependencies": {
        "semver": {
          "version": "5.3.0",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
        }
      }
@ -9028,7 +9028,7 @@
    },
    "node-sass-china": {
      "version": "4.5.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/node-sass-china/-/node-sass-china-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/node-sass-china/-/node-sass-china-4.5.0.tgz",
      "integrity": "sha1-YnbBcNzqWBz14lwC/sqjUPcyx1Q=",
      "requires": {
        "async-foreach": "0.1.3",
@ -9053,7 +9053,7 @@
      "dependencies": {
        "chalk": {
          "version": "1.1.3",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
          "requires": {
            "ansi-styles": "2.2.1",
@ -9065,7 +9065,7 @@
        },
        "gaze": {
          "version": "1.1.2",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/gaze/-/gaze-1.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
          "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
          "requires": {
            "globule": "1.2.0"
@ -9073,7 +9073,7 @@
        },
        "globule": {
          "version": "1.2.0",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/globule/-/globule-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
          "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
          "requires": {
            "glob": "7.1.2",
@ -9083,7 +9083,7 @@
        },
        "lodash.assign": {
          "version": "4.2.0",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/lodash.assign/-/lodash.assign-4.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
          "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
        }
      }
@ -9240,7 +9240,7 @@
    },
    "nopt": {
      "version": "3.0.6",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/nopt/-/nopt-3.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
      "requires": {
        "abbrev": "1.1.0"
@ -12588,22 +12588,6 @@
        }
      }
    },
-    "require_optional": {
-      "version": "1.0.1",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/require_optional/-/require_optional-1.0.1.tgz",
-      "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=",
-      "requires": {
-        "resolve-from": "2.0.0",
-        "semver": "5.4.1"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "2.0.0",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/resolve-from/-/resolve-from-2.0.0.tgz",
-          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
-        }
-      }
-    },
    "require-directory": {
      "version": "2.1.1",
      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/require-directory/-/require-directory-2.1.1.tgz",
@ -12628,6 +12612,22 @@
        "resolve-from": "1.0.1"
      }
    },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=",
+      "requires": {
+        "resolve-from": "2.0.0",
+        "semver": "5.4.1"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "2.0.0",
+          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/resolve-from/-/resolve-from-2.0.0.tgz",
+          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
+        }
+      }
+    },
    "requires-port": {
      "version": "1.0.0",
      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/requires-port/-/requires-port-1.0.0.tgz",
@ -12785,7 +12785,7 @@
    },
    "sass-graph": {
      "version": "2.2.4",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/sass-graph/-/sass-graph-2.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
      "requires": {
        "glob": "7.1.2",
@ -12827,7 +12827,7 @@
    },
    "scss-tokenizer": {
      "version": "0.2.3",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
      "requires": {
        "js-base64": "2.1.9",
@ -12836,7 +12836,7 @@
      "dependencies": {
        "source-map": {
          "version": "0.4.4",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
          "requires": {
            "amdefine": "1.0.1"
@ -13244,7 +13244,7 @@
    },
    "stdout-stream": {
      "version": "1.4.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
      "requires": {
        "readable-stream": "2.3.3"
@ -13301,14 +13301,6 @@
      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
    "string-convert": {
      "version": "0.2.1",
      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/string-convert/-/string-convert-0.2.1.tgz",
@ -13395,6 +13387,14 @@
        "strip-ansi": "3.0.1"
      }
    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
    "stringstream": {
      "version": "0.0.5",
      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/stringstream/-/stringstream-0.0.5.tgz",
@ -13651,7 +13651,7 @@
    },
    "tar": {
      "version": "2.2.1",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/tar/-/tar-2.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
      "requires": {
        "block-stream": "0.0.9",
@ -14436,6 +14436,11 @@
        "makeerror": "1.0.11"
      }
    },
+    "wangeditor": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/wangeditor/-/wangeditor-3.0.8.tgz",
+      "integrity": "sha1-qm5FetXmDiFbwuYE7uIB2TFdAXY="
+    },
    "warning": {
      "version": "3.0.0",
      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/warning/-/warning-3.0.0.tgz",
@ -14674,7 +14679,7 @@
    },
    "webpack-dev-middleware": {
      "version": "1.12.0",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
      "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
      "requires": {
        "memory-fs": "0.4.1",
@ -14686,7 +14691,7 @@
      "dependencies": {
        "time-stamp": {
          "version": "2.0.0",
-          "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/time-stamp/-/time-stamp-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz",
          "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c="
        }
      }
@ -15210,7 +15215,7 @@
    },
    "ykit-config-antd": {
      "version": "0.1.3",
-      "resolved": "https://repo.corp.qunar.com/artifactory/api/npm/npm-qunar/ykit-config-antd/-/ykit-config-antd-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/ykit-config-antd/-/ykit-config-antd-0.1.3.tgz",
      "integrity": "sha1-qUWmV0EHgAd0OrPgz3eBbD9KPN4=",
      "requires": {
        "antd": "2.12.8",
--- a/package.json
+++ b/package.json
@ -93,6 +93,7 @@
    "universal-cookie": "^2.0.8",
    "url": "^0.11.0",
    "validate-commit-msg": "^2.12.2",
+    "wangeditor": "^3.0.8",
    "webpack": "^3.5.5",
    "webpack-dev-middleware": "^1.12.0",
    "ykit-config-antd": "^0.1.3",
--- a/server/controllers/interface.js
+++ b/server/controllers/interface.js
@ -82,16 +82,16 @@ class interfaceController extends baseController {
        if (!yapi.commons.verifyPath(http_path.pathname)) {
            return ctx.body = yapi.commons.resReturn(null, 400, '接口path第一位必须是/，最后一位不能为/');
        }
-        
-        if(!params.req_query){
+
+        if (!params.req_query) {
            params.req_query = [];
-            Object.keys(http_path.query).forEach((item)=>{
+            Object.keys(http_path.query).forEach((item) => {
                params.req_query.push({
                    name: item
                })
            })
        }
-        
+

        let checkRepeat = await this.Model.checkRepeat(params.project_id, params.path, params.method);

@ -191,13 +191,19 @@ class interfaceController extends baseController {
     */
    async get(ctx) {
        let params = ctx.request.query;
-
        if (!params.id) {
            return ctx.body = yapi.commons.resReturn(null, 400, '接口id不能为空');
        }

+
        try {
            let result = await this.Model.get(params.id);
+            let project = await this.projectModel.getBaseInfo(result.project_id);
+            if (project.project_type === 'private') {
+                if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                    return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+                }
+            }
            ctx.body = yapi.commons.resReturn(result);
        } catch (e) {
            ctx.body = yapi.commons.resReturn(null, 402, e.message);
@ -216,7 +222,12 @@ class interfaceController extends baseController {
     */
    async list(ctx) {
        let project_id = ctx.request.query.project_id;
-
+        let project = await this.projectModel.getBaseInfo(project_id);
+        if (project.project_type === 'private') {
+            if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+            }
+        }
        if (!project_id) {
            return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
        }
@ -235,7 +246,15 @@ class interfaceController extends baseController {
            return ctx.body = yapi.commons.resReturn(null, 400, 'catid不能为空');
        }
        try {
+            let catdata = await this.catModel.get(catid);
+            let project = await this.projectModel.getBaseInfo(catdata.project_id);
+            if (project.project_type === 'private') {
+                if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                    return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+                }
+            }
            let result = await this.Model.listByCatid(catid)
+
            ctx.body = yapi.commons.resReturn(result);
        } catch (err) {
            ctx.body = yapi.commons.resReturn(null, 402, err.message);
@ -248,6 +267,14 @@ class interfaceController extends baseController {
        if (!project_id) {
            return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
        }
+
+        let project = await this.projectModel.getBaseInfo(project_id);
+        if (project.project_type === 'private') {
+            if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+            }
+        }
+
        try {
            let result = await this.catModel.list(project_id), newResult = [];
            for (let i = 0, item, list; i < result.length; i++) {
@ -626,26 +653,32 @@ class interfaceController extends baseController {
    }


-        /**
-     * 获取分类列表
-     * @interface /interface/getCatMenu
-     * @method GET
-     * @category interface
-     * @foldnumber 10
-     * @param {Number}   project_id 项目id，不能为空
-     * @returns {Object}
-     * @example ./api/interface/getCatMenu
-     */
+    /**
+ * 获取分类列表
+ * @interface /interface/getCatMenu
+ * @method GET
+ * @category interface
+ * @foldnumber 10
+ * @param {Number}   project_id 项目id，不能为空
+ * @returns {Object}
+ * @example ./api/interface/getCatMenu
+ */

    async getCatMenu(ctx) {
        let project_id = ctx.request.query.project_id;
-        if(!project_id){
+        if (!project_id) {
            return ctx.body = yapi.commons.resReturn(null, 400, '项目id不能为空');
        }
-        try{
+        let project = await this.projectModel.getBaseInfo(project_id);
+        if (project.project_type === 'private') {
+            if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+            }
+        }
+        try {
            let res = await this.catModel.list(project_id);
            return ctx.body = yapi.commons.resReturn(res);
-        }catch(e){
+        } catch (e) {
            yapi.commons.resReturn(null, 400, e.message);
        }
    }
--- a/server/controllers/interfaceCol.js
+++ b/server/controllers/interfaceCol.js
@ -27,6 +27,12 @@ class interfaceColController extends baseController{
    async list(ctx){
        try {
            let id = ctx.query.project_id;
+            let project = await this.projectModel.getBaseInfo(id);
+            if (project.project_type === 'private') {
+                if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                    return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+                }
+            }
            let result = await this.colModel.list(id);

            for(let i=0; i< result.length;i++){
@ -110,8 +116,19 @@ class interfaceColController extends baseController{
    async getCaseList(ctx){
        try {
            let id = ctx.query.col_id;
-            let inst = yapi.getInst(interfaceCaseModel);
-            let result = await inst.list(id, 'all');
+            if(!id || id == 0){
+                return ctx.body = yapi.commons.resReturn(null, 407, 'col_id不能为空')
+            }
+            let result = await this.caseModel.list(id, 'all');
+            let colData = await this.colModel.get(id);            
+            let project = await this.projectModel.getBaseInfo(colData.project_id);
+            
+            if (project.project_type === 'private') {
+                if (await this.checkAuth(project._id, 'project', 'edit') !== true) {
+                    return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+                }
+            }
+
            for(let index=0; index< result.length; index++){

                result[index] = result[index].toObject();
@ -120,7 +137,7 @@ class interfaceColController extends baseController{
                    await this.caseModel.del(result[index]._id);
                    result[index] = undefined;
                    continue;
-                }
+                }                
                let projectData = await this.projectModel.getBaseInfo(interfaceData.project_id);
                result[index].path = projectData.basepath +  interfaceData.path;
                result[index].method = interfaceData.method;
--- a/server/controllers/project.js
+++ b/server/controllers/project.js
@ -308,6 +308,11 @@ class projectController extends baseController {
            if (!result) {
                return ctx.body = yapi.commons.resReturn(null, 400, '不存在的项目');
            }
+            if (result.project_type === 'private') {
+                if (await this.checkAuth(result._id, 'project', 'edit') !== true) {
+                    return ctx.body = yapi.commons.resReturn(null, 406, '没有权限');
+                }
+            }
            result = result.toObject();
            let catInst = yapi.getInst(interfaceCatModel);
            let cat = await catInst.list(params.id);