From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改,爬单新规则添加

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 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 d32578d..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;
@@ -74,7 +73,6 @@
 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;
@@ -128,7 +126,7 @@
 
 	@Resource
 	private IntegralGetService integralGetService;
-	
+
 	@Resource
 	private UserMoneyExtraService userMoneyExtraService;
 
@@ -554,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());
 	}
@@ -643,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