From 2845968f24d910142b9b7fb35a1b1d5946acb6f4 Mon Sep 17 00:00:00 2001
From: lyf <liuyuanfang@geedgenetworks.com>
Date: Tue, 22 Dec 2020 18:34:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9s?=
 =?UTF-8?q?ettings=E6=A8=A1=E5=9D=97=E5=85=B3=E9=94=AE=E5=AD=97=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B2=E3=80=81=E6=8F=90=E4=BA=A4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9user=E5=92=8Cip=E9=99=90=E5=88=B6=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/downloadexcel.cpython-37.pyc  | Bin 594 -> 609 bytes
 .../tsg_ui/ui_accounts/Accountscase.robot     |  22 ++--
 .../ui_settings/IP_Libraries_Case.robot       | 102 +++++++++---------
 .../ui_settings/Insert_Scripts_Case.robot     |  20 ++--
 .../Traffic_Mirror_Profiles_Case.robot        |   2 +-
 ...Trusted_Certificate_Authorities_Case.robot |   2 +-
 .../LoginRestrictions/LoginRestrictions.robot |   2 +-
 02-Keyword/tsg_ui/Menu.robot                  |   2 +-
 02-Keyword/tsg_ui/accounts/Accounts.robot     |  18 ++--
 .../tsg_ui/accounts/Accountspages.robot       |  15 +--
 02-Keyword/tsg_ui/login/Login.robot           |   6 +-
 02-Keyword/tsg_ui/setting/Settings.robot      |  35 ++++--
 03-Variable/BifangApiVariable.txt             |   2 +-
 debug.log                                     |   1 +
 docker-compose.yml                            |  15 ---
 15 files changed, 124 insertions(+), 120 deletions(-)
 create mode 100644 debug.log
 delete mode 100644 docker-compose.yml

diff --git a/01-TestCase/tsg_bfapi/active_defence_event_log/__pycache__/downloadexcel.cpython-37.pyc b/01-TestCase/tsg_bfapi/active_defence_event_log/__pycache__/downloadexcel.cpython-37.pyc
index ad87edb4e97a801e2a1358002e7eb82d7ac23ba5..5176c6f3b47543160f730bc854dda9c58ec6d110 100644
GIT binary patch
delta 55
zcmcb_@{onwiI<m)0SH(l|7_$gVPp)S+`y<Ok(gYPS(X}~lA4y9mz)}(T9%qu5}%Ww
JK6yLiYyh+c5*Gjf

delta 40
ucmaFJa*2i8iI<m)0SN9$uGq+3!pP_`xq(rS(<eVYJ}I#zIb-rM#@PVaoeT#6

diff --git a/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot b/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot
index 8c18f9a..2a71351 100644
--- a/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot
+++ b/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot
@@ -7,7 +7,7 @@ Resource          ../../../02-Keyword/tsg_ui/accounts/Accounts.robot
 *** Test Cases ***
 create-user-001
     #新建Accounts
-    CreatePage    0000    ssjjyy2    111111   log    30    log
+    CreatePage    0000    xxxx2    111111   log    30    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    0000    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -28,7 +28,7 @@ create-user-003
 
 create-user-004
     #新建Accounts
-    CreatePage    xiaohong    kkkkkk    aaaa    log
+    CreatePage    xiaohong    kkkkkk1    aaaa    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    xiaohong    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -39,7 +39,7 @@ create-user-004
 
 create-user-005
     #新建Accounts
-    CreatePage    小红    小红    a1@й    log
+    CreatePage    小红    小红1    a1@й    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    小红    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -50,7 +50,7 @@ create-user-005
 
 create-user-006
     #新建Accounts
-    CreatePage    малый    малый    малый    log
+    CreatePage    малый    малый1    малый    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    малый    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -61,7 +61,7 @@ create-user-006
 
 edit-user-007
     #新建Accounts
-    CreatePage    修改    edit    111111    log
+    CreatePage    修改    edit3    111111    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    修改    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -76,7 +76,7 @@ edit-user-007
 
 create-user-008
     #新建Accounts
-    CreatePage    @#!&*    *^%$    *^%$    log
+    CreatePage    @#!&*    *^%$1    *^%$    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    @#!&*    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -87,14 +87,14 @@ create-user-008
 
 edit-user-009
     #新建Accounts
-    CreatePage    修改ss    edit    111111    log
+    CreatePage    修改ss    edit1    111111    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name    修改ss    Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
     log    ${name}
     Should Be Equal As Strings    ${name}    修改
     #修改对象
-    User-Edit    要修改了啊              ！@#￥123lyfый    close
+    User-Edit    要修改了啊              ！@#￥123lyfый1    close
     #查询修改对象
     Ui-User-Search-Name    要修改了啊
     #删除对象
@@ -102,7 +102,7 @@ edit-user-009
 
 create-user-010
     #新建Accounts
-    CreatePage    @#!&*    *^%$    *^%$    log 
+    CreatePage    @#!&*    *^%$1    *^%$    log     superuser
     #验证新建是否成功
     Ui-User-Search-Name       *    User Name
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -113,7 +113,7 @@ create-user-010
 
 create-user-011
     #新建Accounts
-    CreatePage    @#!&*    *^%$    *^%$    log
+    CreatePage    @#!&*    *^%$1    *^%$    log    superuser
     #验证新建是否成功
     Ui-User-Search-Name        @
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
@@ -124,7 +124,7 @@ create-user-011
     
 delete-user-012
     #新建Accounts
-    CreatePage    @#!&*    *^%$    *^%$   log
+    CreatePage    @#!&*    *^%$1    *^%$   log    superuser
     #验证新建是否成功
     Ui-User-Search-Name     @#!&*
     ${name}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span
diff --git a/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot b/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot
index 95c3cda..d9330cf 100644
--- a/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot
@@ -8,7 +8,7 @@ IP_Libraries_Create_Country-001
     #ip段
     ${iplist}    create list    10.1.1.1-20.1.1.1    20.1.1.1-30.1.1.1
     #新建国家
-    Create_Ip_Libraries    Geo Name    Country    Africa    1151    L1    ${iplist}    j=2    Country=L1    Longitude=1    Latitude=2
+    Create_Ip_Libraries    Geo Name    Country    Africa    115111    L1111    ${iplist}    j=2    Country=L1    Longitude=1    Latitude=2
     #删除
     Delete_IP_Libraries
     
@@ -17,7 +17,7 @@ IP_Libraries_Create_Country-002
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    199    1    ${iplist}    Country=1
+    Create_Ip_Libraries    Geo Name    Country    Africa    1991    1    ${iplist}    Country=1
     #删除
     Delete_IP_Libraries
 
@@ -26,102 +26,102 @@ IP_Libraries_Create_Country-003
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    112    lyf    ${iplist}    Country=lyf    Longitude=1.222222    Latitude=1.222222
+    Create_Ip_Libraries    Geo Name    Country    Africa    1121    lyf    ${iplist}    Country=lyf    Longitude=1.222222    Latitude=1.222222
     #删除
-    Delete_IP_Libraries    Geo Name    112    112    
+    Delete_IP_Libraries     
 
 IP_Libraries_Create_Country-004
     #新建ip归属地-国家，经纬度输入负数
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    113    lyf    ${iplist}    Country=lyf    Longitude=-1    Latitude=-1
+    Create_Ip_Libraries    Geo Name    Country    Africa    1131    lyf    ${iplist}    Country=lyf    Longitude=-1    Latitude=-1
     #删除
-    Delete_IP_Libraries    Geo Name    113    113 
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-005
     #新建ip归属地-国家（输入框最大值）
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    1111111112    qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa    ${iplist}    Country=qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa    Longitude=180    Latitude=90
+    Create_Ip_Libraries    Geo Name    Country    Africa    11111111121    qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa    ${iplist}    Country=qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa    Longitude=180    Latitude=90
     #删除
-    Delete_IP_Libraries    Geo Name    1111111112    1111111112 
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-006
     #新建ip归属地-国家（输入多个ip组合）
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2    0.0.0.0-255.255.255.255    ::-FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF    1234:3456::AAAA-AAAA:BBBB::FFFF
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    116    lyf    ${iplist}    j=4    Country=lyf
+    Create_Ip_Libraries    Geo Name    Country    Africa    1161    lyf    ${iplist}    j=4    Country=lyf
     #删除
-    Delete_IP_Libraries    Geo Name    116    116 
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-007
     #新建ip归属地-城市（国家选择内置国家）
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    126    Garbahaarrey    ${iplist}    Country=Somalia
+    Create_Ip_Libraries    Geo Name    Country    Africa    1261    Garbahaarrey    ${iplist}    Country=Somalia
     #删除
-    Delete_IP_Libraries    Geo Name    126    126 
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-008
     #新建ip归属地-城市（国家选择非内置国家）
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    1    228    1    ${iplist}
+    Create_Ip_Libraries    Geo Name    City    1    2281    1    ${iplist}
     #删除
-    Delete_IP_Libraries    Geo Name    228    228 
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-009
     #修改ip归属地城市
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    1    268    1    ${iplist}
+    Create_Ip_Libraries    Geo Name    City    1    2681    1    ${iplist}
     Edit_Ip_Libraries    Geo Name    268    Longitude=-1    Latitude=-1
     #删除
-    Delete_IP_Libraries    Geo Name    268    268 
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-010
     #使用Geo Name为搜索条件查找ip归属地信息
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    1    181    1    ${iplist}
-    Delete_IP_Libraries    Geo Name    181    181 
+    Create_Ip_Libraries    Geo Name    City    1    1811    1    ${iplist}
+    Delete_IP_Libraries   
     
 IP_Libraries_Create_Country-011
     #使用Country为搜索条件查找ip归属地信息
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    1    284    1    ${iplist}
-    Delete_IP_Libraries    Geo Name    284    284 
+    Create_Ip_Libraries    Geo Name    City    1    2841    1    ${iplist}
+    Delete_IP_Libraries   
     
 IP_Libraries_Create_Country-012
     #使用City为搜索条件查找ip归属地信息
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    1    286    1    ${iplist}
-    Delete_IP_Libraries    Geo Name    286    285 
+    Create_Ip_Libraries    Geo Name    City    1    2861    1    ${iplist}
+    Delete_IP_Libraries    
  
 IP_Libraries_Create_Country-013
     #删除非内置的归属地信息列表
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    1    158    1    ${iplist}
+    Create_Ip_Libraries    Geo Name    City    1    1581    1    ${iplist}
     #删除
-    Delete_IP_Libraries    Geo Name    158    158
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-014
     #新建国家或城市，添加两个以上的iprange
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2    1.2.2.2-3.2.2.2    10.10.10.10-20.20.20.20    15.15.15.15-25.25.25.25    13.13.13.13-26.26.26.26
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    Algeria    127    1    ${iplist}    j=5    Longitude=-1    Latitude=12.13
-    ALL
+    Create_Ip_Libraries    Geo Name    City    Algeria    1271    1    ${iplist}    j=5    Longitude=-1    Latitude=12.13
+    Delete_IP_Libraries  
 
 IP_Libraries_Create_Country-015
     #翻页功能以及每页的归属地条数
@@ -133,77 +133,77 @@ IP_Libraries_Create_Country-016
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    Algeria    117    1    ${iplist}    Longitude=-1    Latitude=12.13
-    Edit_Ip_Libraries    Geo Name    117    Longitude=-2    Latitude=12.13
-    Delete_IP_Libraries    Geo Name    117    117
+    Create_Ip_Libraries    Geo Name    City    Algeria    1171    1    ${iplist}    Longitude=-1    Latitude=12.13
+    Edit_Ip_Libraries    Geo Name    1171    Longitude=-2    Latitude=12.13
+    Delete_IP_Libraries    
     
 IP_Libraries_Create_Country-017
     #p归属地新建国家或者城市，Iprange中搜索框功能
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2    1.2.2.2-3.2.2.2    10.10.10.10-20.20.20.20    15.15.15.15-25.25.25.25    13.13.13.13-26.26.26.26
     #新建国家     
-    Create_Ip_Libraries    Geo Name    City    Algeria    129    1    ${iplist}    j=5    Longitude=-1    Latitude=12.13
-    Delete_IP_Libraries    Geo Name    129    129 
+    Create_Ip_Libraries    Geo Name    City    Algeria    1291    1    ${iplist}    j=5    Longitude=-1    Latitude=12.13
+    Delete_IP_Libraries    
     
 IP_Libraries_Create_Country-018
     #新建国家Country输入中文
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    185    中文     ${iplist}    Country=中文    Longitude=-1    Latitude=-1
-    Delete_IP_Libraries    Geo Name    185    185
+    Create_Ip_Libraries    Geo Name    Country    Africa    1851    中文     ${iplist}    Country=中文    Longitude=-1    Latitude=-1
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-019
     #新建国家Country输入英文
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    185    english     ${iplist}    Country=english    Longitude=-1    Latitude=-1
-    Delete_IP_Libraries    Geo Name    185    185  
+    Create_Ip_Libraries    Geo Name    Country    Africa    1851    english     ${iplist}    Country=english    Longitude=-1    Latitude=-1
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-020
     #新建国家Country输入俄文
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    185    упражнение     ${iplist}    Country=упражнение    Longitude=-1    Latitude=-1
-    Delete_IP_Libraries    Geo Name    184    184 
+    Create_Ip_Libraries    Geo Name    Country    Africa    1851    упражнение     ${iplist}    Country=упражнение    Longitude=-1    Latitude=-1
+    Delete_IP_Libraries    
 
 IP_Libraries_Create_Country-021
     #新建国家Country输入特殊字符
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    185    @^&     ${iplist}    Country=@^&    Longitude=-1    Latitude=-1
-    Delete_IP_Libraries    Geo Name    185    185
+    Create_Ip_Libraries    Geo Name    Country    Africa    1851    @^&     ${iplist}    Country=@^&    Longitude=-1    Latitude=-1
+    Delete_IP_Libraries   
 
 IP_Libraries_Create_Country-022
     #修改国家Country输入中文
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    186    1    ${iplist}    Country=中文    Longitude=-1    Latitude=12.13
-    Edit_Ip_Libraries    Geo Name    186    City=中文 
-    Delete_IP_Libraries    Geo Name    186    186
+    Create_Ip_Libraries    Geo Name    Country    Africa    1861    1    ${iplist}    Country=中文    Longitude=-1    Latitude=12.13
+    Edit_Ip_Libraries    Geo Name    1861    City=中文 
+    Delete_IP_Libraries   
         
 IP_Libraries_Create_Country-023
     #修改国家Country输入英文
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    187    1    ${iplist}    Country=english    Longitude=-1    Latitude=12.13
-    Edit_Ip_Libraries    Geo Name    187    City=english     
-    Delete_IP_Libraries    Geo Name    187    187
+    Create_Ip_Libraries    Geo Name    Country    Africa    1871    1    ${iplist}    Country=english    Longitude=-1    Latitude=12.13
+    Edit_Ip_Libraries    Geo Name    1871    City=english     
+    Delete_IP_Libraries   
     
 IP_Libraries_Create_Country-024
     #修改国家Country输入俄文
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    188    1    ${iplist}    Country=упражнение    Longitude=-1    Latitude=12.13
-    Edit_Ip_Libraries    Geo Name    188    City=упражнение     
-    Delete_IP_Libraries    Geo Name    188    188
+    Create_Ip_Libraries    Geo Name    Country    Africa    1881    1    ${iplist}    Country=упражнение    Longitude=-1    Latitude=12.13
+    Edit_Ip_Libraries    Geo Name    1881    City=упражнение     
+    Delete_IP_Libraries   
 IP_Libraries_Create_Country-025
     #修改国家Country输入特殊字符
     #ip段
     ${iplist}    create list    1.1.1.1-2.2.2.2
     #新建国家     
-    Create_Ip_Libraries    Geo Name    Country    Africa    189    1    ${iplist}    Country=@^&    Longitude=-1    Latitude=12.13
-    Edit_Ip_Libraries    Geo Name    189    City=@^&
-    Delete_IP_Libraries    Geo Name    189    189        
\ No newline at end of file
+    Create_Ip_Libraries    Geo Name    Country    Africa    1891    1    ${iplist}    Country=@^&    Longitude=-1    Latitude=12.13
+    Edit_Ip_Libraries    Geo Name    1891    City=@^&
+    Delete_IP_Libraries      
\ 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 69dc7ad..382303a 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]    name
+    Create-Insert Scripts    lyf-test-001-css    ${path}insert_files\\Create-Insert Scripts-test.css    css    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]    name
+    Create-Insert Scripts    lyf-test-002-js    ${path}insert_files\\Create-Insert_Scripts-test.js    js    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]    name    
+    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    css    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]    name
+    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert Scripts-test.css    css    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]    name
+    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert_Scripts-test.js    js    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]    name
+    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert_Scripts-test.js    js    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]    name
+    Create-Insert Scripts    lyf-test-001-css    ${path}insert_files\\Create-Insert Scripts-test.css    css    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]    id
+    Edit-Insert Scripts    id=input_list_li1    ${id}    lyf-Edit-test-001    ${path}insert_files\\Create-Insert Scripts-test.css    css    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
+    Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    css    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
+    Edit-Insert Scripts    ${name}    lyf-Edit-test-008    ${path}insert_files\\Create-Insert_Scripts-test.js    js    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/Traffic_Mirror_Profiles_Case.robot b/01-TestCase/tsg_ui/ui_settings/Traffic_Mirror_Profiles_Case.robot
index 844f621..9161e20 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
@@ -28,7 +28,7 @@ Create_Traffic_Mirror_Profiles-003
 Edit_Traffic_Mirror_Profiles-004
     [Tags]    mac
     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
+    ${id}    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[1]/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
diff --git a/01-TestCase/tsg_ui/ui_settings/Trusted_Certificate_Authorities_Case.robot b/01-TestCase/tsg_ui/ui_settings/Trusted_Certificate_Authorities_Case.robot
index a15a5aa..072c7ba 100644
--- a/01-TestCase/tsg_ui/ui_settings/Trusted_Certificate_Authorities_Case.robot
+++ b/01-TestCase/tsg_ui/ui_settings/Trusted_Certificate_Authorities_Case.robot
@@ -16,7 +16,7 @@ Create_Trusted_Certificate_Authorities-002
     DeleteAuthorities_del
 
 Create_Trusted_Certificate_Authorities-003
-    import-Trusted Certificate Authorities    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCreaCreate-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}keyrings//root//ca-cer.pem
+    import-Trusted Certificate Authorities    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCreaCreate-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}keyrings//root//ca-cer.pem    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
     DeleteAuthorities_del
 
diff --git a/02-Keyword/tsg_ui/LoginRestrictions/LoginRestrictions.robot b/02-Keyword/tsg_ui/LoginRestrictions/LoginRestrictions.robot
index 5f061fc..64858fd 100644
--- a/02-Keyword/tsg_ui/LoginRestrictions/LoginRestrictions.robot
+++ b/02-Keyword/tsg_ui/LoginRestrictions/LoginRestrictions.robot
@@ -62,7 +62,7 @@ IP-Edit
     \    sleep    1
     \    IP-search    ${ip}[${i}]
     \    sleep    1        
-    \    Click Element    //*[@id="policy_Manipulation2"]/div/div[2]/div/div/form/div[2][text()="${ip}[${i}]"]   #点击修改按钮
+    \    Click Element    //div[text()="${ip}[${i}]"]   #点击修改按钮
     \    sleep    1
     \    input text    id=statusInputedit    ${new_ip}    #输入修改后的ip  
     sleep    1
diff --git a/02-Keyword/tsg_ui/Menu.robot b/02-Keyword/tsg_ui/Menu.robot
index d7cd8a1..47da871 100644
--- a/02-Keyword/tsg_ui/Menu.robot
+++ b/02-Keyword/tsg_ui/Menu.robot
@@ -11,7 +11,7 @@ Menu
     ${policys}    create dictionary    Security Policy=sidebarObjects_ProxyInterception    Proxy Policy=sidebarObjects_ProxyManipulation    WAN NAT=sidebarWan_nat    Schedules=sidebarObjects_Schedule    Tags=sidebarObjects_Tags
     ${objects}    create dictionary    IP=sidebarObjects_ip    FQDN=sidebarObjects_fqdn    SubscriberID=sidebarObjects_subscriberid    HTTPSignature=sidebarObjects_http_signature    Key=sidebarObjects_keywords    URL=sidebarObjects_url    Category=sidebarObjects_fqdn_category    Account=sidebarObjects_account    Applications=sidebarApplication
     ${log}    create dictionary    Security Event Logs=sidebarLog_SecurityEventLogs    Proxy Event Logs=sidebarLog_ProxyEventLogs    Session Records=sidebarLog_SesssionRecords    Radius Logs=sidebarLog_RadiusLogs
-    ${administration}    create dictionary    Accounts=sidebarsystem_UserManagement    Audit Log=sidebarsystem_PolicyConfigurationLog    Login Log =sidebarsystem_LoginLog    Mail Server=sidebarsystem_MailServer    LDAP Server=sidebarsystem_LadpServer    Login Restrictions=sidebarLogin_Restrictions
+    ${administration}    create dictionary    Accounts=sidebarsystem_accounts    Audit Log=sidebarsystem_PolicyConfigurationLog    Login Log =sidebarsystem_LoginLog    Mail Server=sidebarsystem_MailServer    LDAP Server=sidebarsystem_LadpServer    Login Restrictions=sidebarLogin_Restrictions
    
     #    遍历一级菜单
     FOR    ${list}    ${num}    IN ENUMERATE    @{dict}
diff --git a/02-Keyword/tsg_ui/accounts/Accounts.robot b/02-Keyword/tsg_ui/accounts/Accounts.robot
index 3c6110a..7b3b3d6 100644
--- a/02-Keyword/tsg_ui/accounts/Accounts.robot
+++ b/02-Keyword/tsg_ui/accounts/Accounts.robot
@@ -13,28 +13,28 @@ CreateButton
 Create-Name
     [Arguments]    ${accName}
     sleep    2
-    input text    xpath=//*[@id="app"]/div/div[3]/div/div/div/div[2]/form/div[1]/div/div[1]/input    ${accName}
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[1]/div/div[1]/input   ${accName}
 
 Create-Username
     [Arguments]    ${accName}
     sleep    2
-    input text    xpath=//*[@id="app"]/div/div[3]/div/div/div/div[2]/form/div[2]/div/div[1]/input    ${accName}
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[2]/div/div[1]/input    ${accName}
 
 Create-Password
     [Arguments]    ${accPasswd}
     sleep    2
-    input text    xpath=//*[@id="app"]/div/div[3]/div/div/div/div[2]/form/div[3]/div/div/input    ${accPasswd}
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div/input    ${accPasswd}
 
 Create-Enable
     [Arguments]    ${accEnable}
      sleep    2
-     run keyword if   "${accEnable}"=="close"    run keywords    click element   xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[2]/form/div[4]/div/div
+     run keyword if   "${accEnable}"=="close"    run keywords    click element   xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div
     ...    AND    sleep    1
     ...    ELSE  log    不操作
      
 Create-Ok
     sleep    1
-    click button    xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/button[1]
+    click button    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1]
 
 Create-Cancel
     click button    id=userAdd_cancel
@@ -78,17 +78,17 @@ User-Edit
 Ui-User-Search-Name
     [Arguments]    ${name}    ${type}
     sleep    2
-    Wait Until Page Contains Element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input    20
-    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input
+    Wait Until Page Contains Element    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 element    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    2
     run keyword if   "${type}"=="Name"    run keywords    click element   xpath=/html/body/div/div[1]/div[1]/ul/li[3]
     ...   AND    sleep    1
     run keyword if   "${type}"=="User Name"    run keywords    click element   xpath=/html/body/div/div[1]/div[1]/ul/li[2]
     ...   AND    sleep    1
     sleep    2
-    input text    //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input    ${name}
+    input text    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    2
-    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i
+    click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/i
     sleep    2
     click element    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
     sleep    2
diff --git a/02-Keyword/tsg_ui/accounts/Accountspages.robot b/02-Keyword/tsg_ui/accounts/Accountspages.robot
index 1f43cc4..2596dac 100644
--- a/02-Keyword/tsg_ui/accounts/Accountspages.robot
+++ b/02-Keyword/tsg_ui/accounts/Accountspages.robot
@@ -6,18 +6,21 @@ Library           Collections
 
 *** Keywords ***
 CreatePage
-    [Arguments]    ${name}    ${username}    ${accPasswd}    ${Required_Password_Change}    ${day}    ${accEnable}    
-    Menu    administartion    Accounts
+    [Arguments]    ${name}    ${username}    ${accPasswd}    ${Required_Password_Change}    ${day}    ${accEnable}    ${role} 
+    Menu    administration    Accounts
     Accounts.CreateButton
     Accounts.Create-Name    ${name}
     Accounts.Create-Username    ${username}
     Accounts.Create-Password    ${accPasswd}
-    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[4]/div/div[1]/input    ${accPasswd}
-    run keyword if    "${Required_Password_Change}"=="open"    Run Keywords    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[5]/div/div
+    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[4]/div/div/input    ${accPasswd}
+    run keyword if    "${Required_Password_Change}"=="open"    Run Keywords    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[5]/div/div
     ...    AND    sleep    1
-    ...    ELSE  log    不开启密码过期验证
-    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[6]/div/div/input    ${day}
+    ...    AND    input text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div/input    ${day}
+    ...    ELSE  log    不开启密码过期验证    
     Accounts.Create-Enable    ${accEnable}
+    Click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[8]/div/div/div/span/span/i
+    sleep    1
+    click element    //span[.="${role}"]
     Accounts.Create-Ok
 
 DeletePage
diff --git a/02-Keyword/tsg_ui/login/Login.robot b/02-Keyword/tsg_ui/login/Login.robot
index 7d40ff8..c740b1b 100644
--- a/02-Keyword/tsg_ui/login/Login.robot
+++ b/02-Keyword/tsg_ui/login/Login.robot
@@ -21,13 +21,13 @@ Clear-cache
     run keyword if    "${status}"=="False"    log    不用进行清除缓存
     
 Password-prompt
-    [Arguments]    ${passwd}=123    ${day}=30
+    [Arguments]    ${passwd}=123    ${day}=30    ${editpasswd}=no
     ${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}"=="True"    run keywords    Password-prompt-true    ${passwd}    ${day}    ${editpasswd}
     run keyword if    "${status}"=="False"    log    密码未过期
 
 Password-prompt-true
-    [Arguments]    ${passwd}    ${day}
+    [Arguments]    ${passwd}    ${day}    ${editpasswd}
     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
diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 24ccc0b..b38afaa 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -32,16 +32,16 @@ Settings-Search
     ...    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    ${value}
     ...    ELSE IF    "${search}"=="Issuer"    run keywords    sleep    1
-    ...    AND    click   xpath=/html/body/div[7]/div[1]/div[1]/ul/li[4]
+    ...    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}"=="Common Name"    run keywords    sleep    1
-    ...    AND    click   xpath=/html/body/div[7]/div[1]/div[1]/ul/li[5]
+    ...    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}
     ...    ELSE IF    "${search}"=="Certificate Fingerprint"    run keywords    sleep    1
-    ...    AND    click   xpath=/html/body/div[7]/div[1]/div[1]/ul/li[6]
+    ...    AND    click   xpath=/html/body/div/div[1]/div[1]/ul/li[6]
     ...    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}"=="Source Website"    run keywords    sleep    1
-    ...    AND    click   xpath=/html/body/div[7]/div[1]/div[1]/ul/li[2]
+    ...    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    ${value}
     sleep    1
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/i    #点击搜索按钮
@@ -232,7 +232,7 @@ VPN-Accounts-Delete
     
 Create-Proxy-TCP-Options
     [Arguments]    ${name}    ${ip-type}    ${ip-value}    ${ip-type1}    ${ip-value1}    ${Client-ttl-value}    ${Client-User-Timeout}    ${Server-ttl-value}    ${Server-User-Timeout}    ${search}
-    ...    ${Filter}=1    ${sni-type}=FQDN    ${sni-value}=test-.com    ${Enable-TCP-Passthrough}=1    ${Bypass-Duplicated-Packet}=1    ${Client-Override-MSS}=1
+    ...    ${Filter}=1    ${Source}=yes    ${Destination}=1    ${sni-type}=FQDN    ${sni-value}=test-.com    ${Enable-TCP-Passthrough}=1    ${Bypass-Duplicated-Packet}=1    ${Client-Override-MSS}=1
     ...    ${Client-MSS-value}=1000    ${Client-No-Delay}=1    ${Client-Keepalive}=1    ${Client-Probe-Number}=1    ${Client-Idle-Time}=30    ${Client-Interval}=15
     ...    ${Server-Override-MSS}=1    ${Server-MSS-value}=100    ${Server-No-Delay}=1    ${Server-Keepalive}=1    ${Server-Probe-Number}=1    ${Server-Idle-Time}=30    ${Server-Interval}=15
     Sleep    1
@@ -438,7 +438,7 @@ Create-Hijack Files
     Should Be Equal As Strings    ${text1}    ${name}    #断言
 
 Create-Insert Scripts
-    [Arguments]    ${name}    ${file}    ${type}    ${search}
+    [Arguments]    ${name}    ${file}    ${type}    ${search}    ${jstype}=Before Page Load
     Sleep    1
     click    id=children6    #点击一级目录Settings
     Sleep    1
@@ -454,7 +454,14 @@ Create-Insert Scripts
     Sleep    2
     click    id=insert_select_format    #点击下拉框按钮
     Sleep    1
-    click    ${type}    #选择css
+    run keyword if    "${type}"=="css"    run keywords    sleep    1
+    ...    AND    click    //span[.="${type}"]   #选择css
+    run keyword if    "${type}"=="js"    run keywords    sleep    1
+    ...    AND    click    //span[.="${type}"]
+    ...    AND    sleep    1
+    ...    AND    click    id=insert_select_insertOn    #点击下拉框
+    ...    AND    sleep    1
+    ...    AND    click    //span[.="${jstype}"]
     sleep    1
     click    id=insertAddOk1    #点击OK
     Sleep    1
@@ -492,7 +499,7 @@ Create-Traffic Mirror Profiles
     Should Be Equal As Strings    ${text1}    ${name}    #断言
 
 Edit-Insert Scripts
-    [Arguments]    ${id-name}    ${name1}    ${file}    ${type}    ${search}
+    [Arguments]    ${id-name}    ${name1}    ${file}    ${type}    ${search}    ${jstype}=Before Page Load
     [Documentation]    引用关键字，填入必填参数
     ...    必填参数：
     ...    ${search}:为选择要查询的类型是ID或者Name的元素
@@ -518,7 +525,15 @@ Edit-Insert Scripts
     sleep    1
     click    id=insert_select_format    #点击下拉框
     sleep    1
-    click    ${type}    #选择文件类型
+    #选择文件类型
+    run keyword if    "${type}"=="css"    run keywords    sleep    1
+    ...    AND    click    //span[.="${type}"]   #选择css
+    run keyword if    "${type}"=="js"    run keywords    sleep    1
+    ...    AND    click    //span[.="${type}"]
+    ...    AND    sleep    1
+    ...    AND    click    id=insert_select_insertOn    #点击下拉框
+    ...    AND    sleep    1
+    ...    AND    click    //span[.="${jstype}"]    
     sleep    1
     click    id=insertAddOk1    #点击ok提交
 
@@ -728,7 +743,7 @@ Create-Decryption Keyrings
     sleep    1
     ${root}    Set Variable    ${shift}
     run keyword if    "${root}"=="open"    run keywords    sleep    1
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div/div[2]/form/div[10]/div/div
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[3]/div/div[2]/form/div[9]/div/div
     ...    ELSE IF    "${root}"=="close"    log    "go on"
     click    id=keyringsadd_sub    #点击OK缇交
     Sleep    2
diff --git a/03-Variable/BifangApiVariable.txt b/03-Variable/BifangApiVariable.txt
index 2163f5b..9b4b7e5 100644
--- a/03-Variable/BifangApiVariable.txt
+++ b/03-Variable/BifangApiVariable.txt
@@ -12,7 +12,7 @@ ${ldapId}         27
 ${version}        v1
 ${version2}       v2
 ${username}       lyf
-${password}       111111
+${password}       1
 ${encodePassword}    ${EMPTY}
 ${token}          ${EMPTY}
 #[Documentation]    测试终端IP统一配置
diff --git a/debug.log b/debug.log
new file mode 100644
index 0000000..a8c1189
--- /dev/null
+++ b/debug.log
@@ -0,0 +1 @@
+[0814/001741.384:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: �����ɹ���ɡ� (0x0)
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index edce469..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: '3.1'
-services:
-  auto-custom-clibrary:
-    image: 192.168.41.68/robotframework/auto-custom-clibrary:3.0
-    restart: always
-    container_name: auto-custom-clibrary-com
-    environment:
-      TZ: Asia/Shanghai     
-    working_dir: /usr/src/python   
-    command: robot -i tsg_bf_api -d api/$time/ autotsg
-    privileged: true
-    volumes:
-      - /home/autotsg-gao:/usr/src/python
-
-