From 2fc106aa26732bf278eb2d5f81366106b5794151 Mon Sep 17 00:00:00 2001 From: imndx Date: Fri, 28 Jun 2019 17:27:37 +0800 Subject: [PATCH] =?UTF-8?q?web=20route=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbase64=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xiaoleilu/loServer/action/RouteAction.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java index 8ea8b858..70f085c3 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java @@ -40,7 +40,7 @@ public class RouteAction extends Action { if (request.getNettyRequest() instanceof FullHttpRequest) { response.setContentType("application/octet-stream"); - FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest(); + FullHttpRequest fullHttpRequest = (FullHttpRequest) request.getNettyRequest(); boolean b = false; if ("web".equalsIgnoreCase(fullHttpRequest.headers().get("p"))) { b = true; @@ -144,10 +144,14 @@ public class RouteAction extends Action { private void sendResponse(Response response, ErrorCode errorCode, byte[] contents, boolean base64Response) { response.setStatus(HttpResponseStatus.OK); - if(contents == null) { + if (contents == null) { ByteBuf ackPayload = Unpooled.buffer(); ackPayload.ensureWritable(1).writeByte(errorCode.getCode()); - response.setContent(ackPayload); + contents = ackPayload.array(); + } + if (base64Response) { + byte[] base64Data = Base64.getEncoder().encode(contents); + response.setContent(base64Data); } else { response.setContent(contents); }