提交

lwxk · Dec 27, 2018 · 370e0eb · 370e0eb
1 parent f3f3c95
commit 370e0eb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java b/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java
@@ -58,7 +58,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 					render(response, SESSION_ERROR);
 					return false;
 				}
-				key += "_" + user.getId();
+				key += "_" + user.getNickname();
 			}else {
 				//do nothing
 			}

diff --git a/src/main/java/com/geekq/miaosha/controller/LoginController.java b/src/main/java/com/geekq/miaosha/controller/LoginController.java
@@ -29,16 +29,17 @@ public class LoginController {
     @RequestMapping("/to_login")
     public String tologin(LoginVo loginVo, Model model) {
         logger.info(loginVo.toString());
-        String count = RedisLua.getVistorCount(COUNTLOGIN).toString();
-        logger.info("访问网站的次数为:{}",count);
-        model.addAttribute("count",count);
+//        String count = RedisLua.getVistorCount(COUNTLOGIN).toString();
+//        logger.info("访问网站的次数为:{}",count);
+//        model.addAttribute("count",count);
         return "login";
     }
 
     @RequestMapping("/do_login")
     @ResponseBody
     public ResultGeekQ<Boolean> dologin(HttpServletResponse response, @Valid LoginVo loginVo) {
         ResultGeekQ<Boolean> result = ResultGeekQ.build();
+//         RedisLua.vistorCount(COUNTLOGIN);
         logger.info(loginVo.toString());
         userService.login(response, loginVo);
         return result;

diff --git a/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java b/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java
@@ -62,8 +62,8 @@ public class MiaoshaController implements InitializingBean {
      * 5000 * 10
      * get　post get 幂等　从服务端获取数据　不会产生影响　　post 对服务端产生变化
      */
-//    @AccessLimit(seconds = 5, maxCount = 5, needLogin = true)
-    @RequestMapping(value = "/do_miaosha")
+    @AccessLimit(seconds = 5, maxCount = 5, needLogin = true)
+    @RequestMapping(value="/{path}/do_miaosha", method= RequestMethod.POST)
     @ResponseBody
     public ResultGeekQ<Integer> miaosha(Model model, MiaoshaUser user, @PathVariable("path") String path,
                                         @RequestParam("goodsId") long goodsId) {

diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java b/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java
@@ -43,7 +43,7 @@ public void receive(String message) {
 	    		return;
 	    	}
 	    	//判断是否已经秒杀到了
-	    	MiaoshaOrder order = orderService.getMiaoshaOrderByUserIdGoodsId(user.getId(), goodsId);
+	    	MiaoshaOrder order = orderService.getMiaoshaOrderByUserIdGoodsId(Long.valueOf(user.getNickname()), goodsId);
 	    	if(order != null) {
 	    		return;
 	    	}

diff --git a/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java b/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java
@@ -93,7 +93,7 @@ public boolean register(HttpServletResponse response , String userName , String
         miaoShaUser.setNickname(userName);
         try {
             miaoShaUserDao.insertMiaoShaUser(miaoShaUser);
-            MiaoshaUser user = miaoShaUserDao.getById(miaoShaUser.getId());
+            MiaoshaUser user = miaoShaUserDao.getById(Long.valueOf(miaoShaUser.getNickname()));
             if(user == null){
                 return false;
             }

diff --git a/src/main/java/com/geekq/miaosha/service/MiaoshaService.java b/src/main/java/com/geekq/miaosha/service/MiaoshaService.java
@@ -69,7 +69,7 @@ public boolean checkPath(MiaoshaUser user, long goodsId, String path) {
 		if(user == null || path == null) {
 			return false;
 		}
-		String pathOld = redisService.get(MiaoshaKey.getMiaoshaPath, ""+user.getId() + "_"+ goodsId, String.class);
+		String pathOld = redisService.get(MiaoshaKey.getMiaoshaPath, ""+user.getNickname() + "_"+ goodsId, String.class);
 		return path.equals(pathOld);
 	}
 
@@ -78,7 +78,7 @@ public String createMiaoshaPath(MiaoshaUser user, long goodsId) {
 			return null;
 		}
 		String str = MD5Utils.md5(UUIDUtil.uuid()+"123456");
-		redisService.set(MiaoshaKey.getMiaoshaPath, ""+user.getId() + "_"+ goodsId, str);
+		redisService.set(MiaoshaKey.getMiaoshaPath, ""+user.getNickname() + "_"+ goodsId, str);
 		return str;
 	}
 
@@ -113,7 +113,7 @@ public BufferedImage createVerifyCode(MiaoshaUser user, long goodsId) {
 		g.dispose();
 		//把验证码存到redis中
 		int rnd = calc(verifyCode);
-		redisService.set(MiaoshaKey.getMiaoshaVerifyCode, user.getId()+","+goodsId, rnd);
+		redisService.set(MiaoshaKey.getMiaoshaVerifyCode, user.getNickname()+","+goodsId, rnd);
 		//输出图片
 		return image;
 	}
@@ -182,11 +182,11 @@ public boolean checkVerifyCode(MiaoshaUser user, long goodsId, int verifyCode) {
 		if(user == null || goodsId <=0) {
 			return false;
 		}
-		Integer codeOld = redisService.get(MiaoshaKey.getMiaoshaVerifyCode, user.getId()+","+goodsId, Integer.class);
+		Integer codeOld = redisService.get(MiaoshaKey.getMiaoshaVerifyCode, user.getNickname()+","+goodsId, Integer.class);
 		if(codeOld == null || codeOld - verifyCode != 0 ) {
 			return false;
 		}
-		redisService.delete(MiaoshaKey.getMiaoshaVerifyCode, user.getId()+","+goodsId);
+		redisService.delete(MiaoshaKey.getMiaoshaVerifyCode, user.getNickname()+","+goodsId);
 		return true;
 	}
 

diff --git a/src/main/java/com/geekq/miaosha/service/OrderService.java b/src/main/java/com/geekq/miaosha/service/OrderService.java
@@ -46,12 +46,12 @@ public OrderInfo createOrder(MiaoshaUser user, GoodsVo goods) {
 		orderInfo.setGoodsPrice(goods.getMiaoshaPrice());
 		orderInfo.setOrderChannel(1);
 		orderInfo.setStatus(0);
-		orderInfo.setUserId(user.getId());
+		orderInfo.setUserId(Long.valueOf(user.getNickname()));
 		orderDao.insert(orderInfo);
 		MiaoshaOrder miaoshaOrder = new MiaoshaOrder();
 		miaoshaOrder.setGoodsId(goods.getId());
 		miaoshaOrder.setOrderId(orderInfo.getId());
-		miaoshaOrder.setUserId(user.getId());
+		miaoshaOrder.setUserId(Long.valueOf(user.getNickname()));
 		orderDao.insertMiaoshaOrder(miaoshaOrder);
 		redisService.set(OrderKey.getMiaoshaOrderByUidGid,""+user.getNickname()+"_"+goods.getId(),miaoshaOrder) ;
 		return orderInfo;