From 11b1f584fff8340f6a31d8a40efe7d23e8043bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Fri, 30 Apr 2021 00:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E4=BF=A1=E6=81=AF=EF=BC=9A=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?buffer=5Fcache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Library/SystemInfo.php                  | 9 +++++----
 app/Modules/Admin/Services/IndexService.php | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Library/SystemInfo.php b/app/Library/SystemInfo.php
index 1bf1755..e6b3bf9 100644
--- a/app/Library/SystemInfo.php
+++ b/app/Library/SystemInfo.php
@@ -92,11 +92,12 @@ class SystemInfo
             $rs = fread($fp, 1024);
             $sys_info = explode("\n", $rs);
             $mem_info = explode(",", $sys_info[2]); //内存占有量 数组
-            $this->memory['total'] = trim(trim($mem_info[0], 'KiB Mem : '), ' total');
-            $this->memory['used'] = trim(trim($mem_info[2], 'used'));
+
+            $this->memory['total'] = round(trim(trim($mem_info[0], 'KiB Mem : '), ' total'), 0);
+            $this->memory['used'] = round(trim(trim($mem_info[2], 'used')), 0);
             $this->memory['buffer_cache'] = trim(trim($mem_info[3], 'buff/cache'));
-            $this->memory['free'] = trim(trim($mem_info[1], 'free'));
-            $this->memory['usage_ratio'] = round($this->memory['used'] / intval($this->memory['total']), 4) * 100; //百分比
+            $this->memory['free'] = round(trim(trim($mem_info[1], 'free')), 0);
+            $this->memory['usage_ratio'] = round($this->memory['used'] / $this->memory['total'], 4) * 100; //百分比
         }
         return $this->memory;
     }
diff --git a/app/Modules/Admin/Services/IndexService.php b/app/Modules/Admin/Services/IndexService.php
index 08d6938..adc3e4c 100644
--- a/app/Modules/Admin/Services/IndexService.php
+++ b/app/Modules/Admin/Services/IndexService.php
@@ -189,7 +189,7 @@ class IndexService extends BaseService
 
         $memory_info = $systemInfo->getMemory();
         $memory = [
-            'chart_legend' => ['used', 'free'],
+            'chart_legend' => ['used', 'free', 'buffer_cache'],
             'chart_series' => [
                 [
                     'name' => 'used',
@@ -199,6 +199,10 @@ class IndexService extends BaseService
                     'name' => 'free',
                     'value' => $memory_info['free'],
                 ],
+                [
+                    'name' => 'buffer_cache',
+                    'value' => $memory_info['buffer_cache'],
+                ],
             ],
         ];
 
-- 
Gitee