feat(statemachine): 提交数组重组的Processor相关,与探针交互无关

补全数据流注释，部分流的字段的注释后续补充

See merge request project/proto/dataflow!7

.vscode/setting.json

@@ -0,0 +1,5 @@
+{
+    "protoc": {
+        "options": ["-I proto"]
+    }
+}

ApmBaseDataFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -10,164 +12,44 @@ package dataflow;
  
 message ApmBaseDataFlow {
 
-    int32 table_id = 1;
+    int32 table_id = 1;					//编号28
+    uint32 probe_if = 2;				//探针抓包口
+    uint32 tuple_source = 3;			//四元组-源端口
+    uint32 tuple_dest = 4;				//四元组-目的端口
+    IPAddress tuple_saddr = 5;			//四元组-源ip地址
+    IPAddress tuple_daddr = 6;			//四元组-目的ip地址
+    string src_mac = 7;					//源mac地址
+    string dst_mac = 8;					//目的mac地址
+    uint32 vlan_id = 9;					//链路编号
+    uint32 start_tm_tv_sec = 10;		//开始时间(秒)
+    uint32 start_tm_tv_usec = 11;		//开始时间(微秒)
+    uint32 total_bytes = 12;			//总字节数
+    uint32 total_packets = 13;			//总包数
+    uint32 total_drop_packets = 14;		//总丢包数
+    uint32 retran_time_delay = 15;		//重传延时
+    uint32 client_rtt = 16;				//客户端rtt
+    uint32 server_rtt = 17;				//服务端rtt
+    uint32 user_response_time = 18;		//用户响应时间
+    uint32 server_response_time = 19;	//服务端响应时间
+    uint32 con_fail = 20;				//tcp会话连接失败数
+    uint32 bytes_in = 21;				//服务端总字节数
+    uint32 bytes_out = 22;				//客户端总字节数
+    uint32 time_flag = 23;				//探针推送数据时间
+    uint32 end_tm_tv_sec = 24;			//结束时间(秒)
+    uint32 end_tm_tv_usec = 25;			//结束时间(微秒)
+    uint32 respon_num = 26;				//总响应数
+    uint32 cs_window = 27;				//客户端零窗口数
+    uint32 sc_window = 28;				//服务端零窗口数
+    uint32 cs_reset = 29;				//客户端重置数
+    uint32 sc_reset = 30;				//服务端重置数
+    uint32 cs_retran = 31;				//客户端重传数
+    uint32 sc_retran = 32;				//服务端重传数
+    uint32 conn_setup_tm = 33;			//会话建立时间【三次握手时间】
+    uint32 new_session = 34;			//新建会话数
+    uint32 cs_alert = 35;				//
+    uint32 sc_alert = 36;				//
+    bytes protocol = 37;				//协议类型
 
-    int32 probe_if = 2;
-	//四元组
-	/**
-	 * 请求端口
-	 */
-	int32 request_port = 3;
-	/**
-	 * 响应端口
-	 */
-	int32 response_port = 4;
-	/**
-	 * 请求IP
-	 */
-     int32 request_ip = 5;
-	/**
-	 * 响应ip
-	 */
-     int32 response_ip = 6;
-
-	/**
-	 * 源mac
-	 */
-	int64 src_mac = 7;
-
-	/**
-	 * 目的mac
-	 */
-	int64 dst_mac = 8;
-
-	/**
-	 * 链路编号
-	 */
-     int32 vlan_id = 9;
-	
-     int32 tv_sec = 10;
-
-     int32 tv_usec = 11;
-	
-	/**
-	 * 开始时间
-	 */
-     int32 start_tm = 12;
-
-	/**
-	 * 总字节数
-	 */
-     int32 total_bytes = 13;
-
-	/**
-	 * 总包数
-	 */
-     int32 total_packets = 14;
-	/**
-	 * 总丢包数
-	 */
-     int32 total_drop_packets = 15;
-	/**
-	 * 重传延时
-	 */
-     int32 retran_time_delay = 16;
-	/**
-	 * 客户端rtt
-	 */
-     int32 client_rtt = 17;
-	
-	/**
-	 * 服务端Rtt
-	 */
-     int32 server_rtt = 18;
-	
-	
-	/**
-	 * 用户响应时间
-	 */
-     int32 user_response_time = 19;
-	/**
-	 * 服务响应时间
-	 */
-     int32 server_response_time = 20;
-
-
-	/**
-	 * tcp回话连接失败数
-	 */
-     int32 con_fail = 21;
-
-	/**
-	 * 会话重置数
-	 */
-    //	long reset = 22;
-	
-	/**
-	 * 服务端总字节数
-	 */
-     int32 bytes_in = 23;
-	/**
-	 * 客户端总字节数
-	 */
-     int32 bytes_out = 24;
-	/**
-	 * 探针推送时间
-	 */
-     int32 time_flag = 25;
-	
-	/**
-	 * 结束时间
-	 */
-     int32 end_tm = 26;
-	
-	/**
-	 * 结束时间微秒
-	 */
-     int32 end_tm_usec = 27;
-	
-	/**
-	 * 总响应数
-	 */
-     int32	respon_num = 28;
-	/**
-	 * 客户端零窗口数
-	 */
-     int32	cs_window = 29;
-	/**
-	 * 服务端零窗口数
-	 */
-     int32	sc_window = 30;
-	/**
-	 * 客户端重置数
-	 */
-     int32	cs_reset = 31;
-	/**
-	 * 服务端重置数
-	 */
-     int32	sc_reset = 32;
-	/**
-	 * 客户端重传数
-	 */
-     int32	cs_retran = 33;
-	/**
-	 * 服务端重传数
-	 */
-     int32	sc_retran = 34;
-	/**
-	 * 会话建立时间
-	 */
-     int32	conn_setup_tm = 35;
-	/**
-	 * 新建会话数
-	 */
-     int32	new_session = 36;
-	
-     int32 cs_alert = 37;
-	
-     int32 sc_alert = 38;
-
-	string protocal = 39;
 }
 
 

AppFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -8,28 +10,28 @@ option go_package = "../grpc-gen;grpcgen";
 package dataflow;
 
 message AppFlow { 
-    int32 table_id = 1;
+    int32 table_id = 1;			//编号17
-    int32 src_ip = 2;
+    IPAddress src_ip = 2;		//< source ip
-    int32 src_port = 3;
+    uint32 src_port = 3;		//< source port
-    int32 dst_ip = 4;
+    IPAddress dst_ip = 4;		//< destination  ip
-    int32 dst_port = 5;
+    uint32 dst_port = 5;		//< destination port
-    int32 start_tv_sec = 6;
+    uint32 s_tv_sec = 6;		//< start time
-    int32 start_tv_usec = 7;
+    uint32 s_tv_usec = 7;		//< start time
-    int32 last_tv_sec = 8;
+    uint32 l_tv_sec = 8;		//< last update time
-    int32 last_tv_usec = 9;
+    uint32 l_tv_usec = 9;		//< last update time
-    int32 end_tv_sec = 10;
+    uint32 e_tv_sec = 10;		//< end time
-    int32 end_tv_usec = 11;
+    uint32 e_tv_usec = 11;		//< end time
-    int32 input_packets = 12;
+    uint32 input_packets = 12;	//< input packets (dst->src)
-    int32 output_packets = 13;
+    uint32 output_packets = 13;	//< output packets (src->dst)
-    int32 input_bytes = 14;
+    uint32 input_bytes = 14;	//< input bytes  (dst->src)
-    int32 output_bytes = 15;
+    uint32 output_bytes = 15;	//< output bytes (src->dst)
-    string protocaol = 16;
+    bytes protocol = 16;		//< protocol
-    int32 app_id = 17;
+    uint32 app_id = 17;			//< application idectification
-    int32 app_group_id = 18;
+    uint32 app_group_id = 18;	//< application group idectification
-    int32 probe_if = 19;
+    uint32 probe_if = 19;		//探针编号
-    int32 app_style = 20;
+    uint32 app_style = 20;		//< application style
-    int32 time_flag = 21;
+    uint32 time_flag = 21;		// <time flag
-    int32 vlan_id = 22;
+    int32 vlan_id = 22;			//链路编号
-    int32 mpls_lable = 23;
+    int32 mpls_label = 23;		//
-    int32 tos = 24;
+    int32 tos = 24;				//服务类型
-}
+}

BacktrackingFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -9,24 +11,23 @@ package dataflow;
 
 message BacktrackingFlow {
 
-    int32 table_id = 1;
+    int32 table_id = 1;			//编号20
-    int64 mac_src = 2;          //源MAC  8 
+	int64 mac_src = 2;			//源MAC
-	int64 mac_dst = 3;          //目的MAC 8
+	int64 mac_dst = 3;			//目标MAC
-	int64 ip_src = 4;              //源IP 8
+	IPAddress ip_src = 4;		//源IP
-	int64 ip_dst = 5;              //目的IP 8
+	IPAddress ip_dst = 5;		//目标IP
-	int32 port_src = 6;           //源端口，如果没有，为-1
+	int32 port_src = 6;			//源端口，如果没有，为-1
-	int32 port_dst = 7;           //目标端口，如果没有，为-1
+	int32 port_dst = 7;			//目标端口，如果没有，为-1
-	int32 l3_proto = 8;           //第三层协议ID，如果没有，为-1
+	int32 l3_proto = 8;			//第三层协议ID，如果没有，为-1
-	int32 l4_proto = 9;          //第四层协议ID，如果没有，为-1
+	int32 l4_proto = 9;			//第四层协议ID，如果没有，为-1
-	int32 tos = 10;                 //Tos，如果没有，为-1
+	int32 tos = 10;				//Tos，一个字节，如果没有，为-1
-	int32 vlan_id = 11;            //vlan ID，如果没有，为-1
+	int32 vlan_id = 11;			//vlan ID，如果没有，为-1
-	
+	uint64 bytes = 12;			//字节总数
-	int64 bytes = 12;	//	8	字节总数
+	uint64 packets = 13;		//数据包总数
-	int64 packets = 13;	//	8	数据包总数
+	uint64 tcp_sp = 14;			//TCP同步包数
-	int64 tcp_sp = 14;	//	8	tcp同步包数
+	uint64 tcp_scpn = 15;		//TCP同步确认包数
-	int64 tcp_scpn = 15;//	8	tcp同步确认包数
+	uint64 tcp_srp = 16;		//TCP同步重置包数
-	int64 tcp_srp = 16;	//	8	tcp同步重置包数
+	uint32 app_id = 17;			//< application idectification
-	int32 app_id = 17;	//	4	appID
+	uint32 app_group_id = 18;	//< application group idectification
-	int32 app_group_id = 18;//	4	app组ID
+	int32 mpls_label = 19;		//
-	int32 mpls_label = 19;//	4	
+}
-}

Base.proto

@@ -5,21 +5,27 @@ import "google/protobuf/any.proto";
 
 option java_multiple_files = false; //不要拆分成多个文件
 option java_package = "com.yuandian.dataflow.proto";
-
 option go_package = "../grpc-gen;grpcgen";
  
 package dataflow;
-
+ 
 message Response {
-    int32 code = 1;
+    int32 code = 1; // 返回的状态码
-    string message = 2;
+    string message = 2; // 消息
-    repeated google.protobuf.Any packets = 4;
+    repeated google.protobuf.Any packets = 4; // 批量数据包
 }
 
 message Request {
     int32 type = 1; // 请求类型.  默认 为 1.  暂无意义
     string version = 2; // 请求版本.  区分版本. 非必要时不使用 
-    repeated google.protobuf.Any param = 3;
+    repeated google.protobuf.Any param = 3; // 请求的可变参数. 暂不使用
+}
+
+message IPAddress {
+    oneof IP {
+        bytes v4 = 1;
+        bytes v6 = 2;
+    }
 }
 
 service CollectPacketsServer {

BasicTrafficFlow.proto

@@ -1,27 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = false;
-option java_package = "com.yuandian.dataflow.proto.msgtype";
-option go_package = "../grpc-gen;grpcgen";
-
-
-package dataflow;
-
-message BasicTrafficFlow {
-    int32 table_id = 1;
-    int32 cap_port = 2;
-	int32 request_port = 3;
-	int32 response_port = 4;
-	int32 request_ip = 5;
-	int32 response_ip = 6;
-	int32 start_time = 7;
-	int32 total_bytes = 8;
-	int32 total_packets = 9;
-	int32 spackets64 = 10;
-	int32 spackets128 = 11;
-	int32 spackets256 = 12;
-	int32 spackets512 = 13;
-	int32 spackets1024 = 14;
-	int32 spackets = 15;
-	int32 send_time = 16;
-}

BusinessBodyData.proto

@@ -1,34 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = false;
-option java_package = "com.yuandian.dataflow.proto.msgtype";
-option go_package = "../grpc-gen;grpcgen";
-
-
-package dataflow;
-
-message BusinessBodyData {
-    int32 table_id = 1;
-
-    string relvance_data_id = 2;
-	int64 request_ip = 3;
-	int32 request_port = 4;
-	int64 response_ip = 5;
-	int32 response_port = 6;
-	
-	int64 start_tv_sec = 7;//开始时间秒
-	int64 start_tv_usec = 8;//开始时间毫秒
-	int64 end_tv_sec = 9;//结束时间秒
-	int64 end_tv_usec = 10;//结束时间微妙
-	
-	string resource_code = 11;
-	string no_parameter_recognition = 12;
-	string original_recognition = 13;
-	string request_cookie = 14;
-	
-	string request_body_context = 15;
-	string response_body_context = 16;
-	
-	int32 filter_id = 17;
-	string business_detail_mesg = 18;
-}

BussFlowDb.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -10,68 +12,55 @@ package dataflow;
 
 message BussFlowDb {
 
-    int32    table_id = 1;
+int32    table_id = 1;							//编号24
-  
+uint32 msg_type = 2;							//消息类型
-	// redis资源归并,处理服务资源发现是需要设置识别串(正则表达式)
+bytes msg_version = 3;							//数据库版本
-	 string redisRegex = 2;
+uint32 msg_seq = 4;								//消息的序列号
+uint32 msg_len = 5;								//消息长度
+uint64 src_mac = 6;								//源端口物理地址
+uint64 dst_mac = 7;								//目的端口物理地址
+uint32 vlan_id = 8;								//链路编号
+uint32 tos = 9;									//服务类型
+uint32 retran_count = 10						//重传数据量
+uint32 reset_count = 11;						//重置数据量
+uint32 zerowin_count = 12;						//零窗数据量
+uint32 protocol = 13;							//协议类型
+uint32 response_bytes = 14;						//输入字节数
+uint32 request_bytes = 15;						//输出字节数
+uint32 response_packets = 16;					//输入数据报个数
+uint32 request_packets = 17;					//输出数据报个数
+bytes seq_ack = 18;								//序列号和响应序号
+uint32 recog_status = 19;						//
+uint32 probe_if = 20;							//探针编号
+string channel = 21;							//通道
+string dbname = 22;								//数据库名称
+IPAddress request_ip = 23;						//请求ip地址
+uint32 request_port = 24;						//请求端口
+IPAddress response_ip = 25;						//响应ip地址
+uint32 response_port = 26;						//响应端口
+int64 status = 27;								//状态
+int64 server_translate_time = 28;				//服务端传输时间
+int64 client_translate_time = 29;				//客户端传输时间
+int64 server_response_time = 30;				//服务端传输时间
+uint32 server_response_start_time_tv_sec = 31;	//服务端开始响应的时间(秒)
+uint32 server_response_start_time_tv_usec = 32;	//服务端开始响应的时间(微秒)
+uint32 server_response_end_time_tv_sec = 33;	//服务端结束响应的时间(秒)
+uint32 server_response_end_time_tv_usec = 34;	//服务端结束响应的时间(微秒)
+uint32 start_time_tv_sec = 35;					//会话开始时间(秒)
+uint32 start_time_tv_usec = 36;					//会话开始时间(微秒)
+uint32 end_time_tv_sec = 37;					//会话结束时间(秒)
+uint32 end_time_tv_usec = 38;					//会话结束时间(微秒)
+int32 is_uncomplete = 39;						//数据是否完整标志
+uint32 time_flag = 40;							//时间戳
+uint32 sql_len = 41;							//sql字段的长度值
+uint32 detail_msg_len = 42;						//专属指标值得长度
+uint32 req_len = 43;							//请求的数据 长度
+uint32 res_len = 44;							//响应的数据长度
+uint32 reserved_len = 45;						//保留字段长度
+bytes sql = 46;									//sql语句
+bytes bussiness_detail_mesg = 47;				//专属指标值
+bytes req_data = 48;							//请求详情报文
+bytes res_data = 49;							//响应详情报文
+bytes reserved = 50;							//保留字段值
 
-	 string id = 3; //id
+}
-	 int64 msg_len = 4;                 //消息长度
-	 int32 msg_type = 5;                //消息类型
-	 int64 src_mac = 6;
-	 int64 dst_mac = 7;
-	 int32 protocol = 8;                //协议名
-	 string session_serial_number = 9;//会话序列号			
-	 string  buss_type = 10;//业务服务资源编码（C_01）
-	 int64 request_ip = 11;//Web客户端IP
-	 int32 request_port = 12;//Web客户端端口
-	 int64  response_ip = 13;//Web服务器IP
-	 int32 response_port = 14;//Web服务器端口
-	 int64 start_tv_sec = 15;//Web开始时间秒
-	 int64 start_tv_usec = 16;//开始时间毫秒
-	 int64 end_tv_sec = 17;//结束时间秒
-	 int64 end_tv_usec = 18;//结束时间微妙
-	 string disc_resource_ident = 19;    //web：url   mid:apiBody   db：sql
-	 string name = 20;               //web:操作系统   midd：interfaceName  db:db_name
-	//web midd
-	 string session_id = 21;//sessionid
-	 int32 request_msg_length = 22;  //请求报文长度
-	 string request_msg_detail = 23;   //请求报文详情
-	 int32 response_msg_length = 24; //响应报文长度
-	 string response_msg_detail = 25;  //响应报文详情
-	//web段
-	 string reter_url = 26;           
-	 string x_requested_with = 27;
-	 int64 req_method = 28;         //请求方式
-	 string content_type = 29;     //请求类型
-	 string accept = 30;          //jieshou
-	 int32 req_cookie_leng = 31;//请求cookie报文长度
-	 string req_cookie_detail = 32;//请求cookie报文详情
-	 int64 t_intodb_time = 33;
-	 int32 load_or_step = 34;        //0: 页面   1：加载项   2：非web段数据 
-	 string business_detail_mesg = 35;
-	 string bussiness_key_mesg = 36;  //关键字  格式：key=val|key=val....
-	 int32 isUncomplete = 37;    //组包是否完全    0：组包完整  1：不完整
-	 int32 deal_state = 38; // 默认值为1
-	 int32 server_res_code = 39;
-	 int64 server_response_time = 40;
-	 int64 client_translate_time = 41;
-	 string browser = 42;
-	 int64 server_start_tv_sec = 43;
-	 int64 server_start_tv_usec = 44;
-	 int64 server_end_tv_sec = 45;
-	 int64 server_end_tv_usec = 46;
-	 string probe_ip = 47;
-	 int64 probe_if = 48;
-	 int64 server_translate_time = 49;
-	 int64 time_flag = 50;	
-	 string base_code = 51;
-	 string ori_sql = 52;
-	 string reserved = 53;
-	 int64 bytes_in = 54;
-	 int64 bytes_out = 55;
-	 int32 package_in = 56;
-	 int32 package_out = 57;
-	 string  data_id = 58;
-	 int32 filter_id = 59;
-}

BussFlowExternal.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -8,36 +10,35 @@ option go_package = "../grpc-gen;grpcgen";
 package dataflow;
 
 message BussFlowExternal {
-    int32  table_id = 1;
+    int32  table_id = 1;			//编号25
-    string id = 2;
+    uint32 msg_type = 2;			//消息类型
-	int64  probe_if = 3;//接口号
+    uint32 msg_version = 3;			//数据库版本
-	string channel = 4;//营业厅渠道：前台或者分析服务器给出,渠道标识
+    uint32 msg_seq = 4;				//消息的序列号
-	string system_name = 5;  //外部系统名称
+    uint32 msg_len = 5;				//消息的长度
-	string interface_id = 6;// 业务接口编码
+    uint64 src_mac = 6;				//源端口物理地址
-	string session_id = 7;//sessionid
+    uint64 dst_mac = 7;				//目的端口物理地址
-	string phone_id = 8;//受理手机号码
+    IPAddress request_ip = 8;		//请求ip地址
-	string net_type = 9;
+    uint32 request_port = 9;		//请求端口
-	string  net_segment = 10;//网段标识(客户-web)
+    IPAddress response_ip = 10;		//响应ip地址
-	int64 request_ip = 11;//Web客户端IP
+    uint32 response_port = 11;		//响应端口
-	int64 request_port = 12;//Web客户端端口
+    uint32 probeif = 12;			//探针编号
-	int64  response_ip = 13;//Web服务器IP
+    uint32 protocol = 13;			//协议类型
-	int64 response_port = 14;//Web服务器端口
+    uint32 start_time_tv_sec = 14;	//开始时间（秒）
-	
+    uint32 start_time_tv_usec = 15;	//开始时间（微秒）
-	 int64 start_tv_sec = 15;//Web开始时间秒
+    uint32 end_time_tv_sec = 16;	//结束时间（秒）
-	int64 start_tv_usec = 16;//开始时间微秒
+    uint32 end_time_tv_usec = 17;	//结束时间（微秒）
-	int64 end_tv_sec = 17;//结束时间秒
+    uint32 req_len = 18;			//请求数据长度
-	 int64 end_tv_usec = 18;//结束时间微妙
+    uint32 res_len = 19;			//响应数据报长度
-	
+    uint32 busi_msg_len = 20;		//bussiness resouce data length
-	int32 deal_state = 19;//Web操作成功/失败标识1成功0失败
+    uint32 key_msg_len = 21;		//sub bussiness resouce data length
-	int64 server_translate_time = 20;//Web服务器传输耗时
+    uint32 detail_msg_len = 22;		//parents bussiness data length
-	int64 server_response_time = 21;//Web服务器响应时间
+    uint32 remain_len = 23;			//reserve data length
-	string begin_url = 22;//url
+    bytes busi_code = 24;			//
-	string operating_sytem = 23;//操作系统
+    bytes sessionid = 25;			//
-	int32 server_res_code = 24; //Web系统返回码
+    bytes req_data = 26;			//请求详情报文
-	string browser = 25;//浏览器
+    bytes res_data = 27;			//响应详情报文
-	string business_detail_mesg = 26;//要获取的指标
+    bytes busi_msg = 28;			//
-	int64 insert_time = 27;//插入时间? 没有被使用
+    bytes busi_key_msg = 29;		//区分子业务参数
-	string business_involve_msg = 28; //要关联的指标
+    bytes busi_detail_msg = 30;		//专属指标
-	int32 is_uncomplete = 29;
+    bytes remain_data = 31;			//保留字段
-	int64 time_flag = 30;
 }

BussFlowMidd.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto" ;
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -8,66 +10,56 @@ option go_package = "../grpc-gen;grpcgen";
 package dataflow;
 
 message BussFlowMidd {
-    int32 table_id = 1;
+    int32 table_id = 1;								//编号23
-    string id = 2; //id
+    uint32 msg_type = 2;							//消息类型
-	int64 src_mac = 3;
+    bytes msg_version = 3;							//数据库版本
-	int64 dst_mac = 4;
+    uint32 msg_seq = 4;								//消息的序列号
-	int32 msg_len = 5;                 //消息长度
+    uint32 msg_len = 5;								//消息的长度
-	int32 msg_type = 6;                //消息类型
+    uint64 src_mac = 6;								//源端口物理地址
-	int32 protocol = 7;                //协议名
+    uint64 dst_mac = 7;								//目的端口物理地址
-	string session_serial_number = 8;//会话序列号			
+    uint32 vlan_id = 8;								//链路编号
-	string  buss_type = 9;//业务服务资源编码（C_01）
+    uint32 tos = 9;									//服务类型
-	string  net_segment = 10;//网段标识(客户-web)
+    uint32 retran_count = 10;						//重传数据量
-	int64 request_ip = 11;//Web客户端IP
+    uint32 reset_count = 11;						//重置数据量
-	int32 request_port = 12;//Web客户端端口
+    uint32 zerowin_count = 12;						//零窗数据量
-	int64  response_ip = 13;//Web服务器IP
+    uint32 protocol = 13;							//协议类型
-	int32 response_port = 14;//Web服务器端口
+    uint32 response_bytes = 14;						//输入字节数
-	int64 start_tv_sec = 15;//Web开始时间秒
+    uint32 request_bytes = 15;						//输出字节数
-	int64 start_tv_usec = 16;//开始时间毫秒
+    uint32 response_packets = 16;					//输入数据报个数
-	int64 end_tv_sec = 17;//结束时间秒
+    uint32 request_packets = 17;					//输出数据报个数
-	int64 end_tv_usec = 18;//结束时间微妙
+    bytes seq_ack = 18;								//序列号和响应序号
-	string disc_resource_ident = 19;    //web：url   mid:apiBody   db：sql
+    uint32 recog_status = 19;						//
-	string name = 20;               //web:操作系统   midd：interfaceName  db:db_name 
+    uint32 probe_if = 20;							//探针编号
-	//web midd
+    bytes channel = 21;								//通道
-	string session_id = 21;//sessionid
+    IPAddress request_ip = 22;						//请求ip地址
-	int32 request_msg_length = 22;  //请求报文长度
+    uint32 request_port = 23;						//请求端口
-	string request_msg_detail = 23;   //请求报文详情
+    IPAddress response_ip = 24;						//响应ip地址
-	int32 response_msg_length = 24; //响应报文长度
+    uint32 response_port = 25;						//响应端口
-	string response_msg_detail = 25;  //响应报文详情
+    uint32 start_time_tv_sec = 26;					//开始时间（秒）
-	//web段
+    uint32 start_time_tv_usec = 27;					//开始时间（微秒）
-	string reter_url = 26;           
+    uint32 end_time_tv_sec = 28;					//结束时间（秒）
-	string x_requested_with = 27;
+    uint32 end_time_tv_usec = 29;					//结束时间（微秒）
-	int64 req_method = 28;         //请求方式
+    uint32 deal_state = 30;							//
-	string content_type = 29;     //请求类型
+    uint32 server_res_code = 31;					//服务器返回状态
-	string accept = 30;           //jieshou
+    int64 server_translate_time = 32;				//服务器传输时间
-	int32 req_cookie_leng = 31;//请求cookie报文长度
+    uint32 server_response_start_time_tv_sec = 33;	//服务器响应开始时间（秒）
-	string req_cookie_detail = 32;//请求cookie报文详情
+    uint32 server_response_start_time_tv_usec = 34;	//服务器响应开始时间（微秒）
-	int64 t_intodb_time = 33;
+    uint32 server_response_end_time_tv_sec = 35;	//服务器响应结束时间（秒）
-	int32 load_or_step = 34;        //0: 页面   1：加载项   2：非web段数据 
+    uint32 server_response_end_time_tv_usec = 36;	//服务器响应结束时间（微秒）
-	string business_detail_mesg = 35;
+    int64 server_response_time = 37;				//服务器响应时长
-	string bussiness_key_mesg = 36;  //关键字  格式：key=val|key=val....
+    int64 client_translate_time = 38;				//客户端响应时长
-	int32 is_uncomplete = 37;    //组包是否完全    0：组包完整  1：不完整
+    int32 is_uncomplete = 39;						//数据完整标志
-	int32 deal_state = 38; // 默认值1
+    uint32 time_flag = 40;							//时间戳
-	int32 server_res_code = 39;
+    uint32 detail_msg_len = 41;						//专属指标值长度
-	int64 server_response_time = 40;
+    uint32 key_msg_len = 42;						//区分子业务参数值长度
-	int64 client_translate_time = 41;
+    uint32 api_len = 43;							//接口名称长度
-	string browser = 42;
+    uint32 req_len = 44;							//请求数据报文长度
-	int32 server_start_tv_sec = 43;
+    uint32 res_len = 45;							//响应数据报文长度
-	int64 server_start_tv_usec = 44;
+    uint32 remain_len = 46;							//保留字段长度
-	int32 server_end_tv_sec = 45;
+    bytes bussiness_detail_mesg = 47;				//专属指标
-	int64 server_end_tv_usec = 46;
+    bytes bussiness_key_mesg = 48;					//区分子业务参数
-	string probe_ip = 47;
+    bytes api = 49;									//接口名称
-	int32 probe_if = 48;
+    bytes req_data = 50;							//请求详情报文
-	int64 server_translate_time = 49;
+    bytes res_data = 51;							//响应详情报文
-	int64 time_flag = 50;	
+    bytes remain_data = 52;							//保留字段
-	string channel = 51;
+}
-	string base_code = 52;
-	string ori_api = 53;
-	string remain_data = 54;
-	int64 bytes_in = 55;
-	int64 bytes_out = 56;
-	int32 package_in = 57;
-	int32 package_out = 58;
-	string  data_id = 59;
-	int32 filter_id = 60;
-}

BussFlowOrl.proto

@@ -1,42 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = false;
-option java_package = "com.yuandian.dataflow.proto.msgtype";
-option go_package = "../grpc-gen;grpcgen";
-
-
-package dataflow;
-
-message BussFlowOrl {
-    int32 table_id = 1;
-    int32 msg_type = 2;
-    int32 msg_version = 3;
-    int32 msg_seq = 4;
-    int32 msg_len = 5;
-    int64 request_mac = 6;
-    int64 response_mac = 7;
-    int64 request_ip = 8;
-    int32 request_port = 9;
-    int64 response_ip = 10;
-    int32 response_port = 11;
-    int32 probe_if = 12;
-    int32 protocol = 13;
-    int64 start_tv_sec = 14;//Web开始时间秒
-    int64 start_tv_usec = 15;//开始时间毫秒
-    int64 end_tv_sec = 16;//结束时间秒
-    int64 end_tv_usec = 17;//结束时间微妙
-    int32 req_len = 18;
-    int32 res_len = 19;
-    int32 busi_msg_len = 20;
-    int32 key_msg_len = 21;
-    int32 detail_msg_len = 22;
-    int32 remain_len = 23;
-    string business_code = 24;
-    string session_id = 25;
-    string req_data = 26;
-    string res_data = 27;
-    string busi_msg = 28;
-    string busi_key_msg = 29;
-    string busi_detail_msg = 30;
-    string remain_data = 31;
-}

BussFlowWeb.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto";
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -8,75 +10,69 @@ option go_package = "../grpc-gen;grpcgen";
 package dataflow;
 
 message BussFlowWeb {
-    int32 table_id = 1;
+    int32 table_id = 1;								//编号22
-    string id = 2; //id
+    uint32 msg_type = 2;							//消息类型
-	int32 msg_len = 3;                 //消息长度
+    bytes msg_version = 3;							//数据库版本
-	int32 msg_type = 4;                //消息类型
+    uint32 msg_seq = 4;								//消息的序列号
-	int64 src_mac = 5;
+    uint32 msg_len = 5;								//消息长度
-	int64 dst_mac = 6; 
+    uint64 src_mac = 6;								//源端口物理地址
-	int32 protocol = 7;                //协议名
+    uint64 dst_mac = 7;								//目的端口物理地址
-	string session_serial_number = 8;//会话序列号			
+    uint32 vlan_id = 8;								//链路编号
-	string  buss_type = 9;//业务服务资源编码（C_01）
+    uint32 tos = 9;									//服务类型	
-//	string  net_segment = 10;//网段标识(客户-web)
+    uint32 retran_count = 10;						//重传数据量
-	int64 request_ip = 11;//Web客户端IP
+    uint32 reset_count = 11;						//重置数据量
-	int32 request_port = 12;//Web客户端端口
+    uint32 zerowin_count = 12;						//零窗数据量
-	int64  response_ip = 13;//Web服务器IP
+    uint32 protocol = 13;							//协议类型
-	int32 response_port = 14;//Web服务器端口
+    uint32 response_bytes = 14;						//输入字节数
-	int64 start_tv_sec = 15;//Web开始时间秒
+    uint32 request_bytes = 15;						//输出字节数
-	int64 start_tv_usec = 16;//开始时间毫秒
+    uint32 response_packets = 16;					//输入数据报个数
-	int64 end_tv_sec = 17;//结束时间秒
+    uint32 request_packets = 17;					//输出数据报个数
-	int64 end_tv_usec = 18;//结束时间微妙
+    bytes seq_ack = 18;								//序列号和响应序号
-	string disc_resource_ident = 19;    //web：url   mid:apiBody   db：sql
+    uint32 recog_status = 19;						//
-	string operating_system = 20;       //web:操作系统   midd：interfaceName  db:db_name 
+    uint32 req_method = 20;							//请求方法
-	//web midd
+    bytes content_type = 21;						//请求数据类型
-	string session_id = 21;//sessionid
+    bytes accept = 22;								//接受
-	int32 request_msg_length = 22;  //请求报文长度
+    uint32 probe_if = 23;							//探针编号
-	string request_msg_detail = 23;   //请求报文详情
+    bytes channel = 24;								//通道
-	int32 response_msg_length = 24; //响应报文长度
+    bytes sessionid = 25;							//会话id
-	string response_msg_detail = 25;  //响应报文详情
+    IPAddress request_ip = 26;						//请求ip地址
-	//web段
+    uint32 request_port = 27;						//请求端口
-	string reter_url = 26;           
+    IPAddress response_ip = 28;						//响应ip地址
-	string x_requested_with = 27;
+    uint32 response_port = 29;						//响应端口
-	int64 req_method = 28;         //请求方式
+    uint32 start_time_tv_sec = 30;					//开始时间（秒）
-	string content_type = 29;     //请求类型
+    uint32 start_time_tv_usec = 31;					//开始时间（微秒）
-	string accept = 30;           //jieshou
+    uint32 end_time_tv_sec = 32;					//结束时间（秒）
-	int32 req_cookie_leng = 31;//请求cookie报文长度
+    uint32 end_time_tv_usec = 33;					//结束时间（微秒）
-	string req_cookie_detail = 32;//请求cookie报文详情
+    int64 server_translate_time = 34;				//服务器传输时间
-	int64 t_intodb_time = 33;
+    uint32 server_response_start_time_tv_sec = 35;	//服务器响应开始时间（秒）
-	int32 load_or_step = 34;        //0: 页面   1：加载项   2：非web段数据 
+    uint32 server_response_start_time_tv_usec = 36;	//服务器响应开始时间（微秒）
-	string business_detail_mesg = 35;
+    uint32 server_response_end_time_tv_sec = 37;	//服务器响应结束时间（秒）
-	string bussiness_key_mesg = 36;  //关键字  格式：key=val|key=val....
+    uint32 server_response_end_time_tv_usec = 38;	//服务器响应结束时间（微秒）
-	int32 is_uncomplete = 37;    //组包是否完全    0：组包完整  1：不完整
+    int64 server_response_time = 39;				//服务器响应时长
-	int32 deal_state = 38; // 默认为1
+    int64 client_translate_time = 40;				//客户端响应时长
-	int32 server_res_code = 39;
+    int64 locate_server_translate_time = 41;		//本地服务传输时长
-	int64 server_response_time = 40;
+    int64 locate_server_response_time = 42;			//本地服务响应时长
-	int64 client_translate_time = 41;
+    int64 locate_client_translate_time = 43;		//本地客户传输时长
-	string browser = 42;
+    bytes x_requested_with = 44;					//
-	int32 server_start_tv_sec = 43;
+    bytes operating_sytem = 45;						//操作系统
-	int64 server_start_tv_usec = 44;
+    uint32 server_res_code = 46;					//服务器返回状态
-	int32 server_end_tv_sec = 45;
+    bytes browser = 47;								//浏览器名称
-	int64 server_end_tv_usec = 46;
+    int32 is_uncomplete = 48;						//数据完整性
-	string probe_ip = 47;
+    uint32 time_flag = 49;							//时间戳
-	int32 probe_if = 48;
+    uint32 detail_msg_len = 50;						//专属指标值长度
-	int64 server_translate_time = 49;
+    uint32 key_msg_len = 51;						//区分子业务参数值长度
-	int64 time_flag = 50;	
+    uint32 req_len = 52;							//请求数据长度
-	string channel = 51;
+    uint32 res_len = 53;							//响应数据报长度
-	string base_code = 52;
+    uint32 cookie_len = 54;							//cookie长度
-	string ori_url = 53;
+    uint32 begin_url_len = 55;						//主URL长度
-	string remain_data = 54;
+    uint32 refer_url_len = 56;						//引用URL长度
-	int64 bytes_in = 55;
+    uint32 remain_len = 57;							//保留字段值长度
-	int64 bytes_out = 56;
+    bytes bussiness_detail_mesg = 58;				//专属指标
-	int32 package_in = 57;
+    bytes bussiness_key_mesg = 59;					//区分子业务参数
-	int32 package_out = 58;
+    bytes req_data = 60;							//请求详情报文
-
+    bytes res_data = 61;							//响应详情报文
-	string  data_id = 59;
+    bytes cookie_data = 62;							//cookie详情报文
-	
+    bytes begin_url = 63;							//主url详情
-	int32 filter_id = 60;
+    bytes refer_url = 64;							//引用url详情
-
+    bytes remain_data = 65;							//保留字段
-	string white_character = 61;
+}
-
-	// tokenId
-	string token_id = 62;
-	// 判断是否是首端资源( 2 )
-	int32 segment_id = 63;
-}

DataFlow.proto

@@ -1,62 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = false;
-option java_package = "com.yuandian.dataflow.proto.msgtype";
-option go_package = "../grpc-gen;grpcgen";
-
-
-package dataflow;
-
-
-message DataFlow {
-    int32 table_id = 1;
-
-    string id = 2;
-	
-	int32 msg_type = 3;                //消息类型
-	int32 msg_version = 4;             //消息版本
-	int32 msg_seq = 5;                 //序列号
-	int32 msg_len = 6;                 //消息长度
-	int32 probe_if = 7;                //接口号
-	int64 timestamp = 8;    //时间戳
-	int64 mac_src = 9;      //源物理地址
-	int64 mac_dst = 10;      //目的物理地址
-	int32 vlan_id = 11;                 //vlan_id
-	int64 l3_proto = 12;     //l3层协议
-	int64 l4_proto = 13;     //l4层协议
-	int32 tos = 14;                     //tos
-	int32 retran_count = 15;            //重传次数
-	int32 reset_count = 16;             //重置次数
-	int32 zerowin_count = 17;           //零窗口次数
-	int32 protocol = 18;                //协议名
-	int64 seq = 19;
-	int64 ack = 20;
-	int32 recog_status = 21;            //识别类型标识
-	int64 bytes = 22;        //总字节
-	int64 packets = 23;      //总包数
-	 int32 start_tv_sec = 24;//Web开始时间秒
-	int64 start_tv_usec = 25;//开始时间毫秒
-	int32 end_tv_sec = 26;//结束时间秒
-	 int64 end_tv_usec = 27;//结束时间微妙
-	 int32 server_start_tv_sec = 28;//服务器响应开始时间秒
-	int64 server_start_tv_usec = 29;//服务器响应开始时间毫秒
-	int32 server_end_tv_sec = 30;//服务器响应结束时间秒
-	 int64 server_end_tv_usec = 31;//服务器响应结束时间微妙
-	
-	int64 server_response_time = 32;//Web服务器响应时间
-	int64 client_translate_time = 33;//Web客户端传输耗时
-	int64 server_translate_time = 34;//Web服务器传输耗时
-
-	int64 bytes_in = 35;
-	int64 bytes_out = 36;
-	int64 packets_in = 37;
-	int64 packets_out = 38;
-	int64 ip_src = 39;       //源IP
-	int64 ip_dst = 40;       //目的IP
-	int64 port_src = 41;     //源端口
-	int64 port_dst = 42;     //目的端口
-	int64 probeIP = 43;              //探针IP
-	
-	int64 intodb_time = 44;
-	int64 count = 45; // 默认为1
-}

Processor.proto

@@ -0,0 +1,24 @@
+syntax = "proto3";
+
+import "google/protobuf/any.proto";
+ 
+option java_multiple_files = false; //不要拆分成多个文件
+option java_package = "com.yuandian.dataflow.proto";
+option go_package = "../grpc-gen;grpcgen";
+ 
+package dataflow;
+ 
+message ProcessorResponse {
+    int32 code = 1; // 返回的状态码
+    string message = 2; // 消息
+}
+
+message PacketsProcessorRequest {
+    int32 type = 1; // 请求类型.  默认 为 1.  暂无意义
+    string version = 2; // 请求版本.  区分版本. 非必要时不使用 
+    repeated google.protobuf.Any packets = 3; // 请求的可变参数. 暂不使用
+}
+ 
+service ProcessorServer {
+    rpc AllPackets (PacketsProcessorRequest) returns (ProcessorResponse);
+}

QoeFlow.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+import "Base.proto";
+
 option java_multiple_files = false;
 option java_package = "com.yuandian.dataflow.proto.msgtype";
 option go_package = "../grpc-gen;grpcgen";
@@ -8,44 +10,44 @@ option go_package = "../grpc-gen;grpcgen";
 package dataflow;
 
 message QoeFlow {
-   int32 table_id = 1;
+   int32 table_id = 1;						//编号18
-    //		字段类型		字段							原始类型	    字节数 	说明 
+   IPAddress src_ip = 2;					//< source ip
-   int32 src_ip = 2;	 					 //uint32_t 	4	源ip地址
+   IPAddress dst_ip  = 3;					//< destination  ip
-   int32 dst_ip = 3;	 					 //uint32_t 	4	目的ip地址
+   uint32 s_tv_sec = 4;						//< start time
-   int32 stv_sec = 4; 	 				 //uint32_t 	4	开始时间秒
+   uint32 s_tv_usec = 5;					//< start time
-   int32 stv_usec = 5; 	 				 //uint32_t 	4	开始时间微秒
+   uint32 l_tv_sec = 6;						//< last update time
-   int32 ltv_sec = 6;	 				 //uint32_t 	4	最后更新时间秒
+   uint32 l_tv_usec = 7;					//< last update time
-   int32 ltv_usec = 7;	 				 //uint32_t 	4	最后更新时间微秒
+   uint32 dst2_respon_num = 8;				//< response number      (dst->src)
-   int32 dst2_respon_num = 8;	 		 	 //uint32_t 	4	响应总量
+   uint32 dst2_fast = 9;					//< fast response        (dst->src)
-   int32 dst2_fast = 9;	 				 //uint32_t 	4	
+   uint32 dst2_fast_expected = 10;			//< fast expected        (dst->src)
-   int32 dst2_fast_expected = 10;	 		 //uint32_t 	4	
+   uint32 dst2_expected_degrated = 11;		//< expected degrated    (dst->src)
-   int32 dst2_expected_degrated = 11;	 	 //uint32_t 	4	
+   uint32 dst2_degrated_service = 12;		//< degrated service     (dst->src)
-   int32 dst2_degrated_service = 12;	 	 //uint32_t 	4	
+   uint32 dst2_service_availability = 13;	//< service availability (dst->src)
-   int32 dst2_service_availability = 13;	 //uint32_t 	4	
+   uint32 dst2_respon_timeout = 14;			//< response timeout     (dst->src)
-   int32 dst2_respon_timeout = 14;	 	 	 //uint32_t 	4	响应超时数
+   uint32 dst2_respon_success = 15;			//< response success     (dst->src)
-   int32 dst2_respon_success = 15;	 	 	 //uint32_t 	4	响应成功数
+   uint32 dst2_respon_fail = 16;			//< response fail        (dst->src)
-   int32 dst2_respon_fail = 16;	 		 //uint32_t 	4	响应失败数
+   uint32 dst2_respin_peek = 17;			//< response peek time   (dst->src) ms
-   int32 dst2_respon_peek = 17;	 		 //uint32_t 	4	峰值响应时间
+   uint32 dst2_respon_average = 18;			//< response average time(dst->src) ms
-   int32 dst2_respon_average = 18;	 	 	 //uint32_t 	4	响应时间均值
+   uint32 cs_window = 19;					//< cs window event
-   int32 cs_window = 19;	 				 //uint32_t 	4	
+   uint32 sc_window = 20;					//< sc window event;
-   int32 sc_window = 20;	 				 //uint32_t 	4	
+   uint32 cs_reset = 21;					//< cs reset
-   int32 cs_reset = 21;	 				 //uint32_t 	4	
+   uint32 sc_reset = 22;					//< sc reset
-   int32 sc_reset = 22;	 				 //uint32_t 	4	
+   uint32 cs_retran = 23;					//< cs retran
-   int32 cs_retran = 23;	 				 //uint32_t 	4	
+   uint32 sc_retran = 24;					//< sc retran
-   int32 sc_retran = 24;	 				 //uint32_t 	4	
+   uint32 app_id = 25;						//< application idectification
-   int32 app_id = 25;	 					 //uint32_t 	4	Aphid
+   uint32 app_group_id = 26;				//< application group idectification
-   int32 app_group_id = 26;	 			 //uint32_t 	4	app组id
+   uint32 probe_if = 27;					//探针编号
-   int32 probe_if = 27;					 //uint32_t 	4	探针接口id
+   uint32 app_style = 28;					//< application style
-   int32 app_style = 28;					 //uint32_t 	4	
+   uint32 time_flag = 29;					// <time flag
-   int32 time_flag = 29;					 //uint32_t 	4	发送时间戳
+   uint32 conn_setup_tm = 30;				//连接建立时间
-   int32 conn_setup_tm = 30;				 //uint32_t 	4	链接建立时间
+   uint32 data_transfer_tm = 31;			//数据传输时间
-   int32 data_transfer_tm = 31;			 //uint32_t 	4	数据传输时间
+   uint32 retrans_delay_tm = 32;			//数据重传时延
-   int32 retrans_delay_tm = 32;			 //uint32_t 	4	数据重传时延
+   uint32 network_inbound = 33;				//网络响应时间(客户端->服务器)
-   int32 network_inbound = 33;			 	 //uint32_t 	4	网络响应时间（c->s）
+   uint32 network_outbound = 34;			//网络响应时间(服务器->客户端)
-   int32 network_outbound = 34;			 //uint32_t 	4	网络响应时间（s->c）
+   uint32 new_session = 35;					//新会话数
-   int32 new_session = 35;				 	 //uint32_t 	4	新会话数
+   uint32 user_events = 36;					//用户事件
-   int32 user_events = 36;				 	 //uint32_t 	4	用户事件
+   uint32 server_events = 37;				//服务事件
-   int32 server_events = 37;				 //uint32_t 	4	服务事件
+   uint32 conn_setup_peek = 38;				//连接建立时间峰值
-   int32 conn_setup_peek = 38;			 	 //uint32_t 	4	连接建立时间峰值
+   int32 vlan_id = 39;						//链路编号
-   int32 vlan_id = 39;					 	 //uint32_t 	4
+
 }

SstFlow.proto

@@ -1,51 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = false;
-option java_package = "com.yuandian.dataflow.proto.msgtype";
-option go_package = "../grpc-gen;grpcgen";
-
-
-package dataflow;
-
-message SstFlow {
-    int32 table_id = 1;
-
-    int64 mac_src = 2;  //源MAC
-	int64 mac_dst = 3;  //目标MAC
-	int64 ip_src = 4;   //源IP
-	int64 ip_dst = 5;   //目标IP
-	int32 port_src = 6; //源端口，如果没有，为-1
-	int32 port_dst = 7; //目标端口，如果没有，为-1
-	int32 l3_proto = 8; //第三层协议ID，如果没有，为-1
-	int32 l4_proto = 9; //第四层协议ID，如果没有，为-1
-	int32 tos = 10;      //Tos，一个字节，如果没有，为-1
-	int32 vlan_id = 11;  //vlan ID，如果没有，为-1 
-	
-	int64 bytes = 12;    //字节总数
-	int64 packets = 13;  //数据包总数
-	 
-	int64 packets_syn = 14;  //TCP同步包数
-	int64 packets_syn_ack = 15; //TCP同步确认包数
-	int64 packets_syn_rst = 16; //TCP同步重置包数
-
-	int64 timestamp = 17; //时间戳,秒
-
-	int64 appid = 18;//应用ID
-	int64 app_group_id = 19;
-	int32 mpls_label = 20;
-	
-	int64 pkts_syn_rx = 21; //tcp同步包，接收
-	int64 pkts_syn_ack_rx = 22;//tcp同步确认包，接收
-	int64 pkts_syn_rst_rx = 23; //tcp同步重置包，接收
-	int64 pkts_fin = 24;//tcp终止包，接收
-	int64 pkts_rst = 25;//tcp重置包，接收
-
-	int64 bytes_rx = 26;//字节收
-	int64 packets_rx = 27;//数据包收
-	
-	int64 probe_time_sec = 28;
-	int64 probe_time = 29;
-	int64 create_time = 30;
-	
-	int32 probe_if = 31;
-}

UsrFlow.proto

@@ -0,0 +1,45 @@
+syntax = "proto3";
+
+import "Base.proto";
+
+option java_multiple_files = false;
+option java_package = "com.yuandian.dataflow.proto.msgtype";
+option go_package = "../grpc-gen;grpcgen";
+
+
+package dataflow;
+
+message UsrFlow {
+
+    int32 table_id = 1;					//编号19
+    uint32 probe_if = 2;				//探针抓包口
+    IPAddress server_ip = 3;			//服务端ip地址
+    IPAddress client_ip = 4;			//客户端ip地址
+    uint32 client_port = 5;				//客户端端口
+    uint32 client_rtt = 6;				//客户端rtt
+    uint32 server_rtt = 7;				//服务端rtt
+    uint32 s_tv_sec = 8;				//< start time
+    uint32 s_tv_usec = 9;				//< start time
+    uint32 e_tv_sec = 10;				//< end time
+    uint32 e_tv_usec = 11;				//< end time
+    uint32 server_think = 12;			//
+    uint32 page_size = 13;				//
+    uint32 app_id = 14;					//< application idectification
+    uint32 app_group_id = 15;			//< application group idectification
+    bytes request_url = 16;				//
+    bytes referer_url = 17;				//
+    uint32 return_code = 18;			//
+    uint32 err_tv_sec = 19;				//
+    uint32 err_tv_usec = 20;			//
+    uint32 client_loss_pkt = 21;		//
+    uint32 server_loss_pkt = 22;		//
+    uint32 client_bytes = 23;			//
+    uint32 server_bytes = 24;			//
+    uint32 client_packets = 25;			//
+    uint32 server_packets = 26;			//
+    bytes user_agent = 27;				//
+    bytes content_type = 28;			//
+    uint32 request_transfer_tm = 29;	//
+    uint32 time_flag = 30;				// <time flag
+
+}