diff --git a/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot b/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot
index dd89966..8620801 100644
--- a/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot
@@ -148,7 +148,13 @@ HijackFilesUploadNullFile
    
 HijackFilesUploadExceed20MFile
      [Tags]    Negtive    html    Settings    HijackFile
-     UploadFilesSize    HijackFiles    File size upload limit is 20MB    ${path}hijack_files/Exceed20MFile.html    File Maximum Limitation 20MB
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_HijackFiles
+    click    id=hijackAdd
+    sleep    1
+    Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[2]/div/div/div[1]/input    ${path}hijack_files/Exceed20MFile.html
+    sleep    1
+    ${text}    get text    xpath=/html/body/div[last()]/p
+    Should Be Equal As Strings    ${text}    File size upload limit is 20MB    
      
 HijackFilesUploadTypeDoesNotMatch
      [Tags]    Negtive    Settings    HijackFile
diff --git a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot
index f157804..e39a78a 100644
--- a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot
@@ -183,6 +183,10 @@ IPLibrariesCountryandRegionRepeat
     ${iplist}    create list    10.1.1.1-20.1.1.1    20.1.1.1-30.1.1.1
     CreateIpLibraries    Geo Name    Country    Africa    548465    b1111    ${iplist}    j=2    Country=b1111    Longitude=180    Latitude=90
     CreateIpLibrariesErrorVerification    Geo Name    Country    Africa    548466    b1111    ${iplist}    /html/body/div[last()]/p    Country and Region is exist    j=2    Country=b1111    Longitude=180    Latitude=90
+    OpenPages    sidebarAdvanced    Advanced/ipLibrary
+    Settings-Search    548465    GeoName
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeleteIPLibraries
 
 IPLibrariesIpFormatError
     [Tags]    Negtive    UI    Settings    IPLibraries
diff --git a/01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot b/01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot
index 4595844..8385a5f 100644
--- a/01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot
@@ -89,7 +89,13 @@ InsertScriptsUploadNullFile
     
 InsertScriptsUploadExceed20MFile
     [Tags]    Negtive    UI    File    Settings    InsertScript
-    UploadFilesSize    InsertScripts    InsertScriptsUploadNullFile    ${path}insert_files\\Exceed20MFile.css    File Maximum Limitation 100KB
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_Insert
+    click    id=insertAdd
+    sleep    1
+    Choose File    xpath=//*[@id="insertAddUpload"]/div[1]/input    ${path}insert_files\\Exceed20MFile.css
+    sleep    1
+    ${text}    get text    xpath=/html/body/div[last()]/p
+    Should Be Equal As Strings    ${text}    File size upload limit is 20MB
     
 InsertScriptsFileTypeDoesNotMatch
     [Tags]    Negtive    UI    Settings    InsertScript
diff --git a/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot b/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot
new file mode 100644
index 0000000..7fbdc4d
--- /dev/null
+++ b/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot
@@ -0,0 +1,185 @@
+*** Settings ***
+Force Tags        tsg-ui    settings    Hijack Files
+Resource          ../../../03-Variable/bifangapivariable.txt
+Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
+Library           OperatingSystem
+
+*** Test Cases ***
+
+PacketCaptureCreateAddressTypeIPV4    
+    [Tag]    Positive    UI    IPV4    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateAddressTypeIPV4    IPV4    ${testClentIP}    TCP    Nur-sultan    10    10    80    1.1.1.1    8080
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreateAddressTypeIPV6
+    [Tag]    Positive    UI    IPV6    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateAddressTypeIPV6    IPV6    fe80::3cf8:a41c:122a:b3bd    TCP    Aktau    10    10
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreateProtocolUDP
+    [Tag]    Positive    UI    UDP    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateProtocolUDP    IPV4    ${testClentIP}    UDP    Aktubinsk    10    10    80    1.1.1.1    8080
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreateProtocolAny
+    [Tag]    Positive    UI    UDP    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateProtocolUDP    IPV4    ${testClentIP}    Any    Almaty    10    10    80    1.1.1.1    8080
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureEdit
+    [Tag]    Positive    UI    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateProtocolUDP    IPV4    ${testClentIP}    TCP    Atyrau    10    10    80    1.1.1.1    8080
+    ${ID}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
+    EditPacketCapture    PacketCaptureEditSearchID    IPV6    fe80::3cf8:a41c:122a:b3bd    UDP    Karaganda    20    20    8080    fe80::3cf8:a41c:122a:b3    80
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureSearchID
+    [Tag]    Positive    UI    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureSearchID    IPV4    ${testClentIP}    TCP    Kostanay    10    10    80    1.1.1.1    8080
+    ${id}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    Settings-Search    ${id}    id
+    sleep    1
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
+    Should Be Equal As Strings    ${id}    ${text}
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture 
+    
+PacketCaptureSearchName
+    [Tag]    Positive    UI    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureSearchName    IPV4    ${testClentIP}    TCP    Kostanay    10    10    80    1.1.1.1    8080
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    Settings-Search    PacketCaptureSearchName    name
+    sleep    1
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[4]/div/div/div
+    Should Be Equal As Strings    PacketCaptureSearchName    ${text}
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureSearchIP
+    [Tag]    Positive    UI    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureSearchName    IPV4    ${testClentIP}    TCP    Kostanay    10    10    80    1.1.1.1    8080
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    Settings-Search    ${testClentIP}    ip
+    sleep    1
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[7]/div/div/div
+    Should Be Equal As Strings    ${testClentIP}    ${text}
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture 
+    
+PacketCaptureSearchPort
+    [Tag]    Positive    UI    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureSearchName    IPV4    ${testClentIP}    TCP    Kostanay    10    10    80    1.1.1.1    8080
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    Settings-Search    80    port
+    sleep    1
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[8]/div/div/div
+    Should Be Equal As Strings    80-80    ${text}
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture 
+    
+PacketCaptureSearchisValid_Effective
+    [Tag]    Positive    UI    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureSearchName    IPV4    ${testClentIP}    TCP    Kostanay    10    10    80    1.1.1.1    8080
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    PacketCaptureSerch    Effective
+    sleep    1
+    ${text}    Get Element Attribute    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/span/i[2]    style
+    Should Be Equal As Strings    color: rgb(232, 123, 108); font-size: 16px;    ${text}
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureSearchisValid_Invalid
+    [Tag]    Positive    UI    Settings    PacketCapture          
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    PacketCaptureSerch    Invalid
+    sleep    1
+    ${text}    Get Element Attribute    xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/span/i[1]    style
+    Should Be Equal As Strings    font-size: 16px; color: rgb(50, 115, 156);    ${text}
+    
+PacketCaptureCreateNameMinSize
+    [Tag]    Boundary    UI    IPV4    Settings    PacketCapture      
+    CreatePacketCapture    1    IPV4    ${testClentIP}    TCP    Nur-sultan    10    10    80    1.1.1.1    8080
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreateNameMaxSize
+    [Tag]    Boundary    UI    IPV4    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateNameMaxSizePacketCaptureCreateNameMaxSizePacketCaptureCreateNameMaxSizePacketCaptureCreateNameMaxSizePacketCa    IPV4    ${testClentIP}    TCP    Nur-sultan    10    10    80    1.1.1.1    8080
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreateNameSpecialChar
+    [Tag]    Boundary    UI    IPV4    Settings    PacketCapture      
+    CreatePacketCapture    中文+absc+моряков+@#￥%……&*    IPV4    ${testClentIP}    TCP    Nur-sultan    10    10    80    1.1.1.1    8080
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreatePortMinSize
+    [Tag]    Boundary    UI    Settings    PacketCapture      
+    CreatePacketCapture    中文+absc+моряков+@#￥%……&*    IPV4    ${testClentIP}    TCP    Nur-sultan    10    10    1    1.1.1.1    1
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+PacketCaptureCreatePortMaxSize
+    [Tag]    Boundary    UI    Settings    PacketCapture      
+    CreatePacketCapture    中文+absc+моряков+@#￥%……&*    IPV4    ${testClentIP}    TCP    Nur-sultan    10    10    65535    1.1.1.1    65535
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    DeletePacketCapture
+    
+
+
+
+
+PacketCaptureCreateALLNull
+    [Tag]    Negtive    UI    Settings    PacketCapture      
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    click    id=packet_create
+    sleep    1
+    click    id=packetCaptureAdd_ok
+    sleep    1
+    ${text1}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[1]/div/div[3]
+    ${text2}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[9]/div/div[2]
+    ${text3}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[10]/div/div[2]
+    Should Be Equal As Strings    ${text1}    Please enter the content
+    Should Be Equal As Strings    ${text2}    Please enter the content
+    Should Be Equal As Strings    ${text3}    Please enter the content
+    
+PacketCaptureCreateIPFormat
+    [Tag]    Negtive    UI    Settings    PacketCapture
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
+    click    id=packet_create
+    sleep    1
+    input    id=PacketCaptureadd_cliIp    fe80::3cf8:a41c:122a:b3
+    sleep    1
+    click    id=packetCaptureAdd_ok
+    sleep    1
+    ${text}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[3]/div/div[2]
+    Should Be Equal As Strings    ${text}    IP format error
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+    
+
+
+
+
+
+
+
+
diff --git a/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot b/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
index 0fbea25..a877a62 100644
--- a/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
@@ -97,7 +97,13 @@ ResponsePageUploadNullFile
     
 ResponsePageUploadExceed20MFile
     [Tags]    Negtive    UI    File    Settings    ResponsePages
-    UploadFilesSize    ResponsePages    File size upload limit is 20MB    ${path}response_pages_files\\Exceed20MFile.html    File Maximum Limitation 20MB
+    OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
+    click    id=respinseAdd
+    sleep    1
+    Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input    ${path}response_pages_files\\Exceed20MFile.html
+    sleep    1
+    ${text}    get text    xpath=/html/body/div[last()]/p
+    Should Be Equal As Strings    ${text}    File size upload limit is 20MB
     
 ResponsePagesFileTypeDoesNotMatch
     [Tags]    Negtive    UI    File    Settings    ResponsePages
diff --git a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
index cb69ae8..e195045 100644
--- a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
@@ -62,7 +62,7 @@ SSLFingerprintExport
     [Tag]    Positive    UI    Settings    SSLFingerprint
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[5]    Targeting=xpath
     click    id=objectExport
-    sleep    2
+    sleep    3
     Should_Exist    ${Downloadpath}SSL_Fingerprint.csv
     Remove File    ${Downloadpath}SSL_Fingerprint.csv
 
diff --git a/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot b/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot
index 6531ab8..8c1b172 100644
--- a/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Suite Setup       OpenPages    sidebarAdvanced    Advanced/storageQuota
 Force Tags        tsg-ui    settings    VPN Accounts
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
@@ -7,267 +8,134 @@ Library           OperatingSystem
 *** Test Cases ***
 SystemUsageProxyDisabled
     [Tag]    Positive    UI    Proxy    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Proxy_Disabled
+    SystemUsagePolicyVerification    Proxy_Disabled    Disabled
     
 SystemUsageProxyEnabled
     [Tag]    Positive    UI    Proxy    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Proxy_Enabled
+    SystemUsagePolicyVerification    Proxy_Enabled    Enabled
     
 SystemUsageSecurityDisabled
     [Tag]    Positive    UI    Security    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Security_Disabled
+    SystemUsagePolicyVerification    Security_Disabled    Disabled
     
 SystemUsageSecurityEnabled
     [Tag]    Positive    UI    Security    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Security_Enabled
+    SystemUsagePolicyVerification    Security_Enabled    Enabled
     
 SystemUsageWANNATDisabled
     [Tag]    Positive    UI    WANNAT    Settings    SystemUsage    
-    SystemUsagePolicyVerification    WANNAT_Disabled
+    SystemUsagePolicyVerification    WANNAT_Disabled    Disabled
     
 SystemUsageWANNATEnabled
     [Tag]    Positive    UI    WANNAT    Settings    SystemUsage    
-    SystemUsagePolicyVerification    WANNAT_Enabled
+    SystemUsagePolicyVerification    WANNAT_Enabled    Enabled
     
 SystemUsageProxyTCPOptionsDisabled
     [Tag]    Positive    UI    ProxyTCPOptions    Settings    SystemUsage    
-    SystemUsagePolicyVerification    ProxyTCPOptions_Disabled
+    SystemUsagePolicyVerification    ProxyTCPOptions_Disabled    Disabled
     
 SystemUsageProxyTCPOptionsEnabled
     [Tag]    Positive    UI    ProxyTCPOptions    Settings    SystemUsage    
-    SystemUsagePolicyVerification    ProxyTCPOptions_Enabled
-    
-SystemUsageProxySQLDisabled
-    [Tag]    Positive    UI    Proxy    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Proxy_Disabled    Disabled
-    
-SystemUsageProxySQLEnabled
-    [Tag]    Positive    UI    Proxy    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Proxy_Enabled    Enabled
-
-SystemUsageSecuritySQLDisabled
-    [Tag]    Positive    UI    Security    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Security_Disabled    Disabled
-    
-SystemUsageSecuritySQLEnabled
-    [Tag]    Positive    UI    Security    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    Security_Enabled    Enabled    
-
-SystemUsageWANNATSQLDisabled
-    [Tag]    Positive    UI    WANNAT    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    WANNAT_Disabled    Disabled 
-    
-SystemUsageWANNATSQLEnabled
-    [Tag]    Positive    UI    WANNAT    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    WANNAT_Enabled    Enabled
-    
-SystemUsageProxyTCPOptionsSQLDisabled
-    [Tag]    Positive    UI    ProxyTCPOptions    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    ProxyTCPOptions_Disabled    Disabled
-    
-SystemUsageProxyTCPOptionsSQLEnabled
-    [Tag]    Positive    UI    ProxyTCPOptions    SQL    Settings    SystemUsage    
-    SystemUsagePolicySQLVerification    ProxyTCPOptions_Enabled    Enabled  
+    SystemUsagePolicyVerification    ProxyTCPOptions_Enabled    Enabled
     
 #*******************************************************Objects*************************************************************************
 
 SystemUsageObjectAccountsItems
     [Tag]    Positive    UI    Accounts    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Accounts_Items
+    SystemUsageObjectsVerification    Accounts_Items
     
 SystemUsageObjectAccountsObjects
     [Tag]    Positive    UI    Accounts    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Accounts_Objects
+    SystemUsageObjectsVerification    Accounts_Objects
     
 SystemUsageObjectFQDNsItems
     [Tag]    Positive    UI    FQDNs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    FQDNs_Items
+    SystemUsageObjectsVerification    FQDNs_Items
     
 SystemUsageObjectFQDNsObjects
     [Tag]    Positive    UI    FQDNs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    FQDNs_Objects
+    SystemUsageObjectsVerification    FQDNs_Objects
     
 SystemUsageObjectHTTPSignaturesItems
     [Tag]    Positive    UI    HTTPSignatures    Settings    SystemUsage    
-    SystemUsagePolicyVerification    HTTPSignatures_Items
+    SystemUsageObjectsVerification    HTTPSignatures_Items
     
 SystemUsageObjectHTTPSignaturesObjects
     [Tag]    Positive    UI    HTTPSignatures    Settings    SystemUsage    
-    SystemUsagePolicyVerification    HTTPSignatures_Objects
+    SystemUsageObjectsVerification    HTTPSignatures_Objects
     
 SystemUsageObjectKeywordsItems
     [Tag]    Positive    UI    Keywords    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Keywords_Items
+    SystemUsageObjectsVerification    Keywords_Items
     
 SystemUsageObjectKeywordsObjects
     [Tag]    Positive    UI    Keywords    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Keywords_Objects
+    SystemUsageObjectsVerification    Keywords_Objects
     
 SystemUsageObjectSubscriberIDsItems
     [Tag]    Positive    UI    SubscriberIDs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    SubscriberIDs_Items
+    SystemUsageObjectsVerification    SubscriberIDs_Items
     
 SystemUsageObjectSubscriberIDsObjects 
     [Tag]    Positive    UI    SubscriberIDs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    SubscriberIDs_Objects
+    SystemUsageObjectsVerification    SubscriberIDs_Objects
 
 SystemUsageObjectURLsItems
     [Tag]    Positive    UI    URLs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    URLs_Items
+    SystemUsageObjectsVerification    URLs_Items
     
 SystemUsageObjectURLsObjects
     [Tag]    Positive    UI    URLs    Settings    SystemUsage    
-    SystemUsagePolicyVerification    URLs_Objects
+    SystemUsageObjectsVerification    URLs_Objects
     
 SystemUsageObjectIPAddressesIPV4Items
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPV4_Items
+    SystemUsageObjectsVerification    IPAddresses_IPV4_Items
     
 SystemUsageObjectIPAddressesIPV6Items
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPV6_Items
+    SystemUsageObjectsVerification    IPAddresses_IPV6_Items
     
 SystemUsageObjectIPAddressesIPObjects
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IP_Objects
+    SystemUsageObjectsVerification    IPAddresses_IP_Objects
     
 SystemUsageObjectIPAddressesGeographyItems
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_Geography_Items
+    SystemUsageObjectsVerification    IPAddresses_Geography_Items
     
 SystemUsageObjectIPAddressesGeographyObjects
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_Geography_Objects
+    SystemUsageObjectsVerification    IPAddresses_Geography_Objects
     
 SystemUsageObjectIPAddressesIPLearningItems(IPv4)
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPLearning_Items(IPv4)
+    SystemUsageObjectsVerification    IPAddresses_IPLearning_Items(IPv4)
     
 SystemUsageObjectIPAddressesIPLearningObjects
     [Tag]    Positive    UI    IPAddresses    Settings    SystemUsage    
-    SystemUsagePolicyVerification    IPAddresses_IPLearning_Objects
+    SystemUsageObjectsVerification    IPAddresses_IPLearning_Objects
     
 SystemUsageObjectApplicationsObjects
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Objects
+    SystemUsageObjectsVerification    Applications_Objects
     
 SystemUsageObjectApplicationsItems
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Items
+    SystemUsageObjectsVerification    Applications_Items
     
 SystemUsageObjectApplicationsGroupsObjects
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Groups_Objects
+    SystemUsageObjectsVerification    Applications_Groups_Objects
     
 SystemUsageObjectApplicationsGroupsItems
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Groups_Items
+    SystemUsageObjectsVerification    Applications_Groups_Items
     
 SystemUsageObjectApplicationsSelectorsObjects
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Selectors_Objects
+    SystemUsageObjectsVerification    Applications_Selectors_Objects
     
 SystemUsageObjectApplicationsSelectorsItems
     [Tag]    Positive    UI    Applications    Settings    SystemUsage    
-    SystemUsagePolicyVerification    Applications_Selectors_Items
-    
-SystemUsageObjectSQLAccountsItems
-    [Tag]    Positive    UI    Accounts    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Accounts_Items  
-    
-SystemUsageObjectSQLAccountsObjects
-    [Tag]    Positive    UI    Accounts    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Accounts_Objects
-    
-SystemUsageObjectSQLFQDNsItems
-    [Tag]    Positive    UI    FQDNs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    FQDNs_Items
-    
-SystemUsageObjectSQLFQDNsObjects
-    [Tag]    Positive    UI    FQDNs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    FQDNs_Objects
-    
-SystemUsageObjectSQLHTTPSignaturesItems
-    [Tag]    Positive    UI    HTTPSignatures    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    HTTPSignatures_Items
-    
-SystemUsageObjectSQLHTTPSignaturesObjects
-    [Tag]    Positive    UI    HTTPSignatures    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    HTTPSignatures_Objects
-    
-SystemUsageObjectSQLKeywordsItems
-    [Tag]    Positive    UI    Keywords    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Keywords_Items
-    
-SystemUsageObjectSQLKeywordsObjects
-    [Tag]    Positive    UI    Keywords    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Keywords_Objects
-
-SystemUsageObjectSQLSubscriberIDsItems
-    [Tag]    Positive    UI    SubscriberIDs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    SubscriberIDs_Items
-    
-SystemUsageObjectSQLSubscriberIDsObjects
-    [Tag]    Positive    UI    SubscriberIDs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    SubscriberIDs_Objects
-    
-SystemUsageObjectSQLURLsItems
-    [Tag]    Positive    UI    URLs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    URLs_Items
-    
-SystemUsageObjectSQLURLsObjects
-    [Tag]    Positive    UI    URLs    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    URLs_Objects
-    
-SystemUsageObjectSQLIPAddressesIPV4Items
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPV4_Items
-    
-SystemUsageObjectSQLIPAddressesIPV6Items
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPV6_Items
-    
-SystemUsageObjectSQLIPAddressesIPObjects
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IP_Objects
-    
-SystemUsageObjectSQLIPAddressesGeographyItems
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_Geography_Items
-    
-SystemUsageObjectSQLIPAddressesGeographyObjects
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_Geography_Objects
-    
-SystemUsageObjectSQLIPAddressesIPLearningItems(IPv4)
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPLearning_Items(IPv4)
-    
-SystemUsageObjectSQLIPAddressesIPLearningObjects
-    [Tag]    Positive    UI    IPAddresses    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    IPAddresses_IPLearning_Objects
-    
-SystemUsageObjectSQLIPApplicationsItems
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Items
-    
-SystemUsageObjectSQLIPApplicationsObjects
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Objects
-    
-SystemUsageObjectSQLIPApplicationsGroupsObjects
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Groups_Objects
-    
-SystemUsageObjectSQLApplicationsGroupsItems
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Groups_Items
-    
-SystemUsageObjectSQLApplicationsSelectorsObjects
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Selectors_Objects
-    
-SystemUsageObjectSQLApplicationsSelectorsItems
-    [Tag]    Positive    UI    Applications    SQL    Settings    SystemUsage    
-    SystemUsageObjectsSQLVerification    Applications_Selectors_Items    
-    
\ No newline at end of file
+    SystemUsageObjectsVerification    Applications_Selectors_Items
\ No newline at end of file
diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 36b1f5d..3a375c6 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -56,6 +56,12 @@ Settings-Search
     ...    ELSE IF    "${search}"=="City"    run keywords    sleep    1
     ...    AND    click    xpath=/html/body/div/div[1]/div[1]/ul/li[4]
     ...    AND    input    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input    ${value}
+    ...    ELSE IF    "${search}"=="ip"    run keywords    sleep    1
+    ...    AND    click    xpath=/html/body/div/div[1]/div[1]/ul/li[4]
+    ...    AND    input    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input    ${value}    
+    ...    ELSE IF    "${search}"=="port"    run keywords    sleep    1
+    ...    AND    click    xpath=/html/body/div/div[1]/div[1]/ul/li[5]
+    ...    AND    input    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input    ${value}  
     sleep    1
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/i    #点击搜索按钮
     sleep    1
@@ -618,7 +624,7 @@ CreateResponsePages
     Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input    ${file}    #上传文件
     Sleep    2
     click    id=responseAddOk1    #点击OK缇交
-    Sleep    2
+    Wait Until Element Is Visible    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span    30
     Settings-Search    ${name}    ${search}    #搜索框的关键字
     Sleep    1
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span    #获取点击后页面文本信息
@@ -915,9 +921,9 @@ CreateSSLDecryptionExclusion
     input    id=sslAdd_itemDesc    ${value}    #输入内容
     Sleep    2
     click    id=ssl_ok    #点击OK缇交
-    Sleep    1
+    Wait Until Element Is Visible    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span    30
     Settings-Search    ${name1}   ${search}
-    Sleep    1
+    sleep    1
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name}    #断言
     
@@ -1404,7 +1410,7 @@ Min_max_version
     ...    ELSE    log    错误
     sleep    2
     click    id=decryption-ok
-    sleep    2
+    Wait Until Element Is Visible    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span    20
     Settings-Search    ${name}    ${search}    #搜索框的关键字
     sleep    2
     ${name1}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
@@ -1433,7 +1439,7 @@ EditDecryptionProfile
     click    id=profilesTabs_Profile_DecryptionProfile    #点击Decryption Profile
     Sleep    1
     Settings-Search    ${id-name}    ${search}    #搜索框的关键字
-    sleep    1
+    Wait Until Element Is Visible    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span    20
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span    #点击搜索列表
     Sleep    1
     click    id=insertEdit    #点击Edit
@@ -1494,7 +1500,7 @@ EditDecryptionProfile
     ...    AND    click    id=pro_max0
     ...    ELSE    log    错误
     click    id=decryption-ok
-    Wait Until Element Is Visible    id=profilesTabs_Profile_DecryptionProfile     20
+    Wait Until Element Is Visible    id=profilesTabs_Profile_DecryptionProfile     30
     Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     ${name1}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     Should Be Equal As Strings    ${name1}    ${name}
@@ -1939,22 +1945,32 @@ CreateIpLibrariesErrorVerification
     Should Be Equal As Strings    ${text}    ${AssertText}
     
 SystemUsagePolicyVerification
-    [Arguments]    ${type}
+    [Arguments]    ${type}    ${DisabledOREnabled}
     [Documentation]
     ...    ${type}:查询的字段 格式：(Proxy/Security/WANNAT/ProxyTCPOptions)_(Disabled/Enabled)
-    Sleep    1
-    click    id=children6    #点击一级目录Settings
-    Sleep    1
-    click    id=sidebarAdvanced    #点击二级目录Advanced
-    Sleep    2
     click    id=Advanced/storageQuota   #点击System Usage
-    Sleep    2
+    Sleep    1
     ${text1}=    SystemUsageChart    ${type}
-    sleep    1
     click    id=Advanced/storageQuota
     sleep    1
     ${text2}=    SystemUsageText    ${type}
+    ${text3}=    SystemUsagePolicySQLVerification    ${type}    ${DisabledOREnabled}
     Should Be Equal As Strings    ${text1}    ${text2}
+    Should Be Equal As Strings    ${text2}    ${text3}
+    
+SystemUsageObjectsVerification
+    [Arguments]    ${type}
+    [Documentation]
+    ...    ${type}:查询的字段 格式：(Proxy/Security/WANNAT/ProxyTCPOptions)_(Disabled/Enabled)
+    click    id=Advanced/storageQuota   #点击System Usage
+    Sleep    1
+    ${text1}=    SystemUsageChart    ${type}
+    click    id=Advanced/storageQuota
+    sleep    1
+    ${text2}=    SystemUsageText    ${type}
+    ${text3}=    SystemUsageObjectsSQLVerification    ${type}
+    Should Be Equal As Strings    ${text1}    ${text2}
+    Should Be Equal As Strings    ${text2}    ${text3}
     
 SystemUsageChart
     [Arguments]    ${type}
@@ -1965,7 +1981,7 @@ SystemUsageChart
     ...    "${type}"=="Accounts_Items" or "${type}"=="Accounts_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[1]
     ...    "${type}"=="FQDNs_Items" or "${type}"=="FQDNs_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[2]
     ...    "${type}"=="HTTPSignatures_Items" or "${type}"=="HTTPSignatures_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[3]        #定位不到
-    ...    "${type}"=="Keywords_Items" or "${type}"=="Keywords_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[3]                 
+    ...    "${type}"=="Keywords_Items" or "${type}"=="Keywords_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[4]                 
     ...    "${type}"=="SubscriberIDs_Items" or "${type}"=="SubscriberIDs_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[5]    #定位不到4、5、6URL
     ...    "${type}"=="URLs_Items" or "${type}"=="URLs_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[6]
     ...    "${type}"=="IPAddresses_IPV4_Items" or "${type}"=="IPAddresses_IPV6_Items" or "${type}"=="IPAddresses_IP_Objects" or "${type}"=="IPAddresses_Geography_Items" or "${type}"=="IPAddresses_Geography_Objects" or "${type}"=="IPAddresses_IPLearning_Items(IPv4)" or "${type}"=="IPAddresses_IPLearning_Objects"    //*[@id="settings_storage"]/div[1]/div[2]/div[2]/div/div/div[2]/div[7]
@@ -2000,14 +2016,7 @@ SystemUsageText
 
 SystemUsagePolicySQLVerification
     [Arguments]    ${type}    ${DisabledOREnabled}
-    Sleep    1
-    click    id=children6    #点击一级目录Settings
-    Sleep    1
-    click    id=sidebarAdvanced    #点击二级目录Advanced
-    Sleep    2
     click    id=Advanced/storageQuota   #点击System Usage
-    Sleep    1
-    ${text1}=    SystemUsageText   ${type}
     sleep    1
     ${DisabledOREnabled}    Set Variable if    "${DisabledOREnabled}"=="Disabled"    0    1
     ${SQL}    Set Variable if    "${type}"=="Proxy_Disabled" or "${type}"=="Proxy_Enabled"    pxy_ctrl_compile
@@ -2015,27 +2024,18 @@ SystemUsagePolicySQLVerification
     ...    "${type}"=="WANNAT_Disabled" or "${type}"=="WANNAT_Enabled"    wannat_compile
     ...    "${type}"=="ProxyTCPOptions_Disabled" or "${type}"=="ProxyTCPOptions_Enabled"    pxy_tcp_option_compile
     Connect To Database Using Custom Params    pymysql    ${mysqlHost}
-    ${text2}    query     SELECT count(*) FROM ${SQL} WHERE is_initialize !=1 And is_valid=${DisabledOREnabled}
-    ${text2}    Set Variable    ${text2[0][0]}
+    ${text1}    query     SELECT count(*) FROM ${SQL} WHERE is_initialize !=1 And is_valid=${DisabledOREnabled}
+    ${text1}    Set Variable    ${text1[0][0]}
     Disconnect From Database
     ${a}    Set Variable    ${1}
-    ${text3}    Evaluate    ${text2}+${a}
-    ${text2}    Set Variable if    "${type}"=="Security_Enabled" or "${type}"=="ProxyTCPOptions_Enabled"    ${text3}    ${text2}
-    Should Be Equal As Strings    ${text1}    ${text2}
+    ${text2}    Evaluate    ${text1}+${a}
+    ${text1}    Set Variable if    "${type}"=="Security_Enabled" or "${type}"=="ProxyTCPOptions_Enabled"    ${text2}    ${text1}
+    [Return]    ${text1}
     
 SystemUsageObjectsSQLVerification
     [Arguments]    ${type}
     [Documentation]    
     ...  ${type}：验证的类型
-    Sleep    1
-    click    id=children6    #点击一级目录Settings
-    Sleep    1
-    click    id=sidebarAdvanced    #点击二级目录Advanced
-    Sleep    2
-    click    id=Advanced/storageQuota   #点击System Usage
-    Sleep    1
-    ${text1}=    SystemUsageText   ${type}
-    sleep    1
     ${SQL}    Set Variable if    "${type}"=="Accounts_Items"    select count(*) from tsg_obj_account where is_initialize !=1
     ...    "${type}"=="Accounts_Objects"    select count(*) from policy_object where group_type='account' and is_initialize !=1
     ...    "${type}"=="FQDNs_Items"    SELECT count(*) from tsg_obj_fqdn where is_initialize !=1 and group_id !=1
@@ -2061,10 +2061,10 @@ SystemUsageObjectsSQLVerification
     ...    "${type}"=="Applications_Groups_Items"    select count(*) from tsg_obj_app_id where is_initialize !=1 and is_valid != 1
     ...    "${type}"=="Applications_Selectors_Objects" or "${type}"=="Applications_Selectors_Items"    select count(*) from app_selector_compile
     Connect To Database Using Custom Params    pymysql    ${mysqlHost}
-    ${text2}    query     ${SQL}
-    ${text2}    Set Variable    ${text2[0][0]}
+    ${text}    query     ${SQL}
+    ${text}    Set Variable    ${text[0][0]}
     Disconnect From Database
-    Should Be Equal As Strings    ${text1}    ${text2}
+    [Return]    ${text}
 
 SystemUsageGetText
     [Arguments]    ${type}
@@ -2119,12 +2119,7 @@ CreatePacketCapture
     ...    ${ServerIP}：服务器 IP  默认为空
     ...    ${ServerPort}：服务器端口 默认为空
     Sleep    1
-    click    id=children6    #点击一级目录Settings
-    Sleep    1
-    click    id=sidebarTrouble_shooting    #点击二级目录Trouble Shooting
-    Sleep    2
-    click    id=Proxy_Profiles_Profile_Insert   #点击PacketCapture
-    Sleep    1
+    OpenPages    sidebarTrouble_shooting    Proxy_Profiles_Profile_Insert
     click    id=packet_create
     sleep    2
     input    id=PacketCaptureadd_name    ${name}
@@ -2234,8 +2229,6 @@ EditPacketCapture
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[4]/div/div/div/p/span
     Should Be Equal As Strings    ${text}    ${name}
 
-
-
 PacketCaptureEffectiveDevices
     [Arguments]    ${EffectiveDevices}
     click    id=PacketCaptureadd_EDevice
@@ -2279,6 +2272,23 @@ PacketCaptureEffectiveDevices
     sleep    1
     click    id=proxyManipulationConditionsAreaSuccess
     sleep    1
+    
+
+
+PacketCaptureSerch
+    [Arguments]    ${status}
+    sleep    1
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/div/div[2]/div/div/div[1]/input    #点击搜索框
+    sleep    1
+    click    xpath=/html/body/div/div[1]/div[1]/ul/li[6]
+    sleep    1
+    run keyword if    "${status}"=="Effective"    run keywords    sleep    1
+    ...    AND    click    xpath=/html/body/div/div[1]/div[1]/ul/li[1]/span
+    ...    ELSE IF    "${status}"=="Invalid"    run keywords    sleep    1
+    ...    AND    click    xpath=/html/body/div/div[1]/div[1]/ul/li[2]/span
+    sleep    1 
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/i 
+    
 
 Switch_Geographic_Locations
     [Arguments]    ${Continent/Country}
@@ -2350,7 +2360,6 @@ Switch_IP_Libraries
     sleep    2
     Should Be Equal As Strings    ${GeoNameText}    ${GeoName}    #断言
     
-
 OpenPages
     [Arguments]    ${SecondaryMenu}    ${Three-levelMenu}    ${Targeting}=null
     [Documentation]
@@ -2365,7 +2374,7 @@ OpenPages
     ...    AND    click    id=${Three-levelMenu}
     run keyword if    "${Targeting}"=="xpath"    run keywords    sleep    1
     ...    AND    click    ${Targeting}=${Three-levelMenu}     
-    sleep    5
+    sleep    2
 
 TurnPage
      [Arguments]    ${NextPage}    ${PreviousPage}    ${JumpInput}    ${pages}
@@ -2456,7 +2465,7 @@ DeletePacketCapture
     click    id=packet_del
     sleep    2
     click    xpath=/html/body/div/div/div[3]/button[2]
-    sleep    3
+    Wait Until Element Is Visible    xpath=/html/body/div[last()]/p    20
     
 Policy_Verify_Switch
     [Arguments]    ${Protocol}
@@ -2484,6 +2493,8 @@ UploadFilesSize
     ...    AND    Sleep    2
     ...    AND    Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input    ${file}    #上传文件
     ...    AND    sleep    1
+    ...    AND    click    id=responseAddOk1
+    ...    AND    sleep    1
     run keyword if    "${Page}"=="InsertScripts"    run keywords    sleep    1
     ...    AND    click    id=children6    #点击一级目录Settings
     ...    AND    Sleep    1
@@ -2516,6 +2527,12 @@ UploadFilesSize
     ...    AND    Sleep    2
     ...    AND    Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[2]/div/div/div[1]/input    ${file}    #上传文件
     ...    AND    sleep    1
+    ...    AND    click    id=hijackAddContentType    #点击+ 打开侧滑窗口
+    ...    AND    Sleep    1
+    ...    AND    click    id=text/html0    
+    ...    AND    sleep    1
+    ...    AND    click    id=hijackAddOk1
+    ...    AND    sleep    1
     run keyword if    "${Page}"=="SSLFingerprint"    run keywords    sleep    1
     ...    AND    click    id=children6    #点击一级目录Settings
     ...    AND    Sleep    1