From 5ca44785400ed8f736e1735434b5c03a4c56df08 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 04 八月 2021 18:52:09 +0800
Subject: [PATCH] update 更新 SysJob 导入导出 补全 SysUser 试图对象

---
 pom.xml |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index aa930ea..ee443ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,15 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>2.5.2</version>
+    <version>2.6.0</version>
 
     <name>RuoYi-Vue-Plus</name>
     <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
     <description>RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</description>
 
     <properties>
-        <ruoyi-vue-plus.version>2.5.2</ruoyi-vue-plus.version>
-        <spring-boot.version>2.4.8</spring-boot.version>
+        <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
+        <spring-boot.version>2.5.3</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -22,28 +22,30 @@
         <druid.version>1.2.6</druid.version>
         <knife4j.version>3.0.3</knife4j.version>
         <poi.version>4.1.2</poi.version>
+        <easyexcel.version>2.2.10</easyexcel.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.3</mybatis-plus.version>
-        <hutool.version>5.7.4</hutool.version>
+        <hutool.version>5.7.6</hutool.version>
         <feign.version>3.0.3</feign.version>
-        <feign-okhttp.version>11.0</feign-okhttp.version>
+        <feign-okhttp.version>11.2</feign-okhttp.version>
+        <okhttp.version>4.9.1</okhttp.version>
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
-        <redisson.version>3.16.0</redisson.version>
+        <redisson.version>3.16.1</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
-        <datasource.version>3.4.0</datasource.version>
+        <datasource.version>3.4.1</datasource.version>
 
         <!-- OSS 閰嶇疆 -->
         <qiniu.version>7.8.0</qiniu.version>
         <aliyun.oss.version>3.13.0</aliyun.oss.version>
         <qcloud.cos.version>5.6.47</qcloud.cos.version>
-        <minio.version>8.2.2</minio.version>
+        <minio.version>8.3.0</minio.version>
 
         <!-- docker 閰嶇疆 -->
         <docker.registry.url>localhost</docker.registry.url>
         <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
         <docker.namespace>ruoyi</docker.namespace>
-        <docker.plugin.version>1.2.0</docker.plugin.version>
+        <docker.plugin.version>1.2.2</docker.plugin.version>
     </properties>
 
     <!-- 渚濊禆澹版槑 -->
@@ -77,6 +79,12 @@
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel</artifactId>
+                <version>${easyexcel.version}</version>
             </dependency>
 
             <!-- velocity浠g爜鐢熸垚浣跨敤妯℃澘 -->
@@ -130,6 +138,12 @@
             </dependency>
 
             <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-starter-server</artifactId>
                 <version>${spring-boot-admin.version}</version>

--
Gitblit v1.9.3