From bf98ee3c936130bf4df4b2eda1240f61cf380ac3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 14:03:25 +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 | 57 ++++++++++++++++++++++++++++
ruoyi-generator/pom.xml | 2
pom.xml | 4 +-
ruoyi-common/pom.xml | 2
README.md | 2
ruoyi-extend/pom.xml | 2
ruoyi-demo/pom.xml | 2
ruoyi-oss/pom.xml | 2
ruoyi-job/pom.xml | 2
15 files changed, 74 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 1d0b346..7004f0e 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)
[]()
[]()
[]()
diff --git a/pom.xml b/pom.xml
index 9274e6a..db8b6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>3.3.0</version>
+ <version>3.4.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.3.0</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
<spring-boot.version>2.5.7</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 b736a42..91aa013 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index fa3bbc8..a3ce9d7 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 93b9f9d..1ca6d92 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index e44078a..ccd525c 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.3.0</version>
+ <version>3.4.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 fc321bd..177c9af 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.3.0</version>
+ <version>3.4.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 26892d4..29786ee 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.3.0</version>
+ <version>3.4.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 b31bee3..d5466af 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 045ecba..4b61ea6 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml
index d3c76d9..a87b3ef 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index adbb555..8aaf3e4 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index bf0a5c9..a436dfc 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.3.0</version>
+ <version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 37e6ff4..3fc731e 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -101,6 +101,61 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.4.0 - 2021-11-29">
+ <ol>
+ <li>update [閲嶇鏇存柊] 閲嶆瀯 Excel 瀵煎叆 鏀寔 Validator 鏍￠獙 鏀寔鑷畾涔夌洃鍚櫒</li>
+ <li>update [閲嶇鏇存柊] Validator 鏍￠獙妗嗘灦鏀寔鍥介檯鍖�</li>
+ <li>update springboot 2.5.6 => 2.5.7</li>
+ <li>update hutool 5.7.15 => 5.7.16</li>
+ <li>update okhttp 4.9.1 => 4.9.2</li>
+ <li>update spring-boot-admin 2.5.2 => 2.5.4</li>
+ <li>update redisson 3.16.3 => 3.16.4</li>
+ <li>update tlog 1.3.3 => 1.3.4</li>
+ <li>update axios 0.21.0 => 0.24.0</li>
+ <li>update core-js 3.8.1 => 3.19.1</li>
+ <li>update js-cookie 2.2.1 => 3.0.1</li>
+ <li>update velocity 1.7 => 2.3</li>
+ <li>update 鍗囩骇 docker 鍩虹闀滃儚</li>
+ <li>update 鍩轰簬 hutool 灏佽鏍戞瀯寤哄伐鍏� 閲嶆瀯閮ㄩ棬涓庤彍鍗曟爲缁撴瀯杩斿洖</li>
+ <li>update 鍑忓皯浣跨敤鐗瑰畾鏁版嵁搴撳嚱鏁�</li>
+ <li>update 閰嶇疆搴旂敤鍓嶇紑璺緞 鏀逛负閰嶇疆鏂囦欢缁熶竴閰嶇疆</li>
+ <li>update 鍗囩骇 swagger 閰嶇疆 浣跨敤 knife4j 澧炲己妯″紡</li>
+ <li>update 鐩戞帶涓績 闆嗘垚鐩戞帶瀹㈡埛绔� 瀹炵幇鑷洃鎺�</li>
+ <li>update 璋冨害涓績 闆嗘垚鐩戞帶瀹㈡埛绔� 娉ㄥ唽鍒扮洃鎺т腑蹇�</li>
+ <li>update 浼樺寲 tab 瀵硅薄绠�鍖栭〉绛炬搷浣�</li>
+ <li>update 瑙ｈ�� LoginUser 涓� SysUser 寮哄叧鑱�</li>
+ <li>update 鏇存柊 RepeatSubmit 娉ㄨВ aop 澶勭悊 閽堝鐗规畩鍙傛暟杩涜杩囨护</li>
+ <li>update DictUtils 瀛楀吀宸ュ叿绫� 鏍囪杩囨湡 3.5.0 鐗堟湰绉婚櫎 浣跨敤 DictService 浠ｆ浛</li>
+ <li>update 鎶借薄 DictService 閫氱敤 瀛楀吀鏈嶅姟</li>
+ <li>update 鎶借薄 ConfigService 閫氱敤 鍙傛暟閰嶇疆鏈嶅姟</li>
+ <li>update 鍩轰簬 DictService 閲嶆瀯 Excel 鍐呭瓧鍏告煡璇㈠姛鑳�</li>
+ <li>update OSS 妯″潡 鏁翠綋閲嶅懡鍚� 娑堥櫎姝т箟</li>
+ <li>update 鏇存柊 redis.conf 瀛樺偍绛栫暐 aof 涓� rdb 閰嶇疆鍙傛暟</li>
+ <li>update 鍒濆鍖栨暟鎹浆绉诲埌 ApplicationRunner 缁熶竴澶勭悊</li>
+ <li>update 浼樺寲鏃堕棿鏌ヨ璇彞</li>
+ <li>add 澧炲姞 妗嗘灦缂撳瓨鎳掑姞杞� 寮�鍏�</li>
+ <li>add 鏂板 鐩戞帶涓績 Bean 鍒濆鍖� startup trace 鐩戞帶鎻掍欢</li>
+ <li>add 澧炲姞 ValidatorUtils 鏍￠獙妗嗘灦宸ュ叿 鐢ㄤ簬鍦ㄩ潪 Controller 鐨勫湴鏂规牎楠屽璞�</li>
+ <li>fix 淇 SysOss銆丼ysOssConfig 鏈户鎵� BaseEntity 鍩虹瀹炰綋闂</li>
+ <li>fix 淇 xxl-job-admin 閮ㄧ讲闂</li>
+ <li>fix 淇 鍥炴樉鏁版嵁瀛楀吀閿�间慨姝�</li>
+ <li>fix 淇 Linux 娓呴櫎涓存椂鐩綍 瀵艰嚧涓婁紶鎵句笉鍒扮洰褰曟姤閿欓棶棰�</li>
+ <li>fix 淇閫氱敤瀹炰綋 浼犲弬鏃犳硶鎺ユ敹闂</li>
+ <li>fix 淇 SysLoginController 鎺ュ彛鏂囨。涔﹀啓閿欒闂</li>
+ <li>fix 淇 鐢ㄦ埛閫昏緫鍒犻櫎 宸紓闂</li>
+ <li>fix 淇 OSS 涓冪墰浜� token 杩囨湡鏈埛鏂伴棶棰�</li>
+ <li>fix 淇 鍒嗛〉宸ュ叿 鎺掑簭瀛楁 null 澶勭悊</li>
+ <li>fix 淇 鐢ㄦ埛瀵煎叆瀛楀吀浣跨敤閿欒</li>
+ <li>fix 淇 鍏抽棴 xss 鍔熻兘瀵艰嚧鍙噸澶嶈 RepeatableFilter 澶辨晥</li>
+ <li>fix 淇 浣跨敤 this.$options.data 鎶ラ敊闂</li>
+ <li>fix 淇 浠ｇ爜鐢熸垚澶嶉�夋瀛楀吀閬楁紡闂</li>
+ <li>fix 淇 閲嶅鎻愪氦涓嶇敓鏁堥棶棰� 鐢变簬姒傚康涓嶅悓 浣跨敤 RedisUtils 閲嶆瀯</li>
+ <li>fix 淇 OSS 宸ュ巶 鏈疄渚嬪寲鏈嶅姟鏇存柊鍔犺浇闂</li>
+ <li>remove 绉婚櫎 quartz 鐩稿叧浠ｇ爜涓庝緷璧�</li>
+ <li>remove 绉婚櫎 feign 鐩稿叧浠ｇ爜涓庝緷璧�</li>
+ <li>remove 绉婚櫎 MybatisPlusRedisCache 浜岀骇缂撳瓨</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.3.0 - 2021-10-29">
<ol>
<li>add [閲嶇鏇存柊] 澧炲姞鍒嗗竷寮忔棩蹇楁鏋� TLog</li>
@@ -533,7 +588,7 @@
data() {
return {
// 鐗堟湰鍙�
- version: "3.3.0",
+ version: "3.4.0",
};
},
methods: {
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 3782823..34c44b8 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.3.0"
+ image: "ruoyi/ruoyi-server:3.4.0"
container_name: ruoyi-server1
environment:
# 鏃跺尯涓婃捣
@@ -117,7 +117,7 @@
ipv4_address: 172.30.0.60
ruoyi-server2:
- image: "ruoyi/ruoyi-server:3.3.0"
+ image: "ruoyi/ruoyi-server:3.4.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.3.0"
+ image: "ruoyi/ruoyi-monitor-admin:3.4.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.3.0"
+ image: "ruoyi/ruoyi-xxl-job-admin:3.4.0"
container_name: ruoyi-xxl-job-admin
environment:
# 鏃跺尯涓婃捣
--
Gitblit v1.9.3