diff --git a/01-TestCase/tsg_adc/Wan_Nat/Snat_00001.robot b/01-TestCase/tsg_adc/Wan_Nat/Snat_00001.robot
index 23eb64f..8d5f9d0 100644
--- a/01-TestCase/tsg_adc/Wan_Nat/Snat_00001.robot
+++ b/01-TestCase/tsg_adc/Wan_Nat/Snat_00001.robot
@@ -1,6 +1,7 @@
 *** Settings ***
+Documentation     snat运行需要先运行a，然后将连接vpn后，运行b和c
 Test Teardown     DeletePolicyAndObjectAndIPpoor    ${policyIds}    ${wan_ippoor}
-Force Tags        tsg_adc_wp    adc_api    wan_nat
+Force Tags        wan_nat
 Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_adc/SystemCommand.robot
 Resource          ../../../02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -35,31 +36,31 @@ b_wan_nat-snat-00001
     [Tags]    Never+IP Pools内单个IP
     Comment    功能端验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/wan_nat_sant_00001.bat
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Welcome to nginx HTTP
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    一号店
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/wan_nat_sant_00002.bat
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    self signed certificate
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    北京租房网
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证
-    ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup test.com
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    114.114.114.114
+    ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup vip.com
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    183.6.216.41
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证
-    ${FTP}    FTP_login    ftp://192.168.44.8/test.txt -u"ftpuser:123456"    123456
+    ${FTP}    FTP_login    ftp://192.168.100.5/stamp.txt -u"ftp_user:qazXSW@edc"    Shandong Province
     should contain    ${FTP}    ftp_success
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    192.168.40.156
+    ${Smtp服务器}    Set Variable    Smtp.163.com
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    yyq@163.com
-    ${邮箱密码}    Set Variable    111111
-    ${邮件主题}    Set Variable    你好明天
-    ${发送者}    Set Variable    yyq@163.com
-    ${附件}    Set Variable    ["${mailpath}/朱明明测试文件.txt"]
-    ${接收者}    Set Variable    ["zmm@163.com"]
-    ${抄送者}    Set Variable    ["zmm@163.com"]
-    ${密送者}    Set Variable    ["zmm@163.com"]
-    ${邮件正文}    Set Variable    朱明明content
+    ${邮箱账号}    Set Variable    13103304145@163.com
+    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮件主题}    Set Variable    123123132
+    ${发送者}    Set Variable    13103304145@163.com
+    ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
+    ${接收者}    Set Variable    ["nqgjs6@163.com"]
+    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
+    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${邮件正文}    Set Variable    zzzzzzz
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
     should contain    ${发送邮件返回结果}    mail_success
diff --git a/01-TestCase/tsg_adc/Wan_Nat/Snat_00002.robot b/01-TestCase/tsg_adc/Wan_Nat/Snat_00002.robot
index 4b362ec..80c55f1 100644
--- a/01-TestCase/tsg_adc/Wan_Nat/Snat_00002.robot
+++ b/01-TestCase/tsg_adc/Wan_Nat/Snat_00002.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Test Teardown     DeletePolicyAndObjectAndIPpoor    ${policyIds}    ${wan_ippoor}
-Force Tags        tsg_adc_wp    adc_api    wan_nat
+Force Tags        wan_nat
 Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_adc/SystemCommand.robot
 Resource          ../../../02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -47,31 +47,31 @@ b_wan_nat-snat-00002
     [Tags]    Never+IP Pools内单个IP
     Comment    功能端验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/wan_nat_sant_00001.bat
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Welcome to nginx HTTP
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    一号店
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/wan_nat_sant_00002.bat
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    self signed certificate
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    北京租房网
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证
-    ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup test.com
-    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    202.106.196.115
+    ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    nslookup vip.com
+    ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    183.6.216.41
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
     Comment    功能端验证
-    ${FTP}    FTP_login    ftp://192.168.44.8/test.txt -u"ftpuser:123456"    123456
+    ${FTP}    FTP_login    ftp://192.168.100.5/stamp.txt -u"ftp_user:qazXSW@edc"    Shandong Province
     should contain    ${FTP}    ftp_success
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    192.168.40.156
+    ${Smtp服务器}    Set Variable    Smtp.163.com
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    yyq@163.com
-    ${邮箱密码}    Set Variable    111111
-    ${邮件主题}    Set Variable    你好明天
-    ${发送者}    Set Variable    yyq@163.com
-    ${附件}    Set Variable    ["${mailpath}/朱明明测试文件.txt"]
-    ${接收者}    Set Variable    ["zmm@163.com"]
-    ${抄送者}    Set Variable    ["zmm@163.com"]
-    ${密送者}    Set Variable    ["zmm@163.com"]
-    ${邮件正文}    Set Variable    朱明明content
+    ${邮箱账号}    Set Variable    13103304145@163.com
+    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮件主题}    Set Variable    123123132
+    ${发送者}    Set Variable    13103304145@163.com
+    ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
+    ${接收者}    Set Variable    ["nqgjs6@163.com"]
+    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
+    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${邮件正文}    Set Variable    zzzzzzz
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
     should contain    ${发送邮件返回结果}    mail_success
diff --git a/01-TestCase/tsg_adc/multi_step/a_Dnat_Tests.robot b/01-TestCase/tsg_adc/Wan_Nat/a_Dnat_Tests.robot
similarity index 92%
rename from 01-TestCase/tsg_adc/multi_step/a_Dnat_Tests.robot
rename to 01-TestCase/tsg_adc/Wan_Nat/a_Dnat_Tests.robot
index 28d132e..206beb9 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Dnat_Tests.robot
+++ b/01-TestCase/tsg_adc/Wan_Nat/a_Dnat_Tests.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags        tsg_adc_wp    adc_api    wan_nat
+Force Tags        wan_nat
 Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_adc/SystemCommand.robot
 Resource          ../../../02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -11,12 +11,12 @@ Resource          ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot
 *** Test Cases ***
 wan_nat-dnat-00001
     Comment    创建IP
-    ${addItemList1}    Create Dictionary    isSession=endpoint    ip=219.157.114.43-219.157.114.43    port=0-0    direction=0    protocol=0    isInitialize=0
+    ${addItemList1}    Create Dictionary    isSession=endpoint    ip=219.157.114.43/24    port=0-0    direction=0    protocol=0    isInitialize=0
     ${addItemLists}    Create list    ${addItemList1}
     ${objectDict}    Create Dictionary    objectType=ip    isValid=${1}    addItemList=${addItemLists}
     ${rescode}    ${objectId}    AddObjects    ${1}    ${objectDict}
     Comment    创建dnat策略
-    ${policyDict}    Create Dictionary    policyName=wan_nat_dnat-00001    policyType=wannat    policyDesc=autotest    action=wannat    userRegion={"method":"dnat","dnat_vpn_user_account":"jwc-vpn","dnat_destination_port":80,"dnat_when_vpn_offline":"drop"}    isValid=${1}    destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR
+    ${policyDict}    Create Dictionary    policyName=wan_nat_dnat-00001    policyType=wannat    policyDesc=autotest    action=wannat    userRegion={"method":"dnat","dnat_vpn_user_account":"44.8","dnat_destination_port":80,"dnat_when_vpn_offline":"drop"}    isValid=${1}    destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR
     log    ${policyDict}
     ${rescode}    ${policyId2}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    dnat_objectId    ${objectId}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Dnat_Tests.robot b/01-TestCase/tsg_adc/Wan_Nat/b_Dnat_Tests.robot
similarity index 95%
rename from 01-TestCase/tsg_adc/multi_step/b_Dnat_Tests.robot
rename to 01-TestCase/tsg_adc/Wan_Nat/b_Dnat_Tests.robot
index 7020e7f..4906e65 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Dnat_Tests.robot
+++ b/01-TestCase/tsg_adc/Wan_Nat/b_Dnat_Tests.robot
@@ -1,16 +1,15 @@
 *** Settings ***
-Force Tags        tsg_adc_wp    proxy_policy    adc_verify
 Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_adc/SystemCommand.robot
 Resource          ../../../02-Keyword/tsg_bfapi/PolicyObject.robot
 Resource          ../../../02-Keyword/tsg_bfapi/LogVariable.robot
 Resource          ../../../02-Keyword/tsg_adc/FileOperation.robot
+Library           Custometest
 
 *** Test Cases ***
 wan_nat-dnat-00001
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/wan_nat_dant_00001.bat
-    ...    ELSE    set variable    curl 219.157.114.43
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    Welcome to nginx HTTP!
     ...    ELSE    Create List    Welcome to nginx HTTP!
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
diff --git a/01-TestCase/tsg_adc/multi_step/c_Dnat_Tests.robot b/01-TestCase/tsg_adc/Wan_Nat/c_Dnat_Tests.robot
similarity index 96%
rename from 01-TestCase/tsg_adc/multi_step/c_Dnat_Tests.robot
rename to 01-TestCase/tsg_adc/Wan_Nat/c_Dnat_Tests.robot
index e082b64..e88c06f 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Dnat_Tests.robot
+++ b/01-TestCase/tsg_adc/Wan_Nat/c_Dnat_Tests.robot
@@ -1,6 +1,5 @@
 *** Settings ***
 Test Teardown     DeletePolicyAndObject    ${policyIds}    ${objectids}
-Force Tags        tsg_adc_wp    adc_log    proxy_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/a_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot
index c9dfbb5..55c2b0d 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot
@@ -29,5 +29,17 @@ SecurityPolicy-Allow-Http-00002
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Allow-Http-00002    policyType=tsg_security    policyDesc=autotest    action=allow    userRegion={"protocol":"HTTP"}    filterList=${objectId}|TSG_FIELD_HTTP_HOST    isValid=${1}    appIdObjects=2
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
-    insert_policyId_to_file1    allow_http_objectId    ${objectId}
-    insert_policyId_to_file1    allow_http_policyId    ${policyId}
+    insert_policyId_to_file1    allow_http_objectId1    ${objectId}
+    insert_policyId_to_file1    allow_http_policyId1    ${policyId}
+
+SecurityPolicy-Allow-Http-00003
+    [Tags]    cat完整匹配
+    Comment    创建fqdn
+    ${objectDict}    Create Dictionary    objectType=fqdn_category    isValid=${1}    addItemList=$192.168.40.120
+    ${rescode}    ${objectId}    AddObject2    ${1}    ${objectDict}
+    Comment    创建安全策略
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Allow-Http-00003    policyType=tsg_security    policyDesc=autotest    action=allow    userRegion={"protocol":"HTTP"}    filterList=${objectId}|TSG_FIELD_HTTP_HOST    isValid=${1}    appIdObjects=2
+    log    ${policyDict}
+    ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
+    insert_policyId_to_file1    allow_http_objectId2    ${objectId}
+    insert_policyId_to_file1    allow_http_policyId2    ${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 7ab5590..f49cb86 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
@@ -90,7 +90,7 @@ SecurityPolicy-Deny-Http-00006
     ${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
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=mondomedia.com
     ${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,${object_url_Id}|TSG_FIELD_HTTP_URL    isValid=${1}    appIdObjects=2
@@ -106,7 +106,7 @@ SecurityPolicy-Deny-Http-00007
     ${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
+    ${objectDict}    Create Dictionary    objectType=url    isValid=${1}    addItemList=*download.shtml
     ${rescode}    ${object_url_Id}    AddObject2    ${1}    ${objectDict}
     #创建引用文件
     ${response}    CreatePolicyFile2    ${url}    ${responsePageFiles}    404china.html    resPages
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 bedf997..0449c23 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
@@ -37,7 +37,7 @@ SecurityPolicy-Monitor-Mail-00003
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=*асятся
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建From
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*163.com
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*tsgmail.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
@@ -52,7 +52,7 @@ SecurityPolicy-Monitor-Mail-00004
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=$后天周末
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建From
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$13103304145@163.com
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$jwctest@mail.tsgmail.com
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00004    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
@@ -67,7 +67,7 @@ SecurityPolicy-Monitor-Mail-00005
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=210zxcv
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建From
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=13103304145
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=jwctes
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00005    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
@@ -82,7 +82,7 @@ SecurityPolicy-Monitor-Mail-00006
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=Tomor*
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建From
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=1310330*
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=jwctest*
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00006    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
@@ -97,7 +97,7 @@ SecurityPolicy-Monitor-Mail-00007
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=*ируете
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建To
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*3.com
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*mail.tsgmail.com
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -112,7 +112,7 @@ SecurityPolicy-Monitor-Mail-00008
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=$asdf741852
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建To
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$nqgjs6@163.com
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$zmmtest@mail.tsgmail.com
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -127,7 +127,7 @@ SecurityPolicy-Monitor-Mail-00009
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=又过一天
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建To
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=nqgjs6
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=zmmtest@mail.tsgmail.com
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -142,7 +142,7 @@ SecurityPolicy-Monitor-Mail-00010
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=weeke*
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建To
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=nqgjs*
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=zmmtes*
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -157,7 +157,7 @@ SecurityPolicy-Monitor-Mail-00011
     ${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=*45@163.com
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*ail.tsgmail.com
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -172,7 +172,7 @@ SecurityPolicy-Monitor-Mail-00012
     ${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=$13103304145@163.com
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$jwctest@mail.tsgmail.com
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -187,7 +187,7 @@ SecurityPolicy-Monitor-Mail-00013
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=258zxc
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建Account
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=13103304145@
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=jwctest@mail
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -202,7 +202,7 @@ SecurityPolicy-Monitor-Mail-00014
     ${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=13103304*
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=jwctest*
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=5
@@ -217,7 +217,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=13103304*
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=jwctest*
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建Content
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=good
@@ -226,10 +226,10 @@ SecurityPolicy-Monitor-Mail-00015
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=Простопорно
     ${rescode}    ${object_ATT_CONT_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建From
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=1310330
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=jwctes
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建To
-    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=nqgjs6
+    ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=zmmtest
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
     ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00015    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT,${object_Content_Id}|TSG_FIELD_MAIL_CONTENT,${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT,${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=5
diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot
index 78cd5ea..570cccc 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot
@@ -10,7 +10,7 @@ Resource          ../../../02-Keyword/tsg_adc/FileOperation.robot
 SecurityPolicy-Allow-Http-00001
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Allow_HTTP_00001.bat
-    ...    ELSE    set variable    curl \ http://clintonairport.com/airlines-flights/covid/
+    ...    ELSE    set variable    curl -L http://clintonairport.com/airlines-flights/covid/
     ${stringlist}    run keyword if    '${systemType}'=='Windows'    Create List    COVID
     ...    ELSE    Create List    COVID
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
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 90cee7b..bad4a2e 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot
@@ -19,8 +19,8 @@ Proxy-Policy-allow-00002
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/ProxyPolicy_allow_00002.bat
     ...    ELSE    set variable    curl -kv https://www.feishu.cn/solutions/scenarios/remote-work
-    ${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    www.feishu.cn    Tango Secure Gateway CA
+    ...    ELSE    Create List    www.feishu.cn    Tango Secure Gateway CA
     ${rescode}    SystemCommands    ${commandstr}    ${stringlist}
 
 Proxy-Policy-allow-00003
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 c515fe8..9f85aef 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
@@ -76,7 +76,7 @@ SecurityPolicy-Deny-Http-00006
 SecurityPolicy-Deny-Http-00007
     Comment    功能端验证HTTP验证
     ${commandstr}    run keyword if    '${systemType}'=='Windows'    set variable    ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_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 'http://www.baidu.com/' \http://www.destination360.com/travel/destinations
+    ...    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.gw.com.cn/download.shtml
     ${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_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
index 90d4c96..d35f0f9 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
@@ -10,16 +10,16 @@ Resource          ../../../02-Keyword/tsg_common/StmpHandle.robot
 *** Test Cases ***
 SecurityPolicy-Momitor-Mail-00001
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    123123132
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    zzzzzzz
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -27,16 +27,16 @@ SecurityPolicy-Momitor-Mail-00001
 
 SecurityPolicy-Momitor-Mail-00002
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    Простопорно
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/朱明明测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -44,16 +44,16 @@ SecurityPolicy-Momitor-Mail-00002
 
 SecurityPolicy-Momitor-Mail-00003
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    Согласятся
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -61,16 +61,16 @@ SecurityPolicy-Momitor-Mail-00003
 
 SecurityPolicy-Momitor-Mail-00004
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    后天周末
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -78,16 +78,16 @@ SecurityPolicy-Momitor-Mail-00004
 
 SecurityPolicy-Momitor-Mail-00005
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    9876543210zxcv
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -95,16 +95,16 @@ SecurityPolicy-Momitor-Mail-00005
 
 SecurityPolicy-Momitor-Mail-00006
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    Tomorrow
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -112,16 +112,16 @@ SecurityPolicy-Momitor-Mail-00006
 
 SecurityPolicy-Momitor-Mail-00007
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    планируете
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -129,16 +129,16 @@ SecurityPolicy-Momitor-Mail-00007
 
 SecurityPolicy-Momitor-Mail-00008
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    asdf741852
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -146,16 +146,16 @@ SecurityPolicy-Momitor-Mail-00008
 
 SecurityPolicy-Momitor-Mail-00009
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    马上又过一天
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -163,16 +163,16 @@ SecurityPolicy-Momitor-Mail-00009
 
 SecurityPolicy-Momitor-Mail-00010
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    weekend
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -180,16 +180,16 @@ SecurityPolicy-Momitor-Mail-00010
 
 SecurityPolicy-Momitor-Mail-00011
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    邮件发送成功
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -197,16 +197,16 @@ SecurityPolicy-Momitor-Mail-00011
 
 SecurityPolicy-Momitor-Mail-00012
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    ограничительным
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -214,16 +214,16 @@ SecurityPolicy-Momitor-Mail-00012
 
 SecurityPolicy-Momitor-Mail-00013
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    963258zxcvb
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -231,16 +231,16 @@ SecurityPolicy-Momitor-Mail-00013
 
 SecurityPolicy-Momitor-Mail-00014
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    一小时一天一个月
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${抄送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
+    ${密送者}    Set Variable    ["zmmtest@mail.tsgmail.com"]
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
@@ -248,16 +248,16 @@ SecurityPolicy-Momitor-Mail-00014
 
 SecurityPolicy-Momitor-Mail-00015
     Comment    功能端验证
-    ${Smtp服务器}    Set Variable    Smtp.163.com
+    ${Smtp服务器}    Set Variable    192.168.100.5
     ${Smtp服务器端口}    Set Variable    25
-    ${邮箱账号}    Set Variable    13103304145@163.com
-    ${邮箱密码}    Set Variable    jwc0409.
+    ${邮箱账号}    Set Variable    jwctest@mail.tsgmail.com
+    ${邮箱密码}    Set Variable    jwctest
     ${邮件主题}    Set Variable    要留清白在人间
-    ${发送者}    Set Variable    13103304145@163.com
+    ${发送者}    Set Variable    jwctest@mail.tsgmail.com
     ${附件}    Set Variable    ["${mailpath}/姬巍川测试文件.txt"]
-    ${接收者}    Set Variable    ["nqgjs6@163.com"]
-    ${抄送者}    Set Variable    ["nqgjs6@163.com"]
-    ${密送者}    Set Variable    ["nqgjs6@163.com"]
+    ${接收者}    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    ${发送邮件返回结果}
diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot
index a8abdac..b767497 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot
@@ -29,3 +29,9 @@ SecurityPolicy-Allow-Http-00002
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_http_policyId1}]}
     ${s}    Convert to String    ${allow_http_policyId1}
     GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.airpano.com
+
+SecurityPolicy-Allow-Http-00003
+    #删除对象
+    ${objectids}    set Variable    ${allow_http_objectId2}
+    #删除策略
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_http_policyId2}]}
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 fda5584..6bdcd72 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
@@ -81,7 +81,7 @@ SecurityPolicy-Deny-Http-00007
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_http_policyId6}]}
     ${s}    Convert to String    ${deny_http_policyId6}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    destination360.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    http_host    www.gw.com.cn
 
 SecurityPolicy-Deny-Http-00008
     #删除对象
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 9b0abfc..d957667 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
@@ -20,7 +20,7 @@ SecurityPolicy-Monitor-Mail-00001
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId}]}
     ${s}    Convert to String    ${monitor_mail_policyId}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00002
     #删除对象
@@ -28,7 +28,7 @@ SecurityPolicy-Monitor-Mail-00002
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId1}]}
     ${s}    Convert to String    ${monitor_mail_policyId1}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00003
     #删除对象
@@ -37,7 +37,7 @@ SecurityPolicy-Monitor-Mail-00003
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId2}]}
     ${s}    Convert to String    ${monitor_mail_policyId2}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00004
     #删除对象
@@ -46,7 +46,7 @@ SecurityPolicy-Monitor-Mail-00004
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId3}]}
     ${s}    Convert to String    ${monitor_mail_policyId3}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00005
     #删除对象
@@ -55,7 +55,7 @@ SecurityPolicy-Monitor-Mail-00005
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId4}]}
     ${s}    Convert to String    ${monitor_mail_policyId4}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00006
     #删除对象
@@ -64,7 +64,7 @@ SecurityPolicy-Monitor-Mail-00006
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId5}]}
     ${s}    Convert to String    ${monitor_mail_policyId5}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00007
     #删除对象
@@ -73,7 +73,7 @@ SecurityPolicy-Monitor-Mail-00007
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId6}]}
     ${s}    Convert to String    ${monitor_mail_policyId6}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00008
     #删除对象
@@ -82,7 +82,7 @@ SecurityPolicy-Monitor-Mail-00008
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId7}]}
     ${s}    Convert to String    ${monitor_mail_policyId7}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00009
     #删除对象
@@ -91,7 +91,7 @@ SecurityPolicy-Monitor-Mail-00009
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId8}]}
     ${s}    Convert to String    ${monitor_mail_policyId8}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00010
     #删除对象
@@ -100,7 +100,7 @@ SecurityPolicy-Monitor-Mail-00010
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId9}]}
     ${s}    Convert to String    ${monitor_mail_policyId9}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00011
     #删除对象
@@ -109,7 +109,7 @@ SecurityPolicy-Monitor-Mail-00011
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId10}]}
     ${s}    Convert to String    ${monitor_mail_policyId10}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00012
     #删除对象
@@ -118,7 +118,7 @@ SecurityPolicy-Monitor-Mail-00012
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId11}]}
     ${s}    Convert to String    ${monitor_mail_policyId11}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00013
     #删除对象
@@ -127,7 +127,7 @@ SecurityPolicy-Monitor-Mail-00013
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId12}]}
     ${s}    Convert to String    ${monitor_mail_policyId12}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00014
     #删除对象
@@ -136,7 +136,7 @@ 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    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
 
 SecurityPolicy-Monitor-Mail-00015
     #删除对象
@@ -149,4 +149,4 @@ SecurityPolicy-Monitor-Mail-00015
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId14}]}
     ${s}    Convert to String    ${monitor_mail_policyId14}
-    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    13103304145@163.com
+    GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
diff --git a/05-Other/curl/command/SecurityPolicy_Allow_HTTP_00001.bat b/05-Other/curl/command/SecurityPolicy_Allow_HTTP_00001.bat
index 8e63b6a..31b96ed 100644
--- a/05-Other/curl/command/SecurityPolicy_Allow_HTTP_00001.bat
+++ b/05-Other/curl/command/SecurityPolicy_Allow_HTTP_00001.bat
@@ -1 +1 @@
-curl  http://clintonairport.com/airlines-flights/covid/ | iconv -f utf-8 -t gbk
\ No newline at end of file
+curl -L http://clintonairport.com/airlines-flights/covid/ | iconv -f utf-8 -t gbk
\ No newline at end of file
diff --git a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00007.bat b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00007.bat
index 0790784..24134ba 100644
--- a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00007.bat
+++ b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00007.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.destination360.com/travel/destinations | iconv -f utf-8 -t gbk
\ No newline at end of file
+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.gw.com.cn/download.shtml | iconv -f utf-8 -t gbk
\ No newline at end of file
diff --git a/05-Other/curl/command/wan_nat_sant_00001.bat b/05-Other/curl/command/wan_nat_sant_00001.bat
index 0944a1d..b93eac0 100644
--- a/05-Other/curl/command/wan_nat_sant_00001.bat
+++ b/05-Other/curl/command/wan_nat_sant_00001.bat
@@ -1 +1 @@
-curl http://192.168.40.156/ | iconv -f utf-8 -t gbk
\ No newline at end of file
+curl https://www.yhd.com | iconv -f utf-8 -t gbk
\ No newline at end of file
diff --git a/05-Other/curl/command/wan_nat_sant_00002.bat b/05-Other/curl/command/wan_nat_sant_00002.bat
index 802ce42..9cb02f5 100644
--- a/05-Other/curl/command/wan_nat_sant_00002.bat
+++ b/05-Other/curl/command/wan_nat_sant_00002.bat
@@ -1 +1 @@
-curl https://192.168.40.156/ | iconv -f utf-8 -t gbk
\ No newline at end of file
+curl http://www.ziroom.com/ | iconv -f utf-8 -t gbk
\ No newline at end of file