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

.gitignore

@@ -35,7 +35,7 @@ Thumbs.db
 
 node_modules/
 runtime/
-prd/
+./prd/
 plugins/
 dev/
 .tags

client/containers/Project/Interface/InterfaceList/InterfaceEditForm.js

@@ -555,7 +555,7 @@ class InterfaceEditForm extends Component {
                 })}
               </Select>
 
-              <Tooltip title="接口基本路径，可在 项目设置->环境配置 里修改" style={{ display: this.props.basepath == '' ? 'block' : 'none' }}>
+              <Tooltip title="接口基本路径，可在 项目设置 里修改" style={{ display: this.props.basepath == '' ? 'block' : 'none' }}>
                 <Input disabled value={this.props.basepath} readOnly onChange={() => { }} style={{ width: '25%' }} />
               </Tooltip>
               {getFieldDecorator('path', {

config_example.json

@@ -1,7 +1,5 @@
 {
   "port": "3000",
-  "webhost": "yapi.local.qunar.com",
-  "server_ip": "192.168.1.1",
   "adminAccount": "admin@admin.com",
   "db": {
     "servername": "127.0.0.1",

package.json

@@ -17,41 +17,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "assets-webpack-plugin": "^3.5.1",
     "axios": "^0.16.2",
-    "babel": "^6.5.2",
-    "babel-core": "^6.8.0",
-    "babel-eslint": "^7.2.3",
-    "babel-loader": "^6.2.4",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-object-rest-spread": "^6.8.0",
-    "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-preset-es2015": "^6.9.0",
-    "babel-preset-react": "^6.5.0",
-    "babel-preset-stage-3": "^6.24.1",
-    "babel-register": "^6.9.0",
-    "babel-runtime": "^6.9.2",
-    "buffer-shims": "^1.0.0",
     "chalk": "^2.0.1",
     "clipboard": "^1.7.1",
-    "copy-webpack-plugin": "^4.0.1",
-    "core-decorators": "^0.17.0",
-    "css-loader": "^0.28.4",
-    "eslint": "^3.19.0",
-    "eslint-loader": "^1.9.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-react": "^7.1.0",
-    "express": "^4.15.3",
-    "extract-text-webpack-plugin": "2.0.0",
-    "fast-sass-loader-china": "^1.2.5",
     "fs-extra": "^3.0.1",
-    "gulp": "^3.9.1",
-    "gulp-babel": "^6.1.2",
-    "gulp-watch": "^4.3.11",
     "happypack": "^4.0.0-beta.5",
-    "json2html": "0.0.8",
     "json5": "^0.5.1",
-    "jsoneditor": "^5.9.3",
     "jsonwebtoken": "^7.4.1",
     "koa": "^2.0.0",
     "koa-bodyparser": "^3.2.0",
@@ -63,18 +34,53 @@
     "koa-static": "^3.0.0",
     "koa-views": "^5.2.0",
     "koa-websocket": "^4.0.0",
-    "less": "^2.7.2",
-    "less-loader": "^4.0.5",
     "mockjs": "^1.0.1-beta3",
     "moment": "^2.18.1",
     "mongoose": "4.10.8",
     "mongoose-auto-increment": "^5.0.1",
-    "node-sass-china": "^4.5.0",
     "nodemailer": "^4.0.1",
     "ora": "^1.3.0",
     "prop-types": "^15.5.10",
     "rc-queue-anim": "^1.2.0",
     "rc-scroll-anim": "^1.0.7",
+    "request": "^2.81.0",
+    "sha1": "^1.1.1",
+    "underscore": "^1.8.3",
+    "universal-cookie": "^2.0.8",
+    "url": "^0.11.0"
+  },
+  "devDependencies": {
+    "assets-webpack-plugin": "^3.5.1",
+    "babel": "^6.5.2",
+    "babel-core": "^6.8.0",
+    "babel-eslint": "^7.2.3",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-import": "^1.3.1",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-plugin-transform-object-rest-spread": "^6.8.0",
+    "babel-plugin-transform-runtime": "^6.9.0",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-stage-3": "^6.24.1",
+    "babel-register": "^6.9.0",
+    "babel-runtime": "^6.9.2",
+    "brace": "^0.10.0",
+    "buffer-shims": "^1.0.0",
+    "compression-webpack-plugin": "^1.0.0",
+    "copy-webpack-plugin": "^4.0.1",
+    "core-decorators": "^0.17.0",
+    "css-loader": "^0.28.4",
+    "eslint": "^3.19.0",
+    "eslint-loader": "^1.9.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-react": "^7.1.0",
+    "extract-text-webpack-plugin": "2.0.0",
+    "fast-sass-loader-china": "^1.2.5",
+    "ghooks": "^2.0.0",
+    "less": "^2.7.2",
+    "less-loader": "^4.0.5",
+    "node-sass-china": "^4.5.0",
+    "nodemon": "^1.11.0",
     "react": "^15.6.1",
     "react-dnd": "^2.5.1",
     "react-dnd-html5-backend": "^2.5.1",
@@ -85,33 +91,22 @@
     "reactabular-dnd": "^8.9.0",
     "reactabular-table": "^8.9.0",
     "redux": "^3.7.1",
+    "redux-devtools": "^3.4.0",
+    "redux-devtools-dock-monitor": "^1.1.2",
+    "redux-devtools-log-monitor": "^1.3.0",
     "redux-promise": "^0.5.3",
     "redux-thunk": "^2.2.0",
-    "request": "^2.81.0",
-    "sha1": "^1.1.1",
     "string-replace-webpack-plugin": "^0.1.3",
     "style-loader": "^0.18.2",
     "table-resolver": "^3.2.0",
-    "underscore": "^1.8.3",
-    "universal-cookie": "^2.0.8",
-    "url": "^0.11.0",
     "validate-commit-msg": "^2.12.2",
     "wangeditor": "^3.0.8",
     "webpack": "^2.2.0",
     "webpack-dev-middleware": "^1.12.0",
+    "webpack-node-externals": "^1.6.0",
     "ykit-config-antd": "^0.1.3",
     "ykit-config-es6": "^1.1.0"
   },
-  "devDependencies": {
-    "babel-plugin-import": "^1.3.1",
-    "compression-webpack-plugin": "^1.0.0",
-    "ghooks": "^2.0.0",
-    "nodemon": "^1.11.0",
-    "redux-devtools": "^3.4.0",
-    "redux-devtools-dock-monitor": "^1.1.2",
-    "redux-devtools-log-monitor": "^1.3.0",
-    "webpack-node-externals": "^1.6.0"
-  },
   "config": {
     "ghooks": {
       "commit-msg": "validate-commit-msg"

server/utils/db.js

@@ -16,7 +16,7 @@ function connect(callback) {
     mongoose.Promise = global.Promise;
 
     let config = yapi.WEBCONFIG;
-    let options = {};
+    let options = {useMongoClient: true};
 
     if (config.db.user) {
         options.user = config.db.user;

static/prd/assets.js

@@ -0,0 +1 @@
+window.WEBPACK_ASSETS = {"index.js":{"js":"index@bcbd580a19f876f6731e.js","css":"index@bcbd580a19f876f6731e.css"},"lib":{"js":"lib@34aff05b99e03fc574f9.js"},"lib2":{"js":"lib2@783241d8b26619bc12ca.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}

static/prd/manifest@b67af9f8b578904e66c5.js

@@ -0,0 +1 @@
+(function(e){function i(t){if(n[t])return n[t].exports;var r=n[t]={exports:{},id:t,loaded:false};e[t].call(r.exports,r,r.exports,i);r.loaded=true;return r.exports}var t=window["webpackJsonp"];window["webpackJsonp"]=function(o,u){var a,f,l=0,c=[];for(;l<o.length;l++){f=o[l];if(r[f])c.push.apply(c,r[f]);r[f]=0}for(a in u){e[a]=u[a]}if(t)t(o,u);while(c.length)c.shift().call(null,i);if(u[0]){n[0]=0;return i(0)}};var n={};var r={3:0};i.e=function(t,n){if(r[t]===0)return n.call(null,i);if(r[t]!==undefined){r[t].push(n)}else{r[t]=[n];var s=document.getElementsByTagName("head")[0];var o=document.createElement("script");o.type="text/javascript";o.charset="utf-8";o.async=true;o.src=i.p+""+t+".chunk.min.js";s.appendChild(o)}};i.m=e;i.c=n;i.p=""})([])