Airtest 遇到问题13,14,15 bilibili,youtube,twitter数据格式错误修改提交

28 files changed, 143 insertions, 206 deletions

diff --git a/keyword/profiles/profile.robot b/keyword/profiles/profile.robot
index fc8d89a..d5a8df1 100644
--- a/keyword/profiles/profile.robot
+++ b/keyword/profiles/profile.robot
@@ -3,16 +3,16 @@ Library           yaml
 Library           JSON

 Library           Collections

 Library           RequestsLibrary

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

-Resource          ../common/common.robot

-Resource          ../common/api_request.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

+Resource          ${EXECDIR}/common/common.robot

+Resource          ${EXECDIR}/common/api_request.robot

 Library           DatabaseLibrary

 Library           String

 Library           OperatingSystem

 Library           Selenium2Library

-Library           ../../customlib/dict_data.py

-Library           ../../customlib/judge_profilelist.py

+Library           ${EXECDIR}/customlib/dict_data.py

+Library           ${EXECDIR}/customlib/judge_profilelist.py

 *** Variables ***

 ${dnsProfileUrl}      /policy/profile/dnsrecords

 ${resPagesProfileUrl}        /v1/policy/profile/responsepages

diff --git a/keyword/profiles/snatippools.robot b/keyword/profiles/snatippools.robot
index e36cc92..a690917 100644
--- a/keyword/profiles/snatippools.robot
+++ b/keyword/profiles/snatippools.robot
@@ -5,15 +5,15 @@ Library           Collections
 Library           RequestsLibrary

 Library           DateTime

 Library           String

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

-Resource          ../common/common.robot

-Resource          ../common/api_request.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

+Resource          ${EXECDIR}/common/common.robot

+Resource          ${EXECDIR}/common/api_request.robot

 Library           DatabaseLibrary

 Library           OperatingSystem

 Library           Selenium2Library

-Library           ../../customlib/dict_data.py

-Library           ../../customlib/judge_profilelist.py

+Library           ${EXECDIR}/customlib/dict_data.py

+Library           ${EXECDIR}/customlib/judge_profilelist.py

 *** Variables ***

 ${snatIpPoolsUrl}      /policy/profile/wannat/ippool

 

diff --git a/keyword/profiles/testservers.robot b/keyword/profiles/testservers.robot
index 61e5b6b..984bf0c 100644
--- a/keyword/profiles/testservers.robot
+++ b/keyword/profiles/testservers.robot
@@ -5,15 +5,15 @@ Library           Collections
 Library           RequestsLibrary

 Library           DateTime

 Library           String

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

-Resource          ../common/common.robot

-Resource          ../common/api_request.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

+Resource          ${EXECDIR}/common/common.robot

+Resource          ${EXECDIR}/common/api_request.robot

 Library           DatabaseLibrary

 Library           OperatingSystem

 Library           Selenium2Library

-Library           ../../customlib/dict_data.py

-Library           ../../customlib/judge_profilelist.py

+Library           ${EXECDIR}/customlib/dict_data.py

+Library           ${EXECDIR}/customlib/judge_profilelist.py

 *** Variables ***

 ${testServersUrl}      /policy/profile/wannat/testserver

 

diff --git a/keyword/profiles/vpnaccounts.robot b/keyword/profiles/vpnaccounts.robot
index a7d62f3..ab2914e 100644
--- a/keyword/profiles/vpnaccounts.robot
+++ b/keyword/profiles/vpnaccounts.robot
@@ -5,15 +5,15 @@ Library           Collections
 Library           RequestsLibrary

 Library           DateTime

 Library           String

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

-Resource          ../common/common.robot

-Resource          ../common/api_request.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

+Resource          ${EXECDIR}/common/common.robot

+Resource          ${EXECDIR}/common/api_request.robot

 Library           DatabaseLibrary

 Library           OperatingSystem

 Library           Selenium2Library

-Library           ../../customlib/dict_data.py

-Library           ../../customlib/judge_profilelist.py

+Library           ${EXECDIR}/customlib/dict_data.py

+Library           ${EXECDIR}/customlib/judge_profilelist.py

 *** Variables ***

 ${vpnAccountUrl}      /policy/profile/wannat/vpn/account

 ${reachabilityTestUrl}    /policy/profile/wannat/testip/reachability

diff --git a/keyword/system/schsedules.robot b/keyword/system/schsedules.robot
index 0e85624..a888ce6 100644
--- a/keyword/system/schsedules.robot
+++ b/keyword/system/schsedules.robot
@@ -5,15 +5,15 @@ Library           Collections
 Library           RequestsLibrary

 Library           DateTime

 Library           String

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

-Resource          ../common/common.robot

-Resource          ../common/api_request.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

+Resource          ${EXECDIR}/common/common.robot

+Resource          ${EXECDIR}/common/api_request.robot

 Library           DatabaseLibrary

 Library           OperatingSystem

 Library           Selenium2Library

-Library           ../../customlib/dict_data.py

-Library           ../../customlib/judge_profilelist.py

+Library           ${EXECDIR}/customlib/dict_data.py

+Library           ${EXECDIR}/customlib/judge_profilelist.py

 *** Variables ***

 ${schsedulesUrl}      /schedule

 

diff --git a/keyword/system/tags.robot b/keyword/system/tags.robot
index c832b7b..d3a704c 100644
--- a/keyword/system/tags.robot
+++ b/keyword/system/tags.robot
@@ -5,15 +5,15 @@ Library           Collections
 Library           RequestsLibrary

 Library           DateTime

 Library           String

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

-Resource          ../common/common.robot

-Resource          ../common/api_request.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

+Resource          ${EXECDIR}/common/common.robot

+Resource          ${EXECDIR}/common/api_request.robot

 Library           DatabaseLibrary

 Library           OperatingSystem

 Library           Selenium2Library

-Library           ../../customlib/dict_data.py

-Library           ../../customlib/judge_profilelist.py

+Library           ${EXECDIR}/customlib/dict_data.py

+Library           ${EXECDIR}/customlib/judge_profilelist.py

 *** Variables ***

 ${tagsUrl}      /customize/tags

 

diff --git a/keyword/testin/testin_operation.robot b/keyword/testin/testin_operation.robot
index e8e34c5..7258a34 100644
--- a/keyword/testin/testin_operation.robot
+++ b/keyword/testin/testin_operation.robot
@@ -2,16 +2,11 @@
 Library           Collections
 Library           String
 Library           RequestsLibrary
-Resource          ../../variable/incoming_common_variable.txt
-Resource          ../../variable/common_variable.txt
-# Resource          ../common/functional_keywords.robot
-# Resource          process_object_body.robot
+Resource          ${EXECDIR}/variable/incoming_common_variable.txt
+Resource          ${EXECDIR}/variable/common_variable.txt
 Library           Collections
-Resource          ../common/common.robot
-Resource          ../../keyword/common/common_interface.robot
-# Library           ../../customlib/common/util.py
-# Library           DatabaseLibrary
-# Library           ../../customlib/common/common.py
+Resource          ${EXECDIR}/common/common.robot
+Resource          ${EXECDIR}/keyword/common/common_interface.robot
 *** Variables ***
 
 
diff --git a/keyword/verify/verify.robot b/keyword/verify/verify.robot
index 4efbfde..59d7ebe 100644
--- a/keyword/verify/verify.robot
+++ b/keyword/verify/verify.robot
@@ -1,7 +1,7 @@
 *** Settings ***

-Resource          ../comman/command.robot

-Resource          ../../variable/incoming_common_variable.txt

-Resource          ../../variable/common_variable.txt

+Resource          ${EXECDIR}/comman/command.robot

+Resource          ${EXECDIR}/variable/incoming_common_variable.txt

+Resource          ${EXECDIR}/variable/common_variable.txt

 *** Variables ***

 ${policyIds}      ${EMPTY}

 ${objectids}      ${EMPTY}

diff --git a/other/data/proxy/http/proxy-http-allow-url-prefix-data.yaml b/other/data/proxy/http/proxy-http-allow-url-prefix-data.yaml
index f26f97b..26ac453 100644
--- a/other/data/proxy/http/proxy-http-allow-url-prefix-data.yaml
+++ b/other/data/proxy/http/proxy-http-allow-url-prefix-data.yaml
@@ -61,7 +61,7 @@
     "testMachine": 
       -
        "hopeSuccessNumber": 1
-       "command": "wget --debug  -q -O- http://www.yumi.com/domainfx"
+       "command": "wget --debug  -q -O- http://www.yumi.com/escrow"
        "commandRes": "玉米网"
        "logQueryParam":
         -
diff --git a/other/data/proxy/http/proxy-http-allow-url-suffix-data.yaml b/other/data/proxy/http/proxy-http-allow-url-suffix-data.yaml
index 33b4a31..86445db 100644
--- a/other/data/proxy/http/proxy-http-allow-url-suffix-data.yaml
+++ b/other/data/proxy/http/proxy-http-allow-url-suffix-data.yaml
@@ -61,7 +61,7 @@
     "testMachine": 
       -
        "hopeSuccessNumber": 1
-       "command": "wget --debug  -q -O- http://www.yumi.com/domainfx"
+       "command": "wget --debug  -q -O- http://www.yumi.com/escrow"
        "commandRes": "玉米网"
        "logQueryParam":
         -
@@ -77,4 +77,4 @@
        "objectList":
          - "addItemList":  
             -  "keywordArray":  
-                - "*domainfx"                                                                                                                                                                                                          
\ No newline at end of file
+                - "*escrow"                                                                                                                                                                                                          
\ No newline at end of file
diff --git a/other/data/proxy/http/proxy-http-deny-reqheader-prefix-data.yaml b/other/data/proxy/http/proxy-http-deny-reqheader-prefix-data.yaml
index 8be5c67..23ccd7b 100644
--- a/other/data/proxy/http/proxy-http-deny-reqheader-prefix-data.yaml
+++ b/other/data/proxy/http/proxy-http-deny-reqheader-prefix-data.yaml
@@ -122,7 +122,7 @@
       -
        "hopeSuccessNumber": 1
        "command": 'wget --debug  -q -O- --header="Cookie: heroku-session-affinity=AECDaANoA24IAVyKJer///8HYgAJTvpiAA3inmEDbAAAAANtAAAABXdlYi4xbQAAAAV3ZWIuM20AAAAFd2ViLjJqrTwkgqh04599G3sH8AHFEPohQWo_; PLAY_SESSION=a04d65440d858f8fd760367188cfa0071a33b697-session_id=3c2ea932-48b0-4746-aa23-fe773d99e2bc; _ga=GA1.2.718529025.1648610047; _gid=GA1.2.1701695954.1648610047; __gads=ID=0c1d252c315e0aa1-2210edaf64d10062:T=1648610047:RT=1648610047:S=ALNI_MYYnZiT4oOTTy-9rHvMB-OcO1PAQQ" http://www.nymbler.com/'
-       "commandRes": "Error 451"
+       "commandRes": "451"
        "logQueryParam":
         -
          "queryFiledKey": "http_host"
diff --git a/other/data/proxy/http/proxy-http-deny-reqheader-substring-data.yaml b/other/data/proxy/http/proxy-http-deny-reqheader-substring-data.yaml
index f28c497..0ded5f6 100644
--- a/other/data/proxy/http/proxy-http-deny-reqheader-substring-data.yaml
+++ b/other/data/proxy/http/proxy-http-deny-reqheader-substring-data.yaml
@@ -74,7 +74,7 @@
       -
        "hopeSuccessNumber": 1
        "command": 'wget --debug  -q -O- --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36" http://www.yumi.com/'
-       "commandRes": "Error 451"
+       "commandRes": "451"
        "logQueryParam":
         -
          "queryFiledKey": "http_host"
diff --git a/other/data/proxy/http/proxy-http-deny-resheader-substring-data.yaml b/other/data/proxy/http/proxy-http-deny-resheader-substring-data.yaml
index 286677b..355b768 100644
--- a/other/data/proxy/http/proxy-http-deny-resheader-substring-data.yaml
+++ b/other/data/proxy/http/proxy-http-deny-resheader-substring-data.yaml
@@ -74,7 +74,7 @@
       -
        "hopeSuccessNumber": 1
        "command": "wget --debug  -q -O- http://www.yumi.com/"
-       "commandRes": "Error 451"
+       "commandRes": "451"
        "logQueryParam":
         -
          "queryFiledKey": "http_host"
diff --git a/other/data/proxy/http/proxy-http-monitor-url-prefix-data.yaml b/other/data/proxy/http/proxy-http-monitor-url-prefix-data.yaml
index 3443f29..3301b14 100644
--- a/other/data/proxy/http/proxy-http-monitor-url-prefix-data.yaml
+++ b/other/data/proxy/http/proxy-http-monitor-url-prefix-data.yaml
@@ -61,7 +61,7 @@
     "testMachine": 
       -
        "hopeSuccessNumber": 1
-       "command": "wget --debug  -q -O- http://www.yumi.com/domainfx"
+       "command": "wget --debug  -q -O- http://www.yumi.com/escrow"
        "commandRes": "玉米网"
        "logQueryParam":
         -
diff --git a/other/data/proxy/http/proxy-http-monitor-url-suffix-data.yaml b/other/data/proxy/http/proxy-http-monitor-url-suffix-data.yaml
index ee03861..3f163c5 100644
--- a/other/data/proxy/http/proxy-http-monitor-url-suffix-data.yaml
+++ b/other/data/proxy/http/proxy-http-monitor-url-suffix-data.yaml
@@ -61,7 +61,7 @@
     "testMachine": 
       -
        "hopeSuccessNumber": 1
-       "command": "wget --debug  -q -O- http://www.yumi.com/domainfx"
+       "command": "wget --debug  -q -O- http://www.yumi.com/news"
        "commandRes": "玉米网"
        "logQueryParam":
         -
@@ -77,4 +77,43 @@
        "objectList":
          - "addItemList":  
             -  "keywordArray":  
-                - "*domainfx"                                                                                                                                                                                                           
\ No newline at end of file
+                - "*news"   
+  -
+    "opAction": "add"
+    "returnData": 1 
+    "policyName": "proxy-monitor-url-suffix-003"
+    "policyType": "pxy_manipulation"
+    "isGre": 0
+    "logType": "proxy_event"
+    "action": "monitor"
+    "userTags": ""
+    "doBlacklist": 0
+    "doLog": 0
+    "policyDesc": "autotest"
+    "effectiveRange":           
+    "userRegion":
+      "protocol": "http"           
+    "appIdObjects":
+     - "http"
+    "appSelectorObjects":
+    "isTestMachine": 1
+    "testMachine": 
+      -
+       "hopeSuccessNumber": 1
+       "command": "wget --debug  -q -O- https://www.feishu.cn/exception?from=%2F"
+       "commandRes": "defaultCert"
+       "logQueryParam":
+        -
+         "queryFiledKey": "http_host"
+         "queryValue": "empty"
+    "isValid": 1
+    "scheduleId":             
+    "condation": 
+      -       
+       "protocolField": "TSG_FIELD_HTTP_URL"
+       "objectType": "url"
+       "objectSubType": ""
+       "objectList":
+         - "addItemList":  
+            -  "keywordArray":  
+                - "*from=%2F"                                                                                                                                                                                                         
\ No newline at end of file
diff --git a/other/data/proxy/http/proxy-http-replace-url-resheader-data.yaml b/other/data/proxy/http/proxy-http-replace-url-resheader-data.yaml
index 2231439..e4d7469 100644
--- a/other/data/proxy/http/proxy-http-replace-url-resheader-data.yaml
+++ b/other/data/proxy/http/proxy-http-replace-url-resheader-data.yaml
@@ -12,8 +12,8 @@
     "rules":
       -
        "regex_enable": 0
-       "search_in": "http_req_header"
-       "find": "sess"
+       "search_in": "http_resp_body"
+       "find": "GitHub"
        "replace_with": "nonononono"
     "userTags": ""
     "doBlacklist": 0
@@ -30,7 +30,7 @@
       -
        "hopeSuccessNumber": 1
        "command": 'wget --debug  -q -O- --header="Cookie: _gh_sess=u5KTLoXAISa6ptG91jTUXoPNRx4oxh1p%2FidCpwLqdD4vXLBYN7XYEW9VSP1GVSJC%2Fajsz7pegizHIggGmdpBbAysgT04udiUkjZsPtchrEYxWK9hFAuuSqsVp%2BuIHMZN%2FOCtl6y34LvlbLvy8xzpcDWVRBuBHXvqshtdz1WOu9QS4AAsQEksGnNiKHP5%2BIPc2lUiuVYf1%2FXM8mHm05gdHiKfEeONC77%2FdndTWhdW9oo%2FMnG2M24Xy3hd7vV9SHqqrl7bxsNGIzCleArBDdZugg%3D%3D--Tgpf8JLEErRx4l81--KDtZZDUsWMHen8HqcE%2BIjw%3D%3D; _octo=GH1.1.715959592.1649234422; logged_in=no; tz=Europe%2FMoscow" --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36" https://github.com/'
-       "commandRes": "defaultCert"
+       "commandRes": "nonononono"
        "logQueryParam":
         -
          "queryFiledKey": "http_host"
diff --git a/other/data/security/bilibili/bilibili-airTest-data.yaml b/other/data/security/bilibili/bilibili-airTest-data.yaml
index e1ab2e3..1be2e3c 100644
--- a/other/data/security/bilibili/bilibili-airTest-data.yaml
+++ b/other/data/security/bilibili/bilibili-airTest-data.yaml
@@ -287,11 +287,11 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535" 
-"deny-only-IpAndApplication-MemberPurchase-airTest_data":    
+"deny-default-only-IpAndApplication-MemberPurchase-airTest_data":    
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-MemberPurchase"
+    "policyName": "bilibili-deny-default-MemberPurchase"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -327,17 +327,17 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535" 
+             "port": "0-65535"
+"deny-drop-only-IpAndApplication-MemberPurchase-airTest_data":              
   -
-    "opAction": "update"
+    "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-MemberPurchase"
+    "policyName": "bilibili-deny-drop-MemberPurchase"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
     "method": "drop" 
     "isGre": 0
-    "isEdit": 1
     "userTags": ""
     "doBlacklist": 0
     "doLog": 1
@@ -367,11 +367,12 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535"   
+             "port": "0-65535"
+"deny-rate_limit-only-IpAndApplication-MemberPurchase-airTest_data":                
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-MemberPurchase"
+    "policyName": "bilibili-deny-rate-MemberPurchase"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -409,11 +410,12 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535" 
+             "port": "0-65535"
+"deny-tamper-only-IpAndApplication-MemberPurchase-airTest_data":              
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-MemberPurchase"
+    "policyName": "bilibili-deny-tamper-MemberPurchase"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -533,11 +535,11 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535" 
-"deny-only-IpAndApplication-video-airTest_data":    
+"deny-default-only-IpAndApplication-video-airTest_data":    
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-video"
+    "policyName": "bilibili-deny-default-video"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -575,17 +577,17 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535" 
+             "port": "0-65535"
+"deny-drop-only-IpAndApplication-video-airTest_data":              
   -
-    "opAction": "update"
+    "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-video"
+    "policyName": "bilibili-deny-drop-video"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
     "method": "drop" 
     "isGre": 0
-    "isEdit": 1
     "userTags": ""
     "doBlacklist": 0
     "doLog": 1
@@ -615,11 +617,12 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535"   
+             "port": "0-65535"
+"deny-rate_limit-only-IpAndApplication-video-airTest_data":                
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-video"
+    "policyName": "bilibili-deny-rate-video"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -655,11 +658,12 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535" 
+             "port": "0-65535"
+"deny-tamper-only-IpAndApplication-video-airTest_data":              
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-video"
+    "policyName": "bilibili-deny-tamper-video"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -779,11 +783,11 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535" 
-"deny-only-IpAndApplication-frontPage-airTest_data":    
+"deny-default-only-IpAndApplication-frontPage-airTest_data":    
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-frontPage"
+    "policyName": "bilibili-deny-default-frontPage"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -820,8 +824,9 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535" 
+"deny-drop-only-IpAndApplication-frontPage-airTest_data":             
   -
-    "opAction": "update"
+    "opAction": "add"
     "returnData": 1 
     "policyName": "bilibili-deny-frontPage"
     "policyType": "tsg_security"
@@ -829,7 +834,6 @@
     "action": "deny"
     "method": "drop" 
     "isGre": 0
-    "isEdit": 1
     "userTags": ""
     "doBlacklist": 0
     "doLog": 1
@@ -859,11 +863,12 @@
          - "addItemList":
             -
              "ip": "1.1.1.1"
-             "port": "0-65535"   
+             "port": "0-65535" 
+"deny-rate_limit-only-IpAndApplication-frontPage-airTest_data":               
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-frontPage"
+    "policyName": "bilibili-deny-rate-frontPage"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -902,10 +907,11 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535" 
+"deny-tamper-only-IpAndApplication-frontPage-airTest_data":             
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "bilibili-deny-frontPage"
+    "policyName": "bilibili-deny-tamper-frontPage"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
diff --git a/other/data/security/skype/skype-airTest-data.yaml b/other/data/security/skype/skype-airTest-data.yaml
index f8c79db..dd19ca3 100644
--- a/other/data/security/skype/skype-airTest-data.yaml
+++ b/other/data/security/skype/skype-airTest-data.yaml
@@ -378,7 +378,8 @@
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
-    "bps": 34 
+    "method": "rate_limit"
+    "bps": 30 
     "isGre": 0
     "userTags": ""
     "doBlacklist": 0
diff --git a/other/data/security/ssl/security-ssl-allow-cn-exactly-data.yaml b/other/data/security/ssl/security-ssl-allow-cn-exactly-data.yaml
index 50045ba..d3d8bd5 100644
--- a/other/data/security/ssl/security-ssl-allow-cn-exactly-data.yaml
+++ b/other/data/security/ssl/security-ssl-allow-cn-exactly-data.yaml
@@ -32,14 +32,12 @@
          "queryValue": "www.freestockimages.ru" 
       -
        "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com"
+       "command": "curl -kv https://www.wyhgh.com/"
+       "commandRes": "我要学习网"
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com" 
+         "queryValue": "www.wyhgh.com" 
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -52,4 +50,4 @@
             -  "keywordArray":  
                 - "$freestockimages.ru"
             -  "keywordArray":  
-                - "$cxwl.com"
\ No newline at end of file
+                - "$www.wyhgh.com"
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-allow-cn-suffix-data.yaml b/other/data/security/ssl/security-ssl-allow-cn-suffix-data.yaml
index 3f60554..cc9d486 100644
--- a/other/data/security/ssl/security-ssl-allow-cn-suffix-data.yaml
+++ b/other/data/security/ssl/security-ssl-allow-cn-suffix-data.yaml
@@ -24,22 +24,18 @@
        "hopeSuccessNumber": 1
        "command": "curl -kv https://www.freestockimages.ru/"
        "commandRes": "картинки"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.freestockimages.ru"  
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
       -
        "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com"
+       "command": "curl -kv https://www.wyhgh.com/"
+       "commandRes": "我要学习网"
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com" 
+         "queryValue": "www.wyhgh.com" 
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -52,4 +48,4 @@
             -  "keywordArray":  
                 - "*tockimages.ru"
             -  "keywordArray":  
-                - "*wl.com"
\ No newline at end of file
+                - "*ww.wyhgh.com"
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-allow-san-exactly-data.yaml b/other/data/security/ssl/security-ssl-allow-san-exactly-data.yaml
index b94d2a7..8d077c5 100644
--- a/other/data/security/ssl/security-ssl-allow-san-exactly-data.yaml
+++ b/other/data/security/ssl/security-ssl-allow-san-exactly-data.yaml
@@ -24,22 +24,10 @@
        "hopeSuccessNumber": 1
        "command": "curl -kv https://www.freestockimages.ru/"
        "commandRes": "картинки"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.freestockimages.ru"  
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
-      -
-       "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com"
-       "logQueryParam":
-        -
-         "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com" 
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -51,6 +39,4 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "$freestockimages.ru"
-            -  "keywordArray":  
-                - "$cxwl.com"    
    
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-allow-san-suffix-data.yaml b/other/data/security/ssl/security-ssl-allow-san-suffix-data.yaml
index 7f50494..cf5cb22 100644
--- a/other/data/security/ssl/security-ssl-allow-san-suffix-data.yaml
+++ b/other/data/security/ssl/security-ssl-allow-san-suffix-data.yaml
@@ -24,22 +24,10 @@
        "hopeSuccessNumber": 1
        "command": "curl -kv https://www.freestockimages.ru/"
        "commandRes": "картинки"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.freestockimages.ru"  
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
-      -
-       "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com"
-       "logQueryParam":
-        -
-         "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com" 
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -51,5 +39,3 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*tockimages.ru"
-            -  "keywordArray":  
-                - "*wl.com"  
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-data.yaml b/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-data.yaml
index eebbae5..cb82806 100644
--- a/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-data.yaml
+++ b/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-data.yaml
@@ -93,16 +93,6 @@
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
-      -
-       "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com"
-       "logQueryParam":
-        -
-         "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com" 
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -114,8 +104,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "$www.freestockimages.ru"          
-            -  "keywordArray":  
-                - "$www.cxwl.com"
       -       
        "protocolField": "TSG_FIELD_SSL_SAN"
        "objectType": "fqdn"
@@ -124,8 +112,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "$freestockimages.ru"
-            -  "keywordArray":  
-                - "*xwl.com"    
       -       
        "protocolField": "TSG_FIELD_SSL_CN"
        "objectType": "fqdn"
@@ -134,5 +120,3 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*eestockimages.ru"
-            -  "keywordArray":  
-                - "$cxwl.com"                                                                                                     
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-famousSites-data.yaml b/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-famousSites-data.yaml
index 46b5a6f..ca4e078 100644
--- a/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-famousSites-data.yaml
+++ b/other/data/security/ssl/security-ssl-monitor-fqdn-exactly-famousSites-data.yaml
@@ -98,22 +98,10 @@
        "hopeSuccessNumber": 1
        "command": "curl -kv https://www.freestockimages.ru/"
        "commandRes": "картинки"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.freestockimages.ru"  
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
-      -
-       "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com"
-       "logQueryParam":
-        -
-         "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com" 
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -125,8 +113,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "$www.freestockimages.ru"          
-            -  "keywordArray":  
-                - "$www.cxwl.com"
       -       
        "protocolField": "TSG_FIELD_SSL_SAN"
        "objectType": "fqdn"
@@ -135,8 +121,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "$freestockimages.ru"
-            -  "keywordArray":  
-                - "$cxwl.com"    
       -       
        "protocolField": "TSG_FIELD_SSL_CN"
        "objectType": "fqdn"
@@ -145,5 +129,3 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "$freestockimages.ru"
-            -  "keywordArray":  
-                - "*xwl.com"                                                                                                     
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-data.yaml b/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-data.yaml
index 9d1e285..808ccde 100644
--- a/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-data.yaml
+++ b/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-data.yaml
@@ -87,22 +87,10 @@
        "hopeSuccessNumber": 1
        "command": "curl -kv https://www.freestockimages.ru/"
        "commandRes": "картинки"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.freestockimages.ru" 
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
-      -
-       "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com" 
-       "logQueryParam":
-        -
-         "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com"
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -114,8 +102,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*w.freestockimages.ru"          
-            -  "keywordArray":  
-                - "*w.cxwl.com"
       -       
        "protocolField": "TSG_FIELD_SSL_SAN"
        "objectType": "fqdn"
@@ -124,8 +110,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*eestockimages.ru"
-            -  "keywordArray":  
-                - "*xwl.com"    
       -       
        "protocolField": "TSG_FIELD_SSL_CN"
        "objectType": "fqdn"
@@ -134,6 +118,4 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*estockimages.ru"
-            -  "keywordArray":  
-                - "*wl.com"                 
                                                                                                      
\ No newline at end of file
diff --git a/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-famousSites-data.yaml b/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-famousSites-data.yaml
index 8e48d02..33b653a 100644
--- a/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-famousSites-data.yaml
+++ b/other/data/security/ssl/security-ssl-monitor-fqdn-suffix-famousSites-data.yaml
@@ -97,22 +97,10 @@
        "hopeSuccessNumber": 1
        "command": "curl -kv https://www.freestockimages.ru/"
        "commandRes": "картинки"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.freestockimages.ru" 
        "logQueryParam":
         -
          "queryFiledKey": "ssl_sni"
          "queryValue": "www.freestockimages.ru" 
-      -
-       "hopeSuccessNumber": 1
-       "command": "curl -kv https://www.cxwl.com/"
-       "commandRes": "初夏导航"
-       "schemaType": "ssl_sni"
-       "schemaVerify": "www.cxwl.com" 
-       "logQueryParam":
-        -
-         "queryFiledKey": "ssl_sni"
-         "queryValue": "www.cxwl.com"
     "isValid": 1
     "scheduleId":             
     "condation": 
@@ -124,8 +112,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*w.freestockimages.ru"          
-            -  "keywordArray":  
-                - "*w.cxwl.com"
       -       
        "protocolField": "TSG_FIELD_SSL_SAN"
        "objectType": "fqdn"
@@ -134,8 +120,6 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*eestockimages.ru"
-            -  "keywordArray":  
-                - "*xwl.com"    
       -       
        "protocolField": "TSG_FIELD_SSL_CN"
        "objectType": "fqdn"
@@ -144,6 +128,4 @@
          - "addItemList":  
             -  "keywordArray":  
                 - "*estockimages.ru"
-            -  "keywordArray":  
-                - "*wl.com"                 
                                                                                                      
\ No newline at end of file
diff --git a/other/data/security/twitter/twitter-airTest-data.yaml b/other/data/security/twitter/twitter-airTest-data.yaml
index 136a9b4..e8191b5 100644
--- a/other/data/security/twitter/twitter-airTest-data.yaml
+++ b/other/data/security/twitter/twitter-airTest-data.yaml
@@ -578,11 +578,11 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535"
-"deny-default-only-IpAndApplication-search-airTest_data":              
+"deny-drop-only-IpAndApplication-search-airTest_data":              
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "twitter-deny-search"
+    "policyName": "twitter-deny-drop-search"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -618,11 +618,11 @@
             -
              "ip": "1.1.1.1"
              "port": "0-65535"
-"deny-default-only-IpAndApplication-search-airTest_data":                
+"deny-rate_limit-only-IpAndApplication-search-airTest_data":                
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "twitter-deny-search"
+    "policyName": "twitter-deny-rate-search"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
@@ -663,7 +663,7 @@
   -
     "opAction": "add"
     "returnData": 1 
-    "policyName": "twitter-deny-search"
+    "policyName": "twitter-deny-tamper-search"
     "policyType": "tsg_security"
     "logType": "security_event"
     "action": "deny"
diff --git a/other/data/security/youtube/youtube-airTest-data.yaml b/other/data/security/youtube/youtube-airTest-data.yaml
index 43149db..4281d83 100644
--- a/other/data/security/youtube/youtube-airTest-data.yaml
+++ b/other/data/security/youtube/youtube-airTest-data.yaml
@@ -367,7 +367,7 @@
              "ip": "1.1.1.1"
              "port": "0-65535" 
 "deny-drop-only-IpAndApplication-shorts-airTest_data":
--
+  -
     "opAction": "add"
     "returnData": 1 
     "policyName": "youtube-deny-shorts-002"