diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot
index bfb8258..fb063a9 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot
@@ -57,23 +57,31 @@ SecurityPolicy-Deny-Http-00004
     Comment    创建请求头
     ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=Mozilla/5.0*|User-Agent
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    Comment    创建url
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=*sveden
+    ${rescode}    ${object_url_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"block","code":404,"message":"yyyyy"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"block","code":404,"message":"yyyyy"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId3    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId3    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId4    ${objectId}
     insert_policyId_to_file1    deny_http_policyId3    ${policyId}
 
 SecurityPolicy-Deny-Http-00005
     [Tags]    请求头
     Comment    创建请求头
-    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36|User-Agent
+    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36|User-Agent
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    Comment    创建url
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=*a.com/cn/
+    ${rescode}    ${object_url_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId4    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId5    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId6    ${objectId}
     insert_policyId_to_file1    deny_http_policyId4    ${policyId}
 
 SecurityPolicy-Deny-Http-00006
@@ -81,11 +89,15 @@ SecurityPolicy-Deny-Http-00006
     Comment    创建请求头
     ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=AppleWebKit|User-Agent
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    Comment    创建url
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=*vel/ru
+    ${rescode}    ${object_url_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00006    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"网站被阻断"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00006    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"网站被阻断"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId5    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId7    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId8    ${objectId}
     insert_policyId_to_file1    deny_http_policyId5    ${policyId}
 
 SecurityPolicy-Deny-Http-00007
@@ -93,14 +105,18 @@ SecurityPolicy-Deny-Http-00007
     Comment    创建请求头
     ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=*Safari/537.36|User-Agent
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    Comment    创建url
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=*destinations
+    ${rescode}    ${object_url_Id}    AddObject2    ${1}    ${objectDict}
     #创建引用文件
     ${response}    CreatePolicyFile2    ${url}    ${responsePageFiles}    404china.html    resPages
     ${profiledId}    Get From Dictionary    ${response}    profileId
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00007    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":200,"html_profile":${profiledId}}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00007    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":200,"html_profile":${profiledId}}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId6    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId9    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId10    ${objectId}
     insert_policyId_to_file1    deny_http_policyId6    ${policyId}
     insert_policyId_to_file1    deny_http_profiledId1    ${profiledId}
 
@@ -116,8 +132,8 @@ SecurityPolicy-Deny-Http-00008
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00008    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"rst"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId7    ${object_url_Id}
-    insert_policyId_to_file1    deny_http_objectId8    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId11    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId12    ${objectId}
     insert_policyId_to_file1    deny_http_policyId7    ${policyId}
 
 SecurityPolicy-Deny-Http-00009
@@ -132,8 +148,8 @@ SecurityPolicy-Deny-Http-00009
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00009    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":204,"message":"123456"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId9    ${object_url_Id}
-    insert_policyId_to_file1    deny_http_objectId10    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId13    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId14    ${objectId}
     insert_policyId_to_file1    deny_http_policyId8    ${policyId}
 
 SecurityPolicy-Deny-Http-00010
@@ -151,8 +167,8 @@ SecurityPolicy-Deny-Http-00010
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00010    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":204,"html_profile":${profiledId}}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId11    ${object_url_Id}
-    insert_policyId_to_file1    deny_http_objectId12    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId15    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId16    ${objectId}
     insert_policyId_to_file1    deny_http_policyId9    ${policyId}
     insert_policyId_to_file1    deny_http_profiledId2    ${profiledId}
 
@@ -168,11 +184,11 @@ SecurityPolicy-Deny-Http-00011
     ${response}    CreatePolicyFile2    ${url}    ${responsePageFiles}    404english.html    resPages
     ${profiledId}    Get From Dictionary    ${response}    profileId
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00011    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"block","code":404,"html_profile":${profiledId}}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00010    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":204,"html_profile":${profiledId}}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId13    ${object_url_Id}
-    insert_policyId_to_file1    deny_http_objectId14    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId17    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId18    ${objectId}
     insert_policyId_to_file1    deny_http_policyId10    ${policyId}
     insert_policyId_to_file1    deny_http_profiledId3    ${profiledId}
 
@@ -185,19 +201,19 @@ SecurityPolicy-Deny-Http-00012
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00012    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"block","code":404,"message":"马上到周末"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId15    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId19    ${objectId}
     insert_policyId_to_file1    deny_http_policyId11    ${policyId}
 
 SecurityPolicy-Deny-Http-00013
     [Tags]    set-cookie
     Comment    创建set-cookie
-    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$startDate=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; domain=.xiaozhu.com|Set-Cookie,*httponly|Set-Cookie,domain=.kiss.ru|Set-Cookie,*oKD0_802a|Set-Cookie
+    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$_csrf=i5y-sz2EivDxtdiiSm2oFcVCgEah3yvu; path=/; httponly|Set-Cookie,*domain=.xiaozhu.com|Set-Cookie,domain=.kiss.ru|Set-Cookie,*oKD0_802a|Set-Cookie
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00013    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"Главная страница"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId16    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId20    ${objectId}
     insert_policyId_to_file1    deny_http_policyId12    ${policyId}
 
 SecurityPolicy-Deny-Http-00014
@@ -209,7 +225,7 @@ SecurityPolicy-Deny-Http-00014
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00014    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId17    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId21    ${objectId}
     insert_policyId_to_file1    deny_http_policyId13    ${policyId}
 
 SecurityPolicy-Deny-Http-00015
@@ -221,7 +237,7 @@ SecurityPolicy-Deny-Http-00015
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00015    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId18    ${objectId}
+    insert_policyId_to_file1    deny_http_objectId22    ${objectId}
     insert_policyId_to_file1    deny_http_policyId14    ${policyId}
 
 SecurityPolicy-Deny-Http-00016
@@ -242,14 +258,14 @@ SecurityPolicy-Deny-Http-00016
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=qazxsw
     ${rescode}    ${object_body_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00016    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTE    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00016    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId19    ${object_fqdn_Id}
-    insert_policyId_to_file1    deny_http_objectId20    ${object_url_Id}
-    insert_policyId_to_file1    deny_http_objectId21    ${object_qq_Id}
-    insert_policyId_to_file1    deny_http_objectId22    ${object_yd_Id}
-    insert_policyId_to_file1    deny_http_objectId23    ${object_body_Id}
+    insert_policyId_to_file1    deny_http_objectId23    ${object_fqdn_Id}
+    insert_policyId_to_file1    deny_http_objectId24    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId25    ${object_qq_Id}
+    insert_policyId_to_file1    deny_http_objectId26    ${object_yd_Id}
+    insert_policyId_to_file1    deny_http_objectId27    ${object_body_Id}
     insert_policyId_to_file1    deny_http_policyId15    ${policyId}
 
 SecurityPolicy-Deny-Http-00017
@@ -270,12 +286,12 @@ SecurityPolicy-Deny-Http-00017
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=Cell No
     ${rescode}    ${object_body_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00017    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTE    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Http-00017    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_RES_CONTENT    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    deny_http_objectId24    ${object_fqdn_Id}
-    insert_policyId_to_file1    deny_http_objectId25    ${object_url_Id}
-    insert_policyId_to_file1    deny_http_objectId26    ${object_qq_Id}
-    insert_policyId_to_file1    deny_http_objectId27    ${object_yd_Id}
-    insert_policyId_to_file1    deny_http_objectId28    ${object_body_Id}
+    insert_policyId_to_file1    deny_http_objectId28    ${object_fqdn_Id}
+    insert_policyId_to_file1    deny_http_objectId29    ${object_url_Id}
+    insert_policyId_to_file1    deny_http_objectId30    ${object_qq_Id}
+    insert_policyId_to_file1    deny_http_objectId31    ${object_yd_Id}
+    insert_policyId_to_file1    deny_http_objectId32    ${object_body_Id}
     insert_policyId_to_file1    deny_http_policyId16    ${policyId}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot
index 014de49..4d00e74 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot
@@ -40,7 +40,7 @@ SecurityPolicy-Deny-Mail-00003
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*il.com
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId2    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId3    ${object_From_Id}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot
index 860942b..6046368 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot
@@ -51,7 +51,7 @@ SecurityPolicy-Deny-Ssl-00004
     ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=*mail.ru
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Ssl-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SSL","method":"drop"}    filterList=${objectId}|SG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN    isValid=${1}    appIdObjects=3
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Ssl-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SSL","method":"drop"}    filterList=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN    isValid=${1}    appIdObjects=3
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_ssl_objectId3    ${objectId}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot
index 0374a65..b67d8ca 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot
@@ -62,7 +62,7 @@ SecurityPolicy-Monitor-Http-00004
 SecurityPolicy-Monitor-Http-00005
     [Tags]    请求头
     Comment    创建请求头
-    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36|User-Agent
+    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36|User-Agent
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00005    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR    isValid=${1}    appIdObjects=2
@@ -152,7 +152,7 @@ SecurityPolicy-Monitor-Http-00011
     ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=text*|Content-Type
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00011    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00010    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_http_objectId13    ${object_url_Id}
@@ -174,7 +174,7 @@ SecurityPolicy-Monitor-Http-00012
 SecurityPolicy-Monitor-Http-00013
     [Tags]    set-cookie
     Comment    创建set-cookie
-    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$startDate=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; domain=.xiaozhu.com|Set-Cookie,*httponly|Set-Cookie,domain=.kiss.ru|Set-Cookie,*oKD0_802a|Set-Cookie
+    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=$_csrf=i5y-sz2EivDxtdiiSm2oFcVCgEah3yvu; path=/; httponly|Set-Cookie,*domain=.xiaozhu.com|Set-Cookie,domain=.kiss.ru|Set-Cookie,*oKD0_802a|Set-Cookie
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00013    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR    isValid=${1}    appIdObjects=2
@@ -225,7 +225,7 @@ SecurityPolicy-Monitor-Http-00016
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=qazxsw
     ${rescode}    ${object_body_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00016    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTE    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00016    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_http_objectId19    ${object_fqdn_Id}
@@ -253,7 +253,7 @@ SecurityPolicy-Monitor-Http-00017
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=Cell No
     ${rescode}    ${object_body_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00017    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTE    isValid=${1}    appIdObjects=2
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Http-00017    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"HTTP"}    filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_RES_CONTENT    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_http_objectId24    ${object_fqdn_Id}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot
index b637ca2..d83597c 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot
@@ -40,7 +40,7 @@ SecurityPolicy-Monitor-Mail-00003
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*il.com
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId2    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId3    ${object_From_Id}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Quic_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Quic_Tests.robot
index 71a21bf..8497968 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Quic_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Quic_Tests.robot
@@ -15,7 +15,7 @@ SecurityPolicy-Monitor-Quic-00001
     ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=$wordcrow.com,*undergroundhealthreporter.com
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-quic-00001    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"QUIC","method":"drop"}    filterList=${objectId}|TSG_FIELD_QUIC_SNI    isValid=${1}    appIdObjects=43249
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-quic-00001    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"QUIC"}    filterList=${objectId}|TSG_FIELD_QUIC_SNI    isValid=${1}    appIdObjects=43249
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_quic_objectId    ${objectId}
@@ -27,7 +27,7 @@ SecurityPolicy-Monitor-Quic-00002
     ${objectDict}    Create Dictionary    objectType=fqdn_category    isValid=${1}    addItemList=$www.lousycv.com,*stylewithshannon.com
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-quic-00002    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"QUIC","method":"drop"}    filterList=${objectId}|TSG_FIELD_QUIC_SNI    isValid=${1}    appIdObjects=43249
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-quic-00002    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"QUIC"}    filterList=${objectId}|TSG_FIELD_QUIC_SNI    isValid=${1}    appIdObjects=43249
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_quic_objectId1    ${objectId}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot
index aaaec50..62fcdc2 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot
@@ -100,7 +100,7 @@ SecurityPolicy-Deny-Http-00005
     [Tags]    请求头
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00005.bat
-    ...    ELSE    set variable    curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.abchina.com/cn/
+    ...    ELSE    set variable    curl -kv --user-agent "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.abchina.com/cn/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
     ...    ELSE    Create List    Connection reset by peer
     ${starttime}    Get Time
diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot
index e83779b..126349e 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot
@@ -329,3 +329,26 @@ SecurityPolicy-Deny-Mail-00014
     Sleep    ${policyLogVerificationSleepSeconds}s
     ${endtime}    Get Time
     insert_time_to_file1    deny_mail_starttime13    ${starttime}    deny_mail_endtime13    ${endtime}
+
+SecurityPolicy-Deny-Mail-00015
+    [Tags]    最大组合
+    Comment    功能端验证
+    ${starttime}    Get Time
+    Sleep    ${policyVerificationSleepSeconds}s
+    ${Smtp服务器}    Set Variable    192.168.100.5
+    ${Smtp服务器端口}    Set Variable    25
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
+    ${邮件主题}    Set Variable    人生路远及时行乐
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
+    ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${邮件正文}    Set Variable    good
+    ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
+    Log    ${发送邮件返回结果}
+    should contain    ${发送邮件返回结果}    mail_fail
+    Sleep    ${policyLogVerificationSleepSeconds}s
+    ${endtime}    Get Time
+    insert_time_to_file1    deny_mail_starttime14    ${starttime}    deny_mail_endtime14    ${endtime}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot
index 6941951..46f10b2 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot
@@ -100,7 +100,7 @@ SecurityPolicy-Monitor-Http-00005
     [Tags]    请求头
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00005.bat
-    ...    ELSE    set variable    curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.abchina.com/cn/
+    ...    ELSE    set variable    curl -kv --user-agent "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.abchina.com/cn/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
     ...    ELSE    Create List    Connection reset by peer
     ${starttime}    Get Time
diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
index 6e8f4cc..efca5d5 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
@@ -329,3 +329,26 @@ SecurityPolicy-Momitor-Mail-00014
     Sleep    ${policyLogVerificationSleepSeconds}s
     ${endtime}    Get Time
     insert_time_to_file1    momitor_mail_starttime13    ${starttime}    momitor_mail_endtime13    ${endtime}
+
+SecurityPolicy-Momitor-Mail-00015
+    [Tags]    最大组合
+    Comment    功能端验证
+    ${starttime}    Get Time
+    Sleep    ${policyVerificationSleepSeconds}s
+    ${Smtp服务器}    Set Variable    192.168.100.5
+    ${Smtp服务器端口}    Set Variable    25
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
+    ${邮件主题}    Set Variable    人生路远及时行乐
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
+    ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${邮件正文}    Set Variable    good
+    ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
+    Log    ${发送邮件返回结果}
+    should contain    ${发送邮件返回结果}    mail_fail
+    Sleep    ${policyLogVerificationSleepSeconds}s
+    ${endtime}    Get Time
+    insert_time_to_file1    deny_mail_starttime14    ${starttime}    deny_mail_endtime14    ${endtime}
diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot
index 5f229a6..3360e91 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot
@@ -52,6 +52,7 @@ SecurityPolicy-Deny-Http-00004
     [Tags]    请求头
     #删除对象
     ${objectids}    set Variable    ${deny_http_objectId3}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId4}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId3}]}
     ${s}    Convert to String    ${deny_http_policyId3}
@@ -60,7 +61,8 @@ SecurityPolicy-Deny-Http-00004
 SecurityPolicy-Deny-Http-00005
     [Tags]    请求头
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId4}
+    ${objectids}    set Variable    ${deny_http_objectId5}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId6}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId4}]}
     ${s}    Convert to String    ${deny_http_policyId4}
@@ -69,7 +71,8 @@ SecurityPolicy-Deny-Http-00005
 SecurityPolicy-Deny-Http-00006
     [Tags]    请求头
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId5}
+    ${objectids}    set Variable    ${deny_http_objectId7}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId8}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId5}]}
     ${s}    Convert to String    ${deny_http_policyId5}
@@ -80,7 +83,8 @@ SecurityPolicy-Deny-Http-00007
     #删除文件
     ${profiledId}    set Variable    ${deny_http_profiledId1}
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId6}
+    ${objectids}    set Variable    ${deny_http_objectId9}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId10}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId6}]}
     ${s}    Convert to String    ${deny_http_policyId6}
@@ -89,8 +93,8 @@ SecurityPolicy-Deny-Http-00007
 SecurityPolicy-Deny-Http-00008
     [Tags]    应答头
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId7}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId8}
+    ${objectids}    set Variable    ${deny_http_objectId11}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId12}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId7}]}
     ${s}    Convert to String    ${deny_http_policyId7}
@@ -99,8 +103,8 @@ SecurityPolicy-Deny-Http-00008
 SecurityPolicy-Deny-Http-00009
     [Tags]    应答头
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId9}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId10}
+    ${objectids}    set Variable    ${deny_http_objectId13}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId14}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId8}]}
     ${s}    Convert to String    ${deny_http_policyId8}
@@ -111,8 +115,8 @@ SecurityPolicy-Deny-Http-00010
     #删除文件
     ${profiledId}    set Variable    ${deny_http_profiledId2}
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId11}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId12}
+    ${objectids}    set Variable    ${deny_http_objectId15}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId16}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId9}]}
     ${s}    Convert to String    ${deny_http_policyId9}
@@ -123,8 +127,8 @@ SecurityPolicy-Deny-Http-00011
     #删除文件
     ${profiledId}    set Variable    ${deny_http_profiledId3}
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId13}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId14}
+    ${objectids}    set Variable    ${deny_http_objectId17}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId18}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId10}]}
     ${s}    Convert to String    ${deny_http_policyId10}
@@ -133,7 +137,7 @@ SecurityPolicy-Deny-Http-00011
 SecurityPolicy-Deny-Http-00012
     [Tags]    cookie
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId15}
+    ${objectids}    set Variable    ${deny_http_objectId19}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId11}]}
     ${s}    Convert to String    ${deny_http_policyId11}
@@ -142,7 +146,7 @@ SecurityPolicy-Deny-Http-00012
 SecurityPolicy-Deny-Http-00013
     [Tags]    set-cookie
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId16}
+    ${objectids}    set Variable    ${deny_http_objectId20}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId12}]}
     ${s}    Convert to String    ${deny_http_policyId12}
@@ -154,7 +158,7 @@ SecurityPolicy-Deny-Http-00013
 SecurityPolicy-Deny-Http-00014
     [Tags]    请求体
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId17}
+    ${objectids}    set Variable    ${deny_http_objectId21}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId13}]}
     ${s}    Convert to String    ${deny_http_policyId13}
@@ -163,7 +167,7 @@ SecurityPolicy-Deny-Http-00014
 SecurityPolicy-Deny-Http-00015
     [Tags]    应答体
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId18}
+    ${objectids}    set Variable    ${deny_http_objectId22}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId14}]}
     ${s}    Convert to String    ${deny_http_policyId14}
@@ -172,11 +176,11 @@ SecurityPolicy-Deny-Http-00015
 SecurityPolicy-Deny-Http-00016
     [Tags]    最大组合1
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId19}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId20}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId21}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId22}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId23}
+    ${objectids}    set Variable    ${deny_http_objectId23}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId24}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId25}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId26}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId27}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId15}]}
     ${s}    Convert to String    ${deny_http_policyId15}
@@ -185,11 +189,11 @@ SecurityPolicy-Deny-Http-00016
 SecurityPolicy-Deny-Http-00017
     [Tags]    最大组合2
     #删除对象
-    ${objectids}    set Variable    ${deny_http_objectId24}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId25}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId26}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId27}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId28}
+    ${objectids}    set Variable    ${deny_http_objectId28}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId29}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId30}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId31}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId32}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId16}]}
     ${s}    Convert to String    ${deny_http_policyId16}
diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot
index 61fa6d7..07b5b6f 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot
@@ -151,3 +151,17 @@ SecurityPolicy-Deny-Mail-00014
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_mail_policyId13}]}
     ${s}    Convert to String    ${deny_mail_policyId13}
     GetLogList    security_event_log    ${deny_mail_starttime13}    ${deny_mail_endtime13}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
+
+SecurityPolicy-Deny-Mail-00015
+    [Tags]    最大组合
+    #删除对象
+    ${objectids}    set Variable    ${deny_mail_objectId26}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_mail_objectId27}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_mail_objectId28}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_mail_objectId29}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_mail_objectId30}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_mail_objectId31}
+    #删除策略
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_mail_policyId14}]}
+    ${s}    Convert to String    ${deny_mail_policyId14}
+    GetLogList    security_event_log    ${deny_mail_starttime14}    ${deny_mail_endtime14}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot
index 03d8b1a..203b3a3 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot
@@ -151,3 +151,17 @@ SecurityPolicy-Monitor-Mail-00014
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId13}]}
     ${s}    Convert to String    ${monitor_mail_policyId13}
     GetLogList    security_event_log    ${monitor_mail_starttime13}    ${monitor_mail_endtime13}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
+
+SecurityPolicy-Monitor-Mail-00015
+    [Tags]    最大组合
+    #删除对象
+    ${objectids}    set Variable    ${monitor_mail_objectId26}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${monitor_mail_objectId27}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${monitor_mail_objectId28}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${monitor_mail_objectId29}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${monitor_mail_objectId30}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${monitor_mail_objectId31}
+    #删除策略
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId14}]}
+    ${s}    Convert to String    ${monitor_mail_policyId14}
+    GetLogList    security_event_log    ${monitor_mail_starttime14}    ${monitor_mail_endtime14}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
diff --git a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00005.bat b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00005.bat
index 6180d14..21fd2a1 100644
--- a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00005.bat
+++ b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00005.bat
@@ -1 +1 @@
-curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' \ curl  http://www.abchina.com/cn/ | iconv -f utf-8 -t gbk
\ No newline at end of file
+curl -kv --user-agent "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36" --referer 'http://www.baidu.com/' \ curl  http://www.abchina.com/cn/ | iconv -f utf-8 -t gbk
\ No newline at end of file