From d6e080d54695ca3f43da82ca2afb29b19e9841cb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 29 十月 2021 09:14:49 +0800
Subject: [PATCH] 发布 v3.3.0

---
 ruoyi-extend/ruoyi-monitor-admin/pom.xml |    2 
 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml |    2 
 ruoyi-framework/pom.xml                  |    4 +-
 ruoyi-admin/pom.xml                      |    4 +-
 ruoyi-system/pom.xml                     |    4 +-
 script/docker/docker-compose.yml         |    8 ++--
 ruoyi-ui/src/views/index.vue             |   44 +++++++++++++++++++++
 ruoyi-generator/pom.xml                  |    2 
 pom.xml                                  |    4 +-
 ruoyi-common/pom.xml                     |    2 
 README.md                                |    2 
 ruoyi-extend/pom.xml                     |    2 
 ruoyi-quartz/pom.xml                     |    4 +-
 ruoyi-demo/pom.xml                       |    2 
 ruoyi-oss/pom.xml                        |    2 
 ruoyi-ui/package.json                    |    2 
 ruoyi-job/pom.xml                        |    2 
 17 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 3d69f9d..a5cae93 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![浣跨敤IntelliJ IDEA寮�鍙戠淮鎶(https://img.shields.io/badge/IntelliJ%20IDEA-鎻愪緵鏀寔-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.2.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.3.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
diff --git a/pom.xml b/pom.xml
index 055e11f..c5da827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.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>3.2.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>3.3.0</ruoyi-vue-plus.version>
         <spring-boot.version>2.5.6</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 966e065..9ec68cd 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -120,4 +120,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index d276072..12f14a0 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 339cbde..93b9f9d 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index bee9117..e44078a 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ruoyi-extend</artifactId>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index d63b110..33a7851 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-extend</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index 7be85f9..1c1ba6f 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
         <artifactId>ruoyi-extend</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
 	</parent>
 	<artifactId>ruoyi-xxl-job-admin</artifactId>
 	<packaging>jar</packaging>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 8dc0f25..b31bee3 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -65,4 +65,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index e19cbb2..668489f 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml
index 05a297f..d3c76d9 100644
--- a/ruoyi-job/pom.xml
+++ b/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index 6c93df8..adbb555 100644
--- a/ruoyi-oss/pom.xml
+++ b/ruoyi-oss/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index ee682f7..1480b81 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,4 +37,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index e7c12ef..bf0a5c9 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,4 +31,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 264837b..89d591b 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺",
   "author": "LionLi",
   "license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 8ecc659..9767127 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -93,6 +93,48 @@
             <span>鏇存柊鏃ュ織</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v3.3.0 - 2021-10-29">
+              <ol>
+                <li>add [閲嶇鏇存柊] 澧炲姞鍒嗗竷寮忔棩蹇楁鏋� TLog</li>
+                <li>add [閲嶇鏇存柊] 澧炲姞鍒嗗竷寮忎换鍔¤皟搴︾郴缁� Xxl-Job</li>
+                <li>add [閲嶅ぇ鏇存柊] 澧炲姞 ruoyi-job 浠诲姟璋冨害妯″潡(鍩轰簬xxl-job)</li>
+                <li>update [閲嶅ぇ鏇存柊]鍏ㄤ笟鍔� 澧炲姞 鎺ュ彛鏂囨。娉ㄨВ 鏍煎紡鍖栦唬鐮�</li>
+                <li>update springboot 2.5.5 => 2.5.6</li>
+                <li>update springboot-admin 2.5.1 => 2.5.2</li>
+                <li>update element-ui 2.15.5 => 2.15.6</li>
+                <li>update hutool 5.7.13 => 5.7.15</li>
+                <li>update qcloud.cos 5.6.55 => 5.6.58</li>
+                <li>update minio 8.3.0 => 8.3.3</li>
+                <li>update 鏇存柊 element 2.15.6 琛ㄦ牸鏍峰紡</li>
+                <li>update 浼樺寲 浠ｇ爜鐢熸垚甯搁噺 鍏充簬 BO VO 娉ㄩ噴</li>
+                <li>update 浼樺寲浠ｇ爜鐢熸垚 瀵煎叆琛� 鍒楄〃杩斿洖 涓婚敭榛樿閫変腑</li>
+                <li>update MybatisPlusRedisCache 鏍囪杩囨湡 鎺ㄨ崘浣跨敤 spring-cache</li>
+                <li>update Quartz 鏍囪杩囨湡 鎺ㄨ崘杩佺Щ鑷虫柊妗嗘灦 xxl-job</li>
+                <li>update Feign 鏍囪杩囨湡</li>
+                <li>update 鍓嶇澧炲姞榛樿鍥介檯鍖栧弬鏁�</li>
+                <li>update 鏇存柊 Admin 鐩戞帶 娉ㄩ噴 閬垮厤閿欒浣跨敤</li>
+                <li>update Admin 鐩戞帶澧炲姞鏃ュ織鏂囦欢杈撳嚭</li>
+                <li>update 浼樺寲 xxl-job-admin 澧炲姞鏍煎紡鍖栨棩蹇楄緭鍑轰笌 docker 闀滃儚</li>
+                <li>update 鏇存柊 xxl-job 鎵ц鍣ㄥ紑鍏冲姛鑳�</li>
+                <li>update 浠ｇ爜鐢熸垚 鏀逛负鐢熸垚鎶借薄瀹炰綋</li>
+                <li>update 浠ｇ爜鐢熸垚 鎼滅储妗� 鏇存柊鏂囨湰鍩熺敓鎴� 鐢ㄤ簬妯＄硦鏌ヨ</li>
+                <li>update 閫氱敤鏁版嵁娉ㄥ叆鏀逛负閫傞厤閫氱敤瀹炰綋绫�</li>
+                <li>update 浣跨敤璺敱鎳掑姞杞芥彁鍗囬〉闈㈠搷搴旈�熷害</li>
+                <li>update 杩佺Щ鎵�鏈夎剼鏈枃浠惰嚦 script 鐩綍</li>
+                <li>update swagger 缁勯『搴忛厤缃�</li>
+                <li>update sql 鏂囦欢鏇存柊 xxljob 鎺у埗鍙拌彍鍗�</li>
+                <li>update 鍓嶇澧炲姞 浠诲姟璋冨害涓績椤甸潰涓庣幆澧冨強 nginx 閰嶇疆</li>
+                <li>update 鍚堝苟 oss.sql 鑷充富 sql</li>
+                <li>update 琛ュ叏鍥介檯鍖栨枃浠�(鑻辨枃)</li>
+                <li>update 鏇存柊鍏充簬鍏ㄥ眬璺緞璁剧疆涓庢枃妗ｉ摼鎺�</li>
+                <li>update 鍒犻櫎鏃犵敤 setUsername 浣跨敤鑷姩娉ㄥ叆</li>
+                <li>update RedisUtils 鏇存柊鍒犻櫎 hash 鏁版嵁鏂规硶</li>
+                <li>fix 淇 澶氭暟鎹簮 aop 璇硶閿欒</li>
+                <li>fix 淇 瀛愯彍鍗曟棤 query 鍙傛暟闂</li>
+                <li>fix 淇 oss 閰嶇疆鍒犻櫎鏃跺垹闄ょ紦瀛� bug</li>
+                <li>fix 淇鏃犳潈闄愯幏鍙栬姹傚ご download-filename 瀵艰嚧鏂囦欢鍚嶄负绌洪棶棰�</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v3.2.0 - 2021-9-28">
               <ol>
                 <li>update [閲嶅ぇ鏀瑰姩]鎺ュ彛鏂囨。 鏀寔鍒嗙粍閰嶇疆</li>
@@ -483,7 +525,7 @@
   data() {
     return {
       // 鐗堟湰鍙�
-      version: "3.2.0",
+      version: "3.3.0",
     };
   },
   methods: {
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 7e5f32f..c73a93c 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -103,7 +103,7 @@
         ipv4_address: 172.30.0.54
 
   ruoyi-server1:
-    image: "ruoyi/ruoyi-server:3.2.0"
+    image: "ruoyi/ruoyi-server:3.3.0"
     container_name: ruoyi-server1
     environment:
       # 鏃跺尯涓婃捣
@@ -118,7 +118,7 @@
         ipv4_address: 172.30.0.60
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:3.2.0"
+    image: "ruoyi/ruoyi-server:3.3.0"
     container_name: ruoyi-server2
     environment:
       # 鏃跺尯涓婃捣
@@ -133,7 +133,7 @@
         ipv4_address: 172.30.0.61
 
   ruoyi-monitor-admin:
-    image: "ruoyi/ruoyi-monitor-admin:3.2.0"
+    image: "ruoyi/ruoyi-monitor-admin:3.3.0"
     container_name: ruoyi-monitor-admin
     environment:
       # 鏃跺尯涓婃捣
@@ -148,7 +148,7 @@
         ipv4_address: 172.30.0.90
 
   ruoyi-xxl-job-admin:
-    image: "ruoyi/ruoyi-xxl-job-admin:3.2.0"
+    image: "ruoyi/ruoyi-xxl-job-admin:3.3.0"
     container_name: ruoyi-xxl-job-admin
     environment:
       # 鏃跺尯涓婃捣

--
Gitblit v1.9.3