提交全局异常修改

README.md

@@ -26,9 +26,9 @@
     --数据库加唯一索引防止用户重复购买
     --redis预减库存减少数据库访问　内存标记减少redis访问　请求先入队列缓冲，异步下单，增强用户体验
 ####  [1.全局异常处理拦截]()
-> 1.定义全局的异常拦截器<br>
-> 2.定义了全局异常类型<br>
-> 3.只返回和业务有关的<br>
+    1.定义全局的异常拦截器<br>
+    2.定义了全局异常类型<br>
+    3.只返回和业务有关的<br>
 
 #### [解决分布式session]()
     --生成一个随机的uuid一类的写回到cookie中

src/main/java/com/geekq/miaosha/access/AccessInterceptor.java

@@ -1,10 +1,10 @@
 package com.geekq.miaosha.access;
 
 import com.alibaba.fastjson.JSON;
+import com.geekq.miaosha.common.enums.ResultStatus;
+import com.geekq.miaosha.common.resultbean.ResultGeekQ;
 import com.geekq.miaosha.domain.MiaoshaUser;
 import com.geekq.miaosha.redis.RedisService;
-import com.geekq.miaosha.result.CodeMsg;
-import com.geekq.miaosha.result.Result;
 import com.geekq.miaosha.service.MiaoShaUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +17,9 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 
+import static com.geekq.miaosha.common.enums.ResultStatus.ACCESS_LIMIT_REACHED;
+import static com.geekq.miaosha.common.enums.ResultStatus.SESSION_ERROR;
+
 @Service
 public class AccessInterceptor  extends HandlerInterceptorAdapter{
 
@@ -43,7 +46,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 			String key = request.getRequestURI();
 			if(needLogin) {
 				if(user == null) {
-					render(response, CodeMsg.SESSION_ERROR);
+					render(response, SESSION_ERROR);
 					return false;
 				}
 				key += "_" + user.getId();
@@ -57,17 +60,17 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 	    	}else if(count < maxCount) {
 	    		 redisService.incr(ak, key);
 	    	}else {
-	    		render(response, CodeMsg.ACCESS_LIMIT_REACHED);
+	    		render(response, ACCESS_LIMIT_REACHED);
 	    		return false;
 	    	}
 		}
 		return true;
 	}
 
-	private void render(HttpServletResponse response, CodeMsg cm)throws Exception {
+	private void render(HttpServletResponse response, ResultStatus cm)throws Exception {
 		response.setContentType("application/json;charset=UTF-8");
 		OutputStream out = response.getOutputStream();
-		String str  = JSON.toJSONString(Result.error(cm));
+		String str  = JSON.toJSONString(ResultGeekQ.error(cm));
 		out.write(str.getBytes("UTF-8"));
 		out.flush();
 		out.close();

src/main/java/com/geekq/miaosha/common/resultbean/ResultGeekQ.java

@@ -1,8 +1,6 @@
 package com.geekq.miaosha.common.resultbean;
 
 import com.geekq.miaosha.common.enums.ResultStatus;
-import com.geekq.miaosha.result.CodeMsg;
-import com.geekq.miaosha.result.Result;
 
 import java.io.Serializable;
 

src/main/java/com/geekq/miaosha/controller/GoodsController.java

@@ -4,7 +4,6 @@
 import com.geekq.miaosha.domain.MiaoshaUser;
 import com.geekq.miaosha.redis.GoodsKey;
 import com.geekq.miaosha.redis.RedisService;
-import com.geekq.miaosha.result.Result;
 import com.geekq.miaosha.service.GoodsService;
 import com.geekq.miaosha.service.MiaoShaUserService;
 import com.geekq.miaosha.vo.GoodsDetailVo;

src/main/java/com/geekq/miaosha/controller/MiaoshaController.java

@@ -1,21 +1,20 @@
 package com.geekq.miaosha.controller;
 
 import com.geekq.miaosha.access.AccessLimit;
-import com.geekq.miaosha.common.enums.ResultStatus;
 import com.geekq.miaosha.common.resultbean.ResultGeekQ;
 import com.geekq.miaosha.domain.MiaoshaOrder;
 import com.geekq.miaosha.domain.MiaoshaUser;
 import com.geekq.miaosha.rabbitmq.MQSender;
 import com.geekq.miaosha.rabbitmq.MiaoshaMessage;
 import com.geekq.miaosha.redis.GoodsKey;
 import com.geekq.miaosha.redis.RedisService;
-import com.geekq.miaosha.result.CodeMsg;
-import com.geekq.miaosha.result.Result;
 import com.geekq.miaosha.service.GoodsService;
 import com.geekq.miaosha.service.MiaoShaUserService;
 import com.geekq.miaosha.service.MiaoshaService;
 import com.geekq.miaosha.service.OrderService;
 import com.geekq.miaosha.vo.GoodsVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -36,6 +35,8 @@
 @RequestMapping("/miaosha")
 public class MiaoshaController implements InitializingBean {
 
+    private static Logger logger = LoggerFactory.getLogger(MiaoshaController.class);
+
     @Autowired
     MiaoShaUserService userService;
 
@@ -160,24 +161,26 @@ public ResultGeekQ<String> getMiaoshaPath(HttpServletRequest request, MiaoshaUse
 
     @RequestMapping(value = "/verifyCode", method = RequestMethod.GET)
     @ResponseBody
-    public Result<String> getMiaoshaVerifyCod(HttpServletResponse response, MiaoshaUser user,
+    public ResultGeekQ<String> getMiaoshaVerifyCod(HttpServletResponse response, MiaoshaUser user,
                                               @RequestParam("goodsId") long goodsId) {
+        ResultGeekQ<String> result = ResultGeekQ.build();
         if (user == null) {
-            return Result.error(CodeMsg.SESSION_ERROR);
+            result.withError(SESSION_ERROR.getCode(), SESSION_ERROR.getMessage());
+            return result;
         }
         try {
             BufferedImage image = miaoshaService.createVerifyCode(user, goodsId);
             OutputStream out = response.getOutputStream();
             ImageIO.write(image, "JPEG", out);
             out.flush();
             out.close();
-            return null;
+            return result;
         } catch (Exception e) {
-            e.printStackTrace();
-            return Result.error(CodeMsg.MIAOSHA_FAIL);
+            logger.error("生成验证码错误-----goodsId:{}", goodsId, e);
+            result.withError(MIAOSHA_FAIL.getCode(), MIAOSHA_FAIL.getMessage());
+            return result;
         }
     }
-
     /**
      * 系统初始化
      *

src/main/java/com/geekq/miaosha/controller/OrderController.java

@@ -4,8 +4,6 @@
 import com.geekq.miaosha.domain.MiaoshaUser;
 import com.geekq.miaosha.domain.OrderInfo;
 import com.geekq.miaosha.redis.RedisService;
-import com.geekq.miaosha.result.CodeMsg;
-import com.geekq.miaosha.result.Result;
 import com.geekq.miaosha.service.GoodsService;
 import com.geekq.miaosha.service.MiaoShaUserService;
 import com.geekq.miaosha.service.OrderService;

src/main/java/com/geekq/miaosha/exception/GlobleExceptionHandler.java

@@ -1,9 +1,6 @@
 package com.geekq.miaosha.exception;
 
-import com.geekq.miaosha.common.enums.ResultStatus;
 import com.geekq.miaosha.common.resultbean.ResultGeekQ;
-import com.geekq.miaosha.result.CodeMsg;
-import com.geekq.miaosha.result.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;
@@ -17,7 +14,6 @@
 
 import static com.geekq.miaosha.common.enums.ResultStatus.SESSION_ERROR;
 import static com.geekq.miaosha.common.enums.ResultStatus.SYSTEM_ERROR;
-import static com.geekq.miaosha.result.CodeMsg.BIND_ERROR;
 
 /**
  * 拦截异常