diff --git a/01-TestCase/tsg_ui/ui_tcppolicy/TCPPolicy.robot b/01-TestCase/tsg_ui/ui_tcppolicy/TCPPolicy.robot
index 09f271b..5fb0516 100644
--- a/01-TestCase/tsg_ui/ui_tcppolicy/TCPPolicy.robot
+++ b/01-TestCase/tsg_ui/ui_tcppolicy/TCPPolicy.robot
@@ -1,37 +1,57 @@
 *** Settings ***
 Test Teardown     run keywords    Delete-Proxy-estimate    ${PolicyName}
 ...               AND    Delete-object-estimate    ${ObjName}
-Force Tags        tsg-ui    objects    security
+Force Tags        tsg-ui    settings   TCPProxy
 Resource          ../../../02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot
 Library           OperatingSystem
 Resource          ../../../02-Keyword/tsg_ui/Menu.robot
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
+Resource          ../../../03-Variable/PolicyObjectDefault.txt
 
 *** Test Cases ***
+    
 Proxy-TCP-Options001
-    # #新建对象fqdn
-    # Comment    新建对象fqdn
-    # CreatePage    FQDN    single    zdhfqdn    keywordtext=*www.baidu.com
+    #新建对象fqdn
+    Comment    新建对象fqdn
+    CreatePage    FQDN    single    ${TEST NAME}_FQDN    keywordtext=*www.baidu.com
     #新建策略
-    Comment    新建策略
-    Create-Proxy-TCP-Options    Proxy-TCP-Options001
-    Comment    添加源ip
-    TCPSource    policytype=/html/body/div/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[2]    type1=Ip    CreateOrSearch=Create    Add=Address    name=zdhip001    ipclienttext1=192.168.100.1    post=1
-    Comment    添加目的ip
-    TCPDestination    policytype=/html/body/div/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[3]    type1=Ip    CreateOrSearch=Create    Add=Address    name=zdhip001    ipclienttext1=192.168.100.1    post=1
-    ${ipname}    create list    zdhip001    zdhip001
-    ${hostname}    create list    zdhfqdn
-    ${ObjName}    create dictionary    FQDN=${hostname}    #IP=${ipname}
-    ${PolicyName}    set variable    Proxy-TCP-Options001
-    ${filter}    create list    SNI
-    TCPFilter    Filtercreate=${filter}    SNIname=${hostname}    
-    TCP-Enable-TCP-Passthrough    Enable-TCP-Passthrough=open
-    TCP-Bypass-Duplicated-Packet    Bypass-Duplicated-Packet=open
-    TCP-Client-side-Parameters    ClientOverrideMSS=open    ClientMSSvalue=800    ClientNoDelay=open    Clientttlvalue=100    ClientKeepalive=open    ClientProbeNumber=30
+    ${TCPProxy}    Create Dictionary    Tcpname=${TEST NAME}_TCPName    EnableTCPPassthrough=open    BypassDuplicatedPacket=open
+    
+    ${Sip1}    Create Dictionary    Sordtype=Source    Type1=Ip    CreateOrSearch=Create    Add=Address    Name=${TEST NAME}_IP1    Ipclienttext1=192.168.40.11-192.168.40.110    Port=1-65535
+    
+    ${Ip_name1}    create list    ${TEST NAME}_IP1
+    
+    ${SourceAddIpList}    Create List    ${Sip1}      
+     
+    ${SourceInfo}    Create Dictionary    sourceAddIpList=${SourceAddIpList}
+    
+    ${Dip1}    Create Dictionary    Sordtype=Destination    Type1=Ip    CreateOrSearch=Search    ObjectName=${Ip_name1}
+
+    ${DestinationAddIpList}    Create List    ${Dip1}
+    
+    ${DestinationInfo}    Create Dictionary    destinationAddIpList=${DestinationAddIpList} 
+
+    
+    ${TCPClientDict}    Create Dictionary    ClientOverrideMSS=open    ClientMSSvalue=800    ClientNoDelay=open    Clientttlvalue=100    ClientKeepalive=open    ClientProbeNumber=30
     ...    ClientIdleTime=30    ClientInterval=30    ClientUserTimeout=500
-    TCP-Server-side-Parameters    ServerOverrideMSS=open    ServerMSSvalue=800    ServerNoDelay=open    Serverttlvalue=100    ServerKeepalive=open    ServerProbeNumber=30
+ 
+    ${TCPServerDict}    Create Dictionary    ServerOverrideMSS=open    ServerMSSvalue=800    ServerNoDelay=open    Serverttlvalue=100    ServerKeepalive=open    ServerProbeNumber=30
     ...    ServerIdleTime=30    ServerInterval=30    ServerUserTimeout=500
-    TCP-OK
-    TCP-Assertion    Proxy-TCP-Options001    Name
\ No newline at end of file
+
+    ${SNIname}    create list    ${TEST NAME}_FQDN
+    
+    ${IPname}    create list    ${TEST NAME}_IP1
+    
+    ${Filter}    create list    SNI
+    
+    ${FilterInfo}    Create Dictionary    Filtercreate=${Filter}    SNIname=${SNIname}
+    
+    ${PolicyName}    set variable    ${TCPProxy}[Tcpname]     
+    
+    ${ObjName}    Create Dictionary    IP=${IPname}    FQDN=${SNIname}   
+
+    UIAddProxyTCPOptions    ${TCPProxy}    ${TCPClientDict}    ${TCPServerDict}    SourceInfo=${SourceInfo}    DestinationInfo=${DestinationInfo}    FilterInfo=${FilterInfo}
+
+
diff --git a/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot b/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot
index 5bf7d45..f1c7269 100644
--- a/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot
+++ b/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot
@@ -6,7 +6,7 @@ Resource          ../objects/NewObject.robot
 
 *** Keywords ***
 UIAddProxyTCPOptions
-    [Arguments]    ${TCPProxy}     ${TCPClientDict}    ${TCPServerDict}    ${SourceInfo}=null    ${DestinationInfo}=null
+    [Arguments]    ${TCPProxy}     ${TCPClientDict}    ${TCPServerDict}    ${SourceInfo}=null    ${DestinationInfo}=null    ${FilterInfo}=null
     ${return}    ${Tcpname}    Run Keyword And Ignore Error    Get From Dictionary    ${TCPProxy}    Tcpname
     ${Tcpname}    Run Keyword If    "${return}"=="FAIL" or "${Tcpname}}"=="${EMPTY}"    set variable    null
     ...    ELSE    set variable    ${Tcpname}
@@ -349,30 +349,7 @@ Create-Destination
     ...    AND    sleep    ${sleep}
     ...    AND    DestinationIPCreateOrSearch    ${typepath}    ${CreateOrSearch}    ${Add}    ${Type1}    ${Name}    ${ObjectName}    ${Ipclienttext1}     ${Port}    ${Country}    ${City}    ${Fqdn}    ${Protocols1}    ${Degree}    ${Times}    ${Numbers}    ${Limits}
        
-SourceIPCreateOrSearch
-    [Arguments]    ${PolicyType}    ${CreateOrSearch}    ${Add}    ${Ip_type}    ${Name}    ${ObjectName}    ${Ipclienttext1}
-    ...     ${Port}    ${Country}    ${City}    ${Fqdn}    ${Protocols1}    ${Degree}    ${Times}    ${Numbers}    ${Limits}
-    [Documentation]    调用次关键字前需要添加必填参数：
-    ...    ${CreateOrSearch}:填入Create或者Search
-    ...    ${Add}:填入Address或Group
-    ...    ${Name}:名称
-    ...    ${Ip_type}:填入Ip或者Geography或者IPLearning
-    ...    ${Ipclienttext1}:填入IPV4或6的值或range的ip段
-    ...    ${Port}:填入端口
-    ...    ${Country}:列表形式，列表中是国家名字
-    ...    ${City}:列表形式，列表中是城市名字
-    ...    ${Protocols1}:填入HTTP或SSL或HTTPSSL
-    ...    ${Degree}:填入1Degree或2Degree
-    ...    ${Times}:填入小时数，例如1或2
-    ...    ${Numbers}:填入数值，例如1或10000
-    ...    ${Limits}:填入数值，例如1或10000
-    ...    ${ObjectName}:列表形式，列表中是对象的名字
-    ...    判断是新建ip还是搜索添加ip
-    run keyword if    "${CreateOrSearch}"=="Create"    run keywords    sleep    ${sleep}
-    ...    AND    click element    id=interceptionadd_proaddaddSource
-    ...    AND    SourceIPAdd    ${PolicyType}    ${Add}    ${Ip_type}    ${Name}    ${ObjectName}    ${Ipclienttext1}     ${Port}    ${Country}    ${City}    ${Fqdn}    ${Protocols1}    ${Degree}    ${Times}    ${Numbers}    ${Limits}
-    ...    ELSE IF    "${CreateOrSearch}"=="Search"    run keywords    sleep    ${sleep}
-    ...    AND    SourceSearch    ${PolicyType}    ${ObjectName}
+
 SUBIDCreateOrSearch
     [Arguments]    ${PolicyType}    ${CreateOrSearch}    ${Add}    ${Name}    ${Keywordtext}    ${ObjectName}    
     [Documentation]    调用次关键字前需要添加必填参数：
@@ -675,10 +652,10 @@ DestinationCreate-ok
     # ...    ELSE    log    不添加Filter
 Filter-create
     [Arguments]    ${FilterInfo}
-    ${return}    ${Filtercreate}    Run Keyword And Ignore Error    Get From Dictionary    ${PolicyInfo}    Filtercreate
+    ${return}    ${Filtercreate}    Run Keyword And Ignore Error    Get From Dictionary    ${FilterInfo}    Filtercreate
     ${Filtercreate}    Run Keyword If    "${return}"=="FAIL" or "${Filtercreate}"=="${EMPTY}"    set variable    null
     ...    ELSE    set variable    ${Filtercreate}
-    ${return}    ${SNIname}    Run Keyword And Ignore Error    Get From Dictionary    ${PolicyInfo}    SNIname
+    ${return}    ${SNIname}    Run Keyword And Ignore Error    Get From Dictionary    ${FilterInfo}    SNIname
     ${SNIname}    Run Keyword If    "${return}"=="FAIL" or "${SNIname}"=="${EMPTY}"    set variable    null
     ...    ELSE    set variable    ${SNIname}
     FOR    ${i}    IN    @{Filtercreate}
@@ -722,12 +699,9 @@ TCP-Bypass-Duplicated-Packet
     ...    ELSE    log    不开启
 TCP-Client-side-Parameters
     [Arguments]    ${TCPClientDict}
-    # ...    ${Clientelement}=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[9]/div[2]/div[1]
-    # ...    ${ClientOverrideMSS}=null    ${ClientMSSvalue}=null    ${ClientNoDelay}=null    ${Clientttlvalue}=null    ${ClientKeepalive}=null    ${ClientProbeNumber}=null
-    # ...    ${ClientIdleTime}=null    ${ClientInterval}=null    ${ClientUserTimeout}=null
-    ${return}    ${Clientelement}    Run Keyword And Ignore Error    Get From Dictionary    ${TCPClientDict}    Clientelement
-    ${Clientelement}    Run Keyword If    "${return}"=="FAIL" or "${Clientelement}"=="${EMPTY}"    set variable    null
-    ...    ELSE    set variable    ${Clientelement}
+
+    ${Clientelement}    set variable    /html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[9]/div[2]/div[1]
+    
     ${return}    ${ClientOverrideMSS}    Run Keyword And Ignore Error    Get From Dictionary    ${TCPClientDict}    ClientOverrideMSS
     ${ClientOverrideMSS}    Run Keyword If    "${return}"=="FAIL" or "${ClientOverrideMSS}"=="${EMPTY}"    set variable    null
     ...    ELSE    set variable    ${ClientOverrideMSS}
@@ -797,12 +771,8 @@ TCP-Client-side-Parameters
     sleep    ${sleep}  
 TCP-Server-side-Parameters
     [Arguments]    ${TCPServerDict}
-    # ...    ${Serverelement}=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[9]/div[2]/div[2]
-    # ...    ${ServerOverrideMSS}=null    ${ServerMSSvalue}=null    ${ServerNoDelay}=null    ${Serverttlvalue}=null    ${ServerKeepalive}=null    ${ServerProbeNumber}=null
-    # ...    ${ServerIdleTime}=null    ${ServerInterval}=null    ${ServerUserTimeout}=null
-    ${return}    ${Serverelement}    Run Keyword And Ignore Error    Get From Dictionary    ${TCPServerDict}    Serverelement
-    ${Serverelement}    Run Keyword If    "${return}"=="FAIL" or "${Serverelement}"=="${EMPTY}"    set variable    null
-    ...    ELSE    set variable    ${Serverelement}
+
+    ${Serverelement}    set variable    /html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[9]/div[2]/div[2]
     
     ${return}    ${ServerOverrideMSS}    Run Keyword And Ignore Error    Get From Dictionary    ${TCPServerDict}    ServerOverrideMSS
     ${ServerOverrideMSS}    Run Keyword If    "${return}"=="FAIL" or "${ServerOverrideMSS}"=="${EMPTY}"    set variable    null