From d36b4321253a9679fec5c6ae8d95a3defb146d99 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 24 Dec 2024 15:24:25 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                       | 1 +
 core/core-frontend/src/plugins/vue-i18n/index.ts | 4 ++--
 installer/dataease/docker-compose.yml            | 1 +
 installer/install.sh                             | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aabf290dc3..972f5a9303 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ RUN mkdir -p /opt/apps/config \
     /opt/dataease2.0/data/static-resource/ \
     /opt/dataease2.0/data/appearance/ \
     /opt/dataease2.0/data/exportData/ \
+    /opt/dataease2.0/data/i8n/ \
     /opt/dataease2.0/data/plugin/
 
 ADD drivers/* /opt/dataease2.0/drivers/
diff --git a/core/core-frontend/src/plugins/vue-i18n/index.ts b/core/core-frontend/src/plugins/vue-i18n/index.ts
index f86f58a609..bbc7d8475f 100644
--- a/core/core-frontend/src/plugins/vue-i18n/index.ts
+++ b/core/core-frontend/src/plugins/vue-i18n/index.ts
@@ -50,8 +50,8 @@ const createI18nOptions = async (): Promise<I18nOptions> => {
 
 const loadRemoteI18n = async (option: any) => {
   const name = option.lang.replace('-', '_')
-  // const basePath = import.meta.env.VITE_API_BASEPATH
-  const url = `${PATH_URL}/i18n/custom_${name}_front_${option.name}.js`
+  const path = PATH_URL.startsWith('./') && PATH_URL.length > 2 ? PATH_URL.substring(1) : PATH_URL
+  const url = `${path}/i18n/custom_${name}_front_${option.name}.js`
   return await import(url)
 }
 
diff --git a/installer/dataease/docker-compose.yml b/installer/dataease/docker-compose.yml
index 75e445c21a..70bfaef10d 100644
--- a/installer/dataease/docker-compose.yml
+++ b/installer/dataease/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - ${DE_BASE}/dataease2.0/data/exportData:/opt/dataease2.0/data/exportData
       - ${DE_BASE}/dataease2.0/data/plugin:/opt/dataease2.0/data/plugin
       - ${DE_BASE}/dataease2.0/data/font:/opt/dataease2.0/data/font
+      - ${DE_BASE}/dataease2.0/data/i18n:/opt/dataease2.0/data/i18n
     depends_on:
       DE_MYSQL_HOST:
         condition: service_healthy
diff --git a/installer/install.sh b/installer/install.sh
index 248ddd40e2..94d08f5b35 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -104,7 +104,7 @@ function prepare_de_run_base() {
    env | grep DE_ >.env
 
    mkdir -p ${DE_RUN_BASE}/{cache,logs,conf}
-   mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo,appearance,exportData,plugin,font}
+   mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo,appearance,exportData,plugin,font,i18n}
    mkdir -p ${DE_RUN_BASE}/apisix/logs
    mkdir -p ${DE_RUN_BASE}/task/logs
    chmod 777 ${DE_RUN_BASE}/apisix/logs ${DE_RUN_BASE}/data/etcd_data ${DE_RUN_BASE}/task/logs
@@ -203,7 +203,7 @@ EOF
 
       log_content "启动 docker"
       systemctl enable docker >/dev/null 2>&1; systemctl daemon-reload; systemctl start docker 2>&1 | tee -a ${CURRENT_DIR}/install.log
-         
+
       docker version >/dev/null 2>&1
       if [ $? -ne 0 ]; then
          log_content "docker 安装失败"