diff --git a/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java b/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java index a800c63..c0fa2bb 100644 --- a/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java +++ b/im-client/src/main/java/com/bx/imclient/task/PullSendResultPrivateMessageTask.java @@ -31,7 +31,6 @@ public class PullSendResultPrivateMessageTask extends AbstractPullMessageTask{ public void pullMessage() { String key = IMRedisKey.IM_RESULT_PRIVATE_QUEUE; JSONObject jsonObject = (JSONObject)redisTemplate.opsForList().leftPop(key,10, TimeUnit.SECONDS); - if(jsonObject != null) { IMSendResult result = jsonObject.toJavaObject(IMSendResult.class); listenerMulticaster.multicast(IMListenerType.PRIVATE_MESSAGE, result); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 33205cc..a5d1799 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -79,7 +79,7 @@ public class UserServiceImpl extends ServiceImpl implements IU session.setTerminal(dto.getTerminal()); String strJson = JSON.toJSONString(session); String accessToken = JwtUtil.sign(user.getId(),strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret()); - String refreshToken = JwtUtil.sign(user.getId(),strJson,jwtProperties.getAccessTokenExpireIn(),jwtProperties.getAccessTokenSecret()); + String refreshToken = JwtUtil.sign(user.getId(),strJson,jwtProperties.getRefreshTokenExpireIn(),jwtProperties.getRefreshTokenSecret()); LoginVO vo = new LoginVO(); vo.setAccessToken(accessToken); vo.setAccessTokenExpiresIn(jwtProperties.getAccessTokenExpireIn()); @@ -97,7 +97,7 @@ public class UserServiceImpl extends ServiceImpl implements IU @Override public LoginVO refreshToken(String refreshToken) { //验证 token - if(JwtUtil.checkSign(refreshToken, jwtProperties.getRefreshTokenSecret())){ + if(!JwtUtil.checkSign(refreshToken, jwtProperties.getRefreshTokenSecret())){ throw new GlobalException("refreshToken无效或已过期"); } String strJson = JwtUtil.getInfo(refreshToken); diff --git a/im-ui/src/view/Login.vue b/im-ui/src/view/Login.vue index 26df584..d6d6ce8 100644 --- a/im-ui/src/view/Login.vue +++ b/im-ui/src/view/Login.vue @@ -2,7 +2,7 @@