diff --git a/02-Keyword/tsg_bfapi/LoginLogout.robot b/02-Keyword/tsg_bfapi/LoginLogout.robot
index ddef5b5..cc2ba15 100644
--- a/02-Keyword/tsg_bfapi/LoginLogout.robot
+++ b/02-Keyword/tsg_bfapi/LoginLogout.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          ../../03-Variable/BifangApiVariable.txt
-Resource          ../../03-Variable/ApplicationID.txt
+# Resource          ../../03-Variable/ApplicationID.txt
 Library           REST    http://${host}:${port}
 Library           Collections
 Library           SSHLibrary    
@@ -13,51 +13,23 @@ Resource    Tag.robot
 
 *** Keywords ***
 InitPotocol
-    Connect to database using custom params    pymysql    ${mysqlHost}
-    ${test}    query    SELECT region_name,group_id FROM tsg_obj_app_id WHERE is_valid = 1 order by low_boundary
-    ${objportol}    Create Dictionary    a=1      
-    ${testType}    Evaluate    type(${test})
-    log    ${testType}   
-    FOR    ${row}    IN    @{test}
-        log    ${row}
-        ${var}    set Variable    0
-        ${key}    Set Variable    ${EMPTY}    
-        ${value}    Set Variable    ${EMPTY}
-	    FOR    ${cell}    IN    @{row}
-	        log    ${cell}
-	        ${key}    run keyword if    ${var} == 0    set variable    ${cell}    ELSE    set variable    ${key}
-	        ${value}    run keyword if    ${var} == 1    set variable    ${cell}    ELSE    set variable    ${value}  
-	        ${var}    run keyword if    ${var} == 0    set variable    1    ELSE        set variable    0      
-	    END
-	    #${objportol}    run keyword if    "${objportol}"=="${EMPTY}"    set to dictionary    ${objportol}    ELSE    set to dictionary    ${objportol}    ${key}=${value}
-	    ${objportol}    set to dictionary    ${objportol}    ${key}=${value}            
-	END
-	#log    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-	#log    ${objportol}
-	#${key}    Get Dictionary Keys    ${objportol}
-    #log    ${key}
-    #获取数据示例：注意数据获取区分大小写
-	#${v}    Get From Dictionary    ${objportol}    HTTP
-	#log    ${v}
-    ${test}    query    SELECT region_name,low_boundary FROM tsg_obj_app_id WHERE is_valid = 1 order by low_boundary    
-    ${appidportol}    Create Dictionary    
-    ${testType}    Evaluate    type(${test})
-    log    ${testType}   
-    FOR    ${row}    IN    @{test}        
-        log    ${row}
-        ${var}    set Variable    0
-        ${key}    Set Variable    ${EMPTY}    
-        ${value}    Set Variable    ${EMPTY}
-	    FOR    ${cell}    IN    @{row}
-	        log    ${cell}
-	        ${key}    run keyword if    ${var} == 0    set variable    "${cell}"    ELSE    set variable    ${key}
-	        ${value}    run keyword if    ${var} == 1    set variable    ${cell}    ELSE    set variable    ${value}  
-	        ${var}    run keyword if    ${var} == 0    set variable    1    ELSE        set variable    0   
-	    END
-	    ${appidportol}    set to dictionary    ${appidportol}    ${key}=${value}
-	END  
-	SET GLOBAL VARIABLE    ${objprotol}    ${objportol}
-	SET GLOBAL VARIABLE    ${appportol}    ${appidportol} 
+    ${appDict}    Create Dictionary
+    ${appVDict}    Create Dictionary
+    Connect To Database Using Custom Params    pymysql    ${mysqlHost}
+    ${app_id}    query    SELECT group_id,low_boundary,region_name FROM tsg_obj_app_id WHERE is_valid=1
+    ${app_length}    Get Length    ${app_id}
+    FOR    ${n}    IN RANGE    ${app_length}
+        log    ${n}
+        Set To Dictionary    ${appDict}    ${app_id}[${n}][2]=${app_id}[${n}][0]
+        Set To Dictionary    ${appVDict}    ${app_id}[${n}][2]=${app_id}[${n}][1]
+        log    ${appDict}
+        log    ${appVDict}
+    END
+    Disconnect From Database
+	#供策略创建使用的appid
+	SET GLOBAL VARIABLE    ${objprotol}    ${appDict}
+	#供策略验证使用的appid
+	SET GLOBAL VARIABLE    ${appportol}    ${appVDict} 
 Login
     [Tags]    tsg_adc	tsg_bf_api
     #[Arguments]    ${username}    ${password}    ${authmode}    ${authCode}    ${ldapId}