From 0924da3daf86b5c95ba260b413f07d496aebe28b Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 29 Nov 2023 09:35:17 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20config=20api=20=E0=B8=9A=E0=B8=99=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +++- entrypoint.sh | 1 + src/api/index.ts | 17 +++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.env.production b/.env.production index e9ad3c6..8d73df3 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,9 @@ VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK +VITE_API_URI_CONFIG=VITE_API_URI_CONFIG # VITE_REALM_KEYCLOAK: "bma-ehr" # VITE_CLIENTID_KEYCLOAK: "bma-ehr-exam-vue3" -# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/" \ No newline at end of file +# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/" +# VITE_API_URI_CONFIG: "https://bma-ehr.frappet.synology.me/api/v1" \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index ef39424..7f8e2db 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,6 +11,7 @@ do sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file + sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file done diff --git a/src/api/index.ts b/src/api/index.ts index 66bac05..1a28e27 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,7 +1,8 @@ /**config api */ -import { ref } from "vue"; +import { ref } from 'vue' -const env = ref(process.env.NODE_ENV || "development"); +const env = ref(process.env.NODE_ENV || 'development') +export const apiUrlConfig = import.meta.env.VITE_API_URI_CONFIG // if (process.env.VUE_APP_TEST) { // env = "test"; // } @@ -9,21 +10,21 @@ const env = ref(process.env.NODE_ENV || "development"); const config = ref({ development: { // API_URI: "https://localhost:7260/api", - API_URI: "https://bma-ehr.frappet.synology.me/api/v1", + API_URI: 'https://bma-ehr.frappet.synology.me/api/v1', }, test: { - API_URI: "http://localhost:5010/api/v1", + API_URI: 'http://localhost:5010/api/v1', }, production: { // API_URI: "https://localhost:5010", - API_URI: `${window.location.protocol}//${window.location.host}/api/v1`, + API_URI: apiUrlConfig, }, -}); +}) -const API_URI = ref(config.value[env.value].API_URI); +const API_URI = ref(config.value[env.value].API_URI) export default { env: env.value, config: config.value, API_URI: API_URI.value, -}; +}