diff --git a/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot b/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot
index f006e81..6a3ed86 100644
--- a/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot
@@ -53,4 +53,5 @@ CachedIntermediateCertificatesDownLoad
 CachedIntermediateCertificatesTurnPage
     [Tags]    Positive    UI    Settings    CachedIntermediateCertificates
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[4]    xpath
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/button[1]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/span[2]/div/input    2
\ No newline at end of file
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
\ No newline at end of file
diff --git a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot
index b88bc06..0cd2e58 100644
--- a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot
@@ -147,7 +147,8 @@ DecryptionKeyringsDownload
 DecryptionKeyringsTurnPage
     [Tags]    Positive    UI    Settings    DecryptionKeyrings
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[2]    xpath
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
     
  DecryptionKeyringsCARootFileCAMiddleType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
diff --git a/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot b/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot
index 8620801..a425273 100644
--- a/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot
@@ -140,7 +140,8 @@ HijackFilesCreateDownloadNameMaxSize
 HijackFilesPagesTurnPage
     [Tags]    Positive    UI    Settings    HijackFile
     OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_HijackFiles
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div
     
 HijackFilesUploadNullFile
      [Tags]    Negtive    html    Settings    HijackFile
diff --git a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot
index e39a78a..160808e 100644
--- a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot
@@ -161,7 +161,8 @@ IPLibrariesSearchIP
 IPLibrariesTurnPage
     [Tags]    Positive    UI    Settings    IPLibraries
     OpenPages    sidebarAdvanced    Advanced/ipLibrary
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div
 
 IPLibrariesGeoNameIDRepeat
     [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 8385a5f..0f72844 100644
--- a/01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot
@@ -81,7 +81,8 @@ InsertScriptsUpload20MFile
 InsertScritsPagesTurnPage
     [Tags]    Positive    UI    Settings    InsertScript
     OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_Insert
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
     
 InsertScriptsUploadNullFile
     [Tags]    Negtive    UI    File    Settings    InsertScript
diff --git a/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot b/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot
index 7e54ccb..f2719ac 100644
--- a/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/PacketCaptureCase.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags        tsg-ui    settings    Hijack Files
+Force Tags        tsg-ui    settings    Packet Capture
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 Library           OperatingSystem
@@ -30,6 +30,15 @@ PacketCaptureCreateProtocolAny
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
     DeletePacketCapture
     
+PacketCaptureCreateIPInterval
+    [Tag]    Positive    UI    UDP    Settings    PacketCapture      
+    CreatePacketCapture    PacketCaptureCreateProtocolUDP    IPV4    192.168.50.1-192.168.50.62    Any    Almaty    10    10    80    1.1.1.1    8080
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[7]/div/div/div/p/span
+    Should Be Equal As Strings    ${text}    192.168.50.1-192.168.50.62
+    sleep    1
+    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
diff --git a/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot b/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
index a877a62..17769fc 100644
--- a/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot
@@ -77,9 +77,10 @@ ResponsePagesDownloadFile
 ResponsePagesTurnPage
     [Tags]    Positive    UI    Settings    ResponsePages
     OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
     
-ResponsePagesCreateNullName
+ResponsePagesCreateNullNames
     [Tags]    Negtive    UI    Name    Settings    ResponsePages
     OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
     click    id=respinseAdd  
diff --git a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
index e195045..d32d793 100644
--- a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Force Tags        tsg-ui    settings    SSL Decryption Exclusion
+Force Tags        tsg-ui    settings    SSL Fingerprint
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 Library           OperatingSystem
diff --git a/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot b/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot
index 8c1b172..acc6ad1 100644
--- a/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/SystemUsageCase.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup       OpenPages    sidebarAdvanced    Advanced/storageQuota
-Force Tags        tsg-ui    settings    VPN Accounts
+Force Tags        tsg-ui    settings    System Usage
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 Library           OperatingSystem
diff --git a/01-TestCase/tsg_ui/ui_settings/TrafficMirrorProfilesCase.robot b/01-TestCase/tsg_ui/ui_settings/TrafficMirrorProfilesCase.robot
index db8d0dc..bf627f4 100644
--- a/01-TestCase/tsg_ui/ui_settings/TrafficMirrorProfilesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/TrafficMirrorProfilesCase.robot
@@ -78,7 +78,8 @@ TrafficMirrorProfilesCreateMacMaxSize
 TrafficMirrorProfilesPagesTurnPage
     [Tags]    Positive    UI    Settings    TrafficMirrorProfile
     OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_TrafficMirrorProfiles
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
 
 TrafficMirrorProfilesCreateErrorVlan_1
     [Tags]    Negtive    UI    vlan    Settings    TrafficMirrorProfile
diff --git a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot
index b5d5e75..0ae142b 100644
--- a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot
@@ -72,7 +72,8 @@ TrustedCertificateAuthoritiesDownLoadCertificate
 TrustedCertificateAuthoritiesTurnPage
     [Tags]    Positive    UI    Settings    TrustedCertificateAuthorities
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[1]    xpath
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
 
 TrustedCertificateAuthoritiesCreateNameMinSize
     [Tags]    Boundary    UI    name    Settings    TrustedCertificateAuthorities
diff --git a/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot b/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot
index 1f4189c..083f0bb 100644
--- a/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot
+++ b/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot
@@ -37,23 +37,24 @@ VPNAccountsCreatePasswordMaxSize
     VPNAccountsDelete
     
 VPNAccountsTurnPages
+    [Tags]    Positive    UI    Password    Settings    VPNAccounts
     OpenPages    sidebarSetting_Wannat    account
     click    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/button[2]
     sleep    1
-    ${text1}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[2]    class
+    ${text1}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span
     click    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/button[1]
     sleep    1
-    ${text2}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[1]    class
+    ${text2}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span
     Clear Element Text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input
     sleep    2
     input text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input   2
     sleep    1
     press keys    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input   ENTER
     sleep    1
-    ${text3}    Get Element Attribute    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[2]    class
-    Should Be Equal As Strings    ${text1}    number active 
-    Should Be Equal As Strings    ${text2}    number active 
-    Should Be Equal As Strings    ${text3}    number active
+    ${text3}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span
+    Should Not Be Equal    ${text1}    ${text2}
+    Should Not Be Equal    ${text3}    ${text2}
+    Should Not Be Equal    ${text3}    ${text2}
     
 VPNAccountsCreateNameSpecialChar
     [Tags]    Negtive    UI    name    Settings    VPNAccounts
diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 3a375c6..7f887c2 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -2377,31 +2377,33 @@ OpenPages
     sleep    2
 
 TurnPage
-     [Arguments]    ${NextPage}    ${PreviousPage}    ${JumpInput}    ${pages}
-     [Documentation]
-     ...    ${NextPage} 下一页按钮定位
-     ...    ${PreviousPage} 上一页按钮定位
-     ...    ${JumpInput} 跳转页面输入框
-     ...    ${pages}  跳转得页码
-     click    xpath=${NextPage}
-     sleep    2
-     ${text1}    Get Element Attribute    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/ul/li[2]    class
-     sleep    1                                 
-     Should Be Equal As Strings    ${text1}    number active 
-     click    xpath=${PreviousPage}
-     sleep    2
-     ${text2}    Get Element Attribute    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/ul/li[1]    class
-     sleep    1
-     Should Be Equal As Strings    ${text1}    number active    
-     Clear Element Text    xpath=${JumpInput}
-     sleep    2
-     input text    xpath=${JumpInput}   ${pages} 
-     sleep    2
-     press keys    xpath=${JumpInput}   ENTER
-     sleep    2
-     ${text1}    Get Element Attribute    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/ul/li[${pages}]    class
-     sleep    1
-     Should Be Equal As Strings    ${text1}    number active 
+    [Arguments]    ${NextPage}    ${PreviousPage}    ${JumpInput}    ${pages}    ${AssertXpath}
+    [Documentation]
+    ...    ${NextPage} 下一页按钮定位
+    ...    ${PreviousPage} 上一页按钮定位
+    ...    ${JumpInput} 跳转页面输入框
+    ...    ${pages}  跳转得页码
+    ${text1}    get text    xpath=${AssertXpath}
+    click    xpath=${NextPage}
+    sleep    2
+    ${text2}    get text    xpath=${AssertXpath} 
+    click    xpath=${PreviousPage}
+    sleep    2
+    ${text3}    get text    xpath=${AssertXpath} 
+    Clear Element Text    xpath=${JumpInput}
+    sleep    2
+    input text    xpath=${JumpInput}   ${pages} 
+    sleep    2
+    press keys    xpath=${JumpInput}   ENTER
+    sleep    2
+    ${text4}    get text    xpath=${AssertXpath}
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/ul/li[last()]
+    sleep    2
+    ${text5}    get text    xpath=${AssertXpath}
+    Should Not Be Equal    ${text1}    ${text2}
+    Should Not Be Equal    ${text3}    ${text2}
+    Should Not Be Equal    ${text3}    ${text4}
+    Should Not Be Equal    ${text1}    ${text5}
 
 ALL
     [Arguments]