Skip to content

Commit

Permalink
若依 4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@yangzongzhuan
yangzongzhuan committed Aug 24, 2020
1 parent 9f21f88 commit e36334c
Show file tree
Hide file tree
Showing 15 changed files with 78 additions and 23 deletions.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>4.3.1</version>
<version>4.4.0</version>

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

<properties>
<ruoyi.version>4.3.1</ruoyi.version>
<ruoyi.version>4.4.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>
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.3.1</version>
<version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-admin/src/main/resources/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ruoyi:
# 名称
name: RuoYi
# 版本
version: 4.3.1
version: 4.4.0
# 版权年份
copyrightYear: 2019
# 实例演示开关
Expand Down
4 changes: 2 additions & 2 deletions ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h5>Summernote 富文本编辑器</h5>
<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.3.1
<b>当前版本：</b>v4.4.0
</p>
<p>
<span class="label label-warning">免费开源</span>
Expand Down Expand Up @@ -56,7 +56,7 @@ <h5>编辑/保存为html代码示例</h5>
<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.3.1
<b>当前版本：</b>v4.4.0
</p>
<p>
<span class="label label-warning">开源免费</span>
Expand Down
6 changes: 3 additions & 3 deletions ruoyi-admin/src/main/resources/templates/include.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=20200727}" rel="stylesheet"/>
<link th:href="@{/css/animate.css}" rel="stylesheet"/>
<link th:href="@{/css/style.css?v=20200727}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.3.1}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.4.0}" rel="stylesheet"/>
</head>

<!-- 通用JS -->
Expand All @@ -36,8 +36,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.3.1}"></script>
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.3.1}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.4.0}"></script>
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.4.0}"></script>
<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
</div>

Expand Down
6 changes: 3 additions & 3 deletions ruoyi-admin/src/main/resources/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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.3.1}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.4.0}" rel="stylesheet"/>
</head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">
<div id="wrapper">
Expand Down Expand Up @@ -248,8 +248,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.3.1}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.3.1}"></script>
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.4.0}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.4.0}"></script>
<script th:src="@{/ruoyi/index.js}"></script>
<script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
<script th:inline="javascript">
Expand Down
4 changes: 2 additions & 2 deletions ruoyi-admin/src/main/resources/templates/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.3.1}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.4.0}" rel="stylesheet"/>
<!-- 360浏览器急速模式 -->
<meta name="renderer" content="webkit">
<!-- 避免IE使用兼容模式 -->
Expand Down Expand Up @@ -78,7 +78,7 @@ <h4 class="no-margins">登录：</h4>
<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.3.1}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.4.0}"></script>
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
</body>
</html>
57 changes: 56 additions & 1 deletion ruoyi-admin/src/main/resources/templates/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,68 @@ <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="#v44">v4.4.0</a><code class="pull-right">2020.08.24</code>
</h5>
</div>
<div id="v44" class="panel-collapse collapse in">
<div class="panel-body">
<ol>
<li>升级bootstrapTable到最新版本1.17.1</li>
<li>升级shiro到最新版1.6.0 阻止权限绕过漏洞</li>
<li>升级fastjson到最新版1.2.73</li>
<li>代码生成支持同步数据库</li>
<li>代码生成支持富文本控件</li>
<li>用户密码支持自定义配置规则</li>
<li>新增表格自动刷新插件</li>
<li>新增表格打印配置插件</li>
<li>更换图片裁剪工具为cropper</li>
<li>Excel支持sort导出排序</li>
<li>代码生成支持自定义路径</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持上传控件</li>
<li>新增表格参数（自定义加载文本的字体大小loadingFontSize）</li>
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
<li>操作日志记录排除敏感属性字段</li>
<li>修复不同浏览器附件下载中文名乱码的问题</li>
<li>用户分配角色不允许选择超级管理员角色</li>
<li>更换表格冻结列插件</li>
<li>添加右侧冻结列示例</li>
<li>升级表格行编辑&移动端适应插件</li>
<li>修复更新表格插件后无法设置实例配置问题</li>
<li>修复更新表格插件后导致的主子表错误</li>
<li>修复页面存在多表格，回调函数res数据不正确问题</li>
<li>强退&过期清理登录帐号缓存会话</li>
<li>表格树标题内容支持html语义化标签</li>
<li>修复配置应用的访问路径首页页签重复问题</li>
<li>优化openTab打开时滚动到当前页签</li>
<li>表格请求方式method支持自定义配置</li>
<li>菜单页签联动优化</li>
<li>用户邮箱长度限制修改为50</li>
<li>主子表示例添加日期格式案例</li>
<li>修改表格行内编辑示例旧值参数</li>
<li>操作日志查询方式调整</li>
<li>唯一限制条件只返回单条数据</li>
<li>修改Excel设置STRING单元格类型</li>
<li>添加获取当前的环境配置方法</li>
<li>截取返回参数长度，防止超出异常</li>
<li>定时任务cron表达式验证</li>
<li>拆分表格插件，按需引入</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="#v431">v4.3.1</a><code class="pull-right">2020.07.05</code>
</h5>
</div>
<div id="v431" class="panel-collapse collapse in">
<div id="v431" class="panel-collapse collapse">
<div class="panel-body">
<ol>
<li>国家信息安全漏洞（请务必保持cipherKey密钥唯一性）</li>
Expand Down
4 changes: 2 additions & 2 deletions ruoyi-admin/src/main/resources/templates/register.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.3.1}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.4.0}" rel="stylesheet"/>
<!-- 360浏览器急速模式 -->
<meta name="renderer" content="webkit">
<!-- 避免IE使用兼容模式 -->
Expand Down Expand Up @@ -77,7 +77,7 @@ <h4 class="no-margins">注册：</h4>
<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.3.1}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.4.0}"></script>
<script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion ruoyi-admin/src/main/resources/templates/skin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</ul>
</body>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.3.1}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.4.0}"></script>
<script type="text/javascript">
//皮肤样式列表
var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.3.1</version>
<version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-framework/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.3.1</version>
<version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.3.1</version>
<version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-quartz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.3.1</version>
<version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.3.1</version>
<version>4.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down

0 comments on commit e36334c

Please sign in to comment.