From 96f7baece4888f92083773cee23d4064c06f06ba Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Fri, 2 Apr 2021 10:08:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=86=85=E7=BD=AE=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B8=8A=E9=99=90=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA200MB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xiaoleilu/loServer/action/UploadFileAction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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!");

From d4d467afe2f80c36c4b34bdba458b6cf88a5b48d Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Fri, 2 Apr 2021 12:04:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=BE=A4=E7=BB=84=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojos/InputModifyGroupInfo.java           | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java b/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java
index ed0f70c8..19ef9ff0 100755
--- a/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java
+++ b/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java
@@ -49,11 +49,21 @@ public class InputModifyGroupInfo extends InputGroupBase {
     }
 
     public WFCMessage.ModifyGroupInfoRequest toProtoGroupRequest() {
-        return WFCMessage.ModifyGroupInfoRequest.newBuilder()
-            .setGroupId(group_id)
-            .setType(type)
-            .setValue(value)
-            .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines)
-            .build();
+        if(notify_message != null && notify_message.getType() > 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();
+        }
     }
 }

From c7bb49b3f7e3d8e1eaf2aafb936d25b469324249 Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Fri, 2 Apr 2021 12:15:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=A4=E7=BB=84extra?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=97=B6=EF=BC=8C=E5=8F=91=E9=80=81=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E7=BB=99=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/moquette/imhandler/ModifyGroupInfoHandler.java   | 2 ++
 .../wildfirechat/pojos/GroupNotificationBinaryContent.java   | 5 +++++
 .../src/main/java/cn/wildfirechat/proto/ProtoConstants.java  | 2 ++
 3 files changed, 9 insertions(+)

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<WFCMessage.ModifyGroupI
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupPrivatechatNotifyContent();
                 } else if(request.getType() == Modify_Group_Searchable) {
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupSearchableNotifyContent();
+                } else if(request.getType() == Modify_Group_Extra) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupExtraNotifyContent();
                 }
 
                 if (content != null) {
diff --git a/common/src/main/java/cn/wildfirechat/pojos/GroupNotificationBinaryContent.java b/common/src/main/java/cn/wildfirechat/pojos/GroupNotificationBinaryContent.java
index 1976ab76..99229548 100644
--- a/common/src/main/java/cn/wildfirechat/pojos/GroupNotificationBinaryContent.java
+++ b/common/src/main/java/cn/wildfirechat/pojos/GroupNotificationBinaryContent.java
@@ -160,4 +160,9 @@ public class GroupNotificationBinaryContent {
     public WFCMessage.MessageContent getAllowGroupMemberNotifyContent() {
         return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_ALLOW_MEMBER);
     }
+
+    public WFCMessage.MessageContent getChangeGroupExtraNotifyContent() {
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_MODIFY_GROUP_EXTRA);
+    }
+
 }
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;
 }