diff --git a/client/containers/Group/GroupList/GroupList.js b/client/containers/Group/GroupList/GroupList.js
index a4e9482c..619580cf 100755
--- a/client/containers/Group/GroupList/GroupList.js
+++ b/client/containers/Group/GroupList/GroupList.js
@@ -246,7 +246,6 @@ export default class GroupList extends Component {
}
render() {
- console.log(this.props);
const { currGroup } = this.props;
const delmark =
this.showModal(TYPE_EDIT)}>编辑分组
diff --git a/client/plugin-module.js b/client/plugin-module.js
new file mode 100644
index 00000000..c3cbdea7
--- /dev/null
+++ b/client/plugin-module.js
@@ -0,0 +1 @@
+module.exports = {qsso : require('plugins/yapi-plugin-qsso/client.js')}
\ No newline at end of file
diff --git a/client/plugin.js b/client/plugin.js
index c7cc96b6..2e00c98d 100755
--- a/client/plugin.js
+++ b/client/plugin.js
@@ -80,20 +80,17 @@ pluginModule = {
emitHook: emitHook
}
-config.plugins.forEach(plugin => {
+let pluginModuleList = require('./plugin-module.js');
+config.plugins.forEach(plugin=>{
if (!plugin) return null;
if (!plugin.enable) return null;
- if (plugin.client) {
- let p = require(`plugins/yapi-plugin-${plugin.name}/client.js`);
- p.call(pluginModule, plugin);
+ if(plugin.client){
+ pluginModuleList[plugin.name].call(pluginModule, plugin)
}
-
})
-
systemPlugins.forEach(plugin => {
- if (!plugin) return null;
- if (!plugin.enable) return null;
+
if (plugin.client) {
let p = require(`exts/yapi-plugin-${plugin.name}/client.js`);
p.call(pluginModule, plugin);
diff --git a/plugins/yapi-plugin-demo/client.js b/plugins/yapi-plugin-demo/client.js
deleted file mode 100755
index 7d62c908..00000000
--- a/plugins/yapi-plugin-demo/client.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = function(){
- return null;
-};
\ No newline at end of file
diff --git a/server/plugin.js b/server/plugin.js
index 4c1fccce..9d4b7e9d 100755
--- a/server/plugin.js
+++ b/server/plugin.js
@@ -1,5 +1,5 @@
const yapi = require('./yapi.js');
-const plugin_path = yapi.path.join(yapi.WEBROOT, 'plugins');
+const plugin_path = yapi.path.join(yapi.WEBROOT, 'node_modules');
const plugin_system_path = yapi.path.join(yapi.WEBROOT, 'exts');
const initPlugins = require('../common/lib.js').initPlugins;
var extConfig = require('../common/config.js').exts;
diff --git a/ykit.js b/ykit.js
index e1177ea1..6629ed22 100755
--- a/ykit.js
+++ b/ykit.js
@@ -26,10 +26,16 @@ function fileExist (filePath){
};
function initPlugins(){
+ var scripts = [] ;
if(config.plugins && Array.isArray(config.plugins)){
config.plugins = config.plugins.filter(item=>{
- return fileExist(path.resolve(__dirname, 'plugins/yapi-plugin-' + item + '/client.js'))
+ return fileExist(path.resolve(__dirname, 'node_modules/yapi-plugin-' + item + '/client.js'))
})
+ 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);
}
}
@@ -50,13 +56,13 @@ module.exports = {
defaultQuery.plugins.push(["import", { libraryName: "antd"}])
return defaultQuery;
},
- exclude: /node_modules/
- }
+ exclude: /node_modules\/(?!yapi-plugin)/
+ }
}],
// devtool: 'cheap-source-map',
config: function (ykit) {
return {
- exports: [
+ exports: [
'./index.js'
],
commonsChunk: {
@@ -110,7 +116,7 @@ module.exports = {
baseConfig.context = path.resolve(__dirname, './client');
baseConfig.resolve.alias.client = '/client';
baseConfig.resolve.alias.common = '/common';
- baseConfig.resolve.alias.plugins = '/plugins';
+ baseConfig.resolve.alias.plugins = '/node_modules';
baseConfig.resolve.alias.exts = '/exts';
baseConfig.output.prd.path = 'static/prd';
baseConfig.output.prd.publicPath = '';