From 948ad860498cc6c482ee492611b3394f7e661741 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 十二月 2021 10:37:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 2
ruoyi-framework/pom.xml | 2
ruoyi-admin/pom.xml | 2
ruoyi-system/pom.xml | 2
script/docker/docker-compose.yml | 8 ++--
ruoyi-ui/src/views/index.vue | 58 ++++++++++++++++++++++++++++
ruoyi-generator/pom.xml | 2
pom.xml | 8 ++--
ruoyi-common/pom.xml | 2
README.md | 3 +
ruoyi-extend/pom.xml | 2
ruoyi-demo/pom.xml | 2
ruoyi-oss/pom.xml | 2
ruoyi-ui/package.json | 2
ruoyi-job/pom.xml | 2
16 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index 33801da..cbf2da3 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)
[]()
[]()
[]()
@@ -24,6 +24,7 @@
| 鍚庣寮�鍙戞鏋� | SpringBoot | [SpringBoot瀹樼綉](https://spring.io/projects/spring-boot/#learn) | |
| 瀹瑰櫒妗嗘灦 | Undertow | [Undertow瀹樼綉](https://undertow.io/) | 鍩轰簬 XNIO 鐨勯珮鎬ц兘瀹瑰櫒 |
| 鏉冮檺璁よ瘉妗嗘灦 | Spring Security銆丣wt | [SpringSecurity瀹樼綉](https://spring.io/projects/spring-security#learn) | 鏀寔澶氱粓绔璇佺郴缁� |
+| 鏉冮檺璁よ瘉妗嗘灦 | Sa-Token銆丣wt | [Sa-Token瀹樼綉](https://sa-token.dev33.cn/) | 寮鸿В鑰︺�佸己鎵╁睍 |
| 鍏崇郴鏁版嵁搴� | MySQL | [MySQL瀹樼綉](https://dev.mysql.com/) | 閫傞厤 8.X 鏈�浣� 5.7 |
| 缂撳瓨鏁版嵁搴� | Redis | [Redis瀹樼綉](https://redis.io/) | 閫傞厤 6.X 鏈�浣� 4.X |
| 鏁版嵁搴撴鏋� | Mybatis-Plus | [Mybatis-Plus鏂囨。](https://baomidou.com/guide/) | 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜� |
diff --git a/pom.xml b/pom.xml
index 286d8fa..f281612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>3.4.0</version>
+ <version>3.5.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.4.0</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>3.5.0</ruoyi-vue-plus.version>
<spring-boot.version>2.5.8</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -29,10 +29,10 @@
<satoken.version>1.28.0</satoken.version>
<mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.17</hutool.version>
+ <hutool.version>5.7.18</hutool.version>
<okhttp.version>4.9.2</okhttp.version>
<spring-boot-admin.version>2.5.5</spring-boot-admin.version>
- <redisson.version>3.16.6</redisson.version>
+ <redisson.version>3.16.7</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.5.0</dynamic-ds.version>
<tlog.version>1.3.6</tlog.version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 91aa013..29d95dd 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 9788097..91a741a 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 1ca6d92..6b0ea78 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index ccd525c..f0ae61d 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.4.0</version>
+ <version>3.5.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 177c9af..4b0d591 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.4.0</version>
+ <version>3.5.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 835d7de..640628e 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.4.0</version>
+ <version>3.5.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 713c5ab..fe60db3 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 4b61ea6..0fb2be4 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml
index 3c13d35..369ab17 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index 8aaf3e4..1a3c491 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index a436dfc..3d549cd 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.4.0</version>
+ <version>3.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 8e1cc0f..6052905 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "3.4.0",
+ "version": "3.5.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 3fc731e..dd34ed6 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -101,6 +101,62 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.5.0 - 2021-12-28">
+ <ol>
+ <li>[閲嶅ぇ鏇存柊] 閲嶅啓鏁版嵁鏉冮檺瀹炵幇</li>
+ <li>[閲嶇鏇存柊] 閲嶆瀯鍒嗛〉 绠�鍖栦娇鐢�</li>
+ <li>[閲嶇鏇存柊] 鐢ㄦ埛鐧诲綍 鏀寔鏍￠獙閿欒娆℃暟閿佸畾鐧诲綍</li>
+ <li>[閲嶇鏇存柊] 澧炲姞 jdbc 鎵瑰鐞嗗弬鏁� 澶у箙鎻愬崌鎵归噺鎿嶄綔鎬ц兘 瀵瑰師鐢熻鍙ヤ笌 MP 鍧囨湁鏁�</li>
+ <li>update springboot 2.5.7 => 2.5.8 鍗囩骇棰勯槻 log4j2 闂</li>
+ <li>update springboot-admin 2.5.4 => 2.5.5</li>
+ <li>update hutool 5.7.16 => 5.7.18</li>
+ <li>update redisson 3.16.4 => 3.16.7</li>
+ <li>update dynamic-ds 3.4.1 => 3.5.0</li>
+ <li>update qiniu 7.8.0 => 7.9.0</li>
+ <li>update minio 8.3.3 => 8.3.4</li>
+ <li>update tlog 1.3.4 => 1.3.6 鍚敤 tlog 鑷姩閰嶇疆</li>
+ <li>update clipboard 2.0.6 => 2.0.8</li>
+ <li>update 澶氭暟鎹簮鍒囨崲鏍囨敞杩囨湡 3.6.0 绉婚櫎 鎺ㄨ崘浣跨敤鍘熺敓娉ㄨВ</li>
+ <li>update 閫氱敤鏉冮檺鏈嶅姟 杩佺Щ鍥� ruoyi-framework 妯″潡</li>
+ <li>update 浣跨敤 hutool-jwt 鏇挎崲鑰佹棫 jjwt 渚濊禆</li>
+ <li>update 璋冩暣 OSS 琛ㄥ瓧娈靛唴瀹归暱搴�</li>
+ <li>update LoginUser 澧炲姞瑙掕壊缂撳瓨 浼樺寲瑙掕壊鏉冮檺浠ｇ爜</li>
+ <li>update 浣跨敤 Cglib 閲嶆瀯 BeanCopyUtils 鎬ц兘浼樺紓</li>
+ <li>update 绂佹鎵�鏈夊伐鍏风被瀹炰緥鍖� 浼樺寲浠ｇ爜涔﹀啓瑙勮寖</li>
+ <li>update 浼樺寲鏌ヨ鐢ㄦ埛鐨勮鑹茬粍銆佸矖浣嶇粍浠ｇ爜</li>
+ <li>update 鏇存柊 RedisUtils 杩斿洖瀹㈡埛绔疄渚�</li>
+ <li>update 淇敼 鍋ュ悍妫�鏌ユ潈闄� 鏀逛负鐢ㄦ埛鏀捐 鎻愰珮瀹夊叏鎬�</li>
+ <li>update hutool 宸ュ叿 鏀逛负鍗曞寘寮曞叆 鍑忓皯鏃犵敤渚濊禆</li>
+ <li>update ServicePlusImpl 鍔熻兘 涓嬫矇鍒� BaseMapperPlus</li>
+ <li>update 鍘婚櫎 jdk17 鏍囩 鐢变簬寰堝缁勪欢杩樻湭閫傞厤 瀵艰嚧涓�浜涢棶棰�</li>
+ <li>udpate 浠ｇ爜鐢熸垚棰勮鏀寔澶嶅埗鍐呭</li>
+ <li>update 鐢ㄦ埛瀵煎叆鎻愮ず婧㈠嚭鍒欐樉绀烘粴鍔ㄦ潯</li>
+ <li>update 璺敱鏀寔鍗曠嫭閰嶇疆鑿滃崟鎴栬鑹叉潈闄�</li>
+ <li>update 浼樺寲web鎷︽埅鍣� 浣跨敤鍘熺敓鎺ュ彛澶勭悊 榛樿闈炵敓浜х幆澧冨紑鍚�</li>
+ <li>update 璋冩暣鐩戞帶渚濊禆 浠� common 杩佺Щ鍒� framework</li>
+ <li>add 鏂板 Vue3 鍒嗘敮 涓� 浠ｇ爜鐢熸垚妯℃澘(鐢变簬缁勪欢杩樻湭瀹屽杽 浠呬緵瀛︿範)</li>
+ <li>add 澧炲姞 RedisUtils 娉ㄥ唽鐩戝惉鍣ㄦ柟娉�</li>
+ <li>add 澧炲姞 鑷畾涔� Xss 鏍￠獙娉ㄨВ 鐢ㄦ埛瀵煎叆澧炲姞 Bean 鏍￠獙</li>
+ <li>add oss涓嬭浇澧炲姞 loading 灞�</li>
+ <li>add 鏂板鍥剧墖棰勮缁勪欢</li>
+ <li>add 闆嗘垚compression-webpack-plugin鎻掍欢瀹炵幇鎵撳寘Gzip鍘嬬缉</li>
+ <li>add 鏂板 SqlUtils 妫�鏌ュ叧閿瓧鏂规硶</li>
+ <li>fix 淇 闆嗙兢闆姳id閲嶅闂 浣跨敤缃戝崱淇℃伅缁戝畾鐢熸垚</li>
+ <li>fix 淇 count 璇硶寮傚父</li>
+ <li>fix 淇鏇存敼瀵嗙爜闂</li>
+ <li>fix 淇sql鍏抽敭瀛楀鐞� 闃叉瑙ｆ瀽鍣ㄦ姤閿�</li>
+ <li>fix 淇 TreeBuildUtils 椤惰妭鐐逛笉涓� 0 闂</li>
+ <li>fix 淇 SysOssConfig 涓婚敭绫诲瀷閿欒</li>
+ <li>fix 淇浠ｇ爜鐢熸垚 瀵煎嚭娉ㄨВ閿欒</li>
+ <li>fix 淇 redisson 闆嗙兢妯″紡 璺緞鏈尮閰嶅崗璁ご闂</li>
+ <li>fix 淇鎵撳寘鍚庡瓧浣撳浘鏍囧伓鐜扮殑涔辩爜闂</li>
+ <li>fix 淇鐗堟湰宸紓瀵艰嚧鐨勬噿鍔犺浇鎶ラ敊闂</li>
+ <li>fix 淇浠ｇ爜鐢熸垚瀛楀吀缁勯噸澶嶉棶棰�</li>
+ <li>remove 鍒犻櫎 jjwt 鏃犵敤渚濊禆</li>
+ <li>remove 绉婚櫎杩囨湡 鐢ㄦ埛瀵煎叆</li>
+ <li>remove 绉婚櫎杩囨湡宸ュ叿 DictUtils</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.4.0 - 2021-11-29">
<ol>
<li>update [閲嶇鏇存柊] 閲嶆瀯 Excel 瀵煎叆 鏀寔 Validator 鏍￠獙 鏀寔鑷畾涔夌洃鍚櫒</li>
@@ -588,7 +644,7 @@
data() {
return {
// 鐗堟湰鍙�
- version: "3.4.0",
+ version: "3.5.0",
};
},
methods: {
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 34c44b8..79739c3 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -102,7 +102,7 @@
ipv4_address: 172.30.0.54
ruoyi-server1:
- image: "ruoyi/ruoyi-server:3.4.0"
+ image: "ruoyi/ruoyi-server:3.5.0"
container_name: ruoyi-server1
environment:
# 鏃跺尯涓婃捣
@@ -117,7 +117,7 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:3.4.0"
+ image: "ruoyi/ruoyi-server:3.5.0"
container_name: ruoyi-server2
environment:
# 鏃跺尯涓婃捣
@@ -132,7 +132,7 @@
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
- image: "ruoyi/ruoyi-monitor-admin:3.4.0"
+ image: "ruoyi/ruoyi-monitor-admin:3.5.0"
container_name: ruoyi-monitor-admin
environment:
# 鏃跺尯涓婃捣
@@ -147,7 +147,7 @@
ipv4_address: 172.30.0.90
ruoyi-xxl-job-admin:
- image: "ruoyi/ruoyi-xxl-job-admin:3.4.0"
+ image: "ruoyi/ruoyi-xxl-job-admin:3.5.0"
container_name: ruoyi-xxl-job-admin
environment:
# 鏃跺尯涓婃捣
--
Gitblit v1.9.3