release: 3.3.0

lerry903 · Mar 31, 2019 · e0c3f4a · e0c3f4a
1 parent 391d9c4
commit e0c3f4a
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -44,32 +44,36 @@
 
 <table>
     <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/25b5e333768d013d45a990c152dbe4d9d6e.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/dfadf4d864242745486aa0167110dfcbeb8.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/login.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/index.jpg"/></td>
     </tr>
     <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/2e1ed87df9b476ed73ed650df20cf009b78.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/693955d8914ee3c34ab904fa0602bc31267.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user_list.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user_update.jpg"/></td>
     </tr>
     <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/9a2851988f4e7433c9322154534865f57d7.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/396293f80b1e8cce8671f56c296bee78a3a.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/role_list.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/role_update.jpg"/></td>
     </tr>
+	<tr>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user_role.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/role_data.jpg"/></td>
+    </tr>	 
     <tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/787b3b06430a403655b48b9bcd1fa829555.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/a51820009836276b778bc89d4d0e217e26d.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/function.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/function_update.jpg"/></td>
     </tr>
 	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/5fb138478adeda6825e206d21f67ecd0625.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/fa2f027a10707a4eb4fc47d5ea1c3d2b772.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/gen_code.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user.jpg"/></td>
     </tr>
 	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/a714056081523b7dfa782cda866e8be4adc.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/ab4b5797dfb2bc68c4974ad5458bd5f5bcf.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/oper_log.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/login_log.jpg"/></td>
     </tr>
 	<tr>
-        <td><img src="https://oscimg.oschina.net/oscnet/98beb69118d9ab59aa898d5d5baad20b755.jpg"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/5f3d39a141f21f81b90536f391b8408f1fa.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/server_monitoring.jpg"/></td>
+        <td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/prize.jpg"/></td>
     </tr>
 </table>
 

diff --git a/img/index.jpg b/img/index.jpg
diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.2.1</version>
+    <version>3.3.0</version>
 
     <name>ruoyi</name>
     <url>https://github.com/lerry903/RuoYi</url>
     <description>若依管理系统</description>
 
     <properties>
-        <ruoyi.version>3.2.1</ruoyi.version>
+        <ruoyi.version>3.3.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>

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.1</version>
+        <version>3.3.0</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.2.1
+  version: 3.3.0
   # 获取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.2.1
+  version: 3.3.0
   # 获取ip地址开关
   addressEnabled: true
   #演示模式

diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
@@ -84,6 +84,34 @@ <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="#v33">
+                                        <h5 class="panel-title">
+                                            v3.3.0<code class="pull-right">2019.03.31</code>
+                                        </h5>
+                                    </a>
+                                </div>
+                                <div id="v33" class="panel-collapse collapse in">
+                                    <div class="panel-body">
+                                        <ol>
+                                            <li>调整用户个人中心页面</li>
+                                            <li>新增角色管理分配用户功能</li>
+                                            <li>支持左右冻结列</li>
+                                            <li>修复IE浏览器导出功能报错</li>
+                                            <li>捕获线程池执行任务抛出的异常</li>
+                                            <li>增加日期控件显示类型及回显格式扩展选项</li>
+                                            <li>修复关闭最后选项卡无法激活滚动问题</li>
+                                            <li>修复表格数据重新加载未触发部分按钮禁用</li>
+                                            <li>新增表格启用点击选中行参数</li>
+                                            <li>修改上传文件按日期存储</li>
+                                            <li>新增表格字符超长浮动提示</li>
+                                            <li>升级druid到最新版本1.1.14</li>
+                                            <li>其他细节优化</li>
+                                        </ol>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="panel panel-default">
                                 <div class="panel-heading">
                                     <a data-toggle="collapse" data-parent="#version" href="#v321">
@@ -92,7 +120,7 @@ <h5 class="panel-title">
                                         </h5>
                                     </a>
                                 </div>
-                                <div id="v321" class="panel-collapse collapse in">
+                                <div id="v321" class="panel-collapse collapse">
                                     <div class="panel-body">
                                         <ol>
                                             <li>升级SpringBoot到最新版本2.1.3</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.2.1
+  version: 3.3.0
   # 获取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.2.1</version>
+        <version>3.3.0</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.1");
+        return StringUtils.nvl(getConfig("ruoyi.version"), "3.3.0");
     }
 
     /**

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.1</version>
+        <version>3.3.0</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.1</version>
+        <version>3.3.0</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.1</version>
+        <version>3.3.0</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.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sql/ry_20190331.sql → sql/ry_v3.3.0.sql b/sql/ry_20190331.sql → sql/ry_v3.3.0.sql
@@ -621,4 +621,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.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', '管理员');