diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java
index 070659afdfccaebd7b538cb934a5915d47a74d26..bb9c69530cb7bec9a3fce36eb767faff3dd82bfe 100644
--- a/spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java
+++ b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java
@@ -35,7 +35,9 @@ public class DefaultPluginListenerFactory implements PluginListenerFactory{
 
     public DefaultPluginListenerFactory(ApplicationContext applicationContext){
         listeners = new ArrayList<>();
-        addPluginListener(new SwaggerListener(applicationContext));
+
+        // bug 存在二次创建SwaggerListener对象
+        //addPluginListener(new SwaggerListener(applicationContext));
         addExtendPluginListener(applicationContext);
     }
 
diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java
index a8b40099c9b34228ddea661e97e8b6cf739db612..c2f9cae827def95a23ad26d769c8c06589882d7e 100644
--- a/spring-brick/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java
+++ b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java
@@ -17,43 +17,112 @@
 package com.gitee.starblues.integration.listener;
 
 import com.gitee.starblues.core.PluginInfo;
+import com.gitee.starblues.core.descriptor.PluginDescriptor;
+import com.gitee.starblues.loader.utils.ObjectUtils;
 import com.gitee.starblues.utils.SpringBeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.plugin.core.PluginRegistry;
+import org.springframework.plugin.core.PluginRegistrySupport;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.DocumentationPlugin;
+import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Swagger 监听事件
  * @author starBlues
  * @version 3.0.0
  */
 public class SwaggerListener implements PluginListener{
-
     private final Logger log = LoggerFactory.getLogger(this.getClass());
     private final ApplicationContext mainApplicationContext;
 
+    private static List<Parameter> parameterList = new ArrayList<>();
+
+    /**
+     * 设置全局头部/参数
+     * ParameterBuilder tokenPar = new ParameterBuilder();
+    *  tokenPar.name("参数名称").description("参数描述").modelRef(new ModelRef("参数数据类型")).parameterType("header或者query等").required(false);
+    *  Parameter param = tokenPar.build();
+     * @param parameters
+     */
+    public static void setParameters(List<Parameter> parameters){
+        parameterList = parameters;
+    }
+
     public SwaggerListener(ApplicationContext mainApplicationContext) {
         this.mainApplicationContext = mainApplicationContext;
     }
 
     @Override
     public void startSuccess(PluginInfo pluginInfo) {
-        if(pluginInfo.isFollowSystem()){
-            return;
+        Docket docket = this.createDocket(pluginInfo);
+        String groupName = docket.getGroupName();
+        PluginRegistry<DocumentationPlugin, DocumentationType> pluginRegistry = this.getPluginRegistry();
+        List<DocumentationPlugin> plugins = pluginRegistry.getPlugins();
+        List<DocumentationPlugin> newPlugins = new ArrayList();
+        for(DocumentationPlugin plugin : plugins){
+            if(plugin.getGroupName().equals(groupName)){
+                continue;
+            }
+            newPlugins.add(plugin);
+        }
+        newPlugins.add(docket);
+        try {
+            Field field = PluginRegistrySupport.class.getDeclaredField("plugins");
+            field.setAccessible(true);
+            field.set(pluginRegistry, newPlugins);
+            // 如果第一次启动且为跟随系统启动的插件，减少刷新
+            if(!pluginInfo.isFollowSystem() || pluginInfo.getStopTime() != null){
+                this.refresh();
+            }
+            log.debug("插件[{}]注册到swagger成功",pluginInfo.getPluginId());
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            log.error("插件[{}]注册到swagger失败，错误为:{}", pluginInfo.getPluginId(),e.getMessage());
         }
-        refresh();
     }
 
     @Override
     public void stopSuccess(PluginInfo pluginInfo) {
-        refresh();
+        String groupName = getGroupName(pluginInfo);
+
+        PluginRegistry<DocumentationPlugin, DocumentationType> pluginRegistry = this.getPluginRegistry();
+        List<DocumentationPlugin> plugins = pluginRegistry.getPlugins();
+        List<DocumentationPlugin> newPlugins = new ArrayList();
+        for(DocumentationPlugin plugin : plugins){
+            if(groupName.equalsIgnoreCase(plugin.getGroupName())){
+                continue;
+            }
+            newPlugins.add(plugin);
+        }
+        try{
+            Field field = PluginRegistrySupport.class.getDeclaredField("plugins");
+            field.setAccessible(true);
+            field.set(pluginRegistry, newPlugins);
+
+            this.refresh();
+            log.debug("插件[{}]从swagger移除成功",pluginInfo.getPluginId());
+        }
+        catch (NoSuchFieldException | IllegalAccessException e) {
+            log.error("插件[{}]从swagger移除失败，错误为:{}", pluginInfo.getPluginId(),e.getMessage());
+        }
     }
 
     void refresh(){
         try {
-            DocumentationPluginsBootstrapper documentationPluginsBootstrapper = SpringBeanUtils.getExistBean(mainApplicationContext,
-                    DocumentationPluginsBootstrapper.class);
+            DocumentationPluginsBootstrapper documentationPluginsBootstrapper = this.getDocumentationPluginsBootstrapper();
             if(documentationPluginsBootstrapper != null){
                 documentationPluginsBootstrapper.stop();
                 documentationPluginsBootstrapper.start();
@@ -66,4 +135,61 @@ public class SwaggerListener implements PluginListener{
         }
     }
 
+    /**
+     * 获取文档Bootstrapper
+     * @return
+     */
+    private DocumentationPluginsBootstrapper getDocumentationPluginsBootstrapper(){
+        DocumentationPluginsBootstrapper documentationPluginsBootstrapper = SpringBeanUtils.getExistBean(mainApplicationContext,DocumentationPluginsBootstrapper.class);
+        return documentationPluginsBootstrapper;
+    }
+
+    /**
+     * 获取文档PluginRegistry
+     * @return
+     */
+    private PluginRegistry<DocumentationPlugin, DocumentationType> getPluginRegistry(){
+        PluginRegistry<DocumentationPlugin, DocumentationType> pluginRegistry = SpringBeanUtils.getExistBean(mainApplicationContext,"documentationPluginRegistry");
+        return pluginRegistry;
+    }
+    /**
+     * 创建swagger分组对象
+     * @param pluginInfo
+     * @return
+     */
+    private Docket createDocket(PluginInfo pluginInfo) {
+        PluginDescriptor pluginDescriptor = pluginInfo.getPluginDescriptor();
+        String description = pluginInfo.getPluginDescriptor().getDescription();
+        if (ObjectUtils.isEmpty(description)) {
+            description = pluginDescriptor.getPluginId();
+        }
+
+        String provider = pluginDescriptor.getProvider();
+        String pluginBootstrapClass = pluginDescriptor.getPluginBootstrapClass();
+        String pluginClass = pluginBootstrapClass.substring(0,pluginBootstrapClass.lastIndexOf("."));
+        Contact contact = new Contact(provider, "", "");
+        ApiInfo apiInfo = (new ApiInfoBuilder()).title(getGroupName(pluginInfo)).description(description).contact(contact).version(pluginDescriptor.getPluginVersion()).build();
+        Docket docket = (new Docket(DocumentationType.SWAGGER_2))
+                .apiInfo(apiInfo).select()
+                .apis(RequestHandlerSelectors.basePackage(pluginClass))
+                .paths(PathSelectors.any()).build()
+                .groupName(getGroupName(pluginInfo));
+        if(parameterList != null && !parameterList.isEmpty()){
+            return docket.globalOperationParameters(parameterList);
+        }
+        return docket;
+    }
+
+    /**
+     * 获取组名称
+     * @param pluginInfo
+     * @return
+     */
+    private String getGroupName(PluginInfo pluginInfo){
+        String description = pluginInfo.getPluginDescriptor().getDescription();
+        if (ObjectUtils.isEmpty(description)) {
+            description = pluginInfo.getPluginId();
+        }
+        return description +"@" +pluginInfo.getPluginId();
+    }
 }