feat: add swagger data import

.eslintignore

@@ -0,0 +1,2 @@
+node_modules/*
+common/json-schema-mockjs.js

.eslintrc.js

@@ -1,15 +1,14 @@
 module.exports = {
-    "env": {
+    env: {
         "browser": true,
         "commonjs": true,
         "es6": true,
         "node": true
     },
     extends: ["eslint:recommended", "plugin:react/recommended"],
-    "parser": "babel-eslint",
-    "parserOptions": {
+    parser: "babel-eslint",
+    parserOptions: {
         "ecmaFeatures": {
-            "experimentalObjectRestSpread": true,
             "jsx": true
         },
         "sourceType": "module"
@@ -18,22 +17,13 @@ module.exports = {
         "react",
         "import"
     ],
-    "rules": {
-        "indent": [
-            "error",
-            2,
-            {
-                "SwitchCase": 1
-            }
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-      
-        "strict": 0,
+    rules: {
+        "indent": ["off", 2],
+        "react/display-name": ["off"],
+        "react/jsx-indent": ["error", 2],
         "comma-dangle": ["error", "never"],
-        "no-console": ["off"]
+        "no-console": ["off"],
+        "import/no-unresolved": ["off"]
     }
 };
 

.eslintrc.json

@@ -1,37 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "node": true,
-        "commonjs": true
-    },
-    "extends": [],
-    "globals": [
-        "$",
-        "$$",
-        "jQuery",
-        "Promise"
-    ],
-    "rules": {
-        "no-with": "error",
-        "no-octal": "error",
-        "no-undef": "error",
-        "no-dupe-keys": "error",
-        "no-dupe-args": "error",
-        "no-delete-var": "error",
-        "no-unused-vars": "error",
-        "no-caller": "error",
-        "no-debugger": "error",
-        "no-unreachable": "error",
-        "no-inner-declarations": [
-            "error",
-            "functions"
-        ]
-    },
-    "ignorePattern": [
-        "/fekit_modules/*",
-        "/node_modules/*",
-        "/bower_components/*",
-        "/dev/*",
-        "/prd/*"
-    ]
-}

README.md

@@ -1,24 +1,33 @@
-## YApi  
+## YApi  http://yapi.demo.qunar.com 
 
-### 一、平台介绍
+### 平台介绍
 ![avatar](yapi-base-flow.jpg)
 
-<p style='text-indent:2em;line-height:1.8em'>YApi是<strong>高效</strong>、<strong>易用</strong>、<strong>功能强大</strong>的api管理平台，旨在为开发、产品、测试人员提供更优雅的接口管理服务。可以帮助开发者轻松创建、发布、维护 API，YApi还为用户提供了优秀的交互体验，开发人员只需利用平台提供的接口数据写入工具以及简单的点击操作就可以实现接口的管理。</p>
+YApi是<strong>高效</strong>、<strong>易用</strong>、<strong>功能强大</strong>的api管理平台，旨在为开发、产品、测试人员提供更优雅的接口管理服务。可以帮助开发者轻松创建、发布、维护 API，YApi还为用户提供了优秀的交互体验，开发人员只需利用平台提供的接口数据写入工具以及简单的点击操作就可以实现接口的管理。
 
-### 二、为什么使用 YApi
+### 特性
 1.  基于 Json5 和 Mockjs 定义接口返回数据的结构和文档，效率提升多倍
 2.  扁平化权限设计，即保证了大型企业级项目的管理，又保证了易用性
 3.  不仅有类似postman的接口调试，还有强大的测试集功能
 4.  免费开源，内网部署，信息再也不怕泄露了！
 
-### 三、部署
+### 内网部署
+#### 环境要求
+* nodejs（7.6+)
+* mongodb（2.6+）
+#### 安装
+使用我们提供的 yapi-cli 工具，部署 YApi 平台是非常容易的。执行 yapi-cli server 启动可视化部署程序，输入相应的配置和点击开始部署，就能完成整个网站的部署。部署完成之后，可按照提示信息，执行 node/{网站路径/server/app.js} 启动服务器
 
-首先在在服务器安装nodejs, mongodb, npm, git
+    npm install -g yapi-cli --registry https://registry.npm.taobao.org
+    yapi-cli server 
+### 在线demo
+http://yapi.demo.qunar.com
 
-1. git clone 
-2. npm install
-3. 初次安装需要执行npm run install-server
-4. npm run server
+管理员账号： yapi.demo@qunar.com ymfe.org
 
+### 意见反馈
+QQ群： 644642474
 
+### License
+Apache 2.0
 

client/.eslintrc.js

@@ -1,26 +0,0 @@
-module.exports = {
-    parser: 'babel-eslint',
-    extends: ["eslint:recommended", "plugin:react/recommended"],
-    "env": {
-      "browser": true,
-      "es6": true
-    },
-    parserOptions: {
-        "sourceType": 'module',
-        "ecmaFeatures": {
-          "jsx": true
-        }
-    },
-    plugins: [
-        "react",
-        "import"
-    ],
-    rules: {
-        "indent": ["error", 2, { "SwitchCase": 1 }],
-        "react/display-name": ["off"],
-        "react/jsx-indent": ["error", 2],
-        "comma-dangle": ["error", "never"],
-        "no-console": ["off"],
-        "import/no-unresolved": ["error"]
-    }
-}

client/containers/Project/Setting/ProjectData/ProjectData.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import './ProjectData.scss';
 import axios from 'axios';
+import _ from 'underscore';
 const Dragger = Upload.Dragger;
 const Option = Select.Option;
 
@@ -67,19 +68,39 @@ class ProjectData extends Component {
     }
   }
 
+  async handleAddCat(cats){
+    let menuList = this.state.menuList;
+    let catsObj = {};
+    if(cats && Array.isArray(cats)){
+      cats.forEach(async cat=>{
+        let findCat =_.find(menuList, menu=>menu.name === cat.name)
+        catsObj[cat.name] = cat;
+        if(findCat){
+          cat.id = findCat._id;
+        }else{
+          let result = await axios.post('/api/interface/add_cat', {
+            name: cat.name,
+            project_id: this.props.match.params.id,
+            desc: cat.desc
+          })
+          cat.id = result._id;
+        }
+      })
+    }
+    return catsObj;
+  }
+
   handleAddInterface(info) {
     if (!this.state.curImportType) {
       return message.error('请选择导入数据的方式');
     }
     if (this.state.selectCatid) {
-      // let filename = info.file.name;
-      // let filetype = filename.substr(filename.lastIndexOf(".")).toLowerCase();
-      // console.log(filename,filetype);
-      //if(filetype != ".json") return message.error("文件格式只能为json");
       let reader = new FileReader();
       reader.readAsText(info.file);
-      reader.onload = (res) => {
+      reader.onload = async res => {
         res = importDataModule[this.state.curImportType].run(res.target.result);
+        const cats =await this.handleAddCat(res.cats);
+
         res = res.apis;
         let len = res.length;
         let count = 0;
@@ -93,6 +114,9 @@ class ProjectData extends Component {
           if (this.props.basePath) {
             data.path = data.path.indexOf(this.props.basePath) === 0 ? data.path.substr(this.props.basePath.length) : data.path;
           }
+          if(data.catname && cats[data.catname].id){
+            data.catid = cats[data.catname].id;
+          }
 
           let result = await axios.post('/api/interface/add', data);
           count++;
@@ -106,7 +130,7 @@ class ProjectData extends Component {
         })
       }
     } else {
-      message.error("请选择上传的分类");
+      message.error("请选择上传的默认分类");
     }
   }
 
@@ -152,7 +176,7 @@ class ProjectData extends Component {
                 <Select
                   showSearch
                   style={{ width: '100%' }}
-                  placeholder="请选择数据导入的接口分类"
+                  placeholder="请选择数据导入的默认分类"
                   optionFilterProp="children"
                   onChange={this.selectChange.bind(this)}
                   filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}

client/plugin.js

@@ -1,6 +1,5 @@
-let initPlugins = require('common/lib.js').initPlugins;
-const config = process.env.config;
-let hooks, pluginModule, systemPlugins;
+
+let hooks, pluginModule;
 
 /**
  * type component  组件
@@ -32,14 +31,6 @@ hooks = {
   }
 };
 
-
-//初始化配置
-systemPlugins = require('common/config.js').exts;
-systemPlugins = initPlugins(systemPlugins);
-
-config.plugins = config.plugins && Array.isArray(config.plugins) ? config.plugins : [];
-config.plugins = initPlugins(config.plugins);
-
 function bindHook(name, listener) {
   if (!name) throw new Error('缺少hookname');
   if (name in hooks === false) {
@@ -85,24 +76,11 @@ try{
 }catch(err){pluginModuleList = {}}
 
 
-config.plugins.forEach(plugin=>{
-  if (!plugin) return null;
-  if (!plugin.enable) return null;
-  if(plugin.client){
-    if(pluginModuleList[plugin.name] && typeof pluginModuleList[plugin.name] === 'function'){
-      pluginModuleList[plugin.name].call(pluginModule, plugin)
-    }
-    
+Object.keys(pluginModuleList).forEach(plugin=>{
+  if (!pluginModuleList[plugin]) return null;
+  if(pluginModuleList[plugin] && typeof pluginModuleList[plugin].module === 'function'){
+    pluginModuleList[plugin].module.call(pluginModule, pluginModuleList[plugin].options)
   }
 })
 
-systemPlugins.forEach(plugin => {
-  
-  if (plugin.client) {
-    let p = require(`exts/yapi-plugin-${plugin.name}/client.js`);
-    p.call(pluginModule, plugin);
-  }
-  
-})
-
 module.exports = pluginModule;

common/config.js

@@ -5,5 +5,7 @@ module.exports = {
     name: 'import-har'
   },{
     name: 'advanced-mock'
+  },{
+    name: 'import-swagger'
   }]
 }

common/lib.js

@@ -1,19 +1,28 @@
-const defaultPluginConfig = {
-  server: true,
-  client: true,
-  enable: true
-}
+const path = require('path');
 
-function getPluginConfig(name){
-  let pluginConfig = require('yapi-plugin-' + item);
-  if(!pluginConfig || typeof pluginConfig !== 'object'){
-    throw new Error(`Plugin ${name} 配置有误，请检查node_modules/yapi-plugin-${name}/index.js`);
+function getPluginConfig(name, type) {
+  let pluginConfig;
+  if(type === 'ext'){
+    pluginConfig = require('../exts/yapi-plugin-' + name);
+  }else {
+    pluginConfig = require('../node_modules/yapi-plugin-' + name);
+  }
+  
+  if(!pluginConfig || typeof pluginConfig !== 'object'){
+    throw new Error(`Plugin ${name} Config 配置错误，请检查 yapi-plugin-${name}/index.js`);
+  }
+
+  return {
+    server: pluginConfig.server,
+    client: pluginConfig.client 
   }
-  return Object.assign({}, defaultPluginConfig, pluginConfig);
 }
 
 module.exports = {
-  initPlugins: function (plugins) {
+  /**
+   * type @string enum[plugin, ext] plugin是外部插件，ext是内部插件
+   */
+  initPlugins: function (plugins, type) {
     if (!plugins) {
       return [];
     }
@@ -24,11 +33,17 @@ module.exports = {
     return plugins.map(item => {
       let pluginConfig;
       if (item && typeof item === 'string') {
-        pluginConfig = getPluginConfig(item);
-        return Object.assign({}, defaultPluginConfig, pluginConfig, {name: item})
+        pluginConfig = getPluginConfig(item, type);
+        return Object.assign({}, pluginConfig, { name: item, enable: true })
       } else if (item && typeof item === 'object') {
-        pluginConfig = getPluginConfig(item.name);
-        return Object.assign({}, defaultPluginConfig, pluginConfig, {name: item.name, options: item.options})
+        pluginConfig = getPluginConfig(item.name, type);
+        return Object.assign({},
+          pluginConfig,
+          {
+            name: item.name,
+            options: item.options,
+            enable: item.enable === false ? false : true
+          })
       }
     })
   }

exts/yapi-plugin-import-swagger/client.js

@@ -0,0 +1,139 @@
+
+import {message} from 'antd'
+import _ from 'underscore'
+var jsf = require('common/json-schema-mockjs');
+
+function improtData(importDataModule){
+  var SwaggerData;
+  function handlePath(path){
+    path = path.replace(/{(\w*)}/,":$1");
+    if(path.charAt(0) != "/"){
+      path = "/" + path;
+    }
+    if(path.charAt(path.length-1) === "/"){
+      path = path.substr(0,path.length-1);
+    }
+    return path;
+  }
+  
+  function run(res){    
+    try{
+      let interfaceData = {apis: [], cats: []};
+      res = JSON.parse(res);
+      SwaggerData = res;
+      if(res.tags && Array.isArray(res.tags)){
+        res.tags.forEach(tag=>{
+          interfaceData.cats.push({
+            name: tag.name,
+            desc: tag.description
+          })
+        })
+      }
+
+      _.each(res.paths, (apis, path)=>{
+        _.each(apis, (api, method)=>{
+          api.path = path;
+          api.method = method;
+          interfaceData.apis.push(handleSwagger(api));
+        })
+      })
+      
+      return interfaceData;
+      
+    }catch(e){
+      console.error(e);
+      message.error("数据格式有误");
+    }
+    
+  }
+  
+  function handleSwagger(data){
+    let api = {};
+    //处理基本信息
+    api.method = data.method.toUpperCase();
+    api.title = data.summary;
+    api.desc = data.description;
+    api.catname = data.tags && Array.isArray(data.tags)? data.tags[0] : null;
+    api.path = handlePath(data.path);
+    api.req_params = [];
+    api.req_body_form = [];
+    api.req_headers = [];
+    api.req_query = [];
+    api.req_body_type = 'raw';
+    api.res_body_type = 'raw';
+
+    if(data.produces && data.produces.indexOf('application/json') > -1){
+      api.res_body_type = 'json';
+    }
+    
+    if(data.consumes && Array.isArray(data.consumes)){
+      if(data.consumes.indexOf('application/x-www-form-urlencoded') > -1 || data.consumes.indexOf('multipart/form-data' > -1)){
+        api.req_body_type = 'form';
+      }else if(data.consumes.indexOf('application/json') > -1){
+        api.req_body_type = 'json';
+      }
+    }
+    //处理response
+    api.res_body = handleResponse(data.responses);
+    
+    //处理参数
+    data.parameters.forEach(param=>{
+      let defaultParam = {
+        name: param.name,
+        desc: param.description,
+        required: param.required? "1" : "0"
+      }
+      switch(param.in){
+        case 'path' : api.req_params.push(defaultParam); break;
+        case 'query': api.req_query.push(defaultParam); break;
+        case 'body' : api.req_body_other = handleSchema(param.schema); break;
+        case 'formData' : defaultParam.type = param.type === 'file'? 'file' : 'text'; api.req_body_form.push(defaultParam); break;
+        case 'header' : api.req_headers.push(defaultParam);break;
+      }
+    })
+
+    return api;
+  }
+
+  function handleResponse(api){
+    let res_body = '';
+    _.each(api, (res, code)=>{
+      if(code == 200 || code === 'default'){
+        res_body = handleSchema(res.schema);
+      }
+    })
+    return res_body;
+  }
+
+  function handleSchema(data){
+    if(!data) return data;
+    if(typeof data !== 'object'){
+      return data;
+    }
+    try{
+      data.definitions = SwaggerData.definitions;
+      return JSON.stringify(jsf(data), null, 2);
+    }catch(e){
+      return '';
+    }
+  }
+  
+  if(!importDataModule || typeof importDataModule !== 'object'){
+    console.error('importDataModule 参数Must be Object Type');
+    return null;
+  }
+
+  importDataModule.swagger = {
+    name: 'Swagger',
+    run: run,
+    desc: 'Swagger数据导入（ 支持 v2.0+ ）'
+  }
+}
+
+
+
+module.exports = function(){
+
+
+  this.bindHook('import_data', improtData)
+}

exts/yapi-plugin-import-swagger/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  server: false,
+  client: true
+}

package.json

@@ -22,6 +22,7 @@
     "clipboard": "^1.7.1",
     "fs-extra": "^3.0.1",
     "happypack": "^4.0.0-beta.5",
+    "json-schema-faker": "^0.5.0-rc11",
     "json5": "^0.5.1",
     "jsonwebtoken": "^7.4.1",
     "koa": "^2.0.0",

server/plugin.js

@@ -157,30 +157,27 @@ yapi.emitHookSync = emitHookSync;
 
 
 
-let pluginsConfig = initPlugins(yapi.WEBCONFIG.plugins);
-
+let pluginsConfig = initPlugins(yapi.WEBCONFIG.plugins, 'plugin');
 pluginsConfig.forEach(plugin => {
     if (!plugin || plugin.enable === false || plugin.server === false) return null;
 
     if (!yapi.commons.fileExist(yapi.path.join(plugin_path, 'yapi-plugin-' + plugin.name + '/server.js'))) {
-        console.error(`config.json配置了插件${plugin},但plugins目录没有找到此插件，请安装此插件`);
-        process.exit();
+        throw new Error(`config.json配置了插件${plugin},但plugins目录没有找到此插件，请安装此插件`);
     }
     let pluginModule = require(yapi.path.join(plugin_path, 'yapi-plugin-' + plugin.name + '/server.js'));
-    pluginModule.call(yapi, plugin)
+    pluginModule.call(yapi, plugin.options)
 })
 
-extConfig = initPlugins(extConfig);
+extConfig = initPlugins(extConfig, 'ext');
 
 extConfig.forEach(plugin => {
     if (!plugin || plugin.enable === false || plugin.server === false) return null;
 
     if (!yapi.commons.fileExist(yapi.path.join(plugin_system_path, 'yapi-plugin-' + plugin.name + '/server.js'))) {
-        console.error(`config.json配置了插件${plugin},但plugins目录没有找到此插件，请安装此插件`);
-        process.exit();
+        throw new Error(`config.json配置了插件${plugin},但plugins目录没有找到此插件，请安装此插件`);
     }
     let pluginModule = require(yapi.path.join(plugin_system_path, 'yapi-plugin-' + plugin.name + '/server.js'));
-    pluginModule.call(yapi, plugin)
+    pluginModule.call(yapi, plugin.options)
     yapi.commons.log('init plugins success...')
 })
 

static/prd/assets.js

@@ -1 +1 @@
-window.WEBPACK_ASSETS = {"index.js":{"js":"index@da88d5e7f8a84b661340.js","css":"index@da88d5e7f8a84b661340.css"},"lib":{"js":"lib@875e625cb7fc52911ccf.js"},"lib2":{"js":"lib2@350ee6d65d22a8d4ef3f.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}
+window.WEBPACK_ASSETS = {"index.js":{"js":"index@d197a2f2fe99e55b1603.js","css":"index@d197a2f2fe99e55b1603.css"},"lib":{"js":"lib@f88ed246a871afd46f3e.js"},"lib2":{"js":"lib2@34c977588e1eeac462a0.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}

ykit.js

@@ -1,13 +1,14 @@
 var path = require('path');
 var AssetsPlugin = require('assets-webpack-plugin')
 var CompressionPlugin = require('compression-webpack-plugin')
+var commonLib = require('./common/lib.js');
 var assetsPluginInstance = new AssetsPlugin({
   filename: 'static/prd/assets.js',
   processOutput: function (assets) {
     return 'window.WEBPACK_ASSETS = ' + JSON.stringify(assets);
   }
 })
-var config = require('../config.json');
+
 
 var compressPlugin = new CompressionPlugin({
   asset: "[path].gz[query]",
@@ -25,25 +26,41 @@ function fileExist (filePath){
   }
 };
 
-function initPlugins(){
+function createScript(plugin, pathAlias){
+  let options = plugin.options ? JSON.stringify(plugin.options) : null
+  return `"${plugin.name}" : {module: require('${pathAlias}/yapi-plugin-${plugin.name}/client.js'),options: ${options}}`
+}
+
+function initPlugins(configPlugin){
+  var configPlugin = require('../config.json').plugins;
+  var systemConfigPlugin = require('./common/config.js').exts;
+
   var scripts = [] ;
-  if(config.plugins && Array.isArray(config.plugins) && config.plugins.length){
-    config.plugins = config.plugins.filter(item=>{
-      return fileExist(path.resolve(__dirname, 'node_modules/yapi-plugin-' + item + '/client.js'))
+  if(configPlugin && Array.isArray(configPlugin) && configPlugin.length){
+    configPlugin = commonLib.initPlugins(configPlugin, 'plugin');
+    configPlugin.forEach((plugin)=>{
+      if(plugin.client && plugin.enable){
+        scripts.push(createScript(plugin, 'plugins'))
+      }
+      
     })
-    config.plugins.forEach((plugin)=>{
-      scripts.push(`${plugin} : require('plugins/yapi-plugin-${plugin}/client.js')`)
-    })
-    scripts = "module.exports = {" + scripts.join(",") + "}";
-    fs.writeFileSync('client/plugin-module.js', scripts);
-  }else{
-    fs.writeFileSync('client/plugin-module.js', 'module.exports = {}');
+    
   }
+  
+  systemConfigPlugin = commonLib.initPlugins(systemConfigPlugin, 'ext');
+  systemConfigPlugin.forEach(plugin=>{
+    if(plugin.client && plugin.enable){
+      scripts.push(createScript(plugin, 'exts'))
+    }
+    
+  })
+
+  scripts = "module.exports = {" + scripts.join(",") + "}";
+  fs.writeFileSync('client/plugin-module.js', scripts);
 }
 
 initPlugins();
 
-
 module.exports = {
   plugins: [{
     name: 'antd',
@@ -109,8 +126,7 @@ module.exports = {
         }
 
         baseConfig.plugins.push(new this.webpack.DefinePlugin({
-          'process.env.NODE_ENV': JSON.stringify(ENV_PARAMS),
-          'process.env.config': JSON.stringify(config)
+          'process.env.NODE_ENV': JSON.stringify(ENV_PARAMS)
         }))
 
         //初始化配置