diff --git a/src/apps/state.ts b/src/apps/state.ts index 10e1e8a..d8d43e9 100644 --- a/src/apps/state.ts +++ b/src/apps/state.ts @@ -56,8 +56,12 @@ export const state = karin.command(/^#系统信息(pro)?$/, async (e) => { 'CPU信息', `CPU: ${CPUInfo}`, `CPU使用率: ${CPUUsage}%`, - `CPU温度: ${CPUTemp}`, - `CPU缓存: ${CPUCache}` + `CPU温度: ${CPUTemp}°C`, + 'CPU缓存:', + `L1数据缓存: ${CPUCache.l1d}`, + `L1指令缓存: ${CPUCache.l1i}`, + `L2缓存: ${CPUCache.l2}`, + `L3缓存: ${CPUCache.l3}` ].join('\n')) list.push([ @@ -72,7 +76,7 @@ export const state = karin.command(/^#系统信息(pro)?$/, async (e) => { list.push([ '磁盘信息:', - `${DiskInfos}`, + `${DiskInfos}` ].join('\n')) const msg = list.map((v) => segment.text(v)) diff --git a/src/models/state/CPU.ts b/src/models/state/CPU.ts index e8527a8..7aef476 100644 --- a/src/models/state/CPU.ts +++ b/src/models/state/CPU.ts @@ -1,3 +1,4 @@ +import { Size } from '@/components/Size' import si from 'systeminformation' /** @@ -35,11 +36,11 @@ const getCPUInfo = async (): Promise => { * 获取CPU温度 * @returns {Promise} */ -const getCPUTemp = async (): Promise => { +const getCPUTemp = async (): Promise => { try { const cpuTemp = await si.cpuTemperature() - const data = `${cpuTemp.main}°C` + const data = cpuTemp.main return data } catch (error) { return 0 @@ -60,13 +61,13 @@ const getCPUCache = async (): Promise => { l3: '' } const cpuCache = await si.cpuCache() - data.l1d = cpuCache.l1d > 1024 ? `${(cpuCache.l1d / 1024).toFixed(2)}MB` : `${cpuCache.l1d}KB` - data.l1i = cpuCache.l1i > 1024 ? `${(cpuCache.l1i / 1024).toFixed(2)}MB` : `${cpuCache.l1i}KB` - data.l2 = cpuCache.l2 > 1024 ? `${(cpuCache.l2 / 1024).toFixed(2)}MB` : `${cpuCache.l2}KB` - data.l3 = cpuCache.l3 > 1024 ? `${(cpuCache.l3 / 1024).toFixed(2)}MB` : `${cpuCache.l3}KB` + data.l1d = await Size(cpuCache.l1d) + data.l1i = await Size(cpuCache.l1i) + data.l2 = await Size(cpuCache.l2) + data.l3 = await Size(cpuCache.l3) return data } catch (error) { - return '少女不知道哦' + return '' } }