From 0103a3dd37679c4b4dbde597207cfe0135caff13 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Tue, 5 Jan 2016 11:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=8B=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- samples/skywalking-auth/src/main/resources/sky-walking.auth | 2 ++ .../src/main/java/com/ai/cloud/skywalking/conf/Config.java | 2 ++ .../cloud/skywalking/sender/protocol/ProtocolBuilder.java | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/samples/skywalking-auth/src/main/resources/sky-walking.auth b/samples/skywalking-auth/src/main/resources/sky-walking.auth index 34dcdc2d8..5ff536049 100644 --- a/samples/skywalking-auth/src/main/resources/sky-walking.auth +++ b/samples/skywalking-auth/src/main/resources/sky-walking.auth @@ -4,6 +4,8 @@ skywalking.user_id=123 skywalking.application_code=test #skywalking auth的环境变量名字 skywalking.auth_system_env_name=SKYWALKING_RUN +#skywalking数据编码 +skywalking.charset=UTF-8 #是否打印数据 buriedpoint.printf=false diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java index 199b35d3a..58bf7ca8e 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java @@ -10,6 +10,8 @@ public class Config { public static String AUTH_SYSTEM_ENV_NAME = "SKYWALKING_RUN"; public static boolean AUTH_OVERRIDE = false; + + public static String CHARSET = "UTF-8"; } public static class BuriedPoint { diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java index c944810a9..35ecb78cc 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/protocol/ProtocolBuilder.java @@ -1,12 +1,16 @@ package com.ai.cloud.skywalking.sender.protocol; +import com.ai.cloud.skywalking.conf.Config; + +import java.nio.charset.Charset; + public class ProtocolBuilder { //协议格式: // xx xx xx xx | xx xx xx xx xxx xxx xxx // header(4) | content public static byte[] builder(String data) { - byte[] content = data.getBytes(); + byte[] content = data.getBytes(Charset.forName(Config.SkyWalking.CHARSET)); byte[] header = intToByteArray(content.length); byte[] des = new byte[header.length + content.length]; System.arraycopy(header, 0, des, 0, header.length);