diff --git a/backend/app/dto/dashboard.go b/backend/app/dto/dashboard.go index 363a9a804..a7d3a5c95 100644 --- a/backend/app/dto/dashboard.go +++ b/backend/app/dto/dashboard.go @@ -16,8 +16,7 @@ type DashboardBase struct { KernelArch string `json:"kernelArch"` KernelVersion string `json:"kernelVersion"` VirtualizationSystem string `json:"virtualizationSystem"` - IpV4Addr string `json:"ipV4Addr"` - SystemProxy string `json:"systemProxy"` + CPUCores int `json:"cpuCores"` CPULogicalCores int `json:"cpuLogicalCores"` CPUModelName string `json:"cpuModelName"` diff --git a/backend/app/service/dashboard.go b/backend/app/service/dashboard.go index 60d43f8b3..0ac4af844 100644 --- a/backend/app/service/dashboard.go +++ b/backend/app/service/dashboard.go @@ -1,10 +1,8 @@ package service import ( - "context" "encoding/json" "fmt" - "os" "sort" "strings" "sync" @@ -96,20 +94,11 @@ func (u *DashboardService) LoadBaseInfo(ioOption string, netOption string) (*dto baseInfo.KernelVersion = hostInfo.KernelVersion ss, _ := json.Marshal(hostInfo) baseInfo.VirtualizationSystem = string(ss) - baseInfo.IpV4Addr=host.IpV4AddrWithContext(context.Background()) - httpProxy := os.Getenv("http_proxy") - if httpProxy == "" { - httpProxy = os.Getenv("HTTP_PROXY") // 也检查大写的环境变量名 - } - if httpProxy!=""{ - baseInfo.SystemProxy=httpProxy - } - baseInfo.SystemProxy="noProxy" + appInstall, err := appInstallRepo.ListBy() if err != nil { return nil, err } - baseInfo.AppInstalledNumber = len(appInstall) postgresqlDbs, err := postgresqlRepo.List() if err != nil { diff --git a/frontend/src/api/interface/dashboard.ts b/frontend/src/api/interface/dashboard.ts index bd8062809..e593f9e4e 100644 --- a/frontend/src/api/interface/dashboard.ts +++ b/frontend/src/api/interface/dashboard.ts @@ -22,9 +22,7 @@ export namespace Dashboard { kernelArch: string; kernelVersion: string; virtualizationSystem: string; - IpV4Addr: string; - httpProxy: string; - + cpuCores: number; cpuLogicalCores: number; cpuModelName: string; diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index bf7403424..95a87c2b1 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -344,8 +344,6 @@ const message = { kernelArch: 'Kernel arch', network: 'Network', io: 'Disk IO', - ip: 'Ip Addr', - proxy: 'System Proxy', baseInfo: 'Base info', totalSend: 'Total send', totalRecv: 'Total recv', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index fd7e43a4e..c0b793617 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -337,8 +337,6 @@ const message = { kernelArch: '系统类型', network: '流量', io: '磁盘 IO', - ip: 'IP地址', - proxy: '系统代理', baseInfo: '基本信息', totalSend: '总发送', totalRecv: '总接收', diff --git a/frontend/src/views/home/index.vue b/frontend/src/views/home/index.vue index fda5256d8..3e71bdedb 100644 --- a/frontend/src/views/home/index.vue +++ b/frontend/src/views/home/index.vue @@ -225,25 +225,6 @@ {{ loadUpTime(currentInfo.uptime) }} - - - - - - @@ -322,8 +303,7 @@ const baseInfo = ref({ kernelArch: '', kernelVersion: '', virtualizationSystem: '', - IpV4Addr: '', - httpProxy: '', + cpuCores: 0, cpuLogicalCores: 0, cpuModelName: '',