From 0e9da0de206d8319a16d6991ee5c5e9faebe9516 Mon Sep 17 00:00:00 2001 From: taixingyiji Date: Mon, 31 Mar 2025 13:39:22 +0800 Subject: [PATCH] feat: fix bugs --- .../taixingyiji/base/common/utils/UserInfoUtil.java | 2 +- .../taixingyiji/base/module/shiro/CustomRealm.java | 2 +- .../com/taixingyiji/base/module/shiro/FtToken.java | 2 +- .../base/module/shiro/service/ShiroServiceImpl.java | 2 +- hcframe-parent/pom.xml | 12 ++++++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java index 1705776..ab9c144 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java @@ -32,7 +32,7 @@ public class UserInfoUtil { if (date.getTime() > expireData.getTime()) { return null; } - return (T) shiroService.findByUserId(ftToken.getUserId()); + return (T) shiroService.findByUserId(String.valueOf(ftToken.getUserId())); } /** diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java index a8044d5..f4fb90d 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/CustomRealm.java @@ -80,7 +80,7 @@ public class CustomRealm extends AuthorizingRealm { } else { //1. 根据accessToken，查询用户信息 FtToken tokenEntity = shiroService.findByToken(accessToken); - userId = tokenEntity.getUserId(); + userId = String.valueOf(tokenEntity.getUserId()); //2. token失效 if (tokenEntity.getExpireTime().getTime() < System.currentTimeMillis()) { throw new IncorrectCredentialsException("token失效，请重新登录"); diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java index 1d8bc21..733cfa1 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/FtToken.java @@ -29,7 +29,7 @@ public class FtToken implements Serializable { private String token; - private String userId; + private Integer userId; private Date updateTime; diff --git a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java index 9c95d5a..baafd2a 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/shiro/service/ShiroServiceImpl.java @@ -160,7 +160,7 @@ public class ShiroServiceImpl implements ShiroService { Map map = baseMapper.selectOneByCondition("FT_TOKEN", condition); osToken.setToken((String) map.get("TOKEN")); osToken.setTokenId((String) map.get("TOKEN_ID")); - osToken.setUserId((String) map.get("USER_ID")); + osToken.setUserId((Integer) map.get("USER_ID")); osToken.setExpireTime((Date) map.get("EXPIRE_TIME")); osToken.setUpdateTime((Date) map.get("UPDATE_TIME")); return osToken; diff --git a/hcframe-parent/pom.xml b/hcframe-parent/pom.xml index d2dbf8e..f0f218b 100644 --- a/hcframe-parent/pom.xml +++ b/hcframe-parent/pom.xml @@ -229,4 +229,16 @@ + + + releases + Releases + http://192.168.0.123:8081/repository/maven-releases/ + + + snapshots + Snapshot + http://192.168.0.123:8081/repository/maven-snapshots/ + +