fix: 把string类型改为bytes类型

src/main/java/com/yuandian/dataflow/controller/TaskLog.java

@@ -1,6 +1,8 @@
 package com.yuandian.dataflow.controller;
 
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
 
 import com.alipay.sofa.jraft.Closure;
 import com.alipay.sofa.jraft.entity.Task;
@@ -66,10 +68,22 @@ public class TaskLog {
 		return new ResponseEntity<Response>(response, HttpStatus.OK);
 	}
 
-	@GetMapping(path = "/test2")
+	// ip
-	public ResponseEntity<Response> MongodbTest(@RequestBody int status) {
+	private static String convertIpToString(com.google.protobuf.ByteString byteString) {
+		ArrayList<String> res = new ArrayList<>();
+		byteString.forEach(byteStr -> {
+			res.add(String.valueOf(byteStr & 0xff));
+		});
+		return res.stream().collect(Collectors.joining("."));
+	}
 
-		Response response = new Response();
+	// mac
-		return new ResponseEntity<Response>(response, HttpStatus.OK);
+	private static String convertMacToString(com.google.protobuf.ByteString byteString) {
+		ArrayList<String> res = new ArrayList<>();
+		byteString.forEach(byteStr -> {
+			String str = Integer.toHexString(byteStr & 0xff);
+			res.add(str.length() < 2 ? "0" + str : str);
+		});
+		return res.stream().collect(Collectors.joining("-"));
 	}
 }

src/main/java/com/yuandian/dataflow/proto/msgtype/ApmBaseDataFlowOuterClass.java

@@ -77,28 +77,16 @@ public final class ApmBaseDataFlowOuterClass {
     com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleDaddrOrBuilder();
 
     /**
-     * <code>string src_mac = 7;</code>
+     * <code>bytes src_mac = 7;</code>
      * @return The srcMac.
      */
-    java.lang.String getSrcMac();
+    com.google.protobuf.ByteString getSrcMac();
-    /**
-     * <code>string src_mac = 7;</code>
-     * @return The bytes for srcMac.
-     */
-    com.google.protobuf.ByteString
-        getSrcMacBytes();
 
     /**
-     * <code>string dst_mac = 8;</code>
+     * <code>bytes dst_mac = 8;</code>
      * @return The dstMac.
      */
-    java.lang.String getDstMac();
+    com.google.protobuf.ByteString getDstMac();
-    /**
-     * <code>string dst_mac = 8;</code>
-     * @return The bytes for dstMac.
-     */
-    com.google.protobuf.ByteString
-        getDstMacBytes();
 
     /**
      * <code>uint32 vlan_id = 9;</code>
@@ -269,16 +257,10 @@ public final class ApmBaseDataFlowOuterClass {
     int getScAlert();
 
     /**
-     * <code>string protocol = 37;</code>
+     * <code>bytes protocol = 37;</code>
      * @return The protocol.
      */
-    java.lang.String getProtocol();
+    com.google.protobuf.ByteString getProtocol();
-    /**
-     * <code>string protocol = 37;</code>
-     * @return The bytes for protocol.
-     */
-    com.google.protobuf.ByteString
-        getProtocolBytes();
   }
   /**
    * Protobuf type {@code dataflow.ApmBaseDataFlow}
@@ -293,9 +275,9 @@ public final class ApmBaseDataFlowOuterClass {
       super(builder);
     }
     private ApmBaseDataFlow() {
-      srcMac_ = "";
+      srcMac_ = com.google.protobuf.ByteString.EMPTY;
-      dstMac_ = "";
+      dstMac_ = com.google.protobuf.ByteString.EMPTY;
-      protocol_ = "";
+      protocol_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -375,15 +357,13 @@ public final class ApmBaseDataFlowOuterClass {
               break;
             }
             case 58: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              srcMac_ = s;
+              srcMac_ = input.readBytes();
               break;
             }
             case 66: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              dstMac_ = s;
+              dstMac_ = input.readBytes();
               break;
             }
             case 72: {
@@ -527,9 +507,8 @@ public final class ApmBaseDataFlowOuterClass {
               break;
             }
             case 298: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              protocol_ = s;
+              protocol_ = input.readBytes();
               break;
             }
             default: {
@@ -667,79 +646,25 @@ public final class ApmBaseDataFlowOuterClass {
     }
 
     public static final int SRC_MAC_FIELD_NUMBER = 7;
-    private volatile java.lang.Object srcMac_;
+    private com.google.protobuf.ByteString srcMac_;
     /**
-     * <code>string src_mac = 7;</code>
+     * <code>bytes src_mac = 7;</code>
      * @return The srcMac.
      */
     @java.lang.Override
-    public java.lang.String getSrcMac() {
+    public com.google.protobuf.ByteString getSrcMac() {
-      java.lang.Object ref = srcMac_;
+      return srcMac_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        srcMac_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string src_mac = 7;</code>
-     * @return The bytes for srcMac.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getSrcMacBytes() {
-      java.lang.Object ref = srcMac_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        srcMac_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int DST_MAC_FIELD_NUMBER = 8;
-    private volatile java.lang.Object dstMac_;
+    private com.google.protobuf.ByteString dstMac_;
     /**
-     * <code>string dst_mac = 8;</code>
+     * <code>bytes dst_mac = 8;</code>
      * @return The dstMac.
      */
     @java.lang.Override
-    public java.lang.String getDstMac() {
+    public com.google.protobuf.ByteString getDstMac() {
-      java.lang.Object ref = dstMac_;
+      return dstMac_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        dstMac_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string dst_mac = 8;</code>
-     * @return The bytes for dstMac.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getDstMacBytes() {
-      java.lang.Object ref = dstMac_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        dstMac_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int VLAN_ID_FIELD_NUMBER = 9;
@@ -1051,41 +976,14 @@ public final class ApmBaseDataFlowOuterClass {
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 37;
-    private volatile java.lang.Object protocol_;
+    private com.google.protobuf.ByteString protocol_;
     /**
-     * <code>string protocol = 37;</code>
+     * <code>bytes protocol = 37;</code>
      * @return The protocol.
      */
     @java.lang.Override
-    public java.lang.String getProtocol() {
+    public com.google.protobuf.ByteString getProtocol() {
-      java.lang.Object ref = protocol_;
+      return protocol_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        protocol_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string protocol = 37;</code>
-     * @return The bytes for protocol.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getProtocolBytes() {
-      java.lang.Object ref = protocol_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        protocol_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1120,11 +1018,11 @@ public final class ApmBaseDataFlowOuterClass {
       if (tupleDaddr_ != null) {
         output.writeMessage(6, getTupleDaddr());
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(srcMac_)) {
+      if (!srcMac_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, srcMac_);
+        output.writeBytes(7, srcMac_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dstMac_)) {
+      if (!dstMac_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, dstMac_);
+        output.writeBytes(8, dstMac_);
       }
       if (vlanId_ != 0) {
         output.writeUInt32(9, vlanId_);
@@ -1210,8 +1108,8 @@ public final class ApmBaseDataFlowOuterClass {
       if (scAlert_ != 0) {
         output.writeUInt32(36, scAlert_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
+      if (!protocol_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 37, protocol_);
+        output.writeBytes(37, protocol_);
       }
       unknownFields.writeTo(output);
     }
@@ -1246,11 +1144,13 @@ public final class ApmBaseDataFlowOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, getTupleDaddr());
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(srcMac_)) {
+      if (!srcMac_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, srcMac_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(7, srcMac_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dstMac_)) {
+      if (!dstMac_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, dstMac_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(8, dstMac_);
       }
       if (vlanId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1364,8 +1264,9 @@ public final class ApmBaseDataFlowOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(36, scAlert_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
+      if (!protocol_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(37, protocol_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(37, protocol_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1704,9 +1605,9 @@ public final class ApmBaseDataFlowOuterClass {
           tupleDaddr_ = null;
           tupleDaddrBuilder_ = null;
         }
-        srcMac_ = "";
+        srcMac_ = com.google.protobuf.ByteString.EMPTY;
 
-        dstMac_ = "";
+        dstMac_ = com.google.protobuf.ByteString.EMPTY;
 
         vlanId_ = 0;
 
@@ -1764,7 +1665,7 @@ public final class ApmBaseDataFlowOuterClass {
 
         scAlert_ = 0;
 
-        protocol_ = "";
+        protocol_ = com.google.protobuf.ByteString.EMPTY;
 
         return this;
       }
@@ -1903,13 +1804,11 @@ public final class ApmBaseDataFlowOuterClass {
         if (other.hasTupleDaddr()) {
           mergeTupleDaddr(other.getTupleDaddr());
         }
-        if (!other.getSrcMac().isEmpty()) {
+        if (other.getSrcMac() != com.google.protobuf.ByteString.EMPTY) {
-          srcMac_ = other.srcMac_;
+          setSrcMac(other.getSrcMac());
-          onChanged();
         }
-        if (!other.getDstMac().isEmpty()) {
+        if (other.getDstMac() != com.google.protobuf.ByteString.EMPTY) {
-          dstMac_ = other.dstMac_;
+          setDstMac(other.getDstMac());
-          onChanged();
         }
         if (other.getVlanId() != 0) {
           setVlanId(other.getVlanId());
@@ -1995,9 +1894,8 @@ public final class ApmBaseDataFlowOuterClass {
         if (other.getScAlert() != 0) {
           setScAlert(other.getScAlert());
         }
-        if (!other.getProtocol().isEmpty()) {
+        if (other.getProtocol() != com.google.protobuf.ByteString.EMPTY) {
-          protocol_ = other.protocol_;
+          setProtocol(other.getProtocol());
-          onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -2402,47 +2300,21 @@ public final class ApmBaseDataFlowOuterClass {
         return tupleDaddrBuilder_;
       }
 
-      private java.lang.Object srcMac_ = "";
+      private com.google.protobuf.ByteString srcMac_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string src_mac = 7;</code>
+       * <code>bytes src_mac = 7;</code>
        * @return The srcMac.
        */
-      public java.lang.String getSrcMac() {
+      @java.lang.Override
-        java.lang.Object ref = srcMac_;
+      public com.google.protobuf.ByteString getSrcMac() {
-        if (!(ref instanceof java.lang.String)) {
+        return srcMac_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          srcMac_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string src_mac = 7;</code>
+       * <code>bytes src_mac = 7;</code>
-       * @return The bytes for srcMac.
-       */
-      public com.google.protobuf.ByteString
-          getSrcMacBytes() {
-        java.lang.Object ref = srcMac_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          srcMac_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string src_mac = 7;</code>
        * @param value The srcMac to set.
        * @return This builder for chaining.
        */
-      public Builder setSrcMac(
+      public Builder setSrcMac(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2452,7 +2324,7 @@ public final class ApmBaseDataFlowOuterClass {
         return this;
       }
       /**
-       * <code>string src_mac = 7;</code>
+       * <code>bytes src_mac = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSrcMac() {
@@ -2461,64 +2333,22 @@ public final class ApmBaseDataFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string src_mac = 7;</code>
-       * @param value The bytes for srcMac to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSrcMacBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
 
-        srcMac_ = value;
+      private com.google.protobuf.ByteString dstMac_ = com.google.protobuf.ByteString.EMPTY;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object dstMac_ = "";
       /**
-       * <code>string dst_mac = 8;</code>
+       * <code>bytes dst_mac = 8;</code>
        * @return The dstMac.
        */
-      public java.lang.String getDstMac() {
+      @java.lang.Override
-        java.lang.Object ref = dstMac_;
+      public com.google.protobuf.ByteString getDstMac() {
-        if (!(ref instanceof java.lang.String)) {
+        return dstMac_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          dstMac_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string dst_mac = 8;</code>
+       * <code>bytes dst_mac = 8;</code>
-       * @return The bytes for dstMac.
-       */
-      public com.google.protobuf.ByteString
-          getDstMacBytes() {
-        java.lang.Object ref = dstMac_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          dstMac_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string dst_mac = 8;</code>
        * @param value The dstMac to set.
        * @return This builder for chaining.
        */
-      public Builder setDstMac(
+      public Builder setDstMac(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2528,7 +2358,7 @@ public final class ApmBaseDataFlowOuterClass {
         return this;
       }
       /**
-       * <code>string dst_mac = 8;</code>
+       * <code>bytes dst_mac = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearDstMac() {
@@ -2537,22 +2367,6 @@ public final class ApmBaseDataFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string dst_mac = 8;</code>
-       * @param value The bytes for dstMac to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDstMacBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        dstMac_ = value;
-        onChanged();
-        return this;
-      }
 
       private int vlanId_ ;
       /**
@@ -3422,47 +3236,21 @@ public final class ApmBaseDataFlowOuterClass {
         return this;
       }
 
-      private java.lang.Object protocol_ = "";
+      private com.google.protobuf.ByteString protocol_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string protocol = 37;</code>
+       * <code>bytes protocol = 37;</code>
        * @return The protocol.
        */
-      public java.lang.String getProtocol() {
+      @java.lang.Override
-        java.lang.Object ref = protocol_;
+      public com.google.protobuf.ByteString getProtocol() {
-        if (!(ref instanceof java.lang.String)) {
+        return protocol_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          protocol_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string protocol = 37;</code>
+       * <code>bytes protocol = 37;</code>
-       * @return The bytes for protocol.
-       */
-      public com.google.protobuf.ByteString
-          getProtocolBytes() {
-        java.lang.Object ref = protocol_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          protocol_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string protocol = 37;</code>
        * @param value The protocol to set.
        * @return This builder for chaining.
        */
-      public Builder setProtocol(
+      public Builder setProtocol(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -3472,7 +3260,7 @@ public final class ApmBaseDataFlowOuterClass {
         return this;
       }
       /**
-       * <code>string protocol = 37;</code>
+       * <code>bytes protocol = 37;</code>
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
@@ -3481,22 +3269,6 @@ public final class ApmBaseDataFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string protocol = 37;</code>
-       * @param value The bytes for protocol to set.
-       * @return This builder for chaining.
-       */
-      public Builder setProtocolBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        protocol_ = value;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3570,7 +3342,7 @@ public final class ApmBaseDataFlowOuterClass {
       "\001(\r\022\022\n\ntuple_dest\030\004 \001(\r\022(\n\013tuple_saddr\030\005" +
       " \001(\0132\023.dataflow.IPAddress\022(\n\013tuple_daddr" +
       "\030\006 \001(\0132\023.dataflow.IPAddress\022\017\n\007src_mac\030\007" +
-      " \001(\t\022\017\n\007dst_mac\030\010 \001(\t\022\017\n\007vlan_id\030\t \001(\r\022\027" +
+      " \001(\014\022\017\n\007dst_mac\030\010 \001(\014\022\017\n\007vlan_id\030\t \001(\r\022\027" +
       "\n\017start_tm_tv_sec\030\n \001(\r\022\030\n\020start_tm_tv_u" +
       "sec\030\013 \001(\r\022\023\n\013total_bytes\030\014 \001(\r\022\025\n\rtotal_" +
       "packets\030\r \001(\r\022\032\n\022total_drop_packets\030\016 \001(" +
@@ -3585,7 +3357,7 @@ public final class ApmBaseDataFlowOuterClass {
       "\001(\r\022\020\n\010sc_reset\030\036 \001(\r\022\021\n\tcs_retran\030\037 \001(\r" +
       "\022\021\n\tsc_retran\030  \001(\r\022\025\n\rconn_setup_tm\030! \001" +
       "(\r\022\023\n\013new_session\030\" \001(\r\022\020\n\010cs_alert\030# \001(" +
-      "\r\022\020\n\010sc_alert\030$ \001(\r\022\020\n\010protocol\030% \001(\tB<\n" +
+      "\r\022\020\n\010sc_alert\030$ \001(\r\022\020\n\010protocol\030% \001(\014B<\n" +
       "#com.yuandian.dataflow.proto.msgtypeP\000Z\023" +
       "../grpc-gen;grpcgenb\006proto3"
     };

src/main/java/com/yuandian/dataflow/proto/msgtype/AppFlowOuterClass.java

@@ -131,16 +131,10 @@ public final class AppFlowOuterClass {
     int getOutputBytes();
 
     /**
-     * <code>string protocol = 16;</code>
+     * <code>bytes protocol = 16;</code>
      * @return The protocol.
      */
-    java.lang.String getProtocol();
+    com.google.protobuf.ByteString getProtocol();
-    /**
-     * <code>string protocol = 16;</code>
-     * @return The bytes for protocol.
-     */
-    com.google.protobuf.ByteString
-        getProtocolBytes();
 
     /**
      * <code>uint32 app_id = 17;</code>
@@ -203,7 +197,7 @@ public final class AppFlowOuterClass {
       super(builder);
     }
     private AppFlow() {
-      protocol_ = "";
+      protocol_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -328,9 +322,8 @@ public final class AppFlowOuterClass {
               break;
             }
             case 130: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              protocol_ = s;
+              protocol_ = input.readBytes();
               break;
             }
             case 136: {
@@ -607,41 +600,14 @@ public final class AppFlowOuterClass {
     }
 
     public static final int PROTOCOL_FIELD_NUMBER = 16;
-    private volatile java.lang.Object protocol_;
+    private com.google.protobuf.ByteString protocol_;
     /**
-     * <code>string protocol = 16;</code>
+     * <code>bytes protocol = 16;</code>
      * @return The protocol.
      */
     @java.lang.Override
-    public java.lang.String getProtocol() {
+    public com.google.protobuf.ByteString getProtocol() {
-      java.lang.Object ref = protocol_;
+      return protocol_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        protocol_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string protocol = 16;</code>
-     * @return The bytes for protocol.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getProtocolBytes() {
-      java.lang.Object ref = protocol_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        protocol_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int APP_ID_FIELD_NUMBER = 17;
@@ -791,8 +757,8 @@ public final class AppFlowOuterClass {
       if (outputBytes_ != 0) {
         output.writeUInt32(15, outputBytes_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
+      if (!protocol_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 16, protocol_);
+        output.writeBytes(16, protocol_);
       }
       if (appId_ != 0) {
         output.writeUInt32(17, appId_);
@@ -887,8 +853,9 @@ public final class AppFlowOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(15, outputBytes_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
+      if (!protocol_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(16, protocol_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(16, protocol_);
       }
       if (appId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1225,7 +1192,7 @@ public final class AppFlowOuterClass {
 
         outputBytes_ = 0;
 
-        protocol_ = "";
+        protocol_ = com.google.protobuf.ByteString.EMPTY;
 
         appId_ = 0;
 
@@ -1394,9 +1361,8 @@ public final class AppFlowOuterClass {
         if (other.getOutputBytes() != 0) {
           setOutputBytes(other.getOutputBytes());
         }
-        if (!other.getProtocol().isEmpty()) {
+        if (other.getProtocol() != com.google.protobuf.ByteString.EMPTY) {
-          protocol_ = other.protocol_;
+          setProtocol(other.getProtocol());
-          onChanged();
         }
         if (other.getAppId() != 0) {
           setAppId(other.getAppId());
@@ -2104,47 +2070,21 @@ public final class AppFlowOuterClass {
         return this;
       }
 
-      private java.lang.Object protocol_ = "";
+      private com.google.protobuf.ByteString protocol_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string protocol = 16;</code>
+       * <code>bytes protocol = 16;</code>
        * @return The protocol.
        */
-      public java.lang.String getProtocol() {
+      @java.lang.Override
-        java.lang.Object ref = protocol_;
+      public com.google.protobuf.ByteString getProtocol() {
-        if (!(ref instanceof java.lang.String)) {
+        return protocol_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          protocol_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string protocol = 16;</code>
+       * <code>bytes protocol = 16;</code>
-       * @return The bytes for protocol.
-       */
-      public com.google.protobuf.ByteString
-          getProtocolBytes() {
-        java.lang.Object ref = protocol_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          protocol_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string protocol = 16;</code>
        * @param value The protocol to set.
        * @return This builder for chaining.
        */
-      public Builder setProtocol(
+      public Builder setProtocol(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2154,7 +2094,7 @@ public final class AppFlowOuterClass {
         return this;
       }
       /**
-       * <code>string protocol = 16;</code>
+       * <code>bytes protocol = 16;</code>
        * @return This builder for chaining.
        */
       public Builder clearProtocol() {
@@ -2163,22 +2103,6 @@ public final class AppFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string protocol = 16;</code>
-       * @param value The bytes for protocol to set.
-       * @return This builder for chaining.
-       */
-      public Builder setProtocolBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        protocol_ = value;
-        onChanged();
-        return this;
-      }
 
       private int appId_ ;
       /**
@@ -2503,7 +2427,7 @@ public final class AppFlowOuterClass {
       "_usec\030\t \001(\r\022\020\n\010e_tv_sec\030\n \001(\r\022\021\n\te_tv_us" +
       "ec\030\013 \001(\r\022\025\n\rinput_packets\030\014 \001(\r\022\026\n\016outpu" +
       "t_packets\030\r \001(\r\022\023\n\013input_bytes\030\016 \001(\r\022\024\n\014" +
-      "output_bytes\030\017 \001(\r\022\020\n\010protocol\030\020 \001(\t\022\016\n\006" +
+      "output_bytes\030\017 \001(\r\022\020\n\010protocol\030\020 \001(\014\022\016\n\006" +
       "app_id\030\021 \001(\r\022\024\n\014app_group_id\030\022 \001(\r\022\020\n\010pr" +
       "obe_if\030\023 \001(\r\022\021\n\tapp_style\030\024 \001(\r\022\021\n\ttime_" +
       "flag\030\025 \001(\r\022\017\n\007vlan_id\030\026 \001(\005\022\022\n\nmpls_labe" +

src/main/java/com/yuandian/dataflow/proto/msgtype/UsrFlowOuterClass.java

@@ -131,28 +131,16 @@ public final class UsrFlowOuterClass {
     int getAppGroupId();
 
     /**
-     * <code>string request_url = 16;</code>
+     * <code>bytes request_url = 16;</code>
      * @return The requestUrl.
      */
-    java.lang.String getRequestUrl();
+    com.google.protobuf.ByteString getRequestUrl();
-    /**
-     * <code>string request_url = 16;</code>
-     * @return The bytes for requestUrl.
-     */
-    com.google.protobuf.ByteString
-        getRequestUrlBytes();
 
     /**
-     * <code>string referer_url = 17;</code>
+     * <code>bytes referer_url = 17;</code>
      * @return The refererUrl.
      */
-    java.lang.String getRefererUrl();
+    com.google.protobuf.ByteString getRefererUrl();
-    /**
-     * <code>string referer_url = 17;</code>
-     * @return The bytes for refererUrl.
-     */
-    com.google.protobuf.ByteString
-        getRefererUrlBytes();
 
     /**
      * <code>uint32 return_code = 18;</code>
@@ -209,28 +197,16 @@ public final class UsrFlowOuterClass {
     int getServerPackets();
 
     /**
-     * <code>string user_agent = 27;</code>
+     * <code>bytes user_agent = 27;</code>
      * @return The userAgent.
      */
-    java.lang.String getUserAgent();
+    com.google.protobuf.ByteString getUserAgent();
-    /**
-     * <code>string user_agent = 27;</code>
-     * @return The bytes for userAgent.
-     */
-    com.google.protobuf.ByteString
-        getUserAgentBytes();
 
     /**
-     * <code>string content_type = 28;</code>
+     * <code>bytes content_type = 28;</code>
      * @return The contentType.
      */
-    java.lang.String getContentType();
+    com.google.protobuf.ByteString getContentType();
-    /**
-     * <code>string content_type = 28;</code>
-     * @return The bytes for contentType.
-     */
-    com.google.protobuf.ByteString
-        getContentTypeBytes();
 
     /**
      * <code>uint32 request_transfer_tm = 29;</code>
@@ -257,10 +233,10 @@ public final class UsrFlowOuterClass {
       super(builder);
     }
     private UsrFlow() {
-      requestUrl_ = "";
+      requestUrl_ = com.google.protobuf.ByteString.EMPTY;
-      refererUrl_ = "";
+      refererUrl_ = com.google.protobuf.ByteString.EMPTY;
-      userAgent_ = "";
+      userAgent_ = com.google.protobuf.ByteString.EMPTY;
-      contentType_ = "";
+      contentType_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -385,15 +361,13 @@ public final class UsrFlowOuterClass {
               break;
             }
             case 130: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              requestUrl_ = s;
+              requestUrl_ = input.readBytes();
               break;
             }
             case 138: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              refererUrl_ = s;
+              refererUrl_ = input.readBytes();
               break;
             }
             case 144: {
@@ -442,15 +416,13 @@ public final class UsrFlowOuterClass {
               break;
             }
             case 218: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              userAgent_ = s;
+              userAgent_ = input.readBytes();
               break;
             }
             case 226: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              contentType_ = s;
+              contentType_ = input.readBytes();
               break;
             }
             case 232: {
@@ -697,79 +669,25 @@ public final class UsrFlowOuterClass {
     }
 
     public static final int REQUEST_URL_FIELD_NUMBER = 16;
-    private volatile java.lang.Object requestUrl_;
+    private com.google.protobuf.ByteString requestUrl_;
     /**
-     * <code>string request_url = 16;</code>
+     * <code>bytes request_url = 16;</code>
      * @return The requestUrl.
      */
     @java.lang.Override
-    public java.lang.String getRequestUrl() {
+    public com.google.protobuf.ByteString getRequestUrl() {
-      java.lang.Object ref = requestUrl_;
+      return requestUrl_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        requestUrl_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string request_url = 16;</code>
-     * @return The bytes for requestUrl.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getRequestUrlBytes() {
-      java.lang.Object ref = requestUrl_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        requestUrl_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int REFERER_URL_FIELD_NUMBER = 17;
-    private volatile java.lang.Object refererUrl_;
+    private com.google.protobuf.ByteString refererUrl_;
     /**
-     * <code>string referer_url = 17;</code>
+     * <code>bytes referer_url = 17;</code>
      * @return The refererUrl.
      */
     @java.lang.Override
-    public java.lang.String getRefererUrl() {
+    public com.google.protobuf.ByteString getRefererUrl() {
-      java.lang.Object ref = refererUrl_;
+      return refererUrl_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        refererUrl_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string referer_url = 17;</code>
-     * @return The bytes for refererUrl.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getRefererUrlBytes() {
-      java.lang.Object ref = refererUrl_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        refererUrl_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int RETURN_CODE_FIELD_NUMBER = 18;
@@ -872,79 +790,25 @@ public final class UsrFlowOuterClass {
     }
 
     public static final int USER_AGENT_FIELD_NUMBER = 27;
-    private volatile java.lang.Object userAgent_;
+    private com.google.protobuf.ByteString userAgent_;
     /**
-     * <code>string user_agent = 27;</code>
+     * <code>bytes user_agent = 27;</code>
      * @return The userAgent.
      */
     @java.lang.Override
-    public java.lang.String getUserAgent() {
+    public com.google.protobuf.ByteString getUserAgent() {
-      java.lang.Object ref = userAgent_;
+      return userAgent_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        userAgent_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string user_agent = 27;</code>
-     * @return The bytes for userAgent.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getUserAgentBytes() {
-      java.lang.Object ref = userAgent_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        userAgent_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int CONTENT_TYPE_FIELD_NUMBER = 28;
-    private volatile java.lang.Object contentType_;
+    private com.google.protobuf.ByteString contentType_;
     /**
-     * <code>string content_type = 28;</code>
+     * <code>bytes content_type = 28;</code>
      * @return The contentType.
      */
     @java.lang.Override
-    public java.lang.String getContentType() {
+    public com.google.protobuf.ByteString getContentType() {
-      java.lang.Object ref = contentType_;
+      return contentType_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        contentType_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string content_type = 28;</code>
-     * @return The bytes for contentType.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getContentTypeBytes() {
-      java.lang.Object ref = contentType_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        contentType_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
     }
 
     public static final int REQUEST_TRANSFER_TM_FIELD_NUMBER = 29;
@@ -1028,11 +892,11 @@ public final class UsrFlowOuterClass {
       if (appGroupId_ != 0) {
         output.writeUInt32(15, appGroupId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestUrl_)) {
+      if (!requestUrl_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 16, requestUrl_);
+        output.writeBytes(16, requestUrl_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(refererUrl_)) {
+      if (!refererUrl_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 17, refererUrl_);
+        output.writeBytes(17, refererUrl_);
       }
       if (returnCode_ != 0) {
         output.writeUInt32(18, returnCode_);
@@ -1061,11 +925,11 @@ public final class UsrFlowOuterClass {
       if (serverPackets_ != 0) {
         output.writeUInt32(26, serverPackets_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(userAgent_)) {
+      if (!userAgent_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 27, userAgent_);
+        output.writeBytes(27, userAgent_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(contentType_)) {
+      if (!contentType_.isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 28, contentType_);
+        output.writeBytes(28, contentType_);
       }
       if (requestTransferTm_ != 0) {
         output.writeUInt32(29, requestTransferTm_);
@@ -1142,11 +1006,13 @@ public final class UsrFlowOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(15, appGroupId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(requestUrl_)) {
+      if (!requestUrl_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(16, requestUrl_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(16, requestUrl_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(refererUrl_)) {
+      if (!refererUrl_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, refererUrl_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(17, refererUrl_);
       }
       if (returnCode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1184,11 +1050,13 @@ public final class UsrFlowOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(26, serverPackets_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(userAgent_)) {
+      if (!userAgent_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(27, userAgent_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(27, userAgent_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(contentType_)) {
+      if (!contentType_.isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(28, contentType_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(28, contentType_);
       }
       if (requestTransferTm_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1525,9 +1393,9 @@ public final class UsrFlowOuterClass {
 
         appGroupId_ = 0;
 
-        requestUrl_ = "";
+        requestUrl_ = com.google.protobuf.ByteString.EMPTY;
 
-        refererUrl_ = "";
+        refererUrl_ = com.google.protobuf.ByteString.EMPTY;
 
         returnCode_ = 0;
 
@@ -1547,9 +1415,9 @@ public final class UsrFlowOuterClass {
 
         serverPackets_ = 0;
 
-        userAgent_ = "";
+        userAgent_ = com.google.protobuf.ByteString.EMPTY;
 
-        contentType_ = "";
+        contentType_ = com.google.protobuf.ByteString.EMPTY;
 
         requestTransferTm_ = 0;
 
@@ -1712,13 +1580,11 @@ public final class UsrFlowOuterClass {
         if (other.getAppGroupId() != 0) {
           setAppGroupId(other.getAppGroupId());
         }
-        if (!other.getRequestUrl().isEmpty()) {
+        if (other.getRequestUrl() != com.google.protobuf.ByteString.EMPTY) {
-          requestUrl_ = other.requestUrl_;
+          setRequestUrl(other.getRequestUrl());
-          onChanged();
         }
-        if (!other.getRefererUrl().isEmpty()) {
+        if (other.getRefererUrl() != com.google.protobuf.ByteString.EMPTY) {
-          refererUrl_ = other.refererUrl_;
+          setRefererUrl(other.getRefererUrl());
-          onChanged();
         }
         if (other.getReturnCode() != 0) {
           setReturnCode(other.getReturnCode());
@@ -1747,13 +1613,11 @@ public final class UsrFlowOuterClass {
         if (other.getServerPackets() != 0) {
           setServerPackets(other.getServerPackets());
         }
-        if (!other.getUserAgent().isEmpty()) {
+        if (other.getUserAgent() != com.google.protobuf.ByteString.EMPTY) {
-          userAgent_ = other.userAgent_;
+          setUserAgent(other.getUserAgent());
-          onChanged();
         }
-        if (!other.getContentType().isEmpty()) {
+        if (other.getContentType() != com.google.protobuf.ByteString.EMPTY) {
-          contentType_ = other.contentType_;
+          setContentType(other.getContentType());
-          onChanged();
         }
         if (other.getRequestTransferTm() != 0) {
           setRequestTransferTm(other.getRequestTransferTm());
@@ -2443,47 +2307,21 @@ public final class UsrFlowOuterClass {
         return this;
       }
 
-      private java.lang.Object requestUrl_ = "";
+      private com.google.protobuf.ByteString requestUrl_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string request_url = 16;</code>
+       * <code>bytes request_url = 16;</code>
        * @return The requestUrl.
        */
-      public java.lang.String getRequestUrl() {
+      @java.lang.Override
-        java.lang.Object ref = requestUrl_;
+      public com.google.protobuf.ByteString getRequestUrl() {
-        if (!(ref instanceof java.lang.String)) {
+        return requestUrl_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          requestUrl_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string request_url = 16;</code>
+       * <code>bytes request_url = 16;</code>
-       * @return The bytes for requestUrl.
-       */
-      public com.google.protobuf.ByteString
-          getRequestUrlBytes() {
-        java.lang.Object ref = requestUrl_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          requestUrl_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string request_url = 16;</code>
        * @param value The requestUrl to set.
        * @return This builder for chaining.
        */
-      public Builder setRequestUrl(
+      public Builder setRequestUrl(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2493,7 +2331,7 @@ public final class UsrFlowOuterClass {
         return this;
       }
       /**
-       * <code>string request_url = 16;</code>
+       * <code>bytes request_url = 16;</code>
        * @return This builder for chaining.
        */
       public Builder clearRequestUrl() {
@@ -2502,64 +2340,22 @@ public final class UsrFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string request_url = 16;</code>
-       * @param value The bytes for requestUrl to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRequestUrlBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
 
-        requestUrl_ = value;
+      private com.google.protobuf.ByteString refererUrl_ = com.google.protobuf.ByteString.EMPTY;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object refererUrl_ = "";
       /**
-       * <code>string referer_url = 17;</code>
+       * <code>bytes referer_url = 17;</code>
        * @return The refererUrl.
        */
-      public java.lang.String getRefererUrl() {
+      @java.lang.Override
-        java.lang.Object ref = refererUrl_;
+      public com.google.protobuf.ByteString getRefererUrl() {
-        if (!(ref instanceof java.lang.String)) {
+        return refererUrl_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          refererUrl_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string referer_url = 17;</code>
+       * <code>bytes referer_url = 17;</code>
-       * @return The bytes for refererUrl.
-       */
-      public com.google.protobuf.ByteString
-          getRefererUrlBytes() {
-        java.lang.Object ref = refererUrl_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          refererUrl_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string referer_url = 17;</code>
        * @param value The refererUrl to set.
        * @return This builder for chaining.
        */
-      public Builder setRefererUrl(
+      public Builder setRefererUrl(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2569,7 +2365,7 @@ public final class UsrFlowOuterClass {
         return this;
       }
       /**
-       * <code>string referer_url = 17;</code>
+       * <code>bytes referer_url = 17;</code>
        * @return This builder for chaining.
        */
       public Builder clearRefererUrl() {
@@ -2578,22 +2374,6 @@ public final class UsrFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string referer_url = 17;</code>
-       * @param value The bytes for refererUrl to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRefererUrlBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        refererUrl_ = value;
-        onChanged();
-        return this;
-      }
 
       private int returnCode_ ;
       /**
@@ -2874,47 +2654,21 @@ public final class UsrFlowOuterClass {
         return this;
       }
 
-      private java.lang.Object userAgent_ = "";
+      private com.google.protobuf.ByteString userAgent_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string user_agent = 27;</code>
+       * <code>bytes user_agent = 27;</code>
        * @return The userAgent.
        */
-      public java.lang.String getUserAgent() {
+      @java.lang.Override
-        java.lang.Object ref = userAgent_;
+      public com.google.protobuf.ByteString getUserAgent() {
-        if (!(ref instanceof java.lang.String)) {
+        return userAgent_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          userAgent_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string user_agent = 27;</code>
+       * <code>bytes user_agent = 27;</code>
-       * @return The bytes for userAgent.
-       */
-      public com.google.protobuf.ByteString
-          getUserAgentBytes() {
-        java.lang.Object ref = userAgent_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          userAgent_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string user_agent = 27;</code>
        * @param value The userAgent to set.
        * @return This builder for chaining.
        */
-      public Builder setUserAgent(
+      public Builder setUserAgent(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -2924,7 +2678,7 @@ public final class UsrFlowOuterClass {
         return this;
       }
       /**
-       * <code>string user_agent = 27;</code>
+       * <code>bytes user_agent = 27;</code>
        * @return This builder for chaining.
        */
       public Builder clearUserAgent() {
@@ -2933,64 +2687,22 @@ public final class UsrFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string user_agent = 27;</code>
-       * @param value The bytes for userAgent to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUserAgentBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
 
-        userAgent_ = value;
+      private com.google.protobuf.ByteString contentType_ = com.google.protobuf.ByteString.EMPTY;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object contentType_ = "";
       /**
-       * <code>string content_type = 28;</code>
+       * <code>bytes content_type = 28;</code>
        * @return The contentType.
        */
-      public java.lang.String getContentType() {
+      @java.lang.Override
-        java.lang.Object ref = contentType_;
+      public com.google.protobuf.ByteString getContentType() {
-        if (!(ref instanceof java.lang.String)) {
+        return contentType_;
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          contentType_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
       }
       /**
-       * <code>string content_type = 28;</code>
+       * <code>bytes content_type = 28;</code>
-       * @return The bytes for contentType.
-       */
-      public com.google.protobuf.ByteString
-          getContentTypeBytes() {
-        java.lang.Object ref = contentType_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          contentType_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string content_type = 28;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
-      public Builder setContentType(
+      public Builder setContentType(com.google.protobuf.ByteString value) {
-          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
@@ -3000,7 +2712,7 @@ public final class UsrFlowOuterClass {
         return this;
       }
       /**
-       * <code>string content_type = 28;</code>
+       * <code>bytes content_type = 28;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -3009,22 +2721,6 @@ public final class UsrFlowOuterClass {
         onChanged();
         return this;
       }
-      /**
-       * <code>string content_type = 28;</code>
-       * @param value The bytes for contentType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setContentTypeBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        contentType_ = value;
-        onChanged();
-        return this;
-      }
 
       private int requestTransferTm_ ;
       /**
@@ -3163,14 +2859,14 @@ public final class UsrFlowOuterClass {
       " \001(\r\022\021\n\ts_tv_usec\030\t \001(\r\022\020\n\010e_tv_sec\030\n \001(" +
       "\r\022\021\n\te_tv_usec\030\013 \001(\r\022\024\n\014server_think\030\014 \001" +
       "(\r\022\021\n\tpage_size\030\r \001(\r\022\016\n\006app_id\030\016 \001(\r\022\024\n" +
-      "\014app_group_id\030\017 \001(\r\022\023\n\013request_url\030\020 \001(\t" +
+      "\014app_group_id\030\017 \001(\r\022\023\n\013request_url\030\020 \001(\014" +
-      "\022\023\n\013referer_url\030\021 \001(\t\022\023\n\013return_code\030\022 \001" +
+      "\022\023\n\013referer_url\030\021 \001(\014\022\023\n\013return_code\030\022 \001" +
       "(\r\022\022\n\nerr_tv_sec\030\023 \001(\r\022\023\n\013err_tv_usec\030\024 " +
       "\001(\r\022\027\n\017client_loss_pkt\030\025 \001(\r\022\027\n\017server_l" +
       "oss_pkt\030\026 \001(\r\022\024\n\014client_bytes\030\027 \001(\r\022\024\n\014s" +
       "erver_bytes\030\030 \001(\r\022\026\n\016client_packets\030\031 \001(" +
       "\r\022\026\n\016server_packets\030\032 \001(\r\022\022\n\nuser_agent\030" +
-      "\033 \001(\t\022\024\n\014content_type\030\034 \001(\t\022\033\n\023request_t" +
+      "\033 \001(\014\022\024\n\014content_type\030\034 \001(\014\022\033\n\023request_t" +
       "ransfer_tm\030\035 \001(\r\022\021\n\ttime_flag\030\036 \001(\rB<\n#c" +
       "om.yuandian.dataflow.proto.msgtypeP\000Z\023.." +
       "/grpc-gen;grpcgenb\006proto3"

src/main/proto

@@ -1 +1 @@
-Subproject commit bc997440f085ce75fadc071803b0b359bbf6ccb3
+Subproject commit f6e1792ff1747e23ad9963910991be43e96bd2bd