From 8b1191e3781c452c7828bd6ce839abdf4fd27753 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 十一月 2019 16:31:08 +0800
Subject: [PATCH] 免单商品返回更新
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 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 7c8f7c1..3dc6394 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -42,7 +42,6 @@
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.bus.user.UserMoneyExtra;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
@@ -69,11 +68,11 @@
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.util.push.VIVOPushUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -127,7 +126,7 @@
@Resource
private IntegralGetService integralGetService;
-
+
@Resource
private UserMoneyExtraService userMoneyExtraService;
@@ -553,7 +552,7 @@
for (Iterator<String> its = sets.iterator(); its.hasNext();)
array.add(its.next());
} finally {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
out.println(array.toString());
}
@@ -630,24 +629,9 @@
}
}
- @RequestMapping("pushVIVO")
- public void pushVIVO(PrintWriter out) {
- List<String> regList = new ArrayList<>();
- regList.add("15710270630271520610033");
- // regList.add("15711218630321520681531");
- // try {
- // VIVOPushUtil.pushUrl(regList, "鏍囬", "缃戦〉鍐呭", "http://www.baidu.com");
- // } catch (Exception e) {
- // }
-
- try {
- VIVOPushUtil.pushBaiChuanUrl(regList, "鏍囬", "鐧惧窛鍐呭", "http://www.taobao.com");// 鏈塨ug
- // VIVOPushUtil.pushGoods(regList, "鏍囬", "鍟嗗搧鍐呭", 2, 100005625634L);
- // VIVOPushUtil.pushUserSignInNotification(regList, "鏍囬", "绛惧埌");
- // VIVOPushUtil.pushWelfareCenter(regList,"鏍囬", "绂忓埄涓績");
- } catch (PushException e) {
- e.printStackTrace();
- }
+ @RequestMapping("getLocalTime")
+ public void getLocalTime(PrintWriter out) {
+ out.print(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
}
@RequestMapping("getSchedulerList")
@@ -657,19 +641,6 @@
System.out.println(groupName);
}
} catch (Exception e) {
- }
- }
-
- @RequestMapping("taoLiJinExchange")
- public void taoLiJinExchange(PrintWriter out) {
- try {
- for (int i = 1; i <= 100; i ++) {
- userMoneyExtraService.taoLiJinExchange(i, 200);
- }
- JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- } catch (Exception e) {
- JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
}
}
}
--
Gitblit v1.8.0