dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13394 from dataease/pr@dev-v2@perf_log_client

Browse Source 
perf(X-Pack): 日志区分客户端类型
This commit is contained in:
xuwei-fit2cloud 2024-11-18 17:54:41 +08:00 committed by GitHub
commit 7951d15a2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/config/axios/service.ts
View File

@ -14,6 +14,7 @@ import { useEmbedded } from '@/store/modules/embedded'
import { useLinkStoreWithOut } from '@/store/modules/link' import { useLinkStoreWithOut } from '@/store/modules/link'
import { config } from './config' import { config } from './config'
import { configHandler } from './refresh' import { configHandler } from './refresh'
import { isMobile } from '@/utils/utils'
type AxiosErrorWidthLoading<T> = T & { type AxiosErrorWidthLoading<T> = T & {
config: { config: {
@ -108,6 +109,9 @@ service.interceptors.request.use(
config.baseURL = PATH_URL config.baseURL = PATH_URL
} }
if (isMobile()) {
;(config.headers as AxiosRequestHeaders)['X-DE-MOBILE'] = true
}
if (linkStore.getLinkToken) { if (linkStore.getLinkToken) {
;(config.headers as AxiosRequestHeaders)['X-DE-LINK-TOKEN'] = linkStore.getLinkToken ;(config.headers as AxiosRequestHeaders)['X-DE-LINK-TOKEN'] = linkStore.getLinkToken
} else if (embeddedStore.token) { } else if (embeddedStore.token) {

4
core/core-frontend/src/locales/zh-CN.ts
View File

@ -83,7 +83,9 @@ export default {
confirm_export: '确定导出日志吗', confirm_export: '确定导出日志吗',
export_success: '导出成功', export_success: '导出成功',
excel_file_name: 'DataEase操作日志', excel_file_name: 'DataEase操作日志',
relevant_content_found: '没有找到相关内容' relevant_content_found: '没有找到相关内容',
mobile: '移动端',
client: '客户端'
}, },
template_manage: { template_manage: {
name_already_exists_type: '分类名称已存在', name_already_exists_type: '分类名称已存在',

2
de-xpack

@ -1 +1 @@
Subproject commit 9d120aec82118de0493e3c22dc2acc200f74f05a Subproject commit b7b7a604fa8a35ca9e48e6fcbdde2aea9f88c390

2
sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
View File

@ -20,4 +20,6 @@ public class LogGridRequest extends KeywordRequest implements Serializable {
private List<Long> time; private List<Long> time;
private Boolean timeDesc = true; private Boolean timeDesc = true;
private List<String> client;
} }