Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

ht/src/main/java/com/ccsens/ht/aspect/MustLoginAspect.java

@@ -43,13 +43,13 @@ public class MustLoginAspect {
     @Around("loginAdvice()")
     public Object around(ProceedingJoinPoint pjp){
 
-//        HttpServletRequest request = ((ServletRequestAttributes)
-//                RequestContextHolder.getRequestAttributes()).getRequest();
-//        final String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        HttpServletRequest request = ((ServletRequestAttributes)
+                RequestContextHolder.getRequestAttributes()).getRequest();
+        final String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
 
         Object[] args = pjp.getArgs();
         QueryDto dto = (QueryDto) args[0];
-        final String authHeader = dto.getToken();
+//        final String authHeader = dto.getToken();
 
         JsonResponse response = tallFeignClient.getUserIdByToken(authHeader);
         log.info("{}获取userId:{}", authHeader, response);

tall/src/main/java/com/ccsens/tall/web/UserController.java

@@ -223,7 +223,7 @@ public class UserController {
             @ApiImplicitParam(name="token",value = "token",required = true,paramType = "query")
     })
     @RequestMapping(value = "token",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<UserVo.TokenToUserId> getUserByToken(HttpServletRequest request, @RequestParam(required = true) String token) throws Exception {
+    public JsonResponse<UserVo.TokenToUserId> getUserByToken(@RequestParam(required = true) String token) throws Exception {
 
         UserVo.TokenToUserId tokenToUserId = new UserVo.TokenToUserId();