From ce525ca7fb958694b590e645db6bee14a4d9491b Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Tue, 7 Nov 2017 17:40:25 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/constant/CommonEnum.java | 2 +-
 .../main/java/com/xwbing/handler/GlobalExceptionHandler.java   | 3 +--
 boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java b/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java
index ef70a0d..697febc 100644
--- a/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java
+++ b/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java
@@ -60,7 +60,7 @@ public class CommonEnum {
         private String name;
         private int value;
 
-        private LoginInOutEnum(String name, int value) {
+        LoginInOutEnum(String name, int value) {
             this.value = value;
             this.name = name;
         }
diff --git a/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java b/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java
index 6c4027e..6e823d0 100644
--- a/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java
+++ b/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java
@@ -42,8 +42,7 @@ public class GlobalExceptionHandler {
     // 返回给页面200状态码
     @ResponseStatus(value = HttpStatus.OK)
     @ResponseBody
-    public JSONObject handlerGuideException(HttpServletRequest request,
-                                            Exception ex) {
+    public JSONObject handlerGuideException(HttpServletRequest request, Exception ex) {
         logger.error(ex.getMessage());
         return JSONObjResult.toJSONObj(ex.getMessage());
     }
diff --git a/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java b/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java
index 7112aa1..64cfd56 100644
--- a/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java
+++ b/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 @Component
 public class WebLogAspect {
     private final Logger logger = LoggerFactory.getLogger(WebLogAspect.class);
-    ThreadLocal<Long> startTime = new ThreadLocal<>();
+    private ThreadLocal<Long> startTime = new ThreadLocal<>();
 
     @Pointcut("within(com.xwbing.controller..*) && @annotation(logInfo)")
     public void pointCutWithMsg(LogInfo logInfo) {