From 6bb3297db8ce6b665b35cc52878c44d9372e9def Mon Sep 17 00:00:00 2001
From: sxile <3440626@qq.com>
Date: Tue, 12 Nov 2019 15:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=204.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                           |  2 +-
 .../templates/demo/form/summernote.html       |  4 +-
 .../src/main/resources/templates/include.html |  4 +-
 .../src/main/resources/templates/index.html   | 13 +++--
 .../src/main/resources/templates/login.html   |  4 +-
 .../src/main/resources/templates/main.html    | 53 +++++++++++++++++--
 .../src/main/resources/templates/skin.html    |  2 +-
 ruoyi-common/pom.xml                          |  2 +-
 .../java/com/ruoyi/common/config/Global.java  |  2 +-
 ruoyi-framework/pom.xml                       |  2 +-
 ruoyi-generator/pom.xml                       |  2 +-
 ruoyi-quartz/pom.xml                          |  2 +-
 ruoyi-system/pom.xml                          |  2 +-
 13 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 87311e4..487d11d 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html b/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
index 7d6820f..1222d98 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
@@ -17,7 +17,7 @@
                             <h2>若依后台管理系统</h2>
                             <p>ruoyi是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
                             <p>
-                                <b>当前版本：</b>v4.0.0
+                                <b>当前版本：</b>v4.1.0
                             </p>
                             <p>
                                 <span class="label label-warning">免费开源</span>
@@ -56,7 +56,7 @@
                             <h3>你好，若依 </h3>
                             <p>H+是一个完全响应式，基于Bootstrap3.3.6最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
                             <p>
-                                <b>当前版本：</b>v4.0.0
+                                <b>当前版本：</b>v4.1.0
                             </p>
                             <p>
                                 <span class="label label-warning">开源免费</span>
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index e0167d4..82099d2 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -39,8 +39,8 @@
     <script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
 	<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 	<script th:src="@{/ajax/libs/layui/layui.js}"></script>
-	<script th:src="@{/ruoyi/js/common.js?v=4.0.0}"></script>
-	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.0.0}"></script>
+	<script th:src="@{/ruoyi/js/common.js?v=4.1.0}"></script>
+	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.1.0}"></script>
 	<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 9682c66..5c2c2dd 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -15,7 +15,7 @@
 	<link th:href="@{/css/animate.css}" rel="stylesheet"/>
 	<link th:href="@{/css/style.css}" rel="stylesheet"/>
 	<link th:href="@{/css/skins.css}" rel="stylesheet"/>
-	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.0.0}" rel="stylesheet"/>
+	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.1.0}" rel="stylesheet"/>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">
 <div id="wrapper">
@@ -241,8 +241,8 @@
 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>
 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-<script th:src="@{/ruoyi/js/ry-ui.js?v=4.0.0}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.0.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.1.0}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.1.0}"></script>
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
@@ -275,12 +275,17 @@
 			})
 		}
 
+		// 排除非左侧菜单链接
+		var excludesUrl = ["/system/user/profile"];
+
 		$(function() {
 			var hash = location.hash;
 			if (hash !== '') {
 				var url = hash.substring(1, hash.length);
-				$('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
 				$('a[href$="' + url + '"]').click();
+				if($.inArray(url, excludesUrl)){
+					$('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
+				}
 			}
 		});
 </script>
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 3f356ce..0f089f3 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -10,7 +10,7 @@
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
-    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.0.0}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.1.0}" rel="stylesheet"/>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
@@ -80,7 +80,7 @@
 <script src="../static/ajax/libs/validate/messages_zh.min.js" th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.0.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.1.0}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
index 0694e90..9948d5c 100644
--- a/ruoyi-admin/src/main/resources/templates/main.html
+++ b/ruoyi-admin/src/main/resources/templates/main.html
@@ -81,8 +81,8 @@
                     <div class="ibox-content">
                         <p><i class="fa fa-send-o"></i> 官网：<a href="http://www.ruoyi.vip" target="_blank">http://www.ruoyi.vip</a>
                         </p>
-                        <p><i class="fa fa-qq"></i> QQ群：<s>满1389287</s> <s>满1679294</s> <s>满1529866</s> <s>满1772718</s> <s>满1366522</s> <s>满1382251</s> <a href="https://jq.qq.com/?_wv=1027&k=5fdQ1eG" target="_blank">1145125</a>
-                        </p>
+						<p><i class="fa fa-qq"></i> QQ群：<s>满1389287</s> <s>满1679294</s> <s>满1529866</s> <s>满1772718</s> <s>满1366522</s> <s>满1382251</s> <s>满1145125</s> <a href="https://jq.qq.com/?_wv=1027&k=5IdFWW8" target="_blank">86752435</a>
+						</p>
                         <p><i class="fa fa-weixin"></i> 微信：<a href="javascript:;">/ *若依</a>
                         </p>
                         <p><i class="fa fa-credit-card"></i> 支付宝：<a href="javascript:;" class="支付宝信息">/ *若依</a>
@@ -101,10 +101,57 @@
                             <div class="panel panel-default">
 								<div class="panel-heading">
 								   <h5 class="panel-title">
+									   <a data-toggle="collapse" data-parent="#version" href="#v41">v4.1.0</a><code class="pull-right">2019.10.22</code>
+								   </h5>
+								</div>
+								<div id="v41" class="panel-collapse collapse in">
+									<div class="panel-body">
+										<ol>
+											<li>支持多表格实例操作</li>
+											<li>浮动提示方法tooltip支持弹窗</li>
+											<li>代码生成&字典数据支持模糊条件查询</li>
+											<li>增加页签全屏方法</li>
+											<li>增加清除表单验证错误信息方法</li>
+											<li>支持iframe局部刷新页面</li>
+											<li>支持在线切换主题</li>
+											<li>修改图片预览设置的高宽参数颠倒问题</li>
+											<li>操作日志新增解锁账户功能</li>
+											<li>管理员用户&角色不允许操作</li>
+											<li>去掉jsoup包调用自定义转义工具</li>
+											<li>添加时间轴示例</li>
+											<li>修复翻页记住选择时获取指定列值的问题</li>
+											<li>代码生成sql脚本添加导出按钮</li>
+											<li>添加表格父子视图示例</li>
+											<li>添加表格行内编辑示例</li>
+											<li>升级fastjson到最新版1.2.60 阻止漏洞攻击</li>
+											<li>升级echarts到最新版4.2.1</li>
+											<li>操作日志新增返回参数</li>
+											<li>支持mybatis通配符扫描任意多个包</li>
+											<li>权限验证多种情况处理</li>
+											<li>修复树形类型的代码生成的部分必要属性无法显示</li>
+											<li>修复非表格插件情况下重置出现异常</li>
+											<li>修复富文本编辑器有序列表冲突</li>
+											<li>代码生成表前缀配置支持多个</li>
+											<li>修复自动去除表前缀配置无效问题</li>
+											<li>菜单列表按钮数据可见不显示（权限标识控制）</li>
+											<li>修复设置会话超时时间无效问题</li>
+											<li>新增本地资源通用下载方法</li>
+											<li>操作日志记录新增请求方式</li>
+											<li>代码生成单选按钮属性重名修复</li>
+											<li>优化select2下拉框宽度不会随浏览器改变</li>
+											<li>修复代码生成树表异常</li>
+											<li>其他细节优化</li>
+										</ol>
+									</div>
+								</div>
+							</div>
+								<div class="panel panel-default">
+									<div class="panel-heading">
+										<h5 class="panel-title">
 									   <a data-toggle="collapse" data-parent="#version" href="#v40">v4.0.0</a><code class="pull-right">2019.08.08</code>
 								   </h5>
 								</div>
-								<div id="v40" class="panel-collapse collapse in">
+									<div id="v40" class="panel-collapse collapse">
 									<div class="panel-body">
 									   <ol>
 									        <li>代码生成支持预览、编辑，保存方案</li>
diff --git a/ruoyi-admin/src/main/resources/templates/skin.html b/ruoyi-admin/src/main/resources/templates/skin.html
index 4f3d1fd..8984635 100644
--- a/ruoyi-admin/src/main/resources/templates/skin.html
+++ b/ruoyi-admin/src/main/resources/templates/skin.html
@@ -121,7 +121,7 @@
 </ul>
 </body>
 <script th:src="@{/js/jquery.min.js}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.0.0}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.1.0}"></script>
 <script type="text/javascript">
     //皮肤样式列表
     var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 24e2654..5d26e4b 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java
index 2d26803..7feb34a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java
@@ -81,7 +81,7 @@ public class Global
      */
     public static String getVersion()
     {
-        return StringUtils.nvl(getConfig("ruoyi.version"), "4.0.0");
+        return StringUtils.nvl(getConfig("ruoyi.version"), "4.1.0");
     }
 
     /**
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index f894e8e..1156bc3 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 9a1e476..4baa8e3 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index d9d37d2..6bc7a9d 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 40b0235..6658a64 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>