Merge pull request #169 from balala2oo8/master

修复月流量匹配问题，用username当作key作为匹配月流量的依据将其合并到分支usernameAsMonthTrafficKey，有喜欢这个版本的的可以使用。唯一的缺点会暴漏username。
修复月流量匹配问题
2025-12-17 04:01:45 +08:00 · 2022-05-23 16:33:06 +08:00 · 2022-05-13 21:07:44 +08:00 · 2022-05-10 15:20:58 +08:00 · 2022-05-10 11:56:38 +08:00 · 2022-05-06 10:26:46 +08:00
9 changed files with 424 additions and 273 deletions
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 [![Python Support](https://img.shields.io/badge/python-2.7%2B%20-blue.svg)](https://github.com/cppla/ServerStatus)
 [![C++ Compiler](http://img.shields.io/badge/C++-GNU-blue.svg?style=flat&logo=cplusplus)](https://github.com/cppla/ServerStatus)
 [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/cppla/ServerStatus)
-[![Version](https://img.shields.io/badge/Version-Beta%201.0.7-red)](https://github.com/cppla/ServerStatus)
+[![Version](https://img.shields.io/badge/Version-Beta%201.0.8-red)](https://github.com/cppla/ServerStatus)

-![Latest Version](http://dl.cpp.la/Archive/serverstatus-1.0.2.png)
+![Latest Version](http://dl.cpp.la/Archive/serverstatus-latest.png)

 `curl -sSL https://get.docker.com/ | sh && apt -y install docker-compose`    

@@ -127,9 +127,13 @@ sudo pip3 install psutil
 ![Shell View](http://dl.cpp.la/Archive/serverstatus-shell.png)


-# 相关开源项目： 
+# Make Better        

 * BotoX：https://github.com/BotoX/ServerStatus
 * mojeda: https://github.com/mojeda 
 * mojeda's ServerStatus: https://github.com/mojeda/ServerStatus
 * BlueVM's project: http://www.lowendtalk.com/discussion/comment/169690#Comment_169690
+
+# Jetbrains    
+
+<a href="https://www.jetbrains.com/?from=ServerStatus"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_square.png" width="100px"></a>
--- a/clients/client-linux.py
+++ b/clients/client-linux.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # coding: utf-8
-# Update by : https://github.com/cppla/ServerStatus, Update date: 20211009
-# 版本：1.0.2, 支持Python版本：2.7 to 3.9
+# Update by : https://github.com/cppla/ServerStatus, Update date: 20220323
+# 版本：1.0.3, 支持Python版本：2.7 to 3.9
 # 支持操作系统： Linux, OSX, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
 # 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。

@@ -9,16 +9,15 @@ SERVER = "127.0.0.1"
 USER = "s01"


-
-PORT = 35601
 PASSWORD = "USER_DEFAULT_PASSWORD"
-INTERVAL = 1
-PROBEPORT = 80
-PROBE_PROTOCOL_PREFER = "ipv4"  # ipv4, ipv6
-PING_PACKET_HISTORY_LEN = 100
+PORT = 35601
 CU = "cu.tz.cloudcpp.com"
 CT = "ct.tz.cloudcpp.com"
 CM = "cm.tz.cloudcpp.com"
+PROBEPORT = 80
+PROBE_PROTOCOL_PREFER = "ipv4"  # ipv4, ipv6
+PING_PACKET_HISTORY_LEN = 100
+INTERVAL = 1

 import socket
 import time
@@ -147,6 +146,10 @@ netSpeed = {
    'avgrx': 0,
    'avgtx': 0
 }
+diskIO = {
+    'read': 0,
+    'write': 0
+}

 def _ping_thread(host, mark, port):
    lostPacket = 0
@@ -210,7 +213,72 @@ def _net_speed():
            netSpeed["avgtx"] = avgtx
        time.sleep(INTERVAL)

-def get_realtime_date():
+def _disk_io():
+    '''
+    good luck for opensource! by: cpp.la
+    磁盘IO：因为IOPS原因，SSD和HDD、包括RAID卡，ZFS等阵列技术。IO对性能的影响还需要结合自身服务器情况来判断。
+    比如我这里是机械硬盘，大量做随机小文件读写，那么很低的读写也就能造成硬盘长时间的等待。
+    如果这里做连续性IO，那么普通机械硬盘写入到100Mb/s，那么也能造成硬盘长时间的等待。
+    磁盘读写有误差：4k，8k ，https://stackoverflow.com/questions/34413926/psutil-vs-dd-monitoring-disk-i-o
+    :return:
+    '''
+    while True:
+        # pre pid snapshot
+        snapshot_first = {}
+        # next pid snapshot
+        snapshot_second = {}
+        # read count snapshot
+        snapshot_read = 0
+        # write count snapshot
+        snapshot_write = 0
+        # process snapshot
+        pid_snapshot = [str(i) for i in os.listdir("/proc") if i.isdigit() is True]
+        for pid in pid_snapshot:
+            try:
+                with open("/proc/{}/io".format(pid)) as f:
+                    pid_io = {}
+                    for line in f.readlines():
+                        if "read_bytes" in line:
+                            pid_io["read"] = int(line.split("read_bytes:")[-1].strip())
+                        elif "write_bytes" in line and "cancelled_write_bytes" not in line:
+                            pid_io["write"] = int(line.split("write_bytes:")[-1].strip())
+                    pid_io["name"] = open("/proc/{}/comm".format(pid), "r").read().strip()
+                    snapshot_first[pid] = pid_io
+            except:
+                if pid in snapshot_first:
+                    snapshot_first.pop(pid)
+
+        time.sleep(INTERVAL)
+
+        for pid in pid_snapshot:
+            try:
+                with open("/proc/{}/io".format(pid)) as f:
+                    pid_io = {}
+                    for line in f.readlines():
+                        if "read_bytes" in line:
+                            pid_io["read"] = int(line.split("read_bytes:")[-1].strip())
+                        elif "write_bytes" in line and "cancelled_write_bytes" not in line:
+                            pid_io["write"] = int(line.split("write_bytes:")[-1].strip())
+                    pid_io["name"] = open("/proc/{}/comm".format(pid), "r").read().strip()
+                    snapshot_second[pid] = pid_io
+            except:
+                if pid in snapshot_first:
+                    snapshot_first.pop(pid)
+                if pid in snapshot_second:
+                    snapshot_second.pop(pid)
+
+        for k, v in snapshot_first.items():
+            if snapshot_first[k]["name"] == snapshot_second[k]["name"] and snapshot_first[k]["name"] != "bash":
+                snapshot_read += (snapshot_second[k]["read"] - snapshot_first[k]["read"])
+                snapshot_write += (snapshot_second[k]["write"] - snapshot_first[k]["write"])
+        diskIO["read"] = snapshot_read
+        diskIO["write"] = snapshot_write
+
+def get_realtime_data():
+    '''
+    real time get system data
+    :return:
+    '''
    t1 = threading.Thread(
        target=_ping_thread,
        kwargs={
@@ -238,14 +306,12 @@ def get_realtime_date():
    t4 = threading.Thread(
        target=_net_speed,
    )
-    t1.setDaemon(True)
-    t2.setDaemon(True)
-    t3.setDaemon(True)
-    t4.setDaemon(True)
-    t1.start()
-    t2.start()
-    t3.start()
-    t4.start()
+    t5 = threading.Thread(
+        target=_disk_io,
+    )
+    for ti in [t1, t2, t3, t4, t5]:
+        ti.setDaemon(True)
+        ti.start()

 def byte_str(object):
    '''
@@ -273,7 +339,7 @@ if __name__ == '__main__':
        elif 'INTERVAL' in argc:
            INTERVAL = int(argc.split('INTERVAL=')[-1])
    socket.setdefaulttimeout(30)
-    get_realtime_date()
+    get_realtime_data()
    while True:
        try:
            print("Connecting...")
@@ -343,6 +409,8 @@ if __name__ == '__main__':
                array['time_189'] = pingTime.get('189')
                array['time_10086'] = pingTime.get('10086')
                array['tcp'], array['udp'], array['process'], array['thread'] = tupd()
+                array['io_read'] = diskIO.get("read")
+                array['io_write'] = diskIO.get("write")

                s.send(byte_str("update " + json.dumps(array) + "\n"))
        except KeyboardInterrupt:
--- a/clients/client-psutil.py
+++ b/clients/client-psutil.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # coding: utf-8
-# Update by : https://github.com/cppla/ServerStatus, Update date: 20211009
+# Update by : https://github.com/cppla/ServerStatus, Update date: 20220323
 # 依赖于psutil跨平台库
-# 版本：1.0.2, 支持Python版本：2.7 to 3.9
+# 版本：1.0.3, 支持Python版本：2.7 to 3.9
 # 支持操作系统： Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
 # 说明: 默认情况下修改server和user就可以了。丢包率监测方向可以自定义，例如：CU = "www.facebook.com"。

@@ -10,16 +10,15 @@ SERVER = "127.0.0.1"
 USER = "s01"


-
-PORT = 35601
 PASSWORD = "USER_DEFAULT_PASSWORD"
-INTERVAL = 1
-PROBEPORT = 80
-PROBE_PROTOCOL_PREFER = "ipv4"  # ipv4, ipv6
-PING_PACKET_HISTORY_LEN = 100
+PORT = 35601
 CU = "cu.tz.cloudcpp.com"
 CT = "ct.tz.cloudcpp.com"
 CM = "cm.tz.cloudcpp.com"
+PROBEPORT = 80
+PROBE_PROTOCOL_PREFER = "ipv4"  # ipv4, ipv6
+PING_PACKET_HISTORY_LEN = 100
+INTERVAL = 1

 import socket
 import time
@@ -131,6 +130,10 @@ netSpeed = {
    'avgrx': 0,
    'avgtx': 0
 }
+diskIO = {
+    'read': 0,
+    'write': 0
+}

 def _ping_thread(host, mark, port):
    lostPacket = 0
@@ -190,7 +193,62 @@ def _net_speed():
        netSpeed["avgtx"] = avgtx
        time.sleep(INTERVAL)

-def get_realtime_date():
+def _disk_io():
+    """
+    the code is by: https://github.com/giampaolo/psutil/blob/master/scripts/iotop.py
+    good luck for opensource! modify: cpp.la
+    Calculate IO usage by comparing IO statics before and
+        after the interval.
+        Return a tuple including all currently running processes
+        sorted by IO activity and total disks I/O activity.
+    磁盘IO：因为IOPS原因，SSD和HDD、包括RAID卡，ZFS等。IO对性能的影响还需要结合自身服务器情况来判断。
+    比如我这里是机械硬盘，大量做随机小文件读写，那么很低的读写也就能造成硬盘长时间的等待。
+    如果这里做连续性IO，那么普通机械硬盘写入到100Mb/s，那么也能造成硬盘长时间的等待。
+    磁盘读写有误差：4k，8k ，https://stackoverflow.com/questions/34413926/psutil-vs-dd-monitoring-disk-i-o
+    """
+    while True:
+        # first get a list of all processes and disk io counters
+        procs = [p for p in psutil.process_iter()]
+        for p in procs[:]:
+            try:
+                p._before = p.io_counters()
+            except psutil.Error:
+                procs.remove(p)
+                continue
+        disks_before = psutil.disk_io_counters()
+
+        # sleep some time, only when INTERVAL==1 , io read/write per_sec.
+        # when INTERVAL > 1, io read/write per_INTERVAL
+        time.sleep(INTERVAL)
+
+        # then retrieve the same info again
+        for p in procs[:]:
+            with p.oneshot():
+                try:
+                    p._after = p.io_counters()
+                    p._cmdline = ' '.join(p.cmdline())
+                    if not p._cmdline:
+                        p._cmdline = p.name()
+                    p._username = p.username()
+                except (psutil.NoSuchProcess, psutil.ZombieProcess):
+                    procs.remove(p)
+        disks_after = psutil.disk_io_counters()
+
+        # finally calculate results by comparing data before and
+        # after the interval
+        for p in procs:
+            p._read_per_sec = p._after.read_bytes - p._before.read_bytes
+            p._write_per_sec = p._after.write_bytes - p._before.write_bytes
+            p._total = p._read_per_sec + p._write_per_sec
+
+        diskIO["read"] = disks_after.read_bytes - disks_before.read_bytes
+        diskIO["write"] = disks_after.write_bytes - disks_before.write_bytes
+
+def get_realtime_data():
+    '''
+    real time get system data
+    :return:
+    '''
    t1 = threading.Thread(
        target=_ping_thread,
        kwargs={
@@ -218,14 +276,12 @@ def get_realtime_date():
    t4 = threading.Thread(
        target=_net_speed,
    )
-    t1.setDaemon(True)
-    t2.setDaemon(True)
-    t3.setDaemon(True)
-    t4.setDaemon(True)
-    t1.start()
-    t2.start()
-    t3.start()
-    t4.start()
+    t5 = threading.Thread(
+        target=_disk_io,
+    )
+    for ti in [t1, t2, t3, t4, t5]:
+        ti.setDaemon(True)
+        ti.start()

 def byte_str(object):
    '''
@@ -253,7 +309,7 @@ if __name__ == '__main__':
        elif 'INTERVAL' in argc:
            INTERVAL = int(argc.split('INTERVAL=')[-1])
    socket.setdefaulttimeout(30)
-    get_realtime_date()
+    get_realtime_data()
    while 1:
        try:
            print("Connecting...")
@@ -324,6 +380,8 @@ if __name__ == '__main__':
                array['time_189'] = pingTime.get('189')
                array['time_10086'] = pingTime.get('10086')
                array['tcp'], array['udp'], array['process'], array['thread'] = tupd()
+                array['io_read'] = diskIO.get("read")
+                array['io_write'] = diskIO.get("write")

                s.send(byte_str("update " + json.dumps(array) + "\n"))
        except KeyboardInterrupt:
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -178,6 +178,10 @@ int CMain::HandleMessage(int ClientNetID, char *pMessage)
 			pClient->m_Stats.m_HDDTotal = rStart["hdd_total"].u.integer;
 		if(rStart["hdd_used"].type)
 			pClient->m_Stats.m_HDDUsed = rStart["hdd_used"].u.integer;
+		if(rStart["io_read"].type)
+			pClient->m_Stats.m_IORead = rStart["io_read"].u.integer;
+		if(rStart["io_write"].type)
+			pClient->m_Stats.m_IOWrite = rStart["io_write"].u.integer;
 		if(rStart["cpu"].type)
 			pClient->m_Stats.m_CPU = rStart["cpu"].u.dbl;
 		if(rStart["online4"].type && pClient->m_ClientNetType == NETTYPE_IPV6)
@@ -190,19 +194,19 @@ int CMain::HandleMessage(int ClientNetID, char *pMessage)
 		if(m_Config.m_Verbose)
 		{
 			if(rStart["online4"].type)
-				dbg_msg("main", "Online4: %s\nUptime: %" PRId64 "\nLoad_1: %f\nLoad_5: %f\nLoad_15: %f\nPing_10010: %f\nPing_189: %f\nPing_10086: %f\nTime_10010: %" PRId64 "\nTime_189: %" PRId64 "\nTime_10086: %" PRId64 "\nTcp_count: %" PRId64 "\nUdp_count: %" PRId64 "\nprocess_count: %" PRId64 "\nthread_count: %" PRId64 "\nNetworkRx: %" PRId64 "\nNetworkTx: %" PRId64 "\nNetworkIN: %" PRId64 "\nNetworkOUT: %" PRId64 "\nMemTotal: %" PRId64 "\nMemUsed: %" PRId64 "\nSwapTotal: %" PRId64 "\nSwapUsed: %" PRId64 "\nHDDTotal: %" PRId64 "\nHDDUsed: %" PRId64 "\nCPU: %f\n",
+				dbg_msg("main", "Online4: %s\nUptime: %" PRId64 "\nLoad_1: %f\nLoad_5: %f\nLoad_15: %f\nPing_10010: %f\nPing_189: %f\nPing_10086: %f\nTime_10010: %" PRId64 "\nTime_189: %" PRId64 "\nTime_10086: %" PRId64 "\nTcp_count: %" PRId64 "\nUdp_count: %" PRId64 "\nprocess_count: %" PRId64 "\nthread_count: %" PRId64 "\nNetworkRx: %" PRId64 "\nNetworkTx: %" PRId64 "\nNetworkIN: %" PRId64 "\nNetworkOUT: %" PRId64 "\nMemTotal: %" PRId64 "\nMemUsed: %" PRId64 "\nSwapTotal: %" PRId64 "\nSwapUsed: %" PRId64 "\nHDDTotal: %" PRId64 "\nHDDUsed: %" PRId64 "\nCPU: %f\nIORead: %" PRId64 "\nIOWrite: %" PRId64 "\n",
 					rStart["online4"].u.boolean ? "true" : "false",
 					pClient->m_Stats.m_Uptime,
-					pClient->m_Stats.m_Load_1, pClient->m_Stats.m_Load_5, pClient->m_Stats.m_Load_15, pClient->m_Stats.m_ping_10010, pClient->m_Stats.m_ping_189, pClient->m_Stats.m_ping_10086, pClient->m_Stats.m_time_10010, pClient->m_Stats.m_time_189, pClient->m_Stats.m_time_10086,pClient->m_Stats.m_tcpCount,pClient->m_Stats.m_udpCount,pClient->m_Stats.m_processCount,pClient->m_Stats.m_threadCount,pClient->m_Stats.m_NetworkRx, pClient->m_Stats.m_NetworkTx, pClient->m_Stats.m_NetworkIN, pClient->m_Stats.m_NetworkOUT, pClient->m_Stats.m_MemTotal, pClient->m_Stats.m_MemUsed, pClient->m_Stats.m_SwapTotal, pClient->m_Stats.m_SwapUsed, pClient->m_Stats.m_HDDTotal, pClient->m_Stats.m_HDDUsed, pClient->m_Stats.m_CPU);
+					pClient->m_Stats.m_Load_1, pClient->m_Stats.m_Load_5, pClient->m_Stats.m_Load_15, pClient->m_Stats.m_ping_10010, pClient->m_Stats.m_ping_189, pClient->m_Stats.m_ping_10086, pClient->m_Stats.m_time_10010, pClient->m_Stats.m_time_189, pClient->m_Stats.m_time_10086,pClient->m_Stats.m_tcpCount,pClient->m_Stats.m_udpCount,pClient->m_Stats.m_processCount,pClient->m_Stats.m_threadCount,pClient->m_Stats.m_NetworkRx, pClient->m_Stats.m_NetworkTx, pClient->m_Stats.m_NetworkIN, pClient->m_Stats.m_NetworkOUT, pClient->m_Stats.m_MemTotal, pClient->m_Stats.m_MemUsed, pClient->m_Stats.m_SwapTotal, pClient->m_Stats.m_SwapUsed, pClient->m_Stats.m_HDDTotal, pClient->m_Stats.m_HDDUsed, pClient->m_Stats.m_CPU, pClient->m_Stats.m_IORead, pClient->m_Stats.m_IOWrite);
 			else if(rStart["online6"].type)
-				dbg_msg("main", "Online6: %s\nUptime: %" PRId64 "\nLoad_1: %f\nLoad_5: %f\nLoad_15: %f\nPing_10010: %f\nPing_189: %f\nPing_10086: %f\nTime_10010: %" PRId64 "\nTime_189: %" PRId64 "\nTime_10086: %" PRId64 "\nTcp_count: %" PRId64 "\nUdp_count: %" PRId64 "\nprocess_count: %" PRId64 "\nthread_count: %" PRId64 "\nNetworkRx: %" PRId64 "\nNetworkTx: %" PRId64 "\nNetworkIN: %" PRId64 "\nNetworkOUT: %" PRId64 "\nMemTotal: %" PRId64 "\nMemUsed: %" PRId64 "\nSwapTotal: %" PRId64 "\nSwapUsed: %" PRId64 "\nHDDTotal: %" PRId64 "\nHDDUsed: %" PRId64 "\nCPU: %f\n",
+				dbg_msg("main", "Online6: %s\nUptime: %" PRId64 "\nLoad_1: %f\nLoad_5: %f\nLoad_15: %f\nPing_10010: %f\nPing_189: %f\nPing_10086: %f\nTime_10010: %" PRId64 "\nTime_189: %" PRId64 "\nTime_10086: %" PRId64 "\nTcp_count: %" PRId64 "\nUdp_count: %" PRId64 "\nprocess_count: %" PRId64 "\nthread_count: %" PRId64 "\nNetworkRx: %" PRId64 "\nNetworkTx: %" PRId64 "\nNetworkIN: %" PRId64 "\nNetworkOUT: %" PRId64 "\nMemTotal: %" PRId64 "\nMemUsed: %" PRId64 "\nSwapTotal: %" PRId64 "\nSwapUsed: %" PRId64 "\nHDDTotal: %" PRId64 "\nHDDUsed: %" PRId64 "\nCPU: %f\nIORead: %" PRId64 "\nIOWrite: %" PRId64 "\n",
 					rStart["online6"].u.boolean ? "true" : "false",
 					pClient->m_Stats.m_Uptime,
-					pClient->m_Stats.m_Load_1, pClient->m_Stats.m_Load_5, pClient->m_Stats.m_Load_15, pClient->m_Stats.m_ping_10010, pClient->m_Stats.m_ping_189, pClient->m_Stats.m_ping_10086, pClient->m_Stats.m_time_10010, pClient->m_Stats.m_time_189, pClient->m_Stats.m_time_10086,pClient->m_Stats.m_tcpCount,pClient->m_Stats.m_udpCount,pClient->m_Stats.m_processCount,pClient->m_Stats.m_threadCount,pClient->m_Stats.m_NetworkRx, pClient->m_Stats.m_NetworkTx, pClient->m_Stats.m_NetworkIN, pClient->m_Stats.m_NetworkOUT, pClient->m_Stats.m_MemTotal, pClient->m_Stats.m_MemUsed, pClient->m_Stats.m_SwapTotal, pClient->m_Stats.m_SwapUsed, pClient->m_Stats.m_HDDTotal, pClient->m_Stats.m_HDDUsed, pClient->m_Stats.m_CPU);
+					pClient->m_Stats.m_Load_1, pClient->m_Stats.m_Load_5, pClient->m_Stats.m_Load_15, pClient->m_Stats.m_ping_10010, pClient->m_Stats.m_ping_189, pClient->m_Stats.m_ping_10086, pClient->m_Stats.m_time_10010, pClient->m_Stats.m_time_189, pClient->m_Stats.m_time_10086,pClient->m_Stats.m_tcpCount,pClient->m_Stats.m_udpCount,pClient->m_Stats.m_processCount,pClient->m_Stats.m_threadCount,pClient->m_Stats.m_NetworkRx, pClient->m_Stats.m_NetworkTx, pClient->m_Stats.m_NetworkIN, pClient->m_Stats.m_NetworkOUT, pClient->m_Stats.m_MemTotal, pClient->m_Stats.m_MemUsed, pClient->m_Stats.m_SwapTotal, pClient->m_Stats.m_SwapUsed, pClient->m_Stats.m_HDDTotal, pClient->m_Stats.m_HDDUsed, pClient->m_Stats.m_CPU, pClient->m_Stats.m_IORead, pClient->m_Stats.m_IOWrite);
 			else
-				dbg_msg("main", "Uptime: %" PRId64 "\nLoad_1: %f\nLoad_5: %f\nLoad_15: %f\nPing_10010: %f\nPing_189: %f\nPing_10086: %f\nTime_10010: %" PRId64 "\nTime_189: %" PRId64 "\nTime_10086: %" PRId64 "\nTcp_count: %" PRId64 "\nUdp_count: %" PRId64 "\nprocess_count: %" PRId64 "\nthread_count: %" PRId64 "\nNetworkRx: %" PRId64 "\nNetworkTx: %" PRId64 "\nNetworkIN: %" PRId64 "\nNetworkOUT: %" PRId64 "\nMemTotal: %" PRId64 "\nMemUsed: %" PRId64 "\nSwapTotal: %" PRId64 "\nSwapUsed: %" PRId64 "\nHDDTotal: %" PRId64 "\nHDDUsed: %" PRId64 "\nCPU: %f\n",
+				dbg_msg("main", "Uptime: %" PRId64 "\nLoad_1: %f\nLoad_5: %f\nLoad_15: %f\nPing_10010: %f\nPing_189: %f\nPing_10086: %f\nTime_10010: %" PRId64 "\nTime_189: %" PRId64 "\nTime_10086: %" PRId64 "\nTcp_count: %" PRId64 "\nUdp_count: %" PRId64 "\nprocess_count: %" PRId64 "\nthread_count: %" PRId64 "\nNetworkRx: %" PRId64 "\nNetworkTx: %" PRId64 "\nNetworkIN: %" PRId64 "\nNetworkOUT: %" PRId64 "\nMemTotal: %" PRId64 "\nMemUsed: %" PRId64 "\nSwapTotal: %" PRId64 "\nSwapUsed: %" PRId64 "\nHDDTotal: %" PRId64 "\nHDDUsed: %" PRId64 "\nCPU: %f\nIORead: %" PRId64 "\nIOWrite: %" PRId64 "\n",
 					pClient->m_Stats.m_Uptime,
-					pClient->m_Stats.m_Load_1, pClient->m_Stats.m_Load_5, pClient->m_Stats.m_Load_15, pClient->m_Stats.m_ping_10010, pClient->m_Stats.m_ping_189, pClient->m_Stats.m_ping_10086, pClient->m_Stats.m_time_10010, pClient->m_Stats.m_time_189, pClient->m_Stats.m_time_10086,pClient->m_Stats.m_tcpCount,pClient->m_Stats.m_udpCount,pClient->m_Stats.m_processCount,pClient->m_Stats.m_threadCount,pClient->m_Stats.m_NetworkRx, pClient->m_Stats.m_NetworkTx, pClient->m_Stats.m_NetworkIN, pClient->m_Stats.m_NetworkOUT, pClient->m_Stats.m_MemTotal, pClient->m_Stats.m_MemUsed, pClient->m_Stats.m_SwapTotal, pClient->m_Stats.m_SwapUsed, pClient->m_Stats.m_HDDTotal, pClient->m_Stats.m_HDDUsed, pClient->m_Stats.m_CPU);
+					pClient->m_Stats.m_Load_1, pClient->m_Stats.m_Load_5, pClient->m_Stats.m_Load_15, pClient->m_Stats.m_ping_10010, pClient->m_Stats.m_ping_189, pClient->m_Stats.m_ping_10086, pClient->m_Stats.m_time_10010, pClient->m_Stats.m_time_189, pClient->m_Stats.m_time_10086,pClient->m_Stats.m_tcpCount,pClient->m_Stats.m_udpCount,pClient->m_Stats.m_processCount,pClient->m_Stats.m_threadCount,pClient->m_Stats.m_NetworkRx, pClient->m_Stats.m_NetworkTx, pClient->m_Stats.m_NetworkIN, pClient->m_Stats.m_NetworkOUT, pClient->m_Stats.m_MemTotal, pClient->m_Stats.m_MemUsed, pClient->m_Stats.m_SwapTotal, pClient->m_Stats.m_SwapUsed, pClient->m_Stats.m_HDDTotal, pClient->m_Stats.m_HDDUsed, pClient->m_Stats.m_CPU, pClient->m_Stats.m_IORead, pClient->m_Stats.m_IOWrite);
 		}

 		// clean up
@@ -241,7 +245,7 @@ void CMain::JSONUpdateThread(void *pUser)
 		char aFileBuf[2048*NET_MAX_CLIENTS];
 		char *pBuf = aFileBuf;

-		str_format(pBuf, sizeof(aFileBuf), "{\n\"servers\": [\n");
+		str_format(pBuf, sizeof(aFileBuf), "{\n\"servers\": {\n");
 		pBuf += strlen(pBuf);

 		for(int i = 0; i < NET_MAX_CLIENTS; i++)
@@ -274,7 +278,8 @@ void CMain::JSONUpdateThread(void *pUser)
                }

 				str_format(pBuf, sizeof(aFileBuf) - (pBuf - aFileBuf),
-				 "{ \"name\": \"%s\",\"type\": \"%s\",\"host\": \"%s\",\"location\": \"%s\",\"online4\": %s, \"online6\": %s, \"uptime\": \"%s\",\"load_1\": %.2f, \"load_5\": %.2f, \"load_15\": %.2f,\"ping_10010\": %.2f, \"ping_189\": %.2f, \"ping_10086\": %.2f,\"time_10010\": %" PRId64 ", \"time_189\": %" PRId64 ", \"time_10086\": %" PRId64 ", \"tcp_count\": %" PRId64 ", \"udp_count\": %" PRId64 ", \"process_count\": %" PRId64 ", \"thread_count\": %" PRId64 ", \"network_rx\": %" PRId64 ", \"network_tx\": %" PRId64 ", \"network_in\": %" PRId64 ", \"network_out\": %" PRId64 ", \"cpu\": %d, \"memory_total\": %" PRId64 ", \"memory_used\": %" PRId64 ", \"swap_total\": %" PRId64 ", \"swap_used\": %" PRId64 ", \"hdd_total\": %" PRId64 ", \"hdd_used\": %" PRId64 ", \"last_network_in\": %" PRId64 ", \"last_network_out\": %" PRId64 ",\"custom\": \"%s\" },\n",
+				 "\"%s\":{ \"name\": \"%s\",\"type\": \"%s\",\"host\": \"%s\",\"location\": \"%s\",\"online4\": %s, \"online6\": %s, \"uptime\": \"%s\",\"load_1\": %.2f, \"load_5\": %.2f, \"load_15\": %.2f,\"ping_10010\": %.2f, \"ping_189\": %.2f, \"ping_10086\": %.2f,\"time_10010\": %" PRId64 ", \"time_189\": %" PRId64 ", \"time_10086\": %" PRId64 ", \"tcp_count\": %" PRId64 ", \"udp_count\": %" PRId64 ", \"process_count\": %" PRId64 ", \"thread_count\": %" PRId64 ", \"network_rx\": %" PRId64 ", \"network_tx\": %" PRId64 ", \"network_in\": %" PRId64 ", \"network_out\": %" PRId64 ", \"cpu\": %d, \"memory_total\": %" PRId64 ", \"memory_used\": %" PRId64 ", \"swap_total\": %" PRId64 ", \"swap_used\": %" PRId64 ", \"hdd_total\": %" PRId64 ", \"hdd_used\": %" PRId64 ", \"last_network_in\": %" PRId64 ", \"last_network_out\": %" PRId64 ",\"io_read\": %" PRId64 ", \"io_write\": %" PRId64 ",\"custom\": \"%s\" },\n",
+				    pClients[i].m_aUsername,
 					pClients[i].m_aName,pClients[i].m_aType,pClients[i].m_aHost,pClients[i].m_aLocation,
 					pClients[i].m_Stats.m_Online4 ? "true" : "false",pClients[i].m_Stats.m_Online6 ? "true" : "false",
 					aUptime, pClients[i].m_Stats.m_Load_1, pClients[i].m_Stats.m_Load_5, pClients[i].m_Stats.m_Load_15, pClients[i].m_Stats.m_ping_10010, pClients[i].m_Stats.m_ping_189, pClients[i].m_Stats.m_ping_10086,
@@ -283,6 +288,7 @@ void CMain::JSONUpdateThread(void *pUser)
 					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_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_IORead, pClients[i].m_Stats.m_IOWrite,
 					pClients[i].m_Stats.m_aCustom);
 				pBuf += strlen(pBuf);
 			}
@@ -290,16 +296,16 @@ void CMain::JSONUpdateThread(void *pUser)
 			{
 			    // sava network traffic record to json when close client
 			    // last_network_in == last network in record, last_network_out == last network out record
-				str_format(pBuf, sizeof(aFileBuf) - (pBuf - aFileBuf), "{ \"name\": \"%s\", \"type\": \"%s\", \"host\": \"%s\", \"location\": \"%s\", \"online4\": false, \"online6\": false, \"last_network_in\": %" PRId64 ", \"last_network_out\": %" PRId64 " },\n",
+				str_format(pBuf, sizeof(aFileBuf) - (pBuf - aFileBuf), "\"%s\":{ \"name\": \"%s\", \"type\": \"%s\", \"host\": \"%s\", \"location\": \"%s\", \"online4\": false, \"online6\": false, \"last_network_in\": %" PRId64 ", \"last_network_out\": %" PRId64 " },\n",pClients[i].m_aUsername,
 					pClients[i].m_aName, pClients[i].m_aType, pClients[i].m_aHost, pClients[i].m_aLocation, pClients[i].m_LastNetworkIN, pClients[i].m_LastNetworkOUT);
 				pBuf += strlen(pBuf);
 			}
 		}
 		if(!m_pJSONUpdateThreadData->m_ReloadRequired)
-			str_format(pBuf - 2, sizeof(aFileBuf) - (pBuf - aFileBuf), "\n],\n\"updated\": \"%lld\"\n}", (long long)time(/*ago*/0));
+			str_format(pBuf - 2, sizeof(aFileBuf) - (pBuf - aFileBuf), "\n},\n\"updated\": \"%lld\"\n}", (long long)time(/*ago*/0));
 		else
 		{
-			str_format(pBuf - 2, sizeof(aFileBuf) - (pBuf - aFileBuf), "\n],\n\"updated\": \"%lld\",\n\"reload\": true\n}", (long long)time(/*ago*/0));
+			str_format(pBuf - 2, sizeof(aFileBuf) - (pBuf - aFileBuf), "\n},\n\"updated\": \"%lld\",\n\"reload\": true\n}", (long long)time(/*ago*/0));
 			m_pJSONUpdateThreadData->m_ReloadRequired--;
 		}
 		pBuf += strlen(pBuf);
@@ -429,7 +435,7 @@ int CMain::ReadConfig()
        json_value *pNJsonData = json_parse_ex(&nJsonSettings, pNFileData, strlen(pNFileData), aError);
        if(pNJsonData)
        {
-            const json_value &rStart = (*pNJsonData)["servers"];
+            const json_value &cStart = (*pNJsonData)["servers"];
            if(rStart.type == json_array)
            {
                int ID = 0;
@@ -437,14 +443,12 @@ int CMain::ReadConfig()
                {
                    if(ID < 0 || ID >= NET_MAX_CLIENTS)
                        continue;
-
-                    // check name and host for match , when ServerStatus reload month traffic.
-                    if(strcmp(Client(ID)->m_aName, rStart[i]["name"].u.string.ptr)==0 && strcmp(Client(ID)->m_aHost, rStart[i]["host"].u.string.ptr)==0)
+                    char *uName = rStart[i]["username"].u.string.ptr;
+                    if(strlen(cStart[uName]["name"]) != 0)
                    {
-                        Client(ID)->m_LastNetworkIN = rStart[i]["last_network_in"].u.integer;
-                        Client(ID)->m_LastNetworkOUT = rStart[i]["last_network_out"].u.integer;
+                        Client(ID)->m_LastNetworkIN = cStart[uName]["last_network_in"].u.integer;
+                        Client(ID)->m_LastNetworkOUT = cStart[uName]["last_network_out"].u.integer;
                    }
-
                    ID++;
                }
            }
--- a/server/src/main.h
+++ b/server/src/main.h
@@ -73,6 +73,8 @@ class CMain
 			int64_t m_udpCount;
 			int64_t m_processCount;
 			int64_t m_threadCount;
+			int64_t m_IORead;
+			int64_t m_IOWrite;
 			double m_CPU;
 			char m_aCustom[512];
 			// Options
--- a/web/index.html
+++ b/web/index.html
@@ -75,19 +75,19 @@
 			<table class="table table-striped table-condensed table-hover">
 				<thead>
 				<tr>
-					<th id="online_status" style="text-align: center;">协议</th>
-					<th id="month_traffic" style="text-align: center;">月流量 ↓|↑</th>
-					<th id="name">节点名</th>
-					<th id="type">虚拟化</th>
-					<th id="location">位置</th>
-					<th id="uptime">在线</th>
+					<th id="online_status" style="text-align: center;">🔗协议</th>
+					<th id="month_traffic" style="text-align: center;">📊月流量↓|↑</th>
+					<th id="name">📌节点</th>
+					<th id="type">🗂️虚拟化</th>
+					<th id="location">🌍位置</th>
+					<th id="uptime">⏱️在线</th>
 					<th id="load">负载</th>
-					<th id="network">网络 ↓|↑</th>
-					<th id="traffic">总流量 ↓|↑</th>
-					<th id="cpu">核芯</th>
-					<th id="ram">内存</th>
-					<th id="hdd">硬盘</th>
-					<th id="ping">联通|电信|移动</th>
+					<th id="network">🚦网络↓|↑</th>
+					<th id="traffic">📋总流量↓|↑</th>
+					<th id="cpu">🎯核芯</th>
+					<th id="ram">⚡️内存</th>
+					<th id="hdd">💾硬盘</th>
+					<th id="ping">🌐CU|CT|CM</th>
 				</tr>
 				</thead>
 				<tbody id="servers">
--- a/web/js/serverstatus.js
+++ b/web/js/serverstatus.js
@@ -15,8 +15,7 @@ function timeSince(date) {
 		return "几秒前.";
 }

-function bytesToSize(bytes, precision, si)
-{
+function bytesToSize(bytes, precision, si) {
 	var ret;
 	si = typeof si !== 'undefined' ? si : 0;
 	if (si != 0) {
@@ -41,11 +40,12 @@ function bytesToSize(bytes, precision, si)
 	} else {
 		return bytes + ' B';
 	}
-	if(si != 0) {
+	return ret;
+	/*if(si != 0) {
 		return ret + 'B';
 	} else {
 		return ret + 'iB';
-	}
+	}*/
 }

 function uptime() {
@@ -54,7 +54,8 @@ function uptime() {
 		if (result.reload)
 			setTimeout(function () { location.reload() }, 1000);

-		for (var i = 0, rlen=result.servers.length; i < rlen; i++) {
+		let i = 0;
+		for (let key in result.servers) {
 			var TableRow = $("#servers tr#r" + i);
 			var ExpandRow = $("#servers #rt" + i);
 			var hack; // fuck CSS for making me do this
@@ -96,13 +97,13 @@ function uptime() {
 			}

 			// online_status
-			if (result.servers[i].online4 && !result.servers[i].online6) {
+			if (result.servers[key].online4 && !result.servers[key].online6) {
 				TableRow.children["online_status"].children[0].children[0].className = "progress-bar progress-bar-success";
 				TableRow.children["online_status"].children[0].children[0].innerHTML = "<small>IPv4</small>";
-			} else if (result.servers[i].online4 && result.servers[i].online6) {
+			} else if (result.servers[key].online4 && result.servers[key].online6) {
 				TableRow.children["online_status"].children[0].children[0].className = "progress-bar progress-bar-success";
 				TableRow.children["online_status"].children[0].children[0].innerHTML = "<small>双栈</small>";
-			} else if (!result.servers[i].online4 && result.servers[i].online6) {
+			} else if (!result.servers[key].online4 && result.servers[key].online6) {
 				TableRow.children["online_status"].children[0].children[0].className = "progress-bar progress-bar-success";
 				TableRow.children["online_status"].children[0].children[0].innerHTML = "<small>IPv6</small>";
 			} else {
@@ -111,20 +112,20 @@ function uptime() {
 			}

 			// Name
-			TableRow.children["name"].innerHTML = result.servers[i].name;
+			TableRow.children["name"].innerHTML = result.servers[key].name;

 			// Type
-			TableRow.children["type"].innerHTML = result.servers[i].type;
+			TableRow.children["type"].innerHTML = result.servers[key].type;

 			// Location
-			TableRow.children["location"].innerHTML = result.servers[i].location;
-			if (!result.servers[i].online4 && !result.servers[i].online6) {
+			TableRow.children["location"].innerHTML = result.servers[key].location;
+			if (!result.servers[key].online4 && !result.servers[key].online6) {
 				if (server_status[i]) {
 					TableRow.children["uptime"].innerHTML = "–";
 					TableRow.children["load"].innerHTML = "–";
 					TableRow.children["network"].innerHTML = "–";
 					TableRow.children["traffic"].innerHTML = "–";
-					TableRow.children["month_traffic"].children[0].children[0].className = "progress-bar progress-bar-warning";
+					TableRow.children["month_traffic"].children[0].children[0].className = "progress-bar progress-bar-danger";
 					TableRow.children["month_traffic"].children[0].children[0].innerHTML = "<small>关闭</small>";
 					TableRow.children["cpu"].children[0].children[0].className = "progress-bar progress-bar-danger";
 					TableRow.children["cpu"].children[0].children[0].style.width = "100%";
@@ -152,8 +153,8 @@ function uptime() {

 				// month traffic
 				var monthtraffic = "";
-				var trafficdiff_in = result.servers[i].network_in - result.servers[i].last_network_in;
-				var trafficdiff_out = result.servers[i].network_out - result.servers[i].last_network_out;
+				var trafficdiff_in = result.servers[key].network_in - result.servers[key].last_network_in;
+				var trafficdiff_out = result.servers[key].network_out - result.servers[key].last_network_out;
 				if (trafficdiff_in < 1024 * 1024 * 1024 * 1024)
 					monthtraffic += (trafficdiff_in / 1024 / 1024 / 1024).toFixed(1) + "G";
 				else
@@ -167,53 +168,53 @@ function uptime() {
 				TableRow.children["month_traffic"].children[0].children[0].innerHTML = "<small>" + monthtraffic + "</small>";

 				// Uptime
-				TableRow.children["uptime"].innerHTML = result.servers[i].uptime;
+				TableRow.children["uptime"].innerHTML = result.servers[key].uptime;

 				// Load: default load_1, you can change show: load_1, load_5, load_15
-				if(result.servers[i].load == -1) {
+				if (result.servers[key].load == -1) {
 					TableRow.children["load"].innerHTML = "–";
 				} else {
-				    TableRow.children["load"].innerHTML = result.servers[i].load_1.toFixed(2);
+					TableRow.children["load"].innerHTML = result.servers[key].load_1.toFixed(2);
 				}

 				// Network
 				var netstr = "";
-				if(result.servers[i].network_rx < 1024*1024)
-					netstr += (result.servers[i].network_rx/1024).toFixed(1) + "K";
+				if (result.servers[key].network_rx < 1024 * 1024)
+					netstr += (result.servers[key].network_rx / 1024).toFixed(1) + "K";
 				else
-					netstr += (result.servers[i].network_rx/1024/1024).toFixed(1) + "M";
+					netstr += (result.servers[key].network_rx / 1024 / 1024).toFixed(1) + "M";
 				netstr += " | "
-				if(result.servers[i].network_tx < 1024*1024)
-					netstr += (result.servers[i].network_tx/1024).toFixed(1) + "K";
+				if (result.servers[key].network_tx < 1024 * 1024)
+					netstr += (result.servers[key].network_tx / 1024).toFixed(1) + "K";
 				else
-					netstr += (result.servers[i].network_tx/1024/1024).toFixed(1) + "M";
+					netstr += (result.servers[key].network_tx / 1024 / 1024).toFixed(1) + "M";
 				TableRow.children["network"].innerHTML = netstr;

 				//Traffic
 				var trafficstr = "";
-				if(result.servers[i].network_in < 1024*1024*1024*1024)
-					trafficstr += (result.servers[i].network_in/1024/1024/1024).toFixed(1) + "G";
+				if (result.servers[key].network_in < 1024 * 1024 * 1024 * 1024)
+					trafficstr += (result.servers[key].network_in / 1024 / 1024 / 1024).toFixed(1) + "G";
 				else
-                    trafficstr += (result.servers[i].network_in/1024/1024/1024/1024).toFixed(1) + "T";
+					trafficstr += (result.servers[key].network_in / 1024 / 1024 / 1024 / 1024).toFixed(1) + "T";
 				trafficstr += " | "
-				if(result.servers[i].network_out < 1024*1024*1024*1024)
-				    trafficstr += (result.servers[i].network_out/1024/1024/1024).toFixed(1) + "G";
+				if (result.servers[key].network_out < 1024 * 1024 * 1024 * 1024)
+					trafficstr += (result.servers[key].network_out / 1024 / 1024 / 1024).toFixed(1) + "G";
 				else
-					trafficstr += (result.servers[i].network_out/1024/1024/1024/1024).toFixed(1) + "T";
+					trafficstr += (result.servers[key].network_out / 1024 / 1024 / 1024 / 1024).toFixed(1) + "T";
 				TableRow.children["traffic"].innerHTML = trafficstr;

 				// CPU
-				if (result.servers[i].cpu >= 90)
+				if (result.servers[key].cpu >= 90)
 					TableRow.children["cpu"].children[0].children[0].className = "progress-bar progress-bar-danger";
-				else if (result.servers[i].cpu >= 80)
+				else if (result.servers[key].cpu >= 80)
 					TableRow.children["cpu"].children[0].children[0].className = "progress-bar progress-bar-warning";
 				else
 					TableRow.children["cpu"].children[0].children[0].className = "progress-bar progress-bar-success";
-				TableRow.children["cpu"].children[0].children[0].style.width = result.servers[i].cpu + "%";
-				TableRow.children["cpu"].children[0].children[0].innerHTML = result.servers[i].cpu + "%";
+				TableRow.children["cpu"].children[0].children[0].style.width = result.servers[key].cpu + "%";
+				TableRow.children["cpu"].children[0].children[0].innerHTML = result.servers[key].cpu + "%";

 				// Memory
-				var Mem = ((result.servers[i].memory_used/result.servers[i].memory_total)*100.0).toFixed(0);
+				var Mem = ((result.servers[key].memory_used / result.servers[key].memory_total) * 100.0).toFixed(0);
 				if (Mem >= 90)
 					TableRow.children["memory"].children[0].children[0].className = "progress-bar progress-bar-danger";
 				else if (Mem >= 80)
@@ -222,12 +223,12 @@ function uptime() {
 					TableRow.children["memory"].children[0].children[0].className = "progress-bar progress-bar-success";
 				TableRow.children["memory"].children[0].children[0].style.width = Mem + "%";
 				TableRow.children["memory"].children[0].children[0].innerHTML = Mem + "%";
-				ExpandRow[0].children["expand_mem"].innerHTML = "内存: " + bytesToSize(result.servers[i].memory_used*1024, 2) + " / " + bytesToSize(result.servers[i].memory_total*1024, 2);
+				ExpandRow[0].children["expand_mem"].innerHTML = "内存: " + bytesToSize(result.servers[key].memory_used * 1024, 2) + " / " + bytesToSize(result.servers[key].memory_total * 1024, 2);
 				// Swap
-				ExpandRow[0].children["expand_swap"].innerHTML = "交换分区: " + bytesToSize(result.servers[i].swap_used*1024, 2) + " / " + bytesToSize(result.servers[i].swap_total*1024, 2);
+				ExpandRow[0].children["expand_swap"].innerHTML = "交换分区: " + bytesToSize(result.servers[key].swap_used * 1024, 2) + " / " + bytesToSize(result.servers[key].swap_total * 1024, 2);

 				// HDD
-				var HDD = ((result.servers[i].hdd_used/result.servers[i].hdd_total)*100.0).toFixed(0);
+				var HDD = ((result.servers[key].hdd_used / result.servers[key].hdd_total) * 100.0).toFixed(0);
 				if (HDD >= 90)
 					TableRow.children["hdd"].children[0].children[0].className = "progress-bar progress-bar-danger";
 				else if (HDD >= 80)
@@ -236,31 +237,45 @@ function uptime() {
 					TableRow.children["hdd"].children[0].children[0].className = "progress-bar progress-bar-success";
 				TableRow.children["hdd"].children[0].children[0].style.width = HDD + "%";
 				TableRow.children["hdd"].children[0].children[0].innerHTML = HDD + "%";
-				ExpandRow[0].children["expand_hdd"].innerHTML = "硬盘: " + bytesToSize(result.servers[i].hdd_used*1024*1024, 2) + " / " + bytesToSize(result.servers[i].hdd_total*1024*1024, 2);
+				// IO Speed for HDD.
+				// IO， 过小的B字节单位没有意义
+				var io = "";
+				if (result.servers[key].io_read < 1024 * 1024)
+					io += parseInt(result.servers[key].io_read / 1024) + "K";
+				else
+					io += parseInt(result.servers[key].io_read / 1024 / 1024) + "M";
+				io += " / "
+				if (result.servers[key].io_write < 1024 * 1024)
+					io += parseInt(result.servers[key].io_write / 1024) + "K";
+				else
+					io += parseInt(result.servers[key].io_write / 1024 / 1024) + "M";
+				// Expand for HDD.
+				ExpandRow[0].children["expand_hdd"].innerHTML = "硬盘|读写: " + bytesToSize(result.servers[key].hdd_used * 1024 * 1024, 2) + " / " + bytesToSize(result.servers[key].hdd_total * 1024 * 1024, 2) + " | " + io;

 				// delay time

 				// tcp, udp, process, thread count
-				ExpandRow[0].children["expand_tupd"].innerHTML = "TCP/UDP/进/线: " + result.servers[i].tcp_count + " / " + result.servers[i].udp_count + " / " + result.servers[i].process_count+ " / " + result.servers[i].thread_count;
-				ExpandRow[0].children["expand_ping"].innerHTML = "联通/电信/移动: " + result.servers[i].time_10010 + "ms / " + result.servers[i].time_189 + "ms / " + result.servers[i].time_10086 + "ms"
+				ExpandRow[0].children["expand_tupd"].innerHTML = "TCP/UDP/进/线: " + result.servers[key].tcp_count + " / " + result.servers[key].udp_count + " / " + result.servers[key].process_count + " / " + result.servers[key].thread_count;
+				ExpandRow[0].children["expand_ping"].innerHTML = "联通/电信/移动: " + result.servers[key].time_10010 + "ms / " + result.servers[key].time_189 + "ms / " + result.servers[key].time_10086 + "ms"

 				// ping
-                var PING_10010 = result.servers[i].ping_10010.toFixed(0);
-                var PING_189 = result.servers[i].ping_189.toFixed(0);
-                var PING_10086 = result.servers[i].ping_10086.toFixed(0);
-                if (PING_10010 >= 20 || PING_189 >= 20 || PING_10086 >= 20)
+				var PING_10010 = result.servers[key].ping_10010.toFixed(0);
+				var PING_189 = result.servers[key].ping_189.toFixed(0);
+				var PING_10086 = result.servers[key].ping_10086.toFixed(0);
+				if (PING_10010 >= 70 || PING_189 >= 70 || PING_10086 >= 70)
 					TableRow.children["ping"].children[0].children[0].className = "progress-bar progress-bar-warning";
 				else
 					TableRow.children["ping"].children[0].children[0].className = "progress-bar progress-bar-success";
-	            TableRow.children["ping"].children[0].children[0].innerHTML = PING_10010 + "%💻" + PING_189 + "%💻" + PING_10086 + "%";
+				TableRow.children["ping"].children[0].children[0].innerHTML = PING_10010 + "-" + PING_189 + "-" + PING_10086 + "";

 				// Custom
-				if (result.servers[i].custom) {
-					ExpandRow[0].children["expand_custom"].innerHTML = result.servers[i].custom
+				if (result.servers[key].custom) {
+					ExpandRow[0].children["expand_custom"].innerHTML = result.servers[key].custom
 				} else {
 					ExpandRow[0].children["expand_custom"].innerHTML = ""
 				}
 			}
+			i++;
 		};

 		d = new Date(result.updated * 1000);
Author	SHA1	Message	Date
cppla	f43715ff25	Merge pull request #169 from balala2oo8/master 修复月流量匹配问题，用username当作key作为匹配月流量的依据将其合并到分支usernameAsMonthTrafficKey，有喜欢这个版本的的可以使用。唯一的缺点会暴漏username。	2022-05-23 16:33:06 +08:00
balala	086cc5b96b	修复月流量匹配问题	2022-05-13 21:07:44 +08:00
cppla	ab5d6f7d2d	Update serverstatus.js change style for io speed	2022-05-10 15:20:58 +08:00
cppla	dae7c07772	1.0.8 build	2022-05-10 11:56:38 +08:00
cppla	14447399a0	Update README.md	2022-05-06 10:26:46 +08:00
cppla	3327c5fd25	修复增删节点月流量匹配的问题	2022-05-05 10:15:06 +08:00
cppla	217b14bf55	old style	2022-04-29 16:07:56 +08:00
cppla	d7b8f27082	IO Speed as Tips	2022-04-29 13:58:38 +08:00
cppla	8f3736e4fc	增加开源的支持 just do it .	2022-04-13 15:40:46 +08:00
windows11	22c1905acb	style	2022-04-02 15:55:58 +08:00
cppla	f73970262b	test	2022-04-02 15:39:41 +08:00
cppla	f45d9be9fc	ui	2022-04-02 15:34:01 +08:00
cppla	cb1313f5b5	test	2022-04-02 15:25:10 +08:00
cppla	b3f7ab45c5	blue	2022-04-02 14:47:23 +08:00
cppla	54451cab85	no float for IO	2022-04-02 11:39:37 +08:00
cppla	0f26eb502a	1080p change	2022-04-01 18:55:41 +08:00
cppla	472196d1ea	1.0.8 beta	2022-04-01 17:42:43 +08:00
cppla	7e84c230e6	Merge branch 'dev'	2022-04-01 17:36:22 +08:00
cppla	76cc15e84f	css	2022-04-01 17:35:58 +08:00
cppla	4c0f4b94e8	Merge pull request #149 from cppla/dev 新增实时IO统计	2022-04-01 16:29:53 +08:00
cppla	36040be11e	add	2022-04-01 16:28:22 +08:00
cppla	776ad68392	io css style	2022-04-01 16:24:52 +08:00
cppla	39c92f4788	bug	2022-04-01 16:07:30 +08:00
cppla	6a15832966	bug test	2022-04-01 16:04:08 +08:00
cppla	654ecd7a3e	update disk io style	2022-04-01 15:50:09 +08:00
cppla	47cf7a1818	持续获取io	2022-04-01 15:37:43 +08:00
cppla	5176cb0340	table control	2022-04-01 15:19:06 +08:00
cppla	1f47bcdb6f	beta	2022-04-01 14:55:19 +08:00
cppla	7698ce0e4b	开源让编程更加美好	2022-03-31 19:53:17 +08:00
cppla	2d457c66ad	push disk io for client-linux.py	2022-03-31 19:48:26 +08:00
cppla	d8c8d8fd3f	add todo	2022-03-24 17:24:01 +08:00
cppla	d64beb7ba8	psutil add io total	2022-03-23 11:45:16 +08:00
cppla	30f9999fc6	rename	2022-03-23 11:13:18 +08:00