diff --git a/.env.example b/.env.example index 7808f4e0..7f8cb8c5 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,3 @@ VITE_API_URI_CONFIG: "https://app.your-domain.com/api/v1" +VITE_URL_SSO: "https://app-sso.your-domain.com" VITE_MANUAL_URL: "https://app-manual.your-domain.com" \ No newline at end of file diff --git a/.env.production b/.env.production index afa876a1..df95cced 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,4 @@ -VITE_API_PUBLISH_URL=VITE_API_PUBLISH_URL -VITE_API_REPORT_URL=VITE_API_REPORT_URL VITE_API_URI_CONFIG=VITE_API_URI_CONFIG +VITE_API_REPORT_URL=VITE_API_REPORT_URL VITE_MANUAL_URL=VITE_MANUAL_URL VITE_URL_SSO: VITE_URL_SSO \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index ff6c0d53..2f3ac1ac 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -8,9 +8,8 @@ for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/assets/Q do echo "Processing $file ..."; - sed -i 's|VITE_API_PUBLISH_URL|'${VITE_API_PUBLISH_URL}'|g' $file - sed -i 's|VITE_API_REPORT_URL|'${VITE_API_REPORT_URL}'|g' $file sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file + sed -i 's|VITE_API_REPORT_URL|'${VITE_API_REPORT_URL}'|g' $file sed -i 's|VITE_MANUAL_URL|'${VITE_MANUAL_URL}'|g' $file sed -i 's|VITE_URL_SSO|'${VITE_URL_SSO}'|g' $file diff --git a/src/api/index.ts b/src/api/index.ts index aafcee93..6d414f75 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -3,8 +3,7 @@ import { ref } from "vue"; const env = ref(process.env.NODE_ENV || "development"); export const apiUrlConfig = import.meta.env.VITE_API_URI_CONFIG; -// export const apiUrlConfigPublish = import.meta.env.VITE_API_PUBLISH_URL; -// export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL; +export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL; // if (process.env.VUE_APP_TEST) { // env = "test"; // } @@ -37,8 +36,7 @@ const config = ref({ API_REPORT_URI: apiUrlConfig, MEET_URI: "meet.frappet.com", API_REPORT2_URI: `${window.location.protocol}//${window.location.host}/api/v2`, - API_REPORT_TEMPLATE_URI: - "https://report-server.frappet.synology.me/api/v1/report-template", + API_REPORT_TEMPLATE_URI: apiUrlConfigReport, API_LOG: apiUrlConfig, }, });