docker-compose

Author: hoangtien2k3

api-gateway/src/main/resources/application.yml

@@ -21,11 +21,16 @@ spring:
             - Path=/api/inventory/**
 
         # NOTIFY-SERVICE
-        - id: notification-service
+        - id: notification-service-notifications
           uri: lb://NOTIFICATION-SERVICE
           predicates:
             - Path=/api/email/**
 
+        - id: notification-service-payments
+          uri: lb://NOTIFICATION-SERVICE
+          predicates:
+            - Path=/api/payments/**
+
         # ORDER-SERVICE
         - id: order-service-carts
           uri: lb://ORDER-SERVICE

favourite-service/src/main/java/com/hoangtien2k3qx1/favouriteservice/FavouriteServiceApplication.java

@@ -13,6 +13,8 @@ public class FavouriteServiceApplication {
 	public static void main(String[] args) {
 		TimeZone.setDefault(TimeZone.getTimeZone("GMT +0:00"));
 		SpringApplication.run(FavouriteServiceApplication.class, args);
+
+
 	}
 
 }

notification-service/src/main/java/com/hoangtien2k3/notificationservice/api/PaymentController.java

@@ -39,4 +39,5 @@ public Mono<List<Payment>> getAllPayments() {
     public Mono<Void> deletePayment(@PathVariable Integer paymentId) {
         return paymentService.deletePayment(paymentId);
     }
+
 }

notification-service/src/main/java/com/hoangtien2k3/notificationservice/entity/Notification.java

@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

notification-service/src/main/java/com/hoangtien2k3/notificationservice/service/impl/EmailServiceImpl.java

@@ -71,7 +71,6 @@ public Mono<String> sendMailWithAttachment(EmailDetails details) {
                 });
     }
 
-
     @Override
     public Mono<String> sendMail(MultipartFile[] files, String to, String[] cc, String subject, String body) {
         return Mono.fromCallable(() -> {
@@ -98,5 +97,4 @@ public Mono<String> sendMail(MultipartFile[] files, String to, String[] cc, Stri
                 });
     }
 
-
 }

order-service/src/main/java/com/hoangtien2k3/orderservice/api/CartController.java

@@ -41,7 +41,7 @@ public class CartController {
             @ApiResponse(code = 204, message = "No content", response = ResponseEntity.class)
     })
     @GetMapping
-    @PreAuthorize("hasAuthority('ADMIN') and hasAuthority('USER')")
+    @PreAuthorize("hasAuthority('ADMIN') or hasAuthority('USER')")
     public Mono<ResponseEntity<List<CartDto>>> findAll() {
         log.info("*** CartDto List, controller; fetch all categories *");
         return cartService.findAll()
@@ -55,7 +55,7 @@ public Mono<ResponseEntity<List<CartDto>>> findAll() {
             @ApiResponse(code = 204, message = "No content", response = ResponseEntity.class)
     })
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('ADMIN') and hasAuthority('USER')")
+    @PreAuthorize("hasAuthority('ADMIN') or hasAuthority('USER')")
     public Mono<ResponseEntity<Page<CartDto>>> findAll(@RequestParam(defaultValue = "0") int page,
                                                        @RequestParam(defaultValue = "10") int size,
                                                        @RequestParam(defaultValue = "cartId") String sortBy,

payment-service/src/main/java/com/hoangtien2k3/paymentservice/config/swagger/Swagger2Config.java

@@ -29,6 +29,7 @@
 @Configuration
 @EnableSwagger2
 public class Swagger2Config {
+
     @Bean
     public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)

payment-service/src/main/java/com/hoangtien2k3/paymentservice/exception/ApiExceptionHandler.java

@@ -54,5 +54,4 @@ public <T extends RuntimeException> ResponseEntity<ExceptionMessage> handleApiRe
                                 .now(ZoneId.systemDefault()))
                         .build(), badRequest);
     }
-
 }

payment-service/src/main/java/com/hoangtien2k3/paymentservice/security/JwtTokenFilter.java

@@ -4,9 +4,11 @@
 import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.SignatureException;
 import io.jsonwebtoken.UnsupportedJwtException;
+import org.json.HTTP;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -33,7 +35,10 @@ protected void doFilterInternal(HttpServletRequest request,
 
         String token = extractToken(request);
 
+
+
         try {
+
             if (token != null && jwtProvider.validateToken(token)) {
                 Authentication authentication = jwtProvider.getAuthentication(token);
                 SecurityContextHolder.getContext().setAuthentication(authentication);
@@ -46,9 +51,13 @@ protected void doFilterInternal(HttpServletRequest request,
             }
         } catch (ExpiredJwtException e) {
             logger.error("Token has expired for request: {}", request.getRequestURI());
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Token has expired");
+            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+            response.getWriter().write("Token has expired for request");
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Token has expired");
         } catch (MalformedJwtException | SignatureException | UnsupportedJwtException | IllegalArgumentException e) {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid token");
+            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid token");
         }
     }
 

payment-service/src/main/resources/application.properties

@@ -45,5 +45,5 @@ eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://localhost:8761/eureka}
 
 # swagger-ui custom path
 springdoc.swagger-ui.path=/swagger-ui.html
-spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER