From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 52e9d2d..2b649f2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoHttpUtil.java
@@ -277,7 +277,9 @@
// 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);
+ //https://eco.taobao.com/router/rest
+ //http://gw.api.taobao.com/router/rest
+ String result = get("https://eco.taobao.com/router/rest", params, false);
return result;
}
--
Gitblit v1.8.0