Merge branch 'master' of http://git.picaiba.com/why/ym

 Conflicts:

	pom.xml

	ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java

@@ -41,7 +41,7 @@ public class SwaggerConfig {
     @Bean
     public Docket restApi() {
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("标准接口")
+                .groupName("全部接口")
                 .apiInfo(apiInfo("Spring Boot中使用Swagger2构建RESTful APIs", "1.0"))
                 .useDefaultResponseMessages(true)
                 .forCodeGeneration(false)
@@ -54,6 +54,22 @@ public class SwaggerConfig {
                 .securitySchemes(Arrays.asList(new ApiKey("token", "token", "header")));
     }
 
+    @Bean
+    public Docket adminApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("admin模块接口")
+                .apiInfo(apiInfo("Spring Boot中使用Swagger2构建RESTful APIs", "1.0"))
+                .useDefaultResponseMessages(true)
+                .forCodeGeneration(false)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.cnbm.admin"))
+                .paths(PathSelectors.any())
+                .build()
+                .securityContexts(Arrays.asList(securityContext()))
+                // ApiKey的name需与SecurityReference的reference保持一致
+                .securitySchemes(Arrays.asList(new ApiKey("token", "token", "header")));
+    }
+
     @Bean
     public Docket basicApi() {
         return new Docket(DocumentationType.SWAGGER_2)