Merge remote-tracking branch 'origin/dev-0.2.3-log-collector' into dev-0.2.3-log-collector

Author: wushengyeyouya

streamis-jobmanager/streamis-job-log/streamis-job-log-common/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/entities/StreamisLogEvent.java

@@ -76,7 +76,7 @@ public void setSequenceId(int sequenceId){
     public String toJson(){
         return "{" +
                 "\"logTimeStamp\":" + logTimeInMills +
-                ",\"content\":" + (Objects.isNull(content)? null : "\"" + JsonTool.encodeStrValue(content) + "\"") +
+                ",\"content\":" + (Objects.isNull(content)? null : "\"" + JsonTool.escapeStrValue(content) + "\"") +
                 ",\"sequenceId\":0"
                 + "}";
 

streamis-jobmanager/streamis-job-log/streamis-job-log-common/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/entities/StreamisLogEvents.java

@@ -91,7 +91,7 @@ public void setSequenceId(int sequenceId){
     public String toJson(){
         return "{" +
                 "\"logTimeStamp\":" + logTimeInMills +
-                ",\"appName\":" + (Objects.isNull(appName)? null : "\"" + JsonTool.encodeStrValue(appName) + "\"")  +
+                ",\"appName\":" + (Objects.isNull(appName)? null : "\"" + JsonTool.escapeStrValue(appName) + "\"")  +
                 ",\"events\":[" +
                 (Objects.isNull(events) || events.length <=0 ? "" : joinEvents(events, ",") ) + "]" +
                 ",\"sequenceId\":0"

streamis-jobmanager/streamis-job-log/streamis-job-log-common/src/main/java/com/webank/wedatasphere/streamis/jobmanager/log/json/JsonTool.java

@@ -1,13 +1,16 @@
 package com.webank.wedatasphere.streamis.jobmanager.log.json;
 
+import java.util.Locale;
+
 public class JsonTool {
+    static final char[] HEX_DIGITS = new char[] {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
 
     /**
      * Avoid the special char
      * @param input input string
      * @return output string
      */
-    public static String encodeStrValue(String input){
+    public static String escapeStrValue(String input){
         char[] chars = input.toCharArray();
         StringBuilder sb = new StringBuilder();
         for (char c : chars) {
@@ -37,9 +40,24 @@ public static String encodeStrValue(String input){
                     sb.append("\\t");
                     break;
                 default:
-                    sb.append(c);
+                    sb.append((c < 32) ? escapeUnicode(c) : c);
             }
         }
         return sb.toString();
     }
+
+    /**
+     * Escape unicode
+     * @param code char code
+     * @return escaped string
+     */
+    private static String escapeUnicode(int code){
+        if (code > 0xffff){
+            return "\\u" + Integer.toHexString(code).toUpperCase(Locale.ENGLISH);
+        }  else {
+            return "\\u" + HEX_DIGITS[(code >> 12) & 15]
+                    + HEX_DIGITS[(code >> 8) & 15] + HEX_DIGITS[(code >> 4) & 15] + HEX_DIGITS[code & 15];
+        }
+    }
+
 }