diff --git a/01-TestCase/tsg_bfapi/offline_stat_report/ChartLibraryCreate.robot b/01-TestCase/tsg_bfapi/offline_stat_report/ChartLibraryCreate.robot
index c8b0583..b4619fa 100644
--- a/01-TestCase/tsg_bfapi/offline_stat_report/ChartLibraryCreate.robot
+++ b/01-TestCase/tsg_bfapi/offline_stat_report/ChartLibraryCreate.robot
@@ -7,81 +7,81 @@ Resource          ../../../02-Keyword/tsg_bfapi/offline_stat_report/ApiRequest1.
 Resource          ../../../02-Keyword/tsg_bfapi/Common.robot
 
 *** Variables ***
-${dataset_url}            /report/dataset
+${dataset_url}            /${version}/report/dataset
 ${datasetId}             ${EMPTY}
 ${reportId}             ${EMPTY}
-${report_url}             /report/offlinejob
+${report_url}             /${version}/report/offlinejob
 ${chartId}             ${EMPTY}
-${chart_url}             /report/chart
-${result_url}             /report/offlinejob/result
+${chart_url}             /${version}/report/chart
+${result_url}             /${version}/report/offlinejob/result
 ${resultId}             ${EMPTY}
 *** Test Cases ***
 Chart_Library_Lien-001
     #新建DataSet
     ${name}    Set Variable    Chart_Library_Lien-001
-    Post-Request    ${dataset_url}    {"list":{"name":"${name}","logType":"security_event_log","filterConnector":"and","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_client_ip","expression":"count","label":"Client IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_server_ip","expression":"count","label":"Server IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_recv_time","expression":"","label":"Receive Time"}],"filterConditionList":[]}}
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${name}","logType":"security_event_log","filterConnector":"and","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_client_ip","expression":"count","label":"Client IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_server_ip","expression":"count","label":"Server IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_recv_time","expression":"","label":"Receive Time"}],"filterConditionList":[]}}
     #根据name查询出该Dataset的id
-    ${response}    Get-Request    ${dataset_url}?pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     #根据DataSet的id，新建Chart，Lien图形表
-    Post-Request    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"line","dataTop":0,"orderBy":"","orderDesc":1,"drilldownTop":0,"includeOther":false,"timeline":{"dataBinding":"Receive Time","label":"","format":"Time"},"line":[{"dataBinding":"Client IP","type":"Line Up","format":"Default","legend":""},{"dataBinding":"Server IP","type":"Line Up","format":"Default","legend":""},{"dataBinding":"sessions","type":"Line Up","format":"Default","legend":""}]}}
+    BasePostRequestOK    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"line","dataTop":0,"orderBy":"","orderDesc":1,"drilldownTop":0,"includeOther":false,"timeline":{"dataBinding":"Receive Time","label":"","format":"Time"},"line":[{"dataBinding":"Client IP","type":"Line Up","format":"Default","legend":""},{"dataBinding":"Server IP","type":"Line Up","format":"Default","legend":""},{"dataBinding":"sessions","type":"Line Up","format":"Default","legend":""}]}}
     #根据name查询出该Chart的id
-    ${response1}    Get-Request    ${chart_url}?pageSize=20&pageNo=1&id=&name=${name}&opUser=
+    ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${name}&opUser=
     ${chartId}    Set Variable    ${response1}[data][list][0][id]
 Chart_Library_Area-002
     #新建DataSet
     ${name}    Set Variable    Chart_Library_Area-002
-    Post-Request    ${dataset_url}    {"list":{"name":"${name}","logType":"proxy_event_log","filterConnector":"and","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_server_ip","expression":"count","label":"Server IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_client_ip","expression":"count","label":"Client IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_recv_time","expression":"","label":"Receive Time"}],"filterConditionList":[]}}
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${name}","logType":"proxy_event_log","filterConnector":"and","groupColumnList":[{"name":"common_recv_time"}],"queryColumnList":[{"name":"common_server_ip","expression":"count","label":"Server IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_client_ip","expression":"count","label":"Client IP","expressionList":[{"label":"count","value":"count"},{"label":"Count Distinct","value":"count_distinct"}]},{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_recv_time","expression":"","label":"Receive Time"}],"filterConditionList":[]}}
     #根据name查询出该Dataset的id
-    ${response}    Get-Request    ${dataset_url}?pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     #根据DataSet的id，新建Chart，Area图形表
-    Post-Request    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"area","dataTop":0,"orderBy":"","orderDesc":1,"drilldownTop":0,"includeOther":false,"timeline":{"dataBinding":"Receive Time","label":"","format":"Time"},"line":[{"dataBinding":"Server IP","type":"Line Up","format":"Default","legend":""},{"dataBinding":"Client IP","type":"Line Down","format":"Default","legend":""},{"dataBinding":"sessions","type":"Line Up","format":"Default","legend":""}]}}
+    BasePostRequestOK    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"area","dataTop":0,"orderBy":"","orderDesc":1,"drilldownTop":0,"includeOther":false,"timeline":{"dataBinding":"Receive Time","label":"","format":"Time"},"line":[{"dataBinding":"Server IP","type":"Line Up","format":"Default","legend":""},{"dataBinding":"Client IP","type":"Line Down","format":"Default","legend":""},{"dataBinding":"sessions","type":"Line Up","format":"Default","legend":""}]}}
     #根据name查询出该Chart的id
-    ${response1}    Get-Request    ${chart_url}?pageSize=20&pageNo=1&id=&name=${name}&opUser=
+    ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${name}&opUser=
     ${chartId}    Set Variable    ${response1}[data][list][0][id]
 Chart_Library_Pie-003
     #新建DataSet
     ${name}    Set Variable    Chart_Library_Pie-003
-    Post-Request    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
-    ${response}    Get-Request    ${dataset_url}?pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     #根据DataSet的id，新建Chart，Pie图形表
-    Post-Request    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"pie","dataTop":0,"orderBy":"","orderDesc":"","includeOther":true,"xAxis":{"dataBinding":"Client IP","label":"Client IP","dataTop":5,"dataType":""},"yAxis":[{"dataBinding":"sessions","format":"Default","legend":""}]}}
-    ${response1}    Get-Request    ${chart_url}?pageSize=20&pageNo=1&id=&name=${name}&opUser=
+    BasePostRequestOK    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"pie","dataTop":0,"orderBy":"","orderDesc":"","includeOther":true,"xAxis":{"dataBinding":"Client IP","label":"Client IP","dataTop":5,"dataType":""},"yAxis":[{"dataBinding":"sessions","format":"Default","legend":""}]}}
+    ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${name}&opUser=
     ${chartId}    Set Variable    ${response1}[data][list][0][id]
 Chart_Library_Bra-004
     #新建DataSet
     ${name}    Set Variable    Chart_Library_Bra-004
-    Post-Request    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
-    ${response}    Get-Request    ${dataset_url}?pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     #根据DataSet的id，新建Chart，Bra图形表
-    Post-Request    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"bar","dataTop":0,"orderBy":"","orderDesc":"","includeOther":true,"xAxis":{"dataBinding":"Client IP","label":"Client IP","dataTop":5,"dataType":""},"yAxis":[{"dataBinding":"sessions","format":"Default","legend":""}]}}
+    BasePostRequestOK    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"bar","dataTop":0,"orderBy":"","orderDesc":"","includeOther":true,"xAxis":{"dataBinding":"Client IP","label":"Client IP","dataTop":5,"dataType":""},"yAxis":[{"dataBinding":"sessions","format":"Default","legend":""}]}}
     #根据name查询出该Chart的id
-    ${response1}    Get-Request    ${chart_url}?pageSize=20&pageNo=1&id=&name=${name}&opUser=
+    ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${name}&opUser=
     ${chartId}    Set Variable    ${response1}[data][list][0][id]
 Chart_Library_Table-005
     #新建DataSet
     ${name}    Set Variable    Chart_Library_Table-005
-    Post-Request    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
-    ${response}    Get-Request    ${dataset_url}?pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     #根据DataSet的id，新建Chart,tableb表，普通
-    Post-Request    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"table","dataTop":10,"orderBy":"sessions","orderDesc":0,"drilldownTop":null,"includeOther":false,"tableType":"Regular","columns":[{"title":"Client IP","width":20,"dataBindings":[{"dataType":false,"dataBinding":"Client IP","format":"Default","legend":"","name":"common_client_ip"}]},{"title":"sessions","width":20,"dataBindings":[{"dataType":false,"dataBinding":"sessions","format":"Default","legend":"","name":"common_log_id"}]}]}}
+    BasePostRequestOK    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"table","dataTop":10,"orderBy":"sessions","orderDesc":0,"drilldownTop":null,"includeOther":false,"tableType":"Regular","columns":[{"title":"Client IP","width":20,"dataBindings":[{"dataType":false,"dataBinding":"Client IP","format":"Default","legend":"","name":"common_client_ip"}]},{"title":"sessions","width":20,"dataBindings":[{"dataType":false,"dataBinding":"sessions","format":"Default","legend":"","name":"common_log_id"}]}]}}
     #根据name查询出该Chart的id
-    ${response1}    Get-Request    ${chart_url}?pageSize=20&pageNo=1&id=&name=${name}&opUser=
+    ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${name}&opUser=
     ${chartId}    Set Variable    ${response1}[data][list][0][id]
 Chart_Library_Table-006
     #新建DataSet
     ${name}    Set Variable    Chart_Library_Table-006
-    Post-Request    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
-    ${response}    Get-Request    ${dataset_url}?pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
+    BasePostRequestOK    ${dataset_url}    {"list":{"name":"${name}","logType":"connection_record_log","filterConnector":"and","groupColumnList":[{"name":"common_client_ip"}],"queryColumnList":[{"name":"common_log_id","expression":"count","label":"sessions","expressionList":[]},{"name":"common_client_ip","expression":"","label":"Client IP"}],"filterConditionList":[{"name":"common_address_type","expression":"!=","expressionList":["=","!=",">","<",">=","<="],"value":[6],"type":"int"}]}}
+    ${response}    BaseGetRequestOK    ${dataset_url}    pageSize=20&pageNo=1&id=&name=${name}&logType=&opStartTime=&opEndTime=&opUser=
     ${datasetId}    Set Variable    ${response}[data][list][0][id]
     #根据DataSet的id，新建Chart,tableb表，下钻
-    Post-Request    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"table","dataTop":10,"orderBy":"sessions","orderDesc":0,"drilldownTop":null,"includeOther":false,"tableType":"Regular","columns":[{"title":"Client IP","width":20,"dataBindings":[{"dataType":false,"dataBinding":"Client IP","format":"Default","legend":"","name":"common_client_ip"}]},{"title":"sessions","width":20,"dataBindings":[{"dataType":false,"dataBinding":"sessions","format":"Default","legend":"","name":"common_log_id"}]}]}}
+    BasePostRequestOK    ${chart_url}    {"list":{"id":null,"name":"${name}","description":"","datasetId":${datasetId},"chartType":"table","dataTop":10,"orderBy":"sessions","orderDesc":0,"drilldownTop":null,"includeOther":false,"tableType":"Regular","columns":[{"title":"Client IP","width":20,"dataBindings":[{"dataType":false,"dataBinding":"Client IP","format":"Default","legend":"","name":"common_client_ip"}]},{"title":"sessions","width":20,"dataBindings":[{"dataType":false,"dataBinding":"sessions","format":"Default","legend":"","name":"common_log_id"}]}]}}
     #根据name查询出该Chart的id
-    ${response1}    Get-Request    ${chart_url}?pageSize=20&pageNo=1&id=&name=${name}&opUser=
+    ${response1}    BaseGetRequestOK    ${chart_url}    pageSize=20&pageNo=1&id=&name=${name}&opUser=
     ${chartId}    Set Variable    ${response1}[data][list][0][id]