Skip to content

Commit e0c3f4a

Browse files
lerry903lerry903
committed
release: 3.3.0
1 parent 391d9c4 commit e0c3f4a

15 files changed

Lines changed: 61 additions & 28 deletions

File tree

‎README.md‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,36 @@
4444

4545
<table>
4646
<tr>
47-
<td><img src="https://oscimg.oschina.net/oscnet/25b5e333768d013d45a990c152dbe4d9d6e.jpg"/></td>
48-
<td><img src="https://oscimg.oschina.net/oscnet/dfadf4d864242745486aa0167110dfcbeb8.jpg"/></td>
47+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/login.jpg"/></td>
48+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/index.jpg"/></td>
4949
</tr>
5050
<tr>
51-
<td><img src="https://oscimg.oschina.net/oscnet/2e1ed87df9b476ed73ed650df20cf009b78.jpg"/></td>
52-
<td><img src="https://oscimg.oschina.net/oscnet/693955d8914ee3c34ab904fa0602bc31267.jpg"/></td>
51+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user_list.jpg"/></td>
52+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user_update.jpg"/></td>
5353
</tr>
5454
<tr>
55-
<td><img src="https://oscimg.oschina.net/oscnet/9a2851988f4e7433c9322154534865f57d7.jpg"/></td>
56-
<td><img src="https://oscimg.oschina.net/oscnet/396293f80b1e8cce8671f56c296bee78a3a.jpg"/></td>
55+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/role_list.jpg"/></td>
56+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/role_update.jpg"/></td>
5757
</tr>
58+
<tr>
59+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user_role.jpg"/></td>
60+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/role_data.jpg"/></td>
61+
</tr>
5862
<tr>
59-
<td><img src="https://oscimg.oschina.net/oscnet/787b3b06430a403655b48b9bcd1fa829555.jpg"/></td>
60-
<td><img src="https://oscimg.oschina.net/oscnet/a51820009836276b778bc89d4d0e217e26d.jpg"/></td>
63+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/function.jpg"/></td>
64+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/function_update.jpg"/></td>
6165
</tr>
6266
<tr>
63-
<td><img src="https://oscimg.oschina.net/oscnet/5fb138478adeda6825e206d21f67ecd0625.jpg"/></td>
64-
<td><img src="https://oscimg.oschina.net/oscnet/fa2f027a10707a4eb4fc47d5ea1c3d2b772.jpg"/></td>
67+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/gen_code.jpg"/></td>
68+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/user.jpg"/></td>
6569
</tr>
6670
<tr>
67-
<td><img src="https://oscimg.oschina.net/oscnet/a714056081523b7dfa782cda866e8be4adc.jpg"/></td>
68-
<td><img src="https://oscimg.oschina.net/oscnet/ab4b5797dfb2bc68c4974ad5458bd5f5bcf.jpg"/></td>
71+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/oper_log.jpg"/></td>
72+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/login_log.jpg"/></td>
6973
</tr>
7074
<tr>
71-
<td><img src="https://oscimg.oschina.net/oscnet/98beb69118d9ab59aa898d5d5baad20b755.jpg"/></td>
72-
<td><img src="https://oscimg.oschina.net/oscnet/5f3d39a141f21f81b90536f391b8408f1fa.jpg"/></td>
75+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/server_monitoring.jpg"/></td>
76+
<td><img src="https://raw.githubusercontent.com/lerry903/RuoYi/master/img/prize.jpg"/></td>
7377
</tr>
7478
</table>
7579

‎img/index.jpg‎

-1.66 KB
Loading

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
<groupId>com.ruoyi</groupId>
88
<artifactId>ruoyi</artifactId>
9-
<version>3.2.1</version>
9+
<version>3.3.0</version>
1010

1111
<name>ruoyi</name>
1212
<url>https://github.com/lerry903/RuoYi</url>
1313
<description>若依管理系统</description>
1414

1515
<properties>
16-
<ruoyi.version>3.2.1</ruoyi.version>
16+
<ruoyi.version>3.3.0</ruoyi.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1919
<java.version>1.8</java.version>

‎ruoyi-admin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>3.2.1</version>
8+
<version>3.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>

‎ruoyi-admin/src/main/resources/dev/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ruoyi:
55
# 描述
66
description: 若依管理系统
77
# 版本
8-
version: 3.2.1
8+
version: 3.3.0
99
# 获取ip地址开关
1010
addressEnabled: true
1111
#演示模式

‎ruoyi-admin/src/main/resources/run/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ruoyi:
55
# 描述
66
description: 若依管理系统
77
# 版本
8-
version: 3.2.1
8+
version: 3.3.0
99
# 获取ip地址开关
1010
addressEnabled: true
1111
#演示模式

‎ruoyi-admin/src/main/resources/templates/main.html‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,34 @@ <h5>更新日志</h5>
8484
<div class="ibox-content no-padding">
8585
<div class="panel-body">
8686
<div class="panel-group" id="version">
87+
<div class="panel panel-default">
88+
<div class="panel-heading">
89+
<a data-toggle="collapse" data-parent="#version" href="#v33">
90+
<h5 class="panel-title">
91+
v3.3.0<code class="pull-right">2019.03.31</code>
92+
</h5>
93+
</a>
94+
</div>
95+
<div id="v33" class="panel-collapse collapse in">
96+
<div class="panel-body">
97+
<ol>
98+
<li>调整用户个人中心页面</li>
99+
<li>新增角色管理分配用户功能</li>
100+
<li>支持左右冻结列</li>
101+
<li>修复IE浏览器导出功能报错</li>
102+
<li>捕获线程池执行任务抛出的异常</li>
103+
<li>增加日期控件显示类型及回显格式扩展选项</li>
104+
<li>修复关闭最后选项卡无法激活滚动问题</li>
105+
<li>修复表格数据重新加载未触发部分按钮禁用</li>
106+
<li>新增表格启用点击选中行参数</li>
107+
<li>修改上传文件按日期存储</li>
108+
<li>新增表格字符超长浮动提示</li>
109+
<li>升级druid到最新版本1.1.14</li>
110+
<li>其他细节优化</li>
111+
</ol>
112+
</div>
113+
</div>
114+
</div>
87115
<div class="panel panel-default">
88116
<div class="panel-heading">
89117
<a data-toggle="collapse" data-parent="#version" href="#v321">
@@ -92,7 +120,7 @@ <h5 class="panel-title">
92120
</h5>
93121
</a>
94122
</div>
95-
<div id="v321" class="panel-collapse collapse in">
123+
<div id="v321" class="panel-collapse collapse">
96124
<div class="panel-body">
97125
<ol>
98126
<li>升级SpringBoot到最新版本2.1.3</li>

‎ruoyi-admin/src/main/resources/uat/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ruoyi:
55
# 描述
66
description: 若依管理系统
77
# 版本
8-
version: 3.2.1
8+
version: 3.3.0
99
# 获取ip地址开关
1010
addressEnabled: true
1111
#演示模式

‎ruoyi-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ruoyi</artifactId>
77
<groupId>com.ruoyi</groupId>
8-
<version>3.2.1</version>
8+
<version>3.3.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static String getName() {
7777
* 获取项目版本
7878
*/
7979
public static String getVersion() {
80-
return StringUtils.nvl(getConfig("ruoyi.version"), "3.2.1");
80+
return StringUtils.nvl(getConfig("ruoyi.version"), "3.3.0");
8181
}
8282

8383
/**

0 commit comments

Comments
 (0)