release: 3.3.1

lerry903 · May 18, 2019 · 5eb9cd4 · 5eb9cd4
1 parent 73129f7
commit 5eb9cd4
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.3.0</version>
+    <version>3.3.1</version>
 
     <name>ruoyi</name>
     <url>https://github.com/lerry903/RuoYi</url>
     <description>若依管理系统</description>
 
     <properties>
-        <ruoyi.version>3.3.0</ruoyi.version>
+        <ruoyi.version>3.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>

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.3.0</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/ruoyi-admin/src/main/resources/dev/application.yml b/ruoyi-admin/src/main/resources/dev/application.yml
@@ -5,7 +5,7 @@ ruoyi:
   # 描述
   description: 若依管理系统
   # 版本
-  version: 3.3.0
+  version: 3.3.1
   # 获取ip地址开关
   addressEnabled: true
   #演示模式

diff --git a/ruoyi-admin/src/main/resources/run/application.yml b/ruoyi-admin/src/main/resources/run/application.yml
@@ -5,7 +5,7 @@ ruoyi:
   # 描述
   description: 若依管理系统
   # 版本
-  version: 3.3.0
+  version: 3.3.1
   # 获取ip地址开关
   addressEnabled: true
   #演示模式

diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
@@ -39,8 +39,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.3.0}"></script>
-	<script th:src="@{/ruoyi/js/ry-ui.js?v=3.3.0}"></script>
+	<script th:src="@{/ruoyi/js/common.js?v=3.3.1}"></script>
+	<script th:src="@{/ruoyi/js/ry-ui.js?v=3.3.1}"></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.3.0}" rel="stylesheet"/>
+    <link th:href="@{/ruoyi/css/ry-ui.css?v=3.3.1}" rel="stylesheet"/>
     <style type="text/css">
         #content-main.max { height: calc(100% - 110px); overflow: hidden; width: 100%; height: 100%; left: 0px; position: absolute; top: 0px; z-index: 9998; margin: 0; }
     </style>
@@ -158,7 +158,7 @@
 <script th:src="@{/js/plugins/slimscroll/jquery.slimscroll.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=3.3.0}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=3.3.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.3.0}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=3.3.1}" rel="stylesheet"/>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
@@ -82,7 +82,7 @@ <h4 class="no-margins">登录：</h4>
 <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=3.3.0}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=3.3.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
@@ -84,6 +84,33 @@ <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="#v331">
+                                        <h5 class="panel-title">
+                                            v3.3.1<code class="pull-right">2019.05.18</code>
+                                        </h5>
+                                    </a>
+                                </div>
+                                <div id="v331" class="panel-collapse collapse in">
+                                    <div class="panel-body">
+                                        <ol>
+                                            <li>修复一些已知bug</li>
+                                            <li>优化各种配置</li>
+                                            <li>新增角色权限权限可见性，字典状态限制</li>
+                                            <li>去除统计代码</li>
+                                            <li>更改系统接口扫描方式</li>
+                                            <li>新增查询表格树指定列值</li>
+                                            <li>国际化资源文件调整</li>
+                                            <li>新增图片放大效果</li>
+                                            <li>新增查询条件支持下拉多选</li>
+                                            <li>支持更多格式文件上传</li>
+                                            <li>升级升级Spring Boot到2.1.5</li>
+                                            <li>其他代码细节优化</li>
+                                        </ol>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="panel panel-default">
                                 <div class="panel-heading">
                                     <a data-toggle="collapse" data-parent="#version" href="#v33">
@@ -92,7 +119,7 @@ <h5 class="panel-title">
                                         </h5>
                                     </a>
                                 </div>
-                                <div id="v33" class="panel-collapse collapse in">
+                                <div id="v33" class="panel-collapse collapse">
                                     <div class="panel-body">
                                         <ol>
                                             <li>调整用户个人中心页面</li>

diff --git a/ruoyi-admin/src/main/resources/uat/application.yml b/ruoyi-admin/src/main/resources/uat/application.yml
@@ -5,7 +5,7 @@ ruoyi:
   # 描述
   description: 若依管理系统
   # 版本
-  version: 3.3.0
+  version: 3.3.1
   # 获取ip地址开关
   addressEnabled: true
   #演示模式

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.3.0</version>
+        <version>3.3.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 StringUtil.nvl(getConfig("ruoyi.version"), "3.3.0");
+        return StringUtil.nvl(getConfig("ruoyi.version"), "3.3.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.3.0</version>
+        <version>3.3.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.3.0</version>
+        <version>3.3.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.3.0</version>
+        <version>3.3.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.3.0</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sql/ry_v3.3.0.sql → sql/ry_v3.3.1.sql b/sql/ry_v3.3.0.sql → sql/ry_v3.3.1.sql
@@ -622,4 +622,5 @@ create table sys_notice (
 insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
 insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容',   '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
 insert into sys_notice values('3', '温馨提醒：2019-03-20 若依3.2.1版本发布啦', '2', '<p>温馨提醒：2019-03-20 若依3.2.1版本发布啦</p><p>本次更新内容:</p><ol><li>1、升级SpringBoot到最新版本2.1.3</li><li>2、修复一些已知bug</li><li>3、新增表格客户端分页选项</li><li>4、使用jsonview展示操作日志参数</li><li>5、修复一些安全问题</li><li>6、优化现有代码</li><li>7、定时任务支持并发控制</li></ol>', '0', 'admin', '2019-03-20 00-30-00', 'LERRY', '2019-03-20 00-30-00', '管理员');
-insert into sys_notice values('3', '温馨提醒：2019-03-20 若依3.3.0版本发布啦', '2', '<p>温馨提醒：2019-03-31 若依3.3.0版本发布啦</p><p>本次更新内容见github</p>', '0', 'admin', '2019-03-31 17-20-00', 'LERRY', '2019-03-31 17-20-00', '管理员');
+insert into sys_notice values('3', '温馨提醒：2019-03-20 若依3.3.0版本发布啦', '2', '<p>温馨提醒：2019-03-31 若依3.3.0版本发布啦</p><p>本次更新内容见github</p>', '0', 'admin', '2019-03-31 17-20-00', 'LERRY', '2019-03-31 17-20-00', '管理员');
+insert into sys_notice values('4', '温馨提醒：2019-05-18 若依3.3.1版本发布啦', '2', '<p>温馨提醒：2019-05-18 若依3.3.1版本发布啦</p><p>本次更新内容见github</p>', '0', 'admin', '2019-05-18 17-45-00', 'LERRY', '2019-05-18 17-45-00', '管理员');