From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 136 +++++++++++----------------------------------
1 files changed, 34 insertions(+), 102 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 6ee75c8..d138ebb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -4,7 +4,6 @@
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -28,28 +27,24 @@
import org.springframework.cache.ehcache.EhCacheCacheManager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.QRCodeUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
import org.yeshi.utils.wx.WXUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
-import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
-import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.LogManager;
+import com.yeshi.fanli.log.LogType;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
@@ -58,17 +53,13 @@
import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
-import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.db.MongoDBManager;
-import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
-import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.push.OPPOPushUtil;
-import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -122,53 +113,6 @@
@Resource
private UserMoneyExtraService userMoneyExtraService;
-
- @RequestMapping(value = "testimg")
- public void testImg(HttpServletRequest request, PrintWriter out) {
- long startTime = System.currentTimeMillis();
-
- List<String> list = new ArrayList<>();
- for (int i = 0; i < 10; i++) {
- list.add("i" + i);
- }
-
- try {
- final TaoBaoGoodsBrief goods = redisManager.getTaoBaoGoodsBrief(569823237075L);
- } catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
- }
- String url = "http://www.baidu.com";
- list.parallelStream().forEach(ids -> {
- InputStream portrait = HttpUtil.getAsInputStream(
- "https://wwc.alicdn.com/avatar/getAvatar.do?userId=1889722423&width=160&height=160&type=sns");
- System.out.println(ids + "寮�濮嬫椂闂�:" + System.currentTimeMillis());
- String uid = "123";
- String auctionId = "test-" + ids;
-
- String destPath = FileUtil.getCacheDir() + "/" + auctionId + ".jpg";
-
- String shareImgPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + auctionId + ".png";
-
- try {
- QRCodeUtil.getInstance(500).encode(url, destPath);
- } catch (Exception e) {
- e.printStackTrace();
- }
- long startDTime = System.currentTimeMillis();
-
- /*
- * try { //ImageUtil.drawGoodsShareImg(new FileInputStream(new
- * File(destPath)), portrait, goods, shareImgPath); } catch
- * (FileNotFoundException e) { e.printStackTrace(); }
- */
- System.out.println(System.currentTimeMillis() - startDTime);
-
- String shareImgUrl = COSManager.getInstance()
- .uploadFile(new File(shareImgPath), "share_" + uid + "_" + auctionId + ".png").getUrl();
- System.out.println(ids + "缁撴潫鏃堕棿:" + System.currentTimeMillis());
- });
- System.out.println("鏁翠綋鑰楁椂:" + (System.currentTimeMillis() - startTime));
- }
@RequestMapping(value = "kefu")
public void kefu(HttpServletRequest request, PrintWriter out) {
@@ -377,49 +321,6 @@
}
}
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "getJingFenList")
- public void getJingFenList(String callback, Integer page, Integer eliteId, PrintWriter out) {
- try {
- JDSearchResult result = JDApiUtil.getJingFenGoods(page, eliteId);
- long count = 0;
- JSONObject data = new JSONObject();
- JSONArray array = new JSONArray();
- if (result != null) {
- PageEntity pageEntity = result.getPageEntity();
- if (pageEntity != null) {
- count = pageEntity.getTotalCount();
- }
-
- List<JDGoods> goodsList = result.getGoodsList();
- if (goodsList != null && goodsList.size() > 0) {
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
-
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
- array.add(gson.toJson(goodsDetailVO));
- }
- }
- }
-
- data.put("count", count);
- data.put("list", array);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
@RequestMapping(value = "getWaitingThreadsCount")
public void getWaitingThreadsCount(PrintWriter out) {
out.print(Constant.waitingThreadSet.size());
@@ -488,4 +389,35 @@
} catch (Exception e) {
}
}
+
+ @RequestMapping("getTBGoodsCate")
+ public void getTaoBaoGoodsCat(Long id, PrintWriter out) {
+ TaoBaoGoodsBrief goods = null;
+ try {
+ goods = TaoKeApiUtil.getSimpleGoodsInfo(id);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+ if (goods == null)
+ out.println("鍟嗗搧宸蹭笅鏋�");
+ else
+ out.println(
+ "<html><head><meta charset=utf-8></head><body>" + String.format("cat_name:%s <br> cat_leaf_name:%s",
+ goods.getRootCategoryName(), goods.getLeafName()) + "</body></html>");
+ }
+
+ @RequestMapping("getJedisInfo")
+ public void getJedisInfo(PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("active", jedisPool.getNumActive());
+ data.put("idle", jedisPool.getNumIdle());
+ data.put("waiters", jedisPool.getNumWaiters());
+ out.print(data.toString());
+ }
+
+ @RequestMapping("log")
+ public void log(PrintWriter out) {
+ LogManager.getLogger(LogType.taobaoAuth).info("123123123");
+ }
+
}
--
Gitblit v1.8.0