From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-ui/src/views/index.vue |   80 ++++++++++++++++++++++++++++++++-------
 1 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 8ecc659..37e6ff4 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -4,26 +4,34 @@
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>RuoYi-Vue-Plus鍚庡彴绠$悊妗嗘灦</h2>
         <p>
-          鍩轰簬 RuoYi-Vue 闆嗘垚 Mybatis-Plus Lombok Hutool 绛変究鎹峰紑鍙戝伐鍏� 閫傞厤閲嶅啓鐩稿叧涓氬姟 渚夸簬寮�鍙� 瀹氭湡涓� RuoYi-Vue 鍚屾
+          RuoYi-Vue-Plus 鏄熀浜� RuoYi-Vue 閽堝 鍒嗗竷寮忛泦缇� 鍦烘櫙鍗囩骇(涓嶅吋瀹瑰師妗嗘灦)
           <br/>
           * 鍓嶇寮�鍙戞鏋� Vue銆丒lement UI<br/>
-          * 鍚庣寮�鍙戞鏋� Spring Boot銆丷edis<br/>
+          * 鍚庣寮�鍙戞鏋� Spring Boot<br/>
           * 瀹瑰櫒妗嗘灦 Undertow 鍩轰簬 Netty 鐨勯珮鎬ц兘瀹瑰櫒<br/>
-          * 鏉冮檺璁よ瘉妗嗘灦 Spring Security銆丣wt锛屾敮鎸佸缁堢璁よ瘉绯荤粺<br/>
-          * 鍏崇郴鏁版嵁搴� MySQL 閫傞厤 8.X<br/>
-          * 缂撳瓨鏁版嵁搴� Redis 閫傞厤 6.X<br/>
-          * 鏁版嵁搴撳紑鍙戞鏋� Mybatis-Plus 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜� 鎻掍欢鍖栨敮鎸佸悇绫婚渶姹�<br/>
-          * 缃戠粶妗嗘灦 Feign銆丱kHttp3 鎺ュ彛鍖栫鐞� HTTP 璇锋眰<br/>
-          * 宸ュ叿绫绘鏋� Hutool銆丩ombok 鍑忓皯浠g爜鍐椾綑 澧炲姞瀹夊叏鎬�<br/>
-          * 鐩戞帶妗嗘灦 spring-boot-admin 鍏ㄦ柟浣嶆湇鍔$洃鎺�<br/>
-          * 鏍¢獙妗嗘灦 validation 澧炲己鎺ュ彛瀹夊叏鎬� 涓ヨ皑鎬�<br/>
-          * 鏂囨。妗嗘灦 knife4j 缇庡寲鎺ュ彛鏂囨。<br/>
-          * 浠g爜鐢熸垚鍣� 涓�閿敓鎴愬墠鍚庣浠g爜<br/>
+          * 鏉冮檺璁よ瘉妗嗘灦 Spring Security銆丣wt 鏀寔澶氱粓绔璇佺郴缁�<br/>
+          * 鍏崇郴鏁版嵁搴� MySQL 閫傞厤 8.X 鏈�浣� 5.7<br/>
+          * 缂撳瓨鏁版嵁搴� Redis 閫傞厤 6.X 鏈�浣� 4.X<br/>
+          * 鏁版嵁搴撴鏋� Mybatis-Plus 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜�<br/>
+          * 鏁版嵁搴撴鏋� p6spy 鏇村己鍔茬殑 SQL 鍒嗘瀽<br/>
           * 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋�<br/>
-          * Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己<br/>
+          * 搴忓垪鍖栨鏋� Jackson 缁熶竴浣跨敤 jackson 楂樻晥鍙潬<br/>
+          * Redis瀹㈡埛绔� Redisson 鎬ц兘寮哄姴銆丄PI涓板瘜<br/>
+          * 鍒嗗竷寮忛檺娴� Redisson 鍏ㄥ眬銆佽姹侷P銆侀泦缇D 澶氱闄愭祦<br/>
           * 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱<br/>
+          * 鍒嗗竷寮忓箓绛� Lock4j 鍩轰簬鍒嗗竷寮忛攣瀹炵幇<br/>
+          * 鍒嗗竷寮忔棩蹇� TLog 鏀寔璺熻釜閾捐矾鏃ュ織璁板綍銆佹�ц兘鍒嗘瀽銆侀摼璺帓鏌�<br/>
+          * 鍒嗗竷寮忎换鍔¤皟搴� Xxl-Job 楂樻�ц兘 楂樺彲闈� 鏄撴墿灞�<br/>
+          * 鏂囦欢瀛樺偍 Minio 鏈湴瀛樺偍<br/>
+          * 鏂囦欢瀛樺偍 涓冪墰銆侀樋閲屻�佽吘璁�	浜戝瓨鍌�<br/>
+          * 鐩戞帶妗嗘灦 SpringBoot-Admin 鍏ㄦ柟浣嶆湇鍔$洃鎺�<br/>
+          * 鏍¢獙妗嗘灦 Validation 澧炲己鎺ュ彛瀹夊叏鎬� 涓ヨ皑鎬�<br/>
+          * Excel妗嗘灦 Alibaba EasyExcel 鎬ц兘浼樺紓 鎵╁睍鎬у己<br/>
+          * 鏂囨。妗嗘灦 knife4j 缇庡寲鎺ュ彛鏂囨。<br/>
+          * 宸ュ叿绫绘鏋� Hutool銆丩ombok 鍑忓皯浠g爜鍐椾綑 澧炲姞瀹夊叏鎬�<br/>
+          * 浠g爜鐢熸垚鍣� 閫傞厤MP銆並nife4j瑙勮寖鍖栦唬鐮� 涓�閿敓鎴愬墠鍚庣浠g爜<br/>
           * 閮ㄧ讲鏂瑰紡 Docker 瀹瑰櫒缂栨帓 涓�閿儴缃蹭笟鍔¢泦缇�<br/>
-          * 鏂囦欢瀛樺偍 OSS 瀵硅薄瀛樺偍妯″潡 鏀寔(Minio銆佷竷鐗涖�侀樋閲屻�佽吘璁�)<br/>
+          * 鍥介檯鍖� SpringMessage Spring鏍囧噯鍥介檯鍖栨柟妗�<br/>
         </p>
         <p>
           <b>褰撳墠鐗堟湰:</b> <span>v{{ version }}</span>
@@ -93,6 +101,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 浼樺寲 浠g爜鐢熸垚甯搁噺 鍏充簬 BO VO 娉ㄩ噴</li>
+                <li>update 浼樺寲浠g爜鐢熸垚 瀵煎叆琛� 鍒楄〃杩斿洖 涓婚敭榛樿閫変腑</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 浠g爜鐢熸垚 鏀逛负鐢熸垚鎶借薄瀹炰綋</li>
+                <li>update 浠g爜鐢熸垚 鎼滅储妗� 鏇存柊鏂囨湰鍩熺敓鎴� 鐢ㄤ簬妯$硦鏌ヨ</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 鏇存柊鍏充簬鍏ㄥ眬璺緞璁剧疆涓庢枃妗i摼鎺�</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 +533,7 @@
   data() {
     return {
       // 鐗堟湰鍙�
-      version: "3.2.0",
+      version: "3.3.0",
     };
   },
   methods: {

--
Gitblit v1.9.3