update master with Dev branch

ecom-service/src/main/java/com/nisum/ecomservice/service/ProductService.java

@@ -41,7 +41,7 @@ public class ProductService {
     public Flux<Promotion> getAllPromotions() {
         return WebClient
                 .builder()
-                .baseUrl("http://localhost:8082")
+                .baseUrl(promoManagementUrl)
                 .build()
                 .get()
                 .uri("/api/promos")

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

@@ -7,17 +7,17 @@ spring.data.mongodb.uri=mongodb+srv://ecom:ecom@e-commerce-db-cluster.va815.mong
 spring.data.mongodb.database=e-commerce-db
 security.enable-csrf=false
 server.port=8080
-#
+
 #products.apiUrl=http://13.64.175.185:8080
 #promos.apiUrl=http://40.118.215.99:8082
 #orders.apiUrl=http://138.91.251.222:8086
 
 # UNCOMMENT FOR PRODUCTION DEPLOYMENT
-#products.apiUrl=http://13.64.175.185:8080
-#promos.apiUrl=http://40.118.215.99:8082
-#orders.apiUrl=http://138.91.251.222:8086
+products.apiUrl=http://13.64.175.185:8080
+promos.apiUrl=http://40.118.215.99:8082
+orders.apiUrl=http://138.91.251.222:8086
 
 # UNCOMMENT FOR LOCAL TESTING
-products.apiUrl=http://localhost:8083
-promos.apiUrl=http://localhost:8082
-orders.apiUrl=http://localhost:8084
+#products.apiUrl=http://localhost:8083
+#promos.apiUrl=http://localhost:8082
+#orders.apiUrl=http://localhost:8084

ecom-web/src/config.js

 class Config {
-    // static baseApiUrl = "http://13.93.237.130:8084"; //env file
-    static baseApiUrl = "http://localhost:8080"; //env file
+    static baseApiUrl = "http://13.93.237.130:8084"; //env file
+    //static baseApiUrl = "http://localhost:8080"; //env file
     static orderHistoryApiUrlMethod = (userId) => `${this.baseApiUrl}/api/orders/byUser/${userId}`;