From e9d0822bccf8d9bb4db04979228f454172c7bac5 Mon Sep 17 00:00:00 2001
From: Huynh Thanh Binh <1653006@student.hcmus.edu.vn>
Date: Sun, 12 Jul 2020 01:19:18 +0700
Subject: [PATCH] [SERVER] update MailService: remove hardcode web-domain

---
 .env                                                           | 1 +
 dev/.env                                                       | 1 +
 dev/docker-compose.yml                                         | 1 +
 docker-compose.yml                                             | 1 +
 .../src/main/resources/application-production.properties       | 3 ++-
 service/mail-service/src/main/resources/application.properties | 2 +-
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 57f37fb9..2e8313d6 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,7 @@
 # Global environment
 TIMEZONE=Asia/Bangkok
 DOCKER_HUB_ID=saigonparkingmap
+SAIGON_PARKING_DOMAIN=https://saigonparking.wtf
 
 # Version control
 MESSAGE_QUEUE_VERSION=v2.2.4
diff --git a/dev/.env b/dev/.env
index b607ccff..66885f3e 100644
--- a/dev/.env
+++ b/dev/.env
@@ -1,6 +1,7 @@
 # Global environment
 TIMEZONE=Asia/Bangkok
 DOCKER_HUB_ID=saigonparkingmap
+SAIGON_PARKING_DOMAIN=http://localhost:3000
 
 # Version control
 PROXY_VERSION=v2.2.4
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 592ea140..96ced465 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -147,6 +147,7 @@ services:
       SERVICE_ID:   ${MAIL_SERVICE_ID}
       SERVICE_HOST: ${MAIL_SERVICE_HOST}
       SERVICE_PORT: ${MAIL_SERVICE_PORT}
+      WEB_DOMAIN:   ${SAIGON_PARKING_DOMAIN}
     depends_on:
       - message-queue
       - service-discovery
diff --git a/docker-compose.yml b/docker-compose.yml
index fd14a4a1..86d9b93a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,6 +40,7 @@ services:
       SERVICE_ID:   ${MAIL_SERVICE_ID}
       SERVICE_HOST: ${MAIL_SERVICE_HOST}
       SERVICE_PORT: ${MAIL_SERVICE_PORT}
+      WEB_DOMAIN:   ${SAIGON_PARKING_DOMAIN}
     ports:
       - "${MAIL_SERVICE_PORT}:${MAIL_SERVICE_PORT}"
     depends_on:
diff --git a/service/mail-service/src/main/resources/application-production.properties b/service/mail-service/src/main/resources/application-production.properties
index 24e12aff..a5f664fd 100644
--- a/service/mail-service/src/main/resources/application-production.properties
+++ b/service/mail-service/src/main/resources/application-production.properties
@@ -11,4 +11,5 @@ spring.cloud.consul.host=service-discovery
 spring.cloud.consul.discovery.prefer-ip-address=true
 spring.cloud.consul.discovery.instance-id=${SERVICE_ID}
 spring.cloud.consul.discovery.ip-address=${SERVICE_HOST}
-grpc.port=${SERVICE_PORT}
\ No newline at end of file
+grpc.port=${SERVICE_PORT}
+saigonparking.domain=${WEB_DOMAIN}
\ No newline at end of file
diff --git a/service/mail-service/src/main/resources/application.properties b/service/mail-service/src/main/resources/application.properties
index 7dffab9d..9fcce527 100644
--- a/service/mail-service/src/main/resources/application.properties
+++ b/service/mail-service/src/main/resources/application.properties
@@ -53,7 +53,7 @@ connection.max-inbound-metadata-size=2
 connection.refresh-period-in-seconds=60
 connection.load-balancing-policy=round_robin
 ### mail config
-saigonparking.domain=https://saigonparking.wtf
+saigonparking.domain=http://localhost:3000
 ### spring cloud consul config
 spring.cloud.consul.host=localhost
 spring.cloud.consul.port=8500