From 9fe9209426b884ebf4ee11e840ff91f46b64b8cb Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 2 Mar 2022 21:32:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/src/common/js/request/index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mobile/src/common/js/request/index.js b/mobile/src/common/js/request/index.js index 904452cfa4..075b89dbea 100644 --- a/mobile/src/common/js/request/index.js +++ b/mobile/src/common/js/request/index.js @@ -1,6 +1,6 @@ import axios from 'axios' import Config from '@/settings' -import { getToken, setToken, setUserInfo } from '@/common/utils' +import { getToken, setToken, setUserInfo, parseLanguage } from '@/common/utils' const TokenKey = Config.TokenKey const RefreshTokenKey = Config.RefreshTokenKey const white_list = Config.WHITE_LIST @@ -15,6 +15,17 @@ let service = axios.create({ // request interceptor service.interceptors.request.use( config => { + + let lang = parseLanguage() || uni.getLocale() + if (lang === 'en') { + config.headers['Accept-Language'] = 'en-US' + }else if(lang === 'zh-Hant'){ + config.headers['Accept-Language'] = 'zh-TW' + }else { + config.headers['Accept-Language'] = 'zh-CN' + } + + if (white_list.includes(config.url)) { return config } From a0a1b1f96ef326cf05374ab42681467f82954ee4 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 2 Mar 2022 22:34:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96listener=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/listener/DataSourceInitStartListener.java | 2 +- .../src/main/java/io/dataease/listener/SystemInitListener.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java index 543f9f5bc7..453972e4dd 100644 --- a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; @Component -@Order(value = 1) +@Order(value = 2) public class DataSourceInitStartListener implements ApplicationListener { @Resource private DatasourceService datasourceService; diff --git a/backend/src/main/java/io/dataease/listener/SystemInitListener.java b/backend/src/main/java/io/dataease/listener/SystemInitListener.java index a9f6f3e382..28f4ba69e5 100644 --- a/backend/src/main/java/io/dataease/listener/SystemInitListener.java +++ b/backend/src/main/java/io/dataease/listener/SystemInitListener.java @@ -9,12 +9,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; +import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Date; @Component +@Order(value = 1) public class SystemInitListener implements ApplicationListener { private final Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class);