From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期二, 12 九月 2023 09:48:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java index f4bfa37..710b5d3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -142,9 +142,9 @@ public void refreshToken(LoginUser loginUser) { loginUser.setLoginTime(System.currentTimeMillis()); - if(StringUtils.isNull(loginUser.getIsApp())) + String appUserType = loginUser.getUser().getAppUserType(); + if(StringUtils.isNull(appUserType)) { - loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 鏍规嵁uuid灏唋oginUser缂撳瓨 String userKey = getTokenKey(loginUser.getToken()); -- Gitblit v1.9.3