|  | @@ -22,6 +22,7 @@
 | 
	
		
			
				|  |  |          <bitwalker.version>1.21</bitwalker.version>
 | 
	
		
			
				|  |  |          <swagger.version>2.9.2</swagger.version>
 | 
	
		
			
				|  |  |  		<kaptcha.version>2.3.2</kaptcha.version>
 | 
	
		
			
				|  |  | +		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
 | 
	
		
			
				|  |  |          <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
 | 
	
		
			
				|  |  |          <fastjson.version>1.2.75</fastjson.version>
 | 
	
		
			
				|  |  |          <oshi.version>5.6.0</oshi.version>
 | 
	
	
		
			
				|  | @@ -37,7 +38,7 @@
 | 
	
		
			
				|  |  |      <!-- 依赖声明 -->
 | 
	
		
			
				|  |  |      <dependencyManagement>
 | 
	
		
			
				|  |  |          <dependencies>
 | 
	
		
			
				|  |  | -        
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- SpringBoot的依赖配置-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>org.springframework.boot</groupId>
 | 
	
	
		
			
				|  | @@ -46,28 +47,35 @@
 | 
	
		
			
				|  |  |                  <type>pom</type>
 | 
	
		
			
				|  |  |                  <scope>import</scope>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -            
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!--阿里数据库连接池 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.alibaba</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>druid-spring-boot-starter</artifactId>
 | 
	
		
			
				|  |  |                  <version>${druid.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -	        
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 解析客户端操作系统、浏览器等 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>eu.bitwalker</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>UserAgentUtils</artifactId>
 | 
	
		
			
				|  |  |                  <version>${bitwalker.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +            <!-- SpringBoot集成mybatis框架 -->
 | 
	
		
			
				|  |  | +            <dependency>
 | 
	
		
			
				|  |  | +                <groupId>org.mybatis.spring.boot</groupId>
 | 
	
		
			
				|  |  | +                <artifactId>mybatis-spring-boot-starter</artifactId>
 | 
	
		
			
				|  |  | +                <version>${mybatis-spring-boot.version}</version>
 | 
	
		
			
				|  |  | +            </dependency>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- pagehelper 分页插件 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.github.pagehelper</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>pagehelper-spring-boot-starter</artifactId>
 | 
	
		
			
				|  |  |                  <version>${pagehelper.boot.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 获取系统信息 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.github.oshi</groupId>
 | 
	
	
		
			
				|  | @@ -86,7 +94,7 @@
 | 
	
		
			
				|  |  |                  <artifactId>jna-platform</artifactId>
 | 
	
		
			
				|  |  |                  <version>${jna.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- swagger2-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>io.springfox</groupId>
 | 
	
	
		
			
				|  | @@ -103,35 +111,35 @@
 | 
	
		
			
				|  |  |                      </exclusion>
 | 
	
		
			
				|  |  |                  </exclusions>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- swagger2-UI-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>io.springfox</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>springfox-swagger-ui</artifactId>
 | 
	
		
			
				|  |  |                  <version>${swagger.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -            
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!--io常用工具类 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>commons-io</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>commons-io</artifactId>
 | 
	
		
			
				|  |  |                  <version>${commons.io.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -	
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!--文件上传工具类 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>commons-fileupload</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>commons-fileupload</artifactId>
 | 
	
		
			
				|  |  |                  <version>${commons.fileupload.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- excel工具 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>org.apache.poi</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>poi-ooxml</artifactId>
 | 
	
		
			
				|  |  |                  <version>${poi.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!--velocity代码生成使用模板 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>org.apache.velocity</groupId>
 | 
	
	
		
			
				|  | @@ -144,63 +152,63 @@
 | 
	
		
			
				|  |  |                      </exclusion>
 | 
	
		
			
				|  |  |                  </exclusions>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- collections工具类 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>commons-collections</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>commons-collections</artifactId>
 | 
	
		
			
				|  |  |                  <version>${commons.collections.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 阿里JSON解析器 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.alibaba</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>fastjson</artifactId>
 | 
	
		
			
				|  |  |                  <version>${fastjson.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!--Token生成与解析-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>io.jsonwebtoken</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>jjwt</artifactId>
 | 
	
		
			
				|  |  |                  <version>${jwt.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!--验证码 -->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.github.penggle</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>kaptcha</artifactId>
 | 
	
		
			
				|  |  |                  <version>${kaptcha.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -            
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 定时任务-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.ruoyi</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>ruoyi-quartz</artifactId>
 | 
	
		
			
				|  |  |                  <version>${ruoyi.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -	
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 代码生成-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.ruoyi</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>ruoyi-generator</artifactId>
 | 
	
		
			
				|  |  |                  <version>${ruoyi.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 核心模块-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.ruoyi</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>ruoyi-framework</artifactId>
 | 
	
		
			
				|  |  |                  <version>${ruoyi.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 系统模块-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.ruoyi</groupId>
 | 
	
		
			
				|  |  |                  <artifactId>ruoyi-system</artifactId>
 | 
	
		
			
				|  |  |                  <version>${ruoyi.version}</version>
 | 
	
		
			
				|  |  |              </dependency>
 | 
	
		
			
				|  |  | -			
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              <!-- 通用工具-->
 | 
	
		
			
				|  |  |              <dependency>
 | 
	
		
			
				|  |  |                  <groupId>com.ruoyi</groupId>
 |