Начало Каталог Помощ
Регистрация Вход
sunwei
/
education_nanguan
Наблюдаван 1
Харесван 0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

若依 v4.7.3

RuoYi преди 3 години
родител
893b29cae8
ревизия
4613984fb4
променени са 19 файла, в които са добавени 72 реда и са изтрити 31 реда
Разделен изглед Покажи статистика за разликите
  1. 2 2
      README.md
  2. 2 2
      pom.xml
  3. 1 1
      ruoyi-admin/pom.xml
  4. 1 1
      ruoyi-admin/src/main/resources/application.yml
  5. 2 2
      ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
  6. 4 4
      ruoyi-admin/src/main/resources/templates/include.html
  7. 3 3
      ruoyi-admin/src/main/resources/templates/index-topnav.html
  8. 3 3
      ruoyi-admin/src/main/resources/templates/index.html
  9. 1 1
      ruoyi-admin/src/main/resources/templates/lock.html
  10. 2 2
      ruoyi-admin/src/main/resources/templates/login.html
  11. 42 1
      ruoyi-admin/src/main/resources/templates/main.html
  12. 2 2
      ruoyi-admin/src/main/resources/templates/register.html
  13. 1 1
      ruoyi-admin/src/main/resources/templates/skin.html
  14. 1 1
      ruoyi-common/pom.xml
  15. 1 1
      ruoyi-framework/pom.xml
  16. 1 1
      ruoyi-generator/pom.xml
  17. 1 1
      ruoyi-quartz/pom.xml
  18. 1 1
      ruoyi-quartz/src/main/resources/templates/monitor/job/cron.html
  19. 1 1
      ruoyi-system/pom.xml

+ 2 - 2
README.md
Целия файл 

@@ -1,11 +1,11 @@
 
 <p align="center">

 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-dd77653d7c9f197dd9d93684f3c8dcfbab6.png">

 </p>

-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v4.7.2</h1>

+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v4.7.3</h1>

 <h4 align="center">基于SpringBoot开发的轻量级Java快速开发框架</h4>

 <p align="center">

 	<a href="https://gitee.com/y_project/RuoYi/stargazers"><img src="https://gitee.com/y_project/RuoYi/badge/star.svg?theme=gvp"></a>

-	<a href="https://gitee.com/y_project/RuoYi"><img src="https://img.shields.io/badge/RuoYi-v4.7.2-brightgreen.svg"></a>

+	<a href="https://gitee.com/y_project/RuoYi"><img src="https://img.shields.io/badge/RuoYi-v4.7.3-brightgreen.svg"></a>

 	<a href="https://gitee.com/y_project/RuoYi/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>

 </p>

+ 2 - 2
pom.xml
Целия файл 

@@ -5,14 +5,14 @@
 
 
     <groupId>com.ruoyi</groupId>
 
     <artifactId>ruoyi</artifactId>
 
-    <version>4.7.2</version>
 
+    <version>4.7.3</version>
 
 
     <name>ruoyi</name>
 
     <url>http://www.ruoyi.vip</url>
 
     <description>若依管理系统</description>
 
     
     <properties>
 
-        <ruoyi.version>4.7.2</ruoyi.version>
 
+        <ruoyi.version>4.7.3</ruoyi.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>1.8</java.version>

+ 1 - 1
ruoyi-admin/pom.xml
Целия файл 

@@ -5,7 +5,7 @@
 
     <parent>
 
         <artifactId>ruoyi</artifactId>
 
         <groupId>com.ruoyi</groupId>
 
-        <version>4.7.2</version>
 
+        <version>4.7.3</version>
 
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <packaging>jar</packaging>

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml
Целия файл 

@@ -3,7 +3,7 @@ ruoyi:
 
   # 名称

   name: RuoYi

   # 版本

-  version: 4.7.2

+  version: 4.7.3

   # 版权年份

   copyrightYear: 2022

   # 实例演示开关

Файловите разлики са ограничени, защото са твърде много
+ 2 - 2
ruoyi-admin/src/main/resources/templates/demo/form/summernote.html


+ 4 - 4
ruoyi-admin/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.2}" rel="stylesheet"/>

+	<link th:href="@{/css/font-awesome.min.css?v=4.7.3}" 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.2}" rel="stylesheet"/>

+	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.3}" 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.2}"></script>

-	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.2}"></script>

+	<script th:src="@{/ruoyi/js/common.js?v=4.7.3}"></script>

+	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>

 </div>

 

 <!-- ztree树插件 -->

+ 3 - 3
ruoyi-admin/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.2}" rel="stylesheet"/>

+    <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.3}" rel="stylesheet"/>

 </head>

 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">

 <div id="wrapper">

@@ -316,8 +316,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.2}"></script>

-<script th:src="@{/ruoyi/js/common.js?v=4.7.2}"></script>

+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>

+<script th:src="@{/ruoyi/js/common.js?v=4.7.3}"></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>

+ 3 - 3
ruoyi-admin/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.2}" rel="stylesheet"/>

+    <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.3}" rel="stylesheet"/>

 </head>

 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">

 <div id="wrapper">

@@ -263,8 +263,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.2}"></script>

-<script th:src="@{/ruoyi/js/common.js?v=4.7.2}"></script>

+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>

+<script th:src="@{/ruoyi/js/common.js?v=4.7.3}"></script>

 <script th:src="@{/ruoyi/index.js?v=20201208}"></script>

 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>

 <script th:inline="javascript">

+ 1 - 1
ruoyi-admin/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.2}"></script>

+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>

 </body>

 <script th:inline="javascript">

     var ctx = [[@{/}]];

+ 2 - 2
ruoyi-admin/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.2}" rel="stylesheet"/>

+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.3}" rel="stylesheet"/>

     <!-- 360浏览器急速模式 -->

     <meta name="renderer" content="webkit">

     <!-- 避免IE使用兼容模式 -->

@@ -76,7 +76,7 @@
 
 <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.2}"></script>

+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>

 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>

 </body>

 </html>

+ 42 - 1
ruoyi-admin/src/main/resources/templates/main.html
Целия файл 

@@ -99,10 +99,51 @@
 
                             <div class="panel panel-default">

 								<div class="panel-heading">

 								   <h5 class="panel-title">

+									   <a data-toggle="collapse" data-parent="#version" href="#v473">v4.7.3</a><code class="pull-right">2022.03.01</code>

+								   </h5>

+								</div>

+								<div id="v473" class="panel-collapse collapse in">

+									<div class="panel-body">

+									   <ol>

+									        <li>表格树支持分页/异步加载</li>

+									        <li>代码生成预览支持复制内容</li>

+									        <li>定时任务默认保存到内存中执行</li>

+									        <li>代码生成同步保留必填/类型选项</li>

+									        <li>页面若未匹配到字典标签则返回原字典值</li>

+									        <li>用户访问控制时校验数据权限，防止越权</li>

+									        <li>导出Excel时屏蔽公式，防止CSV注入风险</li>

+									        <li>升级spring-boot到最新版本2.5.10</li>

+									        <li>升级spring-boot-mybatis到最新版2.2.2</li>

+									        <li>升级pagehelper到最新版1.4.1</li>

+									        <li>升级oshi到最新版本6.1.2</li>

+									        <li>升级bootstrap-table到最新版本1.19.1</li>

+									        <li>服务监控新增运行参数信息显示</li>

+									        <li>定时任务目标字符串验证包名白名单</li>

+									        <li>文件上传接口新增原/新文件名返回参数</li>

+									        <li>定时任务屏蔽违规的字符</li>

+									        <li>分页数据新增分页参数合理化参数</li>

+									        <li>表格父子视图添加点击事件打开示例</li>

+									        <li>优化上传文件名称命名规则</li>

+									        <li>优化加载字典缓存数据</li>

+									        <li>优化任务队列满时任务拒绝策略</li>

+									        <li>优化IE11上传预览不显示的问题</li>

+									        <li>优化Excel格式化不同类型的日期对象</li>

+									        <li>优化国际化配置多余的zh请求问题</li>

+									        <li>优化新版Chrome浏览器回退出现的遮罩层</li>

+									        <li>修复EMAIL类型回退键被禁止问题</li>

+									        <li>修复Xss注解字段值为空时的异常问题</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="#v472">v4.7.2</a><code class="pull-right">2021.12.23</code>

 								   </h5>

 								</div>

-								<div id="v472" class="panel-collapse collapse in">

+								<div id="v472" class="panel-collapse collapse">

 									<div class="panel-body">

 									   <ol>

 									        <li>自定义xss校验注解实现</li>

+ 2 - 2
ruoyi-admin/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.2}" rel="stylesheet"/>
 
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.3}" rel="stylesheet"/>
 
     <!-- 360浏览器急速模式 -->
 
     <meta name="renderer" content="webkit">
 
     <!-- 避免IE使用兼容模式 -->
 
@@ -74,7 +74,7 @@
 
 <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.2}"></script>
 
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>
 
 <script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
 
 </body>
 
 </html>

+ 1 - 1
ruoyi-admin/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.2}"></script>
 
+<script th:src="@{/ruoyi/js/common.js?v=4.7.3}"></script>
 
 <script type="text/javascript">
 
 //皮肤样式列表
 
 var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];

+ 1 - 1
ruoyi-common/pom.xml
Целия файл 

@@ -5,7 +5,7 @@
 
     <parent>

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.7.2</version>

+        <version>4.7.3</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-framework/pom.xml
Целия файл 

@@ -5,7 +5,7 @@
 
     <parent>
 
         <artifactId>ruoyi</artifactId>
 
         <groupId>com.ruoyi</groupId>
 
-        <version>4.7.2</version>
 
+        <version>4.7.3</version>
 
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-generator/pom.xml
Целия файл 

@@ -5,7 +5,7 @@
 
     <parent>
 
         <artifactId>ruoyi</artifactId>
 
         <groupId>com.ruoyi</groupId>
 
-        <version>4.7.2</version>
 
+        <version>4.7.3</version>
 
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-quartz/pom.xml
Целия файл 

@@ -5,7 +5,7 @@
 
     <parent>

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.7.2</version>

+        <version>4.7.3</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-quartz/src/main/resources/templates/monitor/job/cron.html
Целия файл 

@@ -1131,7 +1131,7 @@
 
 <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.2}"></script>

+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.3}"></script>

 <script th:src="@{/js/cron.js}"></script>

 <script th:inline="javascript">

 var prefix = [[@{/}]] + "monitor/job";

+ 1 - 1
ruoyi-system/pom.xml
Целия файл 

@@ -5,7 +5,7 @@
 
     <parent>

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.7.2</version>

+        <version>4.7.3</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>