diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot
index a44a9f3..8072b94 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot
@@ -16,7 +16,8 @@ SecurityPolicy-Deny-Mail-00001
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=стопо
     ${rescode}    ${object_Content_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"block","code":550}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00001dxytest    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
+    #userRegion={"protocol":"MAIL","method":"block","code":550}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId    ${object_Content_Id}
     insert_policyId_to_file1    deny_mail_policyId    ${policyId}
@@ -27,7 +28,7 @@ SecurityPolicy-Deny-Mail-00002
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=Простопорно
     ${rescode}    ${object_ATT_CONT_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId1    ${object_ATT_CONT_Id}
     insert_policyId_to_file1    deny_mail_policyId1    ${policyId}
@@ -41,7 +42,7 @@ SecurityPolicy-Deny-Mail-00003
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*163.com
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId2    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId3    ${object_From_Id}
@@ -56,7 +57,7 @@ SecurityPolicy-Deny-Mail-00004
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$13103304145@163.com
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId4    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId5    ${object_From_Id}
@@ -71,7 +72,7 @@ SecurityPolicy-Deny-Mail-00005
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=13103304145
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId6    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId7    ${object_From_Id}
@@ -86,7 +87,7 @@ SecurityPolicy-Deny-Mail-00006
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=1310330*
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00006    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00006    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId8    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId9    ${object_From_Id}
@@ -101,7 +102,7 @@ SecurityPolicy-Deny-Mail-00007
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*3.com
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId10    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId11    ${object_To_Id}
@@ -116,7 +117,7 @@ SecurityPolicy-Deny-Mail-00008
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$nqgjs6@163.com
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId12    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId13    ${object_To_Id}
@@ -131,7 +132,7 @@ SecurityPolicy-Deny-Mail-00009
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=nqgjs6
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId14    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId15    ${object_To_Id}
@@ -146,7 +147,7 @@ SecurityPolicy-Deny-Mail-00010
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=nqgjs*
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId16    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId17    ${object_To_Id}
@@ -161,7 +162,7 @@ SecurityPolicy-Deny-Mail-00011
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=*45@163.com
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId18    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId19    ${object_Account_Id}
@@ -176,7 +177,7 @@ SecurityPolicy-Deny-Mail-00012
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=$13103304145@163.com
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId20    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId21    ${object_Account_Id}
@@ -191,7 +192,7 @@ SecurityPolicy-Deny-Mail-00013
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=13103304145@
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId22    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId23    ${object_Account_Id}
@@ -206,7 +207,7 @@ SecurityPolicy-Deny-Mail-00014
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=13103304*
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId24    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId25    ${object_Account_Id}
@@ -233,7 +234,7 @@ SecurityPolicy-Deny-Mail-00015
     ${objectDict}    Create Dictionary    objectType=account    isValid=${1}    addItemList=nqgjs6
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00015    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00015    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    deny_mail_objectId26    ${object_Subject_Id}
     insert_policyId_to_file1    deny_mail_objectId27    ${object_Content_Id}
diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot
index e7ce4cb..41036df 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
@@ -16,7 +16,7 @@ SecurityPolicy-Monitor-Mail-00001
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=zzzzz
     ${rescode}    ${object_Content_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId    ${object_Content_Id}
     insert_policyId_to_file1    monitor_mail_policyId    ${policyId}
@@ -27,7 +27,7 @@ SecurityPolicy-Monitor-Mail-00002
     ${objectDict}    Create Dictionary    objectType=keywords    isValid=${1}    addItemList=朱明明测试文件
     ${rescode}    ${object_ATT_CONT_Id}    AddObject2    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId1    ${object_ATT_CONT_Id}
     insert_policyId_to_file1    monitor_mail_policyId1    ${policyId}
@@ -41,7 +41,7 @@ SecurityPolicy-Monitor-Mail-00003
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId2    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId3    ${object_From_Id}
@@ -56,7 +56,7 @@ SecurityPolicy-Monitor-Mail-00004
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId4    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId5    ${object_From_Id}
@@ -71,7 +71,7 @@ SecurityPolicy-Monitor-Mail-00005
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId6    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId7    ${object_From_Id}
@@ -86,7 +86,7 @@ SecurityPolicy-Monitor-Mail-00006
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId8    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId9    ${object_From_Id}
@@ -101,7 +101,7 @@ SecurityPolicy-Monitor-Mail-00007
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId10    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId11    ${object_To_Id}
@@ -116,7 +116,7 @@ SecurityPolicy-Monitor-Mail-00008
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId12    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId13    ${object_To_Id}
@@ -131,7 +131,7 @@ SecurityPolicy-Monitor-Mail-00009
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId14    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId15    ${object_To_Id}
@@ -146,7 +146,7 @@ SecurityPolicy-Monitor-Mail-00010
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId16    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId17    ${object_To_Id}
@@ -161,7 +161,7 @@ SecurityPolicy-Monitor-Mail-00011
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId18    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId19    ${object_Account_Id}
@@ -176,7 +176,7 @@ SecurityPolicy-Monitor-Mail-00012
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId20    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId21    ${object_Account_Id}
@@ -191,7 +191,7 @@ SecurityPolicy-Monitor-Mail-00013
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId22    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId23    ${object_Account_Id}
@@ -206,7 +206,7 @@ SecurityPolicy-Monitor-Mail-00014
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId24    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId25    ${object_Account_Id}
@@ -233,7 +233,7 @@ SecurityPolicy-Monitor-Mail-00015
     ${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=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     insert_policyId_to_file1    monitor_mail_objectId26    ${object_Subject_Id}
     insert_policyId_to_file1    monitor_mail_objectId27    ${object_Content_Id}
diff --git a/01-TestCase/tsg_adc/selfserver/Api_Security/Allow_Mail_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Security/Allow_Mail_Tests.robot
index 4904aed..62c87a5 100644
--- a/01-TestCase/tsg_adc/selfserver/Api_Security/Allow_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/selfserver/Api_Security/Allow_Mail_Tests.robot
@@ -19,7 +19,7 @@ ${objectids}      ${EMPTY}
 *** Test Cases ***
 SecurityPolicy-Allow-Mail-00001
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Allow-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=allow    userRegion={"protocol":"MAIL"}    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Allow-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=allow    userRegion={"protocol":"MAIL"}    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
diff --git a/01-TestCase/tsg_adc/selfserver/Api_Security/Deny_MAIL_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Security/Deny_MAIL_Tests.robot
index 8128d7a..d870de5 100644
--- a/01-TestCase/tsg_adc/selfserver/Api_Security/Deny_MAIL_Tests.robot
+++ b/01-TestCase/tsg_adc/selfserver/Api_Security/Deny_MAIL_Tests.robot
@@ -24,7 +24,7 @@ SecurityPolicy-Deny-Mail-00001
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"block","code":550}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"block","code":550}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -58,7 +58,7 @@ SecurityPolicy-Deny-Mail-00002
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -92,7 +92,7 @@ SecurityPolicy-Deny-Mail-00003
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -126,7 +126,7 @@ SecurityPolicy-Deny-Mail-00004
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00004    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -160,7 +160,7 @@ SecurityPolicy-Deny-Mail-00005
     ${rescode}    ${object_Content_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Content_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"block","code":551}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"block","code":551}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -194,7 +194,7 @@ SecurityPolicy-Deny-Mail-00006
     ${rescode}    ${object_ATT_CONT_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_ATT_CONT_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00006    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00006    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -228,7 +228,7 @@ SecurityPolicy-Deny-Mail-00007
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -262,7 +262,7 @@ SecurityPolicy-Deny-Mail-00008
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -296,7 +296,7 @@ SecurityPolicy-Deny-Mail-00009
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -330,7 +330,7 @@ SecurityPolicy-Deny-Mail-00010
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -364,7 +364,7 @@ SecurityPolicy-Deny-Mail-00011
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -398,7 +398,7 @@ SecurityPolicy-Deny-Mail-00012
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -432,7 +432,7 @@ SecurityPolicy-Deny-Mail-00013
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -466,7 +466,7 @@ SecurityPolicy-Deny-Mail-00014
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -500,7 +500,7 @@ SecurityPolicy-Deny-Mail-00015
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00015    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00015    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -534,7 +534,7 @@ SecurityPolicy-Deny-Mail-00016
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00016    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00016    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -568,7 +568,7 @@ SecurityPolicy-Deny-Mail-00017
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00017    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00017    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -602,7 +602,7 @@ SecurityPolicy-Deny-Mail-00018
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00018    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00018    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -656,7 +656,7 @@ SecurityPolicy-Deny-Mail-00019
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00019    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT,${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Content_Id}|TSG_FIELD_MAIL_CONTENT,${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_To_Id}|TSG_FIELD_MAIL_TO,${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00019    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT,${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Content_Id}|TSG_FIELD_MAIL_CONTENT,${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_To_Id}|TSG_FIELD_MAIL_TO,${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -700,7 +700,7 @@ SecurityPolicy-Deny-Mail-00020
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00020    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}    source=${objectId}|TSG_SECURITY_SOURCE_ADDR
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00020    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}    source=${objectId}|TSG_SECURITY_SOURCE_ADDR
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -727,7 +727,7 @@ SecurityPolicy-Deny-Mail-00020
     ${s}    Convert to String    ${policyId}
     GetLogList    security_event_log    ${starttime}    ${endtime}    ${testClentIP}    ${s}    mail_account    jwctest@mail.tsgmail.com
     Comment    修改策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00020    policyType=tsg_security    policyDesc=autotest    userTags=    action=deny    effectiveRange=    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}    policyId=${policyId}    source=${objectId}|TSG_SECURITY_SOURCE_ADDR
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-Mail-00020    policyType=tsg_security    policyDesc=autotest    userTags=    action=deny    effectiveRange=    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}    policyId=${policyId}    source=${objectId}|TSG_SECURITY_SOURCE_ADDR
     ${rescode}    UpdatePolicies    1    ${policyDict}    v2    update
     Comment    功能端验证
     ${starttime}    Get Time
diff --git a/01-TestCase/tsg_adc/selfserver/Api_Security/Monitor_MAIL_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Security/Monitor_MAIL_Tests.robot
index 8087b98..2425c1f 100644
--- a/01-TestCase/tsg_adc/selfserver/Api_Security/Monitor_MAIL_Tests.robot
+++ b/01-TestCase/tsg_adc/selfserver/Api_Security/Monitor_MAIL_Tests.robot
@@ -24,7 +24,7 @@ SecurityPolicy-Monitor-Mail-00001
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00001    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -58,7 +58,7 @@ SecurityPolicy-Monitor-Mail-00002
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00002    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -92,7 +92,7 @@ SecurityPolicy-Monitor-Mail-00003
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00003    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -126,7 +126,7 @@ SecurityPolicy-Monitor-Mail-00004
     ${rescode}    ${object_Subject_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Subject_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00004    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00004    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -160,7 +160,7 @@ SecurityPolicy-Monitor-Mail-00005
     ${rescode}    ${object_Content_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Content_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00005    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00005    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -194,7 +194,7 @@ SecurityPolicy-Monitor-Mail-00006
     ${rescode}    ${object_ATT_CONT_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_ATT_CONT_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00006    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00006    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -228,7 +228,7 @@ SecurityPolicy-Monitor-Mail-00007
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00007    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -262,7 +262,7 @@ SecurityPolicy-Monitor-Mail-00008
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00008    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -296,7 +296,7 @@ SecurityPolicy-Monitor-Mail-00009
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00009    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -330,7 +330,7 @@ SecurityPolicy-Monitor-Mail-00010
     ${rescode}    ${object_From_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_From_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00010    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -364,7 +364,7 @@ SecurityPolicy-Monitor-Mail-00011
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00011    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -398,7 +398,7 @@ SecurityPolicy-Monitor-Mail-00012
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00012    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -432,7 +432,7 @@ SecurityPolicy-Monitor-Mail-00013
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00013    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -466,7 +466,7 @@ SecurityPolicy-Monitor-Mail-00014
     ${rescode}    ${object_To_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_To_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00014    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_To_Id}|TSG_FIELD_MAIL_TO    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -500,7 +500,7 @@ SecurityPolicy-Monitor-Mail-00015
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     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    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${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    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -534,7 +534,7 @@ SecurityPolicy-Monitor-Mail-00016
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00016    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00016    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -568,7 +568,7 @@ SecurityPolicy-Monitor-Mail-00017
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00017    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Monitor-Mail-00017    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
@@ -602,7 +602,7 @@ SecurityPolicy-Monitor-Mail-00018
     ${rescode}    ${object_Account_Id}    AddObject2    ${1}    ${objectDict}
     ${objectids}    set Variable    ${object_Account_Id}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-monitor-Mail-00018    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${IMAP_ID},${POP3_ID},${SMTP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-monitor-Mail-00018    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT    isValid=${1}    appIdObjects=${MAIL_ID}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     #删除策略
     ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${policyId}]}
diff --git a/03-Variable/ApplicationID.txt b/03-Variable/ApplicationID.txt
index 20955d8..3548625 100644
--- a/03-Variable/ApplicationID.txt
+++ b/03-Variable/ApplicationID.txt
@@ -3,7 +3,5 @@ ${DNS_ID}      21
 ${FTP_ID}      22
 ${HTTP_ID}      24
 ${SSL_ID}      44
-${IMAP_ID}      26
-${POP3_ID}      34
-${SMTP_ID}      40
+${MAIL_ID}      28