anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决pc多端登录互踢时pc在线状态没有更新的问题

Browse Source
This commit is contained in:
heavyrian2012
2023-04-24 11:26:55 +08:00
parent c159ff90e3
commit 758c5de2c7
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+24 -8
View File
@@ -2510,6 +2510,28 @@ public class MemoryMessagesStore implements IMessagesStore {
}
}
private boolean isOnlineValueEqual(WFCMessage.UserSettingEntry pcentry, String newValue) {
if(pcentry == null) {
return StringUtil.isNullOrEmpty(newValue);
}
String oldValue = pcentry.getValue();
if(StringUtil.isNullOrEmpty(oldValue) && StringUtil.isNullOrEmpty(newValue)) {
return true;
}
if(StringUtil.isNullOrEmpty(oldValue) || StringUtil.isNullOrEmpty(newValue)) {
return false;
}
String[] ssOld = oldValue.split("\\|");
String[] ssNew = newValue.split("\\|");
if(ssOld.length != 4 || ssNew.length != 4 || !ssOld[1].equals(ssNew[1]) || !ssOld[2].equals(ssNew[2]) || !ssOld[3].equals(ssNew[3])) {
return false;
}
return true;
}
@Override
public void updateUserOnlineSetting(MemorySessionStore.Session session, boolean online) {
if(!mMultiPlatformNotification) {
@@ -2541,14 +2563,8 @@ public class MemoryMessagesStore implements IMessagesStore {
}
WFCMessage.UserSettingEntry pcentry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "PC");
if (pcValue != null) {
if (pcentry == null || StringUtil.isNullOrEmpty(pcentry.getValue())) {
updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(pcValue).build(), session.clientID);
}
} else {
if (pcentry != null && !StringUtil.isNullOrEmpty(pcentry.getValue())) {
updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue("").build(), session.clientID);
}
if (!isOnlineValueEqual(pcentry, pcValue)) {
updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(pcValue==null?"":pcValue).build(), session.clientID);
}
}