From 81a2c8e297787cc7dc405d6db4972cb917cd80b5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 一月 2020 16:50:57 +0800
Subject: [PATCH] 无用代码删除,单品分享接口修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |  544 ++++++++++++++++++-----------------------------------
 1 files changed, 187 insertions(+), 357 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 9d5f2a8..656ff83 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -39,10 +39,12 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.user.TokenRecordException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.brand.BrandInfoService;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
@@ -55,6 +57,8 @@
 import com.yeshi.fanli.service.inter.user.HistorySearchService;
 import com.yeshi.fanli.service.inter.user.TokenRecordService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.service.manger.ClipboardAnalysisManager;
+import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;
 import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
@@ -77,8 +81,10 @@
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 import com.yeshi.fanli.vo.brand.BrandInfoVO;
 import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
+import com.yeshi.fanli.vo.common.JumpDetailContentVO;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 import com.yeshi.fanli.vo.msg.TokenVO;
+import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -138,6 +144,12 @@
 	@Resource
 	private JDGoodsLinkParseManager jdGoodsLinkParseManager;
 
+	@Resource
+	private ClipboardAnalysisManager clipboardAnalysisManager;
+
+	@Resource
+	private JumpDetailV2Service jumpDetailV2Service;
+
 	/**
 	 * 绮樿创鏉夸俊鎭帹鑽�
 	 * 
@@ -156,381 +168,199 @@
 		text = text.trim();
 		String originalText = text;
 
-		try {
-			TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
-			out.print(JsonUtil.loadTrueResult(tokenVO));
-			return;
-		} catch (TokenRecordException e) {
-			if (e.getCode() == 1001) { // 闇�瑕佺敤鎴风櫥褰�
-				out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
-				return;
-			}
-		}
+		JSONObject data = new JSONObject();
 
-		TaoBaoGoodsBrief tb = null;
-		String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
+		clipboardAnalysisManager.parse(acceptData.getPlatform(), acceptData.getVersion(), originalText, uid,
+				new IClipboardAnalysisResult() {
 
-		Pattern p = Pattern.compile(URL_REGEX);
-		Matcher matcher = p.matcher(text);
-		if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
-			if (text.length() > 256) {
-				out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
-				return;
-			}
-			String pattern = "^[A-Za-z0-9-]+$";
-			if (Pattern.matches(pattern, text.replace(" ", ""))) {// 鍒犻櫎绌烘牸
-				out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
-				return;
-			}
+					@Override
+					public void onResult(GoodsDocParseResultVO result) {
+						if (uid == null) {
+							out.print(JsonUtil.loadFalseResult("鏃犳帹鑽�"));
+							return;
+						}
 
-			LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
+						JSONObject root = new JSONObject();
+						root.put("type", 20);
+						JSONObject data = new JSONObject();
+						data.put("text", originalText);
+						//
+						int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+						int version = Integer.parseInt(acceptData.getVersion());
+						JumpDetailContentVO convert = new JumpDetailContentVO();
+						convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));
+						JSONObject convertParams = new JSONObject();
+						convertParams.put("url", configService.get(ConfigKeyEnum.convertDocWebLink.getKey()));
+						convertParams.put("clipboard", false);
+						convert.setParams(convertParams);
 
-			if (text.length() > 80) {
-				out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
-				return;
-			}
+						JumpDetailContentVO view = null;
+						JumpDetailContentVO guessLike = null;
 
-			if (analysisTaoToken(acceptData, text, out)) {
-				return;
-			}
-			if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text))) {
-				out.print(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
-				return;
-			}
-			JSONObject root = new JSONObject();
-			root.put("type", 2);
-			JSONObject data = new JSONObject();
-			data.put("title", text);
-			root.put("data", data);
-			out.print(JsonUtil.loadTrueResult(root));
-			return;
-		}
+						Gson gson = JsonUtil.getApiCommonGson();
+						data.put("title", "鏅鸿兘鎼滅储");
+						
+						
 
-		int type = 3;
-		CommonGoods commonGoods = null;
-		text = matcher.group();
+						int state = 0;
+						if (result.getFirstGoods() != null && result.getFirstGoods().getGoodsId() != null) {
+							state = 2;
+							data.put("stateDesc", "閫夋嫨鎼滃埜鎴栬浆閾�");
+							JSONObject params = new JSONObject();
+							params.put("id", result.getFirstGoods().getGoodsId()+"");
+							params.put("from", "杞摼");
+							if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+								view = new JumpDetailContentVO();
+								view.setJumpDetail(
+										jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version));
+								view.setParams(params);
+							} else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_JD) {
+								view = new JumpDetailContentVO();
+								view.setJumpDetail(
+										jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version));
+								view.setParams(params);
+							} else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+								view = new JumpDetailContentVO();
+								view.setJumpDetail(
+										jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version));
+								view.setParams(params);
+							}
 
-		if (text.startsWith("https://a.m.taobao.com/i"))// 娣樺疂璐﹀彿鏈櫥褰曠姸鎬�
-		{
-			text = text.substring("https://a.m.taobao.com/i".length(), text.indexOf(".htm"));
-			if (NumberUtil.isNumeric(text)) {
-				tb = TaoBaoUtil.isAlimama(text);
-			}
-		} else if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 鑱氬垝绠�
-			int index = text.indexOf("item_id");
-			if (index < 0) {
-				out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-				return;
-			}
-			text = text.substring(index);
-			int last = text.indexOf("&");
-			String id = "";
-			if (last > 0)
-				id = text.substring(text.indexOf("=") + 1, text.indexOf("&"));
-			else {
-				id = text.substring(text.indexOf("=" + 1));
-			}
-			tb = TaoBaoUtil.isAlimama(id);
-			if (tb == null) {
-				type = 4;
-				tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
-			}
-		} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
-			tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
-		} else if (text.contains("h5.m.taobao") || text.contains("detail.m.tmall") || text.contains("item.taobao")
-				|| text.contains("detail.tmall")) { // 鎵嬫満椤甸潰鍜岀數鑴戦〉闈�
-			Map<String, String> map = Utils.parseURL(text);
-			String id = "";
-			id = map.get("id").replace("}", "");
-			tb = TaoBaoUtil.isAlimama(id);
-			if (tb == null) {
-				type = 4;
-				tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
-			}
-		} else if (text.contains("v.douyin.com")) { // 鎶栭煶
-			analysisDouYin(acceptData, text, out);
-			return;
-		} else {
-			tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);
-
-			if (tb == null) {
-				String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
-				if (!StringUtil.isNullOrEmpty(goodsId)) {
-					tb = getTaoBaoGoodsBriefFromGoodsId(goodsId, originalText);
-					if (tb != null)
-						type = 4;
-				}
-			}
-
-			if (tb == null)// 娣樺疂鏄┖鍊�
-			{
-				String jdId = JDUtil.getJDGoodsId(text);
-
-				// 寰俊閾炬帴
-				if (StringUtil.isNullOrEmpty(jdId)) {
-					jdId = JDUtil.getJDGoodsIdByWeiXin(text);
-				}
-
-				// 棰嗗埜鐭繛鎺�
-				if (StringUtil.isNullOrEmpty(jdId) && text.contains("u.jd.com")) {
-					jdId = jdGoodsLinkParseManager.parseGoodsIdByJDShortUrl(text);
-				}
-
-				if (!StringUtil.isNullOrEmpty(jdId)) {
-					JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
-					if (goods != null) {
-						// 楂樼骇鎺ュ彛 -- 淇℃伅鏇村畬鏁�
-						JDGoods jdGoods = JDApiUtil.queryGoodsDetail(Long.parseLong(jdId));
-						if (jdGoods != null) {
-							commonGoods = CommonGoodsFactory.create(jdGoods);
+						} else if (!StringUtil.isNullOrEmpty(result.getFirstLink())) {
+							state = 2;
+							data.put("stateDesc", "閫夋嫨鎼滃埜鎴栬浆閾�");
+							view = new JumpDetailContentVO();
+							view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));
+							JSONObject params = new JSONObject();
+							params.put("url", result.getFirstLink());
+							view.setParams(params);
 						} else {
-							commonGoods = CommonGoodsFactory.create(goods);
+							data.put("stateDesc", "鍘昏瘯璇曡浆閾�");
+							state = 1;
 						}
-					} else {
-						type = 4;
-						goods = JDUtil.getSimpleGoodsInfo(jdId);
-						if (goods != null) {
-							commonGoods = new CommonGoods();
-							commonGoods.setTitle(goods.getSkuName());
-							commonGoods.setPicture(goods.getPicUrl());
-						}
+						data.put("state", state);
+						if (convert != null)
+							data.put("convert", gson.toJson(convert));
+						if (view != null)
+							data.put("view", gson.toJson(view));
+
+						if (guessLike != null)
+							data.put("guessLike", gson.toJson(guessLike));
+
+						root.put("data", data);
+						out.print(JsonUtil.loadTrueResult(root));
+						return;
 					}
-				} else {
-					String pddId = PinDuoDuoUtil.getPDDGoodsId(text);
-					if (!StringUtil.isNullOrEmpty(pddId)) {
-						PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));
-						if (goods != null) {
-							commonGoods = CommonGoodsFactory.create(goods);
-						} else {
-							type = 4;
-							goods = PinDuoDuoUtil.getPDDGoodsInfo(pddId);
-							if (goods != null) {
-								commonGoods = new CommonGoods();
-								commonGoods.setTitle(goods.getGoodsName());
-								commonGoods.setPicture(goods.getGoodsThumbnailUrl());
+
+					@Override
+					public void onResult(String result) {
+						JSONObject root = new JSONObject();
+						root.put("type", 2);
+						JSONObject data = new JSONObject();
+						data.put("title", result);
+						root.put("data", data);
+						out.print(JsonUtil.loadTrueResult(root));
+						return;
+					}
+
+					@Override
+					public void onResult(CommonGoods goods) {
+						if (goods.getGoodsId() != null) {
+							if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {// 1.6.5鐗堟湰鍚庤繑鍥炲晢鍝佽鎯�
+								if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+									TaoBaoGoodsBrief goodsBrief = null;
+									try {
+										goodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getGoodsId());
+									} catch (TaobaoGoodsDownException e) {
+										e.printStackTrace();
+									}
+
+									if (goodsBrief != null) {
+										goods = CommonGoodsFactory.create(goodsBrief);
+										Gson gson = JsonUtil
+												.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+												.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd")
+												.create();
+										data.put("type", 3);
+										data.put("goods",
+												gson.toJson(
+														GoodsDetailVOFactory.convertCommonGoods(goods,
+																hongBaoManageService.getShowComputeRate(
+																		acceptData.getPlatform(),
+																		acceptData.getVersion()))));
+										out.print(JsonUtil.loadTrueResult(data));
+										return;
+									}
+								} else {
+									Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+											.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd")
+											.create();
+									data.put("type", 3);
+									data.put("goods",
+											gson.toJson(
+													GoodsDetailVOFactory.convertCommonGoods(goods,
+															hongBaoManageService.getShowComputeRate(
+																	acceptData.getPlatform(),
+																	acceptData.getVersion()))));
+									out.print(JsonUtil.loadTrueResult(data));
+									return;
+								}
+							} else {
+								// 浣庝簬1.6.5鐗堟湰
+								JSONObject taoBaoGoodsJSON = new JSONObject();
+								taoBaoGoodsJSON.put("title", goods.getTitle());
+								taoBaoGoodsJSON.put("zkPrice", goods.getPrice() + "");
+								taoBaoGoodsJSON.put("id", goods.getGoodsId());
+								taoBaoGoodsJSON.put("goodsType", goods.getGoodsType());
+								if (goods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+									taoBaoGoodsJSON.put("url",
+											"http://item.taobao.com/item.htm?id=" + goods.getGoodsId());
+								} else if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+									taoBaoGoodsJSON.put("url",
+											String.format("https://item.jd.com/%s.html", goods.getGoodsId() + ""));
+								} else if (goods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+									taoBaoGoodsJSON.put("url",
+											"http://yangkeduo.com/goods.html?goods_id=" + goods.getGoodsId());
+								}
+								data.put("goods", taoBaoGoodsJSON);
+								List<String> picList = new ArrayList<>();
+								picList.add(goods.getPicture());
+								data.put("imgs", picList);
+								JSONObject root = new JSONObject();
+								root.put("type", 1);
+								root.put("data", data);
+								out.print(JsonUtil.loadTrueResult(root));
+								return;
 							}
 						}
-					}
-				}
-			}
-		}
 
-		if (tb == null && commonGoods == null) {
-			out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-			return;
-		}
+						JSONObject goodsJSON = new JSONObject();
+						goodsJSON.put("title", goods.getTitle());
+						goodsJSON.put("pictUrl", goods.getPicture());
 
-		if (type == 4) {
-			if (!VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
-				out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-				return;
-			}
-
-			JSONObject data = new JSONObject();
-			if (tb != null) {
-				commonGoods = new CommonGoods();
-				commonGoods.setTitle(tb.getTitle());
-				commonGoods.setPicture(tb.getPictUrl());
-			}
-
-			if (StringUtil.isNullOrEmpty(commonGoods.getTitle())
-					|| StringUtil.isNullOrEmpty(commonGoods.getPicture())) {
-				out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-				return;
-			}
-
-			JSONObject goodsJSON = new JSONObject();
-			goodsJSON.put("title", commonGoods.getTitle());
-			goodsJSON.put("pictUrl", commonGoods.getPicture());
-
-			data.put("type", type);
-			data.put("desc", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
-			data.put("goods", goodsJSON);
-			out.print(JsonUtil.loadTrueResult(data));
-			return;
-		}
-
-		JSONObject data = new JSONObject();
-		if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
-			if (tb != null) {
-				TaoBaoGoodsBrief goodsBrief = null;
-				try {
-					goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());
-				} catch (TaobaoGoodsDownException e) {
-					e.printStackTrace();
-				}
-				if (goodsBrief == null) {
-					out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-					return;
-				}
-				commonGoods = CommonGoodsFactory.create(goodsBrief);
-			}
-
-			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
-					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-			data.put("type", type);
-			data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
-					hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
-			out.print(JsonUtil.loadTrueResult(data));
-			return;
-		}
-
-		if (tb != null) {
-			commonGoods = new CommonGoods();
-			commonGoods.setPrice(tb.getZkPrice());
-			commonGoods.setTitle(tb.getTitle());
-			commonGoods.setGoodsId(tb.getAuctionId());
-			commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-			commonGoods.setPicture(tb.getPictUrl());
-		}
-
-		JSONObject taoBaoGoodsJSON = new JSONObject();
-		taoBaoGoodsJSON.put("title", commonGoods.getTitle());
-		taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");
-		taoBaoGoodsJSON.put("id", commonGoods.getGoodsId());
-		taoBaoGoodsJSON.put("goodsType", commonGoods.getGoodsType());
-		if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
-			taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + commonGoods.getGoodsId());
-		} else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {
-			taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", commonGoods.getGoodsId() + ""));
-		} else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
-			taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + commonGoods.getGoodsId());
-		}
-		data.put("goods", taoBaoGoodsJSON);
-		List<String> picList = new ArrayList<>();
-		picList.add(commonGoods.getPicture());
-		data.put("imgs", picList);
-		JSONObject root = new JSONObject();
-		root.put("type", 1);
-		root.put("data", data);
-		out.print(JsonUtil.loadTrueResult(root));
-	}
-
-	private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId, String text) {
-		TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);
-		if (tb == null && NumberUtil.isNumeric(goodsId)) {// 鏄暟瀛�
-			// tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
-			// if (tb != null) {
-			// tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
-			// }
-			if (tb == null) {
-				tb = new TaoBaoGoodsBrief();
-				if (text.trim().indexOf("銆�") == 0 && text.trim().indexOf("銆�") > 0) {
-					// 鎴彇鏍囬
-					String title = text.trim().substring(1, text.trim().lastIndexOf("銆�"));
-					tb.setAuctionId(Long.parseLong(goodsId));
-					tb.setTitle(title);
-					tb.setPictUrl("http://");
-				}
-			}
-		}
-		return tb;
-	}
-
-	/**
-	 * 瑙f瀽鎶栭煶閾炬帴
-	 * 
-	 * @param acceptData
-	 * @param text
-	 * @param out
-	 * @return
-	 */
-	private void analysisDouYin(AcceptData acceptData, String text, PrintWriter out) {
-		String location = HttpUtil.getLocation(text);
-		if (!StringUtil.isNullOrEmpty(location)) {
-			if (location.contains("taobao.com")) { // 娣樺疂鍟嗗搧
-				String realUrl = TaoBaoUtil.getRealUrl(location);
-				if (!StringUtil.isNullOrEmpty(realUrl)) {
-					getRecommendInfo(acceptData, realUrl, null, out);
-					return;
-				}
-			} else if (location.contains("haohuo.jinritemai.com")) { // 鎶栭煶鍟嗗搧
-				DouYinGoods goods = DouYinUtil.getGoodsInfo(location);
-				JSONObject goodsJSON = new JSONObject();
-				goodsJSON.put("title", goods.getName());
-				goodsJSON.put("pictUrl", goods.getImg());
-
-				JSONObject data = new JSONObject();
-				data.put("type", 4);
-				data.put("desc", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
-				data.put("goods", goodsJSON);
-				out.print(JsonUtil.loadTrueResult(data));
-				return;
-			}
-		}
-		out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-		return;
-	}
-
-	/**
-	 * 瑙f瀽娣樺彛浠�
-	 * 
-	 * @param acceptData
-	 * @param text
-	 * @param out
-	 * @return
-	 */
-	private boolean analysisTaoToken(AcceptData acceptData, String text, PrintWriter out) {
-		String token = StringUtil.picUpTaoToken(text);
-		if (!StringUtil.isNullOrEmpty(token)) {
-			Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
-			if (auctionId != null) {
-				TaoBaoGoodsBrief tb = null;
-				try {
-					tb = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
-				} catch (TaobaoGoodsDownException e) {
-					e.printStackTrace();
-				}
-
-				if (tb != null) {
-					if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
-						TaoBaoGoodsBrief goodsBrief = null;
-						try {
-							goodsBrief = TaoKeApiUtil.searchGoodsDetail(tb.getAuctionId());
-						} catch (TaobaoGoodsDownException e) {
-							e.printStackTrace();
-						}
-
-						if (goodsBrief == null) {
-							out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
-							return false;
-						}
-
-						Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
-								.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
-						JSONObject data = new JSONObject();
-						data.put("type", 3);
-						data.put("goods",
-								gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsBrief, hongBaoManageService
-										.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
+						data.put("type", 4);
+						data.put("desc", "璇ュ晢鍝佹棤鎺ㄥ箍淇℃伅");
+						data.put("goods", goodsJSON);
 						out.print(JsonUtil.loadTrueResult(data));
-						return true;
+						return;
 					}
 
-					JSONObject data = new JSONObject();
-					JSONObject taoBaoGoodsJSON = new JSONObject();
-					taoBaoGoodsJSON.put("title", tb.getTitle());
-					taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
-					taoBaoGoodsJSON.put("id", tb.getAuctionId());
-					taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);
-					taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
-					data.put("goods", taoBaoGoodsJSON);
-					if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
-						if (tb.getImgList() == null)
-							tb.setImgList(new ArrayList<>());
-						tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+					@Override
+					public void onResult(TokenVO tokenVO) {
+						out.print(JsonUtil.loadTrueResult(tokenVO));
+						return;
 					}
-					data.put("imgs", tb.getImgList());
-					JSONObject root = new JSONObject();
-					root.put("type", 1);
-					root.put("data", data);
-					out.print(JsonUtil.loadTrueResult(root));
-					return true;
-				}
-			}
-		}
-		return false;
+
+					@Override
+					public void none() {
+						out.print(JsonUtil.loadFalseResult("鏃犳帹鑽�"));
+					}
+
+					@Override
+					public void needLogin(String msg) {
+						out.print(JsonUtil.loadFalseResult(1001, msg));
+					}
+				});
 	}
 
 	/**

--
Gitblit v1.8.0