提交

tall/src/main/java/com/ccsens/tall/aspect/MustLoginTallAspect.java

@@ -16,9 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
@@ -43,7 +41,7 @@ public class MustLoginTallAspect {
     public void tallAdvice(){
 
     }
-    @After("tallAdvice()")
+    @Around("tallAdvice()")
     public Object tallAdvice(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
         //拿到参数
         Object[] args = proceedingJoinPoint.getArgs();
@@ -60,7 +58,7 @@ public class MustLoginTallAspect {
         if (authHeader == null || !authHeader.startsWith(WebConstant.HEADER_KEY_TOKEN_PREFIX)) {
             HttpServletUtil.responseJson(httpServletResponse,
                     JacksonUtil.beanToJson(JsonResponse.newInstance().tokenNotFound()));
-            //return httpServletResponse;
+            return httpServletResponse;
         }
         final String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());
 
@@ -71,22 +69,22 @@ public class MustLoginTallAspect {
         }catch(SignatureException e){
             HttpServletUtil.responseJson(httpServletResponse,
                     JacksonUtil.beanToJson(JsonResponse.newInstance().tokenSignatureFail(e.getMessage())));
-            //return httpServletResponse;
+            return httpServletResponse;
         }catch(ExpiredJwtException e){
             HttpServletUtil.responseJson(httpServletResponse,
                     JacksonUtil.beanToJson(JsonResponse.newInstance().tokenExpire(e.getMessage())));
-            //return httpServletResponse;
+            return httpServletResponse;
         }catch(Exception e){
             HttpServletUtil.responseJson(httpServletResponse,
                     JacksonUtil.beanToJson(JsonResponse.newInstance().tokenFailed(e.getMessage())));
-           // return httpServletResponse;
+            return httpServletResponse;
         }
 
         //验证用户存根
         if(userService.tokenNotExistInCache(Long.valueOf(claims.getSubject()))){
             HttpServletUtil.responseJson(httpServletResponse,
                     JacksonUtil.beanToJson(JsonResponse.newInstance().tokenStubNotFound()));
-           // return httpServletResponse;
+            return httpServletResponse;
         }
 
 
@@ -95,7 +93,7 @@ public class MustLoginTallAspect {
         if(user.getRecStatus() == WebConstant.REC_STATUS.Disabled.value){
             HttpServletUtil.responseJson(httpServletResponse,
                     JacksonUtil.beanToJson(JsonResponse.newInstance().userDisabled()));
-           // return httpServletResponse;
+            return httpServletResponse;
         }
         Object proceed = proceedingJoinPoint.proceed();
         return proceed;

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

@@ -47,7 +47,7 @@ public class LwbsController {
         log.info("查询某人下参加的项目的所有的任务");
         return JsonResponse.newInstance().ok(selBylwbs);
     }
-    @MustLoginTall
+//    @MustLoginTall
     @ApiOperation(value = "test", notes = "1007:输出")
     @RequestMapping(value = "/test", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse test(@ApiParam @Validated @RequestBody QueryDto<LwbsDto.SelByProjectIdToTaskDto> params) {