5.12

79 files changed, 1099 insertions, 1960 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5c33c30..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.idea
-/target
-/dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4c797da..dd05c8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,6 @@
         </dependency>
 
 
-
         <!-- https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper -->
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
diff --git a/src/main/java/cn/ac/iie/storm/bean/SessionRecordLog.java b/src/main/java/cn/ac/iie/storm/bean/SessionRecordLog.java
index e259f12..5edc90d 100644
--- a/src/main/java/cn/ac/iie/storm/bean/SessionRecordLog.java
+++ b/src/main/java/cn/ac/iie/storm/bean/SessionRecordLog.java
@@ -4,6 +4,7 @@ package cn.ac.iie.storm.bean;
  * @author wangchengcheng
  */
 public class SessionRecordLog  {
+
     private String http_request_header;
     private String gjc;
     private String common_user_region;
@@ -23,7 +24,7 @@ public class SessionRecordLog  {
     private String common_isp;
     private int common_address_type;
     private String common_app_label;
-    private String common_app_id;
+    private int common_app_id;
     private int common_c2s_pkt_num;
     private long common_c2s_byte_num;
     private int common_s2c_pkt_num;
@@ -52,12 +53,15 @@ public class SessionRecordLog  {
     private String mail_snapshot;
     private String mail_bcc;
 
+    private String http_domain;
+
     private String http_response_body;
+    private String http_response_content;
     private int enable;
     private String pzid;
     private long timestamp;
-
-
+    private String http_response_body_key;
+    private String mail_eml_file;
     private int flid;
     private int xzid;
     private int lhid;
@@ -282,11 +286,11 @@ public class SessionRecordLog  {
         this.common_app_label = common_app_label;
     }
 
-    public String getCommon_app_id() {
+    public int getCommon_app_id() {
         return common_app_id;
     }
 
-    public void setCommon_app_id(String common_app_id) {
+    public void setCommon_app_id(int common_app_id) {
         this.common_app_id = common_app_id;
     }
 
@@ -533,9 +537,40 @@ public class SessionRecordLog  {
     public void setZsmc(String zsmc) {
         this.zsmc = zsmc;
     }
-
     public void setGjc(String gjc) {
         this.gjc = gjc;
     }
 
-}
+
+    public String getHttp_response_body_key() {
+        return http_response_body_key;
+    }
+
+    public void setHttp_response_body_key(String http_response_body_key) {
+        this.http_response_body_key = http_response_body_key;
+    }
+
+    public String getMail_eml_file() {
+        return mail_eml_file;
+    }
+
+    public void setMail_eml_file(String mail_eml_file) {
+        this.mail_eml_file = mail_eml_file;
+    }
+
+    public String getHttp_response_content() {
+        return http_response_content;
+    }
+
+    public void setHttp_response_content(String http_response_content) {
+        this.http_response_content = http_response_content;
+    }
+
+    public String getHttp_domain() {
+        return http_domain;
+    }
+
+    public void setHttp_domain(String http_domain) {
+        this.http_domain = http_domain;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnHTTPSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnHTTPSendBolt.java
index 50a9bc1..a490909 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnHTTPSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnHTTPSendBolt.java
@@ -30,14 +30,16 @@ public class ConnHTTPSendBolt  extends BaseBasicBolt {
 
         } else {
             if (tuple.getSourceStreamId().equals(StreamAggregateConfig.CONN_HTTP_STREAMID)) {
+
                 byte[] httpSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_HTTP_STREAMID);
                 Integer httpcount = tuple.getIntegerByField("httpcount");
-                Map<String, String> connHttpPost = HttpClientService.getConnHttpPost(getPostUrl(), httpSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_HTTP_TOPIC);
+                String postUrl = getPostUrl();
+                Map<String, String> connHttpPost = HttpClientService.getConnHttpPost(postUrl, httpSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_HTTP_TOPIC);
                 if (connHttpPost.containsValue("200")){
-                    logger.info("-------条数为:"+httpcount+"connhttp数据发送成功-----"+connHttpPost);
+                    logger.info("-------条数为:"+httpcount+"connhttp数据发送到"+postUrl+"成功-----"+connHttpPost);
                     conn_http_success = conn_http_success + httpcount;
                 }else {
-                    logger.error("-------条数为:"+httpcount+"connhttp数据发送失败-----"+connHttpPost);
+                    logger.error("-------条数为:"+httpcount+"connhttp数据发送到"+postUrl+"失败-----"+connHttpPost);
                     conn_http_fail = conn_http_fail + httpcount;
                 }
             }
@@ -52,7 +54,7 @@ public class ConnHTTPSendBolt  extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.CONN_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnIPSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnIPSendBolt.java
index f2fa621..e3afefb 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnIPSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnIPSendBolt.java
@@ -34,7 +34,7 @@ public class ConnIPSendBolt extends BaseBasicBolt {
             if (tuple.getSourceStreamId().equals(StreamAggregateConfig.CONN_IP_STREAMID)) {
                 byte[] ipSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_IP_STREAMID);
                 Integer ipcount = tuple.getIntegerByField("ipcount");
-                Map<String, String> connIpPost = HttpClientService.getConnHttpPost(getPostUrl(), ipSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_IP_TOPIC);
+                Map<String, String> connIpPost = HttpClientService.getConnHttpPost(getPostUrl(), ipSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_IP_TOPIC);
                 if (connIpPost.containsValue("200")){
                     logger.info("-------条数为"+ipcount+"connip数据发送成功-----"+connIpPost);
                     conn_ip_success = conn_ip_success + ipcount;
@@ -55,7 +55,7 @@ public class ConnIPSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.CONN_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnParseBolt.java b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnParseBolt.java
index 512535d..ad4c162 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnParseBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnParseBolt.java
@@ -26,6 +26,11 @@ import java.util.Map;
 import static cn.ac.iie.storm.utils.general.CONNAssignment.*;
 
 import static cn.ac.iie.storm.utils.general.TransFormUtils.*;
+import static cn.ac.iie.storm.utils.hos.HosService.httpPostObject;
+import static cn.ac.iie.storm.utils.hos.Send2S3.SendObject2S3;
+import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getS3Url;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getYL5;
 
 public class ConnParseBolt extends BaseBasicBolt {
     private final static Logger logger = Logger.getLogger(ConnParseBolt.class);
@@ -48,15 +53,6 @@ public class ConnParseBolt extends BaseBasicBolt {
     private long connOutputSize = 0L;
     private long connInputSize = 0L;
 
-    private long conn_http=0L;
-    private long conn_ip=0L;
-    private long conn_ssl=0L;
-    private long conn_jstx=0L;
-    private long conn_mail=0L;
-    private long conn_ftp=0L;
-    private long conn_dns=0L;
-    private long conn_vpn=0L;
-
     private Schema vpnSchema;
     private Schema ipSchema;
     private Schema httpSchema;
@@ -66,6 +62,10 @@ public class ConnParseBolt extends BaseBasicBolt {
     private Schema mailSchema;
     private Schema jstxSchema;
 
+    String bucketName = null;
+    String filename = null;
+    String s3Url = null;
+
 
     public void prepare(Map stormConf, TopologyContext context) {
         ipSchema = new Schema.Parser().parse(StreamAggregateConfig.IP_RZZB_SCHEMA);
@@ -88,7 +88,6 @@ public class ConnParseBolt extends BaseBasicBolt {
     @Override
     public void execute(Tuple tuple, BasicOutputCollector basicOutputCollector) {
             if(TupleUtils.isTick(tuple)){
-
                try {
                     if (!VPNList.isEmpty()){
                         basicOutputCollector.emit(StreamAggregateConfig.CONN_VPN_STREAMID, new Values((Object) generate(vpnSchema, VPNList),VPNList.size()));
@@ -119,149 +118,169 @@ public class ConnParseBolt extends BaseBasicBolt {
                 count = 0;
                 loadFail = 0;
                 connOutputSize = 0;
-
             }else {
                 try {
                     String line = tuple.getString(0);
                     sessionRecordLog = JSONObject.parseObject(line, SessionRecordLog.class);
-                    connInputSize =connInputSize + sessionRecordLog.getCommon_s2c_byte_num();
+                    connInputSize = connInputSize + sessionRecordLog.getCommon_s2c_byte_num();
                     connOutputSize = connOutputSize + sessionRecordLog.getCommon_c2s_byte_num();
                     count = count + 1;
                     //按common_schema_type的值对数据进行分类发
-                switch ( sessionRecordLog.getCommon_schema_type()) {
-                    case "BASE":
-                        if (sessionRecordLog.getCommon_l7_protocol().equals("PPTP") || sessionRecordLog.getCommon_l7_protocol().equals("L2TP") || sessionRecordLog.getCommon_l7_protocol().equals("OPENVPN") || sessionRecordLog.getCommon_l7_protocol().equals("IPSEC")) {
-                            sessionRecordLog.setCommon_schema_type("VPN");
+                    if (sessionRecordLog.getCommon_app_id() >= 100100) {
+                            sessionRecordLog.setCommon_schema_type("JSTX");
                             try {
-                                    GenericRecord vpn_rzzb = new GenericData.Record(vpnSchema);
-                                    setVPN_RZZB(vpn_rzzb, sessionRecordLog);
-                                    VPNList.add(vpn_rzzb);
-                                if (VPNList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                    basicOutputCollector.emit(StreamAggregateConfig.CONN_VPN_STREAMID, new Values((Object) generate(vpnSchema, VPNList),VPNList.size()));
-                                    VPNList.clear();
+                                GenericRecord jstx_rzzb = new GenericData.Record(jstxSchema);
+                                setJSTX_RZZB(jstx_rzzb, sessionRecordLog);
+                                JSTXList.add(jstx_rzzb);
+                                if (JSTXList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                    basicOutputCollector.emit(StreamAggregateConfig.CONN_JSTX_STREAMID, new Values((Object) generate(jstxSchema, JSTXList), JSTXList.size()));
+                                    JSTXList.clear();
                                 }
                             } catch (Exception e) {
-                                logger.error("-----------vpn_rzzb数据封装处理异常-----------" + e);
+                                e.printStackTrace();
+                                logger.error("-----------jstx_rzzb数据封装处理异常-----------" + e);
                                 loadFail++;
                             }
-                        }else if (sessionRecordLog.getCommon_l7_protocol().equals("FTP")){
+                    } else {
+                        switch (sessionRecordLog.getCommon_schema_type()) {
+                            case "BASE":
+                                if (sessionRecordLog.getCommon_l7_protocol().equals("PPTP") || sessionRecordLog.getCommon_l7_protocol().equals("L2TP") || sessionRecordLog.getCommon_l7_protocol().equals("OPENVPN") || sessionRecordLog.getCommon_l7_protocol().equals("IPSEC")) {
+                                    sessionRecordLog.setCommon_schema_type("VPN");
+                                    try {
+                                        GenericRecord vpn_rzzb = new GenericData.Record(vpnSchema);
+                                        setVPN_RZZB(vpn_rzzb, sessionRecordLog);
+                                        VPNList.add(vpn_rzzb);
+                                        if (VPNList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                            basicOutputCollector.emit(StreamAggregateConfig.CONN_VPN_STREAMID, new Values((Object) generate(vpnSchema, VPNList), VPNList.size()));
+                                            VPNList.clear();
+                                        }
+                                    } catch (Exception e) {
+                                        logger.error("-----------vpn_rzzb数据封装处理异常-----------" + e);
+                                        loadFail++;
+                                    }
+                                } else if (sessionRecordLog.getCommon_l7_protocol().equals("FTP")) {
+                                    try {
+                                        sessionRecordLog.setCommon_schema_type("FTP");
+                                        GenericRecord ftp_rzzb = new GenericData.Record(ftpSchema);
+                                        setFTP_RZZB(ftp_rzzb, sessionRecordLog);
+                                        FTPList.add(ftp_rzzb);
+                                        if (FTPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                            basicOutputCollector.emit(StreamAggregateConfig.CONN_FTP_STREAMID, new Values((Object) generate(ftpSchema, FTPList), FTPList.size()));
+                                            FTPList.clear();
+                                        }
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                        logger.error("-----------ftp_rzzb数据封装处理异常-----------" + e);
+                                        loadFail++;
+                                    }
+
+                                } else {
+                                    sessionRecordLog.setCommon_schema_type("IP");
+                                    try {
+                                        GenericRecord ip_rzzb = new GenericData.Record(ipSchema);
+                                        setIP_RZZB(ip_rzzb, sessionRecordLog);
+                                        IPList.add(ip_rzzb);
+                                        if (IPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                            basicOutputCollector.emit(StreamAggregateConfig.CONN_IP_STREAMID, new Values((Object) generate(ipSchema, IPList), IPList.size()));
+                                            IPList.clear();
+                                        }
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                        logger.error("-----------ip_rzzb数据封装处理异常-----：------" + e);
+                                        loadFail++;
+                                    }
+                                }
+                                break;
+                            case "HTTP":
                                 try {
-                                    sessionRecordLog.setCommon_schema_type("FTP");
-                                    GenericRecord ftp_rzzb = new GenericData.Record(ftpSchema);
-                                    setFTP_RZZB(ftp_rzzb, sessionRecordLog);
-                                    FTPList.add(ftp_rzzb);
-                                    if (FTPList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                        basicOutputCollector.emit(StreamAggregateConfig.CONN_FTP_STREAMID, new Values((Object) generate(ftpSchema, FTPList),FTPList.size()));
-                                        FTPList.clear();
+                                    if (sessionRecordLog.getHttp_response_body() != null) {
+                                        String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                        bucketName = split[split.length - 2];
+                                        filename = split[split.length - 1];
+                                        s3Url = getS3Url(StreamAggregateConfig.T_HTTP_RZZB, filename);
+                                        basicOutputCollector.emit("conn-unstructured", new Values(bucketName, filename, s3Url));
+                                        sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_HTTP_RZZB, filename));
+                                    }
+                                    GenericRecord http_rzzb = new GenericData.Record(httpSchema);
+                                    sessionRecordLog.setCommon_schema_type("HTTP");
+
+                                    setHTTP_RZZB(http_rzzb, sessionRecordLog);
+                                    HTTPList.add(http_rzzb);
+                                    if (HTTPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                        basicOutputCollector.emit(StreamAggregateConfig.CONN_HTTP_STREAMID, new Values((Object) generate(httpSchema, HTTPList), HTTPList.size()));
+                                        HTTPList.clear();
                                     }
                                 } catch (Exception e) {
                                     e.printStackTrace();
-                                    logger.error("-----------ftp_rzzb数据封装处理异常-----------" + e);
+                                    logger.error("-----------http_rzzb数据封装处理异常-----------" + e);
                                     loadFail++;
                                 }
-
-                        } else {
-                            sessionRecordLog.setCommon_schema_type("IP");
-                            try {
-                                    GenericRecord ip_rzzb = new GenericData.Record(ipSchema);
-                                    setIP_RZZB(ip_rzzb, sessionRecordLog);
-                                    IPList.add(ip_rzzb);
-                                if (IPList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                    basicOutputCollector.emit(StreamAggregateConfig.CONN_IP_STREAMID, new Values((Object) generate(ipSchema, IPList),IPList.size()));
-                                    IPList.clear();
+                                break;
+                            case "SSL":
+                                sessionRecordLog.setCommon_schema_type("SSL");
+                                try {
+                                    GenericRecord ssl_rzzb = new GenericData.Record(sslSchema);
+                                    setSSL_RZZB(ssl_rzzb, sessionRecordLog);
+                                    SSLList.add(ssl_rzzb);
+                                    if (SSLList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                        basicOutputCollector.emit(StreamAggregateConfig.CONN_SSL_STREAMID, new Values((Object) generate(sslSchema, SSLList), SSLList.size()));
+                                        SSLList.clear();
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    logger.error("-----------ssl_rzzb数据封装处理异常-----------" + e);
+                                    loadFail++;
                                 }
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                logger.error("-----------ip_rzzb数据封装处理异常-----：------"+e );
-                                loadFail++;
-                            }
-                        }
-                        break;
-                    case "HTTP":
-                        sessionRecordLog.setCommon_schema_type("HTTP");
-                        try {
-                                GenericRecord http_rzzb = new GenericData.Record(httpSchema);
-                                setHTTP_RZZB(http_rzzb, sessionRecordLog);
-                                HTTPList.add(http_rzzb);
-
-                            if (HTTPList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                basicOutputCollector.emit(StreamAggregateConfig.CONN_HTTP_STREAMID, new Values((Object) generate(httpSchema, HTTPList),HTTPList.size()));
-                                HTTPList.clear();
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            logger.error("-----------http_rzzb数据封装处理异常-----------"+e);
-                            loadFail++;
+                                break;
+                            case "DNS":
+                                sessionRecordLog.setCommon_schema_type("DNS");
+                                try {
+                                    GenericRecord dns_rzzb = new GenericData.Record(dnsSchema);
+                                    setDNS_RZZB(dns_rzzb, sessionRecordLog);
+                                    if (dns_rzzb.get("DNS_NAME")!=("")){
+                                        DNSList.add(dns_rzzb);
+                                    }else {
+                                        loadFail++;
+                                    }
+                                    if (DNSList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                        basicOutputCollector.emit(StreamAggregateConfig.CONN_DNS_STREAMID, new Values((Object) generate(dnsSchema, DNSList), DNSList.size()));
+                                        DNSList.clear();
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    logger.error("-----------dns_rzzb数据封装处理异常-----------" + e);
+                                    loadFail++;
+                                }
+                                break;
+                            case "MAIL":
+                                try {
+                                    if (sessionRecordLog.getHttp_response_body() != null) {
+                                        String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                        bucketName = split[split.length - 2];
+                                        filename = split[split.length - 1];
+                                        s3Url = getS3Url(StreamAggregateConfig.T_MAIL_RZZB, filename);
+                                        basicOutputCollector.emit("conn-unstructured", new Values(bucketName, filename, s3Url));
+                                        sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_MAIL_RZZB, filename));
+                                    }
+                                    GenericRecord mail_rzzb = new GenericData.Record(mailSchema);
+                                    sessionRecordLog.setCommon_schema_type("MAIL");
+                                    setMAIL_RZZB(mail_rzzb, sessionRecordLog);
+                                    MAILList.add(mail_rzzb);
+                                    if (MAILList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
+                                        basicOutputCollector.emit(StreamAggregateConfig.CONN_MAIL_STREAMID, new Values((Object) generate(mailSchema, MAILList), MAILList.size()));
+                                        MAILList.clear();
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    logger.error("-----------mail_rzzb数据封装处理异常-----------" + e + "异常数据为:" + line);
+                                    loadFail++;
+                                }
+                                break;
+                            default:
+                                break;
                         }
-                        break;
-                    case "SSL":
-                        sessionRecordLog.setCommon_schema_type("SSL");
-                        try {
-                            GenericRecord ssl_rzzb = new GenericData.Record(sslSchema);
+                    }
 
-                                setSSL_RZZB(ssl_rzzb, sessionRecordLog);
-                                SSLList.add(ssl_rzzb);
-                            if (SSLList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                basicOutputCollector.emit(StreamAggregateConfig.CONN_SSL_STREAMID, new Values((Object) generate(sslSchema, SSLList),SSLList.size()));
-                                SSLList.clear();
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            logger.error("-----------ssl_rzzb数据封装处理异常-----------" + e);
-                            loadFail++;
-                        }
-                        break;
-                    case "DNS":
-                        sessionRecordLog.setCommon_schema_type("DNS");
-                        try {
-                                GenericRecord dns_rzzb = new GenericData.Record(dnsSchema);
-                                setDNS_RZZB(dns_rzzb, sessionRecordLog);
-                                DNSList.add(dns_rzzb);
-                            if (DNSList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                basicOutputCollector.emit(StreamAggregateConfig.CONN_DNS_STREAMID, new Values((Object) generate(dnsSchema, DNSList),DNSList.size()));
-                                DNSList.clear();
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            logger.error("-----------dns_rzzb数据封装处理异常-----------" + e);
-                            loadFail++;
-                        }
-                        break;
-                    case "MAIL":
-                        sessionRecordLog.setCommon_schema_type("MAIL");
-                        try {
-                                GenericRecord mail_rzzb = new GenericData.Record(mailSchema);
-                                setMAIL_RZZB(mail_rzzb, sessionRecordLog);
-                                MAILList.add(mail_rzzb);
-                            if (MAILList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                basicOutputCollector.emit(StreamAggregateConfig.CONN_MAIL_STREAMID, new Values((Object) generate(mailSchema, MAILList),MAILList.size()));
-                                MAILList.clear();
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            logger.error("-----------mail_rzzb数据封装处理异常-----------" + e +"异常数据为:"+line);
-                            loadFail++;
-                        }
-                        break;
-                    case "APP":
-                        sessionRecordLog.setCommon_schema_type("JSTX");
-                        try {
-                                GenericRecord jstx_rzzb = new GenericData.Record(jstxSchema);
-                                setJSTX_RZZB(jstx_rzzb, sessionRecordLog);
-                                JSTXList.add(jstx_rzzb);
-                            if (JSTXList.size() >= StreamAggregateConfig.CONN_BATCH_INTER_NUM) {
-                                basicOutputCollector.emit(StreamAggregateConfig.CONN_JSTX_STREAMID, new Values((Object) generate(jstxSchema, JSTXList),JSTXList.size()));
-                                JSTXList.clear();
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            logger.error("-----------jstx_rzzb数据封装处理异常-----------" + e);
-                            loadFail++;
-                        }
-                        break;
-                    default:
-                        break;
-                }
                 } catch(Exception e){
                     logger.error("通联数据格式错误"+e);
                 }
@@ -280,13 +299,15 @@ public class ConnParseBolt extends BaseBasicBolt {
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.CONN_FTP_STREAMID, new Fields(StreamAggregateConfig.CONN_FTP_STREAMID,"ftpcount"));
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.CONN_SSL_STREAMID, new Fields(StreamAggregateConfig.CONN_SSL_STREAMID,"sslcount"));
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.CONN_YBInputSize_STREAMID, new Fields("connInputSize","count","loadFail","connOutputSize"));
+        outputFieldsDeclarer.declareStream("conn-unstructured", new Fields("bucketName","filename","s3Url"));
+
     }
 
 
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.CONN_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSSLSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSSLSendBolt.java
index c3d9d75..c57ad9f 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSSLSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSSLSendBolt.java
@@ -33,7 +33,7 @@ public class ConnSSLSendBolt extends BaseBasicBolt {
 
                 byte[] sslSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_SSL_STREAMID);
                 Integer sslcount = tuple.getIntegerByField("sslcount");
-                Map<String, String> connSslPost = HttpClientService.getConnHttpPost(getPostUrl(), sslSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_SSL_TOPIC);
+                Map<String, String> connSslPost = HttpClientService.getConnHttpPost(getPostUrl(), sslSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_SSL_TOPIC);
                 if (connSslPost.containsValue("200")){
                     logger.info("-------条数为:"+sslcount+"connssl数据发送成功-----"+connSslPost);
                     conn_ssl_success = conn_ssl_success + sslcount;
@@ -48,7 +48,7 @@ public class ConnSSLSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.CONN_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 
diff --git a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSendBolt.java
index 5563aff..b4f6611 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnSendBolt.java
@@ -58,7 +58,7 @@ public class ConnSendBolt extends BaseBasicBolt {
 
                 byte[] dnsSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_DNS_STREAMID);
                 Integer dnscount = tuple.getIntegerByField("dnscount");
-                Map<String, String> dnsPost = HttpClientService.getConnHttpPost(getPostUrl(), dnsSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_DNS_TOPIC);
+                Map<String, String> dnsPost = HttpClientService.getConnHttpPost(getPostUrl(), dnsSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_DNS_TOPIC);
                 if (dnsPost.containsValue("200")){
                     logger.info("-------条数为:"+dnscount+"conndns数据发送成功-----"+dnsPost);
                     conn_dns_success = conn_dns_success + dnscount;
@@ -71,7 +71,7 @@ public class ConnSendBolt extends BaseBasicBolt {
 
                 byte[] mailSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_MAIL_STREAMID);
                 Integer mailcount = tuple.getIntegerByField("mailcount");
-                Map<String, String> mailPost = HttpClientService.getConnHttpPost(getPostUrl(), mailSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_MAIL_TOPIC);
+                Map<String, String> mailPost = HttpClientService.getConnHttpPost(getPostUrl(), mailSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_MAIL_TOPIC);
                 if (mailPost.containsValue("200")){
                     logger.info("-------条数为:"+mailcount+"connmail数据发送成功-----"+mailPost);
                     conn_mail_success = conn_mail_success + mailcount;
@@ -84,7 +84,7 @@ public class ConnSendBolt extends BaseBasicBolt {
 
                 byte[] vpnSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_VPN_STREAMID);
                 Integer vpncount = tuple.getIntegerByField("vpncount");
-                Map<String, String> vpnPost = HttpClientService.getConnHttpPost(getPostUrl(), vpnSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_VPN_TOPIC);
+                Map<String, String> vpnPost = HttpClientService.getConnHttpPost(getPostUrl(), vpnSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_VPN_TOPIC);
                 if (vpnPost.containsValue("200")){
                     logger.info("-------条数为:"+vpncount+"connvpn数据发送成功-----"+vpnPost);
                     conn_vpn_success = conn_vpn_success + vpncount;
@@ -96,7 +96,7 @@ public class ConnSendBolt extends BaseBasicBolt {
             } else if (tuple.getSourceStreamId().equals(StreamAggregateConfig.CONN_JSTX_STREAMID)) {
                 byte[] jstxSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_JSTX_STREAMID);
                 Integer jstxcount = tuple.getIntegerByField("jstxcount");
-                Map<String, String> jstxPost = HttpClientService.getConnHttpPost(getPostUrl(), jstxSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_JSTX_TOPIC);
+                Map<String, String> jstxPost = HttpClientService.getConnHttpPost(getPostUrl(), jstxSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_JSTX_TOPIC);
                 if (jstxPost.containsValue("200")){
                     logger.info("-------条数为:"+jstxcount+"connjstx数据发送成功-----"+jstxPost);
                     conn_jstx_success = conn_jstx_success + jstxcount;
@@ -109,7 +109,7 @@ public class ConnSendBolt extends BaseBasicBolt {
             } else if (tuple.getSourceStreamId().equals(StreamAggregateConfig.CONN_FTP_STREAMID)) {
                 byte[] ftpSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.CONN_FTP_STREAMID);
                 Integer ftpcount = tuple.getIntegerByField("ftpcount");
-                Map<String, String> ftpPost = HttpClientService.getConnHttpPost(getPostUrl(), ftpSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_FTP_TOPIC);
+                Map<String, String> ftpPost = HttpClientService.getConnHttpPost(getPostUrl(), ftpSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.CONN_POST_FTP_TOPIC);
 
                 if (ftpPost.containsValue("200")){
                     logger.info("-------条数为:"+ftpcount+"connftp数据发送成功-----"+ftpPost);
@@ -134,7 +134,7 @@ public class ConnSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.CONN_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 
diff --git a/src/main/java/cn/ac/iie/storm/bolt/conn/ConnUnstructuredSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnUnstructuredSendBolt.java
new file mode 100644
index 0000000..d559b79
--- /dev/null
+++ b/src/main/java/cn/ac/iie/storm/bolt/conn/ConnUnstructuredSendBolt.java
@@ -0,0 +1,39 @@
+package cn.ac.iie.storm.bolt.conn;
+
+import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
+import org.apache.log4j.Logger;
+import org.apache.storm.topology.BasicOutputCollector;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.topology.base.BaseBasicBolt;
+import org.apache.storm.tuple.Tuple;
+
+import java.io.IOException;
+
+import static cn.ac.iie.storm.utils.hos.HosService.httpPostObject;
+import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
+
+public class ConnUnstructuredSendBolt  extends BaseBasicBolt {
+    String bucketName = null;
+    String filename = null;
+    String s3Url = null;
+    private final static Logger logger = Logger.getLogger(ConnUnstructuredSendBolt.class);
+    @Override
+    public void execute(Tuple tuple, BasicOutputCollector basicOutputCollector) {
+        try {
+            bucketName = tuple.getStringByField("bucketName");
+            filename = tuple.getStringByField("filename");
+            s3Url = tuple.getStringByField("s3Url");
+            byte[] bytes = httpPostObject(bucketName, filename);
+            if(bytes!=null) {
+                getConnAnsyHttpPost(s3Url, bytes);
+            }
+        } catch (IOException e) {
+            logger.error("桶："+bucketName+"下的文件"+filename+"发送失败原因为："+e);
+        }
+    }
+
+    @Override
+    public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) {
+
+    }
+}
diff --git a/src/main/java/cn/ac/iie/storm/bolt/gk/GKHTTPSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/gk/GKHTTPSendBolt.java
index 9315cc7..510d983 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/gk/GKHTTPSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/gk/GKHTTPSendBolt.java
@@ -33,12 +33,12 @@ public class GKHTTPSendBolt extends BaseBasicBolt {
             if (tuple.getSourceStreamId().equals(StreamAggregateConfig.GK_HTTP_STREAMID)) {
                 byte[] httpSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_HTTP_STREAMID);
                 Integer httpcount = tuple.getIntegerByField("httpcount");
-                Map<String, String> gkHttpPost = HttpClientService.getConnHttpPost(getPostUrl(), httpSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_HTTP_TOPIC);
+                Map<String, String> gkHttpPost = HttpClientService.getConnHttpPost(getPostUrl(), httpSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_HTTP_TOPIC);
                 if (gkHttpPost.containsValue("200")){
-                    logger.info("-------条数为:"+httpcount+"gkhttp数据发送成功-----"+gkHttpPost);
+                   logger.info("-------条数为:"+httpcount+"gkhttp数据发送成功-----"+gkHttpPost);
                     gk_http_success = gk_http_success + httpcount;
                 }else {
-                    logger.error("-------条数为:"+httpcount+"gkhttp数据发送失败-----"+gkHttpPost);
+                   logger.error("-------条数为:"+httpcount+"gkhttp数据发送失败-----"+gkHttpPost);
                     gk_http_fail = gk_http_fail + httpcount;
                 }
             }
@@ -53,7 +53,7 @@ public class GKHTTPSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/gk/GKIPSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/gk/GKIPSendBolt.java
index 3363fd8..5d4d635 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/gk/GKIPSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/gk/GKIPSendBolt.java
@@ -34,7 +34,7 @@ public class GKIPSendBolt extends BaseBasicBolt {
             if (tuple.getSourceStreamId().equals(StreamAggregateConfig.GK_IP_STREAMID)) {
                 byte[] ipSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_IP_STREAMID);
                 Integer ipCount = tuple.getIntegerByField("ipcount");
-                Map<String, String> gkIpPost = HttpClientService.getConnHttpPost(getPostUrl(), ipSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_IP_TOPIC);
+                Map<String, String> gkIpPost = HttpClientService.getConnHttpPost(getPostUrl(), ipSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_IP_TOPIC);
                 if (gkIpPost.containsValue("200")){
                     logger.info("-------条数为:"+ipCount+"gkip数据发送成功-----"+gkIpPost);
                     gk_ip_success = gk_ip_success + ipCount;
@@ -54,7 +54,7 @@ public class GKIPSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/gk/GKSSLSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/gk/GKSSLSendBolt.java
index e735c9a..58c1473 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/gk/GKSSLSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/gk/GKSSLSendBolt.java
@@ -32,7 +32,7 @@ public class GKSSLSendBolt extends BaseBasicBolt {
             if (tuple.getSourceStreamId().equals(StreamAggregateConfig.GK_SSL_STREAMID)) {
                 byte[] sslSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_SSL_STREAMID);
                 Integer sslCount = tuple.getIntegerByField("sslcount");
-                Map<String, String> gkSslPost = HttpClientService.getConnHttpPost(getPostUrl(), sslSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_SSL_TOPIC);
+                Map<String, String> gkSslPost = HttpClientService.getConnHttpPost(getPostUrl(), sslSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_SSL_TOPIC);
 
                 if (gkSslPost.containsValue("200")){
                     logger.info("-------条数为:"+sslCount+"gkssl数据发送成功-----"+gkSslPost);
@@ -53,7 +53,7 @@ public class GKSSLSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 
diff --git a/src/main/java/cn/ac/iie/storm/bolt/gk/GkParseBolt.java b/src/main/java/cn/ac/iie/storm/bolt/gk/GkParseBolt.java
index 1f02eb4..feae7ef 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/gk/GkParseBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/gk/GkParseBolt.java
@@ -3,7 +3,7 @@ package cn.ac.iie.storm.bolt.gk;
 import cn.ac.iie.storm.bean.SessionRecordLog;
 import cn.ac.iie.storm.bean.Traffic_Forward;
 import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.bolt.conn.ConnParseBolt;
+
 import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.avro.Schema;
@@ -26,16 +26,15 @@ import java.util.Map;
 
 import static cn.ac.iie.storm.utils.general.GKAssignment.*;
 import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getS3Url;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getYL5;
 
 public class GkParseBolt extends BaseBasicBolt {
-    private final static Logger logger = Logger.getLogger(ConnParseBolt.class);
+    private final static Logger logger = Logger.getLogger(GkParseBolt.class);
     private static final long serialVersionUID = 7483439472002862539L;
 
     private SessionRecordLog sessionRecordLog;
 
-
-
-
     private List<GenericRecord> IPList = new ArrayList<GenericRecord>();
     private List<GenericRecord> HTTPList = new ArrayList<GenericRecord>();
     private List<GenericRecord> FTPList = new ArrayList<GenericRecord>();
@@ -61,6 +60,9 @@ public class GkParseBolt extends BaseBasicBolt {
     private Schema jstxSchema;
     private Schema wygjcSchema;
 
+    String bucketName = null;
+    String filename = null;
+    String s3Url = null;
 
 
 
@@ -124,7 +126,6 @@ public class GkParseBolt extends BaseBasicBolt {
                     e.printStackTrace();
                     logger.error("----------批数据发送异常-----------" + e);
                 }
-
                 count = 0;
                 loadfail = 0;
             } else {
@@ -143,11 +144,10 @@ public class GkParseBolt extends BaseBasicBolt {
                 sessionRecordLog.setYyzl(traffic_forward.getYyzl());
                 sessionRecordLog.setGjc(traffic_forward.getGjc());
                 sessionRecordLog.setZsmc(traffic_forward.getZsmc());
-
                 int pzlx = traffic_forward.getPzlx();
                 //按pzlx的值对数据进行分类发送
                 //按pzlx的值对数据进行分类发送
-                switch (pzlx) {
+                 switch (pzlx) {
                     //管控
                     case 201:  //IP黑名单
                     case 601:  //网安IP管控
@@ -159,7 +159,7 @@ public class GkParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("IP");
                             setIP_GKRZ(ip_gkrz, sessionRecordLog);
                             IPList.add(ip_gkrz);
-                            if (IPList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (IPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_IP_STREAMID, new Values((Object) generate(ipSchema, IPList),IPList.size()));
                                 IPList.clear();
                             }
@@ -178,12 +178,15 @@ public class GkParseBolt extends BaseBasicBolt {
                             GenericRecord dns_gkzb = new GenericData.Record(dnsSchema);
                             sessionRecordLog.setCommon_schema_type("DNS");
                             setDNS_GKZB(dns_gkzb, sessionRecordLog);
-                            DNSList.add(dns_gkzb);
-                            if (DNSList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (dns_gkzb.get("DNS_NAME")!=("")){
+                                DNSList.add(dns_gkzb);
+                            }else {
+                                loadfail++;
+                            }
+                            if (DNSList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_DNS_STREAMID, new Values((Object) generate(dnsSchema, DNSList),DNSList.size()));
                                 DNSList.clear();
                             }
-
                         } catch (Exception e) {
                             e.printStackTrace();
                             logger.error("-----------dns_gkzb数据封装处理异常-----------" + e);
@@ -196,10 +199,19 @@ public class GkParseBolt extends BaseBasicBolt {
                     case 703:   //反诈URL管控
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_HTTP_GKZB, filename);
+                                basicOutputCollector.emit("gk-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_HTTP_GKZB, filename));
+                            }
                             GenericRecord http_gkzb = new GenericData.Record(httpSchema);
                             sessionRecordLog.setCommon_schema_type("HTTP");
                             setHTTP_GKZB(http_gkzb, sessionRecordLog);
-                            if (HTTPList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            HTTPList.add(http_gkzb);
+                            if (HTTPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_HTTP_STREAMID, new Values((Object) generate(httpSchema, HTTPList),HTTPList.size()));
                                 HTTPList.clear();
                             }
@@ -216,7 +228,7 @@ public class GkParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("SSL");
                             setSSL_GKZB(ssl_gkzb, sessionRecordLog);
                             SSLList.add(ssl_gkzb);
-                            if (SSLList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (SSLList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_SSL_STREAMID, new Values((Object) generate(sslSchema, SSLList),SSLList.size()));
                                 SSLList.clear();
                             }
@@ -232,11 +244,20 @@ public class GkParseBolt extends BaseBasicBolt {
                     case 409:   //搜索词封堵
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_WYGJC_GKRZ, filename);
+                                basicOutputCollector.emit("gk-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_WYGJC_GKRZ, filename));
+                            }
                             GenericRecord wygjc_gkzb = new GenericData.Record(wygjcSchema);
                             sessionRecordLog.setCommon_schema_type("HTTP");
+
                             setWYGJC_GKZB(wygjc_gkzb, sessionRecordLog);
                             WYGJCList.add(wygjc_gkzb);
-                            if (WYGJCList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (WYGJCList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_WYGJC_STREAMID, new Values((Object) generate(wygjcSchema, WYGJCList),WYGJCList.size()));
                                 WYGJCList.clear();
                             }
@@ -250,17 +271,25 @@ public class GkParseBolt extends BaseBasicBolt {
                     case 410:
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_MAIL_GKZB, filename);
+                                basicOutputCollector.emit("gk-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_MAIL_GKZB, filename));
+                            }
                             GenericRecord mail_gkzb = new GenericData.Record(mailSchema);
                             sessionRecordLog.setCommon_schema_type("MAIL");
                             setMAIL_GKZB(mail_gkzb, sessionRecordLog);
                             MAILList.add(mail_gkzb);
-                            if (MAILList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (MAILList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_MAIL_STREAMID, new Values((Object) generate(mailSchema, MAILList),MAILList.size()));
                                 MAILList.clear();
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
-                            logger.error("-----------mail_gkzb数据封装处理异常-----------" + e);
+                            logger.error("-----------mail_gkzb数据封装处理异常-----------" + e + "异常数据为"+line);
                             loadfail++;
                         }
                         break;
@@ -271,7 +300,7 @@ public class GkParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("FTP");
                             setFTP_GKZB(ftp_gkzb, sessionRecordLog);
                             FTPList.add(ftp_gkzb);
-                            if (FTPList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (FTPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_FTP_STREAMID, new Values((Object) generate(ftpSchema, FTPList),FTPList.size()));
                                 FTPList.clear();
                             }
@@ -288,7 +317,7 @@ public class GkParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("VPN");
                             setVPN_GKZB(vpn_gkzb, sessionRecordLog);
                             VPNList.add(vpn_gkzb);
-                            if (VPNList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (VPNList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_VPN_STREAMID, new Values((Object) generate(vpnSchema, VPNList),VPNList.size()));
                                 VPNList.clear();
                             }
@@ -306,7 +335,7 @@ public class GkParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("JSTX");
                             setJSTX_GKZB(jstx_gkzb, sessionRecordLog);
                             JSTXList.add(jstx_gkzb);
-                            if (JSTXList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (JSTXList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.GK_JSTX_STREAMID, new Values((Object) generate(jstxSchema, JSTXList),JSTXList.size()));
                                 JSTXList.clear();
                             }
@@ -337,12 +366,13 @@ public class GkParseBolt extends BaseBasicBolt {
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.GK_VPN_STREAMID,new Fields(StreamAggregateConfig.GK_VPN_STREAMID,"vpncount"));
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.GK_JSTX_STREAMID,new Fields(StreamAggregateConfig.GK_JSTX_STREAMID,"jstxcount"));
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.GK_COUNT_STREAMID, new Fields("count","loadfail"));
+        outputFieldsDeclarer.declareStream("gk-unstructured", new Fields("bucketName","filename","s3Url"));
     }
 
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/gk/GkSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/gk/GkSendBolt.java
index ad92e13..9038760 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/gk/GkSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/gk/GkSendBolt.java
@@ -62,7 +62,7 @@ public class GkSendBolt extends BaseBasicBolt {
 
                 byte[] dnsSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_DNS_STREAMID);
                 Integer dnscount = tuple.getIntegerByField("dnscount");
-                Map<String, String> gkDnsPost = HttpClientService.getConnHttpPost(getPostUrl(), dnsSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_DNS_TOPIC);
+                Map<String, String> gkDnsPost = HttpClientService.getConnHttpPost(getPostUrl(), dnsSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_DNS_TOPIC);
                 if (gkDnsPost.containsValue("200")){
                    logger.info("-------条数为:"+dnscount+"gkdns数据发送成功-----"+gkDnsPost);
                    gk_dns_success = gk_dns_success + dnscount;
@@ -74,7 +74,7 @@ public class GkSendBolt extends BaseBasicBolt {
 
                 byte[] mailSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_MAIL_STREAMID);
                 Integer mailcount = tuple.getIntegerByField("mailcount");
-                Map<String, String> gkMailPost = HttpClientService.getConnHttpPost(getPostUrl(), mailSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_MAIL_TOPIC);
+                Map<String, String> gkMailPost = HttpClientService.getConnHttpPost(getPostUrl(), mailSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_MAIL_TOPIC);
                 if (gkMailPost.containsValue("200")){
                     logger.info("-------条数为:"+mailcount+"gkmail数据发送成功-----"+gkMailPost);
                     gk_mail_success = gk_mail_success + mailcount;
@@ -86,7 +86,7 @@ public class GkSendBolt extends BaseBasicBolt {
 
                 byte[] vpnSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_VPN_STREAMID);
                 Integer vpnCount = tuple.getIntegerByField("vpncount");
-                Map<String, String> gkVpnPost = HttpClientService.getConnHttpPost(getPostUrl(), vpnSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_VPN_TOPIC);
+                Map<String, String> gkVpnPost = HttpClientService.getConnHttpPost(getPostUrl(), vpnSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_VPN_TOPIC);
                 if (gkVpnPost.containsValue("200")){
                     logger.info("-------条数为:"+vpnCount+"gkvpn数据发送成功-----"+gkVpnPost);
                     gk_vpn_success = gk_vpn_success + vpnCount;
@@ -98,7 +98,7 @@ public class GkSendBolt extends BaseBasicBolt {
 
                 byte[] jstxSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_JSTX_STREAMID);
                 Integer jstxCount = tuple.getIntegerByField("jstxcount");
-                Map<String, String> gkJstxPost = HttpClientService.getConnHttpPost(getPostUrl(), jstxSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_JSTX_TOPIC);
+                Map<String, String> gkJstxPost = HttpClientService.getConnHttpPost(getPostUrl(), jstxSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_JSTX_TOPIC);
                 if (gkJstxPost.containsValue("200")){
                     logger.info("-------条数为:"+jstxCount+"gkjstx数据发送成功-----"+gkJstxPost);
                     gk_jstx_success = gk_jstx_success + jstxCount;
@@ -111,7 +111,7 @@ public class GkSendBolt extends BaseBasicBolt {
 
                 byte[] ftpSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_FTP_STREAMID);
                 Integer ftpCount = tuple.getIntegerByField("ftpcount");
-                Map<String, String> gkFtpPost = HttpClientService.getConnHttpPost(getPostUrl(), ftpSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_FTP_TOPIC);
+                Map<String, String> gkFtpPost = HttpClientService.getConnHttpPost(getPostUrl(), ftpSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_FTP_TOPIC);
                 if (gkFtpPost.containsValue("200")){
                     logger.info("-------条数为:"+ftpCount+"gkftp数据发送成功-----"+gkFtpPost);
                     gk_ftp_success = gk_ftp_success + ftpCount;
@@ -123,7 +123,7 @@ public class GkSendBolt extends BaseBasicBolt {
 
                 byte[] wygjcSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.GK_WYGJC_STREAMID);
                 Integer wygjcCount = tuple.getIntegerByField("wygjccount");
-                Map<String, String> gkWygjcPost = HttpClientService.getConnHttpPost(getPostUrl(), wygjcSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_WYGJC_TOPIC);
+                Map<String, String> gkWygjcPost = HttpClientService.getConnHttpPost(getPostUrl(), wygjcSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_WYGJC_TOPIC);
                 if (gkWygjcPost.containsValue("200")){
                     logger.info("-------条数为:"+wygjcCount+"gkwygjc数据发送成功-----"+gkWygjcPost);
                     gk_wygjc_success = gk_wygjc_success + wygjcCount;
@@ -144,7 +144,7 @@ public class GkSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/gk/GkUnstructuredSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/gk/GkUnstructuredSendBolt.java
new file mode 100644
index 0000000..da7666a
--- /dev/null
+++ b/src/main/java/cn/ac/iie/storm/bolt/gk/GkUnstructuredSendBolt.java
@@ -0,0 +1,40 @@
+package cn.ac.iie.storm.bolt.gk;
+
+
+import org.apache.log4j.Logger;
+import org.apache.storm.topology.BasicOutputCollector;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.topology.base.BaseBasicBolt;
+import org.apache.storm.tuple.Tuple;
+
+import java.io.IOException;
+
+import static cn.ac.iie.storm.utils.hos.HosService.httpPostObject;
+import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
+
+public class GkUnstructuredSendBolt extends BaseBasicBolt {
+    String bucketName = null;
+    String filename = null;
+    String s3Url = null;
+    byte[] bytes;
+    private final static Logger logger = Logger.getLogger(GkUnstructuredSendBolt.class);
+    @Override
+    public void execute(Tuple tuple, BasicOutputCollector basicOutputCollector) {
+        try {
+            bucketName = tuple.getStringByField("bucketName");
+            filename = tuple.getStringByField("filename");
+            s3Url = tuple.getStringByField("s3Url");
+            bytes = httpPostObject(bucketName, filename);
+            if(bytes!=null) {
+                getConnAnsyHttpPost(s3Url, bytes);
+            }
+        } catch (IOException e) {
+            logger.error("桶："+bucketName+"下的文件"+filename+"发送失败原因为："+e);
+        }
+    }
+
+    @Override
+    public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) {
+
+    }
+}
diff --git a/src/main/java/cn/ac/iie/storm/bolt/index/ConnCountBolt.java b/src/main/java/cn/ac/iie/storm/bolt/index/ConnCountBolt.java
index f1d358b..fa34c34 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/index/ConnCountBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/index/ConnCountBolt.java
@@ -125,12 +125,8 @@ public class ConnCountBolt extends BaseBasicBolt {
         if(TupleUtils.isTick(input)){
             inputrate=(float)InputSize/StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS/125000;
             outputrate =(float)OutputSize/StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS/125000;
-
             connSendFail = conn_http_fail +  conn_ip_fail + conn_ssl_fail + conn_dns_fail + conn_ftp_fail + conn_jstx_fail + conn_mail_fail +conn_vpn_fail;
-
             ConnSendCount = conn_http_success +  conn_ip_success + conn_ssl_success + conn_dns_success + conn_ftp_success + conn_jstx_success + conn_mail_success +conn_vpn_success;
-
-
             //一般
             InputRate.labels("input-rate",String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS/60)).set(inputrate);
             OutputRate.labels("output-rate",String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS/60)).set(outputrate);
diff --git a/src/main/java/cn/ac/iie/storm/bolt/index/GkCountBolt.java b/src/main/java/cn/ac/iie/storm/bolt/index/GkCountBolt.java
index f41793a..02f1379 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/index/GkCountBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/index/GkCountBolt.java
@@ -105,10 +105,10 @@ public class GkCountBolt extends BaseBasicBolt {
             .name("gkWygjcFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
 
     static final Gauge GKSendFail = Gauge.build()
-            .name("gkSendFail").labelNames("ServName","Duration").help("Program receiving flow rate, the unit is Mbps").register();
+            .name("gkSendFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
 
     static final Gauge GKParseFail = Gauge.build()
-            .name("gkParseFail").labelNames("ServName","Duration").help("Program output flow rate, the unit is Mbps").register();
+            .name("gkParseFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
 
 
 
@@ -119,7 +119,7 @@ public class GkCountBolt extends BaseBasicBolt {
 
 
         if ((TupleUtils.isTick(tuple) && gkCount != 0L)) {
-            gkSendFail = gk_http_fail +  gk_ip_fail + gk_ssl_fail + gk_dns_fail + gk_ftp_fail + gk_jstx_fail + gk_mail_fail + gk_vpn_fail + gk_wygjc_fail;
+            gkSendFail = gk_http_fail +  gk_ip_fail + gk_ssl_fail + gk_dns_fail + gk_ftp_fail + gk_jstx_fail + gk_mail_fail + gk_vpn_fail + gk_wygjc_fail+gkParseFail;
 
             gkSendCount = gk_http_success + gk_ip_success + gk_ssl_success + gk_dns_success + gk_ftp_success + gk_jstx_success + gk_mail_success +gk_vpn_success + gk_wygjc_success;
 
@@ -138,27 +138,27 @@ public class GkCountBolt extends BaseBasicBolt {
             GKIpSuccess.labels("gk-ip-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ip_success);
             GKIpFail.labels("gk-ip-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ip_fail);
 
-           GKSslSuccess.labels("gk-ssl-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ssl_success);
-           GKSslFail.labels("gk-ssl-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ssl_fail);
+            GKSslSuccess.labels("gk-ssl-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ssl_success);
+            GKSslFail.labels("gk-ssl-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ssl_fail);
 
-           GKDnsSuccess.labels("gk-dns-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_dns_success);
-           GKDnsFail.labels("gk-dns-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_dns_fail);
+            GKDnsSuccess.labels("gk-dns-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_dns_success);
+            GKDnsFail.labels("gk-dns-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_dns_fail);
 
-           GKVpnSuccess.labels("gk-vpn-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_vpn_success);
-           GKVpnFail.labels("gk-vpn-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_vpn_fail);
+            GKVpnSuccess.labels("gk-vpn-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_vpn_success);
+            GKVpnFail.labels("gk-vpn-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_vpn_fail);
 
 
-           GKMailSuccess.labels("gk-mail-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_mail_success);
-           GKMailFail.labels("gk-mail-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_mail_fail);
+            GKMailSuccess.labels("gk-mail-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_mail_success);
+            GKMailFail.labels("gk-mail-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_mail_fail);
 
-           GKJstxSuccess.labels("gk-jstx-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_jstx_success);
-           GKJstxFail.labels("gk-jstx-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_jstx_fail);
+            GKJstxSuccess.labels("gk-jstx-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_jstx_success);
+            GKJstxFail.labels("gk-jstx-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_jstx_fail);
 
-           GKFtpSuccess.labels("gk-ftp-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ftp_success);
-           GKFtpFail.labels("gk-ftp-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ftp_fail);
+            GKFtpSuccess.labels("gk-ftp-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ftp_success);
+            GKFtpFail.labels("gk-ftp-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_ftp_fail);
 
-           GKWygjcSuccess.labels("gk-wygjc-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_wygjc_success);
-           GKWygjcFail.labels("gk-wygjc-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_wygjc_fail);
+            GKWygjcSuccess.labels("gk-wygjc-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_wygjc_success);
+            GKWygjcFail.labels("gk-wygjc-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(gk_wygjc_fail);
 
 
             try {
diff --git a/src/main/java/cn/ac/iie/storm/bolt/index/JCCountBolt.java b/src/main/java/cn/ac/iie/storm/bolt/index/JCCountBolt.java
index af40e35..8cad122 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/index/JCCountBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/index/JCCountBolt.java
@@ -111,10 +111,23 @@ public class JCCountBolt extends BaseBasicBolt {
             .name("jcWygjcFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
 
     static final Gauge JCSendFail = Gauge.build()
-            .name("jcSendFail").labelNames("ServName","Duration").help("Program receiving flow rate, the unit is Mbps").register();
+            .name("jcSendFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
 
     static final Gauge JCParseFail = Gauge.build()
-            .name("jcParseFail").labelNames("ServName","Duration").help("Program output flow rate, the unit is Mbps").register();
+            .name("jcParseFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
+
+
+    static final Gauge JCPicSuccess = Gauge.build()
+            .name("jcPicSuccess").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
+
+    static final Gauge JCPicFail = Gauge.build()
+            .name("jcPicFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
+
+    static final Gauge JCMediaSuccess = Gauge.build()
+            .name("jcMediaSuccess").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
+
+    static final Gauge JCMediaFail = Gauge.build()
+            .name("jcMediaFail").labelNames("ServName","Duration").help("The general intput log volume, the unit is slip").register();
 
     @Override
     public void execute(Tuple tuple, BasicOutputCollector basicOutputCollector) {
@@ -160,6 +173,12 @@ public class JCCountBolt extends BaseBasicBolt {
 
             JCWygjcSuccess.labels("jc-wygjc-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(jc_wygjc_success);
             JCWygjcFail.labels("jc-wygjc-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(jc_wygjc_fail);
+
+            JCPicSuccess.labels("jc-pic-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(jc_pic_success);
+            JCPicFail.labels("jc-pic-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(jc_pic_fail);
+
+            JCMediaSuccess.labels("jc-media-success", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(jc_media_success);
+            JCMediaFail.labels("jc-media-fail", String.valueOf(StreamAggregateConfig.COUNT_TOPOLOGY_TICK_TUPLE_FREQ_SECS / 60)).set(jc_media_fail);
             try {
                 push();
             } catch (IOException e) {
@@ -204,6 +223,9 @@ public class JCCountBolt extends BaseBasicBolt {
                     }
                     break;
                 case "JC-SEND":
+                    jc_dns_success = jc_dns_success + tuple.getLongByField("jc_dns_success");
+                    jc_dns_fail = jc_dns_fail + tuple.getLongByField("jc_dns_fail");
+
                     jc_mail_success = jc_mail_success + tuple.getLongByField("jc_mail_success");
                     jc_mail_fail = jc_mail_fail + tuple.getLongByField("jc_mail_fail");
 
@@ -230,10 +252,7 @@ public class JCCountBolt extends BaseBasicBolt {
                     jc_ip_success = jc_ip_success + tuple.getLongByField("jc_ip_success");
                     jc_ip_fail = jc_ip_fail + tuple.getLongByField("jc_ip_fail");
                     break;
-                case "JC-DNS-SEND":
-                    jc_dns_success = jc_dns_success + tuple.getLongByField("jc_dns_success");
-                    jc_dns_fail = jc_dns_fail + tuple.getLongByField("jc_dns_fail");
-                    break;
+
                 case "JC-HTTP-SEND":
                     jc_http_success = jc_http_success + tuple.getLongByField("jc_http_success");
                     jc_http_fail = jc_http_fail + tuple.getLongByField("jc_http_fail");
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JCDNSSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JCDNSSendBolt.java
deleted file mode 100644
index 0c6d905..0000000
--- a/src/main/java/cn/ac/iie/storm/bolt/jc/JCDNSSendBolt.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package cn.ac.iie.storm.bolt.jc;
-
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import org.apache.log4j.Logger;
-import org.apache.storm.topology.BasicOutputCollector;
-import org.apache.storm.topology.OutputFieldsDeclarer;
-import org.apache.storm.topology.base.BaseBasicBolt;
-import org.apache.storm.tuple.Fields;
-import org.apache.storm.tuple.Tuple;
-import org.apache.storm.tuple.Values;
-import org.apache.storm.utils.TupleUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.http.HttpGetUrl.getPostUrl;
-
-public class JCDNSSendBolt extends BaseBasicBolt {
-    private final static Logger logger = Logger.getLogger(JCDNSSendBolt.class);
-
-    private long jc_dns_success=0L;
-    private long jc_dns_fail=0L;
-    @Override
-    public void execute(Tuple tuple, BasicOutputCollector basicOutputCollector) {
-        if(TupleUtils.isTick(tuple)){
-
-            basicOutputCollector.emit(new Values(jc_dns_success,jc_dns_fail));
-            jc_dns_fail = 0L;
-            jc_dns_success = 0L;
-
-        } else {
-            if (tuple.getSourceStreamId().equals(StreamAggregateConfig.JC_DNS_STREAMID)) {
-
-                byte[] dnsSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_DNS_STREAMID);
-                Integer dnscount = tuple.getIntegerByField("dnscount");
-                Map<String, String> jcDnsPost = HttpClientService.getConnHttpPost(getPostUrl(), dnsSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_DNS_TOPIC);
-                if (jcDnsPost.containsValue("200")){
-                    logger.info("-------条数为:"+dnscount+"jcdns数据发送成功-----"+jcDnsPost);
-                    jc_dns_success = jc_dns_success + dnscount;
-                }else {
-                    logger.error("-------条数为:"+dnscount+"jcdns数据发送失败-----"+jcDnsPost);
-                    jc_dns_fail = jc_dns_fail + dnscount;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) {
-        outputFieldsDeclarer.declare(new Fields("jc_dns_success","jc_dns_fail"));
-    }
-
-    @Override
-    public Map<String, Object> getComponentConfiguration() {
-        Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
-        return conf;
-    }
-
-}
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JCHTTPSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JCHTTPSendBolt.java
index 7d3661d..ac6a293 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/jc/JCHTTPSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/jc/JCHTTPSendBolt.java
@@ -36,7 +36,7 @@ public class JCHTTPSendBolt extends BaseBasicBolt {
 
                 byte[] httpSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_HTTP_STREAMID);
                 Integer httpcount = tuple.getIntegerByField("httpcount");
-                Map<String, String> jcHttpPost = HttpClientService.getConnHttpPost(getPostUrl(), httpSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_HTTP_TOPIC);
+                Map<String, String> jcHttpPost = HttpClientService.getConnHttpPost(getPostUrl(), httpSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_HTTP_TOPIC);
                 if (jcHttpPost.containsValue("200")){
                     logger.info("-------条数为:"+httpcount+"jchttp数据发送成功-----"+jcHttpPost);
                     jc_http_success = jc_http_success + httpcount;
@@ -56,7 +56,7 @@ public class JCHTTPSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JCIPSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JCIPSendBolt.java
index 57c8bbe..31f8d72 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/jc/JCIPSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/jc/JCIPSendBolt.java
@@ -36,7 +36,7 @@ public class JCIPSendBolt extends BaseBasicBolt {
 
                 byte[] ipSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_IP_STREAMID);
                 Integer ipcount = tuple.getIntegerByField("ipcount");
-                Map<String, String> jcIpPost = HttpClientService.getConnHttpPost(getPostUrl(), ipSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_IP_TOPIC);
+                Map<String, String> jcIpPost = HttpClientService.getConnHttpPost(getPostUrl(), ipSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_IP_TOPIC);
                 if (jcIpPost.containsValue("200")){
                     logger.info("-------条数为:"+ipcount+"jcip数据发送成功-----"+jcIpPost);
                     jc_ip_success = jc_ip_success + ipcount;
@@ -56,7 +56,7 @@ public class JCIPSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JCParseBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JCParseBolt.java
index f10df48..c39ef62 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/jc/JCParseBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/jc/JCParseBolt.java
@@ -25,7 +25,8 @@ import java.util.Map;
 
 import static cn.ac.iie.storm.utils.general.JCAssignment.*;
 import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.getValidLength;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getS3Url;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getYL5;
 
 public class JCParseBolt extends BaseBasicBolt {
     private final static Logger logger = Logger.getLogger(JCParseBolt.class);
@@ -61,6 +62,9 @@ public class JCParseBolt extends BaseBasicBolt {
     private Schema picSchema;
     private Schema mediaSchema;
 
+    String bucketName = null;
+    String filename = null;
+    String s3Url = null;
 
 
 
@@ -153,7 +157,9 @@ public class JCParseBolt extends BaseBasicBolt {
                 sessionRecordLog.setGjc(traffic_forward.getGjc());
                 sessionRecordLog.setZsmc(traffic_forward.getZsmc());
                 int pzlx = traffic_forward.getPzlx();
-
+                if (sessionRecordLog.getHttp_response_body_key()!=null) {
+                    System.out.println("--------------" + sessionRecordLog.getHttp_response_body_key() + "--------------");
+                }
                 //按pzlx的值对数据进行分类发送
                 //按pzlx的值对数据进行分类发送
                 switch (pzlx) {
@@ -164,7 +170,7 @@ public class JCParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("IP");
                             setIP_JCRZ(ip_jcrz, sessionRecordLog);
                             IPList.add(ip_jcrz);
-                        if (IPList.size() >=  StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                        if (IPList.size() >=  StreamAggregateConfig.BATCH_INTER_NUM) {
                             basicOutputCollector.emit(StreamAggregateConfig.JC_IP_STREAMID, new Values((Object) generate(ipSchema, IPList),IPList.size()));
                             IPList.clear();
                          }
@@ -180,8 +186,12 @@ public class JCParseBolt extends BaseBasicBolt {
                             GenericRecord dns_jczb = new GenericData.Record(dnsSchema);
                             sessionRecordLog.setCommon_schema_type("DNS");
                             setDNS_JCZB(dns_jczb, sessionRecordLog);
-                            DNSList.add(dns_jczb);
-                            if (DNSList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (dns_jczb.get("DNS_NAME")!=("")){
+                                DNSList.add(dns_jczb);
+                            }else {
+                                loadfail++;
+                            }
+                            if (DNSList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_DNS_STREAMID, new Values((Object) generate(dnsSchema, DNSList),DNSList.size()));
                                 DNSList.clear();
                             }
@@ -195,11 +205,19 @@ public class JCParseBolt extends BaseBasicBolt {
                     case 504:   //网站监测
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_HTTP_JCZB, filename);
+                                basicOutputCollector.emit("jc-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_HTTP_JCZB, filename));
+                            }
                             GenericRecord http_jczb = new GenericData.Record(httpSchema);
                             sessionRecordLog.setCommon_schema_type("HTTP");
                             setHTTP_JCZB(http_jczb, sessionRecordLog);
                             HTTPList.add(http_jczb);
-                            if (HTTPList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (HTTPList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_HTTP_STREAMID, new Values((Object) generate(httpSchema, HTTPList),HTTPList.size()));
                                 HTTPList.clear();
                             }
@@ -216,7 +234,7 @@ public class JCParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("SSL");
                             setSSL_JCZB(ssl_jczb, sessionRecordLog);
                             SSLList.add(ssl_jczb);
-                            if (SSLList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (SSLList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_SSL_STREAMID, new Values((Object) generate(sslSchema, SSLList),SSLList.size()));
                                 SSLList.clear();
                             }
@@ -230,11 +248,19 @@ public class JCParseBolt extends BaseBasicBolt {
                     case 509:   //搜索词监测
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_WYGJC_JCRZ, filename);
+                                basicOutputCollector.emit("jc-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_WYGJC_JCRZ, filename));
+                            }
                             GenericRecord wygjc_jczb = new GenericData.Record(wygjcSchema);
                             sessionRecordLog.setCommon_schema_type("HTTP");
                             setWYGJC_JCZB(wygjc_jczb, sessionRecordLog);
                             WYGJCList.add(wygjc_jczb);
-                            if (WYGJCList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (WYGJCList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_WYGJC_STREAMID, new Values((Object) generate(wygjcSchema,WYGJCList),WYGJCList.size()));
                                 WYGJCList.clear();
                             }
@@ -248,11 +274,19 @@ public class JCParseBolt extends BaseBasicBolt {
                     case 510:   //邮件监测
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_MAIL_JCZB, filename);
+                                basicOutputCollector.emit("jc-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_MAIL_JCZB, filename));
+                            }
                             GenericRecord mail_jczb = new GenericData.Record(mailSchema);
                             sessionRecordLog.setCommon_schema_type("MAIL");
                             setMAIL_JCZB(mail_jczb, sessionRecordLog);
                             MAILList.add(mail_jczb);
-                            if (MAILList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (MAILList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_MAIL_STREAMID, new Values((Object) generate(mailSchema,MAILList),MAILList.size()));
                                 MAILList.clear();
                             }
@@ -269,7 +303,7 @@ public class JCParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("FTP");
                             setFTP_JCZB(ftp_jczb,sessionRecordLog);
                             FTPList.add(ftp_jczb);
-                            if (MAILList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (MAILList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_FTP_STREAMID, new Values((Object) generate(ftpSchema,MAILList),FTPList.size()));
                                 FTPList.clear();
                             }
@@ -286,7 +320,7 @@ public class JCParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("VPN");
                             setVPN_JCZB(vpn_jczb, sessionRecordLog);
                             VPNList.add(vpn_jczb);
-                            if (VPNList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (VPNList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_VPN_STREAMID, new Values((Object) generate(vpnSchema,VPNList),VPNList.size()));
                                 VPNList.clear();
                             }
@@ -304,7 +338,7 @@ public class JCParseBolt extends BaseBasicBolt {
                             sessionRecordLog.setCommon_schema_type("JSTX");
                             setJSTX_JCZB(jstx_jczb, sessionRecordLog);
                             JSTXList.add(jstx_jczb);
-                            if (JSTXList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (JSTXList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_JSTX_STREAMID, new Values((Object) generate(jstxSchema,JSTXList),JSTXList.size()));
                                 JSTXList.clear();
                             }
@@ -318,10 +352,19 @@ public class JCParseBolt extends BaseBasicBolt {
                         count++;
                         try {
                             GenericRecord pic_jczb = new GenericData.Record(picSchema);
+
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_PIC_JCZB, filename);
+                                basicOutputCollector.emit("jc-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5( StreamAggregateConfig.T_PIC_JCZB,filename));
+                            }
                             sessionRecordLog.setCommon_schema_type("HTTP");
                             setPIC_JCZB(pic_jczb, sessionRecordLog);
                             PICList.add(pic_jczb);
-                            if (PICList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (PICList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_PIC_STREAMID, new Values((Object) generate(picSchema,PICList),PICList.size()));
                                 PICList.clear();
                             }
@@ -334,11 +377,19 @@ public class JCParseBolt extends BaseBasicBolt {
                     case 515:   //多媒体监测
                         count++;
                         try {
+                            if (sessionRecordLog.getHttp_response_body()!=null){
+                                String[] split = sessionRecordLog.getHttp_response_body().split("/");
+                                bucketName = split[split.length-2];
+                                filename = split[split.length-1];
+                                s3Url = getS3Url(StreamAggregateConfig.T_MEDIA_JCZB, filename);
+                                basicOutputCollector.emit("jc-unstructured",new Values(bucketName,filename,s3Url));
+                                sessionRecordLog.setHttp_response_body(getYL5(StreamAggregateConfig.T_MEDIA_JCZB, filename));
+                            }
                             GenericRecord media_jczb = new GenericData.Record(mediaSchema);
                             sessionRecordLog.setCommon_schema_type("HTTP");
                             setMEDIA_JCZB(media_jczb, sessionRecordLog);
                             MEDIAList.add(media_jczb);
-                            if (MEDIAList.size() >= StreamAggregateConfig.SAFE_BATCH_INTER_NUM) {
+                            if (MEDIAList.size() >= StreamAggregateConfig.BATCH_INTER_NUM) {
                                 basicOutputCollector.emit(StreamAggregateConfig.JC_MEDIA_STREAMID, new Values((Object) generate(mediaSchema,MEDIAList),MEDIAList.size()));
                                 MEDIAList.clear();
                             }
@@ -371,12 +422,13 @@ public class JCParseBolt extends BaseBasicBolt {
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.JC_PIC_STREAMID,new Fields(StreamAggregateConfig.JC_PIC_STREAMID,"piccount"));
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.JC_MEDIA_STREAMID,new Fields(StreamAggregateConfig.JC_MEDIA_STREAMID,"mediacount"));
         outputFieldsDeclarer.declareStream(StreamAggregateConfig.JC_COUNT_STREAMID, new Fields("count","loadfail"));
+        outputFieldsDeclarer.declareStream("jc-unstructured", new Fields("bucketName","filename","s3Url"));
     }
 
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JCSSLSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JCSSLSendBolt.java
index e8845e9..93c0230 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/jc/JCSSLSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/jc/JCSSLSendBolt.java
@@ -34,7 +34,7 @@ public class JCSSLSendBolt extends BaseBasicBolt {
 
                 byte[] sslSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_SSL_STREAMID);
                 Integer sslcount = tuple.getIntegerByField("sslcount");
-                Map<String, String> jcSslPost = HttpClientService.getConnHttpPost(getPostUrl(), sslSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_SSL_TOPIC);
+                Map<String, String> jcSslPost = HttpClientService.getConnHttpPost(getPostUrl(), sslSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_SSL_TOPIC);
                 if (jcSslPost.containsValue("200")){
                     logger.info("-------条数为:"+sslcount+"jcip数据发送成功-----"+jcSslPost);
                     jc_ssl_success = jc_ssl_success + sslcount;
@@ -54,7 +54,7 @@ public class JCSSLSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JCSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JCSendBolt.java
index a5f3b57..4203e58 100644
--- a/src/main/java/cn/ac/iie/storm/bolt/jc/JCSendBolt.java
+++ b/src/main/java/cn/ac/iie/storm/bolt/jc/JCSendBolt.java
@@ -20,6 +20,8 @@ import static cn.ac.iie.storm.utils.http.HttpGetUrl.getPostUrl;
 public class JCSendBolt extends BaseBasicBolt {
     private final static Logger logger = Logger.getLogger(JCSendBolt.class);
 
+    private long jc_dns_success=0L;
+    private long jc_dns_fail=0L;
 
     private long jc_mail_success=0L;
     private long jc_mail_fail=0L;
@@ -50,8 +52,11 @@ public class JCSendBolt extends BaseBasicBolt {
 
         if (TupleUtils.isTick(tuple)) {
 
-            basicOutputCollector.emit(new Values(jc_mail_success,jc_mail_fail,jc_vpn_success,jc_vpn_fail,
+            basicOutputCollector.emit(new Values(jc_dns_success,jc_dns_fail,jc_mail_success,jc_mail_fail,jc_vpn_success,jc_vpn_fail,
                     jc_jstx_success,jc_jstx_fail,jc_ftp_success,jc_ftp_fail,jc_wygjc_success,jc_wygjc_fail,jc_pic_success,jc_pic_fail,jc_media_success,jc_media_fail));
+
+            jc_dns_fail = 0L;
+            jc_dns_success = 0L;
             jc_mail_success=0L;
             jc_mail_fail=0L;
             jc_vpn_success=0L;
@@ -68,11 +73,24 @@ public class JCSendBolt extends BaseBasicBolt {
             jc_media_fail=0L;
         }else {
             try {
-                if (tuple.getSourceStreamId().equals(StreamAggregateConfig.JC_MAIL_STREAMID)) {
+                if (tuple.getSourceStreamId().equals(StreamAggregateConfig.JC_DNS_STREAMID)) {
+
+                    byte[] dnsSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_DNS_STREAMID);
+                    Integer dnscount = tuple.getIntegerByField("dnscount");
+                    Map<String, String> jcDnsPost = HttpClientService.getConnHttpPost(getPostUrl(), dnsSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_DNS_TOPIC);
+                    if (jcDnsPost.containsValue("200")) {
+                        logger.info("-------条数为:" + dnscount + "jcdns数据发送成功-----" + jcDnsPost);
+                        jc_dns_success = jc_dns_success + dnscount;
+                    } else {
+                        logger.error("-------条数为:" + dnscount + "jcdns数据发送失败-----" + jcDnsPost);
+                        jc_dns_fail = jc_dns_fail + dnscount;
+                    }
+                }
+               else if (tuple.getSourceStreamId().equals(StreamAggregateConfig.JC_MAIL_STREAMID)) {
 
                     byte[] mailSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_MAIL_STREAMID);
                     Integer mailcount = tuple.getIntegerByField("mailcount");
-                    Map<String, String> jcMailPost = HttpClientService.getConnHttpPost(getPostUrl(), mailSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_MAIL_TOPIC);
+                    Map<String, String> jcMailPost = HttpClientService.getConnHttpPost(getPostUrl(), mailSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_MAIL_TOPIC);
                     if (jcMailPost.containsValue("200")){
                         logger.info("-------条数为:"+mailcount+"jcmail数据发送成功-----"+jcMailPost);
                         jc_mail_success = jc_mail_success + mailcount;
@@ -85,7 +103,7 @@ public class JCSendBolt extends BaseBasicBolt {
 
                     byte[] vpnSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_VPN_STREAMID);
                     Integer vpncount = tuple.getIntegerByField("vpncount");
-                    Map<String, String> jcVpnPost = HttpClientService.getConnHttpPost(getPostUrl(), vpnSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_VPN_TOPIC);
+                    Map<String, String> jcVpnPost = HttpClientService.getConnHttpPost(getPostUrl(), vpnSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_VPN_TOPIC);
                     if (jcVpnPost.containsValue("200")){
                         logger.info("-------条数为:"+vpncount+"jcvpn数据发送成功-----"+jcVpnPost);
                         jc_vpn_success = jc_vpn_success + vpncount;
@@ -98,7 +116,7 @@ public class JCSendBolt extends BaseBasicBolt {
 
                     byte[] jstxSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_JSTX_STREAMID);
                     Integer jstxcount = tuple.getIntegerByField("jstxcount");
-                    Map<String, String> jcJstxPost = HttpClientService.getConnHttpPost(getPostUrl(), jstxSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_JSTX_TOPIC);
+                    Map<String, String> jcJstxPost = HttpClientService.getConnHttpPost(getPostUrl(), jstxSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_JSTX_TOPIC);
                     if (jcJstxPost.containsValue("200")){
                         logger.info("-------条数为:"+jstxcount+"jcjstx数据发送成功-----"+jcJstxPost);
                         jc_jstx_success = jc_jstx_success + jstxcount;
@@ -110,7 +128,7 @@ public class JCSendBolt extends BaseBasicBolt {
 
                     byte[] ftpSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_FTP_STREAMID);
                     Integer ftpcount = tuple.getIntegerByField("ftpcount");
-                    Map<String, String> jcFtpPost = HttpClientService.getConnHttpPost(getPostUrl(), ftpSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_FTP_TOPIC);
+                    Map<String, String> jcFtpPost = HttpClientService.getConnHttpPost(getPostUrl(), ftpSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_FTP_TOPIC);
                     if (jcFtpPost.containsValue("200")){
                         logger.info("-------条数为:"+ftpcount+"jcftp数据发送成功-----"+jcFtpPost);
                         jc_ftp_success = jc_ftp_success + ftpcount;
@@ -122,7 +140,7 @@ public class JCSendBolt extends BaseBasicBolt {
 
                     byte[] picSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_PIC_STREAMID);
                     Integer piccount = tuple.getIntegerByField("piccount");
-                    Map<String, String> jcPicPost = HttpClientService.getConnHttpPost(getPostUrl(), picSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_PIC_TOPIC);
+                    Map<String, String> jcPicPost = HttpClientService.getConnHttpPost(getPostUrl(), picSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_PIC_TOPIC);
                     if (jcPicPost.containsValue("200")){
                         logger.info("-------条数为:"+piccount+"jcpic数据发送成功-----"+jcPicPost);
                         jc_pic_success = jc_pic_success + piccount;
@@ -133,7 +151,7 @@ public class JCSendBolt extends BaseBasicBolt {
                 } else if (tuple.getSourceStreamId().equals(StreamAggregateConfig.JC_WYGJC_STREAMID)) {
                     byte[] wygjcSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_WYGJC_STREAMID);
                     Integer wygjccount = tuple.getIntegerByField("wygjccount");
-                    Map<String, String> jsWygjcPost = HttpClientService.getConnHttpPost(getPostUrl(), wygjcSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_WYGJC_TOPIC);
+                    Map<String, String> jsWygjcPost = HttpClientService.getConnHttpPost(getPostUrl(), wygjcSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_WYGJC_TOPIC);
                     if (jsWygjcPost.containsValue("200")){
                         logger.info("-------条数为:"+wygjccount+"jcwygjc数据发送成功-----"+jsWygjcPost);
                         jc_wygjc_success = jc_wygjc_success + wygjccount;
@@ -145,7 +163,7 @@ public class JCSendBolt extends BaseBasicBolt {
 
                     byte[] mediaSource = (byte[]) tuple.getValueByField(StreamAggregateConfig.JC_MEDIA_STREAMID);
                     Integer mediacount = tuple.getIntegerByField("mediacount");
-                    Map<String, String> jcMediaPost = HttpClientService.getConnHttpPost(getPostUrl(), mediaSource, StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_MEDIA_TOPIC);
+                    Map<String, String> jcMediaPost = HttpClientService.getConnHttpPost(getPostUrl(), mediaSource, StreamAggregateConfig.HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_MEDIA_TOPIC);
                     if (jcMediaPost.containsValue("200")){
                         logger.info("-------条数为:"+mediacount+"jcmedia数据发送成功-----"+jcMediaPost);
                         jc_media_success = jc_media_success + mediacount;
@@ -162,7 +180,7 @@ public class JCSendBolt extends BaseBasicBolt {
 
     @Override
     public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) {
-        outputFieldsDeclarer.declare(new Fields("jc_mail_success","jc_mail_fail","jc_vpn_success","jc_vpn_fail",
+        outputFieldsDeclarer.declare(new Fields("jc_dns_success","jc_dns_fail","jc_mail_success","jc_mail_fail","jc_vpn_success","jc_vpn_fail",
                 "jc_jstx_success","jc_jstx_fail","jc_ftp_success","jc_ftp_fail","jc_wygjc_success","jc_wygjc_fail","jc_pic_success","jc_pic_fail"
                 ,"jc_media_success","jc_media_fail"));
     }
@@ -170,7 +188,7 @@ public class JCSendBolt extends BaseBasicBolt {
     @Override
     public Map<String, Object> getComponentConfiguration() {
         Map<String, Object> conf = new HashMap<String, Object>();
-        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS);
+        conf.put(org.apache.storm.Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS,  StreamAggregateConfig.TOPOLOGY_TICK_TUPLE_FREQ_SECS);
         return conf;
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/bolt/jc/JcUnstructuredSendBolt.java b/src/main/java/cn/ac/iie/storm/bolt/jc/JcUnstructuredSendBolt.java
new file mode 100644
index 0000000..0db1952
--- /dev/null
+++ b/src/main/java/cn/ac/iie/storm/bolt/jc/JcUnstructuredSendBolt.java
@@ -0,0 +1,39 @@
+package cn.ac.iie.storm.bolt.jc;
+
+import cn.ac.iie.storm.bolt.conn.ConnUnstructuredSendBolt;
+import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
+import org.apache.log4j.Logger;
+import org.apache.storm.topology.BasicOutputCollector;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.topology.base.BaseBasicBolt;
+import org.apache.storm.tuple.Tuple;
+
+import java.io.IOException;
+
+import static cn.ac.iie.storm.utils.hos.HosService.httpPostObject;
+import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
+
+public class JcUnstructuredSendBolt extends BaseBasicBolt {
+    String bucketName = null;
+    String filename = null;
+    String s3Url = null;
+    private final static Logger logger = Logger.getLogger(JcUnstructuredSendBolt.class);
+    @Override
+    public void execute(Tuple tuple, BasicOutputCollector basicOutputCollector) {
+        try {
+            bucketName = tuple.getStringByField("bucketName");
+            filename = tuple.getStringByField("filename");
+            s3Url = tuple.getStringByField("s3Url");
+            byte[] bytes = httpPostObject(bucketName, filename);
+            if(bytes!=null) {
+                getConnAnsyHttpPost(s3Url, bytes);
+            }
+            } catch (IOException e) {
+            logger.error("桶："+bucketName+"下的文件"+filename+"发送失败原因为："+e);
+        }
+    }
+    @Override
+    public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) {
+
+    }
+}
diff --git a/src/main/java/cn/ac/iie/storm/spout/SafeKafkaSpout.java b/src/main/java/cn/ac/iie/storm/spout/SafeKafkaSpout.java
index 95a4231..a516b9c 100644
--- a/src/main/java/cn/ac/iie/storm/spout/SafeKafkaSpout.java
+++ b/src/main/java/cn/ac/iie/storm/spout/SafeKafkaSpout.java
@@ -25,7 +25,7 @@ public class SafeKafkaSpout extends BaseRichSpout {
     private static Properties createConsumerConfig() {
         Properties props = new Properties();
         props.put("bootstrap.servers", StreamAggregateConfig.BOOTSTRAP_SERVERS);
-        props.put("group.id", StreamAggregateConfig.GROUP_SAFE_ID);
+        props.put("group.id", StreamAggregateConfig.GROUP_ID);
         props.put("session.timeout.ms", "60000");
         props.put("max.poll.records", 3000);
         props.put("max.partition.fetch.bytes", 31457280);
@@ -47,7 +47,6 @@ public class SafeKafkaSpout extends BaseRichSpout {
     @Override
     public void nextTuple() {
         try {
-
             ConsumerRecords<String, String> records = consumer.poll(StreamAggregateConfig.KAFKA_COMSUMER_POLL);
             Thread.sleep(StreamAggregateConfig.TOPOLOGY_SPOUT_SLEEP_TIME);
             for (ConsumerRecord<String, String> record : records) {
diff --git a/src/main/java/cn/ac/iie/storm/topology/StreamAggregateTopology.java b/src/main/java/cn/ac/iie/storm/topology/StreamAggregateTopology.java
index 9d271b8..a12ba72 100644
--- a/src/main/java/cn/ac/iie/storm/topology/StreamAggregateTopology.java
+++ b/src/main/java/cn/ac/iie/storm/topology/StreamAggregateTopology.java
@@ -19,6 +19,8 @@ import org.apache.storm.generated.InvalidTopologyException;
 import org.apache.storm.topology.TopologyBuilder;
 
 
+
+
 public class StreamAggregateTopology {
 
  private static Logger logger = Logger.getLogger(StreamAggregateTopology.class);
@@ -59,28 +61,31 @@ public class StreamAggregateTopology {
         //设置拓扑关系(Bolt) --切分行    ---分发bolt
         switch (StreamAggregateConfig.TOPOLOGY_LOGO) {
             case "conn":
-                topologyBuilder.setSpout(StreamAggregateConfig.KAFKA_SPOUT, new FloodingKafkaSpout(), StreamAggregateConfig.CONN_SPOUT_PARALLELISM);
+                topologyBuilder.setSpout(StreamAggregateConfig.KAFKA_SPOUT, new FloodingKafkaSpout(), StreamAggregateConfig.SPOUT_PARALLELISM);
 
-                topologyBuilder.setBolt(StreamAggregateConfig.CONN_PARSE_COMPONENTID, new ConnParseBolt(), StreamAggregateConfig.CONN_PARSE_PARALLELISM)
+                topologyBuilder.setBolt(StreamAggregateConfig.CONN_PARSE_COMPONENTID, new ConnParseBolt(), StreamAggregateConfig.PARSE_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.KAFKA_SPOUT);
 
-                topologyBuilder.setBolt("CONN-SEND", new ConnSendBolt(),StreamAggregateConfig.CONN_SEND_PARALLELISM)
+                topologyBuilder.setBolt("CONN-SEND", new ConnSendBolt(),StreamAggregateConfig.SEND_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_DNS_STREAMID)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_VPN_STREAMID)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_MAIL_STREAMID)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_JSTX_STREAMID)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_FTP_STREAMID);
 
-                topologyBuilder.setBolt("CONN-IP-SEND",new ConnIPSendBolt(),StreamAggregateConfig.CONN_IP_SEND_PARALLELISM)
+                topologyBuilder.setBolt("CONN-IP-SEND",new ConnIPSendBolt(),StreamAggregateConfig.IP_SEND_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_IP_STREAMID);
 
-                topologyBuilder.setBolt("CONN-HTTP-SEND",new ConnHTTPSendBolt(),StreamAggregateConfig.CONN_HTTP_SEND_PARALLELISM)
+                topologyBuilder.setBolt("CONN-HTTP-SEND",new ConnHTTPSendBolt(),StreamAggregateConfig.HTTP_SEND_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_HTTP_STREAMID);
 
-                topologyBuilder.setBolt("CONN-SSL-SEND",new ConnSSLSendBolt(),StreamAggregateConfig.CONN_SSL_SEND_PARALLELISM)
+                topologyBuilder.setBolt("CONN-SSL-SEND",new ConnSSLSendBolt(),StreamAggregateConfig.SSL_SEND_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_SSL_STREAMID);
 
-                topologyBuilder.setBolt("CONN-COUNT", new ConnCountBolt(),StreamAggregateConfig.CONN_COUNT_SEND_PARALLELISM)
+                topologyBuilder.setBolt("CONN-UNSTRUCTURED-SEND",new ConnUnstructuredSendBolt(),StreamAggregateConfig.UNSTRUCTURED_SEND_PARALLELISM)
+                        .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,"conn-unstructured");
+
+                topologyBuilder.setBolt("CONN-COUNT", new ConnCountBolt(),StreamAggregateConfig.COUNT_SEND_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.CONN_PARSE_COMPONENTID,StreamAggregateConfig.CONN_YBInputSize_STREAMID)
                         .shuffleGrouping("CONN-SEND")
                         .shuffleGrouping("CONN-IP-SEND")
@@ -88,29 +93,26 @@ public class StreamAggregateTopology {
                         .shuffleGrouping("CONN-SSL-SEND");
                 break;
             case "gk":
-                topologyBuilder.setSpout(StreamAggregateConfig.KAFKA_SPOUT, new SafeKafkaSpout(), StreamAggregateConfig.SAFE_SPOUT_PARALLELISM);
+                topologyBuilder.setSpout(StreamAggregateConfig.KAFKA_SPOUT, new SafeKafkaSpout(), StreamAggregateConfig.SPOUT_PARALLELISM);
 
-                topologyBuilder.setBolt("GK-PARSE",new GkParseBolt(),StreamAggregateConfig.GK_PARSE_PARALLELISM)
+                topologyBuilder.setBolt("GK-PARSE",new GkParseBolt(),StreamAggregateConfig.PARSE_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.KAFKA_SPOUT);
-
-                topologyBuilder.setBolt(("GK-SEND"),new GkSendBolt(),StreamAggregateConfig.GK_SEND_PARALLELISM)
+                topologyBuilder.setBolt(("GK-SEND"),new GkSendBolt(),StreamAggregateConfig.SEND_PARALLELISM)
                             .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_DNS_STREAMID)
                             .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_FTP_STREAMID)
                             .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_VPN_STREAMID)
                             .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_MAIL_STREAMID)
                             .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_WYGJC_STREAMID)
                             .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_JSTX_STREAMID);
-
-                topologyBuilder.setBolt(("GK-HTTP-SEND"),new GKHTTPSendBolt(),StreamAggregateConfig.GK_HTTP_SEND_PARALLELISM)
+                topologyBuilder.setBolt(("GK-HTTP-SEND"),new GKHTTPSendBolt(),StreamAggregateConfig.HTTP_SEND_PARALLELISM)
                     .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_HTTP_STREAMID);
-
-                topologyBuilder.setBolt(("GK-IP-SEND"),new GKIPSendBolt(),StreamAggregateConfig.GK_IP_SEND_PARALLELISM)
+                topologyBuilder.setBolt(("GK-IP-SEND"),new GKIPSendBolt(),StreamAggregateConfig.IP_SEND_PARALLELISM)
                            .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_IP_STREAMID);
-
-                topologyBuilder.setBolt(("GK-SSL-SEND"),new GKSSLSendBolt(),StreamAggregateConfig.GK_SSL_SEND_PARALLELISM)
+                topologyBuilder.setBolt(("GK-SSL-SEND"),new GKSSLSendBolt(),StreamAggregateConfig.SSL_SEND_PARALLELISM)
                            .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_SSL_STREAMID);
-
-                topologyBuilder.setBolt("GK-COUNT", new GkCountBolt(),StreamAggregateConfig.GK_COUNT_SEND_PARALLELISM)
+                topologyBuilder.setBolt("GK-UNSTRUCTURED-SEND",new GkUnstructuredSendBolt(),StreamAggregateConfig.UNSTRUCTURED_SEND_PARALLELISM)
+                        .shuffleGrouping("GK-PARSE","gk-unstructured");
+                topologyBuilder.setBolt("GK-COUNT", new GkCountBolt(),StreamAggregateConfig.COUNT_SEND_PARALLELISM)
                         .shuffleGrouping("GK-PARSE",StreamAggregateConfig.GK_COUNT_STREAMID)
                         .shuffleGrouping("GK-HTTP-SEND")
                         .shuffleGrouping("GK-IP-SEND")
@@ -118,12 +120,12 @@ public class StreamAggregateTopology {
                         .shuffleGrouping("GK-SEND");
             break;
             case "jc":
-                topologyBuilder.setSpout(StreamAggregateConfig.KAFKA_SPOUT, new SafeKafkaSpout(), StreamAggregateConfig.SAFE_SPOUT_PARALLELISM);
+                topologyBuilder.setSpout(StreamAggregateConfig.KAFKA_SPOUT, new SafeKafkaSpout(), StreamAggregateConfig.SPOUT_PARALLELISM);
 
-                topologyBuilder.setBolt("JC-PARSE",new JCParseBolt(),StreamAggregateConfig.JC_PARSE_PARALLELISM)
+                topologyBuilder.setBolt("JC-PARSE",new JCParseBolt(),StreamAggregateConfig.PARSE_PARALLELISM)
                         .shuffleGrouping(StreamAggregateConfig.KAFKA_SPOUT);
-
-                topologyBuilder.setBolt("JC-SEND", new JCSendBolt(),StreamAggregateConfig.JC_SEND_PARALLELISM)
+                topologyBuilder.setBolt("JC-SEND", new JCSendBolt(),StreamAggregateConfig.SEND_PARALLELISM)
+                        .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_DNS_STREAMID)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_VPN_STREAMID)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_MAIL_STREAMID)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_JSTX_STREAMID)
@@ -131,24 +133,18 @@ public class StreamAggregateTopology {
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_MEDIA_STREAMID)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_WYGJC_STREAMID)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_FTP_STREAMID);
-
-                topologyBuilder.setBolt("JC-IP-SEND",new JCIPSendBolt(),StreamAggregateConfig.JC_IP_SEND_PARALLELISM)
+                topologyBuilder.setBolt("JC-IP-SEND",new JCIPSendBolt(),StreamAggregateConfig.IP_SEND_PARALLELISM)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_IP_STREAMID);
-
-                topologyBuilder.setBolt("JC-DNS-SEND",new JCDNSSendBolt(),StreamAggregateConfig.JC_DNS_SEND_PARALLELISM)
-                        .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_DNS_STREAMID);
-
-                topologyBuilder.setBolt("JC-HTTP-SEND",new JCHTTPSendBolt(),StreamAggregateConfig.JC_HTTP_SEND_PARALLELISM)
+                topologyBuilder.setBolt("JC-HTTP-SEND",new JCHTTPSendBolt(),StreamAggregateConfig.HTTP_SEND_PARALLELISM)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_HTTP_STREAMID);
-
-                topologyBuilder.setBolt("JC-SSL-SEND",new JCSSLSendBolt(),StreamAggregateConfig.JC_SSL_SEND_PARALLELISM)
+                topologyBuilder.setBolt("JC-SSL-SEND",new JCSSLSendBolt(),StreamAggregateConfig.SSL_SEND_PARALLELISM)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_SSL_STREAMID);
-
-                topologyBuilder.setBolt("JC-COUNT", new JCCountBolt(),StreamAggregateConfig.JC_COUNT_SEND_PARALLELISM)
+                topologyBuilder.setBolt("JC-UNSTRUCTURED-SEND",new JcUnstructuredSendBolt(),StreamAggregateConfig.UNSTRUCTURED_SEND_PARALLELISM)
+                        .shuffleGrouping("JC-PARSE","jc-unstructured");
+                topologyBuilder.setBolt("JC-COUNT", new JCCountBolt(),StreamAggregateConfig.COUNT_SEND_PARALLELISM)
                         .shuffleGrouping("JC-PARSE",StreamAggregateConfig.JC_COUNT_STREAMID)
                         .shuffleGrouping("JC-SEND")
                         .shuffleGrouping("JC-IP-SEND")
-                        .shuffleGrouping("JC-DNS-SEND")
                         .shuffleGrouping("JC-HTTP-SEND")
                         .shuffleGrouping("JC-SSL-SEND");
                 break;
@@ -186,6 +182,5 @@ public class StreamAggregateTopology {
             logger.info("执行远程部署模式...");
             csst.runRemotely();
         }
-
     }
 }
diff --git a/src/main/java/cn/ac/iie/storm/utils/combine/httpurl/Http_URL_process.java b/src/main/java/cn/ac/iie/storm/utils/combine/httpurl/Http_URL_process.java
index e37c712..94c326b 100644
--- a/src/main/java/cn/ac/iie/storm/utils/combine/httpurl/Http_URL_process.java
+++ b/src/main/java/cn/ac/iie/storm/utils/combine/httpurl/Http_URL_process.java
@@ -9,18 +9,23 @@ import java.util.regex.Pattern;
 public class Http_URL_process {
     private final static Logger logger = Logger.getLogger(Http_URL_process.class);
     public static String  getFile_Name(String url) {
-
-
-        String file_name = "";
+        String name = null;
+        String file_name = null;
         if (url == null) {
             return "null";
         } else {
-            String str = url.replace(" ", "");
             try {
                 String[] ss = url.split("/");
-                String s = ss[ss.length - 1];
-                String[] split = s.split("\\?");
-                file_name = split[0];
+                name = ss[ss.length - 1];
+                if (name.contains("?")){
+                    String[] split = name.split("\\?");
+                    name= split[0];
+                }
+                if (name.length()>512){
+                    file_name = name.substring(0,512);
+                }else {
+                    file_name = name;
+                }
             } catch (ArrayIndexOutOfBoundsException e) {
 //            logger.error("该消息中没有File_name.");
             } catch (Exception e) {
@@ -28,7 +33,5 @@ public class Http_URL_process {
                 System.out.println("这是url" + url);
             }
             return file_name;
+        }}
         }
-    }
-
-}
diff --git a/src/main/java/cn/ac/iie/storm/utils/config/GetMap.java b/src/main/java/cn/ac/iie/storm/utils/config/GetMap.java
index 4084161..5e73e08 100644
--- a/src/main/java/cn/ac/iie/storm/utils/config/GetMap.java
+++ b/src/main/java/cn/ac/iie/storm/utils/config/GetMap.java
@@ -2,7 +2,6 @@ package cn.ac.iie.storm.utils.config;
 
 import org.apache.logging.log4j.util.PropertiesUtil;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +19,7 @@ public class GetMap {
 
 
     private static Map<String, String> labelMap;
-    private static Map<String, String> appId;
+    private static Map<String, String> appMap;
     private static Map<String, String> cityMap;
     private static Map<String, String> provinceMap;
     private static Map<String, String> countryMap;
@@ -28,19 +27,16 @@ public class GetMap {
 
 
 
-    public static String  getJstxDetail_id(String common_app_id) throws IOException {
-        if (appId.get(common_app_id) == null) {
-            if (jstxIdMap.get(common_app_id) != null){
-                return jstxIdMap.get(common_app_id);
-            }else {
-                return "";
-            }
-        }else {
-            return appId.get(common_app_id);
+    public static String  getJstxDetail_id(int common_app_id){
+        String appId = String.valueOf(common_app_id);
+        if (appMap.get(appId) != null) {
+            return appMap.get(appId);
+        } else {
+            return appId;
         }
     }
 
-    public static String getProto_id(String common_schema_type) throws IOException {
+    public static String getProto_id(String common_schema_type){
         return labelMap.get(common_schema_type);
     }
 
@@ -48,7 +44,7 @@ public class GetMap {
         String[] split;
         if(location==null){
             return "0";
-        }else if (location.contains(",,")){
+        } else if (location.contains(",,")){
            split = location.split(",,");
             if (split.length == 2) {
                 String s = split[0];
@@ -63,12 +59,14 @@ public class GetMap {
                 return "0";
             }
         } else {
-            String str = cityMap.get(location);
-            split = location.split(",");
+            String loc = location.replace(" ","");
+            String str = cityMap.get(loc);
+            split = loc.split(",");
             if ((str == null&&split.length==3)) {
-                str = provinceMap.get(split[1].replace(" ", ""));
+                str = provinceMap.get(split[1]);
                 if (str == null) {
-                    str = countryMap.get(split[2].replace(" ", ""));
+                    String ss = split[2];
+                    str = countryMap.get(ss);
                     if (str == null) {
                         str = "0";
                     }
@@ -108,11 +106,21 @@ public class GetMap {
         }
     }
 
+    public static String getDns_name(String dns_qname){
+        if (dns_qname==null){
+            return "";
+        }else if (dns_qname.contains(" ")){
+            return "";
+        }else {
+            return dns_qname;
+        }
+    }
+
 
     static {
         try {
             InputStream applabel = PropertiesUtil.class.getClassLoader().getResourceAsStream("common_app_label_coding.properties");
-            InputStream appid = PropertiesUtil.class.getClassLoader().getResourceAsStream("common_app_id_coding.properties");
+            InputStream app = PropertiesUtil.class.getClassLoader().getResourceAsStream("common_app_id_coding.properties");
             InputStream jstxid = PropertiesUtil.class.getClassLoader().getResourceAsStream("common_jstx_id_coding.properties");
 
             InputStream cityNumbering = PropertiesUtil.class.getClassLoader().getResourceAsStream("common_city_coding.properties");
@@ -120,7 +128,7 @@ public class GetMap {
             InputStream countryNumbering = PropertiesUtil.class.getClassLoader().getResourceAsStream("common_country_coding.properties");
 
 
-            propService1.load(appid);
+            propService1.load(app);
             propService.load(applabel);
             propService_jstx.load(jstxid);
 
@@ -129,7 +137,7 @@ public class GetMap {
             propService_country.load(countryNumbering);
 
 
-            appId = new HashMap<String, String>((Map)propService1);
+            appMap = new HashMap<String, String>((Map)propService1);
             labelMap = new HashMap<String, String>((Map) propService);
             jstxIdMap = new HashMap<String, String>((Map) propService_jstx);
             cityMap = new HashMap<String, String>((Map) propService_city);
@@ -145,5 +153,4 @@ public class GetMap {
             propService_country = null;
         }
     }
-
 }
diff --git a/src/main/java/cn/ac/iie/storm/utils/config/StreamAggregateConfig.java b/src/main/java/cn/ac/iie/storm/utils/config/StreamAggregateConfig.java
index e0edd7d..51707c3 100644
--- a/src/main/java/cn/ac/iie/storm/utils/config/StreamAggregateConfig.java
+++ b/src/main/java/cn/ac/iie/storm/utils/config/StreamAggregateConfig.java
@@ -14,8 +14,7 @@ public class StreamAggregateConfig {
     /**
      * System
      */
-    public static final Integer SAFE_SPOUT_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"safe.spout.parallelism");
-    public static final Integer CONN_SPOUT_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.spout.parallelism");
+    public static final Integer SPOUT_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"spout.parallelism");
     public static final Integer MAX_SPOUT_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"max.spout.parallelism");
     public static final Integer TOPOLOGY_NUM_ACKS = StreamAggregateConfigurations.getIntProperty(0, "topology.num.acks");
     public static final Integer TOPOLOGY_SPOUT_SLEEP_TIME = StreamAggregateConfigurations.getIntProperty(0, "topology.spout.sleep.time");
@@ -30,7 +29,7 @@ public class StreamAggregateConfig {
 
     public static final String BOOTSTRAP_SERVERS = StreamAggregateConfigurations.getStringProperty(0, "bootstrap.servers");
     public static final String GROUP_ID = StreamAggregateConfigurations.getStringProperty(0, "group.id");
-    public static final String GROUP_SAFE_ID = StreamAggregateConfigurations.getStringProperty(0, "group.safe.id");
+
     public static final String KAFKA_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "kafka.topic");
     public static final String KAFKA_SAFE_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "kafka.safe.topic");
     public static final String AUTO_OFFSET_RESET = StreamAggregateConfigurations.getStringProperty(0, "auto.offset.reset");
@@ -38,20 +37,21 @@ public class StreamAggregateConfig {
      * flooding
      */
     //Flooding-bolt设置
-    public static final int CONN_TOPOLOGY_TICK_TUPLE_FREQ_SECS = StreamAggregateConfigurations.getIntProperty(0,"conn.topology.tick.tuple.freq.secs");  //定时
+    public static final int TOPOLOGY_TICK_TUPLE_FREQ_SECS = StreamAggregateConfigurations.getIntProperty(0,"topology.tick.tuple.freq.secs");  //定时
     //分批
-    public static final int CONN_BATCH_INTER_NUM = StreamAggregateConfigurations.getIntProperty(0,"conn.batch.inter.num");
+    public static final int BATCH_INTER_NUM = StreamAggregateConfigurations.getIntProperty(0,"batch.inter.num");
 
     //conn-ComponentId-spout
     public static final String KAFKA_SPOUT = StreamAggregateConfigurations.getStringProperty(0, "kafka.spout");
     //#conn-bolt-parallelism_hint
-    public static final int CONN_PARSE_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.parse.parallelism");
-    public static final int CONN_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.send.parallelism");
+    public static final int PARSE_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"parse.parallelism");
+    public static final int SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"send.parallelism");
+    public static final int IP_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"ip.send.parallelism");
+    public static final int HTTP_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"http.send.parallelism");
+    public static final int SSL_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"ssl.send.parallelism");
+    public static final int COUNT_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"count.send.parallelism");
+    public static final int UNSTRUCTURED_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"unstructured.send.parallelism");
 
-    public static final int CONN_IP_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.ip.send.parallelism");
-    public static final int CONN_HTTP_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.http.send.parallelism");
-    public static final int CONN_SSL_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.ssl.send.parallelism");
-    public static final int CONN_COUNT_SEND_PARALLELISM = StreamAggregateConfigurations.getIntProperty(0,"conn.count.send.parallelism");
 
     //conn-ComponentId-bolt
     public static final String CONN_PARSE_COMPONENTID = StreamAggregateConfigurations.getStringProperty(0, "conn.parse.componentid");
@@ -80,13 +80,6 @@ public class StreamAggregateConfig {
      * safa
      */
 
-    //Flooding-bolt设置
-    //定时
-    public static final int SAFE_TOPOLOGY_TICK_TUPLE_FREQ_SECS = StreamAggregateConfigurations.getIntProperty(0,"safe.topology.tick.tuple.freq.secs");
-    //分批
-    public static final int SAFE_BATCH_INTER_NUM = StreamAggregateConfigurations.getIntProperty(0,"safe.batch.inter.num");
-
-
     //Flooding-spout-field
     public static final String SAFE_SPOUT_FIELD = StreamAggregateConfigurations.getStringProperty(0, "safe.spout.field");
 
@@ -97,7 +90,7 @@ public class StreamAggregateConfig {
     //Flooding-http-post-url
 
     //flooding.http.post.socketTimeOut
-    public static final Integer FLOODING_HTTP_POST_SOCKETTIMEOUT = StreamAggregateConfigurations.getIntProperty(0,"flooding.http.post.socketTimeOut");
+    public static final Integer HTTP_POST_SOCKETTIMEOUT = StreamAggregateConfigurations.getIntProperty(0,"http.post.socketTimeOut");
 
     public static final  String HTTP_HEARDER_FORMAT = StreamAggregateConfigurations.getStringProperty(0,"http.hearder.format");
     public static final  String HTTP_HEARDER_CONECTION = StreamAggregateConfigurations.getStringProperty(0,"http.hearder.conection");
@@ -109,24 +102,43 @@ public class StreamAggregateConfig {
 
 
     //flooding.post.topic
-    public static final String FLOODING_POST_DNS_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.dns.topic");
-    public static final String FLOODING_POST_FTP_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.ftp.topic");
-    public static final String FLOODING_POST_HTTP_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.http.topic");
-    public static final String FLOODING_POST_IP_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.ip.topic");
-    public static final String FLOODING_POST_JSTX_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.jstx.topic");
-    public static final String FLOODING_POST_MAIL_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.mail.topic");
-    public static final String FLOODING_POST_SSL_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.ssl.topic");
-    public static final String FLOODING_POST_VPN_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "flooding.post.vpn.topic");
+    public static final String CONN_POST_DNS_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.dns.topic");
+    public static final String CONN_POST_FTP_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.ftp.topic");
+    public static final String CONN_POST_HTTP_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.http.topic");
+    public static final String CONN_POST_IP_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.ip.topic");
+    public static final String CONN_POST_JSTX_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.jstx.topic");
+    public static final String CONN_POST_MAIL_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.mail.topic");
+    public static final String CONN_POST_SSL_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.ssl.topic");
+    public static final String CONN_POST_VPN_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "conn.post.vpn.topic");
 
 
 
-    public static final String  HTTP_POST_FLOODING_IP = StreamAggregateConfigurations.getStringProperty(0, "http.post.flooding.ip");
+    public static final String  HTTP_POST_IP = StreamAggregateConfigurations.getStringProperty(0, "http.post.ip");
 
-    public static final String  HTTP_POST_SAFE_IP = StreamAggregateConfigurations.getStringProperty(0, "http.post.safe.ip");
+    public static final String  HTTP_POST_PORT = StreamAggregateConfigurations.getStringProperty(0, "http.post.port");
 
+    public static final String  S3_POST_IP = StreamAggregateConfigurations.getStringProperty(0, "s3.post.ip");
 
-    public static final String  HTTP_POST_PORT = StreamAggregateConfigurations.getStringProperty(0, "http.post.port");
+    public static final String  S3_POST_PORT = StreamAggregateConfigurations.getStringProperty(0, "s3.post.port");
+
+    public static final String  HOS_URL = StreamAggregateConfigurations.getStringProperty(0, "hos.url");
+
+    public static final int HOS_POOL_MAXCONNECTIONS = StreamAggregateConfigurations.getIntProperty(0,"hos.pool.maxconnections");
+    public static final int HOS_POOL_MAXERRORRETRY = StreamAggregateConfigurations.getIntProperty(0,"hos.pool.maxerrorretry");
+    public static final int HOS_POOL_REQUESTTIMEOUT = StreamAggregateConfigurations.getIntProperty(0,"hos.pool.requesttimeout");
+    public static final int HOS_POOL_CONNECTIONTIMEOUT = StreamAggregateConfigurations.getIntProperty(0,"hos.pool.connectiontimeout");
+    public static final int HOS_POOL_CONNECTIONTTL = StreamAggregateConfigurations.getIntProperty(0,"hos.pool.connectionttl");
+    public static final int HOS_POOL_SOCKETTIMEOUT = StreamAggregateConfigurations.getIntProperty(0,"hos.pool.sockettimeout");
 
+
+
+
+    public static final String  S3_HEARDER_USERNAME = StreamAggregateConfigurations.getStringProperty(0, "s3.hearder.username");
+    public static final String  S3_HEARDER_PASSWORD = StreamAggregateConfigurations.getStringProperty(0, "s3.hearder.password");
+    public static final String  S3_HEARDER_FILETYPE = StreamAggregateConfigurations.getStringProperty(0, "s3.hearder.filetype");
+    public static final String  S3_HEARDER_FILETITLE = StreamAggregateConfigurations.getStringProperty(0, "s3.hearder.filetitle");
+    public static final String  S3_HEARDER_ISFULLTEX = StreamAggregateConfigurations.getStringProperty(0, "s3.hearder.isfulltex");
+    public static final String  S3_HEARDER_CONTENTTYPE = StreamAggregateConfigurations.getStringProperty(0, "s3.hearder.contenttype");
     /**
      * count
      */
@@ -140,15 +152,6 @@ public class StreamAggregateConfig {
     /**
      * gk
      */
-    public static final int GK_PARSE_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"gk.parse.parallelism");
-    public static final int GK_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"gk.send.parallelism");
-    public static final int GK_HTTP_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"gk.http.send.parallelism");
-    public static final int GK_IP_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"gk.ip.send.parallelism");
-    public static final int GK_SSL_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"gk.ssl.send.parallelism");
-    public static final int GK_COUNT_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"gk.count.send.parallelism");
-
-
-
     public static final String IP_GKRZ_SCHEMA = StreamAggregateConfigurations.getStringProperty(0, "ip.gkrz.schema");
     public static final String DNS_GKZB_SCHEMA = StreamAggregateConfigurations.getStringProperty(0, "dns.gkzb.schema");
     public static final String HTTP_GKZB_SCHEMA = StreamAggregateConfigurations.getStringProperty(0, "http.gkzb.schema");
@@ -230,15 +233,20 @@ public class StreamAggregateConfig {
     public static final String JC_POST_MEDIA_TOPIC = StreamAggregateConfigurations.getStringProperty(0, "jc.post.media.topic");
 
 
+    public static final String T_HTTP_RZZB = StreamAggregateConfigurations.getStringProperty(0, "t.http.rzzb");
+    public static final String T_HTTP_JCZB = StreamAggregateConfigurations.getStringProperty(0, "t.http.jczb");
+    public static final String T_HTTP_GKZB = StreamAggregateConfigurations.getStringProperty(0, "t.http.gkzb");
+
+
+    public static final String T_MAIL_RZZB = StreamAggregateConfigurations.getStringProperty(0, "t.mail.rzzb");
+    public static final String T_MAIL_JCZB = StreamAggregateConfigurations.getStringProperty(0, "t.mail.jczb");
+    public static final String T_MAIL_GKZB = StreamAggregateConfigurations.getStringProperty(0, "t.mail.gkzb");
 
-    public static final int JC_PARSE_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.parse.parallelism");
-    public static final int JC_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.send.parallelism");
-    public static final int JC_HTTP_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.http.send.parallelism");
-    public static final int JC_IP_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.ip.send.parallelism");
-    public static final int JC_SSL_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.ssl.send.parallelism");
-    public static final int JC_COUNT_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.count.send.parallelism");
-    public static final int JC_DNS_SEND_PARALLELISM= StreamAggregateConfigurations.getIntProperty(0,"jc.dns.send.parallelism");
+    public static final String T_WYGJC_JCRZ = StreamAggregateConfigurations.getStringProperty(0, "t.wygjc.jcrz");
+    public static final String T_WYGJC_GKRZ = StreamAggregateConfigurations.getStringProperty(0, "t.wygjc.gkrz");
 
+    public static final String T_PIC_JCZB = StreamAggregateConfigurations.getStringProperty(0, "t.pic.jczb");
+    public static final String T_MEDIA_JCZB = StreamAggregateConfigurations.getStringProperty(0, "t.media.jczb");
 
 
 
diff --git a/src/main/java/cn/ac/iie/storm/utils/general/CONNAssignment.java b/src/main/java/cn/ac/iie/storm/utils/general/CONNAssignment.java
index 245770e..4bc0a1f 100644
--- a/src/main/java/cn/ac/iie/storm/utils/general/CONNAssignment.java
+++ b/src/main/java/cn/ac/iie/storm/utils/general/CONNAssignment.java
@@ -13,7 +13,6 @@ import static cn.ac.iie.storm.utils.combine.httpurl.Http_URL_process.getFile_Nam
 import static cn.ac.iie.storm.utils.config.GetMap.*;
 
 import static cn.ac.iie.storm.utils.general.MailTrans.*;
-import static cn.ac.iie.storm.utils.general.MailTrans.getNum;
 import static cn.ac.iie.storm.utils.general.TransFormUtils.*;
 
 public class CONNAssignment {
@@ -37,7 +36,7 @@ public class CONNAssignment {
         dns_rzzb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
         dns_rzzb.put("SC_PKTS",sessionRecordLog.getCommon_s2c_pkt_num());
         dns_rzzb.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
-        dns_rzzb.put("DNS_NAME",sessionRecordLog.getDns_qname());
+        dns_rzzb.put("DNS_NAME",getDns_name(sessionRecordLog.getDns_qname()));
         dns_rzzb.put("DNS_VALUE",sessionRecordLog.getDns_rr());
     }
 
@@ -77,6 +76,7 @@ public class CONNAssignment {
            http_rzzb.put("PROTOCOL", getProtocol(sessionRecordLog.getCommon_l4_protocol()));
            http_rzzb.put("YYS", getYys(sessionRecordLog.getCommon_data_center()));
            http_rzzb.put("YL1", sessionRecordLog.getCommon_address_type());
+           http_rzzb.put("YL5",sessionRecordLog.getHttp_response_body());
            //http特有
            http_rzzb.put("CS_PKTS",sessionRecordLog.getCommon_c2s_pkt_num());
            http_rzzb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
@@ -87,7 +87,7 @@ public class CONNAssignment {
            http_rzzb.put("USER_AGENT",sessionRecordLog.getHttp_user_agent());
            http_rzzb.put("COOKIE",sessionRecordLog.getHttp_cookie());
            http_rzzb.put("FILE_NAME",getFile_Name(sessionRecordLog.getHttp_url()));
-           http_rzzb.put("CONTENT",sessionRecordLog.getHttp_snapshot());
+           http_rzzb.put("CONTENT",sessionRecordLog.getHttp_response_content());
 
     }
     public static void setVPN_RZZB(GenericRecord vpn_rzzb, SessionRecordLog sessionRecordLog) throws IOException {
@@ -99,7 +99,7 @@ public class CONNAssignment {
         vpn_rzzb.put("DIP",getIP(sessionRecordLog.getCommon_address_type(),sessionRecordLog.getCommon_server_ip()));
         vpn_rzzb.put("SPORT",sessionRecordLog.getCommon_client_port());
         vpn_rzzb.put("DPORT",sessionRecordLog.getCommon_server_port());
-        vpn_rzzb.put("PROTO_ID","04");
+        vpn_rzzb.put("PROTO_ID",getProto_id(sessionRecordLog.getCommon_schema_type()));
         vpn_rzzb.put("DETAIL_ID",getVpnDetail_id(sessionRecordLog.getCommon_l7_protocol()));
         vpn_rzzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));
         vpn_rzzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center()));
@@ -173,6 +173,7 @@ public class CONNAssignment {
         mail_rzzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));
         mail_rzzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center()));
         mail_rzzb.put("YL1",sessionRecordLog.getCommon_address_type());
+        mail_rzzb.put("YL5",sessionRecordLog.getHttp_response_body());
         //根据mail_bcc填充
 
         //mail特有
@@ -199,7 +200,8 @@ public class CONNAssignment {
         mail_rzzb.put("ACCESSORY", getAccessory(sessionRecordLog.getMail_attachment_name()));
 
         mail_rzzb.put("FILE_NAME",sessionRecordLog.getMail_attachment_name());
-        mail_rzzb.put("FILE_CONTENT",sessionRecordLog.getMail_attachment_content());
+
+        mail_rzzb.put("FILE_CONTENT",sessionRecordLog.getMail_eml_file());
         mail_rzzb.put("PWD",sessionRecordLog.getMail_passwd());
 
         mail_rzzb.put("FJFWS",getFjfws(sessionRecordLog.getMail_from()));
@@ -235,6 +237,6 @@ public class CONNAssignment {
         jstx_rzzb.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
         jstx_rzzb.put("HOST",sessionRecordLog.getHttp_host());
         jstx_rzzb.put("URL",sessionRecordLog.getHttp_url());
-        jstx_rzzb.put("USER_AGENT",sessionRecordLog.getHttp_user_agent());
     }
+
 }
diff --git a/src/main/java/cn/ac/iie/storm/utils/general/GKAssignment.java b/src/main/java/cn/ac/iie/storm/utils/general/GKAssignment.java
index 89ea1ad..bc5a9a6 100644
--- a/src/main/java/cn/ac/iie/storm/utils/general/GKAssignment.java
+++ b/src/main/java/cn/ac/iie/storm/utils/general/GKAssignment.java
@@ -62,7 +62,7 @@ public class GKAssignment {
         dns_gkzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         dns_gkzb.put("YL1",sessionRecordLog.getCommon_address_type());
         //dns特有
-        dns_gkzb.put("DNS_NAME",sessionRecordLog.getDns_qname());
+        dns_gkzb.put("DNS_NAME",getDns_name(sessionRecordLog.getDns_qname()));
         dns_gkzb.put("DNS_VALUE",sessionRecordLog.getDns_rr());
     }
 
@@ -88,6 +88,7 @@ public class GKAssignment {
         http_gkzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         http_gkzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         http_gkzb.put("YL1",sessionRecordLog.getCommon_address_type());
+        http_gkzb.put("YL5",sessionRecordLog.getHttp_response_body());
         //http特有
         http_gkzb.put("HOST",sessionRecordLog.getHttp_host());
         http_gkzb.put("URL",sessionRecordLog.getHttp_url());
@@ -143,13 +144,14 @@ public class GKAssignment {
         wygjc_gkzb.put("SPORT",sessionRecordLog.getCommon_client_port());
         wygjc_gkzb.put("DPORT",sessionRecordLog.getCommon_server_port());
         wygjc_gkzb.put("PROTO_ID",getProto_id(sessionRecordLog.getCommon_schema_type()));  ///--转化表 还没弄
-        wygjc_gkzb.put("DETAIL_ID","1"); //同上
+        wygjc_gkzb.put("DETAIL_ID","01999"); //同上
         wygjc_gkzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         wygjc_gkzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         wygjc_gkzb.put("YL1",sessionRecordLog.getCommon_address_type());
+        wygjc_gkzb.put("YL5",sessionRecordLog.getHttp_response_body());
         //wygjc特有
         wygjc_gkzb.put("JC_URL",sessionRecordLog.getHttp_url());
-        wygjc_gkzb.put("SSYQ",getSsqy(sessionRecordLog.getHttp_user_agent()));
+        wygjc_gkzb.put("SSYQ",sessionRecordLog.getHttp_domain());
         wygjc_gkzb.put("CONTENT",sessionRecordLog.getHttp_snapshot());
         wygjc_gkzb.put("YYZL",sessionRecordLog.getYyzl());
         wygjc_gkzb.put("GJZ",sessionRecordLog.getGjc());
@@ -176,20 +178,21 @@ public class GKAssignment {
         mail_gkzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         mail_gkzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         mail_gkzb.put("YL1",sessionRecordLog.getCommon_address_type());
+        mail_gkzb.put("YL5",sessionRecordLog.getHttp_response_body());
 
-        mail_gkzb.put("YL2",getNum(sessionRecordLog.getMail_bcc()));
+        mail_gkzb.put("YL2",geSecuritytNum(sessionRecordLog.getMail_bcc()));
         mail_gkzb.put("YL4",getMailRecever(sessionRecordLog.getMail_bcc()));
 
         //mail特有
 
         mail_gkzb.put("MAIL_SENDER",sessionRecordLog.getMail_from());
 
-        mail_gkzb.put("MAIL_RECEVER",getMailRecever(sessionRecordLog.getMail_to()));
+        mail_gkzb.put("MAIL_RECEVER",sessionRecordLog.getMail_to());
 
-        mail_gkzb.put("RECEVER_NUM",getNum(sessionRecordLog.getMail_to()));
+        mail_gkzb.put("RECEVER_NUM",geSecuritytNum(sessionRecordLog.getMail_to()));
 
         mail_gkzb.put("MAIL_CC",sessionRecordLog.getMail_cc());
-        mail_gkzb.put("CC_NUM",getNum(sessionRecordLog.getMail_cc()));
+        mail_gkzb.put("CC_NUM",geSecuritytNum(sessionRecordLog.getMail_cc()));
 
         mail_gkzb.put("MAIL_SUBJECT",sessionRecordLog.getMail_subject());
 
@@ -198,7 +201,7 @@ public class GKAssignment {
         mail_gkzb.put("ACCESSORY",getAccessory(sessionRecordLog.getMail_attachment_name()));
 
         mail_gkzb.put("FILE_NAME",sessionRecordLog.getMail_attachment_name());
-        mail_gkzb.put("FILE_CONTENT",sessionRecordLog.getMail_attachment_content());
+        mail_gkzb.put("FILE_CONTENT",sessionRecordLog.getMail_eml_file());
         mail_gkzb.put("PWD",sessionRecordLog.getMail_passwd());
         mail_gkzb.put("FJFWS",getFjfws(sessionRecordLog.getMail_from()));
         mail_gkzb.put("FJFWS_SZD",getSzd(sessionRecordLog.getCommon_client_location())); //  //境内境外未知，根据Location填充
@@ -261,7 +264,7 @@ public class GKAssignment {
         vpn_gkzb.put("DIP",getIP(sessionRecordLog.getCommon_address_type(),sessionRecordLog.getCommon_server_ip()));
         vpn_gkzb.put("SPORT",sessionRecordLog.getCommon_client_port());
         vpn_gkzb.put("DPORT",sessionRecordLog.getCommon_server_port());
-        vpn_gkzb.put("PROTO_ID","04");  ///--转化表 还没弄
+        vpn_gkzb.put("PROTO_ID",getProto_id(sessionRecordLog.getCommon_schema_type()));  ///--转化表 还没弄
         vpn_gkzb.put("DETAIL_ID",getVpnDetail_id(sessionRecordLog.getCommon_l7_protocol())); //同上
         vpn_gkzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         vpn_gkzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
@@ -288,7 +291,7 @@ public class GKAssignment {
         jstx_gkzb.put("SPORT",sessionRecordLog.getCommon_client_port());
         jstx_gkzb.put("DPORT",sessionRecordLog.getCommon_server_port());
         jstx_gkzb.put("PROTO_ID", GetMap.getProto_id(sessionRecordLog.getCommon_schema_type()));
-        jstx_gkzb.put("DETAIL_ID","02999"); //同上
+        jstx_gkzb.put("DETAIL_ID", GetMap.getJstxDetail_id(sessionRecordLog.getCommon_app_id()));
         jstx_gkzb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         jstx_gkzb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段 //getYys(sessionRecordLog.getCommon_isp())
         jstx_gkzb.put("YL1",sessionRecordLog.getCommon_address_type());
diff --git a/src/main/java/cn/ac/iie/storm/utils/general/JCAssignment.java b/src/main/java/cn/ac/iie/storm/utils/general/JCAssignment.java
index 03113f3..12142a4 100644
--- a/src/main/java/cn/ac/iie/storm/utils/general/JCAssignment.java
+++ b/src/main/java/cn/ac/iie/storm/utils/general/JCAssignment.java
@@ -40,6 +40,9 @@ public class JCAssignment {
         ip_jcrz.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
         ip_jcrz.put("SC_PKTS",sessionRecordLog.getCommon_s2c_pkt_num());
         ip_jcrz.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
+        ip_jcrz.put("HOST",sessionRecordLog.getHttp_host());
+        ip_jcrz.put("URL",sessionRecordLog.getHttp_url());
+        ip_jcrz.put("CONTENT",sessionRecordLog.getHttp_response_content());
 
     }
 
@@ -69,7 +72,7 @@ public class JCAssignment {
         dns_jczb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
         dns_jczb.put("SC_PKTS",sessionRecordLog.getCommon_s2c_pkt_num());
         dns_jczb.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
-        dns_jczb.put("DNS_NAME",sessionRecordLog.getDns_qname());
+        dns_jczb.put("DNS_NAME",getDns_name(sessionRecordLog.getDns_qname()));
         dns_jczb.put("DNS_VALUE",sessionRecordLog.getDns_rr());
     }
 
@@ -94,6 +97,7 @@ public class JCAssignment {
         http_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         http_jczb.put("YYS",getYys(sessionRecordLog.getCommon_data_center()));  //-**common_isp这个字段
         http_jczb.put("YL1",sessionRecordLog.getCommon_address_type());
+        http_jczb.put("YL5",sessionRecordLog.getHttp_response_body());
         //http特有
         http_jczb.put("CS_PKTS",sessionRecordLog.getCommon_c2s_pkt_num());
         http_jczb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
@@ -160,16 +164,15 @@ public class JCAssignment {
        wygjc_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
        wygjc_jczb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
        wygjc_jczb.put("YL1",sessionRecordLog.getCommon_address_type());
+       wygjc_jczb.put("YL5",sessionRecordLog.getHttp_response_body());
         //wygjc特有
        wygjc_jczb.put("CS_PKTS",sessionRecordLog.getCommon_c2s_pkt_num());
        wygjc_jczb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
        wygjc_jczb.put("SC_PKTS",sessionRecordLog.getCommon_s2c_pkt_num());
        wygjc_jczb.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
-
        wygjc_jczb.put("JC_URL",sessionRecordLog.getHttp_url());
-       wygjc_jczb.put("SSYQ",getSsqy(sessionRecordLog.getHttp_user_agent()));
+       wygjc_jczb.put("SSYQ",sessionRecordLog.getHttp_domain());
        wygjc_jczb.put("GJZ",sessionRecordLog.getGjc());
-
        wygjc_jczb.put("CONTENT",sessionRecordLog.getHttp_snapshot());
        wygjc_jczb.put("YYZL",sessionRecordLog.getYyzl());
     }
@@ -194,8 +197,9 @@ public class JCAssignment {
         mail_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         mail_jczb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         mail_jczb.put("YL1",sessionRecordLog.getCommon_address_type());
+        mail_jczb.put("YL5",sessionRecordLog.getHttp_response_body());
 
-        mail_jczb.put("YL2",getNum(sessionRecordLog.getMail_bcc()));
+        mail_jczb.put("YL2",geSecuritytNum(sessionRecordLog.getMail_bcc()));
         mail_jczb.put("YL4",getMailRecever(sessionRecordLog.getMail_bcc()));
 
         //mail特有
@@ -206,11 +210,11 @@ public class JCAssignment {
         mail_jczb.put("MAIL_SENDER",sessionRecordLog.getMail_from());
 
         mail_jczb.put("MAIL_SENDER",sessionRecordLog.getMail_from());
-        mail_jczb.put("MAIL_RECEVER",getMailRecever(sessionRecordLog.getMail_to()));
-        mail_jczb.put("RECEVER_NUM",getNum(sessionRecordLog.getMail_to()));
+        mail_jczb.put("MAIL_RECEVER",sessionRecordLog.getMail_to());
+        mail_jczb.put("RECEVER_NUM",geSecuritytNum(sessionRecordLog.getMail_to()));
 
         mail_jczb.put("MAIL_CC",sessionRecordLog.getMail_cc());
-        mail_jczb.put("CC_NUM",getNum(sessionRecordLog.getMail_cc()));
+        mail_jczb.put("CC_NUM",geSecuritytNum(sessionRecordLog.getMail_cc()));
 
         mail_jczb.put("MAIL_SUBJECT",sessionRecordLog.getMail_subject());
 
@@ -218,7 +222,7 @@ public class JCAssignment {
         mail_jczb.put("ACCESSORY",getAccessory(sessionRecordLog.getMail_attachment_name()));
 
         mail_jczb.put("FILE_NAME",sessionRecordLog.getMail_attachment_name());
-        mail_jczb.put("FILE_CONTENT",sessionRecordLog.getMail_attachment_content());
+        mail_jczb.put("FILE_CONTENT",sessionRecordLog.getMail_eml_file());
         mail_jczb.put("PWD",sessionRecordLog.getMail_passwd());
         mail_jczb.put("FJFWS",getFjfws(sessionRecordLog.getMail_from()));
         mail_jczb.put("FJFWS_SZD",getSzd(sessionRecordLog.getCommon_client_location())); //  //境内境外未知，根据Location填充
@@ -229,9 +233,6 @@ public class JCAssignment {
 
         mail_jczb.put("GJZ",sessionRecordLog.getGjc());
         mail_jczb.put("YYZL",sessionRecordLog.getYyzl());
-
-
-
     }
 
     public static void setFTP_JCZB(GenericRecord ftp_jczb, SessionRecordLog sessionRecordLog) throws IOException {
@@ -264,8 +265,6 @@ public class JCAssignment {
         ftp_jczb.put("FILE_CONTENT",sessionRecordLog.getFtp_url());
         ftp_jczb.put("GJZ",sessionRecordLog.getGjc());
         ftp_jczb.put("YYZL",sessionRecordLog.getYyzl());
-
-
     }
 
 
@@ -285,9 +284,9 @@ public class JCAssignment {
         vpn_jczb.put("DIP",getIP(sessionRecordLog.getCommon_address_type(),sessionRecordLog.getCommon_server_ip()));
         vpn_jczb.put("SPORT",sessionRecordLog.getCommon_client_port());
         vpn_jczb.put("DPORT",sessionRecordLog.getCommon_server_port());
-        vpn_jczb.put("PROTO_ID",getProto_id(sessionRecordLog.getCommon_schema_type()));  ///--转化表 还没弄
-        vpn_jczb.put("DETAIL_ID","04");  ///--转化表 还没弄
-        vpn_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
+        vpn_jczb.put("PROTO_ID",getProto_id(sessionRecordLog.getCommon_schema_type()));
+        vpn_jczb.put("DETAIL_ID",getVpnDetail_id(sessionRecordLog.getCommon_l7_protocol()));
+        vpn_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));
         vpn_jczb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         vpn_jczb.put("YL1",sessionRecordLog.getCommon_address_type());
         //vpn特有
@@ -350,19 +349,15 @@ public class JCAssignment {
         pic_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         pic_jczb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         pic_jczb.put("YL1",sessionRecordLog.getCommon_address_type());
+        pic_jczb.put("YL5",sessionRecordLog.getHttp_response_body());
         //pic特有
         pic_jczb.put("CS_PKTS",sessionRecordLog.getCommon_c2s_pkt_num());
         pic_jczb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
         pic_jczb.put("SC_PKTS",sessionRecordLog.getCommon_s2c_pkt_num());
         pic_jczb.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
-
         pic_jczb.put("PIC_NAME",getFile_Name(sessionRecordLog.getHttp_url()));
-
-        pic_jczb.put("PIC_URL",sessionRecordLog.getHttp_request_header());
-
-        pic_jczb.put("PIC_CONTENT",sessionRecordLog.getHttp_response_body());
-
-        pic_jczb.put("URL",sessionRecordLog.getHttp_url());
+        pic_jczb.put("PIC_URL",sessionRecordLog.getHttp_url());
+        pic_jczb.put("PIC_CONTENT",sessionRecordLog.getHttp_snapshot());
         pic_jczb.put("PIC_TYPE",sessionRecordLog.getHttp_content_type());
         pic_jczb.put("YYZL",sessionRecordLog.getYyzl());
 
@@ -388,15 +383,15 @@ public class JCAssignment {
         media_jczb.put("PROTOCOL",getProtocol(sessionRecordLog.getCommon_l4_protocol()));  //-common_l4_protocol其实是这个字段
         media_jczb.put("YYS",getYys(sessionRecordLog.getCommon_data_center())); //-**common_isp这个字段
         media_jczb.put("YL1",sessionRecordLog.getCommon_address_type());
+        media_jczb.put("YL5",sessionRecordLog.getHttp_response_body());
         //media特有
         media_jczb.put("CS_PKTS",sessionRecordLog.getCommon_c2s_pkt_num());
         media_jczb.put("CS_BYTES",sessionRecordLog.getCommon_c2s_byte_num());
         media_jczb.put("SC_PKTS",sessionRecordLog.getCommon_s2c_pkt_num());
         media_jczb.put("SC_BYTES",sessionRecordLog.getCommon_s2c_byte_num());
         media_jczb.put("MEDIA_NAME",getFile_Name(sessionRecordLog.getHttp_url()));
-        media_jczb.put("MEDIA_URL",sessionRecordLog.getHttp_request_header());
-        media_jczb.put("MEDIA_CONTENT",sessionRecordLog.getHttp_response_body());
-        media_jczb.put("URL",sessionRecordLog.getHttp_url());
+        media_jczb.put("MEDIA_URL",sessionRecordLog.getHttp_url());
+//        media_jczb.put("MEDIA_CONTENT",sessionRecordLog.getHttp_response_body());
         media_jczb.put("MEDIA_TYPE",sessionRecordLog.getHttp_content_type());
         media_jczb.put("YYZL",sessionRecordLog.getYyzl());
     }
diff --git a/src/main/java/cn/ac/iie/storm/utils/general/MailTrans.java b/src/main/java/cn/ac/iie/storm/utils/general/MailTrans.java
index 82c814e..c506d08 100644
--- a/src/main/java/cn/ac/iie/storm/utils/general/MailTrans.java
+++ b/src/main/java/cn/ac/iie/storm/utils/general/MailTrans.java
@@ -15,14 +15,16 @@ public class MailTrans {
      * @return
      */
     public static String getMailRecever(String mail_to){
-        String str = null;
+        String str = "";
         if(mail_to!=null) {
-            Pattern pattern = Pattern.compile("<([\\s\\S]*?)>");
+            Pattern pattern = Pattern.compile("/^[a-z]([a-z0-9]*[-_]?[a-z0-9]+)*@([a-z0-9]*[-_]?[a-z0-9]+)+[\\.][a-z]{2,3}([\\.][a-z]{2})?$/i");
+            //Pattern pattern = Pattern.compile("<([\\s\\S]*?)>");
             Matcher matcher = pattern.matcher(mail_to);
             while(matcher.find()) {
                 int i = 0;
-                if (str!=null) {
+                if (!str.isEmpty()) {
                     str=str+";";
+                    System.out.println(str);
                 }
                 str = str + matcher.group(i);
                 i = i++;
@@ -48,6 +50,16 @@ public class MailTrans {
         }
         return num;
     }
+    public static int geSecuritytNum(String s){
+        int num = 0;
+        if(s!=null) {
+            String[] split = s.split(";");
+
+            num = split.length;
+        }
+        return num;
+    }
+
 
 
     /**
diff --git a/src/main/java/cn/ac/iie/storm/utils/general/TransFormUtils.java b/src/main/java/cn/ac/iie/storm/utils/general/TransFormUtils.java
index 426d53d..8b6743b 100644
--- a/src/main/java/cn/ac/iie/storm/utils/general/TransFormUtils.java
+++ b/src/main/java/cn/ac/iie/storm/utils/general/TransFormUtils.java
@@ -252,18 +252,5 @@ public class TransFormUtils {
             }
         }
     }
-
-    public static String getSsqy(String http_user_agent){
-        if (http_user_agent==null){
-            return " ";
-        }else {
-            UserAgent userAgent = UserAgent.parseUserAgentString(http_user_agent);
-            Browser browser = userAgent.getBrowser();
-            OperatingSystem os = userAgent.getOperatingSystem();
-            String system = os.getName();
-            String browserName = browser.getName();
-            return browserName;
-        }
-    }
 }
 
diff --git a/src/main/java/cn/ac/iie/storm/utils/general/URL_HOS_Interactive.java b/src/main/java/cn/ac/iie/storm/utils/general/URL_HOS_Interactive.java
deleted file mode 100644
index c75f8d8..0000000
--- a/src/main/java/cn/ac/iie/storm/utils/general/URL_HOS_Interactive.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.ac.iie.storm.utils.general;
-
-/**
- * 从HOS系统下载文件
- */
-//public class URL_HOS_Interactive {
-//    public static void main(String[] args) throws IOException {
-///*      //这是上传的测试
-//        String endpoint = "http://192.168.44.12:9098/hos/";
-//        String accessKey = "default";
-//        String secretKey = "default";
-//        AmazonS3 s3 = AmazonS3ClientBuilder.standard().
-//                withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey)))
-//                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, "us-east-1"))
-//                .withChunkedEncodingDisabled(true)
-//                .build();
-//
-//        ObjectMetadata metadata = new ObjectMetadata();
-//        metadata.setContentType("avsc");
-//        metadata.setContentLength(878);
-//        metadata.setHeader("x-hos-meta-message", "message");
-//
-//        InputStream input = new FileInputStream(new File("src/main/resources/floodingschema/DNS_RZZB.avsc"));
-//        s3.putObject("test", "ceshi",input,metadata);
-//
-//        input.close(); // AmazonS3Client
-//       s3.shutdown();*/
-//        String endpoint = "http://192.168.44.12:9098/hos/";
-//        String accessKey = "default";
-//        String secretKey = "default";
-//
-//        AmazonS3 s3 = AmazonS3ClientBuilder.standard().withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey)))
-//                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, "us-east-1")).withChunkedEncodingDisabled(true).build();
-//
-//        S3Object s3Object = s3.getObject("test", "ceshi");
-//
-//        ObjectMetadata objectMetadata = s3Object.getObjectMetadata();
-//
-//        long contentLength = objectMetadata.getContentLength();
-//        String fileMessage = objectMetadata.getRawMetadataValue("x-hos-meta-message").toString();
-//
-//        S3ObjectInputStream objectContent = s3Object.getObjectContent();
-//
-//        BufferedReader reader = new BufferedReader(new InputStreamReader(objectContent));
-//        byte[] bytes = reader.readLine().getBytes();
-//
-//        String s = bytes.toString();
-//        System.out.println(s);
-///*        HttpClientService httpClientService = new HttpClientService();
-//        httpClientService.gethttpFloodingPost("http://192.168.40.119:7700",bytes,100);*/
-//            s3.shutdown();
-//
-//    }
-//}
diff --git a/src/main/java/cn/ac/iie/storm/utils/hos/DownloadObject.java b/src/main/java/cn/ac/iie/storm/utils/hos/DownloadObject.java
deleted file mode 100644
index 43afd68..0000000
--- a/src/main/java/cn/ac/iie/storm/utils/hos/DownloadObject.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package cn.ac.iie.storm.utils.hos;
-
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectInputStream;
-import org.apache.avro.io.BinaryEncoder;
-import org.apache.avro.io.EncoderFactory;
-
-import java.io.*;
-
-public class DownloadObject {
-    public static void main(String[] args) throws IOException {
-        String endpoint = "http://10.111.72.200:9098/hos/";
-        String accessKey = "default";
-        String secretKey = "default";
-
-        AmazonS3 s3 = AmazonS3ClientBuilder.standard().withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey)))
-                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, "us-east-1")).withChunkedEncodingDisabled(true).build();
-
-        S3Object s3Object = s3.getObject("test", "bianhao");
-
-        ObjectMetadata objectMetadata = s3Object.getObjectMetadata();
-
-        long contentLength = objectMetadata.getContentLength();
-        String fileMessage = objectMetadata.getRawMetadataValue("x-hos-meta-message").toString();
-
-        S3ObjectInputStream objectContent = s3Object.getObjectContent();
-
-
-
-        byte[] buffer = null;
-
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            byte[] b = new byte[1024];
-            int n;
-            while ((n = objectContent.read(b)) != -1)
-            {
-                bos.write(b, 0, n);
-            }
-            objectContent.close();
-            bos.close();
-            buffer = bos.toByteArray();
-            s3.shutdown();
-
-        OutputStream out = new FileOutputStream("src/resources/1.txt");
-        ByteArrayInputStream is = new ByteArrayInputStream(buffer);
-        byte[] buf = new byte[1024];
-        int len = 0;
-        while((len=is.read(buf))!=-1){
-            out.write(buf, 0, len);
-        }
-        is.close();
-        out.close();
-    }
-
-}
diff --git a/src/main/java/cn/ac/iie/storm/utils/hos/HosConnPool.java b/src/main/java/cn/ac/iie/storm/utils/hos/HosConnPool.java
new file mode 100644
index 0000000..6ef298c
--- /dev/null
+++ b/src/main/java/cn/ac/iie/storm/utils/hos/HosConnPool.java
@@ -0,0 +1,39 @@
+package cn.ac.iie.storm.utils.hos;
+
+import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
+import com.amazonaws.ClientConfiguration;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+
+public class HosConnPool {
+    private static ClientConfiguration clientConf = null;
+    private static AmazonS3 s3 = null;
+    private static HosConnPool hosConnPool = null;
+
+    public AmazonS3 getS3Conn(){
+        clientConf = new ClientConfiguration();
+        clientConf.setMaxConnections(StreamAggregateConfig.HOS_POOL_MAXCONNECTIONS);
+        clientConf.setMaxErrorRetry(StreamAggregateConfig.HOS_POOL_MAXERRORRETRY);
+        clientConf.setRequestTimeout(StreamAggregateConfig.HOS_POOL_REQUESTTIMEOUT);
+        clientConf.setConnectionTimeout(StreamAggregateConfig.HOS_POOL_CONNECTIONTIMEOUT);
+        clientConf.setConnectionTTL(StreamAggregateConfig.HOS_POOL_CONNECTIONTTL);
+        clientConf.setSocketTimeout(StreamAggregateConfig.HOS_POOL_SOCKETTIMEOUT);
+        BasicAWSCredentials awsCredentials = new BasicAWSCredentials("default", "default");
+        s3 = AmazonS3ClientBuilder.standard()
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(StreamAggregateConfig.HOS_URL, "us-east-1"))
+                .withChunkedEncodingDisabled(true)
+                .withClientConfiguration(clientConf)
+                .build();
+        return s3;
+    }
+    public static synchronized HosConnPool getInstance(){
+        if(null==hosConnPool){
+            hosConnPool = new HosConnPool();
+        }
+        return hosConnPool;
+    }
+}
diff --git a/src/main/java/cn/ac/iie/storm/utils/hos/HosService.java b/src/main/java/cn/ac/iie/storm/utils/hos/HosService.java
new file mode 100644
index 0000000..4ec5b77
--- /dev/null
+++ b/src/main/java/cn/ac/iie/storm/utils/hos/HosService.java
@@ -0,0 +1,67 @@
+package cn.ac.iie.storm.utils.hos;
+
+import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.s3.model.S3ObjectInputStream;
+import org.apache.log4j.Logger;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URLDecoder;
+
+public class HosService {
+    private final static Logger logger = Logger.getLogger(HosService.class);
+    public static byte[] httpPostObject(String BucketName,String filename)  {
+        String endpoint = "endpoint";
+        BasicAWSCredentials awsCredentials = new BasicAWSCredentials("default", "default");
+
+        byte[] buffer = null;
+        S3ObjectInputStream objectContent = null;
+        ByteArrayOutputStream bos = null;
+        AmazonS3 s3 = null;
+        try {
+            s3 = AmazonS3ClientBuilder.standard()
+                    .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(StreamAggregateConfig.HOS_URL, "us-east-1"))
+                    .withChunkedEncodingDisabled(true)
+                    .build();
+            String decode = URLDecoder.decode(filename);
+        S3Object s3Object = s3.getObject(BucketName, decode);
+        objectContent = s3Object.getObjectContent();
+        bos = new ByteArrayOutputStream();
+        byte[] b = new byte[1024];
+        int n;
+            while ((n = objectContent.read(b)) != -1) {
+                bos.write(b, 0, n);
+            }
+        objectContent.close();
+        buffer = bos.toByteArray();
+        bos.close();
+       
+        } catch (IOException | RuntimeException e) {
+            logger.error("获取"+BucketName+"下"+filename+"异常,异常原因为"+e);
+        } finally {
+
+                try {
+                    if (bos!=null) {
+                        bos.close();
+                    }
+                    if(objectContent!=null){
+                        objectContent.close();
+                    }
+                    if (s3!=null){
+                        s3.shutdown();
+                    }
+                } catch (IOException e) {
+                    logger.error("流关闭异常，异常原因为："+e);
+                }
+
+        }
+        return buffer;
+    }
+}
diff --git a/src/main/java/cn/ac/iie/storm/utils/hos/Send2S3.java b/src/main/java/cn/ac/iie/storm/utils/hos/Send2S3.java
new file mode 100644
index 0000000..79640e5
--- /dev/null
+++ b/src/main/java/cn/ac/iie/storm/utils/hos/Send2S3.java
@@ -0,0 +1,28 @@
+package cn.ac.iie.storm.utils.hos;
+import org.apache.log4j.Logger;
+
+import static cn.ac.iie.storm.utils.hos.HosService.httpPostObject;
+import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
+import static cn.ac.iie.storm.utils.http.HttpGetUrl.getS3Url;
+
+public class Send2S3 {
+    private final static Logger logger = Logger.getLogger(Send2S3.class);
+    public static String SendObject2S3(String url,String s3BucketName) {
+        String bucketName = null;
+        String filename = null;
+        String s3Url = null;
+        try {
+            String[] split = url.split("/");
+            bucketName = split[split.length-2];
+            filename = split[split.length-1];
+            byte[] bytes = httpPostObject(bucketName, filename);
+
+            s3Url = getS3Url(s3BucketName, filename);
+            getConnAnsyHttpPost(s3Url, bytes);
+
+        } catch (Exception e) {
+            logger.error("桶："+bucketName+"下的文件"+filename+"发送失败原因为："+e);
+        }
+        return s3Url;
+    }
+}
diff --git a/src/main/java/cn/ac/iie/storm/utils/hos/SendObject.java b/src/main/java/cn/ac/iie/storm/utils/hos/SendObject.java
deleted file mode 100644
index bcbe443..0000000
--- a/src/main/java/cn/ac/iie/storm/utils/hos/SendObject.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.ac.iie.storm.utils.hos;
-
-import kafka.log.Log;
-
-import java.io.*;
-
-
-public class SendObject {
-    public static void main(String[] args) throws IOException, IOException {
-        //FileInputStream
-        FileInputStream fileInputStream = new FileInputStream("src/resources/common_app_id_coding.properties");
-
-
-        byte[] buffer = null;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] b = new byte[1024];
-        int n;
-
-        while ((n = fileInputStream.read(b)) != -1)
-        {
-            bos.write(b, 0, n);
-        }
-        fileInputStream.close();
-        bos.close();
-        buffer = bos.toByteArray();
-
-
-        OutputStream out = new FileOutputStream("src/resources/1.txt");
-        ByteArrayInputStream is = new ByteArrayInputStream(buffer);
-        byte[] buf = new byte[1024];
-        int len = 0;
-        while((len=is.read(buf))!=-1){
-            out.write(buf, 0, len);
-        }
-        is.close();
-        out.close();
-    }
-
-    }
-
diff --git a/src/main/java/cn/ac/iie/storm/utils/hos/UploadObject.java b/src/main/java/cn/ac/iie/storm/utils/hos/UploadObject.java
deleted file mode 100644
index c412188..0000000
--- a/src/main/java/cn/ac/iie/storm/utils/hos/UploadObject.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.ac.iie.storm.utils.hos;
-
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class UploadObject {
-    public static void main(String[] args) throws IOException {
-
-        /**
-         * // endpointip:http://192.168.40.111:8080/hos
-         * String endpoint = "endpoint";
-         * // hosaccessKeydefaultsecretKeydefault
-         * String accessKey = "default";
-         * String secretKey = "default";
-         * // AmazonS3Client
-         * AmazonS3 s3 = AmazonS3ClientBuilder.standard()
-         *  .withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey,
-         * secretKey)))
-         *  .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, "us-east-1"))
-         *  .withChunkedEncodingDisabled(true)
-         *  .build();
-         * //
-         * s3.createBucket("bucketname");
-         * // AmazonS3Client
-         * s3.shutdown();
-         */
-
-        String endpoint = "http://10.111.72.200:9098/hos/";
-        String accessKey = "default";
-        String secretKey = "default";
-        AmazonS3 s3 = AmazonS3ClientBuilder.standard().
-                withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey)))
-                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, "us-east-1"))
-                .withChunkedEncodingDisabled(true)
-                .build();
-//        s3.createBucket("test");
-
-        ObjectMetadata metadata = new ObjectMetadata();
-        metadata.setContentType("avsc");
-
-        metadata.setHeader("x-hos-meta-message", "message");
-
-        InputStream input = new FileInputStream(new File("src/resources/common_app_id_coding.properties"));
-        s3.putObject("test", "bianhao",input,metadata);
-
-        input.close(); // AmazonS3Client
-       s3.shutdown();
-    }
-}
diff --git a/src/main/java/cn/ac/iie/storm/utils/http/HttpAsncClient.java b/src/main/java/cn/ac/iie/storm/utils/http/HttpAsncClient.java
index 22c0e3f..dc5d1dd 100644
--- a/src/main/java/cn/ac/iie/storm/utils/http/HttpAsncClient.java
+++ b/src/main/java/cn/ac/iie/storm/utils/http/HttpAsncClient.java
@@ -1,10 +1,14 @@
 package cn.ac.iie.storm.utils.http;
 
+import cn.ac.iie.storm.bolt.conn.ConnParseBolt;
+import cn.ac.iie.storm.topology.StreamAggregateTopology;
+import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
 import com.google.common.collect.Maps;
 import org.apache.http.*;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.concurrent.FutureCallback;
 
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
@@ -117,15 +121,15 @@ public class HttpAsncClient {
 
             HttpPost request = new HttpPost(url);
 
-            request.setHeader("User-Name","test");
-            request.setHeader("Password","Test123456");
-            request.setHeader("File-Type","pcm");
-            request.setHeader("File-Title","test1file");
-            request.setHeader("Content-Type","application/octet-stream");
+            request.setHeader("User-Name",StreamAggregateConfig.S3_HEARDER_USERNAME);
+            request.setHeader("Password",StreamAggregateConfig.S3_HEARDER_PASSWORD);
+            request.setHeader("File-Type",StreamAggregateConfig.S3_HEARDER_FILETYPE);
+            request.setHeader("File-Title",StreamAggregateConfig.S3_HEARDER_FILETITLE);
+            request.setHeader("Is-Fulltex",StreamAggregateConfig.S3_HEARDER_ISFULLTEX);
+            request.setHeader("Content-Type",StreamAggregateConfig.S3_HEARDER_CONTENTTYPE);
 
-            request.setEntity(new ByteArrayEntity(s));
 
-            System.out.println(" caller thread id is : " + Thread.currentThread().getId());
+            request.setEntity(new ByteArrayEntity(s));
             CloseableHttpAsyncClient httpAsynClient = getHttpAsynClient(60);
             httpAsynClient.start();
 
@@ -134,31 +138,24 @@ public class HttpAsncClient {
                 @Override
                 public void completed(final HttpResponse response) {
                         latch.countDown();
-                        System.out.println("这是completed callback thread id is : " + Thread.currentThread().getId());
-                      //  System.out.println(request.getRequestLine() + "->" + response.getStatusLine());
-                    try {
-                        String content = EntityUtils.toString(response.getEntity(), "UTF-8");
-                        System.out.println(" response content is : " + content);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-
+                    int statusCode = response.getStatusLine().getStatusCode();
+                    if (statusCode==200){
+                        log.info(request.getRequestLine() +"文件发送成功，状态码为"+"->" + statusCode);
+                    }else {
+                        log.error(request.getRequestLine() +"文件发送失败，状态码为"+"->" + statusCode);
                     }
-
-
                 }
-
                 @Override
                 public void failed(Exception ex) {
                     latch.countDown();
-                    System.out.println(request.getRequestLine() + "->" + ex);
-                    System.out.println(" 这是failed callback thread id is : " + Thread.currentThread().getId());
+                    log.error(request.getRequestLine() + "->" + ex);
+                    log.error(request.getEntity()+"-----------"+ex);
                 }
 
                 @Override
                 public void cancelled() {
                     latch.countDown();
-                    System.out.println(request.getRequestLine() + " cancelled");
-                    System.out.println("这是cancelled callback thread id is : " + Thread.currentThread().getId());
+                    log.error(request.getRequestLine() + " cancelled");
                 }
             });
             try {
diff --git a/src/main/java/cn/ac/iie/storm/utils/http/HttpGetUrl.java b/src/main/java/cn/ac/iie/storm/utils/http/HttpGetUrl.java
index f839bf3..95f38f6 100644
--- a/src/main/java/cn/ac/iie/storm/utils/http/HttpGetUrl.java
+++ b/src/main/java/cn/ac/iie/storm/utils/http/HttpGetUrl.java
@@ -7,11 +7,11 @@ import java.util.Random;
 public class HttpGetUrl {
 
     public static String getPostUrl() {
-
-        String[] split = StreamAggregateConfig.HTTP_POST_FLOODING_IP.split(",");
+        String url;
+        String[] split = StreamAggregateConfig.HTTP_POST_IP.split(",");
         Random random = new Random();
         int i = random.nextInt(split.length);
-        String url = "http://" + split[i] + ":" + StreamAggregateConfig.HTTP_POST_PORT + "/";
+        url = "http://" + split[i] + ":" + StreamAggregateConfig.HTTP_POST_PORT + "/";
         return url;
     }
 
@@ -27,5 +27,26 @@ public class HttpGetUrl {
         }
         return urlString;
     }
+
+
+    public static String getS3Url(String bucketname,String filename){
+        String url;
+        String[] split = StreamAggregateConfig.S3_POST_IP.split(",");
+        Random random = new Random();
+        int i = random.nextInt(split.length);
+        url = "http://"+split[i]+":"+StreamAggregateConfig.S3_POST_PORT+"/"+bucketname+"/"+filename+"?method=put";
+        return url;
+    }
+
+    public static String getYL5(String bucketname,String filename){
+        String url;
+        String[] split = StreamAggregateConfig.S3_POST_IP.split(",");
+        Random random = new Random();
+        int i = random.nextInt(split.length);
+        url = "http://"+split[i]+":"+StreamAggregateConfig.S3_POST_PORT+"/"+bucketname+"/"+filename;
+        return url;
+    }
+
+
 }
 
diff --git a/src/resources/common_app_id_coding.properties b/src/resources/common_app_id_coding.properties
index 7aef802..5161ca0 100644
--- a/src/resources/common_app_id_coding.properties
+++ b/src/resources/common_app_id_coding.properties
@@ -1 +1 @@
-#common_app_id_conding
HTTP=01999
DNS=02999
WEBMAIL=03001
SMTP=03002
POP3=03003
IMAP=03004
PPTP=04001
L2TP=04002
OpenVPN=04003
IPSec=04004
QQ=05001
BlackLight=05002
钉钉=05003
翼聊=05004
Hangouts=05005
个信=05006
微信电话本=05007
飞聊=05008
环聊=05009
有信电话=05010
友约=05011
遇见=05012
Kik=05013
微爱=05014
Tango=05015
敢聊=05016
微信=05017
易信=05018
旺信=05019
Tumblr=05020
Blued=05021
网聊=05022
快传=05023
唱吧=05024
比邻=05025
千牛=05026
派派=05027
找对象=05028
IM+=05029
微聚=05030
BBM=05031
LOFTER=05032
Weico=05033
米聊=05034
YY语音=05035
Skype=05036
Path=05037
网易泡泡=05038
有你=05039
微乐=05040
GO短信=05041
和通讯录=05042
约爱=05043
无秘=05044
Wicker=05045
约会吧=05046
hike messager=05047
摩擦=05048
探探=05049
陌陌=05050
来往点点虫=05051
百度Hi=05052
ZANK=05053
小恩爱=05054
飞信=05055
ChatON=05056
QT语音=05057
爱聊=05058
nice好赞=05059
朋友印象=05060
Googletalk=05061
友加=05062
Keechat=05063
啪啪啪啪音乐圈=05064
微会=05065
Radicall=05066
槽厂=05067
想恋爱=05068
颜值颜值点评=05069
LinkedIn=05070
Telegram=05071
DiDi=05072
ICQ=05073
Zello=05074
NextDoor=05075
Pinterest=05076
叮咚=05077
床上=05078
Nimbuzz=05079
微人脉=05080
陪陪=05081
微密=05082
Vine=05083
Line=05084
between=05085
facebook=05086
Viber=05087
MeetUP=05088
MeetMe=05089
OkCupidDating=05090
碰碰=05091
Diaspora=05092
咚呱=05093
陪聊=05094
Twitter=05095
Kakao=05096
MSN=05097
Voxer=05098
Airetalk=05099
ooVoo=05100
Mico=05101
Banjo=05102
TextNow=05103
抱抱=05104
多多的鱼=05105
个性=05106
闺蜜圈=05107
Instagram=05108
Whatsapp=05109
Talkbox=05110
ChatOn=05111
Coco=05112
Badoo=05113
Match.com=05114
TextFree=05115
Tapatalk=05116
KC网络电话=05117
爱唱=05118
酷我=05119
荔枝FM=05120
铁血=05121
酷友社区=05122
花田交友=05123
红娘网=05124
知乎=05125
百度贴吧=05126
百合婚恋=05127
珍爱网=05128
猫扑=05129
新浪微博=05130
开心网=05131
天际好好约=05132
天涯社区=05133
人人网=05134
世纪佳缘=05135
We heart it=05136
Avocado=05137
Tinder=05138
Swarm=05139
Snapchat=05140
Dating for everyone=05141
Skout=05142
QQ空间=05143
Couple=05144
Happn=05145
FTP=06999
SSL=07999
IP黑=08001
IP监测=08002
IP日志总表=08003
\ No newline at end of file
+#common_app_id_conding
HTTP=01999
DNS=02999
WEBMAIL=03001
SMTP=03002
POP3=03003
IMAP=03004
PPTP=04001
L2TP=04002
OpenVPN=04003
IPSec=04004
QQ=05001
BlackLight=05002
钉钉=05003
翼聊=05004
Hangouts=05005
个信=05006
微信电话本=05007
飞聊=05008
环聊=05009
有信电话=05010
友约=05011
遇见=05012
Kik=05013
微爱=05014
Tango=05015
敢聊=05016
微信=05017
易信=05018
旺信=05019
Tumblr=05020
Blued=05021
网聊=05022
快传=05023
唱吧=05024
比邻=05025
千牛=05026
派派=05027
找对象=05028
IM+=05029
微聚=05030
BBM=05031
LOFTER=05032
Weico=05033
米聊=05034
YY语音=05035
Skype=05036
Path=05037
网易泡泡=05038
有你=05039
微乐=05040
GO短信=05041
和通讯录=05042
约爱=05043
无秘=05044
Wicker=05045
约会吧=05046
hike messager=05047
摩擦=05048
探探=05049
陌陌=05050
来往点点虫=05051
百度Hi=05052
ZANK=05053
小恩爱=05054
飞信=05055
ChatON=05056
QT语音=05057
爱聊=05058
nice好赞=05059
朋友印象=05060
Googletalk=05061
友加=05062
Keechat=05063
啪啪啪啪音乐圈=05064
微会=05065
Radicall=05066
槽厂=05067
想恋爱=05068
颜值颜值点评=05069
LinkedIn=05070
Telegram=05071
DiDi=05072
ICQ=05073
Zello=05074
NextDoor=05075
Pinterest=05076
叮咚=05077
床上=05078
Nimbuzz=05079
微人脉=05080
陪陪=05081
微密=05082
Vine=05083
Line=05084
between=05085
facebook=05086
Viber=05087
MeetUP=05088
MeetMe=05089
OkCupidDating=05090
碰碰=05091
Diaspora=05092
咚呱=05093
陪聊=05094
Twitter=05095
Kakao=05096
MSN=05097
Voxer=05098
Airetalk=05099
ooVoo=05100
Mico=05101
Banjo=05102
TextNow=05103
抱抱=05104
多多的鱼=05105
个性=05106
闺蜜圈=05107
Instagram=05108
Whatsapp=05109
Talkbox=05110
ChatOn=05111
Coco=05112
Badoo=05113
Match.com=05114
TextFree=05115
Tapatalk=05116
KC网络电话=05117
爱唱=05118
酷我=05119
荔枝FM=05120
铁血=05121
酷友社区=05122
花田交友=05123
红娘网=05124
知乎=05125
百度贴吧=05126
百合婚恋=05127
珍爱网=05128
猫扑=05129
新浪微博=05130
开心网=05131
天际好好约=05132
天涯社区=05133
人人网=05134
世纪佳缘=05135
We heart it=05136
Avocado=05137
Tinder=05138
Swarm=05139
Snapchat=05140
Dating for everyone=05141
Skout=05142
QQ空间=05143
Couple=05144
Happn=05145
FTP=06999
SSL=07999
IP黑=08001
IP监测=08002
IP日志总表=08003

100100=05001
100200=05002
100300=05003
100400=05004
100500=05005
100600=05006
100700=05007
100800=05008
100900=05009
101000=05010
101100=05011
101200=05012
101300=05013
101400=05014
101500=05015
101600=05016
101700=05017
101800=05018
101900=05019
102000=05020
102100=05021
102200=05022
102300=05023
102400=05024
102500=05025
102600=05026
102700=05027
102800=05028
102900=05029
103000=05030
103100=05031
103200=05032
103300=05033
103400=05034
103500=05035
103600=05036
103700=05037
103800=05038
103900=05039
104000=05040
104100=05041
104200=05042
104300=05043
104400=05044
104500=05045
104600=05046
104700=05047
104800=05048
104900=05049
105000=05050
105100=05051
105200=05052
105300=05053
105400=05054
105500=05055
105600=05056
105700=05057
105800=05058
105900=05059
106000=05060
106100=05061
106200=05062
106300=05063
106400=05064
106500=05065
106600=05066
106700=05067
106800=05068
106900=05069
107000=05070
107100=05071
107200=05072
107300=05073
107400=05074
107500=05075
107600=05076
107700=05077
107800=05078
107900=05079
108000=05080
108100=05081
108200=05082
108300=05083
108400=05084
108500=05085
108600=05086
108700=05087
108800=05088
108900=05089
109000=05090
109100=05091
109200=05092
109300=05093
109400=05094
109500=05095
109600=05096
109700=05097
109800=05098
109900=05099
110000=05100
110100=05101
110200=05102
110300=05103
110400=05104
110500=05105
110600=05106
110700=05107
110800=05108
110900=05109
111000=05110
111100=05111
111200=05112
111300=05113
111400=05114
111500=05115
111600=05116
111700=05117
111800=05118
111900=05119
112000=05120
112100=05121
112200=05122
112300=05123
112400=05124
112500=05125
112600=05126
112700=05127
112800=05128
112900=05129
113000=05130
113100=05131
113200=05132
113300=05133
113400=05134
113500=05135
113600=05136
113700=05137
113800=05138
113900=05139
114000=05140
114100=05141
114200=05142
114300=05143
114400=05144
114500=05145



\ No newline at end of file
diff --git a/src/resources/common_city_coding.properties b/src/resources/common_city_coding.properties
index c93ebd3..9ab0964 100644
--- a/src/resources/common_city_coding.properties
+++ b/src/resources/common_city_coding.properties
@@ -364,4 +364,5 @@ Taoyuan,Taiwan,China=711400
 
 
 #西藏
-Lhasa,Tibet,China=540100
\ No newline at end of file
+Lhasa,Tibet,China=540100
+PrivateIP=000000
\ No newline at end of file
diff --git a/src/resources/common_country_coding.properties b/src/resources/common_country_coding.properties
index d6257c2..370e53a 100644
--- a/src/resources/common_country_coding.properties
+++ b/src/resources/common_country_coding.properties
@@ -181,7 +181,6 @@ Tokelau=690
 FederatedStatesofMicronesia=691
 MarshallIslands=692
 NorthKorea=850
-HongKong=852
 Macao,China=853
 Cambodia=855
 Laos=856
@@ -231,7 +230,7 @@ Montserrat=1664
 NorthernMarianaIslands=1670
 Guam=1671
 AmericanSamoa=1684
-SaintLucia=1758t
+SaintLucia=1758
 Dominica=1767
 SaintVincentandheGrenadines=1784
 PuertoRico=1787
@@ -241,6 +240,7 @@ SaintKittsandNevis=1869
 Jamaica=1876
 Curacao=5999
 Macao=820000
+HongKong=810000
 
 
 
diff --git a/src/resources/service_flow_config.properties b/src/resources/service_flow_config.properties
index 632ebb6..2b1725b 100644
--- a/src/resources/service_flow_config.properties
+++ b/src/resources/service_flow_config.properties
@@ -1,82 +1,124 @@
-#\u7BA1\u7406kafka\u5730\u5740
-bootstrap.servers=10.111.200.5:9092,10.111.200.6:9092,10.111.200.7:9092,10.111.200.8:9092,10.111.200.9:9092
+#管理kafka地址
+bootstrap.servers=10.111.136.55:9092,10.111.136.56:9092,10.111.136.57:9092,10.111.136.58:9092,10.111.136.59:9092,10.111.136.60:9092,10.111.136.61:9092,10.111.136.62:9092,10.111.136.63:9092,10.111.136.64:9092,10.111.136.65:9092,10.111.136.66:9092,10.111.136.67:9092,10.111.136.68:9092,10.111.136.69:9092,10.111.136.70:9092,10.111.136.71:9092,10.111.136.72:9092,10.111.136.73:9092,10.111.136.74:9092,10.111.136.75:9092,10.111.136.76:9092,10.111.136.77:9092,10.111.136.78:9092,10.111.136.79:9092,10.111.136.80:9092,10.111.136.81:9092,10.111.136.82:9092,10.111.136.83:9092,10.111.136.84:9092,10.111.136.85:9092,10.111.136.86:9092,10.111.136.87:9092,10.111.136.88:9092,10.111.136.89:9092,10.111.136.90:9092,10.111.136.91:9092,10.111.136.92:9092,10.111.136.93:9092,10.111.136.94:9092,10.111.136.95:9092,10.111.136.96:9092,10.111.136.97:9092,10.111.136.98:9092,10.111.136.99:9092,10.111.136.100:9092,10.111.136.101:9092,10.111.136.102:9092,10.111.136.103:9092,10.111.136.104:9092
+
 #latest/earliest
 auto.offset.reset=earliest
-#\u538B\u7F29\u6A21\u5F0F none or snappy
+#压缩模式 none or snappy
 kafka.compression.type=none
 
-topology.logo=gk
+topology.logo=conn
 
-#kafka broker\u4E0B\u7684\u6CDB\u6536topic\u540D\u79F0
+#通联日志kafka主题
 kafka.topic=CONNECTION-RECORD-COMPLETED-LOG
 
-#kafka broker\u4E0B\u7684\u5B89\u5168topic\u540D\u79F0
+#策略日志kafka主题
 kafka.safe.topic=SECURITY-EVENT-COMPLETED-LOG
 
-#\u8BFB\u53D6topic,\u5B58\u50A8\u8BE5spout id\u7684\u6D88\u8D39offset\u4FE1\u606F\uFF0C\u53EF\u901A\u8FC7\u8BE5\u62D3\u6251\u547D\u540D;\u5177\u4F53\u5B58\u50A8offset\u7684\u4F4D\u7F6E\uFF0C\u786E\u5B9A\u4E0B\u6B21\u8BFB\u53D6\u4E0D\u91CD\u590D\u7684\u6570\u636E\uFF1B
-group.id=test-consumer-group202102241111
-group.safe.id=test-consumer-group2021022811111
-#kafka\u6BCF\u4E00\u6279\u62C9\u591A\u4E45\u7684\u6570\u636E
+
+#消费者组id-读取topic,存储该spout id的消费offset信息，每次启动前需要更改
+group.id=xj-jc-group20210412A
+
+#kafka消费者每次拉取数据的时间
 kafka.consumer.poll=1000
 
 #storm topology workers
-topology.workers=5
+topology.workers=8
 
-#spout\u6700\u5927\u5E76\u884C\u5EA6
-max.spout.parallelism=10
-conn.spout.parallelism=10
-safe.spout.parallelism=10
+#spout并行度，建议与kafka分区一致
+max.spout.parallelism=8
+spout.parallelism=8
 
 
-#ack\u8BBE\u7F6E 1\u542F\u52A8ack 0\u4E0D\u542F\u52A8ack
+
+#ack设置 1启动ack 0不启动ack
 topology.num.acks=0
 
-#spout\u63A5\u6536\u7761\u7720\u65F6\u95F4
+#spou睡眠间隔
 topology.spout.sleep.time=1
 
 
-#flooding-bolt\u6BCF\u6279\u6B21\u5904\u7406\u7684\u65F6\u95F4\u95F4\u9694
-conn.topology.tick.tuple.freq.secs=10
-#conn-bolt\u6BCF\u6279\u5904\u7406\u6761\u6570
-conn.batch.inter.num=100
+#通联程序批处理的时间
+topology.tick.tuple.freq.secs=60
+#通联程序没批处理的条数
+batch.inter.num=10000
+
+
+
+
+parse.parallelism=100
+send.parallelism=20
+ip.send.parallelism=50
+ssl.send.parallelism=50
+http.send.parallelism=50
+count.send.parallelism=1
+unstructured.send.parallelism=50
+
+
+
+#count指标数据时间批次（单位为秒）
+count.topology.tick.tuple.freq.secs=300
+
+#prometheus-httpserver
+prometheus.pushgateway.address=10.111.143.240:9274
+
+
+
+#http-post请求超时时间
+http.post.socketTimeOut=60
+
+
+#http-post发送设置
+http.heard.content.type=utf-8
+http.hearder.user=yd_xgs_source
+http.hearder.password=yd_xgs_source@2021
+http.hearder.format=avro
+http.hearder.conection=keep-alilve
+#http-post后端接受地址
+http.post.ip=10.111.151.249,10.111.151.250,10.111.151.251,10.111.151.252,10.111.151.253,10.111.153.248,10.111.153.249,10.111.153.250,10.111.153.251,10.111.153.252,10.111.153.253
+
+http.post.port=10080
+
+
+
+hos.url=http://10.111.143.200:9098/hos/
+hos.pool.maxconnections=400
+hos.pool.maxerrorretry=3
+hos.pool.requesttimeout=0
+hos.pool.connectiontimeout=60
+hos.pool.connectionttl=-1
+hos.pool.sockettimeout=50
 
 
-#safe-bolt\u6BCF\u6279\u6B21\u5904\u7406\u7684\u65F6\u95F4\u95F4\u9694
-safe.topology.tick.tuple.freq.secs=10
-#safe-bolt\u6BCF\u6279\u5904\u7406\u6761\u6570
-safe.batch.inter.num=2000
+s3.hearder.username=yd_xgs_s3
+s3.hearder.password=yd_xgs_s3@2021
+s3.hearder.filetype=pcm
+s3.hearder.filetitle=ydtest-file
+s3.hearder.isfulltex=false
+s3.hearder.contenttype=application/octet-stream
 
-#conn-bolt-parallelism_hint
+s3.post.ip=10.111.151.217,10.111.151.218,10.111.151.219,10.111.151.220,10.111.151.221,10.111.151.222,10.111.151.223,10.111.151.224,10.111.151.225,10.111.151.226,10.111.151.227,10.111.151.228,10.111.151.229,10.111.151.230,10.111.151.231,10.111.151.232,10.111.151.233,10.111.151.234,10.111.151.235,10.111.151.236,10.111.151.237,10.111.151.238,10.111.151.239,10.111.151.240,10.111.151.241,10.111.151.242,10.111.151.243,10.111.151.244,10.111.151.245
+s3.post.port=8888
 
-conn.parse.parallelism=10
-conn.send.parallelism=5
-conn.ip.send.parallelism=5
-conn.ssl.send.parallelism=5
-conn.http.send.parallelism=5
-conn.count.send.parallelism=1
+t.http.rzzb=t-http-rzzb
+t.http.jczb=t-http-jczb
+t.http.gkzb=t-http-gkzb
 
-#gk-bolt-parallelism_hint
-gk.parse.parallelism=5
-gk.send.parallelism=5
-gk.http.send.parallelism=5
-gk.ip.send.parallelism=5
-gk.ssl.send.parallelism=5
-gk.count.send.parallelism=5
+t.mail.rzzb=t-mail-rzzb
+t.mail.jczb=t-mail-jczb
+t.mail.gkzb=t-mail-gkzb
 
-#jc-bolt-parallelism_hint
-jc.parse.parallelism=5
-jc.send.parallelism=5
-jc.http.send.parallelism=5
-jc.ip.send.parallelism=5
-jc.ssl.send.parallelism=5
-jc.count.send.parallelism=5
-jc.dns.send.parallelism=5
+t.wygjc.jcrz=t-wygjc-jcrz
+t.wygjc.gkrz=t-wygjc-gkrz
 
+t.pic.jczb=t-pic-jczb
+t.media.jczb=t-media-jczb
 
 
 
 
-#conn-schema
+
+
+#通联数据的schema
 ftp.rzzb.schema={"type":"record","name":"FTP_RZZB","fields":[{"name":"BHSJ","type":"long"},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"FILE_NAME","type":["string","null"]},{"name":"FILE_CONTENT","type":["string","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
 dns.rzzb.schema={"type":"record","name":"DNS_RZZB","fields":[{"name":"BHSJ","type":"long"},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"DNS_NAME","type":["string","null"]},{"name":"DNS_VALUE","type":["string","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
 http.rzzb.schema={"type":"record","name":"HTTP_RZZB","fields":[{"name":"BHSJ","type":"long"},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"HOST","type":["string","null"]},{"name":"URL","type":["string","null"]},{"name":"USER_AGENT","type":["string","null"]},{"name":"COOKIE","type":["string","null"]},{"name":"FILE_NAME","type":["string","null"]},{"name":"CONTENT","type":["string","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
@@ -87,17 +129,14 @@ vpn.rzzb.schema={"type":"record","name":"VPN_RZZB","fields":[{"name":"BHSJ","typ
 mail.rzzb.schema={"type":"record","name":"MAIL_RZZB","fields":[{"name":"BHSJ","type":"long"},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"MAIL_SENDER","type":["string","null"]},{"name":"MAIL_RECEVER","type":["string","null"]},{"name":"RECEVER_NUM","type":["int","null"]},{"name":"MAIL_CC","type":["string","null"]},{"name":"CC_NUM","type":["int","null"]},{"name":"MAIL_SUBJECT","type":["string","null"]},{"name":"CONTENT","type":["string","null"]},{"name":"ACCESSORY","type":["int","null"]},{"name":"FILE_NAME","type":["string","null"]},{"name":"FILE_CONTENT","type":["string","null"]},{"name":"PWD","type":["string","null"]},{"name":"FJFWS","type":["string","null"]},{"name":"FJFWS_SZD","type":["string","null"]},{"name":"SJFWS","type":["string","null"]},{"name":"SJFWS_SZD","type":["string","null"]},{"name":"XYLX","type":["string","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
 
 
-#Flooding-http-post-socketTimeOut
-flooding.http.post.socketTimeOut=60
-
-flooding.post.dns.topic=t_dns_rzzb
-flooding.post.ftp.topic=t_ftp_rzzb
-flooding.post.http.topic=t_http_rzzb
-flooding.post.ip.topic=t_ip_rzzb
-flooding.post.jstx.topic=t_jstx_rzzb
-flooding.post.mail.topic=t_mail_rzzb
-flooding.post.ssl.topic=t_ssl_rzzb
-flooding.post.vpn.topic=t_vpn_rzzb
+conn.post.dns.topic=t_dns_rzzb
+conn.post.ftp.topic=t_ftp_rzzb
+conn.post.http.topic=t_http_rzzb
+conn.post.ip.topic=t_ip_rzzb
+conn.post.jstx.topic=t_jstx_rzzb
+conn.post.mail.topic=t_mail_rzzb
+conn.post.ssl.topic=t_ssl_rzzb
+conn.post.vpn.topic=t_vpn_rzzb
 
 
 gk.post.dns.topic=t_dns_gkzb
@@ -127,22 +166,6 @@ jc.post.media.topic=t_media_jczb
 
 
 
-http.heard.content.type=utf-8
-http.hearder.user=lt_xgs_source
-http.hearder.password=lt_xgs_source@2021
-http.hearder.format=avro
-http.hearder.conection=keep-alilve
-
-http.post.flooding.ip=10.111.208.1,10.111.208.2,10.111.208.3,10.111.208.4,10.111.208.5,10.111.208.6,10.111.208.7,10.111.216.1,10.111.216.2,10.111.216.3
-
-http.post.port=10080
-
-#count\u51FA\u6307\u6807\u7684\u65F6\u95F4\u95F4\u9694(\u5355\u4F4D\u4E3A\u79D2\uFF0C\u6307\u6807\u662F\u4EE5\u5206\u949F\u4E3A\u5355\u4F4D\u6700\u597D\u4E3A60\u7684\u500D\u6570)
-count.topology.tick.tuple.freq.secs=10
-
-#prometheus-httpserver
-prometheus.pushgateway.address=10.111.200.5:9274
-
 
 #gk-schema
 ip.gkrz.schema={"type":"record","name":"IP_GKRZ","fields":[{"name":"BHSJ","type":"long"},{"name":"PZID","type":"string"},{"name":"FLID","type":"int"},{"name":"XZID","type":"int"},{"name":"LHID","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PZLX","type":"int"},{"name":"GKLB","type":["int","null"]},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
@@ -167,10 +190,3 @@ wygjz.jczb.schema={"type":"record","name":"WYGJC_JCRZ","fields":[{"name":"BHSJ",
 pic.jczb.schema={"type":"record","name":"PIC_JCZB","fields":[{"name":"BHSJ","type":"long"},{"name":"PZID","type":"string"},{"name":"FLID","type":"int"},{"name":"XZID","type":"int"},{"name":"LHID","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PZLX","type":"int"},{"name":"GKLB","type":["int","null"]},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"YYZL","type":["int","null"]},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"PIC_NAME","type":["string","null"]},{"name":"PIC_URL","type":["string","null"]},{"name":"URL","type":["string","null"]},{"name":"PIC_TYPE","type":["string","null"]},{"name":"PIC_CONTENT","type":["bytes","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
 media.jczb.schema={"type":"record","name":"MEDIA_JCZB","fields":[{"name":"BHSJ","type":"long"},{"name":"PZID","type":"string"},{"name":"FLID","type":"int"},{"name":"XZID","type":"int"},{"name":"LHID","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PZLX","type":"int"},{"name":"GKLB","type":["int","null"]},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"YYZL","type":["int","null"]},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"MEDIA_NAME","type":["string","null"]},{"name":"MEDIA_URL","type":["string","null"]},{"name":"URL","type":["string","null"]},{"name":"MEDIA_TYPE","type":["string","null"]},{"name":"MEDIA_CONTENT","type":["bytes","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
 mail.jczb.schema={"type":"record","name":"MAILGJZ_JCZB","fields":[{"name":"BHSJ","type":"long"},{"name":"PZID","type":"string"},{"name":"FLID","type":"int"},{"name":"XZID","type":"int"},{"name":"LHID","type":"int"},{"name":"YDY","type":"string"},{"name":"MDDY","type":"string"},{"name":"PZLX","type":"int"},{"name":"GKLB","type":["int","null"]},{"name":"YYZL","type":["int","null"]},{"name":"QDJIP","type":"int"},{"name":"SIP","type":"string"},{"name":"DIP","type":"string"},{"name":"SPORT","type":"int"},{"name":"DPORT","type":"int"},{"name":"PROTOCOL","type":"int"},{"name":"PROTO_ID","type":"string"},{"name":"DETAIL_ID","type":"string"},{"name":"CS_PKTS","type":["int","null"]},{"name":"CS_BYTES","type":["long","null"]},{"name":"SC_PKTS","type":["int","null"]},{"name":"SC_BYTES","type":["long","null"]},{"name":"MAIL_SENDER","type":["string","null"]},{"name":"MAIL_RECEVER","type":["string","null"]},{"name":"RECEVER_NUM","type":["int","null"]},{"name":"MAIL_CC","type":["string","null"]},{"name":"CC_NUM","type":["int","null"]},{"name":"MAIL_SUBJECT","type":["string","null"]},{"name":"CONTENT","type":["string","null"]},{"name":"ACCESSORY","type":["int","null"]},{"name":"FILE_NAME","type":["string","null"]},{"name":"FILE_CONTENT","type":["string","null"]},{"name":"PWD","type":["string","null"]},{"name":"FJFWS","type":["string","null"]},{"name":"FJFWS_SZD","type":["string","null"]},{"name":"SJFWS","type":["string","null"]},{"name":"SJFWS_SZD","type":["string","null"]},{"name":"XYLX","type":["string","null"]},{"name":"GJZ","type":["string","null"]},{"name":"YYS","type":["int","null"]},{"name":"YL1","type":"int"},{"name":"YL2","type":["int","null"]},{"name":"YL3","type":["string","null"]},{"name":"YL4","type":["string","null"]},{"name":"YL5","type":["string","null"]}]}
-
-
-
-
-
-
-
diff --git a/src/test/java/Test.java b/src/test/java/Test.java
new file mode 100644
index 0000000..0ba1f8b
--- /dev/null
+++ b/src/test/java/Test.java
@@ -0,0 +1,26 @@
+public class Test {
+
+    public static String intToIp(int ip) {
+        StringBuilder sb = new StringBuilder();
+        int num = 0;
+        boolean needPoint = false; // 是否需要加入'.'
+        for (int i = 0; i < 4; i++) {
+            if (needPoint) {
+                sb.append('.');
+            }
+            needPoint = true;
+            int offset = 8 * (3 - i);
+            num = (ip >> offset) & 0xff;
+            sb.append(num);
+        }
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        People people = new People();
+        if (2>1){
+            people.setAge(2);
+        }
+        System.out.println(people.getAge());
+    }
+}
diff --git a/src/test/java/TestDy.java b/src/test/java/TestDy.java
new file mode 100644
index 0000000..9742181
--- /dev/null
+++ b/src/test/java/TestDy.java
@@ -0,0 +1,8 @@
+import static cn.ac.iie.storm.utils.config.GetMap.getDy;
+
+public class TestDy {
+    public static void main(String[] args) {
+        String private_ip = getDy("Private IP");
+        System.out.println(private_ip);
+    }
+}
diff --git a/src/test/java/TestGetAllFileMeta.java b/src/test/java/TestGetAllFileMeta.java
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/test/java/TestGetAllFileMeta.java
diff --git a/src/test/java/TestYdy.java b/src/test/java/TestHos.java
index a9384df..4bafa46 100644
--- a/src/test/java/TestYdy.java
+++ b/src/test/java/TestHos.java
@@ -4,22 +4,27 @@ import static cn.ac.iie.storm.utils.config.GetMap.getDy;
 import static cn.ac.iie.storm.utils.config.GetMap.getSzd;
 import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
 
-public class TestYdy {
+public class TestHos {
     public static void main(String[] args) throws IOException {
-        InputStream input = new FileInputStream(new File("src/resources/common_app_id_coding.properties"));
+        InputStream input = new FileInputStream(new File("src/resources/test"));
 
         byte[] buffer = null;
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
         byte[] b = new byte[1024];
+
         int n;
+
         while ((n = input.read(b)) != -1)
         {
             bos.write(b, 0, n);
         }
+
         input.close();
+
         bos.close();
         buffer = bos.toByteArray();
-        getConnAnsyHttpPost("http://10.111.153.249:10080/",buffer);
+        getConnAnsyHttpPost("http://10.111.151.217:8888/yd-test/testfile?method=put",buffer);
     }
 }
diff --git a/src/test/java/TestSendObject.java b/src/test/java/TestSendObject.java
new file mode 100644
index 0000000..f893e6f
--- /dev/null
+++ b/src/test/java/TestSendObject.java
@@ -0,0 +1,41 @@
+import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
+
+import java.io.IOException;
+
+import static cn.ac.iie.storm.utils.hos.HosService.httpPostObject;
+import static cn.ac.iie.storm.utils.hos.Send2S3.SendObject2S3;
+import static cn.ac.iie.storm.utils.http.HttpAsncClient.getConnAnsyHttpPost;
+
+public class TestSendObject {
+    public static void main(String[] args) throws IOException {
+        String s = "http://10.111.143.200:9098/hos/fw_http_plug/http_response_body_36.189.23123123.36.21827-183.201.125.13.80_88136053457070.txt";
+        String[] split = s.split("/");
+        String BucketName = split[split.length-2];
+        String filename = split[split.length-1];
+//        byte[] bytes = httpPostObject("http://10.111.143.239:9098/hos/", BucketName, filename);
+//        getConnAnsyHttpPost("http://10.111.151.218:8888/t-http-rzzb/20210312.txt?method=put",bytes);
+
+
+        System.out.println("---------------------------------------------------");
+
+
+        byte[] bytes =null;
+
+        if (bytes!=null){
+            System.out.println(bytes);
+        }
+        String s3Url = SendObject2S3(s,"t-http-jczb");
+        System.out.println(s3Url);
+
+        String s1 = "http_response_body_36.189.23123123.36.21827-183.201.125.13.80_88136053457070.txt";
+        String s2 ="http://10.111.151.245:8888/t-http-jczb/";
+        System.out.println(s1.length());
+        System.out.println(s2.length());
+
+//        String s = "63.23123e+07";
+//        Float a = Float.valueOf(s);
+//        System.out.println(a);
+
+    }
+
+}
diff --git a/src/test/java/conntest/TestFtp.java b/src/test/java/conntest/TestFtp.java
deleted file mode 100644
index 262f515..0000000
--- a/src/test/java/conntest/TestFtp.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package conntest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.CONNAssignment.setFTP_RZZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestFtp {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_schema_type\":\"FTP\",\"common_sessions\":1,\"http_response_line\":\"HTTP/1.0 200 OK\",\"http_content_type\":\"application/octet-stream\",\"http_content_length\":\"935\",\"http_isn\":2030451978,\"http_proxy_flag\":0,\"http_version\":\"http1\",\"common_protocol_label\":\"TCP/IPv4/ETHERNET\",\"http_sequence\":1,\"common_c2s_ipfrag_num\":0,\"common_s2c_ipfrag_num\":0,\"common_c2s_tcp_unorder_num\":0,\"common_s2c_tcp_unorder_num\":0,\"common_c2s_tcp_lostlen\":0,\"common_s2c_tcp_lostlen\":0,\"common_server_ip\":\"117.190.80.44\",\"common_client_ip\":\"120.230.167.94\",\"common_server_port\":80,\"common_client_port\":17455,\"common_stream_dir\":2,\"common_address_type\":4,\"common_s2c_pkt_num\":5,\"common_s2c_byte_num\":1334,\"common_c2s_pkt_num\":0,\"common_c2s_byte_num\":0,\"common_start_time\":1611030829,\"common_end_time\":1611030830,\"common_con_duration_ms\":31455,\"common_stream_trace_id\":\"87974630312906\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_address_list\":\"17455-80-120.230.167.94-117.190.80.44\",\"common_l7_protocol\":\"HTTP\",\"common_establish_latency_ms\":595,\"common_client_location\":\"Jiangmen,Guangdong,China\",\"common_server_location\":\"Other,Other,China\",\"common_direction\":69,\"common_sled_ip\":\"10.111.128.219\",\"common_device_id\":\"GN202000000000000000\",\"common_data_center\":\"CMCC\",\"common_policy_id\":0,\"common_service\":2,\"common_action\":0}";
-        List<GenericRecord> FTPList = new ArrayList<GenericRecord>();
-        Schema ftpSchema;
-
-        ftpSchema = new Schema.Parser().parse(StreamAggregateConfig.FTP_RZZB_SCHEMA);
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-
-        GenericRecord ftp_rzzb = new GenericData.Record(ftpSchema);
-        setFTP_RZZB(ftp_rzzb, sessionRecordLog);
-        FTPList.add(ftp_rzzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.208.3:10080/", generate(ftpSchema, FTPList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_FTP_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/conntest/TestJstx.java b/src/test/java/conntest/TestJstx.java
deleted file mode 100644
index 3349ef6..0000000
--- a/src/test/java/conntest/TestJstx.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package conntest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.CONNAssignment.setJSTX_RZZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestJstx {
-    public static void main(String[] args) throws IOException {
-        List<GenericRecord> JSTXList = new ArrayList<GenericRecord>();
-        Schema jstxSchema;
-        jstxSchema = new Schema.Parser().parse(StreamAggregateConfig.JSTX_RZZB_SCHEMA);
-
-        String jsonStr = "{\"common_schema_type\":\"APP\",\"common_sessions\":1,\"http_request_line\":\"POST /wdinfo.php HTTP/1.1\",\"http_content_type\":\"application/octet-stream\",\"http_user_agent\":\"Post\",\"http_host\":\"qurl.f.360.cn\",\"http_url\":\"qurl.f.360.cn/wdinfo.php\",\"http_content_length\":\"894\",\"http_isn\":4280345344,\"http_proxy_flag\":0,\"http_version\":\"http1\",\"common_protocol_label\":\"TCP/IPv4/ETHERNET\",\"http_sequence\":1,\"common_c2s_ipfrag_num\":0,\"common_s2c_ipfrag_num\":0,\"common_c2s_tcp_unorder_num\":0,\"common_s2c_tcp_unorder_num\":0,\"common_c2s_tcp_lostlen\":0,\"common_s2c_tcp_lostlen\":0,\"common_server_ip\":\"111.7.68.189\",\"common_client_ip\":\"112.43.6.253\",\"common_server_port\":80,\"common_client_port\":9519,\"common_stream_dir\":1,\"common_address_type\":4,\"common_s2c_pkt_num\":0,\"common_s2c_byte_num\":0,\"common_c2s_pkt_num\":6,\"common_c2s_byte_num\":1402,\"common_start_time\":1611031676,\"common_end_time\":1611031676,\"common_con_duration_ms\":31020,\"common_stream_trace_id\":\"105566844157394\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_address_list\":\"9519-80-112.43.6.253-111.7.68.189\",\"common_l7_protocol\":\"HTTP\",\"common_establish_latency_ms\":54,\"common_client_location\":\"Other,Other,China\",\"common_server_location\":\"Other,Other,China\",\"common_direction\":73,\"common_sled_ip\":\"10.111.128.248\",\"common_device_id\":\"GN202000000000000000\",\"common_data_center\":\"CMCC\",\"common_policy_id\":0,\"common_service\":2,\"common_action\":0,\"common_app_id\":\"QQ\"}";
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(jsonStr, SessionRecordLog.class);
-        GenericRecord jstx_rzzb = new GenericData.Record(jstxSchema);
-        sessionRecordLog.setCommon_schema_type("SSL");
-        setJSTX_RZZB(jstx_rzzb, sessionRecordLog);
-        JSTXList.add(jstx_rzzb);
-        HttpClientService httpClientService = new HttpClientService();
-
-        Map<String, String> stringStringMap = httpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(jstxSchema, JSTXList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_JSTX_TOPIC);
-        System.out.println(stringStringMap);
-        JSTXList.clear();
-    }
-}
diff --git a/src/test/java/conntest/TestMail.java b/src/test/java/conntest/TestMail.java
deleted file mode 100644
index 4a0f995..0000000
--- a/src/test/java/conntest/TestMail.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package conntest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.CONNAssignment.setMAIL_RZZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestMail {
-    public static void main(String[] args) throws IOException {
-       List<GenericRecord> MAILList = new ArrayList<GenericRecord>();
-        Schema mailSchema;
-        mailSchema = new Schema.Parser().parse(StreamAggregateConfig.MAIL_RZZB_SCHEMA);
-
-        String jsonStr = "{\"common_action\":0,\"common_address_type\":4,\"common_c2s_byte_num\":606,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":9,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"36.184.3.197\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":5100,\"common_con_duration_ms\":31462,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611024036,\"common_establish_latency_ms\":269,\"common_external_ip\":\"36.184.3.197\",\"common_internal_ip\":\"183.232.93.197\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"UNKNOWN_TCP\",\"common_log_id\":96315054955890691,\"common_policy_id\":0,\"common_processing_time\":1611024024,\"common_protocol_label\":\"TCP/IPv4/ETHERNET\",\"common_recv_time\":1611024036,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"MAIL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.232.93.197\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":25,\"common_sessions\":1,\"common_sled_ip\":\"10.111.128.240\",\"common_start_time\":1611024035,\"common_stream_dir\":1,\"common_stream_trace_id\":61586128607366,\"mail_account\":\"[email protected]\",\"mail_protocol_type\":\"SMTP\"}";
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(jsonStr, SessionRecordLog.class);
-        GenericRecord mail_rzzb = new GenericData.Record(mailSchema);
-        try {
-            setMAIL_RZZB(mail_rzzb, sessionRecordLog);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        MAILList.add(mail_rzzb);
-        HttpClientService httpClientService = new HttpClientService();
-
-        Map<String, String> stringStringMap = httpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(mailSchema, MAILList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_MAIL_TOPIC);
-        System.out.println(stringStringMap);
-        MAILList.clear();
-    }
-}
diff --git a/src/test/java/conntest/TestSSL.java b/src/test/java/conntest/TestSSL.java
deleted file mode 100644
index 0c70bf8..0000000
--- a/src/test/java/conntest/TestSSL.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package conntest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.CONNAssignment.*;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestSSL {
-    public static void main(String[] args) throws IOException {
-        List<GenericRecord> SSLList = new ArrayList<GenericRecord>();
-        Schema sslSchema;
-        sslSchema = new Schema.Parser().parse(StreamAggregateConfig.HTTP_RZZB_SCHEMA);
-        String str = "{\"common_action\":0,\"common_address_type\":4,\"common_c2s_byte_num\":0,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":0,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.115.228.160\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":6450,\"common_con_duration_ms\":30957,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":69,\"common_end_time\":1611815268,\"common_establish_latency_ms\":83,\"common_external_ip\":\"162.14.14.11\",\"common_internal_ip\":\"223.115.228.160\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTP\",\"common_log_id\":109589882311743491,\"common_policy_id\":0,\"common_processing_time\":1611815266,\"common_protocol_label\":\"TCP/IPv4/ETHERNET\",\"common_recv_time\":1611815268,\"common_s2c_byte_num\":1516,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":4,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"132203\",\"common_server_ip\":\"162.14.14.11\",\"common_server_location\":\"Other,Other,Hong Kong\",\"common_server_port\":80,\"common_sessions\":1,\"common_sled_ip\":\"10.111.128.239\",\"common_start_time\":1611815268,\"common_stream_dir\":2,\"common_stream_trace_id\":123184706918968,\"http_content_length\":\"1134\",\"http_content_type\":\"application/json\",\"http_proxy_flag\":0,\"http_sequence\":1,\"http_version\":\"http1\"}";
-       SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        GenericRecord jstx_rzzb = new GenericData.Record(sslSchema);
-
-        setHTTP_RZZB(jstx_rzzb, sessionRecordLog);
-        SSLList.add(jstx_rzzb);
-        HttpClientService httpClientService = new HttpClientService();
-
-        Map<String, String> stringStringMap = httpClientService.getConnHttpPost("http://10.111.208.1:10080/", generate(sslSchema, SSLList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_SSL_TOPIC);
-        System.out.println(stringStringMap);
-
-
-    }
-
-}
diff --git a/src/test/java/conntest/TestVpn.java b/src/test/java/conntest/TestVpn.java
deleted file mode 100644
index 55db7f4..0000000
--- a/src/test/java/conntest/TestVpn.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package conntest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.CONNAssignment.setVPN_RZZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-
-public class TestVpn {
-    public static void main(String[] args) throws IOException {
-        List<GenericRecord> VPNList = new ArrayList<GenericRecord>();
-        Schema vpnSchema;
-        String str = "{\"common_schema_type\":\"BASE\",\"common_sessions\":1,\"common_protocol_label\":\"UDP/IPv4/ETHERNET\",\"common_c2s_ipfrag_num\":0,\"common_s2c_ipfrag_num\":0,\"common_server_ip\":\"223.115.12.126\",\"common_client_ip\":\"111.21.91.210\",\"common_server_port\":13823,\"common_client_port\":18005,\"common_stream_dir\":2,\"common_address_type\":4,\"common_s2c_pkt_num\":33,\"common_s2c_byte_num\":10049,\"common_c2s_pkt_num\":0,\"common_c2s_byte_num\":0,\"common_start_time\":1611028993,\"common_end_time\":1611028998,\"common_con_duration_ms\":65324,\"common_stream_trace_id\":\"43994105029885\",\"common_l4_protocol\":\"IPv4_UDP\",\"common_address_list\":\"18005-13823-111.21.91.210-223.115.12.126\",\"common_l7_protocol\":\"PPTP\",\"common_establish_latency_ms\":0,\"common_client_location\":\"Xi'an,Shaanxi,China\",\"common_server_location\":\"Other,Other,China\",\"common_direction\":69,\"common_sled_ip\":\"10.111.128.229\",\"common_device_id\":\"GN202000000000000000\",\"common_data_center\":\"CMCC\",\"common_policy_id\":0,\"common_service\":2,\"common_action\":0}";
-        vpnSchema = new Schema.Parser().parse(StreamAggregateConfig.VPN_RZZB_SCHEMA);
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-
-        if (sessionRecordLog.getCommon_l7_protocol().equals("PPTP") || sessionRecordLog.getCommon_l7_protocol().equals("L2TP") || sessionRecordLog.getCommon_l7_protocol().equals("OPENVPN") || sessionRecordLog.getCommon_l7_protocol().equals("IPSEC")) {
-            GenericRecord vpn_rzzb = new GenericData.Record(vpnSchema);
-            setVPN_RZZB(vpn_rzzb, sessionRecordLog);
-            VPNList.add(vpn_rzzb);
-            HttpClientService httpClientService = new HttpClientService();
-            System.out.println(vpn_rzzb.get("YDY"));
-
-            Map<String, String> stringStringMap = httpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(vpnSchema, VPNList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.FLOODING_POST_VPN_TOPIC);
-
-            System.out.println(stringStringMap);
-
-        }
-    }
-}
diff --git a/src/test/java/gktest/TestDns.java b/src/test/java/gktest/TestDns.java
deleted file mode 100644
index 754ac35..0000000
--- a/src/test/java/gktest/TestDns.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setDNS_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestDns {
-    public static void main(String[] args) throws IOException {
-
-        List<GenericRecord> DNSList = new ArrayList<GenericRecord>();
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":71,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":1,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"183.247.173.159\",\"common_client_location\":\"650109,,650440\",\"common_client_port\":12122,\"common_con_duration_ms\":0,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611051108,\"common_establish_latency_ms\":0,\"common_external_ip\":\"183.247.173.159\",\"common_internal_ip\":\"117.146.215.242\",\"common_l4_protocol\":\"IPv4_UDP\",\"common_l7_protocol\":\"DNS\",\"common_log_id\":96768794494537728,\"common_policy_id\":285,\"common_processing_time\":1611051069,\"common_recv_time\":1611051108,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"DNS\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"117.146.215.242\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":53,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.229\",\"common_start_time\":1611051108,\"common_stream_dir\":1,\"common_stream_trace_id\":14364576005,\"common_sub_action\":\"redirect\",\"common_user_region\":\"{\\\"method\\\":\\\"redirect\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":402,\\\"xzid\\\":0,\\\"lhid\\\":416,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉恐,涉黑,涉邪教,测试,诈骗,涉赌,涉爆,涉黄,涉毒,shehuang\\\",\\\"pzid\\\":\\\"0402000000000001\\\",\\\"flid\\\":0,\\\"enable\\\":0,\\\"timestamp\\\":1611030696},\\\"resolution\\\":[{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"1.1.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.5\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.4\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.3\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.1\\\"}]}],\\\"protocol\\\":\\\"DNS\\\"}\",\"dns_aa\":0,\"dns_ancount\":0,\"dns_arcount\":0,\"dns_message_id\":34004,\"dns_nscount\":0,\"dns_opcode\":0,\"dns_qclass\":1,\"dns_qdcount\":1,\"dns_qname\":\"m.baidu.com\",\"dns_qr\":0,\"dns_qtype\":1,\"dns_ra\":0,\"dns_rcode\":0,\"dns_rd\":1,\"dns_sub\":1,\"dns_tc\":0}";
-        Schema dnsSchema;
-
-        dnsSchema = new Schema.Parser().parse(StreamAggregateConfig.DNS_GKZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord dns_gkzb = new GenericData.Record(dnsSchema);
-        setDNS_GKZB(dns_gkzb, sessionRecordLog);
-        DNSList.add(dns_gkzb);
-      //  System.out.println(dns_gkzb.get("YDY"));
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(dnsSchema, DNSList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_DNS_TOPIC);
-     //   System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestFtp.java b/src/test/java/gktest/TestFtp.java
deleted file mode 100644
index 5e607ea..0000000
--- a/src/test/java/gktest/TestFtp.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setFTP_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestFtp {
-    public static void main(String[] args) throws IOException {
-        List<GenericRecord> FTPList = new ArrayList<GenericRecord>();
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":705,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":3,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"39.144.201.71\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":37002,\"common_con_duration_ms\":106,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611114749,\"common_establish_latency_ms\":106,\"common_external_ip\":\"39.144.201.71\",\"common_internal_ip\":\"183.192.170.139\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":97836281738856460,\"common_policy_id\":300,\"common_processing_time\":1611114696,\"common_recv_time\":1611114749,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.192.170.139\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.226\",\"common_start_time\":1611114749,\"common_stream_dir\":1,\"common_stream_trace_id\":87977380205179,\"common_sub_action\":\"rst\",\"common_user_region\":\"{\\\"method\\\":\\\"rst\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":408,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉爆\\\",\\\"pzid\\\":\\\"0405000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"01\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"测试0120\\\",\\\"timestamp\\\":1611114742},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"qq.com\"}";
-        Schema ftpSchema;
-
-        ftpSchema = new Schema.Parser().parse(StreamAggregateConfig.FTP_GKZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord ftp_gkzb = new GenericData.Record(ftpSchema);
-        setFTP_GKZB(ftp_gkzb, sessionRecordLog);
-        FTPList.add(ftp_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(ftpSchema, FTPList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_FTP_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestHttp.java b/src/test/java/gktest/TestHttp.java
deleted file mode 100644
index ba35a1d..0000000
--- a/src/test/java/gktest/TestHttp.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setHTTP_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestHttp {
-    public static void main(String[] args) throws IOException {
-
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":68964,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":75,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.117.129.189\",\"common_client_location\":\"Yining,Xinjiang,China\",\"common_client_port\":26752,\"common_con_duration_ms\":38737,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611116271,\"common_establish_latency_ms\":96,\"common_external_ip\":\"223.117.129.189\",\"common_internal_ip\":\"120.241.186.100\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTP\",\"common_log_id\":97862110380326925,\"common_policy_id\":304,\"common_processing_time\":1611116236,\"common_recv_time\":1611116271,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"120.241.186.100\",\"common_server_location\":\"650400,,650400\",\"common_server_port\":80,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.223\",\"common_start_time\":1611116233,\"common_stream_dir\":1,\"common_stream_trace_id\":17608684656699,\"common_sub_action\":\"rst\",\"common_user_region\":\"{\\\"method\\\":\\\"rst\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":403,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"yyzl\\\":0,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑\\\",\\\"pzid\\\":\\\"0403000000000005\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"timestamp\\\":1611116084},\\\"protocol\\\":\\\"HTTP\\\"}\",\"http_domain\":\"qq.com\",\"http_host\":\"btrace.qq.com\",\"http_proxy_flag\":0,\"http_sequence\":60,\"http_url\":\"btrace.qq.com/ckvcollect/\",\"http_version\":\"http1\"}";
-        List<GenericRecord> HTTPList = new ArrayList<GenericRecord>();
-        Schema httpSchema;
-
-        httpSchema = new Schema.Parser().parse(StreamAggregateConfig.HTTP_GKZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord http_gkzb = new GenericData.Record(httpSchema);
-        setHTTP_GKZB(http_gkzb, sessionRecordLog);
-        HTTPList.add(http_gkzb);
-        System.out.println(http_gkzb.get("MDDY"));
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.80.1:10080/", generate(httpSchema, HTTPList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_HTTP_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestIP.java b/src/test/java/gktest/TestIP.java
deleted file mode 100644
index 0200c90..0000000
--- a/src/test/java/gktest/TestIP.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setIP_GKRZ;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestIP {
-    public static void main(String[] args) throws IOException {
-
-        List<GenericRecord> DNSList = new ArrayList<GenericRecord>();
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":71,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":1,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"183.247.173.159\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":12122,\"common_con_duration_ms\":0,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611051108,\"common_establish_latency_ms\":0,\"common_external_ip\":\"183.247.173.159\",\"common_internal_ip\":\"117.146.215.242\",\"common_l4_protocol\":\"IPv4_UDP\",\"common_l7_protocol\":\"DNS\",\"common_log_id\":96768794494537728,\"common_policy_id\":285,\"common_processing_time\":1611051069,\"common_recv_time\":1611051108,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"DNS\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"117.146.215.242\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":53,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.229\",\"common_start_time\":1611051108,\"common_stream_dir\":1,\"common_stream_trace_id\":14364576005,\"common_sub_action\":\"redirect\",\"common_user_region\":\"{\\\"method\\\":\\\"redirect\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":402,\\\"xzid\\\":0,\\\"lhid\\\":416,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉恐,涉黑,涉邪教,测试,诈骗,涉赌,涉爆,涉黄,涉毒,shehuang\\\",\\\"pzid\\\":\\\"0402000000000001\\\",\\\"flid\\\":0,\\\"enable\\\":0,\\\"timestamp\\\":1611030696},\\\"resolution\\\":[{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"1.1.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.5\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.4\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.3\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.1\\\"}]}],\\\"protocol\\\":\\\"DNS\\\"}\",\"dns_aa\":0,\"dns_ancount\":0,\"dns_arcount\":0,\"dns_message_id\":34004,\"dns_nscount\":0,\"dns_opcode\":0,\"dns_qclass\":1,\"dns_qdcount\":1,\"dns_qname\":\"m.baidu.com\",\"dns_qr\":0,\"dns_qtype\":1,\"dns_ra\":0,\"dns_rcode\":0,\"dns_rd\":1,\"dns_sub\":1,\"dns_tc\":0}";
-        Schema ipSchema;
-
-        ipSchema = new Schema.Parser().parse(StreamAggregateConfig.IP_GKRZ_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord ip_gkzb = new GenericData.Record(ipSchema);
-        setIP_GKRZ(ip_gkzb, sessionRecordLog);
-        DNSList.add(ip_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(ipSchema, DNSList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_IP_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestMail.java b/src/test/java/gktest/TestMail.java
deleted file mode 100644
index 04d65f6..0000000
--- a/src/test/java/gktest/TestMail.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setMAIL_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestMail {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":705,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":3,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"39.144.201.71\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":37002,\"common_con_duration_ms\":106,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611114749,\"common_establish_latency_ms\":106,\"common_external_ip\":\"39.144.201.71\",\"common_internal_ip\":\"183.192.170.139\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":97836281738856460,\"common_policy_id\":300,\"common_processing_time\":1611114696,\"common_recv_time\":1611114749,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.192.170.139\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.226\",\"common_start_time\":1611114749,\"common_stream_dir\":1,\"common_stream_trace_id\":87977380205179,\"common_sub_action\":\"rst\",\"common_user_region\":\"{\\\"method\\\":\\\"rst\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":405,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉爆\\\",\\\"pzid\\\":\\\"0405000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"01\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"测试0120\\\",\\\"timestamp\\\":1611114742},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"qq.com\",\"ssl_ja3_hash\":\"9b02ebd3a43b62d825e1ac605b621dc8\",\"mail_account\":\"[email protected]\",\"mail_protocol_type\":\"SMTP\"}";
-         List<GenericRecord> MAILList = new ArrayList<GenericRecord>();
-        Schema mailSchema;
-
-        mailSchema = new Schema.Parser().parse(StreamAggregateConfig.MAIL_GKZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord mail_gkzb = new GenericData.Record(mailSchema);
-        setMAIL_GKZB(mail_gkzb, sessionRecordLog);
-        MAILList.add(mail_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(mailSchema, MAILList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_MAIL_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestSsl.java b/src/test/java/gktest/TestSsl.java
deleted file mode 100644
index d0bfeff..0000000
--- a/src/test/java/gktest/TestSsl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setSSL_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestSsl {
-    public static void main(String[] args) throws IOException {
-
-        List<GenericRecord> SSLList = new ArrayList<GenericRecord>();
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2396,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":17,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.114.176.221\",\"common_client_location\":\"650000\",\"common_client_port\":2245,\"common_con_duration_ms\":8508,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":69,\"common_end_time\":1611889277,\"common_establish_latency_ms\":97,\"common_external_ip\":\"183.232.232.23\",\"common_internal_ip\":\"223.114.176.221\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":110834274226219014,\"common_policy_id\":443,\"common_processing_time\":1611889437,\"common_recv_time\":1611889277,\"common_s2c_byte_num\":5512,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":18,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.232.232.23\",\"common_server_location\":\"640000\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.252\",\"common_start_time\":1611889269,\"common_stream_dir\":3,\"common_stream_trace_id\":88002759659387,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":505,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉邪教,涉爆,涉毒,测试\\\",\\\"pzid\\\":\\\"0505000000000001\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"01\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"0119ceshi\\\",\\\"timestamp\\\":1611043923},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"baidu.com\",\"ssl_cn\":\"baidu.com\",\"ssl_ja3_hash\":\"e46f2a8067ae28e46fa732fcb3a4f2e8\",\"ssl_san\":\"baidu.com;click.hm.baidu.com;cm.pos.baidu.com;log.hm.baidu.com;update.pan.baidu.com;wn.pos.baidu.com;*.91.com;*.aipage.cn;*.aipage.com;*.apollo.auto;*.baidu.com;*.baidubce.com;*.baiducontent.com;*.baidupcs.com;*.baidustatic.com;*.baifubao.com;*.bce.baidu.com;*.bcehost.com;*.bdimg.com;*.bdstatic.com;*.bdtjrcv.com;*.bj.baidubce.com;*.chuanke.com;*.cloud.baidu.com;*.dlnel.com;*.dlnel.org;*.dueros.baidu.com;*.eyun.baidu.com;*.fanyi.baidu.com;*.gz.baidubce.com;*.hao123.baidu.com;*.hao123.com;*.hao222.com;*.haokan.com;*.im.baidu.com;*.map.baidu.com;*.mbd.baidu.com;*.mipcdn.com;*.news.baidu.com;*.nuomi.com;*.pae.baidu.com;*.safe.baidu.com;*.smartapps.cn;*.su.baidu.com;*.trustgo.com;*.vd.bdstatic.com;*.xueshu.baidu.com;apollo.auto;baifubao.com;dwz.cn;mct.y.nuomi.com;www.baidu.cn;www.baidu.com.cn\",\"ssl_sni\":\"pimlog.baidu.com\"}";
-        Schema sslSchema;
-
-        sslSchema = new Schema.Parser().parse(StreamAggregateConfig.SSL_GKZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord ssl_gkzb = new GenericData.Record(sslSchema);
-        setSSL_GKZB(ssl_gkzb, sessionRecordLog);
-        SSLList.add(ssl_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(sslSchema, SSLList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_SSL_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestVpn.java b/src/test/java/gktest/TestVpn.java
deleted file mode 100644
index 6303b8b..0000000
--- a/src/test/java/gktest/TestVpn.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setVPN_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestVpn {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":68964,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":75,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.117.129.189\",\"common_client_location\":\"Yining,Xinjiang,China\",\"common_client_port\":26752,\"common_con_duration_ms\":38737,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611116271,\"common_establish_latency_ms\":96,\"common_external_ip\":\"223.117.129.189\",\"common_internal_ip\":\"120.241.186.100\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"PPTP\",\"common_log_id\":97862110380326925,\"common_policy_id\":304,\"common_processing_time\":1611116236,\"common_recv_time\":1611116271,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"120.241.186.100\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":80,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.223\",\"common_start_time\":1611116233,\"common_stream_dir\":1,\"common_stream_trace_id\":17608684656699,\"common_sub_action\":\"rst\",\"common_user_region\":\"{\\\"method\\\":\\\"rst\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":411,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"yyzl\\\":0,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑\\\",\\\"pzid\\\":\\\"0403000000000005\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"timestamp\\\":1611116084},\\\"protocol\\\":\\\"HTTP\\\"}\",\"http_domain\":\"qq.com\",\"http_host\":\"btrace.qq.com\",\"http_proxy_flag\":0,\"http_sequence\":60,\"http_url\":\"btrace.qq.com/ckvcollect/\",\"http_version\":\"http1\"}";
-        List<GenericRecord> VPNList = new ArrayList<GenericRecord>();
-        Schema vpnSchema;
-
-        vpnSchema = new Schema.Parser().parse(StreamAggregateConfig.VPN_GKZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord vpn_gkzb = new GenericData.Record(vpnSchema);
-        setVPN_GKZB(vpn_gkzb, sessionRecordLog);
-        VPNList.add(vpn_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(vpnSchema, VPNList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_VPN_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/TestWygjc.java b/src/test/java/gktest/TestWygjc.java
deleted file mode 100644
index 5d6277a..0000000
--- a/src/test/java/gktest/TestWygjc.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setWYGJC_GKZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestWygjc {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":71,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":1,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"183.247.173.159\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":12122,\"common_con_duration_ms\":0,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611051108,\"common_establish_latency_ms\":0,\"common_external_ip\":\"183.247.173.159\",\"common_internal_ip\":\"117.146.215.242\",\"common_l4_protocol\":\"IPv4_UDP\",\"common_l7_protocol\":\"DNS\",\"common_log_id\":96768794494537728,\"common_policy_id\":285,\"common_processing_time\":1611051069,\"common_recv_time\":1611051108,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"DNS\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"117.146.215.242\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":53,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.229\",\"common_start_time\":1611051108,\"common_stream_dir\":1,\"common_stream_trace_id\":14364576005,\"common_sub_action\":\"redirect\",\"common_user_region\":\"{\\\"method\\\":\\\"redirect\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":406,\\\"xzid\\\":0,\\\"lhid\\\":416,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉恐,涉黑,涉邪教,测试,诈骗,涉赌,涉爆,涉黄,涉毒,shehuang\\\",\\\"pzid\\\":\\\"0402000000000001\\\",\\\"flid\\\":0,\\\"enable\\\":0,\\\"timestamp\\\":1611030696},\\\"resolution\\\":[{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"1.1.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.5\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.4\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.3\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.1\\\"}]}],\\\"protocol\\\":\\\"DNS\\\"}\"}";
-        List<GenericRecord> WYGJCList = new ArrayList<GenericRecord>();
-        Schema wygjcSchema;
-
-        wygjcSchema = new Schema.Parser().parse(StreamAggregateConfig.WYGJC_GKRZ_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord wygjc_gkzb = new GenericData.Record(wygjcSchema);
-        setWYGJC_GKZB(wygjc_gkzb, sessionRecordLog);
-        WYGJCList.add(wygjc_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(wygjcSchema, WYGJCList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.GK_POST_WYGJC_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/gktest/Testjstx.java b/src/test/java/gktest/Testjstx.java
deleted file mode 100644
index c783c22..0000000
--- a/src/test/java/gktest/Testjstx.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gktest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class Testjstx {
-    public static void main(String[] args) throws IOException {
-        List<GenericRecord> JSTXList = new ArrayList<GenericRecord>();
-        Schema jstxSchema;
-        jstxSchema = new Schema.Parser().parse(StreamAggregateConfig.JSTX_GKZB_SCHEMA);
-
-         // SessionRecordLog sessionRecordLog = JSONObject.parseObject(, SessionRecordLog.class);
-        GenericRecord jstx_jczb = new GenericData.Record(jstxSchema);
-        //  setJSTX_JCZB(jstx_jczb, sessionRecordLog);
-        JSTXList.add(jstx_jczb);
-        HttpClientService httpClientService = new HttpClientService();
-
-        Map<String, String> stringStringMap = httpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(jstxSchema, JSTXList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_JSTX_TOPIC);
-        System.out.println(stringStringMap);
-        JSTXList.clear();
-    }
-}
diff --git a/src/test/java/jctest/JCIp.java b/src/test/java/jctest/JCIp.java
deleted file mode 100644
index a186af3..0000000
--- a/src/test/java/jctest/JCIp.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setHTTP_JCZB;
-import static cn.ac.iie.storm.utils.general.JCAssignment.setIP_JCRZ;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class JCIp {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2062,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":6,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.117.24.8\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":16089,\"common_con_duration_ms\":236,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611223971,\"common_establish_latency_ms\":134,\"common_external_ip\":\"223.117.24.8\",\"common_internal_ip\":\"183.194.238.117\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTP\",\"common_log_id\":99671189075544078,\"common_policy_id\":342,\"common_processing_time\":1611224065,\"common_recv_time\":1611223971,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.194.238.117\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":80,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.246\",\"common_start_time\":1611223971,\"common_stream_dir\":1,\"common_stream_trace_id\":105573145241355,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":504,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"yyzl\\\":0,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉邪教\\\",\\\"pzid\\\":\\\"0504000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"timestamp\\\":1611222786},\\\"protocol\\\":\\\"HTTP\\\"}\",\"http_content_length\":\"1420\",\"http_content_type\":\"multipart/form-data; boundary=-----------hello word-----------\",\"http_domain\":\"qq.com\",\"http_host\":\"www.qq.com\",\"http_proxy_flag\":0,\"http_response_lantency_ms\":0,\"http_sequence\":1,\"http_session_duration_ms\":101,\"http_url\":\"www.qq.com/\",\"http_user_agent\":\"Dalvik/2.1.0 (Linux; U; Android 10; PCGM00 Build/QKQ1.190918.001)\",\"http_version\":\"http1\"}";
-        List<GenericRecord> IPList = new ArrayList<GenericRecord>();
-        Schema ipSchema;
-
-        ipSchema = new Schema.Parser().parse(StreamAggregateConfig.IP_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord ip_jczb = new GenericData.Record(ipSchema);
-        setIP_JCRZ(ip_jczb, sessionRecordLog);
-        IPList.add(ip_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(ipSchema, IPList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_IP_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/JcHttp.java b/src/test/java/jctest/JcHttp.java
deleted file mode 100644
index c591051..0000000
--- a/src/test/java/jctest/JcHttp.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setHTTP_JCZB;
-import static cn.ac.iie.storm.utils.general.JCAssignment.setSSL_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class JcHttp {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2062,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":6,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.117.24.8\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":16089,\"common_con_duration_ms\":236,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611223971,\"common_establish_latency_ms\":134,\"common_external_ip\":\"223.117.24.8\",\"common_internal_ip\":\"183.194.238.117\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTP\",\"common_log_id\":99671189075544078,\"common_policy_id\":342,\"common_processing_time\":1611224065,\"common_recv_time\":1611223971,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.194.238.117\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":80,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.246\",\"common_start_time\":1611223971,\"common_stream_dir\":1,\"common_stream_trace_id\":105573145241355,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":504,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"yyzl\\\":0,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉邪教\\\",\\\"pzid\\\":\\\"0504000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"timestamp\\\":1611222786},\\\"protocol\\\":\\\"HTTP\\\"}\",\"http_content_length\":\"1420\",\"http_content_type\":\"multipart/form-data; boundary=-----------hello word-----------\",\"http_domain\":\"qq.com\",\"http_host\":\"www.qq.com\",\"http_proxy_flag\":0,\"http_response_lantency_ms\":0,\"http_sequence\":1,\"http_session_duration_ms\":101,\"http_url\":\"www.qq.com/\",\"http_user_agent\":\"Dalvik/2.1.0 (Linux; U; Android 10; PCGM00 Build/QKQ1.190918.001)\",\"http_version\":\"http1\"}";
-        List<GenericRecord> HTTPList = new ArrayList<GenericRecord>();
-        Schema httpSchema;
-
-        httpSchema = new Schema.Parser().parse(StreamAggregateConfig.HTTP_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord http_jczb = new GenericData.Record(httpSchema);
-        setHTTP_JCZB(http_jczb, sessionRecordLog);
-        HTTPList.add(http_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.208.1:10080/", generate(httpSchema, HTTPList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_HTTP_TOPIC);
-        System.out.println("这是消息头"+stringStringMap);
-        if (stringStringMap.containsValue("502")){
-            System.out.println("发送失败"+"失败原因为"+stringStringMap);
-        }
-    }
-}
diff --git a/src/test/java/jctest/JcPic.java b/src/test/java/jctest/JcPic.java
deleted file mode 100644
index d96c866..0000000
--- a/src/test/java/jctest/JcPic.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setPIC_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class JcPic {
-    public static void main(String[] args) throws IOException {
-
-            String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2062,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":6,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.117.24.8\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":16089,\"common_con_duration_ms\":236,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611223971,\"common_establish_latency_ms\":134,\"common_external_ip\":\"223.117.24.8\",\"common_internal_ip\":\"183.194.238.117\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTP\",\"common_log_id\":99671189075544078,\"common_policy_id\":342,\"common_processing_time\":1611224065,\"common_recv_time\":1611223971,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.194.238.117\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":80,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.246\",\"common_start_time\":1611223971,\"common_stream_dir\":1,\"common_stream_trace_id\":105573145241355,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":504,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"yyzl\\\":0,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉邪教\\\",\\\"pzid\\\":\\\"0504000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"timestamp\\\":1611222786},\\\"protocol\\\":\\\"HTTP\\\"}\",\"http_content_length\":\"1420\",\"http_content_type\":\"multipart/form-data; boundary=-----------hello word-----------\",\"http_domain\":\"qq.com\",\"http_host\":\"www.qq.com\",\"http_proxy_flag\":0,\"http_response_lantency_ms\":0,\"http_sequence\":1,\"http_session_duration_ms\":101,\"http_url\":\"www.qq.com/\",\"http_user_agent\":\"Dalvik/2.1.0 (Linux; U; Android 10; PCGM00 Build/QKQ1.190918.001)\",\"http_version\":\"http1\"}";
-            List<GenericRecord> PICList = new ArrayList<GenericRecord>();
-            Schema picSchema;
-
-            picSchema = new Schema.Parser().parse(StreamAggregateConfig.PIC_JCZB_SCHEMA);
-
-            SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-            UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-            Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-            sessionRecordLog.setPzid(traffic_forward.getPzid());
-            sessionRecordLog.setFlid(traffic_forward.getFlid());
-            sessionRecordLog.setXzid(traffic_forward.getXzid());
-            sessionRecordLog.setLhid(traffic_forward.getLhid());
-            sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-            sessionRecordLog.setGklb(traffic_forward.getGklb());
-            sessionRecordLog.setLabels(traffic_forward.getLabels());
-            sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-            GenericRecord pic_jczb = new GenericData.Record(picSchema);
-            setPIC_JCZB(pic_jczb, sessionRecordLog);
-            PICList.add(pic_jczb);
-
-            Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(picSchema, PICList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_PIC_TOPIC);
-            System.out.println(stringStringMap);
-
-    }
-}
diff --git a/src/test/java/jctest/JcSsl.java b/src/test/java/jctest/JcSsl.java
deleted file mode 100644
index c308df9..0000000
--- a/src/test/java/jctest/JcSsl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setHTTP_JCZB;
-import static cn.ac.iie.storm.utils.general.JCAssignment.setSSL_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class JcSsl {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2396,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":17,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.114.176.221\",\"common_client_location\":\"650000\",\"common_client_port\":2245,\"common_con_duration_ms\":8508,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":69,\"common_end_time\":1611889277,\"common_establish_latency_ms\":97,\"common_external_ip\":\"183.232.232.23\",\"common_internal_ip\":\"223.114.176.221\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":110834274226219014,\"common_policy_id\":443,\"common_processing_time\":1611889437,\"common_recv_time\":1611889277,\"common_s2c_byte_num\":5512,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":18,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.232.232.23\",\"common_server_location\":\"640000\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.252\",\"common_start_time\":1611889269,\"common_stream_dir\":3,\"common_stream_trace_id\":88002759659387,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":505,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉邪教,涉爆,涉毒,测试\\\",\\\"pzid\\\":\\\"0505000000000001\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"01\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"0119ceshi\\\",\\\"timestamp\\\":1611043923},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"baidu.com\",\"ssl_cn\":\"baidu.com\",\"ssl_ja3_hash\":\"e46f2a8067ae28e46fa732fcb3a4f2e8\",\"ssl_san\":\"baidu.com;click.hm.baidu.com;cm.pos.baidu.com;log.hm.baidu.com;update.pan.baidu.com;wn.pos.baidu.com;*.91.com;*.aipage.cn;*.aipage.com;*.apollo.auto;*.baidu.com;*.baidubce.com;*.baiducontent.com;*.baidupcs.com;*.baidustatic.com;*.baifubao.com;*.bce.baidu.com;*.bcehost.com;*.bdimg.com;*.bdstatic.com;*.bdtjrcv.com;*.bj.baidubce.com;*.chuanke.com;*.cloud.baidu.com;*.dlnel.com;*.dlnel.org;*.dueros.baidu.com;*.eyun.baidu.com;*.fanyi.baidu.com;*.gz.baidubce.com;*.hao123.baidu.com;*.hao123.com;*.hao222.com;*.haokan.com;*.im.baidu.com;*.map.baidu.com;*.mbd.baidu.com;*.mipcdn.com;*.news.baidu.com;*.nuomi.com;*.pae.baidu.com;*.safe.baidu.com;*.smartapps.cn;*.su.baidu.com;*.trustgo.com;*.vd.bdstatic.com;*.xueshu.baidu.com;apollo.auto;baifubao.com;dwz.cn;mct.y.nuomi.com;www.baidu.cn;www.baidu.com.cn\",\"ssl_sni\":\"pimlog.baidu.com\"}";
-        List<GenericRecord> SSLList = new ArrayList<GenericRecord>();
-        Schema sslSchema;
-
-        sslSchema = new Schema.Parser().parse(StreamAggregateConfig.SSL_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord ssl_jczb = new GenericData.Record(sslSchema);
-        setSSL_JCZB(ssl_jczb, sessionRecordLog);
-        SSLList.add(ssl_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(sslSchema, SSLList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_SSL_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/TestDns.java b/src/test/java/jctest/TestDns.java
deleted file mode 100644
index ee412cc..0000000
--- a/src/test/java/jctest/TestDns.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setDNS_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestDns {
-    public static void main(String[] args) throws IOException {
-       String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":85,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":1,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"4134\",\"common_client_ip\":\"49.114.170.81\",\"common_client_location\":\",,\",\"common_client_port\":20991,\"common_con_duration_ms\":1,\"common_data_center\":\"CTCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1614496480,\"common_establish_latency_ms\":0,\"common_external_ip\":\"49.114.170.81\",\"common_internal_ip\":\"114.114.114.114\",\"common_l4_protocol\":\"IPv4_UDP\",\"common_l7_protocol\":\"DNS\",\"common_log_id\":154573189755715584,\"common_policy_id\":1351,\"common_processing_time\":1614496480,\"common_recv_time\":1614496480,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"DNS\",\"common_server_asn\":\"174,4134\",\"common_server_ip\":\"114.114.114.114\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":53,\"common_sessions\":0,\"common_sled_ip\":\"10.111.64.11\",\"common_start_time\":1614496480,\"common_stream_dir\":1,\"common_stream_trace_id\":127262545176,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":502,\\\"xzid\\\":0,\\\"lhid\\\":333,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉邪教,诈骗,涉爆,涉黄,涉毒,测试\\\",\\\"pzid\\\":\\\"0502000000000007\\\",\\\"flid\\\":0,\\\"enable\\\":0,\\\"timestamp\\\":1611985457},\\\"protocol\\\":\\\"DNS\\\"}\",\"dns_aa\":0,\"dns_ancount\":0,\"dns_arcount\":0,\"dns_message_id\":57215,\"dns_nscount\":0,\"dns_opcode\":0,\"dns_qclass\":1,\"dns_qdcount\":1,\"dns_qname\":\"pull-flv-f6.douyincdn.com\",\"dns_qr\":0,\"dns_qtype\":1,\"dns_ra\":0,\"dns_rcode\":0,\"dns_rd\":1,\"dns_sub\":1,\"dns_tc\":0}";
-       List<GenericRecord> DNSList = new ArrayList<GenericRecord>();
-        Schema dnsSchema;
-
-        dnsSchema = new Schema.Parser().parse(StreamAggregateConfig.DNS_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord dns_jczb = new GenericData.Record(dnsSchema);
-        setDNS_JCZB(dns_jczb, sessionRecordLog);
-        DNSList.add(dns_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(dnsSchema, DNSList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_DNS_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/TestFTP.java b/src/test/java/jctest/TestFTP.java
deleted file mode 100644
index 1d18a27..0000000
--- a/src/test/java/jctest/TestFTP.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setFTP_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestFTP {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2884,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":13,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.116.148.253\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":9410,\"common_con_duration_ms\":34024,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611224156,\"common_establish_latency_ms\":243,\"common_external_ip\":\"223.116.148.253\",\"common_internal_ip\":\"117.144.244.26\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":99672745028108302,\"common_policy_id\":341,\"common_processing_time\":1611224158,\"common_recv_time\":1611224156,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"117.144.244.26\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.251\",\"common_start_time\":1611224152,\"common_stream_dir\":1,\"common_stream_trace_id\":20034944269,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":505,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉爆,涉黄\\\",\\\"pzid\\\":\\\"0505000000000004\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"qq.com\\\",\\\"timestamp\\\":1611222773},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"qq.com\",\"ssl_ja3_hash\":\"0b87118411d0a3fb5002ce9ad0acbaa9\",\"ssl_sni\":\"lbs.map.qq.com\"}";
-        List<GenericRecord> FTPList = new ArrayList<GenericRecord>();
-        Schema ftpSchema;
-
-        ftpSchema = new Schema.Parser().parse(StreamAggregateConfig.FTP_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord ftp_jczb = new GenericData.Record(ftpSchema);
-        setFTP_JCZB(ftp_jczb, sessionRecordLog);
-        FTPList.add(ftp_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(ftpSchema, FTPList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_FTP_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/TestJstx.java b/src/test/java/jctest/TestJstx.java
deleted file mode 100644
index acdbb71..0000000
--- a/src/test/java/jctest/TestJstx.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestJstx {
-    public static void main(String[] args) throws IOException {
-        List<GenericRecord> JSTXList = new ArrayList<GenericRecord>();
-        Schema jstxSchema;
-        jstxSchema = new Schema.Parser().parse(StreamAggregateConfig.JSTX_JCZB_SCHEMA);
-
-       // SessionRecordLog sessionRecordLog = JSONObject.parseObject(, SessionRecordLog.class);
-        GenericRecord jstx_jczb = new GenericData.Record(jstxSchema);
-      //  setJSTX_JCZB(jstx_jczb, sessionRecordLog);
-        JSTXList.add(jstx_jczb);
-        HttpClientService httpClientService = new HttpClientService();
-
-        Map<String, String> stringStringMap = httpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(jstxSchema, JSTXList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_JSTX_TOPIC);
-        System.out.println(stringStringMap);
-        JSTXList.clear();
-    }
-}
diff --git a/src/test/java/jctest/TestMail.java b/src/test/java/jctest/TestMail.java
deleted file mode 100644
index cc09344..0000000
--- a/src/test/java/jctest/TestMail.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setMAIL_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestMail {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":705,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":3,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"39.144.201.71\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":37002,\"common_con_duration_ms\":106,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611114749,\"common_establish_latency_ms\":106,\"common_external_ip\":\"39.144.201.71\",\"common_internal_ip\":\"183.192.170.139\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":97836281738856460,\"common_policy_id\":300,\"common_processing_time\":1611114696,\"common_recv_time\":1611114749,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.192.170.139\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.226\",\"common_start_time\":1611114749,\"common_stream_dir\":1,\"common_stream_trace_id\":87977380205179,\"common_sub_action\":\"rst\",\"common_user_region\":\"{\\\"method\\\":\\\"rst\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":405,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉爆\\\",\\\"pzid\\\":\\\"0405000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"01\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"测试0120\\\",\\\"timestamp\\\":1611114742},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"qq.com\",\"ssl_ja3_hash\":\"9b02ebd3a43b62d825e1ac605b621dc8\",\"mail_account\":\"[email protected]\",\"mail_protocol_type\":\"SMTP\"}";
-        List<GenericRecord> MAILList = new ArrayList<GenericRecord>();
-        Schema mailSchema;
-
-        mailSchema = new Schema.Parser().parse(StreamAggregateConfig.MAIL_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord mail_gkzb = new GenericData.Record(mailSchema);
-        setMAIL_JCZB(mail_gkzb, sessionRecordLog);
-        MAILList.add(mail_gkzb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(mailSchema, MAILList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_MAIL_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/TestMedia.java b/src/test/java/jctest/TestMedia.java
deleted file mode 100644
index 6f1be7b..0000000
--- a/src/test/java/jctest/TestMedia.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setMEDIA_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestMedia {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2062,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":6,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.117.24.8\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":16089,\"common_con_duration_ms\":236,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611223971,\"common_establish_latency_ms\":134,\"common_external_ip\":\"223.117.24.8\",\"common_internal_ip\":\"183.194.238.117\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTP\",\"common_log_id\":99671189075544078,\"common_policy_id\":342,\"common_processing_time\":1611224065,\"common_recv_time\":1611223971,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"HTTP\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"183.194.238.117\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":80,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.246\",\"common_start_time\":1611223971,\"common_stream_dir\":1,\"common_stream_trace_id\":105573145241355,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":504,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"yyzl\\\":0,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉黑,涉邪教\\\",\\\"pzid\\\":\\\"0504000000000002\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"timestamp\\\":1611222786},\\\"protocol\\\":\\\"HTTP\\\"}\",\"http_content_length\":\"1420\",\"http_content_type\":\"multipart/form-data; boundary=-----------hello word-----------\",\"http_domain\":\"qq.com\",\"http_host\":\"www.qq.com\",\"http_proxy_flag\":0,\"http_response_lantency_ms\":0,\"http_sequence\":1,\"http_session_duration_ms\":101,\"http_url\":\"www.qq.com/\",\"http_user_agent\":\"Dalvik/2.1.0 (Linux; U; Android 10; PCGM00 Build/QKQ1.190918.001)\",\"http_version\":\"http1\"}";
-        List<GenericRecord> MEDIAList = new ArrayList<GenericRecord>();
-        Schema mediaSchema;
-
-        mediaSchema = new Schema.Parser().parse(StreamAggregateConfig.MEDIA_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord media_jczb = new GenericData.Record(mediaSchema);
-        setMEDIA_JCZB(media_jczb, sessionRecordLog);
-        MEDIAList.add(media_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(mediaSchema, MEDIAList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_MEDIA_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/TestVPN.java b/src/test/java/jctest/TestVPN.java
deleted file mode 100644
index dab4f63..0000000
--- a/src/test/java/jctest/TestVPN.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.JCAssignment.setSSL_JCZB;
-import static cn.ac.iie.storm.utils.general.JCAssignment.setVPN_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestVPN {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":1,\"common_address_type\":4,\"common_c2s_byte_num\":2884,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":13,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"223.116.148.253\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":9410,\"common_con_duration_ms\":34024,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611224156,\"common_establish_latency_ms\":243,\"common_external_ip\":\"223.116.148.253\",\"common_internal_ip\":\"117.144.244.26\",\"common_l4_protocol\":\"IPv4_TCP\",\"common_l7_protocol\":\"HTTPS\",\"common_log_id\":99672745028108302,\"common_policy_id\":341,\"common_processing_time\":1611224158,\"common_recv_time\":1611224156,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"SSL\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"117.144.244.26\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":443,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.251\",\"common_start_time\":1611224152,\"common_stream_dir\":1,\"common_stream_trace_id\":20034944269,\"common_user_region\":\"{\\\"traffic_forward\\\":{\\\"pzlx\\\":505,\\\"xzid\\\":0,\\\"lhid\\\":410,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉爆,涉黄\\\",\\\"pzid\\\":\\\"0505000000000004\\\",\\\"flid\\\":0,\\\"yylx\\\":\\\"00\\\",\\\"enable\\\":0,\\\"zsmc\\\":\\\"qq.com\\\",\\\"timestamp\\\":1611222773},\\\"protocol\\\":\\\"SSL\\\"}\",\"http_domain\":\"qq.com\",\"ssl_ja3_hash\":\"0b87118411d0a3fb5002ce9ad0acbaa9\",\"ssl_sni\":\"lbs.map.qq.com\"}";
-        List<GenericRecord> VPNList = new ArrayList<GenericRecord>();
-        Schema vpnSchema;
-
-        vpnSchema = new Schema.Parser().parse(StreamAggregateConfig.VPN_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord vpn_jczb = new GenericData.Record(vpnSchema);
-        setVPN_JCZB(vpn_jczb, sessionRecordLog);
-        VPNList.add(vpn_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(vpnSchema, VPNList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_VPN_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/jctest/TestWygjc.java b/src/test/java/jctest/TestWygjc.java
deleted file mode 100644
index 18784e8..0000000
--- a/src/test/java/jctest/TestWygjc.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jctest;
-
-import cn.ac.iie.storm.bean.SessionRecordLog;
-import cn.ac.iie.storm.bean.Traffic_Forward;
-import cn.ac.iie.storm.bean.UserRegion;
-import cn.ac.iie.storm.utils.config.StreamAggregateConfig;
-import cn.ac.iie.storm.utils.http.HttpClientService;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRecord;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static cn.ac.iie.storm.utils.general.GKAssignment.setWYGJC_GKZB;
-import static cn.ac.iie.storm.utils.general.JCAssignment.setWYGJC_JCZB;
-import static cn.ac.iie.storm.utils.general.TransFormUtils.generate;
-
-public class TestWygjc {
-    public static void main(String[] args) throws IOException {
-        String str = "{\"common_action\":16,\"common_address_type\":4,\"common_c2s_byte_num\":71,\"common_c2s_ipfrag_num\":0,\"common_c2s_pkt_num\":1,\"common_c2s_tcp_lostlen\":0,\"common_c2s_tcp_unorder_num\":0,\"common_client_asn\":\"9808\",\"common_client_ip\":\"183.247.173.159\",\"common_client_location\":\"Other,Other,China\",\"common_client_port\":12122,\"common_con_duration_ms\":0,\"common_data_center\":\"CMCC\",\"common_device_id\":\"GN202000000000000000\",\"common_direction\":73,\"common_end_time\":1611051108,\"common_establish_latency_ms\":0,\"common_external_ip\":\"183.247.173.159\",\"common_internal_ip\":\"117.146.215.242\",\"common_l4_protocol\":\"IPv4_UDP\",\"common_l7_protocol\":\"DNS\",\"common_log_id\":96768794494537728,\"common_policy_id\":285,\"common_processing_time\":1611051069,\"common_recv_time\":1611051108,\"common_s2c_byte_num\":0,\"common_s2c_ipfrag_num\":0,\"common_s2c_pkt_num\":0,\"common_s2c_tcp_lostlen\":0,\"common_s2c_tcp_unorder_num\":0,\"common_schema_type\":\"DNS\",\"common_server_asn\":\"9808\",\"common_server_ip\":\"117.146.215.242\",\"common_server_location\":\"Other,Other,China\",\"common_server_port\":53,\"common_sessions\":0,\"common_sled_ip\":\"10.111.128.229\",\"common_start_time\":1611051108,\"common_stream_dir\":1,\"common_stream_trace_id\":14364576005,\"common_sub_action\":\"redirect\",\"common_user_region\":\"{\\\"method\\\":\\\"redirect\\\",\\\"traffic_forward\\\":{\\\"pzlx\\\":409,\\\"xzid\\\":0,\\\"lhid\\\":416,\\\"gklb\\\":4,\\\"labels\\\":\\\"涉恐,涉黑,涉邪教,测试,诈骗,涉赌,涉爆,涉黄,涉毒,shehuang\\\",\\\"pzid\\\":\\\"0402000000000001\\\",\\\"flid\\\":0,\\\"enable\\\":0,\\\"timestamp\\\":1611030696},\\\"resolution\\\":[{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"1.1.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.5\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.4\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.2\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.3\\\"}]},{\\\"qtype\\\":\\\"A\\\",\\\"answer\\\":[{\\\"ttl\\\":{\\\"max\\\":300,\\\"min\\\":300},\\\"atype\\\":\\\"A\\\",\\\"value\\\":\\\"192.168.1.1\\\"}]}],\\\"protocol\\\":\\\"DNS\\\"}\"}";
-        List<GenericRecord> WYGJCList = new ArrayList<GenericRecord>();
-        Schema wygjcSchema;
-
-        wygjcSchema = new Schema.Parser().parse(StreamAggregateConfig.WYGJZ_JCZB_SCHEMA);
-
-        SessionRecordLog sessionRecordLog = JSONObject.parseObject(str, SessionRecordLog.class);
-        UserRegion userRegion = JSONObject.parseObject(sessionRecordLog.getCommon_user_region(), UserRegion.class);
-        Traffic_Forward traffic_forward = JSONObject.parseObject(userRegion.getTraffic_forward(), Traffic_Forward.class);
-        sessionRecordLog.setPzid(traffic_forward.getPzid());
-        sessionRecordLog.setFlid(traffic_forward.getFlid());
-        sessionRecordLog.setXzid(traffic_forward.getXzid());
-        sessionRecordLog.setLhid(traffic_forward.getLhid());
-        sessionRecordLog.setPzlx(traffic_forward.getPzlx());
-        sessionRecordLog.setGklb(traffic_forward.getGklb());
-        sessionRecordLog.setLabels(traffic_forward.getLabels());
-        sessionRecordLog.setYyzl(traffic_forward.getYyzl());
-
-        GenericRecord wygjc_jczb = new GenericData.Record(wygjcSchema);
-        setWYGJC_JCZB(wygjc_jczb, sessionRecordLog);
-        WYGJCList.add(wygjc_jczb);
-
-        Map<String, String> stringStringMap = HttpClientService.getConnHttpPost("http://10.111.153.249:10080/", generate(wygjcSchema, WYGJCList), StreamAggregateConfig.FLOODING_HTTP_POST_SOCKETTIMEOUT, StreamAggregateConfig.JC_POST_WYGJC_TOPIC);
-        System.out.println(stringStringMap);
-    }
-}
diff --git a/src/test/java/testAppId.java b/src/test/java/testAppId.java
new file mode 100644
index 0000000..5b1367d
--- /dev/null
+++ b/src/test/java/testAppId.java
@@ -0,0 +1,11 @@
+import java.io.IOException;
+
+import static cn.ac.iie.storm.utils.config.GetMap.getJstxDetail_id;
+
+public class testAppId {
+    public static void main(String[] args) throws IOException {
+        String jstxDetail_id = getJstxDetail_id(100100);
+        System.out.println(jstxDetail_id);
+    }
+
+}