diff --git a/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java b/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java index 2b22b4bb..8152ca21 100644 --- a/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java +++ b/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java @@ -1621,6 +1621,26 @@ public final class WFCMessage { * optional int32 searchable = 13; */ int getSearchable(); + + // optional int32 max_member_count = 14; + /** + * optional int32 max_member_count = 14; + */ + boolean hasMaxMemberCount(); + /** + * optional int32 max_member_count = 14; + */ + int getMaxMemberCount(); + + // optional int32 history_message = 15; + /** + * optional int32 history_message = 15; + */ + boolean hasHistoryMessage(); + /** + * optional int32 history_message = 15; + */ + int getHistoryMessage(); } /** * Protobuf type {@code GroupInfo} @@ -1738,6 +1758,16 @@ public final class WFCMessage { searchable_ = input.readInt32(); break; } + case 112: { + bitField0_ |= 0x00002000; + maxMemberCount_ = input.readInt32(); + break; + } + case 120: { + bitField0_ |= 0x00004000; + historyMessage_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2121,6 +2151,38 @@ public final class WFCMessage { return searchable_; } + // optional int32 max_member_count = 14; + public static final int MAX_MEMBER_COUNT_FIELD_NUMBER = 14; + private int maxMemberCount_; + /** + * optional int32 max_member_count = 14; + */ + public boolean hasMaxMemberCount() { + return ((bitField0_ & 0x00002000) == 0x00002000); + } + /** + * optional int32 max_member_count = 14; + */ + public int getMaxMemberCount() { + return maxMemberCount_; + } + + // optional int32 history_message = 15; + public static final int HISTORY_MESSAGE_FIELD_NUMBER = 15; + private int historyMessage_; + /** + * optional int32 history_message = 15; + */ + public boolean hasHistoryMessage() { + return ((bitField0_ & 0x00004000) == 0x00004000); + } + /** + * optional int32 history_message = 15; + */ + public int getHistoryMessage() { + return historyMessage_; + } + private void initFields() { targetId_ = ""; name_ = ""; @@ -2135,6 +2197,8 @@ public final class WFCMessage { joinType_ = 0; privateChat_ = 0; searchable_ = 0; + maxMemberCount_ = 0; + historyMessage_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2195,6 +2259,12 @@ public final class WFCMessage { if (((bitField0_ & 0x00001000) == 0x00001000)) { output.writeInt32(13, searchable_); } + if (((bitField0_ & 0x00002000) == 0x00002000)) { + output.writeInt32(14, maxMemberCount_); + } + if (((bitField0_ & 0x00004000) == 0x00004000)) { + output.writeInt32(15, historyMessage_); + } getUnknownFields().writeTo(output); } @@ -2256,6 +2326,14 @@ public final class WFCMessage { size += com.google.protobuf.CodedOutputStream .computeInt32Size(13, searchable_); } + if (((bitField0_ & 0x00002000) == 0x00002000)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(14, maxMemberCount_); + } + if (((bitField0_ & 0x00004000) == 0x00004000)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(15, historyMessage_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -2398,6 +2476,10 @@ public final class WFCMessage { bitField0_ = (bitField0_ & ~0x00000800); searchable_ = 0; bitField0_ = (bitField0_ & ~0x00001000); + maxMemberCount_ = 0; + bitField0_ = (bitField0_ & ~0x00002000); + historyMessage_ = 0; + bitField0_ = (bitField0_ & ~0x00004000); return this; } @@ -2478,6 +2560,14 @@ public final class WFCMessage { to_bitField0_ |= 0x00001000; } result.searchable_ = searchable_; + if (((from_bitField0_ & 0x00002000) == 0x00002000)) { + to_bitField0_ |= 0x00002000; + } + result.maxMemberCount_ = maxMemberCount_; + if (((from_bitField0_ & 0x00004000) == 0x00004000)) { + to_bitField0_ |= 0x00004000; + } + result.historyMessage_ = historyMessage_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2543,6 +2633,12 @@ public final class WFCMessage { if (other.hasSearchable()) { setSearchable(other.getSearchable()); } + if (other.hasMaxMemberCount()) { + setMaxMemberCount(other.getMaxMemberCount()); + } + if (other.hasHistoryMessage()) { + setHistoryMessage(other.getHistoryMessage()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -3212,6 +3308,72 @@ public final class WFCMessage { return this; } + // optional int32 max_member_count = 14; + private int maxMemberCount_ ; + /** + * optional int32 max_member_count = 14; + */ + public boolean hasMaxMemberCount() { + return ((bitField0_ & 0x00002000) == 0x00002000); + } + /** + * optional int32 max_member_count = 14; + */ + public int getMaxMemberCount() { + return maxMemberCount_; + } + /** + * optional int32 max_member_count = 14; + */ + public Builder setMaxMemberCount(int value) { + bitField0_ |= 0x00002000; + maxMemberCount_ = value; + onChanged(); + return this; + } + /** + * optional int32 max_member_count = 14; + */ + public Builder clearMaxMemberCount() { + bitField0_ = (bitField0_ & ~0x00002000); + maxMemberCount_ = 0; + onChanged(); + return this; + } + + // optional int32 history_message = 15; + private int historyMessage_ ; + /** + * optional int32 history_message = 15; + */ + public boolean hasHistoryMessage() { + return ((bitField0_ & 0x00004000) == 0x00004000); + } + /** + * optional int32 history_message = 15; + */ + public int getHistoryMessage() { + return historyMessage_; + } + /** + * optional int32 history_message = 15; + */ + public Builder setHistoryMessage(int value) { + bitField0_ |= 0x00004000; + historyMessage_ = value; + onChanged(); + return this; + } + /** + * optional int32 history_message = 15; + */ + public Builder clearHistoryMessage() { + bitField0_ = (bitField0_ & ~0x00004000); + historyMessage_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:GroupInfo) } @@ -61843,166 +62005,167 @@ public final class WFCMessage { "dRequest\022\022\n\ntarget_uid\030\001 \002(\t\022\016\n\006reason\030\002" + " \002(\t\022\r\n\005extra\030\003 \001(\t\":\n\014Conversation\022\014\n\004t" + "ype\030\001 \002(\005\022\016\n\006target\030\002 \002(\t\022\014\n\004line\030\003 \002(\005\"" + - "\370\001\n\tGroupInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004name" + + "\253\002\n\tGroupInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004name" + "\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005owner\030\004 \001(\t\022" + "\014\n\004type\030\005 \002(\005\022\024\n\014member_count\030\006 \001(\005\022\r\n\005e" + "xtra\030\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\030\n\020member_" + "update_dt\030\t \001(\003\022\014\n\004mute\030\n \001(\005\022\021\n\tjoin_ty" + "pe\030\013 \001(\005\022\024\n\014private_chat\030\014 \001(\005\022\022\n\nsearch", - "able\030\r \001(\005\"r\n\013GroupMember\022\021\n\tmember_id\030\001" + - " \002(\t\022\r\n\005alias\030\002 \001(\t\022\014\n\004type\030\003 \002(\005\022\021\n\tupd" + - "ate_dt\030\004 \001(\003\022\021\n\tcreate_dt\030\005 \001(\003\022\r\n\005extra" + - "\030\006 \001(\t\"F\n\005Group\022\036\n\ngroup_info\030\001 \002(\0132\n.Gr" + - "oupInfo\022\035\n\007members\030\002 \003(\0132\014.GroupMember\"\304" + - "\001\n\013ChannelInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004nam" + - "e\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005owner\030\004 \001(\t" + - "\022\016\n\006status\030\005 \001(\005\022\014\n\004desc\030\006 \001(\t\022\r\n\005extra\030" + - "\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\016\n\006secret\030\t \001(\t" + - "\022\020\n\010callback\030\n \001(\t\022\021\n\tautomatic\030\013 \001(\005\"D\n", - "\021ModifyChannelInfo\022\022\n\nchannel_id\030\001 \002(\t\022\014" + - "\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\"8\n\017TransferC" + - "hannel\022\022\n\nchannel_id\030\001 \002(\t\022\021\n\tnew_owner\030" + - "\002 \002(\t\"3\n\017PullChannelInfo\022\022\n\nchannel_id\030\001" + - " \002(\t\022\014\n\004head\030\002 \002(\003\"H\n\023PullChannelListene" + - "r\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006offset\030\002 \002(\005\022\r\n" + - "\005count\030\003 \002(\005\"R\n\031PullChannelListenerResul" + - "t\022\023\n\013total_count\030\001 \002(\005\022\016\n\006offset\030\002 \002(\005\022\020" + - "\n\010listener\030\003 \003(\t\"3\n\rListenChannel\022\022\n\ncha" + - "nnel_id\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005\"E\n\023SearchC", - "hannelResult\022\035\n\007channel\030\001 \003(\0132\014.ChannelI" + - "nfo\022\017\n\007keyword\030\002 \002(\t\"\235\002\n\016MessageContent\022" + - "\014\n\004type\030\001 \002(\005\022\032\n\022searchable_content\030\002 \001(" + - "\t\022\024\n\014push_content\030\003 \001(\t\022\017\n\007content\030\004 \001(\t" + - "\022\014\n\004data\030\005 \001(\014\022\021\n\tmediaType\030\006 \001(\005\022\026\n\016rem" + - "oteMediaUrl\030\007 \001(\t\022\024\n\014persist_flag\030\010 \001(\005\022" + - "\027\n\017expire_duration\030\t \001(\005\022\026\n\016mentioned_ty" + - "pe\030\n \001(\005\022\030\n\020mentioned_target\030\013 \003(\t\022\r\n\005ex" + - "tra\030\014 \001(\t\022\021\n\tpush_data\030\r \001(\t\"\226\001\n\025AddGrou" + - "pMemberRequest\022\020\n\010group_id\030\001 \002(\t\022\"\n\014adde", - "d_member\030\002 \003(\0132\014.GroupMember\022\017\n\007to_line\030" + - "\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132\017.MessageC" + - "ontent\022\r\n\005extra\030\005 \001(\t\"{\n\022CreateGroupRequ" + - "est\022\025\n\005group\030\001 \002(\0132\006.Group\022\017\n\007to_line\030\002 " + + "able\030\r \001(\005\022\030\n\020max_member_count\030\016 \001(\005\022\027\n\017" + + "history_message\030\017 \001(\005\"r\n\013GroupMember\022\021\n\t" + + "member_id\030\001 \002(\t\022\r\n\005alias\030\002 \001(\t\022\014\n\004type\030\003" + + " \002(\005\022\021\n\tupdate_dt\030\004 \001(\003\022\021\n\tcreate_dt\030\005 \001" + + "(\003\022\r\n\005extra\030\006 \001(\t\"F\n\005Group\022\036\n\ngroup_info" + + "\030\001 \002(\0132\n.GroupInfo\022\035\n\007members\030\002 \003(\0132\014.Gr" + + "oupMember\"\304\001\n\013ChannelInfo\022\021\n\ttarget_id\030\001" + + " \001(\t\022\014\n\004name\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005" + + "owner\030\004 \001(\t\022\016\n\006status\030\005 \001(\005\022\014\n\004desc\030\006 \001(" + + "\t\022\r\n\005extra\030\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\016\n\006s", + "ecret\030\t \001(\t\022\020\n\010callback\030\n \001(\t\022\021\n\tautomat" + + "ic\030\013 \001(\005\"D\n\021ModifyChannelInfo\022\022\n\nchannel" + + "_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\"8" + + "\n\017TransferChannel\022\022\n\nchannel_id\030\001 \002(\t\022\021\n" + + "\tnew_owner\030\002 \002(\t\"3\n\017PullChannelInfo\022\022\n\nc" + + "hannel_id\030\001 \002(\t\022\014\n\004head\030\002 \002(\003\"H\n\023PullCha" + + "nnelListener\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006offs" + + "et\030\002 \002(\005\022\r\n\005count\030\003 \002(\005\"R\n\031PullChannelLi" + + "stenerResult\022\023\n\013total_count\030\001 \002(\005\022\016\n\006off" + + "set\030\002 \002(\005\022\020\n\010listener\030\003 \003(\t\"3\n\rListenCha", + "nnel\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005" + + "\"E\n\023SearchChannelResult\022\035\n\007channel\030\001 \003(\013" + + "2\014.ChannelInfo\022\017\n\007keyword\030\002 \002(\t\"\235\002\n\016Mess" + + "ageContent\022\014\n\004type\030\001 \002(\005\022\032\n\022searchable_c" + + "ontent\030\002 \001(\t\022\024\n\014push_content\030\003 \001(\t\022\017\n\007co" + + "ntent\030\004 \001(\t\022\014\n\004data\030\005 \001(\014\022\021\n\tmediaType\030\006" + + " \001(\005\022\026\n\016remoteMediaUrl\030\007 \001(\t\022\024\n\014persist_" + + "flag\030\010 \001(\005\022\027\n\017expire_duration\030\t \001(\005\022\026\n\016m" + + "entioned_type\030\n \001(\005\022\030\n\020mentioned_target\030" + + "\013 \003(\t\022\r\n\005extra\030\014 \001(\t\022\021\n\tpush_data\030\r \001(\t\"", + "\226\001\n\025AddGroupMemberRequest\022\020\n\010group_id\030\001 " + + "\002(\t\022\"\n\014added_member\030\002 \003(\0132\014.GroupMember\022" + + "\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\013" + + "2\017.MessageContent\022\r\n\005extra\030\005 \001(\t\"{\n\022Crea" + + "teGroupRequest\022\025\n\005group\030\001 \002(\0132\006.Group\022\017\n" + + "\007to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017" + + ".MessageContent\022\024\n\014member_extra\030\004 \001(\t\"a\n" + + "\023DismissGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\017" + + "\n\007to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132" + + "\017.MessageContent\"\245\001\n\rFriendRequest\022\020\n\010fr", + "om_uid\030\001 \001(\t\022\016\n\006to_uid\030\002 \002(\t\022\016\n\006reason\030\003" + + " \002(\t\022\016\n\006status\030\004 \001(\005\022\021\n\tupdate_dt\030\005 \001(\003\022" + + "\030\n\020from_read_status\030\006 \001(\010\022\026\n\016to_read_sta" + + "tus\030\007 \001(\010\022\r\n\005extra\030\010 \001(\t\"#\n\rGeneralResul" + + "t\022\022\n\nerror_code\030\001 \002(\005\"?\n\025GetUploadTokenR" + + "equest\022\022\n\nmedia_type\030\001 \002(\005\022\022\n\nmedia_path" + + "\030\002 \002(\t\"S\n\024GetUploadTokenResult\022\016\n\006domain" + + "\030\001 \002(\t\022\r\n\005token\030\002 \002(\t\022\016\n\006server\030\003 \002(\t\022\014\n" + + "\004port\030\004 \001(\005\"H\n\023HandleFriendRequest\022\022\n\nta" + + "rget_uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\022\r\n\005extra\030", + "\003 \001(\t\"\023\n\005IDBuf\022\n\n\002id\030\001 \002(\t\"\027\n\tIDListBuf\022" + + "\n\n\002id\030\001 \003(\t\"\256\001\n\007Message\022#\n\014conversation\030" + + "\001 \002(\0132\r.Conversation\022\021\n\tfrom_user\030\002 \002(\t\022" + + " \n\007content\030\003 \002(\0132\017.MessageContent\022\022\n\nmes" + + "sage_id\030\004 \001(\003\022\030\n\020server_timestamp\030\005 \001(\003\022" + + "\017\n\007to_user\030\006 \001(\t\022\n\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n" + + "\003uid\030\001 \002(\t\022\014\n\004name\030\002 \001(\t\022\024\n\014display_name" + + "\030\003 \001(\t\022\020\n\010portrait\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t" + + "\022\r\n\005email\030\006 \001(\t\022\017\n\007address\030\007 \001(\t\022\017\n\007comp" + + "any\030\010 \001(\t\022\r\n\005extra\030\t \001(\t\022\021\n\tupdate_dt\030\n ", + "\001(\003\022\016\n\006gender\030\013 \001(\005\022\016\n\006social\030\014 \001(\t\022\014\n\004t" + + "ype\030\r \001(\005\022\017\n\007deleted\030\016 \001(\005\"c\n\005Robot\022\013\n\003u" + + "id\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016" + + "\n\006secret\030\004 \001(\t\022\020\n\010callback\030\005 \001(\t\022\r\n\005extr" + + "a\030\006 \001(\t\"(\n\017GetRobotsResult\022\025\n\005entry\030\001 \003(" + + "\0132\006.Robot\"g\n\030UploadDeviceTokenRequest\022\020\n" + + "\010platform\030\001 \002(\005\022\020\n\010app_name\030\002 \002(\t\022\024\n\014dev" + + "ice_token\030\003 \002(\t\022\021\n\tpush_type\030\004 \002(\005\"\201\001\n\026M" + + "odifyGroupInfoRequest\022\020\n\010group_id\030\001 \002(\t\022" + + "\014\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\022\017\n\007to_line\030", + "\004 \003(\005\022\'\n\016notify_content\030\005 \001(\0132\017.MessageC" + + "ontent\"\203\001\n\026SetGroupManagerRequest\022\020\n\010gro" + + "up_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\017\n\007user_id\030\003 \003" + + "(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_content\030\005 " + + "\001(\0132\017.MessageContent\"(\n\tInfoEntry\022\014\n\004typ" + + "e\030\001 \002(\005\022\r\n\005value\030\002 \002(\t\"0\n\023ModifyMyInfoRe" + + "quest\022\031\n\005entry\030\001 \003(\0132\n.InfoEntry\";\n\rNoti" + + "fyMessage\022\014\n\004type\030\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n" + + "\006target\030\003 \001(\t\"=\n\022PullMessageRequest\022\n\n\002i" + + "d\030\001 \002(\003\022\014\n\004type\030\002 \002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021", + "PullMessageResult\022\031\n\007message\030\001 \003(\0132\010.Mes" + + "sage\022\017\n\007current\030\002 \002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023P" + + "ullGroupInfoResult\022\030\n\004info\030\001 \003(\0132\n.Group" + + "Info\"6\n\026PullGroupMemberRequest\022\016\n\006target" + + "\030\001 \002(\t\022\014\n\004head\030\002 \002(\003\"5\n\025PullGroupMemberR" + + "esult\022\034\n\006member\030\001 \003(\0132\014.GroupMember\"-\n\013U" + + "serRequest\022\013\n\003uid\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001" + + "(\003\"0\n\017PullUserRequest\022\035\n\007request\030\001 \003(\0132\014" + + ".UserRequest\"/\n\nUserResult\022\023\n\004user\030\001 \002(\013" + + "2\005.User\022\014\n\004code\030\002 \002(\005\"-\n\016PullUserResult\022", + "\033\n\006result\030\001 \003(\0132\013.UserResult\"^\n\020QuitGrou" + + "pRequest\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 " + "\003(\005\022\'\n\016notify_content\030\003 \001(\0132\017.MessageCon" + - "tent\022\024\n\014member_extra\030\004 \001(\t\"a\n\023DismissGro" + - "upRequest\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002" + - " \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017.MessageCo" + - "ntent\"\245\001\n\rFriendRequest\022\020\n\010from_uid\030\001 \001(" + - "\t\022\016\n\006to_uid\030\002 \002(\t\022\016\n\006reason\030\003 \002(\t\022\016\n\006sta", - "tus\030\004 \001(\005\022\021\n\tupdate_dt\030\005 \001(\003\022\030\n\020from_rea" + - "d_status\030\006 \001(\010\022\026\n\016to_read_status\030\007 \001(\010\022\r" + - "\n\005extra\030\010 \001(\t\"#\n\rGeneralResult\022\022\n\nerror_" + - "code\030\001 \002(\005\"?\n\025GetUploadTokenRequest\022\022\n\nm" + - "edia_type\030\001 \002(\005\022\022\n\nmedia_path\030\002 \002(\t\"S\n\024G" + - "etUploadTokenResult\022\016\n\006domain\030\001 \002(\t\022\r\n\005t" + - "oken\030\002 \002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004port\030\004 \001(\005" + - "\"H\n\023HandleFriendRequest\022\022\n\ntarget_uid\030\001 " + - "\002(\t\022\016\n\006status\030\002 \002(\005\022\r\n\005extra\030\003 \001(\t\"\023\n\005ID" + - "Buf\022\n\n\002id\030\001 \002(\t\"\027\n\tIDListBuf\022\n\n\002id\030\001 \003(\t", - "\"\256\001\n\007Message\022#\n\014conversation\030\001 \002(\0132\r.Con" + - "versation\022\021\n\tfrom_user\030\002 \002(\t\022 \n\007content\030" + - "\003 \002(\0132\017.MessageContent\022\022\n\nmessage_id\030\004 \001" + - "(\003\022\030\n\020server_timestamp\030\005 \001(\003\022\017\n\007to_user\030" + - "\006 \001(\t\022\n\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n\003uid\030\001 \002(\t\022" + - "\014\n\004name\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\020\n\010p" + - "ortrait\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t\022\r\n\005email\030\006" + - " \001(\t\022\017\n\007address\030\007 \001(\t\022\017\n\007company\030\010 \001(\t\022\r" + - "\n\005extra\030\t \001(\t\022\021\n\tupdate_dt\030\n \001(\003\022\016\n\006gend" + - "er\030\013 \001(\005\022\016\n\006social\030\014 \001(\t\022\014\n\004type\030\r \001(\005\022\017", - "\n\007deleted\030\016 \001(\005\"c\n\005Robot\022\013\n\003uid\030\001 \002(\t\022\r\n" + - "\005state\030\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016\n\006secret\030\004 " + - "\001(\t\022\020\n\010callback\030\005 \001(\t\022\r\n\005extra\030\006 \001(\t\"(\n\017" + - "GetRobotsResult\022\025\n\005entry\030\001 \003(\0132\006.Robot\"g" + - "\n\030UploadDeviceTokenRequest\022\020\n\010platform\030\001" + - " \002(\005\022\020\n\010app_name\030\002 \002(\t\022\024\n\014device_token\030\003" + - " \002(\t\022\021\n\tpush_type\030\004 \002(\005\"\201\001\n\026ModifyGroupI" + - "nfoRequest\022\020\n\010group_id\030\001 \002(\t\022\014\n\004type\030\002 \002" + - "(\005\022\r\n\005value\030\003 \002(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016no" + - "tify_content\030\005 \001(\0132\017.MessageContent\"\203\001\n\026", - "SetGroupManagerRequest\022\020\n\010group_id\030\001 \002(\t" + - "\022\014\n\004type\030\002 \002(\005\022\017\n\007user_id\030\003 \003(\t\022\017\n\007to_li" + - "ne\030\004 \003(\005\022\'\n\016notify_content\030\005 \001(\0132\017.Messa" + - "geContent\"(\n\tInfoEntry\022\014\n\004type\030\001 \002(\005\022\r\n\005" + - "value\030\002 \002(\t\"0\n\023ModifyMyInfoRequest\022\031\n\005en" + - "try\030\001 \003(\0132\n.InfoEntry\";\n\rNotifyMessage\022\014" + - "\n\004type\030\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n\006target\030\003 \001" + - "(\t\"=\n\022PullMessageRequest\022\n\n\002id\030\001 \002(\003\022\014\n\004" + - "type\030\002 \002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021PullMessage" + - "Result\022\031\n\007message\030\001 \003(\0132\010.Message\022\017\n\007cur", - "rent\030\002 \002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023PullGroupInf" + - "oResult\022\030\n\004info\030\001 \003(\0132\n.GroupInfo\"6\n\026Pul" + - "lGroupMemberRequest\022\016\n\006target\030\001 \002(\t\022\014\n\004h" + - "ead\030\002 \002(\003\"5\n\025PullGroupMemberResult\022\034\n\006me" + - "mber\030\001 \003(\0132\014.GroupMember\"-\n\013UserRequest\022" + - "\013\n\003uid\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"0\n\017PullU" + - "serRequest\022\035\n\007request\030\001 \003(\0132\014.UserReques" + - "t\"/\n\nUserResult\022\023\n\004user\030\001 \002(\0132\005.User\022\014\n\004" + - "code\030\002 \002(\005\"-\n\016PullUserResult\022\033\n\006result\030\001" + - " \003(\0132\013.UserResult\"^\n\020QuitGroupRequest\022\020\n", - "\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016noti" + - "fy_content\030\003 \001(\0132\017.MessageContent\"~\n\030Rem" + - "oveGroupMemberRequest\022\020\n\010group_id\030\001 \002(\t\022" + - "\026\n\016removed_member\030\002 \003(\t\022\017\n\007to_line\030\003 \003(\005" + - "\022\'\n\016notify_content\030\004 \001(\0132\017.MessageConten" + - "t\"u\n\024TransferGroupRequest\022\020\n\010group_id\030\001 " + - "\002(\t\022\021\n\tnew_owner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022" + - "\'\n\016notify_content\030\004 \001(\0132\017.MessageContent" + - "\"\206\001\n\026ModifyGroupMemberAlias\022\020\n\010group_id\030" + - "\001 \002(\t\022\r\n\005alias\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n", - "\016notify_content\030\004 \001(\0132\017.MessageContent\022\021" + - "\n\tmember_id\030\005 \001(\t\"\206\001\n\026ModifyGroupMemberE" + - "xtra\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022" + - "\'\n\016notify_content\030\003 \001(\0132\017.MessageContent" + - "\022\r\n\005extra\030\004 \001(\t\022\021\n\tmember_id\030\005 \001(\t\"P\n\020Us" + - "erSettingEntry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002" + - "(\t\022\r\n\005value\030\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n\024" + - "ModifyUserSettingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003k" + - "ey\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\"\032\n\007Version\022\017\n\007ve" + - "rsion\030\001 \002(\003\"8\n\024GetUserSettingResult\022 \n\005e", - "ntry\030\001 \003(\0132\021.UserSettingEntry\"f\n\006Friend\022" + - "\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_dt" + - "\030\003 \002(\003\022\r\n\005alias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022\r" + - "\n\005extra\030\006 \001(\t\"*\n\020GetFriendsResult\022\026\n\005ent" + - "ry\030\001 \003(\0132\007.Friend\"7\n\026GetFriendRequestRes" + - "ult\022\035\n\005entry\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021C" + - "onnectAckPayload\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013fr" + - "iend_head\030\002 \001(\003\022\026\n\016friend_rq_head\030\003 \001(\003\022" + - "\024\n\014setting_head\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(\t" + - "\022\021\n\tnode_port\030\006 \001(\005\022\023\n\013server_time\030\007 \001(\003", - "\"P\n\rIMHttpWrapper\022\r\n\005token\030\001 \002(\t\022\021\n\tclie" + - "nt_id\030\002 \002(\t\022\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 \001" + - "(\014\"A\n\021SearchUserRequest\022\017\n\007keyword\030\001 \002(\t" + - "\022\r\n\005fuzzy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020SearchU" + - "serResult\022\024\n\005entry\030\001 \003(\0132\005.User\"@\n\026GetCh" + - "atroomInfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022\021" + - "\n\tupdate_dt\030\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005ti" + - "tle\030\001 \002(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001(" + - "\t\022\024\n\014member_count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 \001" + - "(\003\022\021\n\tupdate_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005", - "state\030\010 \001(\005\"F\n\034GetChatroomMemberInfoRequ" + - "est\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tmax_count\030\002 " + - "\001(\005\";\n\022ChatroomMemberInfo\022\024\n\014member_coun" + - "t\030\001 \001(\005\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002" + - "id\030\001 \002(\003\"4\n\023NotifyRecallMessage\022\n\n\002id\030\001 " + - "\002(\003\022\021\n\tfrom_user\030\002 \002(\t\"/\n\020BlackUserReque" + - "st\022\013\n\003uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014Rout" + - "eRequest\022\013\n\003app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005\022" + - "\021\n\tpush_type\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t\022" + - "\026\n\016device_version\030\005 \001(\t\022\022\n\nphone_name\030\006 ", - "\001(\t\022\020\n\010language\030\007 \001(\t\022\024\n\014carrier_name\030\010 " + - "\001(\t\022\023\n\013app_version\030\t \001(\t\022\023\n\013sdk_version\030" + - "\n \001(\t\"D\n\rRouteResponse\022\014\n\004host\030\001 \002(\t\022\021\n\t" + - "long_port\030\002 \002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017G" + - "etTokenRequest\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclien" + - "t_id\030\002 \002(\t\022\020\n\010platform\030\003 \001(\005\"\\\n\022LoadRemo" + - "teMessages\022#\n\014conversation\030\001 \002(\0132\r.Conve" + - "rsation\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005count\030\003 \002" + - "(\005\"a\n\020MultiCastMessage\022\021\n\tfrom_user\030\001 \002(" + - "\t\022 \n\007content\030\002 \002(\0132\017.MessageContent\022\n\n\002t", - "o\030\003 \003(\t\022\014\n\004line\030\004 \002(\005\"E\n\035RecallMultiCast" + - "MessageRequest\022\022\n\nmessage_id\030\001 \002(\003\022\020\n\010re" + - "ceiver\030\002 \003(\tB#\n\025cn.wildfirechat.protoB\nW" + - "FCMessage" + "tent\"~\n\030RemoveGroupMemberRequest\022\020\n\010grou" + + "p_id\030\001 \002(\t\022\026\n\016removed_member\030\002 \003(\t\022\017\n\007to" + + "_line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132\017.Me" + + "ssageContent\"u\n\024TransferGroupRequest\022\020\n\010" + + "group_id\030\001 \002(\t\022\021\n\tnew_owner\030\002 \002(\t\022\017\n\007to_" + + "line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132\017.Mes" + + "sageContent\"\206\001\n\026ModifyGroupMemberAlias\022\020", + "\n\010group_id\030\001 \002(\t\022\r\n\005alias\030\002 \002(\t\022\017\n\007to_li" + + "ne\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132\017.Messa" + + "geContent\022\021\n\tmember_id\030\005 \001(\t\"\206\001\n\026ModifyG" + + "roupMemberExtra\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_" + + "line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017.Mes" + + "sageContent\022\r\n\005extra\030\004 \001(\t\022\021\n\tmember_id\030" + + "\005 \001(\t\"P\n\020UserSettingEntry\022\r\n\005scope\030\001 \002(\005" + + "\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\022\021\n\tupdate_d" + + "t\030\004 \002(\003\"A\n\024ModifyUserSettingReq\022\r\n\005scope" + + "\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\"\032\n\007Ve", + "rsion\022\017\n\007version\030\001 \002(\003\"8\n\024GetUserSetting" + + "Result\022 \n\005entry\030\001 \003(\0132\021.UserSettingEntry" + + "\"f\n\006Friend\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021" + + "\n\tupdate_dt\030\003 \002(\003\022\r\n\005alias\030\004 \001(\t\022\017\n\007blac" + + "ked\030\005 \001(\005\022\r\n\005extra\030\006 \001(\t\"*\n\020GetFriendsRe" + + "sult\022\026\n\005entry\030\001 \003(\0132\007.Friend\"7\n\026GetFrien" + + "dRequestResult\022\035\n\005entry\030\001 \003(\0132\016.FriendRe" + + "quest\"\243\001\n\021ConnectAckPayload\022\020\n\010msg_head\030" + + "\001 \001(\003\022\023\n\013friend_head\030\002 \001(\003\022\026\n\016friend_rq_" + + "head\030\003 \001(\003\022\024\n\014setting_head\030\004 \001(\003\022\021\n\tnode", + "_addr\030\005 \001(\t\022\021\n\tnode_port\030\006 \001(\005\022\023\n\013server" + + "_time\030\007 \001(\003\"P\n\rIMHttpWrapper\022\r\n\005token\030\001 " + + "\002(\t\022\021\n\tclient_id\030\002 \002(\t\022\017\n\007request\030\003 \002(\t\022" + + "\014\n\004data\030\004 \001(\014\"A\n\021SearchUserRequest\022\017\n\007ke" + + "yword\030\001 \002(\t\022\r\n\005fuzzy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005" + + "\"(\n\020SearchUserResult\022\024\n\005entry\030\001 \003(\0132\005.Us" + + "er\"@\n\026GetChatroomInfoRequest\022\023\n\013chatroom" + + "_id\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"\227\001\n\014Chatroo" + + "mInfo\022\r\n\005title\030\001 \002(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010po" + + "rtrait\030\003 \001(\t\022\024\n\014member_count\030\004 \001(\005\022\021\n\tcr", + "eate_dt\030\005 \001(\003\022\021\n\tupdate_dt\030\006 \001(\003\022\r\n\005extr" + + "a\030\007 \001(\t\022\r\n\005state\030\010 \001(\005\"F\n\034GetChatroomMem" + + "berInfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tm" + + "ax_count\030\002 \001(\005\";\n\022ChatroomMemberInfo\022\024\n\014" + + "member_count\030\001 \001(\005\022\017\n\007members\030\002 \003(\t\"\026\n\010I" + + "NT64Buf\022\n\n\002id\030\001 \002(\003\"4\n\023NotifyRecallMessa" + + "ge\022\n\n\002id\030\001 \002(\003\022\021\n\tfrom_user\030\002 \002(\t\"/\n\020Bla" + + "ckUserRequest\022\013\n\003uid\030\001 \002(\t\022\016\n\006status\030\002 \002" + + "(\005\"\323\001\n\014RouteRequest\022\013\n\003app\030\001 \001(\t\022\020\n\010plat" + + "form\030\002 \001(\005\022\021\n\tpush_type\030\003 \001(\005\022\023\n\013device_", + "name\030\004 \001(\t\022\026\n\016device_version\030\005 \001(\t\022\022\n\nph" + + "one_name\030\006 \001(\t\022\020\n\010language\030\007 \001(\t\022\024\n\014carr" + + "ier_name\030\010 \001(\t\022\023\n\013app_version\030\t \001(\t\022\023\n\013s" + + "dk_version\030\n \001(\t\"D\n\rRouteResponse\022\014\n\004hos" + + "t\030\001 \002(\t\022\021\n\tlong_port\030\002 \002(\005\022\022\n\nshort_port" + + "\030\003 \002(\005\"G\n\017GetTokenRequest\022\017\n\007user_id\030\001 \002" + + "(\t\022\021\n\tclient_id\030\002 \002(\t\022\020\n\010platform\030\003 \001(\005\"" + + "\\\n\022LoadRemoteMessages\022#\n\014conversation\030\001 " + + "\002(\0132\r.Conversation\022\022\n\nbefore_uid\030\002 \002(\003\022\r" + + "\n\005count\030\003 \002(\005\"a\n\020MultiCastMessage\022\021\n\tfro", + "m_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132\017.MessageC" + + "ontent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005\"E\n\035Reca" + + "llMultiCastMessageRequest\022\022\n\nmessage_id\030" + + "\001 \002(\003\022\020\n\010receiver\030\002 \003(\tB#\n\025cn.wildfirech" + + "at.protoB\nWFCMessage" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -62026,7 +62189,7 @@ public final class WFCMessage { internal_static_GroupInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_GroupInfo_descriptor, - new java.lang.String[] { "TargetId", "Name", "Portrait", "Owner", "Type", "MemberCount", "Extra", "UpdateDt", "MemberUpdateDt", "Mute", "JoinType", "PrivateChat", "Searchable", }); + new java.lang.String[] { "TargetId", "Name", "Portrait", "Owner", "Type", "MemberCount", "Extra", "UpdateDt", "MemberUpdateDt", "Mute", "JoinType", "PrivateChat", "Searchable", "MaxMemberCount", "HistoryMessage", }); internal_static_GroupMember_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_GroupMember_fieldAccessorTable = new diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java index 3de330e2..f200a26d 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java @@ -9,7 +9,9 @@ import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.HttpClients; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,10 +26,12 @@ public class AdminHttpUtils { private static String adminUrl; private static String adminSecret; + private static CloseableHttpClient httpClient; public static void init(String url, String secret) { adminUrl = url; adminSecret = secret; + httpClient = HttpClients.createDefault(); } public static IMResult httpJsonPost(String path, Object object, Class clazz) throws Exception{ @@ -42,15 +46,13 @@ public class AdminHttpUtils { String url = adminUrl + path; HttpPost post = null; - try { - HttpClient httpClient = HttpClientBuilder.create().build(); + try { int nonce = (int)(Math.random() * 100000 + 3); long timestamp = System.currentTimeMillis(); String str = nonce + "|" + adminSecret + "|" + timestamp; String sign = DigestUtils.sha1Hex(str); - post = new HttpPost(url); post.setHeader("Content-type", "application/json; charset=utf-8"); post.setHeader("Connection", "Keep-Alive"); diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java index 16bca8fa..0516d23b 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java @@ -9,7 +9,9 @@ import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.HttpClients; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,11 +27,13 @@ public class ChannelHttpUtils { private String imurl; private String channelId; private String channelSecret; + private final CloseableHttpClient httpClient; public ChannelHttpUtils(String imurl, String channelId, String secret) { this.imurl = imurl; this.channelId = channelId; this.channelSecret = secret; + this.httpClient = HttpClients.createDefault(); } public IMResult httpJsonPost(String path, Object object, Class clazz) throws Exception{ @@ -41,8 +45,6 @@ public class ChannelHttpUtils { String url = imurl + path; HttpPost post = null; try { - HttpClient httpClient = HttpClientBuilder.create().build(); - int nonce = (int)(Math.random() * 100000 + 3); long timestamp = System.currentTimeMillis(); String str = nonce + "|" + channelSecret + "|" + timestamp; diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java index 947def46..426db648 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java @@ -10,7 +10,9 @@ import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.HttpClients; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,11 +28,13 @@ public class RobotHttpUtils { private final String url; private final String robotId; private final String robotSecret; + private final CloseableHttpClient httpClient; public RobotHttpUtils(String url, String robotId, String robotSecret) { this.url = url; this.robotId = robotId; this.robotSecret = robotSecret; + this.httpClient = HttpClients.createDefault(); } @@ -43,8 +47,6 @@ public class RobotHttpUtils { String url = this.url + path; HttpPost post = null; try { - HttpClient httpClient = HttpClientBuilder.create().build(); - int nonce = (int)(Math.random() * 100000 + 3); long timestamp = System.currentTimeMillis(); String str = nonce + "|" + robotSecret + "|" + timestamp;