diff --git a/backend/app/api/v1/device.go b/backend/app/api/v1/device.go index 4d9873809..4b04e3f5d 100644 --- a/backend/app/api/v1/device.go +++ b/backend/app/api/v1/device.go @@ -14,7 +14,7 @@ import ( // @Description 获取设备基础信息 // @Success 200 {object} dto.DeviceBaseInfo // @Security ApiKeyAuth -// @Router /toolbox/device/base [get] +// @Router /toolbox/device/base [post] func (b *BaseApi) LoadDeviceBaseInfo(c *gin.Context) { data, err := deviceService.LoadBaseInfo() if err != nil { diff --git a/backend/app/service/device.go b/backend/app/service/device.go index 28da10c78..9441c776d 100644 --- a/backend/app/service/device.go +++ b/backend/app/service/device.go @@ -55,10 +55,15 @@ func (u *DeviceService) LoadBaseInfo() (dto.DeviceBaseInfo, error) { baseInfo.Hosts = loadHosts() baseInfo.Hostname = loadHostname() baseInfo.User = loadUser() - ntp, _ := settingRepo.Get(settingRepo.WithByKey("NtpSite")) - baseInfo.Ntp = ntp.Value + ntp, err := settingRepo.Get(settingRepo.WithByKey("NtpSite")) + if err == nil { + baseInfo.Ntp = ntp.Value + } - swapInfo, _ := mem.SwapMemory() + swapInfo, err := mem.SwapMemory() + if err != nil { + return baseInfo, err + } baseInfo.SwapMemoryTotal = swapInfo.Total baseInfo.SwapMemoryAvailable = swapInfo.Free baseInfo.SwapMemoryUsed = swapInfo.Used @@ -375,7 +380,7 @@ func loadUser() string { func loadSwap() []dto.SwapHelper { var data []dto.SwapHelper - std, err := cmd.Execf("%s swapon --show --summary", cmd.SudoHandleCmd()) + std, err := cmd.Execf("%s swapon --summary", cmd.SudoHandleCmd()) if err != nil { return data } diff --git a/backend/router/ro_toolbox.go b/backend/router/ro_toolbox.go index a2008cd8a..ddb506e65 100644 --- a/backend/router/ro_toolbox.go +++ b/backend/router/ro_toolbox.go @@ -16,7 +16,7 @@ func (s *ToolboxRouter) InitToolboxRouter(Router *gin.RouterGroup) { Use(middleware.PasswordExpired()) baseApi := v1.ApiGroupApp.BaseApi { - toolboxRouter.GET("/device/base", baseApi.LoadDeviceBaseInfo) + toolboxRouter.POST("/device/base", baseApi.LoadDeviceBaseInfo) toolboxRouter.GET("/device/zone/options", baseApi.LoadTimeOption) toolboxRouter.POST("/device/update/conf", baseApi.UpdateDeviceConf) toolboxRouter.POST("/device/update/host", baseApi.UpdateDeviceHost) diff --git a/cmd/server/docs/docs.go b/cmd/server/docs/docs.go index f634ef66c..f46955f50 100644 --- a/cmd/server/docs/docs.go +++ b/cmd/server/docs/docs.go @@ -10102,7 +10102,7 @@ const docTemplate = `{ } }, "/toolbox/device/base": { - "get": { + "post": { "security": [ { "ApiKeyAuth": [] diff --git a/cmd/server/docs/swagger.json b/cmd/server/docs/swagger.json index 016953aca..2077d314f 100644 --- a/cmd/server/docs/swagger.json +++ b/cmd/server/docs/swagger.json @@ -10095,7 +10095,7 @@ } }, "/toolbox/device/base": { - "get": { + "post": { "security": [ { "ApiKeyAuth": [] diff --git a/cmd/server/docs/swagger.yaml b/cmd/server/docs/swagger.yaml index af1c6ac30..0b1a6146b 100644 --- a/cmd/server/docs/swagger.yaml +++ b/cmd/server/docs/swagger.yaml @@ -11190,7 +11190,7 @@ paths: formatZH: 清理系统垃圾文件 paramKeys: [] /toolbox/device/base: - get: + post: description: 获取设备基础信息 responses: "200": diff --git a/frontend/src/api/modules/toolbox.ts b/frontend/src/api/modules/toolbox.ts index 0095ead5d..61a296a96 100644 --- a/frontend/src/api/modules/toolbox.ts +++ b/frontend/src/api/modules/toolbox.ts @@ -6,16 +6,16 @@ import { TimeoutEnum } from '@/enums/http-enum'; // device export const getDeviceBase = () => { - return http.get(`/toolbox/device/base`); + return http.post(`/toolbox/device/base`, {}, TimeoutEnum.T_60S); }; export const loadTimeZoneOptions = () => { return http.get>(`/toolbox/device/zone/options`); }; export const updateDevice = (key: string, value: string) => { - return http.post(`/toolbox/device/update/conf`, { key: key, value: value }); + return http.post(`/toolbox/device/update/conf`, { key: key, value: value }, TimeoutEnum.T_60S); }; export const updateDeviceHost = (param: Array) => { - return http.post(`/toolbox/device/update/host`, param); + return http.post(`/toolbox/device/update/host`, param, TimeoutEnum.T_60S); }; export const updateDevicePasswd = (user: string, passwd: string) => { return http.post(`/toolbox/device/update/passwd`, { user: user, passwd: Base64.encode(passwd) }); diff --git a/frontend/src/views/home/status/index.vue b/frontend/src/views/home/status/index.vue index 6aaf46bbc..288279a54 100644 --- a/frontend/src/views/home/status/index.vue +++ b/frontend/src/views/home/status/index.vue @@ -69,7 +69,7 @@ {{ $t('home.free') }}: {{ formatNumber(currentInfo.swapMemoryAvailable / 1024 / 1024) }} MB - {{ $t('home.percent') }}: {{ formatNumber(currentInfo.swapMemoryUsedPercent * 100) }}% + {{ $t('home.percent') }}: {{ formatNumber(currentInfo.swapMemoryUsedPercent) }}% - + - + - + { type: 'info', }, ).then(async () => { + loading.value = true; await updateDevice('Hostname', form.hostname) .then(async () => { MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); diff --git a/frontend/src/views/toolbox/device/hosts/index.vue b/frontend/src/views/toolbox/device/hosts/index.vue index 972346626..27357f4f4 100644 --- a/frontend/src/views/toolbox/device/hosts/index.vue +++ b/frontend/src/views/toolbox/device/hosts/index.vue @@ -5,7 +5,7 @@ - + {{ $t('database.baseConf') }} diff --git a/frontend/src/views/toolbox/device/passwd/index.vue b/frontend/src/views/toolbox/device/passwd/index.vue index 0e831c752..99f5e676a 100644 --- a/frontend/src/views/toolbox/device/passwd/index.vue +++ b/frontend/src/views/toolbox/device/passwd/index.vue @@ -1,11 +1,11 @@