diff --git a/src/main/java/cn/ac/iie/bean/PublicSessionRecordLog.java b/src/main/java/cn/ac/iie/bean/PublicSessionRecordLog.java
index d9e6ced..6b852cd 100644
--- a/src/main/java/cn/ac/iie/bean/PublicSessionRecordLog.java
+++ b/src/main/java/cn/ac/iie/bean/PublicSessionRecordLog.java
@@ -8,7 +8,7 @@ package cn.ac.iie.bean;
  */
 public class PublicSessionRecordLog {
 
-//TODO 基础属性   40     int22
+//TODO 基础属性   41     int22
 
     private int common_service;
     private int common_direction;
diff --git a/src/main/java/cn/ac/iie/bean/RadiusSessionRecordLog.java b/src/main/java/cn/ac/iie/bean/RadiusSessionRecordLog.java
index a530da6..d4f7679 100644
--- a/src/main/java/cn/ac/iie/bean/RadiusSessionRecordLog.java
+++ b/src/main/java/cn/ac/iie/bean/RadiusSessionRecordLog.java
@@ -9,12 +9,17 @@ package cn.ac.iie.bean;
 public class RadiusSessionRecordLog extends PublicSessionRecordLog {
 
 
-//TODO RADIUS协议属性  4
+//TODO RADIUS协议属性  8
 
     private int radius_session_timeout;
     private int radius_idle_timeout;
     private int radius_acct_status_type;
     private int radius_acct_terminate_cause;
+    private int radius_packet_type;
+    private String radius_nas_ip;
+    private String radius_framed_ip;
+    private String radius_account;
+
 
     public int getRadius_session_timeout() {
         return radius_session_timeout;
@@ -48,13 +53,6 @@ public class RadiusSessionRecordLog extends PublicSessionRecordLog {
         this.radius_acct_terminate_cause = radius_acct_terminate_cause;
     }
 
-    private int radius_packet_type;
-
-    private String radius_nas_ip;
-    private String radius_framed_ip;
-    private String radius_account;
-
-
     public int getRadius_packet_type() {
         return radius_packet_type;
     }
diff --git a/src/main/java/cn/ac/iie/bolt/collectProtocol/CollectCompletedBolt.java b/src/main/java/cn/ac/iie/bolt/collect/CollectCompletedBolt.java
similarity index 98%
rename from src/main/java/cn/ac/iie/bolt/collectProtocol/CollectCompletedBolt.java
rename to src/main/java/cn/ac/iie/bolt/collect/CollectCompletedBolt.java
index c619be1..2e08d2e 100644
--- a/src/main/java/cn/ac/iie/bolt/collectProtocol/CollectCompletedBolt.java
+++ b/src/main/java/cn/ac/iie/bolt/collect/CollectCompletedBolt.java
@@ -1,4 +1,4 @@
-package cn.ac.iie.bolt.collectprotocol;
+package cn.ac.iie.bolt.collect;
 
 import cn.ac.iie.common.FlowWriteConfig;
 import cn.ac.iie.utils.system.TupleUtils;
diff --git a/src/main/java/cn/ac/iie/topology/LogFlowWriteTopology.java b/src/main/java/cn/ac/iie/topology/LogFlowWriteTopology.java
index 639a523..9f3a54d 100644
--- a/src/main/java/cn/ac/iie/topology/LogFlowWriteTopology.java
+++ b/src/main/java/cn/ac/iie/topology/LogFlowWriteTopology.java
@@ -2,7 +2,7 @@ package cn.ac.iie.topology;
 
 
 import cn.ac.iie.bolt.NtcLogSendBolt;
-import cn.ac.iie.bolt.collectprotocol.CollectCompletedBolt;
+import cn.ac.iie.bolt.collect.CollectCompletedBolt;
 import cn.ac.iie.bolt.radius.RadiusCompletionBolt;
 import cn.ac.iie.bolt.security.SecurityCompletionBolt;
 
diff --git a/src/main/java/cn/ac/iie/utils/general/TransFormUtils.java b/src/main/java/cn/ac/iie/utils/general/TransFormUtils.java
index 4801314..66f5c49 100644
--- a/src/main/java/cn/ac/iie/utils/general/TransFormUtils.java
+++ b/src/main/java/cn/ac/iie/utils/general/TransFormUtils.java
@@ -78,7 +78,6 @@ public class TransFormUtils {
             proxySessionRecordLog.setCommon_server_asn(ipLookup.asnLookup(serverIp, true));
             //TODO 集成AAA数据subscribe_id -数据端补全
             proxySessionRecordLog.setCommon_subscriber_id(HbaseUtils.getAccount(clientIp));
-//            proxySessionRecordLog.setCommon_subscriber_id("aaaaaaa");
             proxySessionRecordLog.setHttp_domain(getTopDomain(null, proxySessionRecordLog.getHttp_host()));
             return JSONObject.toJSONString(proxySessionRecordLog);
         } catch (Exception e) {
@@ -109,7 +108,6 @@ public class TransFormUtils {
             securitySessionRecordLog.setCommon_server_asn(ipLookup.asnLookup(serverIp, true));
             //TODO 集成AAA数据subscribe_id -数据端补全
             securitySessionRecordLog.setCommon_subscriber_id(HbaseUtils.getAccount(clientIp));
-//            securitySessionRecordLog.setCommon_subscriber_id("aaaaa");
             securitySessionRecordLog.setHttp_domain(getTopDomain(securitySessionRecordLog.getSsl_sni(), securitySessionRecordLog.getHttp_host()));
             return JSONObject.toJSONString(securitySessionRecordLog);
         } catch (Exception e) {
@@ -123,7 +121,7 @@ public class TransFormUtils {
      * 解析日志，并补全
      * 补domain,补subscriber_id
      *
-     * @param message Security原始日志
+     * @param message CollectProtocol原始日志
      * @return 补全后的日志
      */
     public static String getCollectProtocolMessage(String message) {
@@ -139,7 +137,6 @@ public class TransFormUtils {
             collectProtocolRecordLog.setCommon_server_asn(ipLookup.asnLookup(serverIp, true));
             //TODO 集成AAA数据subscribe_id -数据端补全
             collectProtocolRecordLog.setCommon_subscriber_id(HbaseUtils.getAccount(clientIp));
-//            securitySessionRecordLog.setCommon_subscriber_id("aaaaa");
             collectProtocolRecordLog.setHttp_domain(getTopDomain(collectProtocolRecordLog.getSsl_sni(), collectProtocolRecordLog.getHttp_host()));
             return JSONObject.toJSONString(collectProtocolRecordLog);
         } catch (Exception e) {