Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster

core/src/main/java/com/wecloud/im/ws/cache/UserStateCacheManager.java

@@ -32,7 +32,7 @@ public class UserStateCacheManager extends UserStateListener {
 
     @Override
     public void onLineEvent(Long clientId, Integer platform, String longChannelId) {
-        log.info("ws用户上线保存redis连接ip: {}, uid: {}", GetIpUtils.getlanIp(), longChannelId);
+        log.info("ws用户上线保存redis连接clientId: {}, ip: {}, uid: {}", clientId, GetIpUtils.getlanIp(), longChannelId);
         // 先删除旧的重复的platform
         Set<String> platformAndIps = redisUtils.getForSetMembers(getUserStateCacheKey(clientId));
         for(String platformAndIp : platformAndIps) {
@@ -48,7 +48,7 @@ public class UserStateCacheManager extends UserStateListener {
 
     @Override
     public void offlineEvent(Long clientId, Integer platform, String longChannelId) {
-        log.info("ws用户离线删除redis key,uid:" + longChannelId);
+        log.info("ws用户离线删除redis key,uid: {}, clientId: {}", longChannelId, clientId);
         redisUtils.removeForSet(getUserStateCacheKey(clientId), platform + RedisUtils.SPLIT + GetIpUtils.getlanIp());
     }