diff --git a/pom.xml b/pom.xml index fb8b4bb8..d2550307 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 UTF-8 17 - 3.4.6 + 3.4.7 2024.0.0 3.4.7 3.5.16 @@ -29,11 +29,11 @@ 2.8.8 0.15.0 1.2.0 - 5.8.35 - 3.45.1 + 5.8.38 + 3.50.0 2.2.7 1.5.0 - 1.42.0 + 1.44.0 1.18.36 7.4 3.0.0 @@ -48,20 +48,20 @@ 1.2.83 - 2.28.22 + 2.31.67 3.3.4 - 8.7.2-20250101 + 8.7.2-20250603 1.7.3 2.3.0 - 3.11.0 - 3.1.2 + 3.14.0 + 3.5.3 1.3.0 true diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java b/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java index 6e22e199..47153999 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java @@ -162,7 +162,7 @@ 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-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index d3808ba7..ad4fc487 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/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;