github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update copyright 2023

pull/438/MERGE
RuoYi 2023-02-03 17:41:14 +08:00
parent 8939e21a29
commit f2d5545092
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -5,7 +5,7 @@ ruoyi:
# 版本 # 版本
version: 4.7.6 version: 4.7.6
# 版权年份 # 版权年份
copyrightYear: 2022 copyrightYear: 2023
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）

20
ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html
View File

@ -32,16 +32,16 @@
showRefresh: false, showRefresh: false,
showToggle: false, showToggle: false,
showColumns: false, showColumns: false,
onReorderRow: function (data, newRow, oldRow, el) { onReorderRow: function (data, newRow, oldRow, el) {
//当拖拽结束后，data为整个表格的数据 // 当拖拽结束后，data为整个表格的数据
console.table(data) console.table(data)
// 当sidePagination: "server"时，拖拽行后顺序错乱，需要重新调用加载数据方法 // 当sidePagination: "server"时，拖拽行后顺序错乱，需要重新调用加载数据方法
$("#" + table.options.id).bootstrapTable('load', { $("#" + table.options.id).bootstrapTable('load', {
total: el._xhr.responseJSON.total, total: el._xhr.responseJSON.total,
rows: data rows: data
}); });
return false; return false;
}, },
columns: [{ columns: [{
checkbox: true checkbox: true
}, },

2
ruoyi-admin/src/main/resources/templates/login.html
View File

@ -65,7 +65,7 @@
</div> </div>
<div class="signup-footer"> <div class="signup-footer">
<div class="pull-left"> <div class="pull-left">
Copyright © 2018-2022 ruoyi.vip All Rights Reserved. <br> Copyright © 2018-2023 ruoyi.vip All Rights Reserved. <br>
</div> </div>
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/register.html
View File

@ -64,7 +64,7 @@
</div> </div>
<div class="signup-footer"> <div class="signup-footer">
<div class="pull-left"> <div class="pull-left">
&copy; 2018-2022 All Rights Reserved. RuoYi <br> &copy; 2018-2023 All Rights Reserved. RuoYi <br>
</div> </div>
</div> </div>
</div> </div>

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -4,7 +4,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.Deque; import java.util.Deque;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.Cache;
import org.apache.shiro.cache.ehcache.EhCacheManager; import org.apache.shiro.cache.ehcache.EhCacheManager;
@ -117,7 +116,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
@Override @Override
public void removeUserCache(String loginName, String sessionId) public void removeUserCache(String loginName, String sessionId)
{ {
EhCacheManager ehCacheManager= SpringUtils.getBean(EhCacheManager.class); EhCacheManager ehCacheManager = SpringUtils.getBean(EhCacheManager.class);
Cache<String, Deque<Serializable>> cache = ehCacheManager.getCache(ShiroConstants.SYS_USERCACHE); Cache<String, Deque<Serializable>> cache = ehCacheManager.getCache(ShiroConstants.SYS_USERCACHE);
Deque<Serializable> deque = cache.get(loginName); Deque<Serializable> deque = cache.get(loginName);
if (StringUtils.isEmpty(deque) || deque.size() == 0) if (StringUtils.isEmpty(deque) || deque.size() == 0)