mirror of
https://github.com/dataease/dataease.git
synced 2025-02-24 11:32:57 +08:00
Merge branch 'dev' of github.com:dataease/dataease into dev
This commit is contained in:
commit
2b05361788
@ -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<ApplicationReadyEvent> {
|
||||
@Resource
|
||||
private DatasourceService datasourceService;
|
||||
|
@ -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<ApplicationReadyEvent> {
|
||||
private final Logger logger = LoggerFactory.getLogger(ClassloaderResponsity.class);
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user