diff --git a/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot index 613fe90..bf8a283 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot @@ -13,7 +13,7 @@ ${url} /v1/policy/profile/insertscripts *** Test Cases *** Proxy-Policy-insert-00001 - [Tags] fqdn完整匹配 + [Tags] fqdn完整匹配 update policy:ip geo,fqdn Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.costcotravel.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -23,8 +23,16 @@ Proxy-Policy-insert-00001 Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId + Comment 创建ip geo + ${addItemList1} Create Dictionary keywordArray=XXG地区.* + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*.costcotravel.com + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-01 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -38,14 +46,16 @@ Proxy-Policy-insert-00001 insert_policyId_to_file1 insert_profileId ${profiledId} insert_policyId_to_file1 insert_objectId ${objectId} insert_policyId_to_file1 insert_objectId39 ${objectId1} + insert_policyId_to_file1 insert_objectId41 ${objectId2} + insert_policyId_to_file1 insert_objectId42 ${objectId3} insert_policyId_to_file1 intercept_insert_policyId ${policyId1} insert_policyId_to_file1 insert_policyId ${policyId2} Proxy-Policy-insert-00002 [Tags] cat右匹配 Comment 创建fqdn - # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*cruisingpower.com - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.meilleurmobile.com + ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=meilleurmobile ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} @@ -53,19 +63,19 @@ Proxy-Policy-insert-00002 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=169|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-02 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=169|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建insert策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-insert-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${profiledId},"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-insert-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${profiledId},"protocol":"HTTP"} filterList=169|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} ${policyId2} Set Variable ${policyId2}[0] insert_policyId_to_file1 insert_profileId1 ${profiledId} - #insert_policyId_to_file1 insert_objectId1 ${objectId} + insert_policyId_to_file1 insert_objectId1 ${objectId} insert_policyId_to_file1 insert_objectId40 ${objectId1} insert_policyId_to_file1 intercept_insert_policyId1 ${policyId1} insert_policyId_to_file1 insert_policyId1 ${policyId2} @@ -73,8 +83,8 @@ Proxy-Policy-insert-00002 Proxy-Policy-insert-00003 [Tags] url4种匹配 Comment 创建fqdn - # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*uncorneredmarket.com,*alltrails.com,*atlasobscura.com,*anguilla-beaches.com - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*ttsdalepublicart.org,$www.troop508.org,*wordpress.com,$www.doctorpoo.net + ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=scottsdalepublic*,$www.troop508.org,*wordpress.com/,doctorpoo ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} @@ -82,7 +92,7 @@ Proxy-Policy-insert-00003 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-03 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -94,13 +104,13 @@ Proxy-Policy-insert-00003 ${policyId2} Get-Pids ${policyId2} ${policyId2} Set Variable ${policyId2}[0] insert_policyId_to_file1 insert_profileId2 ${profiledId} - #insert_policyId_to_file1 insert_objectId2 ${objectId} + insert_policyId_to_file1 insert_objectId2 ${objectId} insert_policyId_to_file1 insert_objectId3 ${objectId1} insert_policyId_to_file1 intercept_insert_policyId2 ${policyId1} insert_policyId_to_file1 insert_policyId2 ${policyId2} Proxy-Policy-insert-00004 - [Tags] 请求头左匹配 + [Tags] 请求头左匹配 update policy:url,请求头 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*viator.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -113,8 +123,14 @@ Proxy-Policy-insert-00004 Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId + Comment 创建url + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=viator.com + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + Comment 创建请求头 + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent + ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-04 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -129,6 +145,8 @@ Proxy-Policy-insert-00004 insert_policyId_to_file1 insert_objectId4 ${objectId} insert_policyId_to_file1 insert_objectId5 ${objectId1} insert_policyId_to_file1 insert_objectId6 ${objectId2} + insert_policyId_to_file1 insert_objectId43 ${objectId3} + insert_policyId_to_file1 insert_objectId44 ${objectId4} insert_policyId_to_file1 intercept_insert_policyId3 ${policyId1} insert_policyId_to_file1 insert_policyId3 ${policyId2} @@ -232,21 +250,24 @@ Proxy-Policy-insert-00007 insert_policyId_to_file1 insert_policyId6 ${policyId2} Proxy-Policy-insert-00008 - [Tags] 应答头右匹配 + [Tags] 应答头右匹配 update policy :应答头 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*waikikibeachwalk.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=Shops.htm ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 + Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头2 + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-08 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -261,6 +282,7 @@ Proxy-Policy-insert-00008 insert_policyId_to_file1 insert_objectId16 ${objectId} insert_policyId_to_file1 insert_objectId17 ${objectId1} insert_policyId_to_file1 insert_objectId18 ${objectId2} + insert_policyId_to_file1 insert_objectId45 ${objectId3} insert_policyId_to_file1 intercept_insert_policyId7 ${policyId1} insert_policyId_to_file1 insert_policyId7 ${policyId2} diff --git a/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot index da95b14..e91c2f4 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot @@ -5,6 +5,9 @@ Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** Proxy-Policy-insert-00001 @@ -14,7 +17,21 @@ Proxy-Policy-insert-00001 ${stringlist} run keyword if '${systemType}'=='Windows' Create List X-TG-Construct-By: tfe Tango Secure Gateway CA ... ELSE Create List X-TG-Construct-By: tfe Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变拦截策略 + ${policyDict} Create Dictionary policyId=${intercept_insert_policyId} source=${insert_objectId41}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Intercept-insert-1 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${insert_objectId42}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 改变Hijack策略 + ${policyDict} Create Dictionary policyId=${insert_policyId} source=${insert_objectId41}|TSG_SECURITY_SOURCE_LOCATION policyName=Proxy-Policy-insert-00001-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${insert_profileId},"protocol":"HTTP"} filterList=${insert_objectId42}|TSG_FIELD_HTTP_HOST,${insert_objectId39}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00001.bat + ... ELSE set variable curl -kv https://www.costcotravel.com/Vacation-Packages + ${stringlist} run keyword if '${systemType}'=='Windows' Create List X-TG-Construct-By: tfe Tango Secure Gateway CA + ... ELSE Create List X-TG-Construct-By: tfe Tango Secure Gateway CA + ${rescode} SystemCommands ${commandstr} ${stringlist} + Proxy-Policy-insert-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00002.bat @@ -56,6 +73,16 @@ Proxy-Policy-insert-00004 ${stringlist} run keyword if '${systemType}'=='Windows' Create List select_language Tango Secure Gateway CA ... ELSE Create List select_language Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 改变Hijack策略 + ${policyDict} Create Dictionary policyId=${insert_policyId3} policyName=Proxy-Policy-insert-00004-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${insert_profileId3},"protocol":"HTTP"} filterList=${insert_objectId43}|TSG_FIELD_HTTP_URL,${insert_objectId44}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00004.bat + ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'https://www.baidu.com/' https://www.viator.com/login?login_redirect=%2Faccount%2Fbookings + ${stringlist} run keyword if '${systemType}'=='Windows' Create List select_language Tango Secure Gateway CA + ... ELSE Create List select_language Tango Secure Gateway CA + ${rescode} SystemCommands ${commandstr} ${stringlist} Proxy-Policy-insert-00005 Comment 功能端验证HTTP验证 @@ -88,7 +115,17 @@ Proxy-Policy-insert-00008 ${stringlist} run keyword if '${systemType}'=='Windows' Create List alert ... ELSE Create List alert ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变Hijack策略 + ${policyDict} Create Dictionary policyId=${insert_policyId7} policyName=Proxy-Policy-insert-00008-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${insert_profileId7},"protocol":"HTTP"} filterList=${insert_objectId17}|TSG_FIELD_HTTP_URL,${insert_objectId45}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00008.bat + ... ELSE set variable curl -kv http://www.waikikibeachwalk.com/Shops.htm + ${stringlist} run keyword if '${systemType}'=='Windows' Create List alert + ... ELSE Create List alert + ${rescode} SystemCommands ${commandstr} ${stringlist} + Proxy-Policy-insert-00009 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00009.bat diff --git a/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot index bb7a934..c19d0af 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot @@ -22,6 +22,8 @@ Proxy-Policy-insert-00001 #删除对象 ${objectids} set Variable ${insert_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId39} + ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId41} + ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId42} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId}]} @@ -33,7 +35,7 @@ Proxy-Policy-insert-00002 #删除文件 ${profiledId} set Variable ${insert_profileId1} #删除对象 - #${objectids} set Variable ${insert_objectId1} + ${objectids} set Variable ${insert_objectId1} ${objectids} set Variable ${insert_objectId40} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId1}]} @@ -46,7 +48,7 @@ Proxy-Policy-insert-00003 #删除文件 ${profiledId} set Variable ${insert_profileId2} #删除对象 - #${objectids} set Variable ${insert_objectId2} + ${objectids} set Variable ${insert_objectId2} ${objectids} set Variable ${insert_objectId3} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId2}]} @@ -65,6 +67,8 @@ Proxy-Policy-insert-00004 ${objectids} set Variable ${insert_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId5} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId6} + ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId43} + ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId44} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId3}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId3}]} @@ -121,6 +125,7 @@ Proxy-Policy-insert-00008 ${objectids} set Variable ${insert_objectId16} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId17} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId18} + ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId45} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId7}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId7}]} diff --git a/05-Other/curl/command/ProxyPolicy_insert_00002.bat b/05-Other/curl/command/ProxyPolicy_insert_00002.bat index 3fd37e4..549239e 100644 --- a/05-Other/curl/command/ProxyPolicy_insert_00002.bat +++ b/05-Other/curl/command/ProxyPolicy_insert_00002.bat @@ -1 +1 @@ -curl -kv https://www.meilleurmobile.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv https://www.meilleurmobile.com/ | iconv -f utf-8 -t gbk//IGNORE \ No newline at end of file diff --git a/05-Other/curl/command/ProxyPolicy_insert_00003.bat b/05-Other/curl/command/ProxyPolicy_insert_00003.bat index c899fa9..ceb6ffd 100644 --- a/05-Other/curl/command/ProxyPolicy_insert_00003.bat +++ b/05-Other/curl/command/ProxyPolicy_insert_00003.bat @@ -1 +1 @@ -curl -kv https://scottsdalepublicart.org/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv https://scottsdalepublicart.org/ | iconv -f utf-8 -t gbk//IGNORE \ No newline at end of file diff --git a/05-Other/curl/command/ProxyPolicy_insert_00008.bat b/05-Other/curl/command/ProxyPolicy_insert_00008.bat index c4f18f8..44787a1 100644 --- a/05-Other/curl/command/ProxyPolicy_insert_00008.bat +++ b/05-Other/curl/command/ProxyPolicy_insert_00008.bat @@ -1 +1 @@ -curl -kv http://www.waikikibeachwalk.com/Shops.htm | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv http://www.waikikibeachwalk.com/Shops.htm | iconv -f utf-8 -t gbk//IGNORE \ No newline at end of file