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

若依 v4.7.0

RuoYi 3 년 전
부모
1878b10daa
커밋
bf2d2cbeb3
19개의 변경된 파일과 86개의 추가작업 그리고 31개의 파일을 삭제
분할 보기 변경상태 보기
  1. 2 2
      pom.xml
  2. 1 1
      ruoyi-admin/pom.xml
  3. 1 1
      ruoyi-admin/src/main/resources/application.yml
  4. 2 2
      ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
  5. 3 3
      ruoyi-admin/src/main/resources/templates/include.html
  6. 3 3
      ruoyi-admin/src/main/resources/templates/index-topnav.html
  7. 3 3
      ruoyi-admin/src/main/resources/templates/index.html
  8. 1 1
      ruoyi-admin/src/main/resources/templates/lock.html
  9. 2 2
      ruoyi-admin/src/main/resources/templates/login.html
  10. 56 1
      ruoyi-admin/src/main/resources/templates/main.html
  11. 2 2
      ruoyi-admin/src/main/resources/templates/register.html
  12. 1 1
      ruoyi-admin/src/main/resources/templates/skin.html
  13. 1 1
      ruoyi-common/pom.xml
  14. 1 1
      ruoyi-framework/pom.xml
  15. 1 1
      ruoyi-generator/pom.xml
  16. 1 1
      ruoyi-quartz/pom.xml
  17. 1 1
      ruoyi-quartz/src/main/resources/templates/monitor/job/cron.html
  18. 1 1
      ruoyi-system/pom.xml
  19. 3 3
      sql/quartz.sql

+ 2 - 2
pom.xml
파일 보기 

@@ -5,14 +5,14 @@
 
 
     <groupId>com.ruoyi</groupId>
 
     <artifactId>ruoyi</artifactId>
 
-    <version>4.6.2</version>
 
+    <version>4.7.0</version>
 
 
     <name>ruoyi</name>
 
     <url>http://www.ruoyi.vip</url>
 
     <description>若依管理系统</description>
 
     
     <properties>
 
-        <ruoyi.version>4.6.2</ruoyi.version>
 
+        <ruoyi.version>4.7.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>

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

@@ -5,7 +5,7 @@
 
     <parent>
 
         <artifactId>ruoyi</artifactId>
 
         <groupId>com.ruoyi</groupId>
 
-        <version>4.6.2</version>
 
+        <version>4.7.0</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.6.2

+  version: 4.7.0

   # 版权年份

   copyrightYear: 2021

   # 实例演示开关

+ 2 - 2
ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
파일 보기 

@@ -17,7 +17,7 @@
 
                             <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.6.2
 
+                                <b>当前版本：</b>v4.7.0
 
                             </p>
 
                             <p>
 
                                 <span class="label label-warning">免费开源</span>
 
@@ -56,7 +56,7 @@
 
                             <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.6.2
 
+                                <b>当前版本：</b>v4.7.0
 
                             </p>
 
                             <p>
 
                                 <span class="label label-warning">开源免费</span>

+ 3 - 3
ruoyi-admin/src/main/resources/templates/include.html
파일 보기 

@@ -12,7 +12,7 @@
 
 	<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.6.2}" rel="stylesheet"/>

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

-	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.6.2}"></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>

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

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

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

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

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

+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></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.6.2}" rel="stylesheet"/>

+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" 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.6.2}"></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/login.js" th:src="@{/ruoyi/login.js}"></script>

 </body>

 </html>

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

@@ -96,13 +96,68 @@
 
                     <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="#v470">v4.7.0</a><code class="pull-right">2021.09.01</code>

+								   </h5>

+								</div>

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

+									<div class="panel-body">

+									   <ol>

+									        <li>优化弹出层显示在顶层窗口</li>

+									        <li>定时任务支持在线生成cron表达式</li>

+									        <li>Excel注解支持Image图片导入</li>

+									        <li>支持配置是否开启记住我功能</li>

+									        <li>修改时检查用户数据权限范围</li>

+									        <li>表单重置开始/结束时间控件</li>

+									        <li>新增多图上传示例</li>

+									        <li>启用父部门状态排除顶级节点</li>

+									        <li>富文本默认dialogsInBody属性</li>

+									        <li>去除默认分页合理化参数</li>

+									        <li>顶部菜单跳转添加绝对路径</li>

+									        <li>升级oshi到最新版本v5.8.0</li>

+									        <li>升级shiro到最新版本v1.8.0</li>

+									        <li>升级commons.io到最新版本v2.11.0</li>

+									        <li>升级jquery到最新版v3.6.0</li>

+									        <li>升级icheck到最新版v1.0.3</li>

+									        <li>升级layer到最新版本v3.5.1</li>

+									        <li>升级layui到最新版本v2.6.8</li>

+									        <li>升级laydate到最新版本v5.3.1</li>

+									        <li>升级select2到最新版v4.0.13</li>

+									        <li>升级cropper到最新版本v1.5.12</li>

+									        <li>升级summernote到最新版本v0.8.18</li>

+									        <li>升级duallistbox到最新版本v3.0.9</li>

+									        <li>升级jquery.validate到最新版本v1.19.3</li>

+									        <li>升级bootstrap-suggest到最新版本v0.1.29</li>

+									        <li>升级bootstrap-select到最新版本v1.13.18</li>

+									        <li>升级bootstrap-fileinput到最新版本v5.2.3</li>

+									        <li>查询表格指定列值增加是否去重属性</li>

+									        <li>删除sourceMappingURL源映射</li>

+									        <li>去除多余的favicon.ico引入</li>

+									        <li>优化代码生成模板</li>

+									        <li>优化XSS跨站脚本过滤</li>

+									        <li>补充定时任务表字段注释</li>

+									        <li>定时任务屏蔽ldap远程调用</li>

+									        <li>定时任务屏蔽http(s)远程调用</li>

+									        <li>定时任务对检查异常进行事务回滚</li>

+									        <li>调度日志详细页添加关闭按钮</li>

+									        <li>优化异常打印输出信息</li>

+									        <li>优化移动端进入首页样式</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="#v462">v4.6.2</a><code class="pull-right">2021.07.01</code>

 								   </h5>

 								</div>

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

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

 									<div class="panel-body">

 									   <ol>

 									        <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/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.6.2}" rel="stylesheet"/>
 
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" 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.6.2}"></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/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.6.2}"></script>
 
+<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></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.6.2</version>

+        <version>4.7.0</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.6.2</version>
 
+        <version>4.7.0</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.6.2</version>

+        <version>4.7.0</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.6.2</version>

+        <version>4.7.0</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.6.2}"></script>

+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></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.6.2</version>

+        <version>4.7.0</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>

+ 3 - 3
sql/quartz.sql
파일 보기 

@@ -56,7 +56,7 @@ create table QRTZ_TRIGGERS (
 
 -- ----------------------------

 create table QRTZ_SIMPLE_TRIGGERS (

     sched_name           varchar(120)    not null            comment '调度名称',

-    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_ name的外键',

+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_name的外键',

     trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',

     repeat_count         bigint(7)       not null            comment '重复的次数统计',

     repeat_interval      bigint(12)      not null            comment '重复的间隔时间',

@@ -134,7 +134,7 @@ create table QRTZ_FIRED_TRIGGERS (
 
 -- ---------------------------- 

 create table QRTZ_SCHEDULER_STATE (

     sched_name           varchar(120)    not null            comment '调度名称',

-    instance_name        varchar(200)    not null            comment '之前配置文件中org.quartz.scheduler.instanceId配置的名字，就会写入该字段',

+    instance_name        varchar(200)    not null            comment '实例名称',

     last_checkin_time    bigint(13)      not null            comment '上次检查时间',

     checkin_interval     bigint(13)      not null            comment '检查间隔时间',

     primary key (sched_name, instance_name)

@@ -154,7 +154,7 @@ create table QRTZ_LOCKS (
 
 -- ---------------------------- 

 create table QRTZ_SIMPROP_TRIGGERS (

     sched_name           varchar(120)    not null            comment '调度名称',

-    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_ name的外键',

+    trigger_name         varchar(200)    not null            comment 'qrtz_triggers表trigger_name的外键',

     trigger_group        varchar(200)    not null            comment 'qrtz_triggers表trigger_group的外键',

     str_prop_1           varchar(512)    null                comment 'String类型的trigger的第一个参数',

     str_prop_2           varchar(512)    null                comment 'String类型的trigger的第二个参数',