Commit 47da146e authored by akbar fauzi's avatar akbar fauzi

service :

modify url api
parent bcee012e
...@@ -60,8 +60,8 @@ public class WorkOrderOrafinHystrixService { ...@@ -60,8 +60,8 @@ public class WorkOrderOrafinHystrixService {
@Value("${ddms.h2.service.slave}") @Value("${ddms.h2.service.slave}")
private String DDMS_H2_SERVICE_SLAVE; private String DDMS_H2_SERVICE_SLAVE;
@Value("${dam.receipt.query.h3}") // @Value("${dam.receipt.query.h3}")
private String receipt_query_url; // private String receipt_query_url;
@Value("${dam.receipt.command.h3}") @Value("${dam.receipt.command.h3}")
private String receipt_command_url; private String receipt_command_url;
...@@ -402,7 +402,7 @@ public class WorkOrderOrafinHystrixService { ...@@ -402,7 +402,7 @@ public class WorkOrderOrafinHystrixService {
private ReceiptSOTaskDTO getReceiptSoDP(String soid, String ahassCode) { private ReceiptSOTaskDTO getReceiptSoDP(String soid, String ahassCode) {
if (StringUtil.hasValue(soid)) { if (StringUtil.hasValue(soid)) {
ResponseEntity<ResponseReceiptSOTaskGetListDTO> response = restTemplate.exchange( ResponseEntity<ResponseReceiptSOTaskGetListDTO> response = restTemplate.exchange(
receipt_query_url + DDMS_H2_SERVICE_SLAVE +
"api/receipt/so/task/query/getbyahasscodeandsoid/{ahassCode}/{soID}", "api/receipt/so/task/query/getbyahasscodeandsoid/{ahassCode}/{soID}",
HttpMethod.GET, HttpMethod.GET,
RequestUtil.getPreFormattedRequestWithUserPassword(), RequestUtil.getPreFormattedRequestWithUserPassword(),
...@@ -419,7 +419,7 @@ public class WorkOrderOrafinHystrixService { ...@@ -419,7 +419,7 @@ public class WorkOrderOrafinHystrixService {
public ReceiptSOTunaiDTO getSalesOrderByReceiptID(String receiptID) { public ReceiptSOTunaiDTO getSalesOrderByReceiptID(String receiptID) {
if (StringUtil.hasValue(receiptID)) { if (StringUtil.hasValue(receiptID)) {
ResponseEntity<ReceiptSOTunaiDTO> data = restTemplate.exchange( ResponseEntity<ReceiptSOTunaiDTO> data = restTemplate.exchange(
receipt_query_url + DDMS_H2_SERVICE_SLAVE +
"api/receipt/so/tunai/query/getByReceiptID/{receiptID}", "api/receipt/so/tunai/query/getByReceiptID/{receiptID}",
HttpMethod.GET, HttpMethod.GET,
RequestUtil.getPreFormattedRequestWithUserPassword(), RequestUtil.getPreFormattedRequestWithUserPassword(),
...@@ -446,7 +446,7 @@ public class WorkOrderOrafinHystrixService { ...@@ -446,7 +446,7 @@ public class WorkOrderOrafinHystrixService {
private ReceiptSOTaskDTO getReceiptSo(String soid, String ahassCode) { private ReceiptSOTaskDTO getReceiptSo(String soid, String ahassCode) {
if (StringUtil.hasValue(soid)) { if (StringUtil.hasValue(soid)) {
ResponseEntity<ResponseReceiptSOTaskGetListDTO> response = restTemplate.exchange( ResponseEntity<ResponseReceiptSOTaskGetListDTO> response = restTemplate.exchange(
receipt_query_url + DDMS_H2_SERVICE_SLAVE +
"api/receipt/so/task/query/getbyahasscodeandsoid/{ahassCode}/{soID}", "api/receipt/so/task/query/getbyahasscodeandsoid/{ahassCode}/{soID}",
HttpMethod.GET, HttpMethod.GET,
RequestUtil.getPreFormattedRequestWithUserPassword(), RequestUtil.getPreFormattedRequestWithUserPassword(),
......
...@@ -19,13 +19,9 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE ...@@ -19,13 +19,9 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
ddms.h2.service.slave = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/} ddms.h2.service.slave = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
dam.masterdata.h1 = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/} dam.masterdata.h1 = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
dam.ppn.query.url = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn} dam.ppn.query.url = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
dam.receipt.query.h3 = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
#dam.gigr.h3 = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
dam.receipt.command.h3 = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/} dam.receipt.command.h3 = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
dam.masterdata.h2 = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/} dam.masterdata.h2 = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
#dam.cust.purch.h3 = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
dam.claim.h2 = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/} dam.claim.h2 = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
#dam.masterdata.h3 = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
# KAFKA # KAFKA
#----------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------
......
...@@ -19,13 +19,9 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE ...@@ -19,13 +19,9 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
ddms.h2.service.slave = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/} ddms.h2.service.slave = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
dam.masterdata.h1 = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/} dam.masterdata.h1 = ${DAM_MASTERDATA_H1:http://api-cbr.daya-dms.id/masterdata/}
dam.ppn.query.url = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn} dam.ppn.query.url = ${PPN_QUERY_URL:http://api-cbr.daya-dms.id/ddms-h1-ppn/v1/qry/master/ppn/getActivePpn}
dam.receipt.query.h3 = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
#dam.gigr.h3 = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
dam.receipt.command.h3 = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/} dam.receipt.command.h3 = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
dam.masterdata.h2 = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/} dam.masterdata.h2 = ${DAM_MASTERDATA_H2:https://api-uat-b.eksad.com/masterdata-h2/}
#dam.cust.purch.h3 = ${DAM_CUST_PURCH_H3:https://api-uat-b.eksad.com/cust-purch/}
dam.claim.h2 = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/} dam.claim.h2 = ${DAM_CLAIM_H2:https://api-uat-b.eksad.com/claim-h2/}
#dam.masterdata.h3 = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
# KAFKA # 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