diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java index 87a812f7..9933d891 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java @@ -201,7 +201,7 @@ public class UploadFileAction extends Action { return false; } - if (remoteFileSize > 50 * 1024 * 1024) { + if (remoteFileSize > 200 * 1024 * 1024) { logger.warn("file over limite!(" + remoteFileSize + ")"); response.setStatus(HttpResponseStatus.BAD_REQUEST); response.setContent("file over limite!"); diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java index 681ded5a..8675aae7 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java @@ -44,6 +44,8 @@ public class ModifyGroupInfoHandler extends GroupHandler 0) { + return WFCMessage.ModifyGroupInfoRequest.newBuilder() + .setGroupId(group_id) + .setType(type) + .setValue(value) + .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) + .build(); + } else { + return WFCMessage.ModifyGroupInfoRequest.newBuilder() + .setGroupId(group_id) + .setType(type) + .setValue(value) + .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) + .setNotifyContent(notify_message.toProtoMessageContent()) + .build(); + } } } diff --git a/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java index 9cce0922..5d52ac49 100644 --- a/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java +++ b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java @@ -234,5 +234,7 @@ public class ProtoConstants { public static final int MESSAGE_CONTENT_TYPE_ALLOW_MEMBER = 119; public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER_VISIBLE = 120; public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP_VISIBLE = 121; + + public static final int MESSAGE_CONTENT_TYPE_MODIFY_GROUP_EXTRA = 122; }