update proxy

lcstore · Jan 14, 2015 · 6a4462e · 6a4462e
1 parent e384ff3
commit 6a4462e
Show file tree

Hide file tree

Showing 5 changed files with 31,382 additions and 129 deletions.
diff --git a/iscript-core/iscript-core-client/src/main/resources/config/client.properties b/iscript-core/iscript-core-client/src/main/resources/config/client.properties
@@ -1,29 +1,29 @@
-yeam_name=lezo
-yeam_tasker_host=http://lezp.wicp.net:30256/tasker/taskservlet/service
-host=localhost
-task_worker_core=5
-send_period_time=2000
-
-task_capacity=50
-storage_capacity=20
-persistent_capacity=30
-
-host=c.lezomao.com
-port=8209
-name=myClient
-
-#lcstore
-qiniu_accessKey=dwCDiS4sTkm_8aXoesOHIvFKy65OdrBskcxThAmv
-qiniu_secretKey=vflRTCRrydngKk7QRYcTh7BYmsG-9KeH-NET4riL
-qiniu_bucket=istore
-
-#dlinked1001
-qiniu_accessKey=fQvW5tvryZ9YoAPgOUH-AwjaFRJImsgekp8NgIrG
-qiniu_secretKey=SbZs6Nr3fZTP23I0vodwGkyOnYOdXN6PSzxvoxEy
-qiniu_bucket=d1002
-
-#dlinked
-qiniu_accessKey=9LRrNHyvLCeGLIreQ44VOPUgwyHsHEGFmto0CKtf
-qiniu_secretKey=vgkZsUExS4fc4Iym1FZPEgRe5BxItMnKmv0Ew0dk
-qiniu_bucket=d1001
-
+yeam_name=lezo
+yeam_tasker_host=http://lezp.wicp.net:30256/tasker/taskservlet/service
+host=localhost
+task_worker_core=5
+send_period_time=2000
+
+task_capacity=50
+storage_capacity=20
+persistent_capacity=30
+
+host=c.lezomao.com
+port=8209
+name=my1001
+
+#lcstore
+qiniu_accessKey=dwCDiS4sTkm_8aXoesOHIvFKy65OdrBskcxThAmv
+qiniu_secretKey=vflRTCRrydngKk7QRYcTh7BYmsG-9KeH-NET4riL
+qiniu_bucket=istore
+
+#dlinked1001
+qiniu_accessKey=fQvW5tvryZ9YoAPgOUH-AwjaFRJImsgekp8NgIrG
+qiniu_secretKey=SbZs6Nr3fZTP23I0vodwGkyOnYOdXN6PSzxvoxEy
+qiniu_bucket=d1002
+
+#dlinked
+qiniu_accessKey=9LRrNHyvLCeGLIreQ44VOPUgwyHsHEGFmto0CKtf
+qiniu_secretKey=vgkZsUExS4fc4Iym1FZPEgRe5BxItMnKmv0Ew0dk
+qiniu_bucket=d1001
+
diff --git a/...ent/src/test/java/com/lezo/iscript/yeam/http/CachePoolingClientConnectionManagerTest.java b/...ent/src/test/java/com/lezo/iscript/yeam/http/CachePoolingClientConnectionManagerTest.java
@@ -168,11 +168,15 @@ public void testSocketProxy() throws Exception {
 		socksaddr = new InetSocketAddress("122.14.166.37", 1080);
 
 		socksaddr = new InetSocketAddress("76.233.192.215", 31258);
-		
-		//http://fastproxyservers.org/socks5-servers.htm
+
+		// http://fastproxyservers.org/socks5-servers.htm
 		socksaddr = new InetSocketAddress("202.38.95.66", 1080);
 		socksaddr = new InetSocketAddress("207.255.105.53", 36006);
 
+		socksaddr = new InetSocketAddress("115.112.189.79", 8080);
+		socksaddr = new InetSocketAddress("37.228.134.52", 7808);
+		socksaddr = new InetSocketAddress("110.139.128.4", 80);
+
 		// http://www.xroxy.com/proxy-type-Socks5.htm
 		// socksaddr = new InetSocketAddress("61.147.67.2", 9125);
 		// socksaddr = new InetSocketAddress("124.42.127.221", 1080);

diff --git a/iscript-core/iscript-core-resulter/src/main/resources/spring/spring-bean-timer.xml b/iscript-core/iscript-core-resulter/src/main/resources/spring/spring-bean-timer.xml
@@ -42,11 +42,12 @@
 				<value>ConfigJdPromotion</value>
 				<value>ConfigProxyDetector</value>
 				<value>ConfigYhdPromotion</value> 
-				-->
+				
 				<value>ConfigTmallBrandShop</value>
 				<value>ConfigJdBrandShop</value>
 				<value>ConfigProxyDetector</value>
 				<value>ConfigProxyCollector</value>
+				-->
 				<value>ConfigProxyChecker</value>
 			</list>
 		</property>