Merge branch 'develop' of https://git.mesalab.cn/dongxiaoyan/tsg_autotest.git into develop

01-TestCase/tsg_ui/ui_administration/LDAPServerCase.robot

@@ -116,7 +116,7 @@ CreateLDAPServerConnectionTimeoutExceedMax
 
 CreateLDAPServerErrorHost
     [Tags]    Negtive    UI    Administration    LDAP Server
-    ${list}    Create List    ${TEST NAME}    192.168.40.12    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
+    ${list}    Create List    ${TEST NAME}    192.168.55.148    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
     CreateLDAPServer       ${list}    NoOKButton=2
     Assertion    /html/body/div[last()]/p    Test connection failed
     
@@ -136,7 +136,7 @@ CreateLDAPServerErrorPassword
     [Tags]    Negtive    UI    Administration    LDAP Server
     ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    ui    dc=bifang,dc    11    21
     CreateLDAPServer       ${list}    NoOKButton=2
-    Assertion    /html/body/div[last()]/p    Test connection failed
+    Assertion    /html/body/div[last()]/p    Incorrect username or password
     
 CreateLDAPServerPortExceedMax
     [Tags]    Negtive    UI    Administration    LDAP Server

01-TestCase/tsg_ui/ui_administration/RolesCase.robot

@@ -109,12 +109,9 @@ RolesCitedDelete
     RolesDelete
     Menu    administration    Accounts
     UserSearchName    ${a}    UserName
-    click element    id=userEdit
+    sleep     ${sleep}                                 
-    Wait Until Element Is Enabled    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]    ${sleep_Wait}
+    ${text}    Get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[5]/div/div/span      
-    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[last()]/div/div/div/span/span/i
+    Should Be Equal As Strings    ${text}    superreader
-    sleep     ${sleep_min}                                 
-    ${text}    Get Element Attribute    xpath=/html/body/div[last()]/div[1]/div[1]/ul/li[2]    class        
-    Should Be Equal As Strings    ${text}    el-select-dropdown__item selected
     
 RolesDisable
     [Tags]    Positive    UI    Administration    Roles 

01-TestCase/tsg_ui/ui_proxy/A_ProxyAllowCase.robot

@@ -323,5 +323,33 @@ Proxy-Allow-0012
     Comment    创建代理策略
     UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    FilterInfo=${ProxyfilterInfo}
     
+EditProxyAllow
+    [Tags]    Positive    UI    Proxy    Allow    Edit
+    Comment    创建代理策略数据
+    CreatePage    FQDN    single    ${TEST NAME}HOST    keywordtext=$www.lifewire.com
+    CreatePage    URL    single    ${TEST NAME}URL    keywordtext=ifewire
+    ${Proxyfilter}    Create list    Host    URL
+    ${URL}    Create list    ${TEST NAME}URL
+    ${Host}    Create list    ${TEST NAME}HOST
+    ${ProxyfilterInfo}    Create Dictionary    Filter=${Proxyfilter}    URLname=${URL}    Hostname=${Host}
+    ${Proxysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}    Ipclienttext1=${testClentIP}    Port=1-65535
+    ${ProxysourceAddIpList}    Create list    ${Proxysip}   
+    ${ProxysourceInfo}    Create Dictionary    sourceAddIpList=${ProxysourceAddIpList}
+    ${ProxypolicyInfo}    Create Dictionary    PolicyType=Proxy Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Allow    ApplicationSearch=HTTP    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建修改代策略数据
+    CreatePage    HTTPSignature    single    ${TEST NAME}EditRequestHeader    reqrestype=req    reqresheader=ck    keywordtext=sailthru_pageviews
+    CreatePage    HTTPSignature    single    ${TEST NAME}EditResponseHeader   reqrestype=res    reqresheader=ct    keywordtext=charset=utf-8
+    ${ProxyCreatefilter}    Create list    URL
+    ${EditURL}    Create list    ${TEST NAME}URL
+    ${CreateOrDeleteFilterInfo}    Create Dictionary    URL=${EditURL}
+    ${EditRequest Header}    Create list    ${TEST NAME}EditRequestHeader
+    ${EditResponse Header}    Create list    ${TEST NAME}EditResponseHeader
+    ${ProxyAddfilter}     Create list    Request Header    Response Header
+    ${EditfilterInfo}    Create Dictionary    Filter=${ProxyAddfilter}    Request Headername=${EditRequest Header}    Response Headername=${EditResponse Header}
+    ${ProxyEditpolicyInfo}    Create Dictionary    PolicyType=Proxy Policy    CreateorEdit=Edit    PolicyName=${TEST NAME}    PolicyEditName=Edit${TEST NAME}    PolicyAction=Allow    ApplicationSearch=HTTP    ApplicationFilter=HTTP    PolicyLogSession=1    PolicyEnabled=1
+    Comment    创建代理策略
+    UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    FilterInfo=${ProxyfilterInfo}
+    Comment    修改代理策略
+    UIPolicies    ${ProxyEditpolicyInfo}    EditFilterInfo=${EditfilterInfo}    CreateOrDeleteFilterInfo=${CreateOrDeleteFilterInfo}
 
     

01-TestCase/tsg_ui/ui_proxy/A_ProxyDenyCase.robot

@@ -299,20 +299,97 @@ Proxy-Deny-011
     UIPolicies    ${SecurityInfo}    SourceInfo=${SecuritysourceInfo}    FilterInfo=${SecurityfilterInfo}
     Comment    创建代理策略
     UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    ProxyDenyadd=${ProxyDenyadd}    FilterInfo=${ProxyfilterInfo}
-
     
-
+Proxy-Deny-012
-# Proxy-Deny-003
+    [Tags]    Positive    UI    Proxy    Deny    Filter选择Response Content
-    # [Tags]    Positive    UI    Proxy    Deny    目的使用地址
+    Comment    创建安全策略数据
-    # Comment    创建安全策略数据
+    CreatePage    FQDN    single    ${TEST NAME}SNI    keywordtext=*reqbin.com
-    # ${Country}    Create list    United States
+    ${SNI}    Create list    ${TEST NAME}SNI
-    # ${dip1}    Create Dictionary    Sordtype=Source    Type1=Geography    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}    Country=${Country}
+    ${Securityfilter}    create list    SNI
-    # ${destinationAddIpList}     Create list    ${dip1}
+    ${SecurityfilterInfo}    Create Dictionary    Filter=${Securityfilter}    SSLSNIname=${SNI}
-    # ${destinationInfo}    Create Dictionary    destinationAddIpList=${destinationAddIpList}  
+    ${Securitysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}    Ipclienttext1=${testClentIP}    Port=1-65535
-    # ${ProxyDenyadd}    Create Dictionary    Action=Deny    DenyCode=404    ContentType=TEXT    TextValue=${TEST NAME}
+    ${SecuritysourceAddIpList}    Create List    ${Securitysip}
-    # ${ProxysourceAddIpList}    Create list    ${dip1}   
+    ${SecuritysourceInfo}    Create Dictionary    sourceAddIpList=${SecuritysourceAddIpList}
-    # ${ProxysourceInfo}    Create Dictionary    sourceAddIpList=${ProxysourceAddIpList}
+    ${SecurityInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Intercept    ApplicationSearch=HTTP    PolicyLogSession=1    PolicyEnabled=open
-    # ${ProxypolicyInfo}    Create Dictionary    PolicyType=Proxy Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Deny    ApplicationSearch=HTTP    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建代理策略shuju8
-    # Comment    创建安全策略
+    CreatePage    Key    single    ${TEST NAME}_RESCONT    keywordtext=*test
-    # Comment    创建代理策略
+    ${Proxyfilter}    create list    Response Content
-    # UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    ProxyDenyadd=${ProxyDenyadd}
+    ${Request Content}    create list    ${TEST NAME}_RESCONT
+    ${ProxyfilterInfo}    Create Dictionary    Filter=${Proxyfilter}    Response Contentname=${Response Content}
+    ${ProxyDenyadd}    Create Dictionary    Action=Deny    DenyCode=405    ContentType=Profile    SearchorCreate=Search    ProfileName=404
+    ${ip_name}    create list    ${TEST NAME}
+    ${Proxysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Search    ObjectName=${ip_name}
+    ${ProxysourceAddIpList}    Create list    ${Proxysip}   
+    ${ProxysourceInfo}    Create Dictionary    sourceAddIpList=${ProxysourceAddIpList}
+    ${ProxypolicyInfo}    Create Dictionary    PolicyType=Proxy Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Deny    ApplicationSearch=HTTP    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建安全策略
+    UIPolicies    ${SecurityInfo}    SourceInfo=${SecuritysourceInfo}    FilterInfo=${SecurityfilterInfo}
+    Comment    创建代理策略
+    UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    ProxyDenyadd=${ProxyDenyadd}    FilterInfo=${ProxyfilterInfo}
+    
+Proxy-Deny-013
+    [Tags]    Positive    UI    Proxy    Deny    最大组合1
+    Comment    创建安全策略数据
+    CreatePage    FQDN    single    ${TEST NAME}SNI    keywordtext=*ox.ac.uk
+    ${SNI}    Create list    ${TEST NAME}SNI
+    ${Securityfilter}    create list    SNI
+    ${SecurityfilterInfo}    Create Dictionary    Filter=${Securityfilter}    SSLSNIname=${SNI}
+    ${Securitysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}    Ipclienttext1=${testClentIP}    Port=1-65535
+    ${SecuritysourceAddIpList}    Create List    ${Securitysip}
+    ${SecuritysourceInfo}    Create Dictionary    sourceAddIpList=${SecuritysourceAddIpList}
+    ${SecurityInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Intercept    ApplicationSearch=SSL    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建代理策略数据
+    CreatePage    FQDN    single    ${TEST NAME}HOST    keywordtext=$www.ox.ac.uk
+    CreatePage    URL    single    ${TEST NAME}URL    keywordtext=ox.ac
+    CreatePage    HTTPSignature    single    ${TEST NAME}RequestHeader1    reqrestype=req    reqresheader=ua    keywordtext=Mozilla/5.0
+    CreatePage    HTTPSignature    single    ${TEST NAME}RequestHeader2    reqrestype=req    reqresheader=ck    keywordtext=_gat_UA
+    CreatePage    Key    single    ${TEST NAME}_RESCONT    keywordtext=Oxford Science Blog
+    ${Proxyfilter}    Create list    Host    URL    Request Header    Response Content
+    ${URL}    Create list    ${TEST NAME}URL
+    ${Host}    Create list    ${TEST NAME}HOST
+    ${Request Header}    Create list    ${TEST NAME}RequestHeader1    ${TEST NAME}RequestHeader2
+    ${Response Conten}    Create list    ${TEST NAME}_RESCONT
+    ${ProxyfilterInfo}    Create Dictionary    Filter=${Proxyfilter}    URLname=${URL}    Hostname=${Host}    Request Headername=${Request Header}    Response Contentname=${Response Conten}
+    ${ProxyDenyadd}    Create Dictionary    Action=Deny    DenyCode=405    ContentType=Profile    SearchorCreate=Search    ProfileName=404
+    ${ip_name}    create list    ${TEST NAME}
+    ${Proxysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Search    ObjectName=${ip_name}
+    ${ProxysourceAddIpList}    Create list    ${Proxysip}   
+    ${ProxysourceInfo}    Create Dictionary    sourceAddIpList=${ProxysourceAddIpList}
+    ${ProxypolicyInfo}    Create Dictionary    PolicyType=Proxy Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Deny    ApplicationSearch=HTTP    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建安全策略
+    UIPolicies    ${SecurityInfo}    SourceInfo=${SecuritysourceInfo}    FilterInfo=${SecurityfilterInfo}
+    Comment    创建代理策略
+    UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    ProxyDenyadd=${ProxyDenyadd}    FilterInfo=${ProxyfilterInfo}
+    
+Proxy-Deny-014
+    [Tags]    Positive    UI    Proxy    Deny    最大组合2
+    Comment    创建安全策略数据
+    CreatePage    FQDN    single    ${TEST NAME}SNI    keywordtext=*weibo.com
+    ${SNI}    Create list    ${TEST NAME}SNI
+    ${Securityfilter}    create list    SNI
+    ${SecurityfilterInfo}    Create Dictionary    Filter=${Securityfilter}    SSLSNIname=${SNI}
+    ${Securitysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}    Ipclienttext1=${testClentIP}    Port=1-65535
+    ${SecuritysourceAddIpList}    Create List    ${Securitysip}
+    ${SecuritysourceInfo}    Create Dictionary    sourceAddIpList=${SecuritysourceAddIpList}
+    ${SecurityInfo}    Create Dictionary    PolicyType=Security Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Intercept    ApplicationSearch=SSL    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建代理策略数据
+    CreatePage    FQDN    single    ${TEST NAME}HOST    keywordtext=$weibo.com
+    CreatePage    URL    single    ${TEST NAME}URL    keywordtext=wei
+    CreatePage    HTTPSignature    single    ${TEST NAME}ResPonseHeader    reqrestype=res    reqresheader=ca    keywordtext=charset=utf-8
+    CreatePage    Key    single    ${TEST NAME}_REQCONT    keywordtext=DenyTest
+    ${Proxyfilter}    Create list    Host    URL    Response Header    Request Content
+    ${URL}    Create list    ${TEST NAME}URL
+    ${Host}    Create list    ${TEST NAME}HOST
+    ${Response Header}    Create list    ${TEST NAME}ResPonseHeader
+    ${Request Content}    Create list    ${TEST NAME}_REQCONT
+    ${ProxyfilterInfo}    Create Dictionary    Filter=${Proxyfilter}    URLname=${URL}    Hostname=${Host}    Response Headername=${Response Header}    Request Contentname=${Request Content}
+    ${ProxyDenyadd}    Create Dictionary    Action=Deny    DenyCode=405    ContentType=Profile    SearchorCreate=Search    ProfileName=404
+    ${ip_name}    create list    ${TEST NAME}
+    ${Proxysip}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Search    ObjectName=${ip_name}
+    ${ProxysourceAddIpList}    Create list    ${Proxysip}   
+    ${ProxysourceInfo}    Create Dictionary    sourceAddIpList=${ProxysourceAddIpList}
+    ${ProxypolicyInfo}    Create Dictionary    PolicyType=Proxy Policy    CreateorEdit=Create    PolicyName=${TEST NAME}     PolicyAction=Deny    ApplicationSearch=HTTP    PolicyLogSession=1    PolicyEnabled=open
+    Comment    创建安全策略
+    UIPolicies    ${SecurityInfo}    SourceInfo=${SecuritysourceInfo}    FilterInfo=${SecurityfilterInfo}
+    Comment    创建代理策略
+    UIPolicies    ${ProxypolicyInfo}    SourceInfo=${ProxysourceInfo}    ProxyDenyadd=${ProxyDenyadd}    FilterInfo=${ProxyfilterInfo}

01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot

@@ -280,7 +280,7 @@ DecryptionKeyringsMaxSizeHSM
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[2]    xpath
     click    id=app_create
     sleep     ${sleep_min}
-    input    id=keyringsadd_name    DecryptionKeyringsMaxSizeHSM
+    input    id=keyringsadd_name1    DecryptionKeyringsMaxSizeHSM
     sleep     ${sleep_min}
     Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[2]/div/div/div/input    ${path}keyrings//end-entity//caentity.chain.pem   
     sleep    ${sleep}
@@ -298,7 +298,7 @@ DecryptionKeyringsMaxSizeCustomized
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[2]    xpath
     click    id=app_create
     sleep     ${sleep_min}
-    input    id=keyringsadd_name    DecryptionKeyringsMaxSizeCustomized
+    input    id=keyringsadd_name1    DecryptionKeyringsMaxSizeCustomized
     sleep     ${sleep_min}
     Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[2]/div/div/div/input    ${path}keyrings//end-entity//caentity.chain.pem   
     sleep    ${sleep}

01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot

@@ -177,7 +177,7 @@ SSLFingerprintCreateFormatError
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[5]    Targeting=xpath
     click    id=Fingerprint_create
     sleep     ${sleep_min}
-    input    id=authoritiesAdd_name    a75de44db3e351bbd8d38b64c41ggggg
+    input    id=authoritiesAdd_name1    a75de44db3e351bbd8d38b64c41ggggg
     sleep     ${sleep_min}
     click    id=authoritiesAdd_sub
     sleep    ${sleep}
@@ -190,7 +190,7 @@ SSLFingerprintCreateRepeatJA3Hash
     ${ID}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/div/span
     click    id=Fingerprint_create
     sleep     ${sleep_min}
-    input    id=authoritiesAdd_name    a75de44db3e351bbd8d38b64c41fffff
+    input    id=authoritiesAdd_name1    a75de44db3e351bbd8d38b64c41fffff
     sleep     ${sleep_min}
     click    id=authoritiesAdd_sub
     sleep    ${sleep}
@@ -204,7 +204,7 @@ SSLFingerprintCreateRepeatJA3Hash
 
 SSLFingerprintImportNoJsonFile
     [Tags]    Negtive    UI    Settings    SSLFingerprint
-    UploadFilesSize    SSLFingerprint    1     ${path}SSLFingerprint_files/NoJsonFile.txt    Only support import JSON file
+    UploadFilesSize    SSLFingerprint    1     ${path}SSLFingerprint_files/NoJsonFile.txt    Only json formats can be uploaded
     
 SSLFingerprintImportEmptyJsonFile
     [Tags]    Negtive    UI    Settings    SSLFingerprint
@@ -224,14 +224,13 @@ SSLFingerprintImportLackLast_seen
     
 SSLFingerprintImportRepeatJA3    
     [Tags]    Negtive    UI    Settings    SSLFingerprint
-    ${a}=    RandomNumber 
+    CreateSSLFingerprint    d8c87baaaaaaaaaaaa9e41242626c2f3    Yes    JA3Hash    Description=test
-    CreateSSLFingerprint    d8c87baaaaaaaaaaaa9e41${a}26c2f3    Yes    JA3Hash    Description=test
     SSLFingerprintImportJA3    ${path}SSLFingerprint_files/InportSSLFingerprint.csv
     ${text}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div
     Should Be Equal As Strings    ${text}    JA3 Hash repeat
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[2]/div[2]/button
     sleep     ${sleep_min}
-    Settings-Search    d8c87baaaaaaaaaaaa9e41${a}26c2f3    JA3Hash
+    Settings-Search    d8c87baaaaaaaaaaaa9e41242626c2f3    JA3Hash
     sleep     ${sleep_min}
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr
     DeleteSSLFingerprint

02-Keyword/tsg_ui/policy/UIPolicy.robot

@@ -1445,7 +1445,7 @@ Create-Object-Search
     sleep    ${sleep}
     click element    xpath=//*[@id="policy_paper_left"]/div[8]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div
     run keyword if    "${Hosttype}"=="Category"    run keywords    sleep    ${sleep}
-    ...    AND    click element    xpath=//*[@id="policy_paper_left"]/div[8]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div/div/div/div/div/div/div/div[2]
+    ...    AND    click element    xpath=//*[@id="condistions_protocol"]/div[2]/p[contains(text(), "${filter}")]/following-sibling::div/div/div/div/div/div/div/div/div[2]
     ...    ELSE    log    不操作
     sleep    ${sleep}
     FOR    ${i}    IN    @{Name}
@@ -1465,7 +1465,7 @@ Create-Object-Proxy-Search
     sleep    ${sleep}
     click element    xpath=//*[@id="policy_paper_left"]/div[9]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div
     run keyword if    "${Hosttype}"=="Category"    run keywords    sleep    ${sleep}
-    ...    AND    click element    xpath=//*[@id="policy_paper_left"]/div[9]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div/div/div/div/div/div/div/div[2]
+    ...    AND    click element    xpath=//*[@id="condistions_protocol"]/div[2]/p[contains(text(), "${filter}")]/following-sibling::div/div/div/div/div/div/div/div/div[2]
     ...    ELSE    log    不操作
     sleep    ${sleep}
     FOR    ${i}    IN    @{Name}
@@ -2212,7 +2212,7 @@ Proxy-Policies-OK
 Edit-Filter-SecurityOrProxy
     [Arguments]    ${PolicyType}    ${EditFilterdict}
     ${typepath}    Run Keyword If    "${PolicyType}"=="Security Policy"    set variable    /html/body/div[1]/div/div[3]/div[2]/div/div[1]/form[1]/div/div[8]/div[1]/div[1]/label
-    ...    ELSE    set variable    /html/body/div[1]/div/div[3]/div[2]/div/div[1]/form[1]/div/div[9]/div[1]/div[1]/label
+    ...    ELSE    set variable    /html/body/div[1]/div/div[3]/div[2]/div/div[1]/form[1]/div/div[9]/div/div[1]/label
     FOR    ${Var}    ${Filter}    IN ENUMERATE    @{EditFilterdict}
         click element    xpath=${typepath}\[contains(text(), "${Filter}")]/following-sibling::div/div/i
         sleep    ${sleep}

02-Keyword/tsg_ui/setting/Settings.robot

@@ -895,9 +895,9 @@ EditDecryptionKeyrings
     sleep    ${sleep_min}
     click    id=appEdit    #点击Edit按钮
     sleep    ${sleep_min}
-    Clear Element Text    id=keyringsadd_name    #清空name输入框
+    Clear Element Text    id=keyringsadd_name1    #清空name输入框
     sleep    ${sleep_min}
-    input    id=keyringsadd_name    ${name}    #输入name
+    input    id=keyringsadd_name1    ${name}    #输入name
     sleep    ${sleep_min}
     Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[5]/div/div/div/input    ${file}    #上传文件
     sleep    ${sleep}