Pre Merge pull request !34 from WangXuewen/master

Merge pull request #1928 from meqbyte/master
jwt剩余时间计算错误
2026-05-25 22:47:49 +08:00 · 2025-07-28 00:47:02 +00:00 · 2025-07-28 08:32:24 +08:00 · 2025-07-25 15:59:59 +08:00 · 2025-07-09 22:51:24 +08:00 · 2025-07-09 22:43:36 +08:00
2 changed files with 2 additions and 3 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -64,8 +64,7 @@ jobs:
          fi
          
          TAG_NAME="${GITHUB_REF#refs/tags/}"
-          DATE=$(date +%Y%m%d)
-          ZIP_FILE_NAME="${BRANCH_NAME}-${TAG_NAME}-${DATE}.zip"
+          ZIP_FILE_NAME="${BRANCH_NAME}-${TAG_NAME}.zip"
          zip -r "$ZIP_FILE_NAME" release
          echo "ZIP_FILE_NAME=$ZIP_FILE_NAME" >> $GITHUB_ENV

--- a/src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
@ -231,7 +231,7 @@ public class JwtUtils implements InitializingBean {
            if (expirationTime != null) {
                // 判断是否即将过期, 默认剩余时间小于5分钟未即将过期
                // 剩余时间 （秒）
-                long timeRemaining = LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)) - expirationTime.getValue();
+                long timeRemaining = expirationTime.getValue() - LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8));
                if (timeRemaining < 5 * 60) {
                    jwtUser.setStatus(JwtUser.TokenStatus.EXPIRING_SOON);
                } else {
Author	SHA1	Message	Date
WangXuewen	1fbc5bc168	Pre Merge pull request !34 from WangXuewen/master	2025-07-28 00:47:02 +00:00
648540858	49578e884f	Merge pull request #1928 from meqbyte/master jwt剩余时间计算错误	2025-07-28 08:32:24 +08:00
meqbyte	305c8ec8d7	jwt剩余时间计算错误	2025-07-25 15:59:59 +08:00
648540858	569b361a43	调整打包命名	2025-07-09 22:51:24 +08:00
648540858	16fd1db833	调整打包命名	2025-07-09 22:43:36 +08:00