From 2f0c5d2b0397b16560e4e6d052fe2a4a13db0276 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 7 Oct 2018 21:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=203.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                           | 21 +++++++------------
 .../ruoyi/web/core/config/SwaggerConfig.java  |  2 +-
 ruoyi-common/pom.xml                          |  1 +
 ruoyi-framework/pom.xml                       |  6 +-----
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index bc6caf0da..61752a86b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -54,14 +54,14 @@
 			<artifactId>springfox-swagger2</artifactId>
 			<version>${swagger.version}</version>
 		</dependency>
-        
-		<!-- 通用工具-->
-		<dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
 		
+		<!-- swagger2-UI-->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+        
 		<!-- 核心模块-->
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -69,13 +69,6 @@
             <version>${ruoyi.version}</version>
         </dependency>
 		
-		<!-- 系统模块-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-system</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
-        
         <!-- 定时任务-->
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 88f63450c..9cee0a47f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -32,7 +32,7 @@ public class SwaggerConfig
                 .apiInfo(apiInfo())
                 .select()
                 // 指定当前包路径
-                .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                .apis(RequestHandlerSelectors.basePackage("com.ruoyi.web.controller.tool"))
                 // 扫描所有 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build();
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index b2fbbe732..32552e111 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -64,6 +64,7 @@
 			<version>${poi.version}</version>
 		</dependency>
 		
+		<!-- yml解析器 -->
 		<dependency>
 		    <groupId>org.yaml</groupId>
 		    <artifactId>snakeyaml</artifactId>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index d89ca5c1a..4cb1e5d15 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -83,11 +83,7 @@
 			<version>${bitwalker.version}</version>
 		</dependency>
 		
-		<dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
+		<!-- 系统模块-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>