Merge branch 'main' into personal/heshunme/news

src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java

@@ -38,7 +38,7 @@ public class NewsController {
 
     @PutMapping("/{id}")
     @JwtVerify
-    public ResponseEntity<MessageResponse> updateNews(@RequestBody NewsRequest request, @PathVariable Long id) {
+    public ResponseEntity<MessageResponse> updateNews(@PathVariable Long id, @RequestBody NewsRequest request) {
         try {
             newsService.updateNews(id, request);
         } catch (DataIntegrityViolationException e) {

src/main/java/org/cmh/backend/Utils/JwtVerifyAspect.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 @Aspect
 @Component
 public class JwtVerifyAspect {
-    @Before("@annotation(JwtVerify)")
+    @Before("@annotation(JwtVerify)&&args(..)")
     public void verifyJwtToken(JoinPoint joinPoint) throws JwtValidationException {
         Object[] args = joinPoint.getArgs();
         for (Object arg : args) {
@@ -17,9 +17,9 @@ public class JwtVerifyAspect {
                 if (!JwtUtil.isTokenValid(token)) {
                     throw new JwtValidationException("JWT token is invalid");
                 }
-            }
                 break;
             }
         }
+    }
 }