From 8236316ecb3192eb3fa3f9d365bb030edd04d0c6 Mon Sep 17 00:00:00 2001 From: ibnu Date: Fri, 1 Sep 2023 02:31:15 +0700 Subject: [PATCH 1/2] conflict --- src/const/ApiConst.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index 07b56d8..855f266 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -112,8 +112,8 @@ export const BASE_INTEGRATION_V1 = "http://ospro-api.adyawinsa.com:9083"; export const TOKEN_ADW = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIxMjAyIiwiZXhwIjoxNjkxODMwNDkzfQ.DvBQIOZsdFndWsliPCZT65Y6G5Xx4vWBKz8Rhe7rvRA"; // export let BASE_OSPRO = "https://ospro-api.ospro.id"; -export let BASE_OSPRO = "https://adw-api.ospro.id"; -// export let BASE_OSPRO = "http://localhost:8444/adw-backend"; +// export let BASE_OSPRO = "https://adw-api.ospro.id"; +export let BASE_OSPRO = "http://localhost:8444"; // export let BASE_OSPRO = "http://192.168.1.123:8444"; // local // export let BASE_OSPRO = "http://103.73.125.81:8444"; // ip public adw export let BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; From 6f78abe133b2d80644fac320db68ddec30b836c5 Mon Sep 17 00:00:00 2001 From: ibnu Date: Tue, 5 Sep 2023 10:30:35 +0700 Subject: [PATCH 2/2] update base_url API --- src/const/ApiConst.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index 08f05e5..cbed48f 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -118,7 +118,6 @@ export const TOKEN_ADW = // export let BASE_OSPRO = "https://ospro-api.ospro.id"; export let BASE_OSPRO = "https://adw-api.ospro.id"; // export let BASE_OSPRO = "http://localhost:8444"; -// export let BASE_OSPRO = "http://192.168.1.123:8444"; // local // export let BASE_OSPRO = "http://103.73.125.81:8444"; // ip public adw export let BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; export let BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`;