aidar/SHiNE-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Промежуточный комит для отдачи задания брату

Browse Source
This commit is contained in:
AidarKC
2026-04-03 10:50:44 +03:00
parent c0fba4af94
commit 78e62997d1
40 changed files with 324 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java
+6 -2
View File
@@ -54,7 +54,9 @@ import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListSubscrip
// --- NEW: Ping ---
import server.logic.ws_protocol.JSON.handlers.system.Net_GetServerInfo_Handler;
import server.logic.ws_protocol.JSON.handlers.system.Net_ClientErrorLog_Handler;
import server.logic.ws_protocol.JSON.handlers.system.Net_Ping_Handler;
import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_ClientErrorLog_Request;
import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_GetServerInfo_Request;
import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_Ping_Request;
@@ -97,7 +99,8 @@ public final class JsonHandlerRegistry {
// --- system ---
Map.entry("Ping", new Net_Ping_Handler()),
Map.entry("GetServerInfo", new Net_GetServerInfo_Handler())
Map.entry("GetServerInfo", new Net_GetServerInfo_Handler()),
Map.entry("ClientErrorLog", new Net_ClientErrorLog_Handler())
// --- subscriptions ---
// Map.entry("ListSubscribedChannels", new Net_GetSubscribedChannels_Handler())
@@ -134,7 +137,8 @@ public final class JsonHandlerRegistry {
// --- system ---
Map.entry("Ping", Net_Ping_Request.class),
Map.entry("GetServerInfo", Net_GetServerInfo_Request.class)
Map.entry("GetServerInfo", Net_GetServerInfo_Request.class),
Map.entry("ClientErrorLog", Net_ClientErrorLog_Request.class)
);
private JsonHandlerRegistry() { }
shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java
+3 -2
View File
@@ -121,7 +121,7 @@ final class ChannelsReadSupport {
try {
BchBlockEntry e = new BchBlockEntry(blockBytes);
TextInfo ti = new TextInfo();
ti.createdAtMs = e.timeMs;
ti.createdAtMs = e.timestamp * 1000L;
if (e.body instanceof TextBody tb) {
ti.text = tb.message;
}
@@ -137,7 +137,8 @@ final class ChannelsReadSupport {
SELECT login,bch_name,block_number,block_hash,block_bytes
FROM blocks
WHERE bch_name=? AND msg_type=? AND msg_sub_type=? AND line_code=?
ORDER BY block_number """ + order + " LIMIT ?";
ORDER BY block_number
""" + order + " LIMIT ?";
try (PreparedStatement ps = c.prepareStatement(sql)) {
ps.setString(1, ownerBch);
ps.setInt(2, MSG_TYPE_TEXT);