Skip to content

Commit 6d3c988

Browse files
yangzongzhuanyangzongzhuan
committedNov 10, 2021
若依 v4.7.1
1 parent 618b81b commit 6d3c988

File tree

18 files changed

+83
-29
lines changed

18 files changed

+83
-29
lines changed
 

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>com.ruoyi</groupId>
77
<artifactId>ruoyi</artifactId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99

1010
<name>ruoyi</name>
1111
<url>http://www.ruoyi.vip</url>
1212
<description>若依管理系统</description>
1313

1414
<properties>
15-
<ruoyi.version>4.7.0</ruoyi.version>
15+
<ruoyi.version>4.7.1</ruoyi.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1818
<java.version>1.8</java.version>

‎ruoyi-admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>

‎ruoyi-admin/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ruoyi:
33
# 名称
44
name: RuoYi
55
# 版本
6-
version: 4.7.0
6+
version: 4.7.1
77
# 版权年份
88
copyrightYear: 2021
99
# 实例演示开关

‎ruoyi-admin/src/main/resources/templates/demo/form/summernote.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h5>Summernote 富文本编辑器</h5>
1717
<h2>若依后台管理系统</h2>
1818
<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>
1919
<p>
20-
<b>当前版本：</b>v4.7.0
20+
<b>当前版本：</b>v4.7.1
2121
</p>
2222
<p>
2323
<span class="label label-warning">免费开源</span>
@@ -56,7 +56,7 @@ <h5>编辑/保存为html代码示例</h5>
5656
<h3>你好，若依 </h3>
5757
<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>
5858
<p>
59-
<b>当前版本：</b>v4.7.0
59+
<b>当前版本：</b>v4.7.1
6060
</p>
6161
<p>
6262
<span class="label label-warning">开源免费</span>

‎ruoyi-admin/src/main/resources/templates/include.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<meta name="description" content="">
88
<title th:text="${title}"></title>
99
<link th:href="@{/css/bootstrap.min.css?v=3.3.7}" rel="stylesheet"/>
10-
<link th:href="@{/css/font-awesome.min.css?v=4.7.0}" rel="stylesheet"/>
10+
<link th:href="@{/css/font-awesome.min.css?v=4.7.1}" rel="stylesheet"/>
1111
<!-- bootstrap-table 表格插件样式 -->
1212
<link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=1.18.3}" rel="stylesheet"/>
1313
<link th:href="@{/css/animate.min.css?v=20210831}" rel="stylesheet"/>
1414
<link th:href="@{/css/style.min.css?v=20210831}" rel="stylesheet"/>
15-
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
15+
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
1616
</head>
1717

1818
<!-- 通用JS -->
@@ -36,8 +36,8 @@
3636
<script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>
3737
<script th:src="@{/ajax/libs/layer/layer.min.js?v=3.5.1}"></script>
3838
<script th:src="@{/ajax/libs/layui/layui.min.js?v=2.6.8}"></script>
39-
<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
40-
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
39+
<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
40+
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
4141
</div>
4242

4343
<!-- ztree树插件 -->

‎ruoyi-admin/src/main/resources/templates/index-topnav.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
1515
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
1616
<link th:href="@{/css/skins.css?v=20200902}" rel="stylesheet"/>
17-
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
17+
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
1818
</head>
1919
<body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
2020
<div id="wrapper">
@@ -315,8 +315,8 @@
315315
<script th:src="@{/js/jquery.contextMenu.min.js}"></script>
316316
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
317317
<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
318-
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
319-
<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
318+
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
319+
<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
320320
<script th:src="@{/ruoyi/index.js?v=20201208}"></script>
321321
<script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
322322
<script th:src="@{/js/resize-tabs.js}"></script>

‎ruoyi-admin/src/main/resources/templates/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
1515
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
1616
<link th:href="@{/css/skins.css}" rel="stylesheet"/>
17-
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
17+
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
1818
</head>
1919
<body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
2020
<div id="wrapper">
@@ -262,8 +262,8 @@
262262
<script th:src="@{/js/jquery.contextMenu.min.js}"></script>
263263
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
264264
<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
265-
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
266-
<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
265+
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
266+
<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
267267
<script th:src="@{/ruoyi/index.js?v=20201208}"></script>
268268
<script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
269269
<script th:inline="javascript">

‎ruoyi-admin/src/main/resources/templates/lock.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script>
3939
<script src="../static/js/three.min.js" th:src="@{/js/three.min.js}"></script>
4040
<script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
41-
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
41+
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
4242
</body>
4343
<script th:inline="javascript">
4444
var ctx = [[@{/}]];

‎ruoyi-admin/src/main/resources/templates/login.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
1010
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
1111
<link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
12-
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
12+
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
1313
<!-- 360浏览器急速模式 -->
1414
<meta name="renderer" content="webkit">
1515
<!-- 避免IE使用兼容模式 -->
@@ -76,7 +76,7 @@ <h4 class="no-margins">登录：</h4>
7676
<script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
7777
<script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
7878
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
79-
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
79+
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
8080
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
8181
</body>
8282
</html>

‎ruoyi-admin/src/main/resources/templates/main.html

+55-1
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,67 @@ <h5>更新日志</h5>
9696
<div class="ibox-content no-padding">
9797
<div class="panel-body">
9898
<div class="panel-group" id="version">
99+
<div class="panel panel-default">
100+
<div class="panel-heading">
101+
<h5 class="panel-title">
102+
<a data-toggle="collapse" data-parent="#version" href="#v471">v4.7.1</a><code class="pull-right">2021.11.10</code>
103+
</h5>
104+
</div>
105+
<div id="v471" class="panel-collapse collapse in">
106+
<div class="panel-body">
107+
<ol>
108+
<li>新增是否开启页签功能</li>
109+
<li>代码生成的模块增加创建表功能</li>
110+
<li>Excel导入支持@Excels注解</li>
111+
<li>Excel注解支持导入导出标题信息</li>
112+
<li>Excel注解支持自定义数据处理器</li>
113+
<li>日志注解新增是否保存响应参数</li>
114+
<li>防重提交注解支持配置间隔时间/提示消息</li>
115+
<li>网页部分操作禁止使用后退键（Backspace）</li>
116+
<li>实例演示中增加多层窗口获取值</li>
117+
<li>弹出层openOptions增加动画属性</li>
118+
<li>升级spring-boot到最新版本2.5.6</li>
119+
<li>升级spring-boot-mybatis到最新版2.2.0</li>
120+
<li>升级pagehelper到最新版1.4.0</li>
121+
<li>升级oshi到最新版本v5.8.2</li>
122+
<li>升级druid到最新版1.2.8</li>
123+
<li>升级fastjson到最新版1.2.78</li>
124+
<li>升级thymeleaf-extras-shiro到最新版本v2.1.0</li>
125+
<li>升级bootstrap-fileinput到最新版本v5.2.4</li>
126+
<li>修改阿里云maven仓库地址为新版地址</li>
127+
<li>定时任务屏蔽违规字符</li>
128+
<li>增加sendGet无参请求方法</li>
129+
<li>代码生成去掉多余的排序字段</li>
130+
<li>优化启动脚本参数优化</li>
131+
<li>优化页签关闭右侧清除iframe元素</li>
132+
<li>优化多表格切换表单查询参数</li>
133+
<li>优化表格实例切换event不能为空</li>
134+
<li>优化mybatis全局默认的执行器</li>
135+
<li>优化导入Excel数据关闭时清理file</li>
136+
<li>优化Excel导入图片可能出现的异常</li>
137+
<li>优化记录登录信息，防止不必要的修改</li>
138+
<li>优化aop语法，使用spring自动注入注解</li>
139+
<li>修复无法被反转义问题</li>
140+
<li>修复拖拽行数据错位问题</li>
141+
<li>修复新窗口打开页面关闭弹窗报错</li>
142+
<li>修复富文本回退键被禁止&控制台报错问题</li>
143+
<li>修复自定义弹出层全屏参数无效问题</li>
144+
<li>修复树表代码生成短字段无法识别问题</li>
145+
<li>修复apple/webkit浏览器时间无法格式化</li>
146+
<li>修复后端主子表代码模板方法名生成错误问题</li>
147+
<li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
148+
<li>其他细节优化</li>
149+
</ol>
150+
</div>
151+
</div>
152+
</div>
99153
<div class="panel panel-default">
100154
<div class="panel-heading">
101155
<h5 class="panel-title">
102156
<a data-toggle="collapse" data-parent="#version" href="#v470">v4.7.0</a><code class="pull-right">2021.09.01</code>
103157
</h5>
104158
</div>
105-
<div id="v470" class="panel-collapse collapse in">
159+
<div id="v470" class="panel-collapse collapse">
106160
<div class="panel-body">
107161
<ol>
108162
<li>优化弹出层显示在顶层窗口</li>

‎ruoyi-admin/src/main/resources/templates/register.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
1010
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
1111
<link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
12-
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
12+
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.1}" rel="stylesheet"/>
1313
<!-- 360浏览器急速模式 -->
1414
<meta name="renderer" content="webkit">
1515
<!-- 避免IE使用兼容模式 -->
@@ -74,7 +74,7 @@ <h4 class="no-margins">注册：</h4>
7474
<script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
7575
<script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
7676
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
77-
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
77+
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
7878
<script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
7979
</body>
8080
</html>

‎ruoyi-admin/src/main/resources/templates/skin.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
</ul>
141141
</body>
142142
<script th:src="@{/js/jquery.min.js}"></script>
143-
<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
143+
<script th:src="@{/ruoyi/js/common.js?v=4.7.1}"></script>
144144
<script type="text/javascript">
145145
//皮肤样式列表
146146
var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];

‎ruoyi-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ruoyi-framework/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ruoyi-generator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ruoyi-quartz/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ruoyi-quartz/src/main/resources/templates/monitor/job/cron.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ <h4>表达式</h4>
11311131
<script th:src="@{/js/jquery.min.js}"></script>
11321132
<script th:src="@{/js/bootstrap.min.js}"></script>
11331133
<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
1134-
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
1134+
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.1}"></script>
11351135
<script th:src="@{/js/cron.js}"></script>
11361136
<script th:inline="javascript">
11371137
var prefix = [[@{/}]] + "monitor/job";

‎ruoyi-system/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>4.7.0</version>
8+
<version>4.7.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)
Failed to load comments.