From 23f7b250c00597ad89282075460a4c27dffe1ada Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:39:06 +0800
Subject: [PATCH] Merge branch 'dev-msg'
---
fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java
index 2427ae7..52e9d2d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java
@@ -204,13 +204,12 @@
url += String.format("%s=%s&", key, URLEncoder.encode(params.get(key), "UTF-8"));
}
- //System.out.println("url"+url);
+ // System.out.println("url"+url);
GetMethod method = new GetMethod(url);
- //3S鐨勫搷搴旇秴鏃�
- HttpConnectionManagerParams hparams = new
- HttpConnectionManagerParams();
- hparams.setConnectionTimeout(3000);
- client.getHttpConnectionManager().setParams(hparams);
+ // 3S鐨勫搷搴旇秴鏃�
+ HttpConnectionManagerParams hparams = new HttpConnectionManagerParams();
+ hparams.setConnectionTimeout(3000);
+ client.getHttpConnectionManager().setParams(hparams);
/*
* if(proxy){ Address address = ProxyUtil.getAddressProxy();
@@ -274,10 +273,11 @@
}
public static String taoKeGet(Map<String, String> params) {
- // 鑱氱煶濉旀湇鍔″櫒鐜 118.178.179.189
- String result = get("http://118.178.179.189/taoke/", params, false);
- if (StringUtil.isNullOrEmpty(result))
- result = get("http://gw.api.taobao.com/router/rest", params, false);
+ // 鑱氱煶濉旀湇鍔″櫒鐜 118.178.179.189
+
+ // result = get("http://118.178.179.189/taoke/", params, false);
+ // if (StringUtil.isNullOrEmpty(result))
+ String result = get("http://gw.api.taobao.com/router/rest", params, false);
return result;
}
--
Gitblit v1.8.0