diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf index 2ad9c16..b103707 100644 --- a/resource/pangu/table_info.conf +++ b/resource/pangu/table_info.conf @@ -16,7 +16,6 @@ #For expr/expr_plus Table #id name type src_charset dst_charset do_merge cross_cache quick_mode 0 PXY_CTRL_COMPILE compile escape -- -<<<<<<< HEAD 1 GROUP_COMPILE_RELATION group2compile -- 2 GROUP_GROUP_RELATION group2group -- 3 TSG_OBJ_IP_ADDR ip_plus --- @@ -60,49 +59,4 @@ 39 TSG_SECURITY_SOURCE_LOCATION virtual TSG_OBJ_GEO_LOCATION -- 40 TSG_SECURITY_DESTINATION_LOCATION virtual TSG_OBJ_GEO_LOCATION -- 41 TSG_FIELD_DOH_QNAME virtual TSG_OBJ_FQDN -- -42 TSG_FIELD_DOH_HOST virtual TSG_OBJ_FQDN -- -======= -1 GROUP_COMPILE_RELATION group -- -2 TSG_OBJ_IP_ADDR ip_plus --- -3 TSG_OBJ_URL expr UTF8 GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 0 quickoff -4 TSG_FIELD_HTTP_URL virtual TSG_OBJ_URL -- -5 TSG_OBJ_FQDN expr UTF8 GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 0 quickoff -5 TSG_OBJ_FQDN_CAT expr UTF8 GBK/UNICODE/UTF8/url_encode_gb2312/url_encode_utf8 yes 0 quickoff -6 TSG_FIELD_HTTP_HOST virtual TSG_OBJ_FQDN -- -7 TSG_OBJ_HTTP_SIGNATURE expr_plus UTF8 UTF8 yes 0 quickoff -8 TSG_FIELD_HTTP_REQ_HDR virtual TSG_OBJ_HTTP_SIGNATURE -- -9 TSG_FIELD_HTTP_RES_HDR virtual TSG_OBJ_HTTP_SIGNATURE -- -10 TSG_OBJ_KEYWORDS expr UTF8 GBK/UNICODE/UTF8 yes 128 quickoff -11 TSG_FIELD_HTTP_REQ_CONTENT virtual TSG_OBJ_KEYWORDS -- -12 TSG_FIELD_HTTP_RES_CONTENT virtual TSG_OBJ_KEYWORDS -- -13 TSG_OBJ_SUBSCRIBER_ID expr UTF8 UTF8 yes 0 quickon -14 TSG_OBJ_APP_ID expr UTF8 UTF8 yes 0 -15 TSG_SECURITY_SOURCE_ADDR virtual TSG_OBJ_IP_ADDR -- -16 TSG_SECURITY_DESTINATION_ADDR virtual TSG_OBJ_IP_ADDR -- -17 TSG_SECURITY_ADDR composition {"source":"TSG_SECURITY_SOURCE_ADDR","destination":"TSG_SECURITY_DESTINATION_ADDR"} -18 PXY_CACHE_COMPILE compile escape -- -18 PXY_CACHE_GROUP group -- -19 PXY_CACHE_HTTP_URL expr UTF8 UTF8 yes 0 quickoff -20 PXY_CACHE_HTTP_COOKIE expr UTF8 UTF8 yes 0 quickoff -21 PXY_PROFILE_TRUSTED_CA_CERT plugin {"key":1,"valid":4,"foreign":"3"} -21 PXY_EXCH_INTERMEDIA_CERT plugin {"key":1,"valid":4,"foreign":"3"} -22 PXY_OBJ_TRUSTED_CA_CRL plugin {"valid":4,"foreign":"3"} -23 TSG_PROFILE_RESPONSE_PAGES plugin {"key":1,"foreign":"4","valid":5} -24 PXY_PROFILE_HIJACK_FILES plugin {"key":1,"foreign":"5","valid":6} -25 PXY_PROFILE_INSERT_SCRIPTS plugin {"key":1,"foreign":"4","valid":6} -26 TSG_SECURITY_COMPILE plugin {"key":1,"valid":8} -27 PXY_PROFILE_TRAFFIC_MIRROR plugin {"key":1,"valid":4} -28 TSG_PROFILE_DECRYPTION plugin {"key":1,"valid":4} -29 TSG_IP_ASN_BUILT_IN ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304} -30 TSG_IP_ASN_USER_DEFINED ip_plugin {"row_id":1,"ip_type":2,"start_ip":3,"end_ip":4,"valid":7,"estimate_size":4194304} -31 TSG_IP_LOCATION_BUILT_IN ip_plugin {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304} -32 TSG_IP_LOCATION_USER_DEFINED ip_plugin {"row_id":1,"ip_type":3,"start_ip":4,"end_ip":5,"valid":18,"estimate_size":4194304} -33 TSG_OBJ_AS_NUMBER expr UTF8 UTF8/GBK yes 0 -34 TSG_SECURITY_SOURCE_ASN virtual TSG_OBJ_AS_NUMBER -- -35 TSG_SECURITY_DESTINATION_ASN virtual TSG_OBJ_AS_NUMBER -- -36 TSG_OBJ_GEO_LOCATION expr UTF8 UTF8/GBK yes 0 -37 TSG_SECURITY_SOURCE_LOCATION virtual TSG_OBJ_GEO_LOCATION -- -38 TSG_SECURITY_DESTINATION_LOCATION virtual TSG_OBJ_GEO_LOCATION -- -39 TSG_FIELD_DOH_QNAME virtual TSG_OBJ_FQDN -- -40 TSG_FIELD_DOH_HOST virtual TSG_OBJ_FQDN -- ->>>>>>> TSG-1531 tfe 代码整理, 将多插件公用的基础代码移动到 tfe init 阶段 +42 TSG_FIELD_DOH_HOST virtual TSG_OBJ_FQDN -- \ No newline at end of file