Add option to reduct temperature information (#369 )

chore: fix some typos (#370 )
update contributors[no ci]
2024-06-16 18:12:45 +08:00 · 2024-06-16 18:04:27 +08:00 · 2024-06-15 01:43:49 +00:00 · 2024-06-15 09:43:30 +08:00 · 2024-06-14 10:03:18 +00:00 · 2024-06-14 18:02:55 +08:00
17 changed files with 679 additions and 565 deletions
@@ -30,6 +30,7 @@ jobs:
          v: true
          x: false
          race: false
+          tags: timetzdata
          ldflags: -s -w --extldflags '-static -fpic' -X github.com/naiba/nezha/service/singleton.Version=${{ steps.extract_branch.outputs.tag }}
          buildmode: default

@@ -33,6 +33,7 @@ jobs:
          v: true
          x: false
          race: false
+          tags: timetzdata
          ldflags: -s -w --extldflags '-static -fpic' -X github.com/naiba/nezha/service/singleton.Version=test
          buildmode: default

@@ -40,5 +40,6 @@ jobs:
          v: true
          x: false
          race: false
+          tags: timetzdata
          ldflags: -s -w --extldflags '-static -fpic' -X github.com/naiba/nezha/service/singleton.Version=test
          buildmode: default
@@ -45,13 +45,13 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/xykt" title="xykt"><img src="https://avatars.githubusercontent.com/u/152045469?v=4" width="50;" alt="xykt"/></a>
 <a href="https://github.com/MikoyChinese" title="MikoyChinese"><img src="https://avatars.githubusercontent.com/u/22676744?v=4" width="50;" alt="MikoyChinese"/></a>
 <a href="https://github.com/JackieSung4ev" title="JackieSung4ev"><img src="https://avatars.githubusercontent.com/u/24974735?v=4" width="50;" alt="JackieSung4ev"/></a>
-<a href="https://github.com/uubulb" title="UUBulb"><img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="UUBulb"/></a>
 <a href="https://github.com/nap0o" title="nap0o"><img src="https://avatars.githubusercontent.com/u/144927971?v=4" width="50;" alt="nap0o"/></a>
+<a href="https://github.com/uubulb" title="UUBulb"><img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="UUBulb"/></a>
 <a href="https://github.com/lemoeo" title="Lemoe"><img src="https://avatars.githubusercontent.com/u/18618627?v=4" width="50;" alt="Lemoe"/></a>
 <a href="https://github.com/cantoblanco" title="Kris"><img src="https://avatars.githubusercontent.com/u/116849421?v=4" width="50;" alt="Kris"/></a>
-<a href="https://github.com/CosmosZ-code" title="CosmosZ-code"><img src="https://avatars.githubusercontent.com/u/81398224?v=4" width="50;" alt="CosmosZ-code"/></a>
-<a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
 <a href="https://github.com/spiritLHLS" title="spiritlhl"><img src="https://avatars.githubusercontent.com/u/103393591?v=4" width="50;" alt="spiritlhl"/></a>
+<a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
+<a href="https://github.com/CosmosZ-code" title="CosmosZ-code"><img src="https://avatars.githubusercontent.com/u/81398224?v=4" width="50;" alt="CosmosZ-code"/></a>
 <a href="https://github.com/lvgj-stack" title="Ko no dio"><img src="https://avatars.githubusercontent.com/u/38449861?v=4" width="50;" alt="Ko no dio"/></a>
 <a href="https://github.com/hhhkkk520" title="Kris"><img src="https://avatars.githubusercontent.com/u/52115472?v=4" width="50;" alt="Kris"/></a>
 <a href="https://github.com/1ridic" title="1ridic"><img src="https://avatars.githubusercontent.com/u/88495501?v=4" width="50;" alt="1ridic"/></a>
@@ -79,6 +79,7 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/nickfox-taterli" title="Tater Li"><img src="https://avatars.githubusercontent.com/u/19658596?v=4" width="50;" alt="Tater Li"/></a>
 <a href="https://github.com/dreamingsleeping" title="Nanjing Hopefun Network Technology Co. Ltd."><img src="https://avatars.githubusercontent.com/u/13828658?v=4" width="50;" alt="Nanjing Hopefun Network Technology Co. Ltd."/></a>
 <a href="https://github.com/MartijnLindeman" title="Martijn Lindeman"><img src="https://avatars.githubusercontent.com/u/78365708?v=4" width="50;" alt="Martijn Lindeman"/></a>
+<a href="https://github.com/funnyzak" title="Leon"><img src="https://avatars.githubusercontent.com/u/2562087?v=4" width="50;" alt="Leon"/></a>
 <a href="https://github.com/KorenKrita" title="KorenKrita"><img src="https://avatars.githubusercontent.com/u/22239339?v=4" width="50;" alt="KorenKrita"/></a>
 <a href="https://github.com/techotaku" title="Ian Li"><img src="https://avatars.githubusercontent.com/u/1948179?v=4" width="50;" alt="Ian Li"/></a>
 <a href="https://github.com/GreenTeodoro839" title="GreenTeodoro839"><img src="https://avatars.githubusercontent.com/u/77104800?v=4" width="50;" alt="GreenTeodoro839"/></a>
@@ -22,7 +22,7 @@ var Themes = map[string]string{
 	"mdui":          "Neko Mdui",
 	"hotaru":        "Hotaru",
 	"angel-kanade":  "AngelKanade",
-	"server-status": "SeverStatus",
+	"server-status": "ServerStatus",
 	"custom":        "Custom(local)",
 }

@@ -6,7 +6,7 @@ const mixinsVue = {
        adaptedTemplates: [
            { key: 'default', name: 'Default', icon: 'th large' },
            { key: 'angel-kanade', name: 'AngelKanade', icon: 'square' },
-            { key: 'server-status', name: 'SeverStatus', icon: 'list' }
+            { key: 'server-status', name: 'ServerStatus', icon: 'list' }
        ]
    },
    created() {
@@ -10,7 +10,7 @@ const mixinsVue = {
        adaptedTemplates: [
            { key: 'default', name: 'Default', icon: 'th large' },
            { key: 'angel-kanade', name: 'AngelKanade', icon: 'square' },
-            { key: 'server-status', name: 'SeverStatus', icon: 'list' }
+            { key: 'server-status', name: 'ServerStatus', icon: 'list' }
        ]
    },
    created() {
@@ -24,6 +24,9 @@
                        <i :class="item.icon + ' icon'"></i>@#item.name#@
                        <i class="check icon" v-if="preferredTemplate === item.key"></i>
                    </a>
+                    <a v-if="defaultTemplate === 'custom'" @click="toggleTemplate('custom')" class="item">
+                        <i class="expand icon"></i>Custom
+                    </a>
                </div>
            </div>
            {{ end }}
@@ -7,19 +7,20 @@
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <meta content="telephone=no" name="format-detection">
    <title>{{.Title}}</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/assets/font-logos.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.2/font/bootstrap-icons.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/[email protected]/css/flag-icons.min.css">
+    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/semantic.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/font-logos@0.17.0/assets/font-logos.css">
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/css/flag-icons.min.css">
    <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240226">
-    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.1/dist/semantic.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/jquery.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/semantic.min.js"></script>
+    <script src="https://unpkg.com/vue@2.6.14/dist/vue.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/echarts.min.js"></script>
    <script src="/static/semantic-ui-alerts.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
    <script src="/static/theme-default/js/mixin.js?v20240302"></script>
 </head>
 <body>
-{{end}}
+{{end}} 
+            
@@ -27,6 +27,9 @@
                        <i :class="item.icon + ' icon'"></i>@#item.name#@
                        <i class="check icon" v-if="preferredTemplate === item.key"></i>
                    </a>
+                    <a v-if="defaultTemplate === 'custom'" @click="toggleTemplate('custom')" class="item">
+                        <i class="expand icon"></i>Custom
+                    </a>
                </div>
            </div>
        {{ end }}
@@ -39,6 +39,11 @@
                                    <i class="check icon" v-if="preferredTemplate === item.key"></i>
                                </a>
                            </li>
+                            <li v-if="defaultTemplate === 'custom'">
+                                <a @click="toggleTemplate('custom')" class="item">
+                                    <i class="expand icon" style="font-size:1em"></i>Custom
+                                </a>
+                            </li>
                        </ul>
                    </li>
                {{ end }}
@@ -6,16 +6,22 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/static/theme-server-status/css/bootstrap-theme.min.css">
+    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/css/bootstrap-theme.min.css">
    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20240407">
    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css?v20240407">
    <link rel="stylesheet" href="/static/theme-server-status/css/light.css?v20240407">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/font/bootstrap-icons.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/assets/font-logos.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@7.0.0/css/flag-icons.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].1/dist/semantic.min.css">
-    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
+    <link rel="stylesheet" href="https://unpkg.com/[email protected].3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/[email protected].0/assets/font-logos.css">
+    <link rel="stylesheet" href="https://unpkg.com/flag-icons@7.2.3/css/flag-icons.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/[email protected].0/dist/semantic.min.css">
+    <script src="https://unpkg.com/[email protected]/dist/jquery.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/js/bootstrap.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/echarts.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/map/js/world.js"></script>
+    <script src="/static/theme-server-status/js/mixin.js?v20240302"></script>
    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!--[if lt IE 9]>
    <script src="/static/theme-server-status/js/html5shiv.js"></script>
@@ -24,12 +30,13 @@
    {{if ts .CustomCode}}
    {{.CustomCode|safe}}
    {{end}}
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/echarts/map/js/world.js"></script>
-    <script src="/static/theme-server-status/js/mixin.js?v20240302"></script>
 </head>
 <body>
 {{end}}
+
+
+
+
+
+
+
@@ -27,10 +27,10 @@
            </td>
            <td class="node-cell name center">@#node.name#@</td>
            <td class="node-cell os center">
-                <i v-if='node.os == "darwin"' class="apple icon"></i>
-                <i v-else-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-else-if='getFontLogoClass(node.host.Platform) == "" && node.stateuptime > 0' class="fl-tux"></i>
                <i v-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
-                <span class="node-cell-os-text">@#node.os#@</span>
+                <span class="node-cell-os-text">@#getPlatformName(node.os)#@</span>
            </td>
            <td style="text-align: center;" class="node-cell location">
                <i :class="'fi fi-' + node.location"></i>
@@ -71,20 +71,23 @@
                        </span>
                        <span class="node-cell-expand" v-if="node.host.CPU">
                            <span class="node-cell-expand-label">CPU:</span>
-                            @#node.host.CPU.join(",")#@
+                            @#node.host.CPU.join(",")#@ (@#node.cpu.percent#@%)
                        </span>
                        <span class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
-                            @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@
+                            @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@ (@#node.hdd.percent#@%)
                        </span>
                        <span class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "MemUsed"}}:</span>
-                            @#formatByteSize(node.state.MemUsed)#@ / @#formatByteSize(node.host.MemTotal)#@(@#toFixed2(node.state.MemUsed / node.host.MemTotal * 100)#@%)
+                            @#formatByteSize(node.state.MemUsed)#@ / @#formatByteSize(node.host.MemTotal)#@ (@#toFixed2(node.state.MemUsed / node.host.MemTotal * 100)#@%)
                        </span>
-                        <span class="node-cell-expand">
+                        <span v-if="node.host.SwapTotal > 0" class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "SwapUsed"}}:</span>
                            @#formatByteSize(node.state.SwapUsed)#@ / @#formatByteSize(node.host.SwapTotal)#@
-                            <span v-if="node.host.SwapTotal">(@#toFixed2(node.state.SwapUsed / node.host.SwapTotal * 100)#@%)</span>
+                            <span>(@#toFixed2(node.state.SwapUsed / node.host.SwapTotal * 100)#@%)</span>
+                        </span>
+                        <span v-else class="node-cell-expand">
+                            <span class="node-cell-expand-label">{{tr "SwapUsed"}}: OFF</span>
                        </span>
                        <span class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "NetTransfer"}}:</span>
@@ -30,10 +30,10 @@
            </td>
            <td class="node-cell name center">@#node.name#@</td>
            <td class="node-cell os center">
-                <i v-if='node.os == "darwin"' class="apple icon"></i>
-                <i v-else-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-else-if='getFontLogoClass(node.host.Platform) == "" && node.stateuptime > 0' class="fl-tux"></i>
                <i v-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
-                <span class="node-cell-os-text">@#node.os#@</span>
+                <span class="node-cell-os-text">@#getPlatformName(node.os)#@</span>
            </td>
            <td style="text-align: center;" class="node-cell location">
                <i :class="'fi fi-' + node.location"></i>
@@ -74,20 +74,23 @@
                        </span>
                        <span class="node-cell-expand" v-if="node.host.CPU">
                            <span class="node-cell-expand-label">CPU:</span>
-                            @#node.host.CPU.join(",")#@
-                        </span>
-                        <span class="node-cell-expand">
-                            <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
-                            @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@
+                            @#node.host.CPU.join(",")#@ (@#node.cpu.percent#@%)
                        </span>
                        <span class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "MemUsed"}}:</span>
-                            @#formatByteSize(node.state.MemUsed)#@ / @#formatByteSize(node.host.MemTotal)#@(@#toFixed2(node.state.MemUsed / node.host.MemTotal * 100)#@%)
+                            @#formatByteSize(node.state.MemUsed)#@ / @#formatByteSize(node.host.MemTotal)#@ (@#toFixed2(node.state.MemUsed / node.host.MemTotal * 100)#@%)
                        </span>
                        <span class="node-cell-expand">
+                            <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
+                            @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@ (@#node.hdd.percent#@%)
+                        </span>
+                        <span v-if="node.host.SwapTotal > 0" class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "SwapUsed"}}:</span>
                            @#formatByteSize(node.state.SwapUsed)#@ / @#formatByteSize(node.host.SwapTotal)#@
-                            <span v-if="node.host.SwapTotal">(@#toFixed2(node.state.SwapUsed / node.host.SwapTotal * 100)#@%)</span>
+                            <span>(@#toFixed2(node.state.SwapUsed / node.host.SwapTotal * 100)#@%)</span>
+                        </span>
+                        <span v-else class="node-cell-expand">
+                            <span class="node-cell-expand-label">{{tr "SwapUsed"}}: OFF</span>
                        </span>
                        <span class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "NetTransfer"}}:</span>
@@ -195,6 +195,12 @@
            isWindowsPlatform(str) {
                return str.includes('Windows')
            },
+            getPlatformName(str){
+                if (str.toLowerCase().includes('opensuse')) {
+                    return 'openSUSE';
+                }
+                return str;
+            },
            getFontLogoClass(str) {
                if (["almalinux",
                        "alpine",
@@ -241,6 +247,9 @@
                    > -1) {
                    return str;
                }
+                if (str == 'darwin') {
+                    return 'apple';
+                }
                if (['openwrt', 'linux', "immortalwrt"].indexOf(str) > -1) {
                    return 'tux';
                }
@@ -250,6 +259,9 @@
                if (str == 'arch') {
                    return 'archlinux';
                }
+                if (str.toLowerCase().includes('opensuse')) {
+                    return 'opensuse';
+                }
                return '';
            },
            secondToDate(s) {
@@ -276,6 +288,9 @@
            },
            formatPercents(live,percent) {
                //if(!live) { percent = 0; }
+                if (isNaN(percent)) {
+                    percent = 0;
+                }
                if (percent <= 0) {
                    percent = 0;
                }
@@ -359,6 +374,7 @@
                        name: server.Name,
                        os: platform,
                        location: server.Host.CountryCode,
+                        stateuptime: server.State.Uptime,
                        uptime: this.secondToDate(server.State.Uptime),
                        load: this.toFixed2(server.State.Load1),
                        network: this.getNetworkSpeed(server.State.NetInSpeed, server.State.NetOutSpeed),
@@ -182,7 +182,7 @@ before_show_menu() {

 install_base() {
    (command -v git >/dev/null 2>&1 && command -v curl >/dev/null 2>&1 && command -v wget >/dev/null 2>&1 && command -v unzip >/dev/null 2>&1 && command -v getenforce >/dev/null 2>&1) ||
-        (install_soft curl wget git unzip tzdata)
+        (install_soft curl wget git unzip)
 }

 install_arch() {
Author	SHA1	Message	Date
UUBulb	0ed7436176	Add option to reduct temperature information (#369 )	2024-06-16 18:12:45 +08:00
UUBulb	2aabe1bd61	chore: fix some typos (#370 )	2024-06-16 18:04:27 +08:00
github-actions[bot]	db5e94d0de	update contributors[no ci]	2024-06-15 01:43:49 +00:00
nap0o	3eecdc2b3f	修复一些bug (#367 ) * bug修复： 1. serverstatus主题agent详情不显示内存信息 2. windows系统icon错误小优化 1. echarts绘制世界地图所需的world.js坐标信息从本地加载切换为从cdn加载 2. font-logos切换为0.17.0版本，使得图标间距更合适 * 优化agent离线保留信息逻辑，从判断“实时在线”调整为判断“曾经在线”。 * 优化agent离线保留信息逻辑，从判断“实时在线”调整为判断“曾经在线”。	2024-06-15 09:43:30 +08:00
github-actions[bot]	b2740e5f3c	update contributors[no ci]	2024-06-14 10:03:18 +00:00
nap0o	c3fa4cbbee	优化default和server status主题 (#363 )	2024-06-14 18:02:55 +08:00
UUBulb	a9da084711	ci: using time/tzdata package to provide zoneinfo (#365 )	2024-06-14 10:24:58 +08:00
github-actions[bot]	f30969e946	update contributors[no ci]	2024-06-01 11:12:04 +00:00