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

client/Application.js

@@ -36,15 +36,9 @@ export default class App extends Component {
     loginState: PropTypes.number
   };
 
-  // componentWillMount() {
-  //   if( !this.props.isAuthenticated ){
-  //     this.props.history.push('/');
-  //     this.props.changeMenuItem('/');
-  //   }
-  // }
 
   componentDidMount() {
-    message.warning('YApi平台正在公测，发布正式版会删除所有公测数据！', 5)
+    message.warning('YApi平台正在公测，发布正式版会删除所有公测数据！', 10)
     this.props.checkLoginState();
   }
 
@@ -66,10 +60,6 @@ export default class App extends Component {
                 <Route path="/follow" component={requireAuthentication(Follows)} />
                 <Route path="/add-project" component={requireAuthentication(AddProject)} />
                 <Route path="/login" component={Login} />
-                {
-                // <Route path="/news" component={requireAuthentication(News)} />
-                // <Route path="/add-interface" component={requireAuthentication(AddInterface)} />
-                }
               </div>
             </div>
             <Footer />

client/components/Postman/Postman.js

@@ -421,7 +421,7 @@ export default class Run extends Component {
             <Alert
               message={
                 <div>
-                  温馨提示：当前正在使用接口测试服务，请安装我们为您免费提供的测试增强插件&nbsp;
+                  温馨提示：当前正在使用接口测试服务，请安装我们为您免费提供的测试增强插件&nbsp;（该插件可支持任何 chrome 内核的浏览器）
                   <div>
                     <a
                       target="blank"
@@ -431,12 +431,13 @@ export default class Run extends Component {
                   <div>
                     <a
                       target="blank"
-                      href="/attachment/cross-request.crx"
-                    > [手动下载安装] </a>
+                      href="/attachment/cross-request.zip"
+                    > [手动下载] </a>
+                    <span> zip 文件解压后将 crx 文件拖入到 chrome://extensions/ </span>
                     <a
                       target="blank"
                       href="http://www.jianshu.com/p/12ca04c61fc6"
-                    > [安装教程] </a>
+                    > [详细安装教程] </a>
                   </div>
                 </div>
               }

client/containers/Project/Interface/InterfaceCol/InterfaceColContent.js

@@ -82,7 +82,7 @@ export default class InterfaceColContent extends Component {
       render: (path, record) => {
         return (
           <Tooltip title="跳转到对应接口">
-            <a href={`/project/2909/interface/api/${record.interface_id}`}>{path || 'fdsf'}</a>
+            <a href={`/project/${record.project_id}/interface/api/${record.interface_id}`}>{path || 'fdsf'}</a>
           </Tooltip>
         )
       }

server/controllers/interface.js

@@ -1,5 +1,7 @@
 import interfaceModel from '../models/interface.js';
 import interfaceCatModel from '../models/interfaceCat.js';
+import interfaceCaseModel from '../models/interfaceCase.js'
+
 import baseController from './base.js';
 import yapi from '../yapi.js';
 import userModel from '../models/user.js';
@@ -11,6 +13,7 @@ class interfaceController extends baseController {
         this.Model = yapi.getInst(interfaceModel);
         this.catModel = yapi.getInst(interfaceCatModel);
         this.projectModel = yapi.getInst(projectModel);
+        this.caseModel = yapi.getInst(interfaceCaseModel);
     }
 
     /**
@@ -404,7 +407,7 @@ class interfaceController extends baseController {
 
             let inter = await this.Model.get(id);
             let result = await this.Model.del(id);
-
+            await this.caseModel.delByInterfaceId(id);
             let username = this.getUsername();
             this.catModel.get(inter.catid).then((cate)=>{
                 yapi.commons.saveLog({

server/models/interfaceCase.js

@@ -75,6 +75,12 @@ class interfaceCase extends baseModel {
         })
     }
 
+    delByInterfaceId(id){
+        return this.model.deleteMany({
+            interface_id: id
+        })
+    }
+
     delByCol(id) {
         return this.model.deleteMany({
             col_id: id

server_dist/controllers/interface.js

@@ -40,6 +40,10 @@ var _interfaceCat = require('../models/interfaceCat.js');
 
 var _interfaceCat2 = _interopRequireDefault(_interfaceCat);
 
+var _interfaceCase = require('../models/interfaceCase.js');
+
+var _interfaceCase2 = _interopRequireDefault(_interfaceCase);
+
 var _base = require('./base.js');
 
 var _base2 = _interopRequireDefault(_base);
@@ -69,6 +73,7 @@ var interfaceController = function (_baseController) {
         _this.Model = _yapi2.default.getInst(_interface2.default);
         _this.catModel = _yapi2.default.getInst(_interfaceCat2.default);
         _this.projectModel = _yapi2.default.getInst(_project2.default);
+        _this.caseModel = _yapi2.default.getInst(_interfaceCase2.default);
         return _this;
     }
 
@@ -801,6 +806,10 @@ var interfaceController = function (_baseController) {
 
                             case 18:
                                 result = _context7.sent;
+                                _context7.next = 21;
+                                return this.caseModel.delByInterfaceId(id);
+
+                            case 21:
                                 username = this.getUsername();
 
                                 this.catModel.get(inter.catid).then(function (cate) {
@@ -814,21 +823,21 @@ var interfaceController = function (_baseController) {
                                 });
 
                                 ctx.body = _yapi2.default.commons.resReturn(result);
-                                _context7.next = 27;
+                                _context7.next = 29;
                                 break;
 
-                            case 24:
-                                _context7.prev = 24;
+                            case 26:
+                                _context7.prev = 26;
                                 _context7.t0 = _context7['catch'](0);
 
                                 ctx.body = _yapi2.default.commons.resReturn(null, 402, _context7.t0.message);
 
-                            case 27:
+                            case 29:
                             case 'end':
                                 return _context7.stop();
                         }
                     }
-                }, _callee7, this, [[0, 24]]);
+                }, _callee7, this, [[0, 26]]);
             }));
 
             function del(_x7) {

server_dist/models/interfaceCase.js

@@ -118,6 +118,13 @@ var interfaceCase = function (_baseModel) {
                 project_id: id
             });
         }
+    }, {
+        key: 'delByInterfaceId',
+        value: function delByInterfaceId(id) {
+            return this.model.deleteMany({
+                interface_id: id
+            });
+        }
     }, {
         key: 'delByCol',
         value: function delByCol(id) {