fix request doesn't work in base controller

easepan · easepan · commit 6ec98fdecf02 · 2018-09-27T19:35:25.000+08:00
diff --git a/src/main/java/com/zhazhapan/util/web/BaseController.java b/src/main/java/com/zhazhapan/util/web/BaseController.java
@@ -16,7 +16,7 @@
  */
 public class BaseController {
 
-    private ThreadLocal<HttpServletRequest> request = new ThreadLocal<>();
+    private HttpServletRequest request;
 
     private ThreadLocal<String> token = new ThreadLocal<>();
 
@@ -29,22 +29,21 @@ public BaseController(boolean checkSensitiveData) {
     }
 
     public BaseController(HttpServletRequest request) {
-        this.request.set(request);
+        this.request = request;
     }
 
     public BaseController(HttpServletRequest request, boolean checkSensitiveData) {
-        this.request.set(request);
+        this.request = request;
         this.checkSensitiveData = checkSensitiveData;
     }
 
     protected String getToken() {
         if (Checker.isEmpty(token.get())) {
-            token.set(request.get().getHeader("token"));
+            token.remove();
+            token.set(request.getHeader("token"));
             if (Checker.isEmpty(token.get())) {
-                token.set(request.get().getParameter("token"));
+                token.set(request.getParameter("token"));
             }
-            token.remove();
-            request.remove();
         }
         return token.get();
     }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`public class BaseController {`
`18`	`18`
`19`		`- private ThreadLocal<HttpServletRequest> request = new ThreadLocal<>();`
	`19`	`+ private HttpServletRequest request;`
`20`	`20`
`21`	`21`	`private ThreadLocal<String> token = new ThreadLocal<>();`
`22`	`22`
`@@ -29,22 +29,21 @@ public BaseController(boolean checkSensitiveData) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public BaseController(HttpServletRequest request) {`
`32`		`- this.request.set(request);`
	`32`	`+ this.request = request;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public BaseController(HttpServletRequest request, boolean checkSensitiveData) {`
`36`		`- this.request.set(request);`
	`36`	`+ this.request = request;`
`37`	`37`	`this.checkSensitiveData = checkSensitiveData;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`protected String getToken() {`
`41`	`41`	`if (Checker.isEmpty(token.get())) {`
`42`		`- token.set(request.get().getHeader("token"));`
	`42`	`+ token.remove();`
	`43`	`+ token.set(request.getHeader("token"));`
`43`	`44`	`if (Checker.isEmpty(token.get())) {`
`44`		`- token.set(request.get().getParameter("token"));`
	`45`	`+ token.set(request.getParameter("token"));`
`45`	`46`	`}`
`46`		`- token.remove();`
`47`		`- request.remove();`
`48`	`47`	`}`
`49`	`48`	`return token.get();`
`50`	`49`	`}`