From 47a9ba60cb8f7eb8a3ba65d1b0f2623ce1c17a1d Mon Sep 17 00:00:00 2001 From: windows11 Date: Wed, 3 Nov 2021 13:39:55 +0800 Subject: [PATCH 1/3] fix a bug --- server/src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main.cpp b/server/src/main.cpp index b3473e2..f4e35d5 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -267,7 +267,7 @@ void CMain::JSONUpdateThread(void *pUser) // track month network traffic, diff: 2021-10-01 00:05, 5minutes // last_network_in/out is last record flag. time_t currentStamp = (long long)time(/*ago*/0); - if(0 == pClients[i].m_LastNetworkIN || (localtime(¤tStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(¤tStamp)->tm_hour == 0 && localtime(¤tStamp)->tm_min < 5)) + if(0 == pClients[i].m_LastNetworkIN || pClients[i].m_LastNetworkIN > pClients[i].m_Stats.m_NetworkIN || (localtime(¤tStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(¤tStamp)->tm_hour == 0 && localtime(¤tStamp)->tm_min < 5)) { pClients[i].m_LastNetworkIN = pClients[i].m_Stats.m_NetworkIN; pClients[i].m_LastNetworkOUT = pClients[i].m_Stats.m_NetworkOUT; @@ -281,8 +281,8 @@ void CMain::JSONUpdateThread(void *pUser) pClients[i].m_Stats.m_time_10010, pClients[i].m_Stats.m_time_189, pClients[i].m_Stats.m_time_10086,pClients[i].m_Stats.m_tcpCount,pClients[i].m_Stats.m_udpCount,pClients[i].m_Stats.m_processCount,pClients[i].m_Stats.m_threadCount, pClients[i].m_Stats.m_NetworkRx, pClients[i].m_Stats.m_NetworkTx, pClients[i].m_Stats.m_NetworkIN, pClients[i].m_Stats.m_NetworkOUT, (int)pClients[i].m_Stats.m_CPU, pClients[i].m_Stats.m_MemTotal, pClients[i].m_Stats.m_MemUsed, pClients[i].m_Stats.m_SwapTotal, pClients[i].m_Stats.m_SwapUsed, pClients[i].m_Stats.m_HDDTotal, pClients[i].m_Stats.m_HDDUsed, - pClients[i].m_Stats.m_NetworkIN == 0 || pClients[i].m_LastNetworkIN == 0 || pClients[i].m_LastNetworkIN > pClients[i].m_Stats.m_NetworkIN? pClients[i].m_Stats.m_NetworkIN : pClients[i].m_LastNetworkIN, - pClients[i].m_Stats.m_NetworkOUT == 0 || pClients[i].m_LastNetworkOUT == 0 || pClients[i].m_LastNetworkOUT > pClients[i].m_Stats.m_NetworkOUT ? pClients[i].m_Stats.m_NetworkOUT : pClients[i].m_LastNetworkOUT, + pClients[i].m_Stats.m_NetworkIN == 0 || pClients[i].m_LastNetworkIN == 0 ? pClients[i].m_Stats.m_NetworkIN : pClients[i].m_LastNetworkIN, + pClients[i].m_Stats.m_NetworkOUT == 0 || pClients[i].m_LastNetworkOUT == 0 ? pClients[i].m_Stats.m_NetworkOUT : pClients[i].m_LastNetworkOUT, pClients[i].m_Stats.m_aCustom); pBuf += strlen(pBuf); } From f6cfdc9e6b62ac05bdd34390f93e65477eff8450 Mon Sep 17 00:00:00 2001 From: windows11 Date: Wed, 3 Nov 2021 14:45:00 +0800 Subject: [PATCH 2/3] fix --- server/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main.cpp b/server/src/main.cpp index f4e35d5..11b2526 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -267,7 +267,7 @@ void CMain::JSONUpdateThread(void *pUser) // track month network traffic, diff: 2021-10-01 00:05, 5minutes // last_network_in/out is last record flag. time_t currentStamp = (long long)time(/*ago*/0); - if(0 == pClients[i].m_LastNetworkIN || pClients[i].m_LastNetworkIN > pClients[i].m_Stats.m_NetworkIN || (localtime(¤tStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(¤tStamp)->tm_hour == 0 && localtime(¤tStamp)->tm_min < 5)) + if(0 == pClients[i].m_LastNetworkIN || (0 != pClients[i].m_Stats.m_NetworkIN && pClients[i].m_LastNetworkIN > pClients[i].m_Stats.m_NetworkIN) || (localtime(¤tStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(¤tStamp)->tm_hour == 0 && localtime(¤tStamp)->tm_min < 5)) { pClients[i].m_LastNetworkIN = pClients[i].m_Stats.m_NetworkIN; pClients[i].m_LastNetworkOUT = pClients[i].m_Stats.m_NetworkOUT; From 3cb0ea477712703137f6e5fac134d2d222fbef69 Mon Sep 17 00:00:00 2001 From: windows11 Date: Wed, 3 Nov 2021 14:48:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?css=E9=98=B2=E6=AD=A2=E6=8C=A4=E5=85=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/css/dark.css | 1 + web/css/light.css | 1 + 2 files changed, 2 insertions(+) diff --git a/web/css/dark.css b/web/css/dark.css index e2b7029..906b969 100644 --- a/web/css/dark.css +++ b/web/css/dark.css @@ -25,6 +25,7 @@ tr.odd.expandRow > :hover { background: #000 !important; } @media only screen and (max-width: 992px) { #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } + #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } #ping, tr td:nth-child(13) { display:none; visibility:hidden; } } @media only screen and (max-width: 720px) { diff --git a/web/css/light.css b/web/css/light.css index 18fbedf..f7c169b 100644 --- a/web/css/light.css +++ b/web/css/light.css @@ -22,6 +22,7 @@ tr.odd.expandRow > :hover { background: #FFF !important; } @media only screen and (max-width: 992px) { #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } + #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } #ping, tr td:nth-child(13) { display:none; visibility:hidden; } } @media only screen and (max-width: 720px) {