홈 탐색 도움말
가입하기 로그인
sunwei
/
education_nanguan
Watch 1
Star 0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

若依 v4.7.5

RuoYi 2 년 전
부모
31bd27fcf0
커밋
0ca327f538
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">

 <p align="center">

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

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

 </p>

 </p>

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

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

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

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

 <p align="center">

 <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/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.4-brightgreen.svg"></a>

+	<a href="https://gitee.com/y_project/RuoYi"><img src="https://img.shields.io/badge/RuoYi-v4.7.5-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>

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

 </p>

 </p>

+ 2 - 2
pom.xml
파일 보기 

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

+ 1 - 1
ruoyi-admin/pom.xml
파일 보기 

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

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml
파일 보기 

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

   # 名称

   name: RuoYi

   name: RuoYi

   # 版本

   # 版本

-  version: 4.7.4

+  version: 4.7.5

   # 版权年份

   # 版权年份

   copyrightYear: 2022

   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="">

 	<meta name="description" content="">

 	<title th:text="${title}"></title>

 	<title th:text="${title}"></title>

 	<link th:href="@{/css/bootstrap.min.css?v=3.3.7}" rel="stylesheet"/>

 	<link th:href="@{/css/bootstrap.min.css?v=3.3.7}" rel="stylesheet"/>

-	<link th:href="@{/css/font-awesome.min.css?v=4.7.4}" rel="stylesheet"/>

+	<link th:href="@{/css/font-awesome.min.css?v=4.7.0}" rel="stylesheet"/>

 	<!-- bootstrap-table 表格插件样式 -->

 	<!-- bootstrap-table 表格插件样式 -->

 	<link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=1.18.3}" rel="stylesheet"/>

 	<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/animate.min.css?v=20210831}" rel="stylesheet"/>

 	<link th:href="@{/css/style.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.4}" rel="stylesheet"/>

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

 </head>

 </head>

 

 

 <!-- 通用JS -->

 <!-- 通用JS -->

@@ -36,8 +36,8 @@
 
     <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>

     <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/layer/layer.min.js?v=3.5.1}"></script>

 	<script th:src="@{/ajax/libs/layui/layui.min.js?v=2.7.5}"></script>

 	<script th:src="@{/ajax/libs/layui/layui.min.js?v=2.7.5}"></script>

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

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

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

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

 </div>

 </div>

 

 

 <!-- ztree树插件 -->

 <!-- 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/animate.min.css}" rel="stylesheet"/>

     <link th:href="@{/css/style.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="@{/css/skins.css?v=20200902}" rel="stylesheet"/>

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

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

     <style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar)>li.active{border-left:0px!important;</style>

     <style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar)>li.active{border-left:0px!important;</style>

 </head>

 </head>

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

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

@@ -318,8 +318,8 @@
 
 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>

 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>

 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.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="@{/ajax/libs/layer/layer.min.js}"></script>

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

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

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

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

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

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

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

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

 <script th:src="@{/js/resize-tabs.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/animate.min.css}" rel="stylesheet"/>

     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>

     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>

     <link th:href="@{/css/skins.css}" rel="stylesheet"/>

     <link th:href="@{/css/skins.css}" rel="stylesheet"/>

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

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

 </head>

 </head>

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

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

 <div id="wrapper">

 <div id="wrapper">

@@ -264,8 +264,8 @@
 
 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>

 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>

 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.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="@{/ajax/libs/layer/layer.min.js}"></script>

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

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

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

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

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

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

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

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

 <script th:inline="javascript">

 <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/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/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/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.4}"></script>

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

 </body>

 </body>

 <script th:inline="javascript">

 <script th:inline="javascript">

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

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

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

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

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

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

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

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

     <!-- 避免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/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/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/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.4}"></script>

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

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

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

 </body>

 </body>

 </html>

 </html>

+ 42 - 1
ruoyi-admin/src/main/resources/templates/main.html
파일 보기 

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

                             <div class="panel panel-default">

 								<div class="panel-heading">

 								<div class="panel-heading">

 								   <h5 class="panel-title">

 								   <h5 class="panel-title">

+									   <a data-toggle="collapse" data-parent="#version" href="#v475">v4.7.5</a><code class="pull-right">2022.09.05</code>

+								   </h5>

+								</div>

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

+									<div class="panel-body">

+									   <ol>

+									        <li>Excel支持导出对象的子列表方法</li>

+									        <li>数据逻辑删除不进行唯一验证</li>

+									        <li>优化多角色数据权限匹配规则</li>

+									        <li>新增主子表提交校验示例</li>

+									        <li>支持自定义隐藏Excel属性列</li>

+									        <li>Excel注解支持backgroundColor属性设置背景颜色</li>

+									        <li>菜单配置刷新时Tab页签切换时刷新</li>

+									        <li>增加对AjaxResult消息结果类型的判断</li>

+									        <li>新增示例（进度条）</li>

+									        <li>新增内容编码/解码方便插件集成使用</li>

+									        <li>升级jquery到最新版3.6.1</li>

+									        <li>升级layui到最新版本2.7.5</li>

+									        <li>升级shiro到最新版本1.9.1</li>

+									        <li>升级druid到最新版本1.2.11</li>

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

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

+									        <li>修复树表onLoadSuccess不生效的问题</li>

+											<li>修复用户分配角色大于默认页数丢失问题</li>

+									        <li>定时任务支持执行父类方法</li>

+									        <li>自动设置切换多个树表格实例配置</li>

+									        <li>页签创建标题优先data-title属性</li>

+									        <li>优化任务过期不执行调度</li>

+									        <li>优化横向菜单下激活菜单样式</li>

+									        <li>优化按钮打开窗口后按回车反复弹出</li>

+									        <li>优化excel/scale属性导出单元格数值类型</li>

+									        <li>优化druid开启wall过滤器出现的异常问题</li>

+									        <li>优化多个相同角色数据导致权限SQL重复问题</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="#v474">v4.7.4</a><code class="pull-right">2022.06.01</code>

 									   <a data-toggle="collapse" data-parent="#version" href="#v474">v4.7.4</a><code class="pull-right">2022.06.01</code>

 								   </h5>

 								   </h5>

 								</div>

 								</div>

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

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

 									<div class="panel-body">

 									<div class="panel-body">

 									   <ol>

 									   <ol>

 									        <li>用户头像上传图片格式限制</li>

 									        <li>用户头像上传图片格式限制</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/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/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/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.4}" rel="stylesheet"/>
 
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.5}" rel="stylesheet"/>
 
     <!-- 360浏览器急速模式 -->
 
     <!-- 360浏览器急速模式 -->
 
     <meta name="renderer" content="webkit">
 
     <meta name="renderer" content="webkit">
 
     <!-- 避免IE使用兼容模式 -->
 
     <!-- 避免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/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/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/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.4}"></script>
 
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.5}"></script>
 
 <script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
 
 <script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/skin.html
파일 보기 

@@ -140,7 +140,7 @@
 
 </ul>
 
 </ul>
 
 </body>
 
 </body>
 
 <script th:src="@{/js/jquery.min.js}"></script>
 
 <script th:src="@{/js/jquery.min.js}"></script>
 
-<script th:src="@{/ruoyi/js/common.js?v=4.7.4}"></script>
 
+<script th:src="@{/ruoyi/js/common.js?v=4.7.5}"></script>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 //皮肤样式列表
 
 //皮肤样式列表
 
 var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];
 
 var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];

+ 1 - 1
ruoyi-common/pom.xml
파일 보기 

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

     <parent>

         <artifactId>ruoyi</artifactId>

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

         <groupId>com.ruoyi</groupId>

-        <version>4.7.4</version>

+        <version>4.7.5</version>

     </parent>

     </parent>

     <modelVersion>4.0.0</modelVersion>

     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-framework/pom.xml
파일 보기 

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

+ 1 - 1
ruoyi-generator/pom.xml
파일 보기 

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

+ 1 - 1
ruoyi-quartz/pom.xml
파일 보기 

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

     <parent>

         <artifactId>ruoyi</artifactId>

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

         <groupId>com.ruoyi</groupId>

-        <version>4.7.4</version>

+        <version>4.7.5</version>

     </parent>

     </parent>

     <modelVersion>4.0.0</modelVersion>

     <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/jquery.min.js}"></script>

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

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

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

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

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

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

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

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

 <script th:inline="javascript">

 <script th:inline="javascript">

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

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

+ 1 - 1
ruoyi-system/pom.xml
파일 보기 

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

     <parent>

         <artifactId>ruoyi</artifactId>

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

         <groupId>com.ruoyi</groupId>

-        <version>4.7.4</version>

+        <version>4.7.5</version>

     </parent>

     </parent>

     <modelVersion>4.0.0</modelVersion>

     <modelVersion>4.0.0</modelVersion>