Commit 56e7abf9 authored by Arie Valdano's avatar Arie Valdano

Merge branch 'master' into 'DEV/Akbar/master-h3-slave'

# Conflicts:
#   src/main/resources/application-dev.properties
parents 784ef4dc 92691eb8
......@@ -13,7 +13,9 @@ spring.jpa.properties.hibernate.format_sql=true
logging.level.org.hibernate.SQL=DEBUG
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
ddms.h3.service.slave = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
dam.gigr.h3 = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
dam.masterdata.h3 = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
#dam.receipt.query = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
dam.receipt.command = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
# KAFKA
......
......@@ -15,8 +15,8 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
dam.gigr.h3 = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
dam.masterdata.h3 = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
dam.receipt.query = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
dam.receipt.command = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
#dam.receipt.query = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
dam.receipt.command = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
# KAFKA
#-----------------------------------------------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment