From 40516609579a1d716eb6af8934130fc20b6b4cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9C=E6=96=B9?= <3979434@qq.com> Date: Sat, 16 Apr 2022 12:07:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AFsdk=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=8C=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E5=90=8D=E5=8A=A0=E5=85=A5UID=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libs/cim-server-sdk-netty-4.2.0.jar | Bin 92587 -> 92647 bytes .../cim/coder/protobuf/WebMessageDecoder.java | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cim-boot-server/libs/cim-server-sdk-netty-4.2.0.jar b/cim-boot-server/libs/cim-server-sdk-netty-4.2.0.jar index fbee3969fd19301917008b9237a773329fd29730..c82ad8771e70fba9fce18cb651c6cf7c22dc4a73 100644 GIT binary patch delta 3670 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 V1L<@JvdF<`ph(>1fsXaK{{gS{ix&U@ delta 3480 zcmZ9O2|U#4AIImJL5>+TWtSQEnWz{lRpHGZdF~cUdtMe8Chbs{l+(Q8ulY=os{IK+lB=DYbUEoV=ARI*FO22?2%sY~ zCTi1n9tB@CSO3?M$g#jmk-u~ME)j`q=iC<&=A;8r92(6z1oYt83AVy9AE&|@(h~XC z`gvX|oK77f4js#jVqp#W(JIJES0K#k#|lH?1=awLKj4hv*a=jS3^#xmTiy+BwtUKhaiPR;V}E}~{03Zb=ABnX~25MH_uJ(fJ! z+=r8arfnlZJmuu*tyNHocwfMSrH{IT@WGF8a#x=R7)&n~gHc8wtZXBFz8gSO#dywG zDf-ehpE8`-Cu+kR!PvVJp`VArlxyHzd0$~DIB_QRvaRn1xD zLie4`-nHgQ2i4>z&;zqo+hybSo|Z+NibQGCPQK5K;}WZlU)&D3kY+QjbvL^-9-Ea} zG$nOc=8lAYbmsxqHo-^gCLOd-Cc`0Ay)lo9ogWp?vqR@~ylmnq$K6!BEw$ey{d(ts zxBisjorL694kb?ymz3R!HygkF)28gC&#&n7=FcwNGgLY>7F9toPOUgBs5jhNa?RFS z?~v|L0)FNS7m^mICJRr#!2p1$5-ZHI9eBiu*gh^3Wo z*|4cqk`_-%<-AZf-F~(? zY=6k_XX>knk94|E=4%hMt&{zopnsR5A6!m*N>n@1^lCnU*sPgYe1o=;=pS7`A&TXC z-BRD-qo|#%*X^g~7?*7neLs<58W)w6SIM5ll~(SJ91jf_5y5v)M`YIL z5eR0KPf?d8Jd66ymC-${4bw0BAS&&5!wjS+g{O|rv6*L2r%kp=j<%R?-V!%#y?b`{ zhQ4O~S@$WG27_mXLr816;@9hV*HmBo7qtVY^!MzS>ru%2_FN^Utq=U-bs;y`KYf&b zC2nXqdsmWkvkU9(sOKX2WY`;q_m^Ldk&6B6?hWcn>6C33zjfW_w>Bps(o;t{3iHiw zrPhW!3kRIo@w@9PZA<2AW**eY=SLaUb+0yw5T6`%j-U+XC4qvH1lz_gTitrhl@ztZ?Q7(NW96D&(q^Lt(_NkD_l4Wz}*> zJ8t${2>-Q)eP)ec@UU=S;;Dma<9?s1uPEbBbgRgnOBUC%Oi6XcwsIQXlyw^6HckRA z5C1%2cQWtE8VLq{^2))f@#(MObPGz@K!=rN-u8`hX z^}pL@n|QF_*48Js!q{GNLKR56REQT5>QhoI=PfswSGbn<96nuJuwY_Eim+Rf-0@D< z!Y`BE!72^n zci%gZ#b~=Q(Oq4iukR3|8$bHIrmCj5@U20g!fch+?BzW>&33N4Sch|_0_6kNbMc;)1VUWK>- zZFqHzd)43qwEpp&TlQ3O1$N7_6$C~&kU{Rd@}?|t0}fC{Gul8vlUYL;aYJ{KyF7|J zU_dB#2XqLZ+yM=Ovj^~kaMlBOLlE=?9uWLIfiHxsp1=2IU;}|O1dl-A0--jL z?=v3=JfY$m#NW(I%OK4JKL2T9kPIe&J6|vX8P_ciI0f=+R+^e0k)>dOhv_VWQF{|{ z#jcLrWdghs`qWV-=cGe)0rD(R{UiUTM0n;Cm$gM%@-%jv!gAs zC}JA|)+=!H?K+@Lu|wN2doc`V>v#D~k%AEZOY>e?1eaaR>uzp$fuKm8H89AcJIk1H2-4Enm%U?i54s zt5Fhzp?tTN$6L7m=5WQsQx}~~&~maM_g^m^>p*S>s ZBKkF7nTGo`Qjt6sa1*k3LYrjF{{dLK6ITEL diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java index 03b9c70..6b0fc6f 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/WebMessageDecoder.java @@ -23,6 +23,7 @@ package com.farsunset.cim.coder.protobuf; import com.farsunset.cim.constant.CIMConstant; import com.farsunset.cim.constant.ChannelAttr; +import com.farsunset.cim.exception.ReadInvalidTypeException; import com.farsunset.cim.model.Pong; import com.farsunset.cim.model.SentBody; import com.farsunset.cim.model.proto.SentBodyProto; @@ -52,7 +53,13 @@ public class WebMessageDecoder extends MessageToMessageDecoder