From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
index ea8ce84..5b19dd5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
@@ -13,6 +13,7 @@
 import org.yeshi.utils.HttpUtil;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
@@ -86,12 +87,22 @@
 			map.put("keyword", sf.getKw());
 		map.put("pid", PID_FANLI);
 		String result = baseRequest(map);
+		
+		try {
+			result = new String(result.getBytes("GBK"),"UTF-8");
+//			result = new String(result.getBytes("GBK"),"ISO-8859-1");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("goods_search_response");
 		JSONArray array = root.optJSONArray("goods_list");
 		Type type = new TypeToken<List<PDDGoodsDetail>>() {
 		}.getType();
-		List<PDDGoodsDetail> goodsList = new Gson().fromJson(array.toString(), type);
+		
+		Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+		List<PDDGoodsDetail> goodsList = gson.fromJson(array.toString(), type);
 		int totalCount = json.optInt("total_count");
 		return new PDDGoodsResult(totalCount, goodsList);
 	}

--
Gitblit v1.8.0