diff --git a/pom.xml b/pom.xml index 2d5746c3a..573311ab4 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 5.4.0 - 3.4.6 + 3.4.7 UTF-8 UTF-8 17 @@ -23,12 +23,12 @@ 0.15.0 1.2.0 2.3 - 1.42.0 + 1.44.0 3.5.12 3.9.1 - 5.8.35 + 5.8.38 3.4.7 - 3.45.1 + 3.50.0 2.2.7 4.3.1 1.5.0 @@ -41,21 +41,21 @@ 2.7.0 - 2.28.22 + 2.31.67 3.3.4 1.2.83 - 8.7.2-20250101 + 8.7.2-20250603 1.7.4 - 3.2.2 - 3.2.2 - 3.11.0 - 3.1.2 + 3.4.2 + 3.4.0 + 3.14.0 + 3.5.3 1.3.0 true diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java index 554c64b32..6c8accb69 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java @@ -158,6 +158,6 @@ public class UserActionListener implements SaTokenListener { * 每次Token续期时触发 */ @Override - public void doRenewTimeout(String tokenValue, Object loginId, long timeout) { + public void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) { } } diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java index b397f37f4..2ff161ffa 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java @@ -302,8 +302,8 @@ public class GenTableServiceImpl implements IGenTableService { tableColumn.setColumnComment(column.getComment()); tableColumn.setColumnType(column.getOriginType().toLowerCase()); tableColumn.setSort(column.getPosition()); - tableColumn.setIsRequired(column.isNullable() == 0 ? "1" : "0"); - tableColumn.setIsIncrement(column.isAutoIncrement() == -1 ? "0" : "1"); + tableColumn.setIsRequired(column.isNullable() ? "1" : "0"); + tableColumn.setIsIncrement(column.isAutoIncrement() ? "0" : "1"); tableColumns.add(tableColumn); }); return tableColumns;