From 24c7ff79595c12d6bd84285236b888c3eb2f71e5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 六月 2021 09:54:13 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
---
ruoyi-ui/package.json | 2 +-
ruoyi-ui/src/views/index.vue | 32 ++++++++++++++++++++++++++++++++
pom.xml | 2 +-
README.md | 7 +++++--
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index ac06048..3a24d04 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[
<br>
-[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[]()
[]()
[]()
@@ -30,7 +30,10 @@
## 鍙傝�冩枃妗�
-浣跨敤妗嗘灦鍓嶈浠旂粏闃呰鏂囨。閲嶇偣娉ㄦ剰浜嬮」
+浣跨敤妗嗘灦鍓嶈浠旂粏闃呰鏂囨。閲嶇偣娉ㄦ剰浜嬮」
+<br>
+[鍒濆鍖栭」鐩� 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬鍒濆鍖栭」鐩�?sort_id=4164117)
+<br>
[鍙傝�冩枃妗� Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
## 淇敼RuoYi鍔熻兘
diff --git a/pom.xml b/pom.xml
index 5fe335a..2a8521c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>2.4.0</ruoyi-vue-plus.version>
<spring-boot.version>2.4.7</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 48009be..af8db7e 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "2.3.2",
+ "version": "2.4.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 d16cf12..dba6dfe 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -19,6 +19,9 @@
* 鏍￠獙妗嗘灦 validation 澧炲己鎺ュ彛瀹夊叏鎬� 涓ヨ皑鎬�<br/>
* 鏂囨。妗嗘灦 knife4j 缇庡寲鎺ュ彛鏂囨。<br/>
* 浠ｇ爜鐢熸垚鍣� 涓�閿敓鎴愬墠鍚庣浠ｇ爜<br/>
+ * 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋�<br/>
+ * Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己<br/>
+ * 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱<br/>
</p>
<p>
<b>褰撳墠鐗堟湰:</b> <span>v{{ version }}</span>
@@ -34,6 +37,14 @@
plain
@click="goTarget('https://gitee.com/JavaLionLi/RuoYi-Vue-Plus')"
>璁块棶鐮佷簯</el-button
+ >
+ <el-button
+ type="primary"
+ size="mini"
+ icon="el-icon-cloudy"
+ plain
+ @click="goTarget('https://github.com/JavaLionLi/RuoYi-Vue-Plus')"
+ >璁块棶GitHub</el-button
>
</p>
</el-col>
@@ -80,6 +91,27 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v2.4.0 - 2021-6-24">
+ <ol>
+ <li>update springboot 2.3.11 => 2.4.7</li>
+ <li>update springboot-admin 2.3.1 => 2.4.1</li>
+ <li>update feign 2.2.6 => 3.0.3</li>
+ <li>update hutool 5.6.7 => 5.7.2</li>
+ <li>update 澶氭暟鎹簮鏇挎崲鎴恉ynamic-datasource</li>
+ <li>update 閫傞厤 jdk11</li>
+ <li>update 闆嗘垚 Lock4j 鍒嗗竷寮忛攣</li>
+ <li>update 绉婚櫎 fastjson 澧炲姞 jackson 宸ュ叿绫� 閲嶅啓鐩稿叧涓氬姟</li>
+ <li>update 浼樺寲 寮傛宸ュ巶閲嶅啓 浣跨敤 spring 寮傛澶勭悊</li>
+ <li>update 鍏ㄥ眬鎸傝浇瀛楀吀鏍囩缁勪欢</li>
+ <li>update 鏃ュ織鍒楄〃鏀寔鎺掑簭鎿嶄綔</li>
+ <li>update 鏇存柊 feign demo 鏇存竻鏅扮殑鐢ㄦ硶</li>
+ <li>update 鏇存柊澶氭暟鎹簮婕旂ず妗堜緥</li>
+ <li>add 澧炲姞 ServicePlusImpl 鑷姩浠ュ疄鐜扮被 閲嶅啓绉婚櫎浜嬪姟娉ㄨВ鏂规硶 闃叉澶氭暟鎹簮澶辨晥</li>
+ <li>add 澧炲姞 鑷畾涔� 鎵归噺insert鏂规硶</li>
+ <li>add 澧炲姞 Swagger3 鐢ㄦ硶绀轰緥</li>
+ <li>fix 淇鍦板潃ip鍦板潃鐗规畩鍥炵幆闂</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v2.3.2 - 2021-6-11">
<ol>
<li>add redis閿佸伐鍏风被缂栧啓</li>
--
Gitblit v1.9.3