From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

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

diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 24bc8b2..d16cf12 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -5,19 +5,20 @@
         <h2>RuoYi-Vue-Plus鍚庡彴绠$悊妗嗘灦</h2>
         <p>
           鍩轰簬 RuoYi-Vue 闆嗘垚 Mybatis-Plus Lombok Hutool 绛変究鎹峰紑鍙戝伐鍏� 閫傞厤閲嶅啓鐩稿叧涓氬姟 渚夸簬寮�鍙� 瀹氭湡涓� RuoYi-Vue 鍚屾
-          * 鍓嶇寮�鍙戞鏋� Vue銆丒lement UI
-          * 鍚庣寮�鍙戞鏋� Spring Boot銆丷edis
-          * 瀹瑰櫒妗嗘灦 Undertow 鍩轰簬 Netty 鐨勯珮鎬ц兘瀹瑰櫒
-          * 鏉冮檺璁よ瘉妗嗘灦 Spring Security銆丣wt锛屾敮鎸佸缁堢璁よ瘉绯荤粺
-          * 鍏崇郴鏁版嵁搴� MySQL 閫傞厤 8.X
-          * 缂撳瓨鏁版嵁搴� Redis 閫傞厤 6.X
-          * 鏁版嵁搴撳紑鍙戞鏋� Mybatis-Plus 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜� 鎻掍欢鍖栨敮鎸佸悇绫婚渶姹�
-          * 缃戠粶妗嗘灦 Feign銆丱kHttp3 鎺ュ彛鍖栫鐞� HTTP 璇锋眰
-          * 宸ュ叿绫绘鏋� Hutool銆丩ombok 鍑忓皯浠g爜鍐椾綑 澧炲姞瀹夊叏鎬�
-          * 鐩戞帶妗嗘灦 spring-boot-admin 鍏ㄦ柟浣嶆湇鍔$洃鎺�
-          * 鏍¢獙妗嗘灦 validation 澧炲己鎺ュ彛瀹夊叏鎬� 涓ヨ皑鎬�
-          * 鏂囨。妗嗘灦 knife4j 缇庡寲鎺ュ彛鏂囨。
-          * 浠g爜鐢熸垚鍣ㄥ彲浠ヤ竴閿敓鎴愬墠鍚庣浠g爜
+          <br/>
+          * 鍓嶇寮�鍙戞鏋� Vue銆丒lement UI<br/>
+          * 鍚庣寮�鍙戞鏋� Spring Boot銆丷edis<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/>
         </p>
         <p>
           <b>褰撳墠鐗堟湰:</b> <span>v{{ version }}</span>
@@ -52,7 +53,7 @@
               <li>JWT</li>
               <li>MyBatis</li>
               <li>Druid</li>
-              <li>Fastjson</li>
+              <li>Jackson</li>
               <li>...</li>
             </ul>
           </el-col>
@@ -79,6 +80,102 @@
             <span>鏇存柊鏃ュ織</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v2.3.2 - 2021-6-11">
+              <ol>
+                <li>add redis閿佸伐鍏风被缂栧啓</li>
+                <li>update spring-cache 鏁村悎 redisson</li>
+                <li>update MybatisPlus鏁村悎Redis浜岀骇缂撳瓨</li>
+                <li>update swagger 鍗囩骇涓� 3.0.0 浣跨敤 OAS_30 鍗忚</li>
+                <li>update 浼樺寲 浠g爜鐢熸垚鍣� 澧炲姞琛ㄥ崟闃查噸娉ㄨВ</li>
+                <li>update 浼樺寲 閿佸垏闈唬鐮� key鍒板父閲忕被</li>
+                <li>fix 淇鐩稿璺緞涓婁紶寮傚父闂</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.3.1 - 2021-6-4">
+              <ol>
+                <li>add 澧炲姞 redisson 鍒嗗竷寮忛攣 娉ㄨВ涓巇emo妗堜緥</li>
+                <li>add 澧炲姞 Oracle 鍒嗘敮</li>
+                <li>update 浼樺寲 redis 绌哄瘑鐮佸吋瀹规��</li>
+                <li>update 浼樺寲鍓嶇浠g爜鐢熸垚鎸夐挳澧炲姞 loading</li>
+                <li>fix 淇 redisson 涓嶈兘鎵归噺鍒犻櫎鐨刡ug</li>
+                <li>fix 淇琛ㄥ崟鏋勫缓閫夋嫨涓嬫媺閫夋嫨鎺у埗鍙版姤閿欓棶棰�</li>
+                <li>fix 淇 vo 浠g爜鐢熸垚 涓婚敭鍒楄〃鏄剧ず 閲嶅鐢熸垚bug</li>
+                <li>fix 淇涓婁紶璺緞 win 鎵撳寘缂栬瘧涓� win 璺緞, linux 鎶ラ敊bug</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.3.0 - 2021-6-1">
+              <ol>
+                <li>add 鍗囩骇 luttuce 涓� redisson 鎬ц兘鏇村己 宸ュ叿鏇村叏</li>
+                <li>add 澧炲姞娴嬭瘯鏁版嵁sql鏂囦欢</li>
+                <li>add 澧炲姞demo妯″潡 鍗曡〃婕旂ず妗堜緥(鍖呭惈鏁版嵁鏉冮檺)</li>
+                <li>update 瀹岀編淇 鏁版嵁鏉冮檺鍔熻兘(鏀寔鍗曡〃澶氳〃杩囨护)</li>
+                <li>update 浼樺寲浠g爜鐢熸垚妯℃澘</li>
+                <li>update 浼樺寲 system 妯″潡 鎵归噺鎿嶄綔鎬ц兘</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.2.1 - 2021-5-29">
+              <ol>
+                <li>add 澧炲姞 security 鏉冮檺妗嗘灦 @Async 寮傛娉ㄨВ閰嶇疆</li>
+                <li>update 浼樺寲dataScope鍙傛暟闃叉娉ㄥ叆</li>
+                <li>update 浼樺寲鍙傛暟&瀛楀吀缂撳瓨鎿嶄綔</li>
+                <li>update 澧炲姞淇敼鍖呭悕鏂囨。</li>
+                <li>update 鏂囨。澧炲姞婕旂ず鍥句緥</li>
+                <li>fix 淇閮ㄩ棬绫籹ql绗﹀彿閿欒</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.2.0 - 2021-5-25">
+              <ol>
+                <li>鍚屾鍗囩骇 RuoYi-Vue 3.5.0</li>
+                <li>add 澧炲姞楠岃瘉鐮佸紑鍏�</li>
+                <li>add 鏂板IE娴忚鍣ㄧ増鏈繃浣庢彁绀洪〉闈�</li>
+                <li>update 鍗囩骇druid鍒版渶鏂扮増鏈瑅1.2.6</li>
+                <li>update 鍗囩骇fastjson鍒版渶鏂扮増1.2.76</li>
+                <li>update 淇敼bo鍔犲叆鍒ゆ柇鏄惁璁剧疆蹇呭~鍐嶅姞杞藉繀濉敞瑙�</li>
+                <li>update 鐢熸垚vue妯℃澘瀵煎嚭鎸夐挳鐐瑰嚮鍚庢坊鍔犻伄缃�</li>
+                <li>update Redis璁剧疆HashKey搴忓垪鍖�</li>
+                <li>update 浼樺寲Redis搴忓垪鍖栭厤缃�</li>
+                <li>fix 淇浠g爜鐢熸垚鍣ㄤ腑琛ㄥ瓧娈靛彇娑堝繀濉棤娉曟洿鏂伴棶棰�</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.1.2 - 2021-5-21">
+              <ol>
+                <li>update springboot 鍗囩骇 2.3.11</li>
+                <li>update mybatis-plus 鍗囩骇 3.4.3 鍒嗛〉Plus瀵硅薄閫傞厤鏇存柊</li>
+                <li>update 楠岃瘉鐮佺敓鎴愭洿鏂颁负鏃犵鍙锋暣鏁拌绠�</li>
+                <li>update 璇锋眰鍝嶅簲瀵硅薄 涓� 鍒嗛〉瀵硅薄 缁撴瀯淇敼 閫傞厤鎺ュ彛鏂囨。閰嶇疆</li>
+                <li>update swagger澧炲姞璇锋眰鍓嶇紑</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.1.1 - 2021-5-19">
+              <ol>
+                <li>update 閰嶇疆缁熶竴鎻愬彇涓� properties 閰嶇疆绫�</li>
+                <li>update 鍒嗛〉宸ュ叿 鍒犻櫎杩囨湡鏂规硶</li>
+                <li>update admin 瀹炴椂鐩戞帶鏃ュ織 鏀逛负淇濈暀涓�澶�</li>
+                <li>fix 淇swagger寮�鍏虫棤娉曟帶鍒跺叧闂棶棰�</li>
+                <li>fix maven install 寮傚父</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.1.0 - 2021-5-17">
+              <ol>
+                <li>update knife4j鍗囩骇3.0.2</li>
+                <li>update 澧炲己鍒嗛〉宸ュ叿鍏煎鎬�</li>
+                <li>update 閫氱敤Service鎺ュ彛 澧炲姞鑷畾涔塿o杞崲鍑芥暟</li>
+                <li>remove 绉婚櫎ruoyi鑷甫鏈嶅姟鐩戞帶(Admin宸插叏閮ㄥ寘鍚�)</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v2.0.0 - 2021-5-15">
+              <ol>
+                <li>springboot 鍗囩骇 2.3.10 渚濊禆鍏ㄩ潰鍗囩骇閫傞厤</li>
+                <li>add 澧炲姞鍒嗛〉宸ュ叿</li>
+                <li>add 澧炲姞 澧炲己Mapper 涓� 澧炲己Service 閲嶅啓涓氬姟閫傞厤</li>
+                <li>add 浠g爜鐢熸垚鍣� 澧炲姞鏍¢獙娉ㄨВ</li>
+                <li>update 浠g爜鐢熸垚鍣ㄤ慨鏀逛负MP鍒嗛〉</li>
+                <li>update 浣跨敤 MP 鍒嗛〉宸ュ叿 閲嶆瀯涓氬姟</li>
+                <li>update 閲嶅啓鏂囨。浠嬬粛</li>
+                <li>remove 绉婚櫎 pagehelper 鍒嗛〉宸ュ叿</li>
+                <li>fix 淇浠g爜鐢熸垚 鏁版嵁鏉冮檺闂</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v1.0.2 - 2021-5-13">
               <ol>
                 <li>update 鏇存柊鏁村悎鎵撳寘鏂囨。 閲嶆柊鎺掔増</li>
@@ -121,12 +218,14 @@
 </template>
 
 <script>
+import config from '../../package.json'
+
 export default {
   name: "index",
   data() {
     return {
       // 鐗堟湰鍙�
-      version: "1.0.2",
+      version: config.version,
     };
   },
   methods: {

--
Gitblit v1.9.3