Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Сериализация в base64 запросов.

Browse source
This commit is contained in:
Zaxar163 2019-06-03 10:56:00 +03:00
parent 03ef5265dd
commit 3bfb3881d2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -36,8 +36,6 @@
import pro.gravit.launcher.profiles.ClientProfile;
import pro.gravit.launcher.serialize.signed.SignedObjectHolder;
import pro.gravit.utils.helper.*;
import pro.gravit.launchserver.binary.*;
import pro.gravit.launchserver.manangers.*;
import pro.gravit.utils.Version;
import pro.gravit.utils.command.CommandHandler;
import pro.gravit.utils.command.JLineCommandHandler;

3
LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java
View file

@ -8,6 +8,7 @@
import io.netty.util.concurrent.GlobalEventExecutor;
import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.socket.Client;
import pro.gravit.utils.helper.CommonHelper;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.LogHelper;
@ -15,7 +16,7 @@
public class WebSocketFrameHandler extends SimpleChannelInboundHandler<WebSocketFrame> {
public static LaunchServer server;
public static GsonBuilder builder = new GsonBuilder();
public static GsonBuilder builder = CommonHelper.newBuilder();
public static WebSocketService service = new WebSocketService(new DefaultChannelGroup(GlobalEventExecutor.INSTANCE), LaunchServer.server, builder);
public NettyConnectContext context;

5
LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StandartClientWebSocketService.java
View file

@ -4,6 +4,7 @@
import pro.gravit.launcher.events.request.ErrorRequestEvent;
import pro.gravit.launcher.request.RequestException;
import pro.gravit.launcher.request.ResultInterface;
import pro.gravit.utils.helper.CommonHelper;
import pro.gravit.utils.helper.JVMHelper;
import pro.gravit.launcher.request.Request;
import pro.gravit.utils.helper.LogHelper;
@ -18,7 +19,7 @@ public class StandartClientWebSocketService extends ClientWebSocketService {
public WaitEventHandler waitEventHandler = new WaitEventHandler();
public StandartClientWebSocketService(GsonBuilder gsonBuilder, String address, int i) throws SSLException {
super(gsonBuilder, address, i);
super(null, address, i);
}
public class RequestFuture implements Future<ResultInterface> {
@ -106,7 +107,7 @@ public RequestFuture asyncSendRequest(RequestInterface request) throws IOExcepti
public static StandartClientWebSocketService initWebSockets(String address, boolean async) {
StandartClientWebSocketService service;
try {
service = new StandartClientWebSocketService(new GsonBuilder(), address, 5000);
service = new StandartClientWebSocketService(CommonHelper.newBuilder(), address, 5000);
} catch (SSLException e) {
LogHelper.error(e);
return null;