若依 v4.7.1

yangzongzhuan · Nov 10, 2021 · 0413a6e · 0413a6e
1 parent 70d3db2
commit 0413a6e
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
  <groupId>com.ruoyi</groupId>
  <artifactId>ruoyi</artifactId>
- <version>4.7.0</version>
+ <version>4.7.1</version>
  <packaging>jar</packaging>
 
  <name>ruoyi</name>

diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -38,7 +38,7 @@ public class HttpUtils
  */
  public static String sendGet(String url)
  {
- return sendGet(url, StringUtils.EMPTY, Constants.UTF8);
+ return sendGet(url, StringUtils.EMPTY);
  }
 
  /**

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
  # 名称
  name: RuoYi
  # 版本
- version: 4.7.0
+ version: 4.7.1
  # 版权年份
  copyrightYear: 2021
  # 实例演示开关

diff --git a/src/main/resources/templates/demo/form/summernote.html b/src/main/resources/templates/demo/form/summernote.html
@@ -17,7 +17,7 @@ <h5>Summernote 富文本编辑器</h5>
  <h2>若依后台管理系统</h2>
  <p>ruoyi是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了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.7.0
+ <b>当前版本：</b>v4.7.1
  </p>
  <p>
  <span class="label label-warning">免费开源</span>
@@ -56,7 +56,7 @@ <h5>编辑/保存为html代码示例</h5>
  <h3>你好，若依 </h3>
  <p>H+是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了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.7.0
+ <b>当前版本：</b>v4.7.1
  </p>
  <p>
  <span class="label label-warning">开源免费</span>

diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html
@@ -7,12 +7,12 @@
  <meta name="description" content="">
  <title th:text="${title}"></title>
  <link th:href="@{/css/bootstrap.min.css?v=3.3.7}" rel="stylesheet"/>
- <link th:href="@{/css/font-awesome.min.css?v=4.7.0}" rel="stylesheet"/>
+ <link th:href="@{/css/font-awesome.min.css?v=4.7.1}" rel="stylesheet"/>
  <!-- bootstrap-table 表格插件样式 -->
  <link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=1.18.3}" rel="stylesheet"/>
  <link th:href="@{/css/animate.min.css?v=20210831}" rel="stylesheet"/>
  <link th:href="@{/css/style.min.css?v=20210831}" rel="stylesheet"/>
- <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
+ <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
 </head>
 
 <!-- 通用JS -->
@@ -36,8 +36,8 @@
  <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>
  <script th:src="@{/ajax/libs/layer/layer.min.js?v=3.5.1}"></script>
  <script th:src="@{/ajax/libs/layui/layui.min.js?v=2.6.8}"></script>
- <script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
- <script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
+ <script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
+ <script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
 </div>
 
 <!-- ztree树插件 -->

diff --git a/src/main/resources/templates/index-topnav.html b/src/main/resources/templates/index-topnav.html
@@ -14,7 +14,7 @@
  <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
  <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
  <link th:href="@{/css/skins.css?v=20200902}" rel="stylesheet"/>
- <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
+ <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
 <div id="wrapper">
@@ -315,8 +315,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.7.0}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
 <script th:src="@{/ruoyi/index.js?v=20201208}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:src="@{/js/resize-tabs.js}"></script>

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -14,7 +14,7 @@
  <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
  <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
  <link th:href="@{/css/skins.css}" rel="stylesheet"/>
- <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
+ <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
 <div id="wrapper">
@@ -262,8 +262,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.7.0}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
 <script th:src="@{/ruoyi/index.js?v=20201208}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">

diff --git a/src/main/resources/templates/lock.html b/src/main/resources/templates/lock.html
@@ -38,7 +38,7 @@
 <script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script>
 <script src="../static/js/three.min.js" th:src="@{/js/three.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
 </body>
 <script th:inline="javascript">
  var ctx = [[@{/}]];

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -9,7 +9,7 @@
  <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
  <link href="../static/css/style.min.css" th:href="@{/css/style.min.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.7.0}" rel="stylesheet"/>
+ <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
  <!-- 360浏览器急速模式 -->
  <meta name="renderer" content="webkit">
  <!-- 避免IE使用兼容模式 -->
@@ -76,7 +76,7 @@ <h4 class="no-margins">登录：</h4>
 <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.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.7.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
@@ -96,13 +96,67 @@ <h5>更新日志</h5>
  <div class="ibox-content no-padding">
  <div class="panel-body">
  <div class="panel-group" id="version">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h5 class="panel-title">
+ <a data-toggle="collapse" data-parent="#version" href="#v471">v4.7.1</a><code class="pull-right">2021.11.10</code>
+ </h5>
+ </div>
+ <div id="v471" class="panel-collapse collapse in">
+ <div class="panel-body">
+ <ol>
+ <li>新增是否开启页签功能</li>
+ <li>代码生成的模块增加创建表功能</li>
+ <li>Excel导入支持@Excels注解</li>
+ <li>Excel注解支持导入导出标题信息</li>
+ <li>Excel注解支持自定义数据处理器</li>
+ <li>日志注解新增是否保存响应参数</li>
+ <li>防重提交注解支持配置间隔时间/提示消息</li>
+ <li>网页部分操作禁止使用后退键（Backspace）</li>
+ <li>实例演示中增加多层窗口获取值</li>
+ <li>弹出层openOptions增加动画属性</li>
+ <li>升级spring-boot到最新版本2.5.6</li>
+ <li>升级spring-boot-mybatis到最新版2.2.0</li>
+ <li>升级pagehelper到最新版1.4.0</li>
+ <li>升级oshi到最新版本v5.8.2</li>
+ <li>升级druid到最新版1.2.8</li>
+ <li>升级fastjson到最新版1.2.78</li>
+ <li>升级thymeleaf-extras-shiro到最新版本v2.1.0</li>
+ <li>升级bootstrap-fileinput到最新版本v5.2.4</li>
+ <li>修改阿里云maven仓库地址为新版地址</li>
+ <li>定时任务屏蔽违规字符</li>
+ <li>增加sendGet无参请求方法</li>
+ <li>代码生成去掉多余的排序字段</li>
+ <li>优化启动脚本参数优化</li>
+ <li>优化页签关闭右侧清除iframe元素</li>
+ <li>优化多表格切换表单查询参数</li>
+ <li>优化表格实例切换event不能为空</li>
+ <li>优化mybatis全局默认的执行器</li>
+ <li>优化导入Excel数据关闭时清理file</li>
+ <li>优化Excel导入图片可能出现的异常</li>
+ <li>优化记录登录信息，防止不必要的修改</li>
+ <li>优化aop语法，使用spring自动注入注解</li>
+ <li>修复无法被反转义问题</li>
+ <li>修复拖拽行数据错位问题</li>
+ <li>修复新窗口打开页面关闭弹窗报错</li>
+ <li>修复富文本回退键被禁止&控制台报错问题</li>
+ <li>修复自定义弹出层全屏参数无效问题</li>
+ <li>修复树表代码生成短字段无法识别问题</li>
+ <li>修复apple/webkit浏览器时间无法格式化</li>
+ <li>修复后端主子表代码模板方法名生成错误问题</li>
+ <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</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="#v470">v4.7.0</a><code class="pull-right">2021.09.01</code>
  </h5>
  </div>
- <div id="v470" class="panel-collapse collapse in">
+ <div id="v470" class="panel-collapse collapse">
  <div class="panel-body">
  <ol>
  <li>优化弹出层显示在顶层窗口</li>

diff --git a/src/main/resources/templates/monitor/job/cron.html b/src/main/resources/templates/monitor/job/cron.html
@@ -1131,7 +1131,7 @@ <h4>表达式</h4>
 <script th:src="@{/js/jquery.min.js}"></script>
 <script th:src="@{/js/bootstrap.min.js}"></script>
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
 <script th:src="@{/js/cron.js}"></script>
 <script th:inline="javascript">
 var prefix = [[@{/}]] + "monitor/job";

diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html
@@ -9,7 +9,7 @@
  <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
  <link href="../static/css/style.min.css" th:href="@{/css/style.min.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.7.0}" rel="stylesheet"/>
+ <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
  <!-- 360浏览器急速模式 -->
  <meta name="renderer" content="webkit">
  <!-- 避免IE使用兼容模式 -->
@@ -74,7 +74,7 @@ <h4 class="no-margins">注册：</h4>
 <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.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.7.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
 <script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/skin.html b/src/main/resources/templates/skin.html
@@ -140,7 +140,7 @@
 </ul>
 </body>
 <script th:src="@{/js/jquery.min.js}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
 <script type="text/javascript">
 //皮肤样式列表
 var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];