diff --git a/01-TestCase/tsg_bfapi/report/ReportStressTesting.robot b/01-TestCase/tsg_bfapi/report/ReportStressTesting.robot
index 293ddc6..bff9550 100644
--- a/01-TestCase/tsg_bfapi/report/ReportStressTesting.robot
+++ b/01-TestCase/tsg_bfapi/report/ReportStressTesting.robot
@@ -17,9 +17,9 @@ ${resultId}             ${EMPTY}
 *** Test Cases ***
 Report_Top30 Users By Bandwidth and Sessions_15-001
     #引用默认Chart  ID为1
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_Top30UsersByBandwidthandSessions_15-001-${i}
-        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":1,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":1,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
         #查询Report的id
         ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
         ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -31,9 +31,9 @@ Report_Top30 Users By Bandwidth and Sessions_15-001
     
 Report_Top30 Website Domains By BandWidth and Sessions_15-002
     #引用默认Chart  ID为2
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_Top30WebsiteDomainsByBandWidthandSessions_15-002-${i}
-        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":2,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":2,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
         #查询Report的id
         ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
         ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -44,9 +44,9 @@ Report_Top30 Website Domains By BandWidth and Sessions_15-002
     
 Report_Top30 Server IP By BandWidth and Sessions_15-003
     #引用默认Chart  ID为3
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_Top30ServerIPByBandWidthandSessions_15-003-${i}
-        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":3,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":3,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
         #查询Report的id
         ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
         ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -58,9 +58,9 @@ Report_Top30 Server IP By BandWidth and Sessions_15-003
     
 Report_Top30 Client IP By BandWidth and Sessions-004
     #引用默认Chart  ID为4
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_Top30ClientIPByBandWidthandSessions-004-${i}
-        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":4,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":4,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
         #查询Report的id
         ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
         ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -71,9 +71,9 @@ Report_Top30 Client IP By BandWidth and Sessions-004
         
 Report_Top30 Server Ports By Sessions-005
     #引用默认Chart  ID为5
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_Top30ServerPortsBySessions-004-${i}
-        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":5,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":5,"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
         #查询Report的id
         ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
         ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -83,7 +83,7 @@ Report_Top30 Server Ports By Sessions-005
     END
     
 Report_SecurityEventActionHit-006
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_SecurityEventActionHit-006-${i}
         #新建DataSet
         #${name}    Set Variable    Report_Result-001
@@ -101,7 +101,7 @@ Report_SecurityEventActionHit-006
         #把得到的ID写入文件里
         lyf_list_write    ${path}/report_files/chartid.txt    ${chartId}
         #新建Report，时间计划为Today，图表引用Line。
-        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+        BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
         #查询Report的id
         ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
         ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -112,7 +112,7 @@ Report_SecurityEventActionHit-006
     END
     
 Report_ClientIPTopN-007
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_ClientIPTopN-007-${i}
         #新建DataSet
 	    #${name}    Set Variable    Report_Result-001
@@ -130,7 +130,7 @@ Report_ClientIPTopN-007
 	    #把得到的ID写入文件里
         lyf_list_write    ${path}/report_files/chartid.txt    ${chartId}
 	    #新建Report，时间计划为Today，图表引用Line。
-	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
 	    #查询Report的id
 	    ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
 	    ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -141,7 +141,7 @@ Report_ClientIPTopN-007
     END
     
 Report_ServiceIPTopN-008
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_ServiceIPTopN-008-${i}
         #新建DataSet
 	    #${name}    Set Variable    Report_Result-001
@@ -159,7 +159,7 @@ Report_ServiceIPTopN-008
 	    #把得到的ID写入文件里
         lyf_list_write    ${path}/report_files/chartid.txt    ${chartId}
 	    #新建Report，时间计划为Today，图表引用Line。
-	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
 	    #查询Report的id
 	    ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
 	    ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -170,7 +170,7 @@ Report_ServiceIPTopN-008
     END
     
 Report_SubscriberIDTopN-009
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_SubscriberIDTopN-009-${i}
         #新建DataSet
 	    #${name}    Set Variable    Report_Result-001
@@ -188,7 +188,7 @@ Report_SubscriberIDTopN-009
 	    #把得到的ID写入文件里
         lyf_list_write    ${path}/report_files/chartid.txt    ${chartId}
 	    #新建Report，时间计划为Today，图表引用Line。
-	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
 	    #查询Report的id
 	    ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
 	    ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
@@ -199,7 +199,7 @@ Report_SubscriberIDTopN-009
     END
     
 Report_DomainsTopN-010
-    FOR    ${i}    IN RANGE    15
+    FOR    ${i}    IN RANGE    3
         ${name}    Set Variable    Report_Report_DomainsTopN-010-${i}
         #新建DataSet
 	    #${name}    Set Variable    Report_Result-001
@@ -217,7 +217,7 @@ Report_DomainsTopN-010
 	    #把得到的ID写入文件里
         lyf_list_write    ${path}/report_files/chartid.txt    ${chartId}
 	    #新建Report，时间计划为Today，图表引用Line。
-	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":6,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
+	    BasePostRequestOK    ${report_url}    {"reportJobList":{"rangeType":"last","rangeInterval":1,"rangeUnit":"day","jobName":"${name}","scheduleId":20,"chartList":[{"chartId":${chartId},"timeGranulartiy":1,"timeUnit":"","disabled":true}],"isNotice":0,"noticeMethod":"","receivers":[""],"receiver":"","startTime":"","endTime":"","filterConnector":"and","filterCondition":[]}}
 	    #查询Report的id
 	    ${response1}    BaseGetRequestOK    ${report_url}    pageSize=20&pageNo=1&jobIds=&jobName=${name}&opStartTime=&opEndTime=&opUser=&scheduleId=
 	    ${reportId}    Set Variable    ${response1}[data][list][0][jobId]
diff --git a/01-TestCase/tsg_ui/ui_settings/Decryption_Profile_Case.robot b/01-TestCase/tsg_ui/ui_settings/Decryption_Profile_Case.robot
index 85c023d..d3cd668 100644
--- a/01-TestCase/tsg_ui/ui_settings/Decryption_Profile_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/Decryption_Profile_Case.robot
@@ -9,133 +9,134 @@ Create_Decryption_Profile-001
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=1
     ...    Certificate Transparency=1    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=1    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-1    ${dict}
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-1    name    ${dict}
+    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
+                   //*[@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
     Delete
     
 Create_Decryption_Profile-002
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0e
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-2    ${dict}
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-2    name    ${dict}
+    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
     Delete
     
 Create_Decryption_Profile-003
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=1
     ...    Certificate Transparency=1    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=1    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-3    ${dict}    fail1=Fail-close
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-3    name    ${dict}    fail1=Fail-close
+    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
     Delete
     
 Create_Decryption_Profile-004
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=1
     ...    Certificate Transparency=1    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=1    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-3    ${dict}    fail1=Pass-through
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-3    name    ${dict}    fail1=Pass-through
+    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
     Delete
     
 Create_Decryption_Profile-005
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-5    ${dict}    min1=SSLv3.0    max1=SSLv3.0
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-5    name    ${dict}    min1=SSLv3.0    max1=SSLv3.0
+    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
     Delete
     
 Create_Decryption_Profile-006
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-6    ${dict}    min1=TLSv1.0    max1=TLSv1.0
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-6    name    ${dict}    min1=TLSv1.0    max1=TLSv1.0
+    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
     Delete
     
 Create_Decryption_Profile-007
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-7    ${dict}    min1=TLSv1.1    max1=TLSv1.1
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-7    name    ${dict}    min1=TLSv1.1    max1=TLSv1.1
+    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
     Delete
     
 Create_Decryption_Profile-008
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-8    ${dict}    min1=TLSv1.2    max1=TLSv1.2
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-8    name    ${dict}    min1=TLSv1.2    max1=TLSv1.2
+    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
     Delete
     
 Create_Decryption_Profile-009
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-9    ${dict}    min1=TLSv1.3    max1=TLSv1.3
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-9    name    ${dict}    min1=TLSv1.3    max1=TLSv1.3
+    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
     Delete
     
 Create_Decryption_Profile-010
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=0    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-10    ${dict}
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-10    name    ${dict}
+    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
     Delete
     
 Create_Decryption_Profile-011
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=0    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-11    ${dict}    fail1=Fail-close
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-11    name    ${dict}    fail1=Fail-close
+    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
     Delete
     
 Create_Decryption_Profile-012
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=0    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-12    ${dict}    fail1=Pass-through
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-12    name    ${dict}    fail1=Pass-through
+    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
     Delete
     
 Create_Decryption_Profile-013
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=1
     ...    Certificate Transparency=1    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=1    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-13    ${dict}
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-13    name    ${dict}
+    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
     Delete
     
 Create_Decryption_Profile-014
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=1
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-14    ${dict}
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-14    name    ${dict}
+    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
     Delete
     
 Create_Decryption_Profile-015
     ${dict}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=0    Expiry Date=0    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=1
-    Create-Decryption_Profile   lyf-test-15    ${dict}
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Decryption_Profile   lyf-test-15    name    ${dict}
+    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
     Delete
     
 Edit_Dercryption_Profile-16
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=1
     ...    Certificate Transparency=1    Mutual Authentication=1    On Protocol Errors=1    Certificate Pinning=1    Certificate Not Installed=1    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Create-Decryption_Profile   lyf-test-16    ${dict}    fail1=Pass-through    min1=SSLv3.0    max1=SSLv3.0
+    Create-Decryption_Profile   lyf-test-16    name    ${dict}    fail1=Pass-through    min1=SSLv3.0    max1=SSLv3.0
     Sleep    1
-    ${id}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span
+    ${id}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[1]/div/div/span
     sleep    1
     ${dict1}    Create Dictionary    Common Name=0    Issuer=0    Self-signed=1    Expiry Date=1    EV Certificat=0
     ...    Certificate Transparency=0    Mutual Authentication=0    On Protocol Errors=0    Certificate Pinning=0    Certificate Not Installed=0    Mirror Client Versions=0
     ...    Allow HTTP/2=0
-    Edit_Decryption Profile    id=input_list_li1    ${id}    lyf-edit-test-1    ${dict1}    fail1=Fail-close    min1=TLSv1.2
+    Edit_Decryption Profile    ${id}    lyf-edit-test-1    id    ${dict1}    fail1=Fail-close    min1=TLSv1.2
     ...    max1=TLSv1.2
     
\ No newline at end of file
diff --git a/01-TestCase/tsg_ui/ui_settings/Hijack_Files_Case.robot b/01-TestCase/tsg_ui/ui_settings/Hijack_Files_Case.robot
index 9464a93..4bcfc76 100644
--- a/01-TestCase/tsg_ui/ui_settings/Hijack_Files_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/Hijack_Files_Case.robot
@@ -6,68 +6,68 @@ Library           OperatingSystem
 
 *** Test Cases ***
 Create_Hijack_Files-001
-    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0
+    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
     
 Create_Hijack_Files-002
-    Create-Hijack Files    lyf-test-002-exe    ${path}hijack_files/Create-Hijack Files-test-1.exe    id=application/x-msdos-program0
+    Create-Hijack Files    lyf-test-002-exe    ${path}hijack_files/Create-Hijack Files-test-1.exe    id=application/x-msdos-program0    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-003
-    Create-Hijack Files    lyf-test-003-gif    ${path}hijack_files/Create-Hijack Files-test-2.gif    id=image/gif0
+    Create-Hijack Files    lyf-test-003-gif    ${path}hijack_files/Create-Hijack Files-test-2.gif    id=image/gif0    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-004
-    Create-Hijack Files    lyf-test-004-html    ${path}hijack_files/Create-Hijack Files-test-3.html    id=text/html0
+    Create-Hijack Files    lyf-test-004-html    ${path}hijack_files/Create-Hijack Files-test-3.html    id=text/html0    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-005
-    Create-Hijack Files    lyf-test-005-jpeg    ${path}hijack_files/Create-Hijack Files-test-4.jpeg    id=image/jpeg1
+    Create-Hijack Files    lyf-test-005-jpeg    ${path}hijack_files/Create-Hijack Files-test-4.jpeg    id=image/jpeg1    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-006
-    Create-Hijack Files    lyf-test-006-png    ${path}hijack_files/Create-Hijack Files-test-5.png    id=image/png2
+    Create-Hijack Files    lyf-test-006-png    ${path}hijack_files/Create-Hijack Files-test-5.png    id=image/png2    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-007
-    Create-Hijack Files    lyf-test-007-svg    ${path}hijack_files/Create-Hijack Files-test-6.svg    id=image/svg+xml3
+    Create-Hijack Files    lyf-test-007-svg    ${path}hijack_files/Create-Hijack Files-test-6.svg    id=image/svg+xml3    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Edit_Hijack_Files-008
-    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0
+    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/span
-    Edit-Hijack Files    id=input_list_li2    ${name}    lyf-Edit-test-001    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0
+    Edit-Hijack Files    ${name}    lyf-Edit-test-001    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Edit_Hijack_Files-009
-    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0
+    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    name
     ${id}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/span
-    Edit-Hijack Files    id=input_list_li1    ${id}    lyf-Edit-test-002    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0
+    Edit-Hijack Files    ${id}    lyf-Edit-test-002    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    id
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Edit_Hijack_Files-010
-    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0
+    Create-Hijack Files    lyf-test-001-apk    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    name
     ${id}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/span
-    Edit-Hijack Files    id=input_list_li1    ${id}    lyf-Edit-test-003    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    close
+    Edit-Hijack Files    ${id}    lyf-Edit-test-003    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    id    close
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-011
-    Create-Hijack Files    lyf-test-011-svg    ${path}hijack_files/Create-Hijack Files-test-6.svg    id=image/svg+xml3    close    shuru
+    Create-Hijack Files    lyf-test-011-svg    ${path}hijack_files/Create-Hijack Files-test-6.svg    id=image/svg+xml3    name    close    shuru
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
 Create_Hijack_Files-012
-    Create-Hijack Files    lyf-test-011-svg    ${path}hijack_files/Create-Hijack Files-test-6.svg    id=image/svg+xml3    open
+    Create-Hijack Files    lyf-test-011-svg    ${path}hijack_files/Create-Hijack Files-test-6.svg    id=image/svg+xml3    name    open
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
    
\ No newline at end of file
diff --git a/01-TestCase/tsg_ui/ui_settings/Insert_Scripts_Case.robot b/01-TestCase/tsg_ui/ui_settings/Insert_Scripts_Case.robot
index 519792f..69dc7ad 100644
--- a/01-TestCase/tsg_ui/ui_settings/Insert_Scripts_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/Insert_Scripts_Case.robot
@@ -7,53 +7,53 @@ Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 *** Test Cases ***
 Create_Insert_Scripts-001
     [Tags]    css
-    Create-Insert Scripts    lyf-test-001-css    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    lyf-test-001-css    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Create_Insert_Scripts-002
     [Tags]    js
-    Create-Insert Scripts    lyf-test-002-js    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    lyf-test-002-js    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Create_Insert_Scripts-003
     [Tags]    css    name最小值
-    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    name    
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Create_Insert_Scripts-004
     [Tags]    css    name传入超过64字符
-    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Create_Insert_Scripts-005
     [Tags]    js    name最小值
-    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Create_Insert_Scripts-006
     [Tags]    js    name传入超过64字符
-    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Edit_Insert_Scripts-007
     [Tags]    css    edit
-    Create-Insert Scripts    lyf-test-001-css    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
+    Create-Insert Scripts    lyf-test-001-css    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    name
     ${id}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[1]/div/div/span
-    Edit-Insert Scripts    id=input_list_li1    ${id}    lyf-Edit-test-001    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Edit-Insert Scripts    id=input_list_li1    ${id}    lyf-Edit-test-001    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    id
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
 Edit_Insert_Scripts-008
     [Tags]    edit    js
-    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
-    ${name}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
-    Edit-Insert Scripts    id=input_list_li2    ${name}    lyf-Edit-test-008    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    name
+    ${name}    get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    Edit-Insert Scripts    ${name}    lyf-Edit-test-008    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
    
\ No newline at end of file
diff --git a/01-TestCase/tsg_ui/ui_settings/Response_Pages_Case.robot b/01-TestCase/tsg_ui/ui_settings/Response_Pages_Case.robot
index e7ca2f7..3e797b4 100644
--- a/01-TestCase/tsg_ui/ui_settings/Response_Pages_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/Response_Pages_Case.robot
@@ -7,46 +7,46 @@ Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 *** Test Cases ***
 Create_Response_pages-001
     [Tags]    html
-    Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response Pages-test.html
+    Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response Pages-test.html    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
 
 Create_Response_pages-002
     [Tags]    htm
-    Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response_Pages-test-2.htm
+    Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response_Pages-test-2.htm    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
 
 Create_Response_pages-003
     [Tags]    name最小值
-    Create-Response Pages    1    ${path}response_pages_files\\Create-Response_Pages-test-2.htm
+    Create-Response Pages    1    ${path}response_pages_files\\Create-Response_Pages-test-2.htm    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
 
 Create_Response_pages-004
     [Tags]    name超过64字符
-    Create-Response Pages    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}response_pages_files\\Create-Response_Pages-test-2.htm
+    Create-Response Pages    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}response_pages_files\\Create-Response_Pages-test-2.htm    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
 
 Create_Response_pages-005
     [Tags]    中英俄特殊字符
-    Create-Response Pages    中文+absc+моряков+@#￥%……&*    ${path}response_pages_files\\Create-Response Pages-test.html
+    Create-Response Pages    中文+absc+моряков+@#￥%……&*    ${path}response_pages_files\\Create-Response Pages-test.html    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
 
 Edit_Response_pages-006
     [Tags]    修改+以id为查找对象
-    Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response Pages-test.html
+    Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response Pages-test.html    name
     ${id}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span
-    Edit-Response Pages    id=input_list_li1    ${id}    lyf-Edit-test-001    ${path}response_pages_files\\Create-Response Pages-test-1.html
+    Edit-Response Pages    ${id}    lyf-Edit-test-001    ${path}response_pages_files\\Create-Response Pages-test-1.html    id
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
 
 Edit_Response_pages-007
     [Tags]    修改+以name为查找对象
     Create-Response Pages    Create-Response Pages-001    ${path}response_pages_files\\Create-Response Pages-test.html
-    ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
-    Edit-Response Pages    id=input_list_li2    ${name}    lyf-Edit-test-007    ${path}response_pages_files\\Create-Response Pages-test-1.html
+    ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span    name
+    Edit-Response Pages    ${name}    lyf-Edit-test-007    ${path}response_pages_files\\Create-Response Pages-test-1.html    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
diff --git a/01-TestCase/tsg_ui/ui_settings/Traffic_Mirror_Profiles_Case.robot b/01-TestCase/tsg_ui/ui_settings/Traffic_Mirror_Profiles_Case.robot
index 2ce51ab..844f621 100644
--- a/01-TestCase/tsg_ui/ui_settings/Traffic_Mirror_Profiles_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/Traffic_Mirror_Profiles_Case.robot
@@ -7,38 +7,38 @@ Library           OperatingSystem
 *** Test Cases ***
 Create_Traffic_Mirror_Profiles-001
     [Tags]    vlan最小值
-    Create-Traffic Mirror Profiles    lyf-test-004-vlan    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    1
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
+    Create-Traffic Mirror Profiles    lyf-test-001-vlan    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    1    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     DeletetrafficMirrorDel
 
 Create_Traffic_Mirror_Profiles-002
     [Tags]    vlan最大值
-    Create-Traffic Mirror Profiles    lyf-test-002-vlan    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    4094
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
+    Create-Traffic Mirror Profiles    lyf-test-002-vlan    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    4094    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     DeletetrafficMirrorDel
 
 
 Create_Traffic_Mirror_Profiles-003
     [Tags]    mac
-    Create-Traffic Mirror Profiles    lyf-test-003-mac    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    11:11:11:11:11:11
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
+    Create-Traffic Mirror Profiles    lyf-test-003-mac    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    11:11:11:11:11:11    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     DeletetrafficMirrorDel
 
 
 Edit_Traffic_Mirror_Profiles-004
     [Tags]    mac
-    Create-Traffic Mirror Profiles    lyf-test-003-mac    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    11:11:11:11:11:11
+    Create-Traffic Mirror Profiles    lyf-test-004-mac    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    11:11:11:11:11:11    name
     ${id}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[2]/div/div[3]/table/tbody/tr/td[1]/div/div/span
-    Edit-Traffic Mirror Profiles    id=input_list_li1    ${id}    lyf-Edit-test-001    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    11:11:11:11:11:12
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
+    Edit-Traffic Mirror Profiles    ${id}    lyf-Edit-test-001    xpath=/html/body/div/div[1]/div[1]/ul/li[2]    11:11:11:11:11:12    id
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     DeletetrafficMirrorDel
 
 
 Edit_Traffic_Mirror_Profiles-005
     [Tags]    vlan最大值
-    Create-Traffic Mirror Profiles    lyf-test-002-vlan    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    4094
+    Create-Traffic Mirror Profiles    lyf-test-005-vlan    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    4094    name
     ${name}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
-    Edit-Traffic Mirror Profiles    id=input_list_li2    ${name}    lyf-Edit-test-002    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    11
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
+    Edit-Traffic Mirror Profiles    ${name}    lyf-Edit-test-002    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    11    name
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     DeletetrafficMirrorDel
 
diff --git a/02-Keyword/tsg_ui/login/Login.robot b/02-Keyword/tsg_ui/login/Login.robot
index 9773c82..f22e1c5 100644
--- a/02-Keyword/tsg_ui/login/Login.robot
+++ b/02-Keyword/tsg_ui/login/Login.robot
@@ -9,10 +9,33 @@ Resource          ../objects/ObjectPages.robot
 Login
     Open Browser    http://${host}/#/login    ${browserType}
     Maximize Browser Window
+    click element    xpath=/html/body/div[2]/div/div[3]/button[2]
     input text    xpath=//*[@id="app"]/div/div[2]/div/div[2]/div/input    ${username}
     input text    xpath=//*[@id="app"]/div/div[2]/div/div[3]/div/input    ${password}
     Click button    id=login
+    Password-prompt    #判断是否有密码过期的提示
+    
+Password-prompt
+    [Arguments]    ${passwd}=123    ${day}=30
+    ${status}    Run Keyword And Return Status    Page Should Contain    Does the password need to be changed when the password expires?    #判断页面是否包含该文本
+    run keyword if    "${status}"=="True"    run keywords    Password-prompt-true    ${passwd}    ${day}
+    run keyword if    "${status}"=="False"    log    密码未过期
 
+Password-prompt-true
+    [Arguments]    ${passwd}    ${day}
+    run keyword if    "${editpasswd}"=="yes"    run keywords    sleep    1
+    ...    AND    click element   xpath=/html/body/div[2]/div/div[3]/button[2]
+    ...    AND    sleep    1
+    ...    AND    input text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[3]/div/div/input    ${passwd}
+    ...    AND    sleep    1
+    ...    AND    input text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div[1]/input    ${passwd}
+    ...    AND    sleep    1
+    ...    AND    intup text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div/input    ${day}
+    ...    AND    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[2]/button[1]
+    ...    ELSE IF    "${editpasswd}"=="no"    run keywords    sleep    1
+    ...    AND    click element    xpath=/html/body/div[2]/div/div[3]/button[1]
+    ...    AND    sleep    1
 AddLocalIp
     ${obj1}    create dictionary    type=Ip    name=LocahIPName    ipads=${ipType}    ipclient=masks    ipclienttext1=${testClentIP}    ipclienttext2=${ipMask}
     CreatePage    ${obj1}[type]    ${obj1}[name]    ipads=${obj1}[ipads]    ipclient=${obj1}[ipclient]    ipclienttext1=${obj1}[ipclienttext1]    ipclienttext2=${obj1}[ipclienttext2]
diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 4698732..ca9f18d 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -19,10 +19,26 @@ ui-login
     input    xpath=//*[@id="app"]/div/div[2]/div/div[3]/div/input    111111
     click    xpath=//*[@id="app"]/div/div[2]/div/div[4]/button
 
+Settings-Search
+    [Arguments]    ${name}    ${search}
+    Wait Until Element Is Visible    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    20  
+    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
+    #判断是使用name搜索还是id搜索
+    run keyword if    "${search}"=="name"    run keywords    sleep    1
+    ...    AND    click   xpath=/html/body/div/div[1]/div[1]/ul/li[3]
+    ...    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    ${name}
+    ...    ELSE IF    "${search}"=="id"    run keywords    sleep    1
+    ...    AND    click   xpath=/html/body/div/div[1]/div[1]/ul/li[2]
+    ...    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    ${name}
+    sleep    1
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/i    #点击搜索按钮
+    sleep    1
+    
 Create-Hijack Files
-    [Arguments]    ${name}    ${file}    ${type}    ${shift}=1    ${input1}=1
+    [Arguments]    ${name}    ${file}    ${type}    ${search}    ${shift}=1    ${input1}=1
     Sleep    1
-    click    id=children5    #点击一级目录Settings
+    click    id=children6    #点击一级目录Settings
     Sleep    1
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     Sleep    2
@@ -32,7 +48,7 @@ Create-Hijack Files
     Sleep    2
     input    id=hijack_profileName    ${name}    #输入name
     Sleep    2
-    Choose File    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[1]/div[2]/form/div[2]/div/div/div[1]/input    ${file}    #上传文件
+    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}    #上传文件
     Sleep    2
     ${dow_name}    Set Variable    ${shift}
     ${input}    Set Variable    ${input1}
@@ -45,18 +61,14 @@ Create-Hijack Files
     click    ${type}    #选择文件类型
     sleep    2
     click    id=hijackAddOk1    #点击OK
-    Wait Until Element Is Visible    id=one-input    20
-    input    id=one-input    ${name}    #搜索输入框输入name
-    Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    Sleep    1
+    Settings-Search    ${name}    ${search}    #搜索框的关键字
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name}    #断言
 
 Create-Insert Scripts
-    [Arguments]    ${name}    ${file}    ${type}
+    [Arguments]    ${name}    ${file}    ${type}    ${search}
     Sleep    1
-    click    id=children5    #点击一级目录Settings
+    click    id=children6    #点击一级目录Settings
     Sleep    1
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     Sleep    2
@@ -74,17 +86,17 @@ Create-Insert Scripts
     sleep    1
     click    id=insertAddOk1    #点击OK
     Sleep    1
-    input    id=one-input    ${name}    #搜索输入框输入name
+    Settings-Search    ${name}    ${search}    #搜索框的关键字
+    log    psssssssssssssssssssssssssss
     Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    Sleep    1
-    ${text1}    Get Text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span    #获取点击后页面文本信息
+    ${text1}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    #//*[@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    ${text1}    ${name}    #断言
 
 Create-Traffic Mirror Profiles
-    [Arguments]    ${name}    ${type}    ${shuru}
+    [Arguments]    ${name}    ${type}    ${shuru}    ${search}
     Sleep    1
-    click    id=children5    #点击一级目录Settings
+    click    id=children6    #点击一级目录Settings
     Sleep    1
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     Sleep    2
@@ -100,21 +112,19 @@ Create-Traffic Mirror Profiles
     Sleep    1
     input    id=trafficmirror_addrArray0    ${shuru}
     sleep    2
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/button[1]    #点击OK
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1]    #点击OK
     Sleep    2
-    input    id=one-input    ${name}    #搜索输入框输入name
+    Settings-Search    ${name}    ${search}    #搜索框的关键字
     Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    Sleep    1
-    ${text1}    Get Text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span    #获取点击后页面文本信息
+    ${text1}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name}    #断言
 
 Edit-Insert Scripts
-    [Arguments]    ${id-name}    ${name}    ${name1}    ${file}    ${type}
+    [Arguments]    ${id-name}    ${name1}    ${file}    ${type}    ${search}
     [Documentation]    引用关键字，填入必填参数
     ...    必填参数：
-    ...    ${id-name}:为选择要查询的类型是ID或者Name的元素
-    ...    ${name}:为查询输入框输入内容
+    ...    ${search}:为选择要查询的类型是ID或者Name的元素
+    ...    ${id-name}:为查询输入框输入内容
     ...    ${name1}:为修改页面的name输入框里输入的内容
     ...    ${file}:为修改页面要上传文件的路径
     ...    ${type}:选择文件类型的元素
@@ -122,14 +132,7 @@ Edit-Insert Scripts
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     sleep    2
     click    id=profilesTabs_Profile_Insert    #点击Insert files按钮
-    sleep    1
-    click    id=one-input    #搜索点击输入框
-    sleep    1
-    click    ${id-name}    #选择ID或者name
-    sleep    1
-    input    id=sreach_input    ${name}    #输入搜索内容
-    sleep    1
-    click    id=select_new_search_btn     #点击搜索按钮
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     sleep    1
     click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]    #点击搜素到的列表
     sleep    1
@@ -148,7 +151,7 @@ Edit-Insert Scripts
     click    id=insertAddOk1    #点击ok提交
 
 Create-Response Pages
-    [Arguments]    ${name}    ${file}
+    [Arguments]    ${name}    ${file}    ${search}
     [Documentation]    引用次关键字，填入必填参数
     ...    必填参数：
     ...    ${name}:新建页面name输入框里的内容
@@ -156,7 +159,7 @@ Create-Response Pages
     #打开浏览器
     #ui-login    lyf    111111
     Sleep    1
-    click    id=children5    #点击一级目录Settings
+    click    id=children6    #点击一级目录Settings
     Sleep    1
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     Sleep    2
@@ -167,30 +170,24 @@ Create-Response Pages
     Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input    ${file}    #上传文件
     Sleep    2
     click    id=responseAddOk1    #点击OK缇交
-    Sleep    1
-    input    id=one-input    ${name}    #搜索框输入
-    Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
+    Sleep    2
+    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    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name}    #断言
 
 Edit-Response Pages
-    [Arguments]    ${id-name}    ${name}    ${name1}    ${file}
+    [Arguments]    ${id-name}    ${name1}    ${file}    ${search}
     [Documentation]    引用关键字，填入必填参数
     ...    必填参数：
-    ...    ${id-name}:为选择要查询的类型是ID或者Name的元素
-    ...    ${name}:为查询输入框输入内容
+    ...    ${search}:为选择要查询的类型是ID或者Name
+    ...    ${id-name}:为查询输入框输入内容
     ...    ${name1}:为修改页面的name输入框里输入的内容
     ...    ${file}:为修改页面要上传文件的路径
     sleep    1
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     Sleep    2
-    click    id=one-input    #搜索点击输入框
-    Sleep    1
-    click    ${id-name}    #选择ID或者name
-    Sleep    1
-    input    id=sreach_input    ${name}
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     Sleep    1
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]    #点击搜素到的列表
     sleep    1
@@ -204,20 +201,18 @@ Edit-Response Pages
     sleep    1
     click    id=responseAddOk1
     Sleep    1
-    input    id=one-input    ${name1}    #搜索框输入
-    Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     Sleep    1
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name1}    #断言
 
 Edit-Hijack Files
-    [Arguments]    ${id-name}    ${name}    ${name1}    ${file}    ${type}    ${shift}=1
+    [Arguments]    ${id-name}    ${name1}    ${file}    ${type}    ${search}    ${shift}=1
     ...    ${input1}=1
     [Documentation]    引用关键字，填入必填参数
     ...    必填参数：
-    ...    ${id-name}:为选择要查询的类型是ID或者Name的元素
-    ...    ${name}:为查询输入框输入内容
+    ...    ${search}:为选择要查询的类型是ID或者Name的元素
+    ...    ${id-name}:为查询输入框输入内容
     ...    ${name1}:为修改页面的name输入框里输入的内容
     ...    ${file}:为修改页面要上传文件的路径
     ...    ${type}:为文件类型的元素
@@ -226,13 +221,7 @@ Edit-Hijack Files
     Sleep    2
     click    id=profilesTabs_Profile_HijackFiles    #点击Hijack files按钮
     sleep    1
-    click    id=one-input    #搜索点击输入框
-    sleep    1
-    click    ${id-name}    #选择ID或者name
-    sleep    1
-    input    id=sreach_input    ${name}    #输入搜索内容
-    sleep    1
-    click    id=select_new_search_btn     #点击搜索按钮
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     sleep    1
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]    #点击搜素到的列表
     sleep    1
@@ -242,7 +231,7 @@ Edit-Hijack Files
     sleep    1
     input    id=hijack_profileName    ${name1}    #输入框输入
     sleep    1
-    Choose File    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[1]/div[2]/form/div[5]/div/div/div[1]/input    ${file}    #上传文件
+    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}    #上传文件
     sleep    1
     ${dow_name}    Set Variable    ${shift}
     ${input}    Set Variable    ${input1}
@@ -257,20 +246,16 @@ Edit-Hijack Files
     click    id=rigth-menu-button-close    #关闭侧滑框
     sleep    1
     click    id=hijackAddOk1    #点击ok提交
-    Wait Until Element Is Visible    id=one-input    20
-    input    id=one-input    ${name1}    #搜索输入框输入name
-    Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    Sleep    1
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name1}    #断言
 
 Edit-Traffic Mirror Profiles
-    [Arguments]    ${id-name}    ${name}    ${name1}    ${type}    ${shuju}
+    [Arguments]    ${id-name}    ${name1}    ${type}    ${shuju}    ${search}
     [Documentation]    引用关键字，填入必填参数
     ...    必填参数：
-    ...    ${id-name}:为选择要查询的类型是ID或者Name的元素
-    ...    ${name}:为查询输入框输入内容
+    ...    ${search}:为选择要查询的类型是ID或者Name的元素
+    ...    ${id-name}:为查询输入框输入内容
     ...    ${name1}:为修改页面的name输入框里输入的内容
     ...    ${type}:为选择点击vlan或mac的元素
     ...    ${shuju}:为输入框输入内容
@@ -279,13 +264,7 @@ Edit-Traffic Mirror Profiles
     Sleep    2
     click    id=profilesTabs_Profile_TrafficMirrorProfiles    #点击Traffic Mirror Profiles按钮
     sleep    1
-    click    id=one-input    #搜索点击输入框
-    sleep    1
-    click    ${id-name}    #选择ID或者name
-    sleep    1
-    input    id=sreach_input    ${name}    #输入搜索内容
-    sleep    1
-    click    id=select_new_search_btn     #点击搜索按钮
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     sleep    1
     click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]    #点击搜素到的列表
     sleep    1
@@ -305,11 +284,9 @@ Edit-Traffic Mirror Profiles
     sleep    1
     click    xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[2]/button[1]     #点击ok
     Sleep    2
-    input    id=one-input    ${name1}    #搜索输入框输入name
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     Sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    Sleep    1
-    ${text1}    Get Text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span    #获取点击后页面文本信息
+    ${text1}    Get Text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name1}    #断言
 
 import-Trusted Certificate Authorities
@@ -717,9 +694,9 @@ Min_max_version
     ...    ELSE    log    错误
 
 Create-Decryption_Profile
-    [Arguments]    ${name}    ${dict1}=null    ${fail1}=null    ${min1}=null    ${max1}=null
+    [Arguments]    ${name}    ${search}    ${dict1}=null    ${fail1}=null    ${min1}=null    ${max1}=null
     Sleep    1
-    click    id=children5    #点击一级目录Settings
+    click    id=children6    #点击一级目录Settings
     Sleep    1
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     sleep    2
@@ -783,15 +760,9 @@ Create-Decryption_Profile
     sleep    2
     click    id=decryption-ok
     sleep    2
-    click    id=one-input    #点击搜索框
+    Settings-Search    ${name}    ${search}    #搜索框的关键字
     sleep    2
-    click    id=input_list_li2    #选择搜索类型-name
-    sleep    1
-    input    id=sreach_input    ${name}    #输入内容
-    sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    sleep    2
-    ${name1}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    ${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}
     
 
@@ -810,21 +781,15 @@ Button_Switch
     \    run keyword if    "${class}"=="${close}" and "${dict}[${key}]"=="0"    log    默认关闭，不进行操作
 
 Edit_Decryption Profile
-    [Arguments]    ${id-name}    ${value}    ${name}    ${dict1}=null    ${fail1}=null    ${min1}=null
+    [Arguments]    ${id-name}    ${name}    ${search}    ${dict1}=null    ${fail1}=null    ${min1}=null
     ...    ${max1}=null
     click    id=sidebarProxy_Profiles    #点击二级目录Proxy Profiles
     sleep    2
     click    id=profilesTabs_Profile_DecryptionProfile    #点击Decryption Profile
     Sleep    1
-    click    id=one-input    #点击搜索框
+    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     sleep    1
-    click    ${id-name}    #选择搜索类型
-    sleep    1
-    input    id=sreach_input    ${value}    #输入内容
-    sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    sleep    1
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr    #点击搜索列表
+    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
     Sleep    2
@@ -885,17 +850,11 @@ Edit_Decryption Profile
     ...    ELSE    log    错误
     click    id=decryption-ok
     sleep    2
-    click    id=one-input    #点击搜索框
-    sleep    1
-    click    id=input_list_li2    #选择搜索类型-name
-    sleep    1
-    input    id=sreach_input    ${name}    #输入内容
-    sleep    1
-    click    id=select_new_search_btn    #点击搜索按钮
-    ${name1}    get text    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    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}
     sleep    1
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
+    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
     Delete
 
 Delete
diff --git a/03-Variable/BifangApiVariable.txt b/03-Variable/BifangApiVariable.txt
index b0216d1..2163f5b 100644
--- a/03-Variable/BifangApiVariable.txt
+++ b/03-Variable/BifangApiVariable.txt
@@ -1,10 +1,10 @@
 *** Variables ***
 #登录类型：api | cli | ${None}（tsg mib） | 未指定，默认为ui
-${loginType}      api
+${loginType}      ui
 #执行环境是否Widonws
 ${systemType}     api
 #API配置信息
-${host}           192.168.44.17
+${host}           192.168.44.71
 ${port}           8080
 ${authmode}       1
 ${authCode}       ${EMPTY}
@@ -21,7 +21,7 @@ ${testSubscriberID}    $test57
 #自动化标签
 ${userTagIds}     ${EMPTY}
 #Documentation]    是否添加测试终端IP到策略统一配置，0为不添加测试终端IP，1为添加测试终端IP，默认1
-${addTestClentIPFlag}    1
+${addTestClentIPFlag}    0
 #测试环境是否需要把tsgui和api添加为SecurityPolicy-Allow  1为需要，默认1 ，
 ${addTsgUIAPIFlag}    1
 #执行需要暂停时间
@@ -29,7 +29,7 @@ ${addTsgUIAPIFlag}    1
 ${policyVerificationSleepSeconds}    20
 #策略验证后到验证策略日志需等待时间
 ${policyLogVerificationSleepSeconds}    60
-${path}           C:/Users/admin/git/tsg_autotest/05-Other/
+${path}           F:/tsg-git/tsg_autotest/05-Other/
 ${curlbatpath}    ${path}/curl/
 ${mailpath}       ${path}/mail/
 ${responsePageFiles}    ${path}/response_pages_files/
@@ -63,4 +63,5 @@ ${snmpCommunity}    public
 #API配置信息
 ${oamHost}        192.168.40.210
 ${oamPort}        50080
-${contrast}       0.1
\ No newline at end of file
+${contrast}       0.1
+${editpasswd}	no	#设置密码过期时是否需要修改密码，no为不修改，yes为修改
\ No newline at end of file