[SERVER] update MailService: remove hardcode web-domain

huynhthanhbinh · Jul 11, 2020 · e9d0822 · e9d0822
1 parent b4ee627
commit e9d0822
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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}
+grpc.port=${SERVICE_PORT}
+saigonparking.domain=${WEB_DOMAIN}
diff --git 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