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

client/containers/AddInterface/AddInterface.js

@@ -254,9 +254,6 @@ class AddInterface extends Component {
               <Result isSave={isSave} mockJson={mockJson} />
               <MockUrl mockURL={mockURL} />
             </TabPane>
-            {
-            // <TabPane tab="Mock" key="2">mock</TabPane>
-            }
             <TabPane tab="请求接口" key="3">
               <InterfaceTest />
             </TabPane>

client/containers/Interface/InterfaceTable/InterfaceTable.js

@@ -65,10 +65,14 @@ class InterfaceTable extends Component {
       title: '接口名称',
       dataIndex: 'title',
       key: 'title'
-    }, {
+    },{
       title: '接口URL',
       dataIndex: 'path',
       key: 'path'
+    },{
+      title: '请求方式',
+      dataIndex: 'method',
+      key: 'method'
     },{
       title: '更新日期',
       dataIndex: 'add_time',

server/controllers/interface.js

@@ -38,6 +38,7 @@ class interfaceController extends baseController{
     async add(ctx){
         let params = ctx.request.body;
         params = yapi.commons.handleParams(params, {
+            project_id: 'number',
             title: 'string',
             path: 'string',
             method: 'string',
@@ -57,8 +58,9 @@ class interfaceController extends baseController{
         if(!yapi.commons.verifyPath(params.path)){
             return ctx.body = yapi.commons.resReturn(null, 400, '接口path第一位必须是/，最后一位不能为/')
         }
+        
+        let checkRepeat = await this.Model.checkRepeat(params.project_id, params.path, params.method);
 
-        let checkRepeat = await this.Model.checkRepeat(params.path, params.method);
         if(checkRepeat > 0){
             return ctx.body =  yapi.commons.resReturn(null, 401, '已存在的接口:' + params.path + '[' + params.method + ']');
         }       
@@ -184,7 +186,7 @@ class interfaceController extends baseController{
         }
         
         if(params.path && params.path !== interfaceData.path  && params.method !== interfaceData.method){
-            let checkRepeat = await this.Model.checkRepeat(params.path, params.method);
+            let checkRepeat = await this.Model.checkRepeat(interfaceData.project_id,params.path, params.method);
             if(checkRepeat > 0){
                 return ctx.body =  yapi.commons.resReturn(null, 401, '已存在的接口:' + params.path + '[' + params.method + ']');
             }

server/models/interface.js

@@ -54,8 +54,9 @@ class interfaceModel extends baseModel{
         }).exec()
     }
 
-    checkRepeat(path, method){
+    checkRepeat(id, path, method){
         return this.model.count({
+            project_id: id,
             path: path,
             method: method
         })

server_dist/controllers/interface.js

@@ -95,6 +95,7 @@ var interfaceController = function (_baseController) {
                                 params = ctx.request.body;
 
                                 params = _yapi2.default.commons.handleParams(params, {
+                                    project_id: 'number',
                                     title: 'string',
                                     path: 'string',
                                     method: 'string',
@@ -129,7 +130,7 @@ var interfaceController = function (_baseController) {
 
                             case 11:
                                 _context.next = 13;
-                                return this.Model.checkRepeat(params.path, params.method);
+                                return this.Model.checkRepeat(params.project_id, params.path, params.method);
 
                             case 13:
                                 checkRepeat = _context.sent;
@@ -393,7 +394,7 @@ var interfaceController = function (_baseController) {
                                 }
 
                                 _context4.next = 15;
-                                return this.Model.checkRepeat(params.path, params.method);
+                                return this.Model.checkRepeat(interfaceData.project_id, params.path, params.method);
 
                             case 15:
                                 checkRepeat = _context4.sent;

server_dist/models/interface.js

@@ -96,8 +96,9 @@ var interfaceModel = function (_baseModel) {
         }
     }, {
         key: 'checkRepeat',
-        value: function checkRepeat(path, method) {
+        value: function checkRepeat(id, path, method) {
             return this.model.count({
+                project_id: id,
                 path: path,
                 method: method
             });