提交 2b053617 authored 作者: taojinlong's avatar taojinlong

Merge branch 'dev' of github.com:dataease/dataease into dev

...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; ...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
@Component @Component
@Order(value = 1) @Order(value = 2)
public class DataSourceInitStartListener implements ApplicationListener<ApplicationReadyEvent> { public class DataSourceInitStartListener implements ApplicationListener<ApplicationReadyEvent> {
@Resource @Resource
private DatasourceService datasourceService; private DatasourceService datasourceService;
......
...@@ -9,12 +9,14 @@ import org.slf4j.Logger; ...@@ -9,12 +9,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
@Component @Component
@Order(value = 1)
public class SystemInitListener implements ApplicationListener<ApplicationReadyEvent> { public class SystemInitListener implements ApplicationListener<ApplicationReadyEvent> {
private final Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class); private final Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class);
......
import axios from 'axios' import axios from 'axios'
import Config from '@/settings' import Config from '@/settings'
import { getToken, setToken, setUserInfo } from '@/common/utils' import { getToken, setToken, setUserInfo, parseLanguage } from '@/common/utils'
const TokenKey = Config.TokenKey const TokenKey = Config.TokenKey
const RefreshTokenKey = Config.RefreshTokenKey const RefreshTokenKey = Config.RefreshTokenKey
const white_list = Config.WHITE_LIST const white_list = Config.WHITE_LIST
...@@ -15,6 +15,17 @@ let service = axios.create({ ...@@ -15,6 +15,17 @@ let service = axios.create({
// request interceptor // request interceptor
service.interceptors.request.use( service.interceptors.request.use(
config => { 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)) { if (white_list.includes(config.url)) {
return config return config
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论