From 5e64a93d115cfc65ef76eb0e4612d9a313448e29 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期二, 25 五月 2021 09:37:55 +0800 Subject: [PATCH] 若依 3.5.0 --- ruoyi-quartz/pom.xml | 2 ruoyi-ui/public/index.html | 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 | 42 ++++++++++++++++++++ ruoyi-ui/src/views/system/notice/index.vue | 2 ruoyi-generator/pom.xml | 2 pom.xml | 4 +- ruoyi-admin/src/main/resources/application.yml | 2 ruoyi-common/pom.xml | 2 12 files changed, 53 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index a3b0b1b..640387a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi</artifactId> - <version>3.4.0</version> + <version>3.5.0</version> <name>ruoyi</name> <url>http://www.ruoyi.vip</url> <description>鑻ヤ緷绠$悊绯荤粺</description> <properties> - <ruoyi.version>3.4.0</ruoyi.version> + <ruoyi.version>3.5.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 6b0a0fa..d58ad5b 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.4.0</version> + <version>3.5.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 cf043b0..3e6d53b 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.4.0 + version: 3.5.0 # 鐗堟潈骞翠唤 copyrightYear: 2021 # 瀹炰緥婕旂ず寮�鍏� diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index d63c3b4..653cfdb 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.4.0</version> + <version>3.5.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 38dc010..e6a567c 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.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 144fb5b..d65176e 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.4.0</version> + <version>3.5.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index cc2d760..477333c 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.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 81eb2a2..c68f4c2 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.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 fb0e916..c7e888c 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.4.0", + "version": "3.5.0", "description": "鑻ヤ緷绠$悊绯荤粺", "author": "鑻ヤ緷", "license": "MIT", diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html index 4e74001..56fd45b 100644 --- a/ruoyi-ui/public/index.html +++ b/ruoyi-ui/public/index.html @@ -7,7 +7,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <link rel="icon" href="<%= BASE_URL %>favicon.ico"> <title><%= webpackConfig.name %></title> - <!--[if lt IE 11]><script>window.location.href='html/ie.html';</script><![endif]--> + <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> <style> html, body, diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index b18cc6c..f824971 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -147,6 +147,46 @@ <span>鏇存柊鏃ュ織</span> </div> <el-collapse accordion> + <el-collapse-item title="v3.5.0 - 2021-05-25"> + <ol> + <li>鏂板鑿滃崟瀵艰埅鏄剧ず椋庢牸TopNav锛坒alse涓哄乏渚у鑸彍鍗曪紝true涓洪《閮ㄥ鑸彍鍗曪級</li> + <li>甯冨眬璁剧疆鏀寔淇濆瓨&閲嶇疆閰嶇疆</li> + <li>淇鏍戣〃鏁版嵁鏄剧ず涓嶅叏&鍔犺浇鎱㈤棶棰�</li> + <li>鏂板IE娴忚鍣ㄧ増鏈繃浣庢彁绀洪〉闈�</li> + <li>鐢ㄦ埛鐧诲綍鍚庤褰曟渶鍚庣櫥褰旾P&鏃堕棿</li> + <li>椤甸潰瀵煎嚭鎸夐挳鐐瑰嚮涔嬪悗娣诲姞閬僵</li> + <li>瀵屾枃鏈紪杈戝櫒鏀寔鑷畾涔変笂浼犲湴鍧�</li> + <li>瀵屾枃鏈紪杈戠粍浠舵柊澧瀝eadOnly灞炴��</li> + <li>椤电TagsView鏂板鍏抽棴鍙充晶鍔熻兘</li> + <li>鏄鹃殣鍒楃粍浠跺姞杞藉垵濮嬮粯璁ら殣钘忓垪</li> + <li>鍏抽棴澶村儚涓婁紶绐楀彛杩樺師榛樿鍥剧墖</li> + <li>涓汉淇℃伅娣诲姞鎵嬫満&閭閲嶅楠岃瘉</li> + <li>浠g爜鐢熸垚妯℃澘瀵煎嚭鎸夐挳鐐瑰嚮鍚庢坊鍔犻伄缃�</li> + <li>浠g爜鐢熸垚妯℃澘鏍戣〃鎿嶄綔鍒楁坊鍔犳柊澧炴寜閽�</li> + <li>浠g爜鐢熸垚妯℃澘淇涓诲瓙琛ㄥ瓧娈甸噸鍚嶉棶棰�</li> + <li>鍗囩骇fastjson鍒版渶鏂扮増1.2.76</li> + <li>鍗囩骇druid鍒版渶鏂扮増鏈瑅1.2.6</li> + <li>鍗囩骇mybatis鍒版渶鏂扮増3.5.6 闃绘杩滅▼浠g爜鎵ц婕忔礊</li> + <li>鍗囩骇oshi鍒版渶鏂扮増鏈瑅5.6.0</li> + <li>velocity鍓旈櫎commons-collections鐗堟湰锛岄槻姝�3.2.1鐗堟湰鐨勫弽搴忓垪鍖栨紡娲�</li> + <li>鏁版嵁鐩戞帶椤甸粯璁よ处鎴峰瘑鐮侀槻姝㈣秺鏉冭闂�</li> + <li>淇firefox涓嬭〃鍗曟瀯寤烘嫋鎷戒細鏂版墦鍗′竴涓�夐」鍗�</li> + <li>淇鍚庣瀵煎叆琛ㄦ潈闄愭爣璇�</li> + <li>淇鍓嶇鎿嶄綔鏃ュ織&鐧诲綍鏃ュ織鏉冮檺鏍囪瘑</li> + <li>璁剧疆Redis閰嶇疆HashKey搴忓垪鍖�</li> + <li>鍒犻櫎鎿嶄綔鏃ュ織璁板綍淇℃伅</li> + <li>涓婁紶濯掍綋绫诲瀷娣诲姞瑙嗛鏍煎紡</li> + <li>淇璇锋眰褰㈠弬鏈紶鍊艰褰曟棩蹇楀紓甯搁棶棰�</li> + <li>浼樺寲xss鏍¢獙json璇锋眰鏉′欢</li> + <li>鏍戠骇缁撴瀯鏇存柊瀛愯妭鐐逛娇鐢╮eplaceFirst</li> + <li>浼樺寲ExcelUtil绌哄�煎鐞�</li> + <li>鏃ュ織璁板綍杩囨护BindingResult瀵硅薄锛岄槻姝㈠紓甯�</li> + <li>淇敼涓婚鍚巑ini绫诲瀷鎸夐挳鏃犳晥闂</li> + <li>浼樺寲閫氱敤涓嬭浇瀹屾垚鍚庡垹闄よ妭鐐�</li> + <li>閫氱敤Controller娣诲姞鍝嶅簲杩斿洖娑堟伅</li> + <li>鍏朵粬缁嗚妭浼樺寲</li> + </ol> + </el-collapse-item> <el-collapse-item title="v3.4.0 - 2021-02-22"> <ol> <li>浠g爜鐢熸垚妯℃澘鏀寔涓诲瓙琛�</li> @@ -526,7 +566,7 @@ data() { return { // 鐗堟湰鍙� - version: "3.4.0", + version: "3.5.0", }; }, methods: { diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index cc22a10..7da4798 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -176,7 +176,7 @@ </template> <script> -import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice"; +import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice"; import Editor from '@/components/Editor'; export default { -- Gitblit v1.9.3