github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-admin/pom.xml
#	ruoyi-framework/pom.xml
pull/28/MERGE
kuangbx 2018-10-07 22:29:19 +08:00
parent 211a0ab746 2f0c5d2b03
commit ebe67e7bde
4 changed files with 190 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
View File

@ -32,7 +32,7 @@ public class SwaggerConfig
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.select() .select()
// 指定当前包路径 // 指定当前包路径
.apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) .apis(RequestHandlerSelectors.basePackage("com.ruoyi.web.controller.tool"))
// 扫描所有 .apis(RequestHandlerSelectors.any()) // 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();

1
ruoyi-common/pom.xml
View File

@ -64,6 +64,7 @@
<version>${poi.version}</version> <version>${poi.version}</version>
</dependency> </dependency>
<!-- yml解析器 -->
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>