release: 3.2.1

lerry903 · Mar 19, 2019 · c47f5e6 · c47f5e6
1 parent ad9be21
commit c47f5e6
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![License](https://img.shields.io/github/license/lerry903/RuoYi.svg)](https://github.com/lerry903/RuoYi/blob/master/LICENSE)
-[![SpringBoot](https://img.shields.io/badge/SpringBoot-2.1.1.RELEASE-brightgreen.svg)](https://docs.spring.io/spring-boot/docs/2.1.1.RELEASE/reference/htmlsingle/)
+[![SpringBoot](https://img.shields.io/badge/SpringBoot-2.1.3.RELEASE-brightgreen.svg)](https://docs.spring.io/spring-boot/docs/2.1.3.RELEASE/reference/htmlsingle/)
 [![GitHub Release](https://img.shields.io/github/release/lerry903/RuoYi.svg)](https://github.com/lerry903/RuoYi/releases)
 
 ## 平台简介

diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
 
     <name>ruoyi</name>
     <url>https://github.com/lerry903/RuoYi</url>
     <description>若依管理系统</description>
 
     <properties>
-        <ruoyi.version>3.2.0</ruoyi.version>
+        <ruoyi.version>3.2.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>
@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>2.1.3.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
@@ -5,7 +5,7 @@ ruoyi:
   # 描述
   description: 若依管理系统
   # 版本
-  version: 3.2.0
+  version: 3.2.1
   # 获取ip地址开关
   addressEnabled: true
   #演示模式
@@ -160,15 +160,4 @@ thread:
   pool:
     keepAliveSeconds: 2000
     maxPoolSize: 100
-    corePoolSize: 10
-
-# 代码生成
-gen:
-  # 作者
-  author: lerry
-  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
-  # 自动去除表前缀，默认是true
-  autoRemovePre: true
-  # 表前缀(类名不会包含表前缀)
-  tablePrefix: sys_
+    corePoolSize: 10
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
@@ -40,8 +40,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=3.2.0}"></script>
-	<script th:src="@{/ruoyi/js/ry-ui.js?v=3.2.0}"></script>
+	<script th:src="@{/ruoyi/js/common.js?v=3.2.1}"></script>
+	<script th:src="@{/ruoyi/js/ry-ui.js?v=3.2.1}"></script>
 	<script src="http://tajs.qq.com/stats?sId=62048022"></script>
 	<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
@@ -16,7 +16,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=3.2.0}" rel="stylesheet"/>
+    <link th:href="@{/ruoyi/css/ry-ui.css?v=3.2.1}" rel="stylesheet"/>
     <style type="text/css">
         .nav > li:hover .dropdown-menu {display: block;}
         #content-main.max { height: calc(100% - 110px); overflow: hidden; width: 100%; height: 100%; left: 0px; position: absolute; top: 0px; z-index: 9998; margin: 0; }
@@ -159,7 +159,7 @@
 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="http://tajs.qq.com/stats?sId=62048022"></script>
-<script th:src="@{/ruoyi/js/ry-ui.js?v=3.2.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=3.2.1}"></script>
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript"> 

diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
@@ -11,7 +11,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=3.2.0}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=3.2.1}" rel="stylesheet"/>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
@@ -83,7 +83,7 @@ <h4 class="no-margins">登录：</h4>
 <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="http://tajs.qq.com/stats?sId=62048022"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=3.2.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=3.2.1}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
@@ -37,7 +37,7 @@ <h2>若依后台管理框架</h2>
             <a class="btn btn-success btn-outline" href="https://github.com/lerry903/RuoYi" target="_blank">
                 <i class="fa fa-cloud"> </i> 访问源码
             </a>
-            <a class="btn btn-white btn-bitbucket" href="http://ruoyi.vip" target="_blank">
+            <a class="btn btn-white btn-bitbucket" href="https://github.com/lerry903/RuoYi" target="_blank">
                 <i class="fa fa-home"></i> 访问主页
             </a>
         </p>
@@ -67,14 +67,10 @@ <h5>联系信息</h5>
 
                 </div>
                 <div class="ibox-content">
-                    <p><i class="fa fa-send-o"></i> 官网：<a href="http://www.ruoyi.vip" target="_blank">http://www.ruoyi.vip</a>
-                    </p>
-                    <p><i class="fa fa-qq"></i> QQ群：<s>满1389287</s> <a href="https://jq.qq.com/?_wv=1027&k=5cHeRVW"
-                                                                       target="_blank">1679294</a>
-                    </p>
-                    <p><i class="fa fa-weixin"></i> 微信：<a href="javascript:;">/ *若依</a>
-                    </p>
-                    <p><i class="fa fa-credit-card"></i> 支付宝：<a href="javascript:;" class="支付宝信息">/ *若依</a>
+                    <p>
+                        <i class="fa fa-send-o"></i> 源码：
+                        <a href="https://github.com/lerry903/RuoYi" target="_blank">Github</a>&nbsp;&nbsp;
+                        <a href="https://gitee.com/lerry903/RuoYi" target="_blank">Gitee</a>
                     </p>
                 </div>
             </div>
@@ -87,6 +83,28 @@ <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">
+                                    <a data-toggle="collapse" data-parent="#version" href="#v321">
+                                        <h5 class="panel-title">
+                                            v3.2.1<code class="pull-right">2019.03.20</code>
+                                        </h5>
+                                    </a>
+                                </div>
+                                <div id="v321" class="panel-collapse collapse in">
+                                    <div class="panel-body">
+                                        <ol>
+                                            <li>升级SpringBoot到最新版本2.1.3</li>
+                                            <li>修复一些已知bug</li>
+                                            <li>新增表格客户端分页选项</li>
+                                            <li>使用jsonview展示操作日志参数</li>
+                                            <li>修复一些安全问题</li>
+                                            <li>优化现有代码</li>
+                                            <li>定时任务支持并发控制</li>
+                                        </ol>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="panel panel-default">
                                 <div class="panel-heading">
                                     <a data-toggle="collapse" data-parent="#version" href="#v32">
@@ -95,7 +113,7 @@ <h5 class="panel-title">
                                         </h5>
                                     </a>
                                 </div>
-                                <div id="v32" class="panel-collapse collapse in">
+                                <div id="v32" class="panel-collapse collapse">
                                     <div class="panel-body">
                                         <ol>
                                             <li>修复一些已知bug</li>

diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java
@@ -77,7 +77,7 @@ public static String getName() {
      * 获取项目版本
      */
     public static String getVersion() {
-        return StringUtils.nvl(getConfig("ruoyi.version"), "3.2.0");
+        return StringUtils.nvl(getConfig("ruoyi.version"), "3.2.1");
     }
 
     /**

diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>