From b755f33e96eaaa86387b834f39de3b27285b64d5 Mon Sep 17 00:00:00 2001 From: RoyceDa Date: Mon, 2 Feb 2026 05:22:06 +0200 Subject: [PATCH] =?UTF-8?q?ECI=20=D1=82=D0=B5=D0=B3=D0=B8=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B,=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BB=D0=BE=D0=B3=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=20hibernate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/client/tags/Authentificate.java | 2 +- .../im/executors/Executor0Handshake.java | 2 +- .../java/com/rosetta/im/protocol/Server.java | 1 + .../im/protocol/{ => client}/Client.java | 4 +++- .../im/protocol/{ => client}/ECITag.java | 2 +- .../im/protocol/packet/PacketExecutor.java | 2 +- src/main/resources/hibernate.cfg.xml | 2 -- .../im/executors/Executor0Handshake.class | Bin 3725 -> 3767 bytes .../com/rosetta/im/protocol/Client.class | Bin 3511 -> 0 bytes .../com/rosetta/im/protocol/Server.class | Bin 6698 -> 6719 bytes .../im/protocol/packet/PacketExecutor.class | Bin 765 -> 772 bytes 11 files changed, 8 insertions(+), 7 deletions(-) rename src/main/java/com/rosetta/im/protocol/{ => client}/Client.java (97%) rename src/main/java/com/rosetta/im/protocol/{ => client}/ECITag.java (94%) delete mode 100644 target/classes/com/rosetta/im/protocol/Client.class diff --git a/src/main/java/com/rosetta/im/client/tags/Authentificate.java b/src/main/java/com/rosetta/im/client/tags/Authentificate.java index 82c350b..87499fd 100644 --- a/src/main/java/com/rosetta/im/client/tags/Authentificate.java +++ b/src/main/java/com/rosetta/im/client/tags/Authentificate.java @@ -1,7 +1,7 @@ package com.rosetta.im.client.tags; import com.rosetta.im.packet.enums.HandshakeStage; -import com.rosetta.im.protocol.ECITag; +import com.rosetta.im.protocol.client.ECITag; /** * Это вложенный обьект для клиента, содержащий информацию об аутентификации. diff --git a/src/main/java/com/rosetta/im/executors/Executor0Handshake.java b/src/main/java/com/rosetta/im/executors/Executor0Handshake.java index 7f99260..b80682a 100644 --- a/src/main/java/com/rosetta/im/executors/Executor0Handshake.java +++ b/src/main/java/com/rosetta/im/executors/Executor0Handshake.java @@ -10,7 +10,7 @@ import com.rosetta.im.database.DatabaseManager; import com.rosetta.im.database.entity.User; import com.rosetta.im.packet.Packet0Handshake; import com.rosetta.im.packet.enums.HandshakeStage; -import com.rosetta.im.protocol.Client; +import com.rosetta.im.protocol.client.Client; import com.rosetta.im.protocol.packet.Packet; import com.rosetta.im.protocol.packet.PacketExecutor; diff --git a/src/main/java/com/rosetta/im/protocol/Server.java b/src/main/java/com/rosetta/im/protocol/Server.java index effe878..499e174 100644 --- a/src/main/java/com/rosetta/im/protocol/Server.java +++ b/src/main/java/com/rosetta/im/protocol/Server.java @@ -10,6 +10,7 @@ import org.java_websocket.WebSocket; import org.java_websocket.handshake.ClientHandshake; import org.java_websocket.server.WebSocketServer; +import com.rosetta.im.protocol.client.Client; import com.rosetta.im.protocol.packet.Packet; import com.rosetta.im.protocol.packet.PacketExecutor; import com.rosetta.im.protocol.packet.PacketManager; diff --git a/src/main/java/com/rosetta/im/protocol/Client.java b/src/main/java/com/rosetta/im/protocol/client/Client.java similarity index 97% rename from src/main/java/com/rosetta/im/protocol/Client.java rename to src/main/java/com/rosetta/im/protocol/client/Client.java index 0656f76..b119d8c 100644 --- a/src/main/java/com/rosetta/im/protocol/Client.java +++ b/src/main/java/com/rosetta/im/protocol/client/Client.java @@ -1,10 +1,12 @@ -package com.rosetta.im.protocol; +package com.rosetta.im.protocol.client; import java.util.HashSet; import java.util.Set; import org.java_websocket.WebSocket; +import com.rosetta.im.protocol.BaseFailures; +import com.rosetta.im.protocol.ServerFailures; import com.rosetta.im.protocol.util.StringUtil; /** diff --git a/src/main/java/com/rosetta/im/protocol/ECITag.java b/src/main/java/com/rosetta/im/protocol/client/ECITag.java similarity index 94% rename from src/main/java/com/rosetta/im/protocol/ECITag.java rename to src/main/java/com/rosetta/im/protocol/client/ECITag.java index efc4e2d..1a12a26 100644 --- a/src/main/java/com/rosetta/im/protocol/ECITag.java +++ b/src/main/java/com/rosetta/im/protocol/client/ECITag.java @@ -1,4 +1,4 @@ -package com.rosetta.im.protocol; +package com.rosetta.im.protocol.client; /** * Embedded Client Information Tag. diff --git a/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java b/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java index cd197be..f140de0 100644 --- a/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java +++ b/src/main/java/com/rosetta/im/protocol/packet/PacketExecutor.java @@ -1,7 +1,7 @@ package com.rosetta.im.protocol.packet; -import com.rosetta.im.protocol.Client; import com.rosetta.im.protocol.Settings; +import com.rosetta.im.protocol.client.Client; /** * Базовый класс для обработчиков пакетов. diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index dcf79da..40ca860 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -8,8 +8,6 @@ your_password update - true - true diff --git a/target/classes/com/rosetta/im/executors/Executor0Handshake.class b/target/classes/com/rosetta/im/executors/Executor0Handshake.class index fddac1262b1497147af76c95cb6a4628b2a04522..3602d0304969cbc1f7db28e8bd0e390562db20eb 100644 GIT binary patch delta 131 zcmeB`-7dRSRquDYoRC%+$P+%}$JpjEt%i9VHYX0{YHiaUKQ@22Dl= ww)E7Jki>LGh5(R838<#YYnYT^`p+_1voLER%WhU;&tzm$M^e9e3CBxT0F?kH#Q*>R delta 90 zcmdlk+bg?)k&)4B@mMX2Sgx-{-tsq#p$=WXDQj$%ff{J(W zHag>s%8dHaFML490@WGE&;ANO`YXiq?rw7{Y3q#4kllSR=Q+=L&ilOm^PgXT2XF$P zD{u+yNo3QJTsE(prWP^Mk@;NK%qFs_$Uw@_Go}KMK*L3CL5rlc%xq+Q=Axc31$_Bz z;*!pnJtNuNY(y@YzM{|Aqme0nCT7j|2-GDkplDK{aijzkGjm2}mh+09Fyh*5USNwo zT`-MQB&M63tB)D88OLzDFo*rs9=Hp{o| zD!lOdu@k!$>=HOwi?E%rrN;zwSFs0=3#d6Qlgy@VodlYL(a>u7WSqS!6x1o$$Gj|k zExc1&evTsg(T*m$>VS%R`27eXtRPfT)7WC()YB?DaflF!LN3R`OHoFRRLWpsnA>TI zaYV%yY?g&GGWu8{J)`I1+DwY#HI8HxT53|u8S>j1^q6yUcU#R$*%p%?F!Co;#sYyD z>YSJMl>c1Li~DbZO)*nTTpHEp9qcWI`J`s*#Tp6(W_8mBlvZmBK0+-4KNk(I_-*UT z8oL0N5Jlq>UzTUdNU_9OvnhanF zrxd(Eok|X1^;JYcySo`!I;f16eU5uV=Sa&wfNK@XVI|N~S?9(1m0G*WgLR}1_E~Op zf)%Be8Fg0;Za`a0Hx|v(t$%&p))P!1x*=KD!wE58srsafDZI=sXRyC$W;RESDl8Or z#<}_&&MSC@how}bm01-R@G84XM!(9QT4`RVR0>{Oqg&e*@?#n^DiY{rS*hBvzUYUJ zSp~0Go_MR-sF;)P@adNeS}HI3T~u)i-K^uBmLIdIxJ_wTAHO&1Tso?rq3!-pQ&Ej| zZU}$U$S1OyjCHYi*yreH6AKCo0=w4QtKteMxHpmF{YCW>?8$8KQGrlxr}S%ieMmD> zyj1em(YcPd6uc?0zgB-P-=X4d+@L_rP~HGm!;1RZ8{buNS&}(W(>diZJ@xniA1U~d z8)}7(@xsz`D^yk7#4WboiLv3a@u{)tp_9>(i8F%&wKJ^*=#eZxku2X}AB<%Sxr9Ds z$mSieTh|e3OYG$;H=D1QPhMYqW45TXp1eT#6_BkND&Kg~@x5PO3Vd$nNCUR=w~=4B zh~nWh626be!u3mN33o1`HQdnl06Uh@7XA(GXYXVG5<0?da`piZF5&P`+~PunzwK7g z{RC;{&DBBp1K5Ux91rq0gd+&!39f6i=tgi9UHoD|i?*=dBtaJm9YeQ6Yn&;`xm^qw z{so8iCOm2IrKJf^8()0~ujh{Y4(Ht#2YYR|6-Oq_eNLQbtTkc>2aluK0e_0yuRd!jPwZtz6>8J)7 zek90qIO#BuV3Ms*7ObsQ5Ict$<&9eiE%vIS@IK2Yl6^l0iiDoG2u(VeDzob7T*jaa zQxe&h*+xFk6fTq@t3_lL!x$m%D0kRpkRxLp5g5md#aJ&{vE+A=e@AtcB>C%QQGCTH zKKTbyMHD$A;|ZKWtQaM3MY+vy>F+L?(K03k#(u=^!^=1;@CT+x58Z>-$^Z9|{1)Cr zcR6DS+3Xo>KCU6h$ tR0DoZz;9{-zUKgzT7&FEvNimS_wV83YP9cJyC2H3EVYJDxyyym{sjgF?j`^L diff --git a/target/classes/com/rosetta/im/protocol/Server.class b/target/classes/com/rosetta/im/protocol/Server.class index cbcc02d70d3ccbdb29dabbc42a3d33d73a8dd42e..733b0bc0a6758535b9950e45a4c71766746e1196 100644 GIT binary patch delta 301 zcmX|*KTAS!6o#KG*Wg~V8oYVc3{n&q$wbNmqoFeB57;1NS;nOyQZYy>XwV9DOn%=W zXlaPx5{)|a5gOVW`x>1g;+>wu%X^;Z>>&F()U|m3+#YdirzedI^`#e7Y&7(TZqECt zdy2_^God`@|21spO)JDWlLQDeC7B^Yf@xLvmy8%GAd6R}tg!m==e4AYTV*4S$sA*3 z+@6)!D)WL1Opud_MWQUrzzP{wh1OW2z&e|3v&D{Nk0K3rX;I>aG7s$Y!~rijkni`9cCrje4Lc*Pizyi<;(u^1;xCcJkFMlh*3MU0$Qrb$uI z(i{`aGs6OTiaI4$SY}moi#3i|r_KhKO1G4GWSeJpcqO32F7NE|MTK9gVJ?w0A~ijK zpk9X(xHbC}lQSZmtLue)yZd%S725i~q0Tq5=p8#v-M&(4G0HV*nyS{853l|YGVnNP diff --git a/target/classes/com/rosetta/im/protocol/packet/PacketExecutor.class b/target/classes/com/rosetta/im/protocol/packet/PacketExecutor.class index 047954be6be82d8456c00ecc5ae00f45d6ad4518..d566856e453f1d8435bbd217028e6921a2964702 100644 GIT binary patch delta 33 pcmey%+QPPB6(dui#>7O)$^4AGlP@t!u_fnZrskDwe$6Pv2mrkW3e^Ar delta 26 icmZo+`^&mv6(f_E#>7O)$^4AGlP@t!ZT`$C$Or&<4+u~I