From 121c5ee5345d366ae4aadf7901af9b0678dbb7a8 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 00:24:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 2bb28b4..e5b23ed 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -1,15 +1,18 @@
package org.fanli;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Scanner;
import org.junit.Test;
import org.yeshi.utils.HttpUtil;
@@ -34,6 +37,7 @@
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.BeanUtil;
+import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
@@ -92,9 +96,12 @@
@Test
public void test2() {
- TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(571754672318L,
- new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET));
- System.out.println(goods);
+ try {
+ TaoKeApiUtil.getSimpleGoodsInfo(539432362036L);
+ } catch (TaobaoGoodsDownException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
@@ -376,4 +383,23 @@
}
}
+ @Test
+ public void test12() {
+
+ try {
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(
+ new FileInputStream(new File("C:/Users/Administrator/Desktop/鏂板缓鏂囨湰鏂囨。 (2).txt"))));
+ String text = "";
+ String lineTxt = null;
+ while ((lineTxt = br.readLine()) != null) {// 鏁版嵁浠ラ�楀彿鍒嗛殧
+ text += new String(lineTxt.getBytes("unicode"), "UTF-8");
+ }
+ System.out.println(text);
+ br.close();
+ } catch (Exception e) {
+ }
+
+ }
+
}
--
Gitblit v1.8.0