From 170cfb356c93c32fa804799c4bc9d02b83b21dae Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 12 七月 2021 08:42:11 +0800
Subject: [PATCH] 若依 3.6.0
---
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 | 41 ++++++++++++++++++++
ruoyi-generator/pom.xml | 2
pom.xml | 4 +-
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-common/pom.xml | 2
10 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 456b148..60c01e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.5.0</ruoyi.version>
+ <ruoyi.version>3.6.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>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 25016b0..a0cb8a8 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.5.0</version>
+ <version>3.6.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 3e6d53b..eb6af14 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.5.0
+ version: 3.6.0
# 鐗堟潈骞翠唤
copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 653cfdb..02be00c 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index e6a567c..eb58d18 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index d65176e..c87ee7c 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 477333c..67b7abd 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index c68f4c2..da5569e 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.5.0</version>
+ <version>3.6.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 3e5c3ea..b765eee 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.5.0",
+ "version": "3.6.0",
"description": "鑻ヤ緷绠＄悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index f824971..1fc8586 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -147,6 +147,45 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.6.0 - 2021-07-12">
+ <ol>
+ <li>瑙掕壊绠＄悊鏂板鍒嗛厤鐢ㄦ埛鍔熻兘</li>
+ <li>鐢ㄦ埛绠＄悊鏂板鍒嗛厤瑙掕壊鍔熻兘</li>
+ <li>鏃ュ織鍒楄〃鏀寔鎺掑簭鎿嶄綔</li>
+ <li>浼樺寲鍙傛暟&瀛楀吀缂撳瓨鎿嶄綔</li>
+ <li>绯荤粺甯冨眬閰嶇疆鏀寔鍔ㄦ�佹爣棰樺紑鍏�</li>
+ <li>鑿滃崟璺敱閰嶇疆鏀寔鍐呴摼璁块棶</li>
+ <li>榛樿璁块棶鍚庣棣栭〉鏂板鎻愮ず璇�</li>
+ <li>瀵屾枃鏈粯璁や笂浼犺繑鍥瀠rl绫诲瀷</li>
+ <li>鏂板鑷畾涔夊脊绐楁嫋鎷芥寚浠�</li>
+ <li>鍏ㄥ眬娉ㄥ唽甯哥敤閫氱敤缁勪欢</li>
+ <li>鍏ㄥ眬鎸傝浇瀛楀吀鏍囩缁勪欢</li>
+ <li>ImageUpload缁勪欢鏀寔澶氬浘鐗囦笂浼�</li>
+ <li>FileUpload缁勪欢鏀寔澶氭枃浠朵笂浼�</li>
+ <li>鏂囦欢涓婁紶缁勪欢娣诲姞鏁伴噺闄愬埗灞炴��</li>
+ <li>瀵屾枃鏈紪杈戠粍浠舵坊鍔犵被鍨嬪睘鎬�</li>
+ <li>瀵屾枃鏈粍浠跺伐鍏锋爮閰嶇疆瑙嗛</li>
+ <li>灏佽閫氱敤iframe缁勪欢</li>
+ <li>闄愬埗瓒呯骇绠＄悊鍛樹笉鍏佽鎿嶄綔</li>
+ <li>鐢ㄦ埛淇℃伅闀垮害鏍￠獙闄愬埗</li>
+ <li>鍒嗛〉缁勪欢鏂板pagerCount灞炴��</li>
+ <li>娣诲姞bat鑴氭湰鎵ц搴旂敤</li>
+ <li>鍗囩骇oshi鍒版渶鏂扮増鏈瑅5.7.4</li>
+ <li>鍗囩骇element-ui鍒版渶鏂扮増鏈�2.15.2</li>
+ <li>鍗囩骇pagehelper鍒版渶鏂扮増1.3.1</li>
+ <li>鍗囩骇commons.io鍒版渶鏂扮増鏈瑅2.10.0</li>
+ <li>鍗囩骇commons.fileupload鍒版渶鏂扮増鏈瑅1.4</li>
+ <li>鍗囩骇swagger鍒版渶鏂扮増鏈瑅3.0.0</li>
+ <li>淇鍏抽棴confirm鎻愮ず妗嗘帶鍒跺彴鎶ラ敊闂</li>
+ <li>淇瀛樺湪鐨凷QL娉ㄥ叆婕忔礊闂</li>
+ <li>瀹氭椂浠诲姟灞忚斀rmi杩滅▼璋冪敤</li>
+ <li>淇鐢ㄦ埛鎼滅储鍒嗛〉鍙橀噺閿欒</li>
+ <li>淇瀵煎嚭瑙掕壊鏁版嵁鑼冨洿缈昏瘧缂哄皯浠呮湰浜�</li>
+ <li>淇琛ㄥ崟鏋勫缓閫夋嫨涓嬫媺閫夋嫨鎺у埗鍙版姤閿欓棶棰�</li>
+ <li>浼樺寲鍥剧墖宸ュ叿绫昏鍙栨枃浠�</li>
+ <li>鍏朵粬缁嗚妭浼樺寲</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.5.0 - 2021-05-25">
<ol>
<li>鏂板鑿滃崟瀵艰埅鏄剧ず椋庢牸TopNav锛坒alse涓哄乏渚у鑸彍鍗曪紝true涓洪《閮ㄥ鑸彍鍗曪級</li>
@@ -566,7 +605,7 @@
data() {
return {
// 鐗堟湰鍙�
- version: "3.5.0",
+ version: "3.6.0",
};
},
methods: {
--
Gitblit v1.9.3