From 9baa1f9b230701b651ab19e97b42dfef78034c7c Mon Sep 17 00:00:00 2001 From: imhao183 Date: Mon, 30 Dec 2019 08:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/config/wildfirechat.conf | 4 ++++ .../com/xiaoleilu/loServer/action/admin/AdminAction.java | 2 +- .../xiaoleilu/loServer/action/channel/ChannelAction.java | 2 +- .../com/xiaoleilu/loServer/action/robot/RobotAction.java | 2 +- broker/src/main/java/io/moquette/BrokerConstants.java | 2 +- .../main/java/io/moquette/imhandler/SendMessageHandler.java | 4 ++-- .../java/io/moquette/persistence/MemoryMessagesStore.java | 6 +++--- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/broker/config/wildfirechat.conf b/broker/config/wildfirechat.conf index 79d173ed..ceeb9d77 100755 --- a/broker/config/wildfirechat.conf +++ b/broker/config/wildfirechat.conf @@ -64,6 +64,10 @@ message.max_queue 1024 ##是否禁止陌生人聊天 message.disable_stranger_chat false + +##黑名单处理策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃； +message.blacklist.strategy 0 + ##好友请求重复发送的间隔，单位是毫秒，默认是7天，0为不限制 friend.repeat_request_duration 604800000 diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java index e6090c45..79977868 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java @@ -50,7 +50,7 @@ abstract public class AdminAction extends Action { Long ts; try { ts = Long.parseLong(timestamp); - } catch (NumberFormatException e) { + } catch (Exception e) { e.printStackTrace(); return ErrorCode.INVALID_PARAMETER; } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java index d312076e..477738be 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java @@ -45,7 +45,7 @@ abstract public class ChannelAction extends Action { Long ts; try { ts = Long.parseLong(timestamp); - } catch (NumberFormatException e) { + } catch (Exception e) { e.printStackTrace(); return ErrorCode.INVALID_PARAMETER; } diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java index b10073b5..3b568b7a 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java @@ -47,7 +47,7 @@ abstract public class RobotAction extends Action { Long ts; try { ts = Long.parseLong(timestamp); - } catch (NumberFormatException e) { + } catch (Exception e) { e.printStackTrace(); return ErrorCode.INVALID_PARAMETER; } diff --git a/broker/src/main/java/io/moquette/BrokerConstants.java b/broker/src/main/java/io/moquette/BrokerConstants.java index a0d8e224..8efa606c 100755 --- a/broker/src/main/java/io/moquette/BrokerConstants.java +++ b/broker/src/main/java/io/moquette/BrokerConstants.java @@ -119,7 +119,7 @@ public final class BrokerConstants { public static final String MESSAGE_Disable_Stranger_Chat = "message.disable_stranger_chat"; - public static final String MESSAGE_Blacklist_Strategy = "blacklist.strategy"; + public static final String MESSAGE_Blacklist_Strategy = "message.blacklist.strategy"; public static final String FRIEND_Repeat_Request_Duration = "friend.repeat_request_duration"; public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration"; diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java index 15426c6b..1507419f 100644 --- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java @@ -42,8 +42,8 @@ public class SendMessageHandler extends IMHandler { } try { - mBlacklistStrategy = Integer.parseInt(Server.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Strategy)); - } catch (NumberFormatException e) { + mBlacklistStrategy = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Strategy)); + } catch (Exception e) { e.printStackTrace(); } } diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 18ebc83e..8e06351c 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -137,13 +137,13 @@ public class MemoryMessagesStore implements IMessagesStore { } try { - mFriendRequestDuration = Long.parseLong(Server.getConfig().getProperty(FRIEND_Repeat_Request_Duration)); + mFriendRequestDuration = Long.parseLong(m_Server.getConfig().getProperty(FRIEND_Repeat_Request_Duration)); } catch (Exception e) { e.printStackTrace(); } try { - mFriendRejectDuration = Long.parseLong(Server.getConfig().getProperty(FRIEND_Reject_Request_Duration)); + mFriendRejectDuration = Long.parseLong(m_Server.getConfig().getProperty(FRIEND_Reject_Request_Duration)); } catch (Exception e) { e.printStackTrace(); } @@ -2432,7 +2432,7 @@ public class MemoryMessagesStore implements IMessagesStore { else if(modifyType == Modify_Channel_OnlyCallback) { try { newInfoBuilder.setAutomatic(Integer.parseInt(value)); - } catch (NumberFormatException e) { + } catch (Exception e) { e.printStackTrace(); } }