diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d9925166..1accf8e6 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ ruoyi: # 版本 version: 4.7.6 # 版权年份 - copyrightYear: 2022 + copyrightYear: 2023 # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html b/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html index 197db801..ded9ecec 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html @@ -32,16 +32,16 @@ showRefresh: false, showToggle: false, showColumns: false, - onReorderRow: function (data, newRow, oldRow, el) { - //当拖拽结束后,data为整个表格的数据 - console.table(data) - // 当sidePagination: "server"时,拖拽行后顺序错乱,需要重新调用加载数据方法 - $("#" + table.options.id).bootstrapTable('load', { - total: el._xhr.responseJSON.total, - rows: data - }); - return false; - }, + onReorderRow: function (data, newRow, oldRow, el) { + // 当拖拽结束后,data为整个表格的数据 + console.table(data) + // 当sidePagination: "server"时,拖拽行后顺序错乱,需要重新调用加载数据方法 + $("#" + table.options.id).bootstrapTable('load', { + total: el._xhr.responseJSON.total, + rows: data + }); + return false; + }, columns: [{ checkbox: true }, diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 0b173c1f..ca6cf6ed 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -65,7 +65,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html index 37c106f9..604c0701 100644 --- a/ruoyi-admin/src/main/resources/templates/register.html +++ b/ruoyi-admin/src/main/resources/templates/register.html @@ -64,7 +64,7 @@ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index 436fe8f3..a71dc17a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -4,7 +4,6 @@ import java.io.Serializable; import java.util.Date; import java.util.Deque; import java.util.List; - import com.ruoyi.common.utils.spring.SpringUtils; import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.ehcache.EhCacheManager; @@ -117,7 +116,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService @Override public void removeUserCache(String loginName, String sessionId) { - EhCacheManager ehCacheManager= SpringUtils.getBean(EhCacheManager.class); + EhCacheManager ehCacheManager = SpringUtils.getBean(EhCacheManager.class); Cache