diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot
index 28310ea..dcd9215 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot
@@ -188,7 +188,7 @@ SecurityPolicy-Allow-SIP-00004
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     ${policyId}    Get-Pids    ${policyId}
     ${policyId}    Set Variable    ${policyId}[0]
-    insert_policyId_to_file1    allow_sip_objectId1    ${objectId}
+    insert_policyId_to_file1    allow_sip_objectId401    ${objectId}
     insert_policyId_to_file1    allow_sip_policyId3    ${policyId}
 
 SecurityPolicy-Allow-SIP-00005
@@ -317,7 +317,7 @@ SecurityPolicy-Allow-SIP-00002
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     ${policyId}    Get-Pids    ${policyId}
     ${policyId}    Set Variable    ${policyId}[0]
-    insert_policyId_to_file1    allow_sip_objectId9    ${object_Account_Id}
+    insert_policyId_to_file1    allow_sip_objectId0209    ${object_Account_Id}
     insert_policyId_to_file1    allow_sip_objectId1201    ${object_Ip_Id}
     insert_policyId_to_file1    allow_sip_policyId11    ${policyId}
     
@@ -436,8 +436,8 @@ SecurityPolicy-Allow-SIP-00003
     ${policyId}    Get-Pids    ${policyId}
     ${policyId}    Set Variable    ${policyId}[0]
     insert_policyId_to_file1    allow_sip_objectId9    ${object_Account_Id}
-    insert_policyId_to_file1    allow_sip_objectId1201    ${object_Ip_Id}
-    insert_policyId_to_file1    allow_sip_policyId11    ${policyId}
+    insert_policyId_to_file1    allow_sip_objectId0301    ${object_Ip_Id}
+    insert_policyId_to_file1    allow_sip_policyId0301    ${policyId}
     
     
 
diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot
index 11e925e..e93e694 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot
@@ -72,7 +72,7 @@ SecurityPolicy-Deny-Dns-00004
     ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=$www.twitch.tv
     ${rescode}    ${objectId1}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Dns-00004   destination=3123|TSG_SECURITY_DESTINATION_ADDR    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]}    filterList=${objectId}|TSG_FIELD_DNS_QNAME    isValid=${1}    appIdObjects=${DNS_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Dns-00004     policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]}    filterList=${objectId}|TSG_FIELD_DNS_QNAME    isValid=${1}    appIdObjects=${DNS_ID}
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     ${policyId}    Get-Pids    ${policyId}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot
index 7171f7e..8b6af0c 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot
@@ -44,7 +44,7 @@ SecurityPolicy-Deny-Ftp-00001
     insert_policyId_to_file1    deny_ftp_objectId1    ${object_url_Id}
     insert_policyId_to_file1    deny_ftp_objectId2    ${object_content_Id}
     insert_policyId_to_file1    deny_ftp_objectId12    ${objectId1}
-    insert_policyId_to_file1    deny_ftp_objectId13    ${object_Account_Id}
+    insert_policyId_to_file1    deny_ftp_objectId13    ${object_Account_Id1}
     insert_policyId_to_file1    deny_ftp_objectId14    ${object_url_Id1}
     insert_policyId_to_file1    deny_ftp_objectId15    ${object_content_Id}
     insert_policyId_to_file1    deny_ftp_policyId    ${policyId}
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 9cf305c..fbaf4ff 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
@@ -194,7 +194,7 @@ SecurityPolicy-Deny-Http-00009
     insert_policyId_to_file1    deny_http_policyId8    ${policyId}
 
 SecurityPolicy-Deny-Http-00010
-    [Tags]    应答头字串匹配         update policy:destination ip learning
+    [Tags]    应答头字串匹配         update policy
     Comment    创建url
     ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=www.avaxsearch.com
     ${rescode}    ${object_url_Id}    AddObject2    ${1}    ${objectDict}
@@ -421,5 +421,5 @@ SecurityPolicy-Deny-Http-00020
     insert_policyId_to_file1    deny_http_objectId43    ${object_ck_Id}
     insert_policyId_to_file1    deny_http_objectId44    ${object_ua_Id}
     insert_policyId_to_file1    deny_http_objectId45    ${object_ct_Id}
-    insert_policyId_to_file1    deny_http_policyId17    ${policyId}
+    insert_policyId_to_file1    deny_http_policyId19    ${policyId}
     
\ No newline at end of file
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 f770666..602d190 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
@@ -81,7 +81,7 @@ SecurityPolicy-Deny-Ssl-00004
     insert_policyId_to_file1    deny_ssl_policyId3    ${policyId}
     
 SecurityPolicy-Deny-Ssl-00005
-    [Tags]  update policy:destination learning
+    [Tags]  update policy:
     Comment    创建fqdn
     ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=*leisu.com
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot
index 3f9190a..90dce50 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot
@@ -433,7 +433,7 @@ Proxy-Policy-deny-00014
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=ProxydenyTest001401
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建fqdn
-    ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=*open.node.com:180
+    ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=*open.node.com
     ${rescode}    ${objectId1}    AddObject2    ${1}    ${objectDict}
     Comment    创建请求体2
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=ProxydenyTest001402
@@ -482,9 +482,9 @@ Proxy-Policy-deny-00016
     Comment    创建url
     ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=*mt.meipai.com/
     ${rescode}    ${objectId1}    AddObject2    ${1}    ${objectDict}
-    ${addItemList}    Create List    ${objectId1}
-    ${objectDict1}    Create Dictionary    objectType=url    isValid=${1}    subObjectIds=${addItemList}
-    ${rescode}    ${objectId2}    AddObjects    ${1}    ${objectDict1}
+    # ${addItemList}    Create List    ${objectId1}
+    # ${objectDict1}    Create Dictionary    objectType=url    isValid=${1}    subObjectIds=${addItemList}
+    # ${rescode}    ${objectId2}    AddObjects    ${1}    ${objectDict1}
     Comment    创建引用文件
     ${response}    CreatePolicyFile2    ${url}    ${responsePageFiles}    404china.html    resPages
     ${profiledId}    Get From Dictionary    ${response}    profileId
@@ -503,7 +503,7 @@ Proxy-Policy-deny-00016
     insert_policyId_to_file1    deny_profileId6    ${profiledId}
     insert_policyId_to_file1    deny_objectId47    ${objectId}
     insert_policyId_to_file1    deny_objectId58    ${objectId1}
-    insert_policyId_to_file1    deny_objectId59    ${objectId2}
+    # insert_policyId_to_file1    deny_objectId59    ${objectId2}
     insert_policyId_to_file1    intercept_deny_policyId15    ${policyId1}
     insert_policyId_to_file1    deny_policyId17    ${policyId2}
 
diff --git a/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot
index 5a21b24..4a3966d 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot
@@ -86,7 +86,7 @@ Proxy-Policy-insert-00003
     ${objectDict}    Create Dictionary    objectType=fqdn    isValid=${1}    addItemList=*ttsdalepublicart.org,$www.troop508.org,*wordpress.com,$www.doctorpoo.net
     ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
     Comment    创建url
-    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=scottsdalepublic*,$www.troop508.org,*wordpress.com/,doctorpoo
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=scottsdalepublic*,$www.troop508.org/,*wordpress.com/,doctorpoo
     ${rescode}    ${objectId1}    AddObject2    ${1}    ${objectDict}
     Comment    创建insert文件
     ${response}    CreatePolicyFile2    ${url}    ${path}/insert_files/    Create-Insert Scripts-test-1.js    insert
@@ -192,7 +192,7 @@ Proxy-Policy-insert-00006
     ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=hotels/
     ${rescode}    ${objectId1}    AddObject2    ${1}    ${objectDict}
     Comment    创建请求头
-    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=AppleWebKit|User-Agent
+    ${objectDict}    Create Dictionary    objectType=http_signature    isValid=${1}    addItemList=Mozilla|User-Agent
     ${rescode}    ${objectId2}    AddObject2    ${1}    ${objectDict}
     Comment    创建insert文件
     ${response}    CreatePolicyFile2    ${url}    ${path}/insert_files/    Create-Insert Scripts-test-1.js    insert
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 16cf185..7a8ef33 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
@@ -272,7 +272,7 @@ SecurityPolicy-Monitor-Mail-00015
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=$要留清白在人间
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建Account
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=hebingning*
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=266213*
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建Content
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=good
@@ -305,7 +305,7 @@ SecurityPolicy-Monitor-Mail-00016
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=monitorMail16
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建Account
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=hebingning
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=2662136486
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建Content
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=Monitor16*
diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot
index ac1ae57..8052a9d 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags          adc_api    security_policy
+Force Tags        tsg_adc_wp  adc_api    security_policy
 Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_adc/SystemCommand.robot
 Resource          ../../../02-Keyword/tsg_bfapi/PolicyObject.robot
diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot
index a717955..9cb502a 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot
@@ -59,8 +59,8 @@ Proxy-Policy-allow-00003
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00003_2.bat
     ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00003_2L.bat
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    каждые    Tango Secure Gateway CA
-    ...    ELSE    Create List    каждые    Tango Secure Gateway CA
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    RSD    Tango Secure Gateway CA
+    ...    ELSE    Create List    RSD    Tango Secure Gateway CA
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
 
 Proxy-Policy-allow-00004
@@ -99,7 +99,7 @@ Proxy-Policy-allow-00006
 Proxy-Policy-allow-00007
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00007.bat
-    ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00007_L
+    ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00007_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List     WoodSnap    Tango Secure Gateway CA
     ...    ELSE    Create List     WoodSnap    Tango Secure Gateway CA
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
@@ -123,7 +123,7 @@ Proxy-Policy-allow-00009
 Proxy-Policy-allow-00010
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00010.bat
-    ...    ELSE    set variable    curl http://www.gf.com.cn/about/intro
+    ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00010_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    广发证券
     ...    ELSE    Create List    广发证券
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot
index 0a82503..f3c41e1 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot
@@ -15,13 +15,13 @@ SecurityPolicy-Deny-Dns-00001
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d www.facebook.com
     ...    ELSE    set variable    nslookup www.facebook.com
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    超时
-    ...    ELSE    Create List    canonical name = www.facebook.com
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d rutube.ru
     ...    ELSE    set variable    nslookup -d rutube.ru
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    超时
-    ...    ELSE    Create List    canonical name = rutube.ru
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    改变阻断策略
     ${policyDict}    Create Dictionary    policyId=${deny_dns_policyId}    policyName=SecurityPolicy-Deny-Dns-00001_1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"drop"}    source=${deny_dns_objectId4}|TSG_SECURITY_SOURCE_LOCATION    filterList=${deny_dns_objectId}|TSG_FIELD_DNS_QNAME    isValid=${1}    appIdObjects=${DNS_ID}
@@ -31,13 +31,13 @@ SecurityPolicy-Deny-Dns-00001
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d www.facebook.com
     ...    ELSE    set variable    nslookup www.facebook.com
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    超时
-    ...    ELSE    Create List    canonical name = www.facebook.com
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d rutube.ru
     ...    ELSE    set variable    nslookup -d rutube.ru
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    超时
-    ...    ELSE    Create List    canonical name = rutube.ru
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
 
 SecurityPolicy-Deny-Dns-00002
@@ -57,31 +57,35 @@ SecurityPolicy-Deny-Dns-00002
 SecurityPolicy-Deny-Dns-00003
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d aec188.com 8.8.8.8
-    ...    ELSE    set variable    nslookup -debug -query=AAAA harfordemcomm.org
+    ...    ELSE    set variable    nslookup -debug -query=AAAA \ aec188.com
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    aec188.com
     ...    ELSE    Create List    aec188.com
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d huitu.com 8.8.8.8
-    ...    ELSE    set variable    nslookup -debug -query=AAAA harfordemcomm.org
+    ...    ELSE    set variable    nslookup -debug -query=AAAA \ huitu.com
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    huitu.com
     ...    ELSE    Create List    fc00::2:11    www.taobao.com    ttl = 400
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
+    Comment    用后失效，与insert12互相影响
+    ${policyDict}    Create Dictionary    policyId=${deny_dns_policyId2}    policyName=SecurityPolicy-Deny-Dns-00003_1     policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]}    filterList=129|TSG_FIELD_DNS_QNAME    isValid=${0}    appIdObjects=${DNS_ID}
+    log    ${policyDict}
+    ${rescode}    UpdatePolicies    1    ${policyDict}    v2    update
 
 SecurityPolicy-Deny-Dns-00004
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d www.twitch.tv
-    ...    ELSE    set variable    nslookup -debug -query=A www.twitch.tv
+    ...    ELSE    set variable    nslookup -debug -query=A \ www.twitch.tv
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    192.168.40.110    www.facebook.com    ttl = 400    www.ok.ru    fc00::2:22
     ...    ELSE    Create List    192.168.40.110    www.ok.ru    ttl = 400
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    改变阻断策略
-    ${policyDict}    Create Dictionary    policyId=${deny_dns_policyId3}    policyName=SecurityPolicy-Deny-Dns-00004_1   destination=164745|TSG_SECURITY_DESTINATION_ADDR    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]}    filterList=${deny_dns_objectId5}|TSG_FIELD_DNS_QNAME    isValid=${1}    appIdObjects=${DNS_ID}
+    ${policyDict}    Create Dictionary    policyId=${deny_dns_policyId3}    policyName=SecurityPolicy-Deny-Dns-00004_1      policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]}    filterList=${deny_dns_objectId5}|TSG_FIELD_DNS_QNAME    isValid=${1}    appIdObjects=${DNS_ID}
     log    ${policyDict}
     ${rescode}    UpdatePolicies    1    ${policyDict}    v2    update
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d www.twitch.tv
-    ...    ELSE    set variable    nslookup -debug -query=AAAA www.twitch.tv
+    ...    ELSE    set variable    nslookup -debug -query=AAAA \ www.twitch.tv
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    fc00::2:22    www.facebook.com    ttl = 400    www.ok.ru    192.168.40.110
     ...    ELSE    Create List    ttl = 400    www.facebook.com    fc00::2:22
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
@@ -96,7 +100,7 @@ SecurityPolicy-Deny-Dns-00005
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup -d www.facebook.com
     ...    ELSE    set variable    nslookup www.facebook.com
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List     超时
-    ...    ELSE    Create List    canonical name = www.facebook.com
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    关闭安全策略
     ${policyDict}    Create Dictionary    policyId=${deny_dns_policyId4}    policyName=SecurityPolicy-Deny-Dns-00005-2    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"DNS","method":"drop"}       isValid=${0}    appIdObjects=${DNS_ID}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot
index 6777777..ea42c83 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot
@@ -14,7 +14,9 @@ Resource          ../../../05-Other/AllFlowCaseVariable.txt
 SecurityPolicy-Deny-Ftp-00001
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/123456.txt -u ftpuser:111111    123456789qwertyuiop
-    should contain    ${FTP}    ftp_fail
+    # should contain    ${FTP}    ftp_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_fail
+    ...    ELSE    should contain    ${FTP}    Fail
     Comment    改变阻断策略
     ${policyDict}    Create Dictionary    policyId=${deny_ftp_policyId}    source=${deny_ftp_objectId12}|TSG_SECURITY_SOURCE_LOCATION     policyName=SecurityPolicy-Deny-FTP-00001-1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"FTP","method":"drop"}    filterList=${deny_ftp_objectId13}|TSG_FIELD_FTP_ACCOUNT,${deny_ftp_objectId15}|TSG_FIELD_FTP_CONTENT,${deny_ftp_objectId14}|TSG_FIELD_FTP_URI    isValid=${1}    appIdObjects=${FTP_ID}
     log    ${policyDict}
@@ -23,25 +25,25 @@ SecurityPolicy-Deny-Ftp-00001
     ${FTP}    FTP_login    ftp://192.168.40.158/123456.txt -u ftpuser:111111    123456789qwertyuiop
     # should contain    ${FTP}    ftp_fail
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_fail
-    ...    ELSE    should contain    ${发送邮件返回结果}    Fail
+    ...    ELSE    should contain    ${FTP}    Fail
     
 SecurityPolicy-Deny-Ftp-00002
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/test.txt -u ftpuser:111111    中文test
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_fail
-    ...    ELSE    should contain    ${发送邮件返回结果}    Fail
+    ...    ELSE    should contain    ${FTP}    Fail
 
 SecurityPolicy-Deny-Ftp-00003
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/wlcsy.txt -u ftpuser:111111    中文文件内容
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_fail
-    ...    ELSE    should contain    ${发送邮件返回结果}    Fail
+    ...    ELSE    should contain    ${FTP}    Fail
 
 SecurityPolicy-Deny-Ftp-00004
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/aewn.txt -u ftpuser:111111    завезенными
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_fail
-    ...    ELSE    should contain    ${发送邮件返回结果}    Fail
+    ...    ELSE    should contain    ${FTP}    Fail
     
 SecurityPolicy-Deny-Ftp-00005
     Comment    开启阻断策略
@@ -52,7 +54,7 @@ SecurityPolicy-Deny-Ftp-00005
     ${FTP}    FTP_login    ftp://192.168.40.158/test.txt -u ftpuser:111111    中文test
     # should contain    ${FTP}    ftp_fail
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_fail
-    ...    ELSE    should contain    ${发送邮件返回结果}    Fail
+    ...    ELSE    should contain    ${FTP}    Fail
     Comment    关闭阻断策略
     ${policyDict}    Create Dictionary    policyId=${deny_ftp_policyId4}  policyName=SecurityPolicy-Deny-FTP-00005-2    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"FTP","method":"rst"}       isValid=${0}    appIdObjects=${FTP_ID}  
     log    ${policyDict}
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 4f59d78..0087332 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
@@ -121,7 +121,7 @@ SecurityPolicy-Deny-Http-00008
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00008.bat
     ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00008_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    timed out
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    改变阻断策略
     ${policyDict}    Create Dictionary    policyId=${deny_http_policyId7}    policyName=SecurityPolicy-Deny-Http-00008_1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"rst"}    filterList=${deny_http_objectId39}|TSG_FIELD_HTTP_RES_HDR,${deny_http_objectId11}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=${HTTP_ID}
@@ -132,7 +132,7 @@ SecurityPolicy-Deny-Http-00008
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00008.bat
     ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00008_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    timed out
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     
 SecurityPolicy-Deny-Http-00009
@@ -151,9 +151,10 @@ SecurityPolicy-Deny-Http-00010
     ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    改变阻断策略
-    ${policyDict}    Create Dictionary    policyId=${deny_http_policyId9}    policyName=SecurityPolicy-Deny-Http-00010_1    destination=24849|TSG_SECURITY_DESTINATION_ADDR    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${deny_http_objectId16}|TSG_FIELD_HTTP_RES_HDR,${deny_http_objectId15}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=${HTTP_ID}
+    ${policyDict}    Create Dictionary    policyId=${deny_http_policyId9}    policyName=SecurityPolicy-Deny-Http-00010_1      policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"HTTP","method":"drop"}    filterList=${deny_http_objectId16}|TSG_FIELD_HTTP_RES_HDR,${deny_http_objectId15}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=${HTTP_ID}
     log    ${policyDict}
     ${rescode}    UpdatePolicies    1    ${policyDict}    v2    update
+    sleep    10
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00010.bat
     ...    ELSE    set variable    curl -m 10 -kv http://www.avaxsearch.com/tangkas/
diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot
index 6d103f9..4dee10f 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot
@@ -15,13 +15,13 @@ SecurityPolicy-Deny-Ssl-00001
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00001.bat
     ...    ELSE    set variable    curl https://www.freestockimages.ru/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    OpenSSL SSL_connect
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00001_1.bat
     ...    ELSE    set variable    curl \ \ \ https://www.cxwl.com/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    OpenSSL SSL_connect
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    改变阻断策略
     ${policyDict}    Create Dictionary    policyId=${deny_ssl_policyId}    source=${deny_ssl_objectId5}|TSG_SECURITY_SOURCE_LOCATION     policyName=SecurityPolicy-Deny-Ssl-00001_1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SSL","method":"rst"}    filterList=${deny_ssl_objectId4}|TSG_FIELD_SSL_SNI    isValid=${1}    appIdObjects=${SSL_ID}
@@ -31,7 +31,7 @@ SecurityPolicy-Deny-Ssl-00001
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00001_1.bat
     ...    ELSE    set variable    curl \ \ \ https://www.cxwl.com/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    OpenSSL SSL_connect
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     
 SecurityPolicy-Deny-Ssl-00002
@@ -39,19 +39,19 @@ SecurityPolicy-Deny-Ssl-00002
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00002.bat
     ...    ELSE    set variable    curl https://amesweb.info/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    OpenSSL SSL_connect
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00002_2.bat
     ...    ELSE    set variable    curl https://rentar.com/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Connection was reset
-    ...    ELSE    Create List    Connection reset by peer
+    ...    ELSE    Create List    OpenSSL SSL_connect
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
 
 SecurityPolicy-Deny-Ssl-00003
     # Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003.bat
-    ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003L.bat 
+    ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003_L.bat 
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    timed out 
     ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
@@ -88,7 +88,7 @@ SecurityPolicy-Deny-Ssl-00005
     ...    ELSE    Create List    timed out
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    改变阻断策略
-    ${policyDict}    Create Dictionary    policyId=${deny_ssl_policyId4}    policyName=SecurityPolicy-Deny-Ssl-00005-1    destination=3309|TSG_SECURITY_DESTINATION_ADDR     policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SSL","method":"drop"}    filterList=${deny_ssl_objectId7}|TSG_FIELD_SSL_SAN,${deny_ssl_objectId7}|TSG_FIELD_SSL_SNI,${deny_ssl_objectId7}|TSG_FIELD_SSL_CN    isValid=${1}    appIdObjects=${SSL_ID}
+    ${policyDict}    Create Dictionary    policyId=${deny_ssl_policyId4}    policyName=SecurityPolicy-Deny-Ssl-00005-1       policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SSL","method":"drop"}    filterList=${deny_ssl_objectId7}|TSG_FIELD_SSL_SAN,${deny_ssl_objectId7}|TSG_FIELD_SSL_SNI,${deny_ssl_objectId7}|TSG_FIELD_SSL_CN    isValid=${1}    appIdObjects=${SSL_ID}
     log    ${policyDict}
     ${rescode}    UpdatePolicies    1    ${policyDict}    v2    update
     Comment    功能端验证HTTP验证
diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot
index f77d4be..4c26ce8 100644
--- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot
@@ -361,7 +361,7 @@ SecurityPolicy-Deny-Http-00018
     ${fqdn}    Create Dictionary    attributeType=string    attributeName=host    appId=106    appName=http    protocol=http    attributeValue={"string": "www.hebbank.com"}
     ${app_id}    Create Dictionary    attributeType=string    attributeName=app_id    attributeValue={"string": "106"}
     ${subscriberid}    Create Dictionary    attributeType=string    attributeName=subscriberid    attributeValue={"string": "test56"}
-    ${ipsource}    Create Dictionary    attributeType=ip    attributeName=source    attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"}
+    ${ipsource}    Create Dictionary    attributeType=ip    attributeName=source    attributeValue={"ip":"192.168.50.18","port":"100","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"}
     ${ipdestination}    Create Dictionary    attributeType=ip    attributeName=destination    attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"}
     # 合成attributes字典集
     ${attributes}    Create List    ${app_id}    ${subscriberid}    ${ipsource}    ${ipdestination}    ${fqdn}    
@@ -370,7 +370,7 @@ SecurityPolicy-Deny-Http-00018
     log    ${verifyList}
     ${rescode}    ${resData}    VerifyPolicies    ${verifyList}
     # 打印检查结果
-    ${objectid_verify}    Set Variable    ${testClentIpId}
+    ${objectid_verify}    Set Variable    ${deny_http_objectId33}
     ${objectid_verify}    Catenate    SEPARATOR=,    ${objectid_verify}       ${deny_http_objectId34}    ${deny_http_policyId17}
     # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中
     log         ${objectid_verify}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot
index caa1841..3b9a2a0 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot
@@ -60,7 +60,7 @@ Proxy-Policy-insert-00003
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_insert_00003_1.bat
     ...    ELSE    set variable    curl -kv https://www.troop508.org/
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Troop    Tango Secure Gateway CA
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    alert    Tango Secure Gateway CA
     ...    ELSE    Create List    Troop    Tango Secure Gateway CA
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
@@ -147,9 +147,6 @@ Proxy-Policy-insert-00009
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_insert_00009.bat
     ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_insert_00009_L.bat
-    sleep    3
-    ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_insert_00009.bat
-    ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_insert_00009_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    X-TG-Construct-By: tfe
     ...    ELSE    Create List    X-TG-Construct-By: tfe
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
diff --git a/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot
index 65d7903..23df5ff 100644
--- a/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot
@@ -150,7 +150,7 @@ Proxy-Policy-insert-00006
     #创建attributes中的字典
     ${fqdn}    Create Dictionary    attributeType=string    attributeName=host    appId=106    appName=http    protocol=http    attributeValue={"string": "www.farecompare.com"}
     ${url}    Create Dictionary    attributeType=string    attributeName=url    appId=106    appName=http    protocol=http    attributeValue={"string": "www.farecompare.com/hotels/"}
-    ${req_hdr_ua}    Create Dictionary    attributeType=signature    attributeName=req_hdr    appId=106    appName=http    protocol=http    attributeValue={"string": "safrisyAppleWebKit","district": "User-Agent"}
+    ${req_hdr_ua}    Create Dictionary    attributeType=signature    attributeName=req_hdr    appId=106    appName=http    protocol=http    attributeValue={"string": "Mozillasssaaa","district": "User-Agent"}
     ${app_id}    Create Dictionary    attributeType=string    attributeName=app_id    attributeValue={"string": "106"}
     ${subscriberid}    Create Dictionary    attributeType=string    attributeName=subscriberid    attributeValue={"string": "test56"}
     ${ipsource}    Create Dictionary    attributeType=ip    attributeName=source    attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot
index 7612c2e..a7fed8b 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot
@@ -14,7 +14,9 @@ Resource          ../../../05-Other/AllFlowCaseVariable.txt
 SecurityPolicy-Monitor-Ftp-00001
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/123zxcvbnm.txt -u ftpuser:111111    crfvtgbyhnuj
-    should contain    ${FTP}    ftp_success
+    # should contain    ${FTP}    ftp_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_success
+    ...    ELSE    should contain    ${FTP}    Success
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${monitor_ftp_policyId}    source=${monitor_ftp_objectId12}|TSG_SECURITY_SOURCE_LOCATION     policyName=SecurityPolicy-Monitor-FTP-00001-1    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"FTP"}    filterList=${monitor_ftp_objectId13}|TSG_FIELD_FTP_ACCOUNT,${monitor_ftp_objectId15}|TSG_FIELD_FTP_CONTENT,${monitor_ftp_objectId14}|TSG_FIELD_FTP_URI    isValid=${1}    appIdObjects=${FTP_ID}
     log    ${policyDict}
@@ -23,25 +25,25 @@ SecurityPolicy-Monitor-Ftp-00001
     ${FTP}    FTP_login    ftp://192.168.40.158/123zxcvbnm.txt -u ftpuser:111111    crfvtgbyhnuj
     #should contain    ${FTP}    ftp_success
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_success
-    ...    ELSE    should contain    ${发送邮件返回结果}    Success
+    ...    ELSE    should contain    ${FTP}    Success
     
 SecurityPolicy-Monitor-Ftp-00002
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/stamp.txt -u ftpuser:111111    Shandong Province
     #should contain    ${FTP}    ftp_success
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_success
-    ...    ELSE    should contain    ${发送邮件返回结果}    Success
+    ...    ELSE    should contain    ${FTP}    Success
     
 SecurityPolicy-Monitor-Ftp-00003
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/qwert.txt -u ftpuser:111111    花好听的名字
     should contain    ${FTP}    ftp_success
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_success
-    ...    ELSE    should contain    ${发送邮件返回结果}    Success
+    ...    ELSE    should contain    ${FTP}    Success
     
 SecurityPolicy-Monitor-Ftp-00004
     Comment    功能端验证
     ${FTP}    FTP_login    ftp://192.168.40.158/asdfg.txt -u ftpuser:111111    уютных апартаментов
     # should contain    ${FTP}    ftp_success
     run keyword if     '${systemType}'=='Windows'    should contain    ${FTP}    ftp_success
-    ...    ELSE    should contain    ${发送邮件返回结果}    Success
+    ...    ELSE    should contain    ${FTP}    Success
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 d74d12e..4cefdf1 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
@@ -156,19 +156,19 @@ SecurityPolicy-Monitor-Http-00012
 SecurityPolicy-Monitor-Http-00013
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013.bat
-    ...    ELSE    set variable    curl http://www.spore.com/what
+    ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    www.spore.com
     ...    ELSE    Create List    www.spore.com
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013_1.bat
-    ...    ELSE    set variable    curl http://www.dianping.com/beijing
+    ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013_1L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    小吃快餐
     ...    ELSE    Create List    小吃快餐
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013_3.bat
-    ...    ELSE    set variable    curl http://virtualflowers.ru/en/
+    ...    ELSE    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013_3L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    virtualflowers
     ...    ELSE    Create List    virtualflowers
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
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 e6fb183..426653c 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
@@ -388,7 +388,7 @@ SecurityPolicy-Momitor-Mail-00016
     ${接收者}    Set Variable    ["${mailAccountGeedge}"]
     ${抄送者}    Set Variable    ["${mailAccountGeedge}"]
     ${密送者}    Set Variable    ["${mailAccountGeedge}"]
-    ${邮件正文}    Set Variable    Monitor16右匹配测试邮件正文
+    ${邮件正文}    Set Variable    Monitor16左匹配测试邮件正文
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
     run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot
index 1e31739..6df667f 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot
@@ -49,12 +49,12 @@ SecurityPolicy-Monitor-Ssl-00003
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Accuracy In Academia
     ...    ELSE    Create List    Accuracy In Academia
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
-    Comment    功能端验证HTTP验证
-    ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00003_3.bat
-    ...    ELSE    set variable    curl https://www.proisraelforever.com/
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Israel Forever
-    ...    ELSE    Create List    Israel Forever
-    ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
+    # Comment    功能端验证HTTP验证
+    # ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00003_3.bat
+    # ...    ELSE    set variable    curl https://www.proisraelforever.com/
+    # ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Israel Forever
+    # ...    ELSE    Create List    Israel Forever
+    # ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
 
 SecurityPolicy-Monitor-Ssl-00004
     Comment    功能端验证HTTP验证
diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot
index 5499cf3..715021d 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot
@@ -113,14 +113,14 @@ Proxy-Policy-Monitor-00007
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_Monitor_00007.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 'https://www.baidu.com/' https://www.pptv.com/
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    PP视频     Tango Secure Gateway CA
-    ...    ELSE    Create List    PP视频    Tango Secure Gateway CA
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    首页     Tango Secure Gateway CA
+    ...    ELSE    Create List    首页    Tango Secure Gateway CA
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
 
 Proxy-Policy-Monitor-00008
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_Monitor_00008.bat
-    ...    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 'https://www.baidu.com/' http://www.zhenai.com/
+    ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_Monitor_00008_L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Tango    珍爱网-征婚
     ...    ELSE    Create List    Tango    珍爱网-征婚
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
@@ -136,7 +136,7 @@ Proxy-Policy-Monitor-00008
     sleep    5
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_Monitor_00008_1.bat
-    ...    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 'https://www.baidu.com/' https://love.163.com/
+    ...    ELSE    set variable    ${curlbatpath}/command/ProxyPolicy_Monitor_00008_1L.bat
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Tango    花田,网易
     ...    ELSE    Create List    Tango    花田,网易
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Rtp_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_Rtp_Tests_Verify.robot
index ed73835..ef4ebe0 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Rtp_Tests_Verify.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Rtp_Tests_Verify.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Test Teardown     DeletePolicyAndGroupObject    ${policyIds}    ${objectids}
-Force Tags        tsg_bf_api    Trusted_Certificate_Authorities
+Force Tags        tsg_adc_wp    tsg_bf_api    Trusted_Certificate_Authorities
 Library           String
 Library           OperatingSystem
 Library           Selenium2Library
diff --git a/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot
index d53862c..1a9160b 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags        tsg_bf_api    Trusted_Certificate_Authorities
+Force Tags        tsg_adc_wp    tsg_bf_api    Trusted_Certificate_Authorities
 Library           String
 Library           OperatingSystem
 Library           Selenium2Library
diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot
index 0906f8c..2be21e8 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot
@@ -63,7 +63,7 @@ SecurityPolicy-Allow-Sip-00001-4
    
 SecurityPolicy-Allow-Sip-00002
     #删除对象
-    ${objectids}    set Variable    ${allow_sip_objectId9}
+    ${objectids}    set Variable    ${allow_sip_objectId0209}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${allow_sip_objectId1201}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_sip_policyId11}]}
@@ -87,7 +87,7 @@ SecurityPolicy-Allow-Sip-00003
     #GetLogList    security_event_log    ${starttime}    ${endtime}    ${voipCallIp}    ${s}    common_action    allow
     
 SecurityPolicy-Allow-Sip-00004
-    ${objectids}    set Variable    ${allow_sip_objectId1}
+    ${objectids}    set Variable    ${allow_sip_objectId401}
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_sip_policyId3}]}
     ${s}    Convert to String    ${allow_sip_policyId3}
     #GetLogList    security_event_log    ${starttime}    ${endtime}    ${voipCallIp}    ${s}    common_action    allow
@@ -134,11 +134,11 @@ SecurityPolicy-Allow-Sip-000011
     ${s}    Convert to String    ${allow_sip_policyId10}
     #GetLogList    security_event_log    ${starttime}    ${endtime}    ${voipCallIp}    ${s}    common_action    allow
     
-SecurityPolicy-Allow-Sip-00002
+SecurityPolicy-Allow-Sip-00003
     ${objectids}    set Variable    ${allow_sip_objectId9}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${allow_sip_objectId1201}
-    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_sip_policyId11}]}
-    ${s}    Convert to String    ${allow_sip_policyId11}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${allow_sip_objectId0301}
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_sip_policyId0301}]}
+    ${s}    Convert to String    ${allow_sip_policyId0301}
     GetLogList    security_event_log    ${starttime}    ${endtime}    ${voipCallIp}    ${s}    voip_calling_account    test4
     
 SecurityPolicy-Allow-Sip-000013
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 1df9de8..8ca5aba 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
@@ -147,7 +147,7 @@ SecurityPolicy-Deny-Http-00014
     #删除对象
     ${objectids}    set Variable    ${deny_http_objectId21}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId40}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId42}
+    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId431}
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId13}]}
     ${s}    Convert to String    ${deny_http_policyId13}
@@ -208,6 +208,6 @@ SecurityPolicy-Deny-Http-00020
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId44}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_http_objectId45}
     #删除策略
-    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId17}]}
-    ${s}    Convert to String    ${deny_http_policyId17}
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId19}]}
+    ${s}    Convert to String    ${deny_http_policyId19}
     GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.xinhuanet.com
\ No newline at end of file
diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot
index 5b12861..e7da875 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot
@@ -221,7 +221,6 @@ Proxy-Policy-deny-00016
     #删除对象
     ${objectids}    set Variable    ${deny_objectId47}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_objectId58}
-    ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${deny_objectId59}
     #删除策略
     ${policyId1}    set Variable    {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId15}]}
     ${policyId2}    set Variable    {"policyType":"pxy_manipulation","policyIds":[${deny_policyId17}]}
diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot
index 42b99ca..f71217a 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot
@@ -39,7 +39,7 @@ SecurityPolicy-Monitor-Ssl-00003
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId2}]}
     ${s}    Convert to String    ${monitor_ssl_policyId2}
     GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    ssl_sni    www.academia.org
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    ssl_sni    proisraelforever
+    # GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    ssl_sni    proisraelforever
 
 SecurityPolicy-Monitor-Ssl-00004
     #删除对象