Página inicial Explorar Ajuda
Registrar Entrar
root
/
gs_bg
1
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

若依 4.3.1

RuoYi 4 anos atrás
pai
91986f13f8
commit
7c48bc3184
16 arquivos alterados com 48 adições e 24 exclusões
Visão dividida Mostrar estatísticas do Diff
  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. 2 2
      ruoyi-admin/src/main/resources/templates/include.html
  6. 3 3
      ruoyi-admin/src/main/resources/templates/index.html
  7. 2 2
      ruoyi-admin/src/main/resources/templates/login.html
  8. 25 1
      ruoyi-admin/src/main/resources/templates/main.html
  9. 2 2
      ruoyi-admin/src/main/resources/templates/register.html
  10. 1 1
      ruoyi-admin/src/main/resources/templates/skin.html
  11. 1 1
      ruoyi-common/pom.xml
  12. 1 1
      ruoyi-framework/pom.xml
  13. 2 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
  14. 1 1
      ruoyi-generator/pom.xml
  15. 1 1
      ruoyi-quartz/pom.xml
  16. 1 1
      ruoyi-system/pom.xml

+ 2 - 2
pom.xml
Ver arquivo 

@@ -6,14 +6,14 @@
 
 	

     <groupId>com.ruoyi</groupId>

     <artifactId>ruoyi</artifactId>

-    <version>4.3.0</version>

+    <version>4.3.1</version>

 

     <name>ruoyi</name>

 	<url>http://www.ruoyi.vip</url>

     <description>若依管理系统</description>

     

     <properties>

-	    <ruoyi.version>4.3.0</ruoyi.version>

+	    <ruoyi.version>4.3.1</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
Ver arquivo 

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

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml
Ver arquivo 

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

   name: RuoYi

   # 版本

-  version: 4.3.0

+  version: 4.3.1

   # 版权年份

   copyrightYear: 2019

   # 实例演示开关

+ 2 - 2
ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
Ver arquivo 

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

+ 2 - 2
ruoyi-admin/src/main/resources/templates/include.html
Ver arquivo 

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

-	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.3.0}"></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:inline="javascript"> var ctx = [[@{/}]]; </script>

 </div>

+ 3 - 3
ruoyi-admin/src/main/resources/templates/index.html
Ver arquivo 

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

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

 </head>

 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">

 <div id="wrapper">

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

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

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

 <script th:inline="javascript">

+ 2 - 2
ruoyi-admin/src/main/resources/templates/login.html
Ver arquivo 

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

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

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

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

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

@@ -78,7 +78,7 @@
 
 <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.0}"></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/login.js" th:src="@{/ruoyi/login.js}"></script>

 </body>

 </html>

+ 25 - 1
ruoyi-admin/src/main/resources/templates/main.html
Ver arquivo 

@@ -96,13 +96,37 @@
 
                     <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="#v431">v4.3.1</a><code class="pull-right">2020.07.05</code>

+								   </h5>

+								</div>

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

+									<div class="panel-body">

+									   <ol>

+									        <li>国家信息安全漏洞（请务必保持cipherKey密钥唯一性）</li>

+									        <li>升级shiro到最新版1.5.3 阻止权限绕过漏洞</li>

+									        <li>修改验证码在使用后清除，防止多次使用</li>

+									        <li>检查字符支持小数点&降级改成异常提醒</li>

+									        <li>openOptions函数中加入自定义maxmin属性</li>

+									        <li>支持openOptions方法最大化</li>

+									        <li>支持openOptions方法多个按钮回调</li>

+									        <li>新增isLinkage支持页签与菜单联动</li>

+									        <li>修改代码生成导入表结构出现异常页面不提醒问题</li>

+									        <li>优化用户头像发生错误，则显示一个默认头像</li>

+									        <li>Excel导出支持字典类型</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="#v43">v4.3.0</a><code class="pull-right">2020.06.22</code>

 								   </h5>

 								</div>

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

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

 									<div class="panel-body">

 									   <ol>

 									        <li>代码生成模板支持主子表</li>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/register.html
Ver arquivo 

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

+ 1 - 1
ruoyi-admin/src/main/resources/templates/skin.html
Ver arquivo 

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

+ 1 - 1
ruoyi-common/pom.xml
Ver arquivo 

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

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.3.0</version>

+        <version>4.3.1</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-framework/pom.xml
Ver arquivo 

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

+ 2 - 2
ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
Ver arquivo 

@@ -83,8 +83,8 @@ public class SysPasswordService
 
         return new Md5Hash(username + password + salt).toHex();

     }

 

-    public void unlock(String loginName){

+    public void unlock(String loginName)

+    {

         loginRecordCache.remove(loginName);

     }

-

 }

+ 1 - 1
ruoyi-generator/pom.xml
Ver arquivo 

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

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.3.0</version>

+        <version>4.3.1</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-quartz/pom.xml
Ver arquivo 

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

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.3.0</version>

+        <version>4.3.1</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
ruoyi-system/pom.xml
Ver arquivo 

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

         <artifactId>ruoyi</artifactId>

         <groupId>com.ruoyi</groupId>

-        <version>4.3.0</version>

+        <version>4.3.1</version>

     </parent>

     <modelVersion>4.0.0</modelVersion>