From ac99fddfe62caf4ec18fbfbe459699053860840f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 22 二月 2021 10:04:43 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-quartz/pom.xml | 2 +-
ruoyi-framework/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-admin/pom.xml | 2 +-
ruoyi-system/pom.xml | 2 +-
ruoyi-ui/src/views/index.vue | 34 +++++++++++++++++++++++++++++++++-
ruoyi-generator/pom.xml | 2 +-
pom.xml | 6 +++---
ruoyi-admin/src/main/resources/application.yml | 2 +-
ruoyi-common/pom.xml | 2 +-
10 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 41cda32..bef6fd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.3.0</ruoyi.version>
+ <ruoyi.version>3.4.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.2.12.RELEASE</version>
+ <version>2.2.13.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 57b0323..ae5fd0b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</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-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a2c1950..35919fa 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 3.3.0
+ version: 3.4.0
# 鐗堟潈骞翠唤
copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 4d55fb9..60fb69c 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</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-framework/pom.xml b/ruoyi-framework/pom.xml
index 969197a..1100a29 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</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 8a768f2..594d0b3 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</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-quartz/pom.xml b/ruoyi-quartz/pom.xml
index a6068a6..cc2d760 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</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 cddc6a3..81eb2a2 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</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/package.json b/ruoyi-ui/package.json
index 567842d..57fa9db 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.3.0",
+ "version": "3.4.0",
"description": "鑻ヤ緷绠＄悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 91667f5..d2ded93 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,38 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.4.0 - 2021-02-22">
+ <ol>
+ <li>浠ｇ爜鐢熸垚妯℃澘鏀寔涓诲瓙琛�</li>
+ <li>琛ㄦ牸鍙充晶宸ュ叿鏍忕粍浠舵敮鎸佹樉闅愬垪</li>
+ <li>鍥剧墖缁勪欢娣诲姞棰勮&绉婚櫎鍔熻兘</li>
+ <li>Excel娉ㄨВ鏀寔Image鍥剧墖瀵煎嚭</li>
+ <li>鎿嶄綔鎸夐挳缁勮皟鏁翠负鏈寸礌鎸夐挳鏍峰紡</li>
+ <li>浠ｇ爜鐢熸垚鏀寔鏂囦欢涓婁紶缁勪欢</li>
+ <li>浠ｇ爜鐢熸垚鏃ユ湡鎺т欢鍖哄垎鑼冨洿</li>
+ <li>浠ｇ爜鐢熸垚鏁版嵁搴撴枃鏈被鍨嬬敓鎴愯〃鍗曟枃鏈煙</li>
+ <li>鐢ㄦ埛鎵嬫満閭&鑿滃崟缁勪欢淇敼鍏佽绌哄瓧绗︿覆</li>
+ <li>鍗囩骇SpringBoot鍒版渶鏂扮増鏈�2.2.13 鎻愬崌鍚姩閫熷害</li>
+ <li>鍗囩骇druid鍒版渶鏂扮増鏈瑅1.2.4</li>
+ <li>鍗囩骇fastjson鍒版渶鏂扮増1.2.75</li>
+ <li>鍗囩骇element-ui鍒版渶鏂扮増鏈�2.15.0</li>
+ <li>淇IE11娴忚鍣ㄦ姤閿欓棶棰�</li>
+ <li>浼樺寲澶氱骇鑿滃崟涔嬮棿鍒囨崲鏃犳硶缂撳瓨鐨勯棶棰�</li>
+ <li>淇鍥涚骇鑿滃崟鏃犳硶鏄剧ず闂</li>
+ <li>淇渚ц竟鏍忛潤鎬佽矾鐢变涪澶遍棶棰�</li>
+ <li>淇瑙掕壊绠＄悊-缂栬緫瑙掕壊-鍔熻兘鏉冮檺鏄剧ず寮傚父</li>
+ <li>閰嶇疆鏂囦欢鏂板redis鏁版嵁搴撶储寮曞睘鎬�</li>
+ <li>鏉冮檺宸ュ叿绫诲鍔燼dmin鍒ゆ柇</li>
+ <li>瑙掕壊闈炶嚜瀹氫箟鏉冮檺鑼冨洿娓呯┖閫夋嫨鍊�</li>
+ <li>淇瀵煎叆鏁版嵁涓鸿礋娴偣鏁版椂涓㈠け绮惧害闂</li>
+ <li>绉婚櫎path-to-regexp姝ｅ垯鍖归厤鎻掍欢</li>
+ <li>淇鐢熸垚鏍戣〃浠ｇ爜寮傚父</li>
+ <li>淇敼ip瀛楁闀垮害闃叉ipv6鍦板潃闀垮害涓嶅</li>
+ <li>闃叉get璇锋眰鍙傛暟鍊间负false鎴�0绛夌壒娈婂�间細瀵艰嚧鏃犳硶姝ｇ‘鐨勪紶鍙�</li>
+ <li>鐧诲綍鍚巔ush娣诲姞catch闃叉鍑虹幇妫�鏌ラ敊璇�</li>
+ <li>鍏朵粬缁嗚妭浼樺寲</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.3.0 - 2020-12-14">
<ol>
<li>鏂板缂撳瓨鐩戞帶鍔熻兘</li>
@@ -493,7 +525,7 @@
data() {
return {
// 鐗堟湰鍙�
- version: "3.3.0",
+ version: "3.4.0",
};
},
methods: {
--
Gitblit v1.9.3