From 58c98bbbfabd7a546568b100b4444d928c0bd5da Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Fri, 12 Apr 2019 16:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=8D=E6=AC=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A5=BD=E5=8F=8B=E9=80=BB=E8=BE=91=EF=BC=9A=201?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E5=8F=91=E8=BF=87=E5=A5=BD?= =?UTF-8?q?=E5=8F=8B=E8=AF=B7=E6=B1=82=EF=BC=8C=E6=88=96=E8=80=85=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E5=8F=91=E9=80=81=E5=A5=BD=E5=8F=8B=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E6=8E=A5=E5=8F=97=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=8F=91=E9=80=81=202=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=BF=87=E5=A5=BD=E5=8F=8B=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E4=B8=94=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=97=EF=BC=8C=E6=97=B6=E9=97=B4=E5=B0=8F=E4=BA=8E7?= =?UTF-8?q?=E5=A4=A9=E7=9A=84=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=BF=87=E9=94=99=E8=AF=AF=E7=A0=81=E3=80=82?= =?UTF-8?q?=203=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8F=91=E9=80=81=E8=BF=87?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E8=AF=B7=E6=B1=82=EF=BC=8C=E4=B8=94=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8D=E4=B8=BA=E6=8E=A5=E5=8F=97=EF=BC=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=A4=A7=E4=BA=8E7=E5=A4=A9=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=8A=B6=E6=80=81=E4=B8=BAreject=EF=BC=8C30?= =?UTF-8?q?=E5=A4=A9=E4=BB=A5=E5=86=85=E4=B8=8D=E8=83=BD=E5=8F=91=E9=80=81?= =?UTF-8?q?=EF=BC=88=E8=BF=94=E5=9B=9E=E6=8B=89=E9=BB=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=EF=BC=89=EF=BC=8C30=E5=A4=A9=E4=BB=A5=E4=B8=8A?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=86=8D=E6=AC=A1=E5=8F=91=E9=80=81=204?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8F=91=E9=80=81=E8=BF=87=E5=A5=BD?= =?UTF-8?q?=E5=8F=8B=E8=AF=B7=E6=B1=82=EF=BC=8C=E4=B8=94=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E6=8E=A5=E5=8F=97=EF=BC=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E7=E5=A4=A9=E7=9A=84=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E7=8A=B6=E6=80=81=E4=B8=BAsent=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=86=8D=E6=AC=A1=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/moquette/persistence/MemoryMessagesStore.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 3deb0469..e68ddd10 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -1480,9 +1480,10 @@ public class MemoryMessagesStore implements IMessagesStore { } } - if (existRequest != null) { - if (existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) { - if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected) { + if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) { + if (System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) { + if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected + && System.currentTimeMillis() - existRequest.getUpdateDt() < 30 * 24 * 60 * 60 * 1000) { return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED; } requestMap.remove(userId, existRequest);