replace statifile cdn with bytedance cdn

update contributors[no ci]
更新判断面板是否是通过docker安装的逻辑 (#311 )
2023-12-11 21:53:56 +08:00 · 2023-12-08 13:17:02 +00:00 · 2023-12-08 21:16:36 +08:00 · 2023-12-08 09:55:17 +08:00 · 2023-12-07 13:59:01 +00:00 · 2023-12-07 21:58:42 +08:00
27 changed files with 334 additions and 253 deletions
@@ -1,18 +1,18 @@
-FROM ubuntu:focal-20221130
-
-ENV TZ="Asia/Shanghai"
+# latest 镜像还没有 riscv64 https://hub.docker.com/_/alpine/tags
+FROM alpine:edge

 ARG TARGETOS
 ARG TARGETARCH

-COPY ./script/entrypoint.sh /entrypoint.sh
+RUN apk update && \
+    apk upgrade --no-cache && \
+    apk add --no-cache tzdata && \
+    cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+    echo 'Asia/Shanghai' >/etc/timezone && \
+    rm -rf /var/cache/apk/*

-RUN export DEBIAN_FRONTEND="noninteractive" && \
-    apt update && apt install -y ca-certificates tzdata && \
-    update-ca-certificates && \
-    ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \
-    dpkg-reconfigure tzdata && \
-    chmod +x /entrypoint.sh
+COPY ./script/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh

 WORKDIR /dashboard
 COPY dist/dashboard-${TARGETOS}-${TARGETARCH} ./app
@@ -4,7 +4,7 @@
  <br>
  <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
  <br><br>
-<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.2-brightgreen?style=for-the-badge&logo=linux">
+<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.4-brightgreen?style=for-the-badge&logo=linux">
  <br>
  <br>
  <p>:trollface: <b>Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.</b></p>
@@ -71,15 +71,18 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <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/hhhkkk520" title="Kris">
-  <img src="https://avatars.githubusercontent.com/u/52115472?v=4" width="50;" alt="Kris"/>
-</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/applexad" title="Applexad">
  <img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="Applexad"/>
 </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/Mmx233" title="Mmx">
+  <img src="https://avatars.githubusercontent.com/u/36563672?v=4" width="50;" alt="Mmx"/>
+</a>
 <a href="https://github.com/rootmelo92118" title="rootmelo92118">
  <img src="https://avatars.githubusercontent.com/u/32770959?v=4" width="50;" alt="rootmelo92118"/>
 </a>
@@ -134,6 +137,9 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/yuanweize" title="I">
  <img src="https://avatars.githubusercontent.com/u/30067203?v=4" width="50;" alt="I"/>
 </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/unclezs" title="unclezs">
  <img src="https://avatars.githubusercontent.com/u/42318775?v=4" width="50;" alt="unclezs"/>
 </a>
@@ -110,15 +110,9 @@ func (n *Notification) setRequestHeader(req *http.Request) error {
 }

 func (ns *NotificationServerBundle) Send(message string) error {
-	var verifySSL bool
+	var client *http.Client
 	n := ns.Notification
 	if n.VerifySSL != nil && *n.VerifySSL {
-		verifySSL = true
-	}
-
-	var client *http.Client
-
-	if verifySSL {
 		client = utils.HttpClient
 	} else {
 		client = utils.HttpClientSkipTlsVerify
@@ -14,23 +14,23 @@ var (
 func init() {
 	HttpClientSkipTlsVerify = httpClient(_httpClient{
 		Transport: httpTransport(_httpTransport{
-			VerifySSL: true,
+			SkipVerifySSL: true,
 		}),
 	})
 	HttpClient = httpClient(_httpClient{
 		Transport: httpTransport(_httpTransport{
-			VerifySSL: false,
+			SkipVerifySSL: false,
 		}),
 	})
 }

 type _httpTransport struct {
-	VerifySSL bool
+	SkipVerifySSL bool
 }

 func httpTransport(conf _httpTransport) *http.Transport {
 	return &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.VerifySSL},
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.SkipVerifySSL},
 		Proxy:           http.ProxyFromEnvironment,
 	}
 }
@@ -27,6 +27,10 @@ body[theme="light"] .table {
    background: #ffffff;
 }

+body[theme="light"] .table>thead>tr>th.node-group-tag {
+    background-color:#ffffff;
+}
+
 body[theme="light"] .table-striped tbody > tr.even > td,
 body[theme="light"] .table-striped tbody > tr.even > th {
    background-color: #F9F9F9;
@@ -37,10 +41,25 @@ body[theme="light"] .table-striped tbody > tr.odd > th {
    background-color: #FFF;
 }

+body[theme="light"] .table>tbody>tr>td, 
+body[theme="light"] .table>tbody>tr>th, 
+body[theme="light"] .table>tfoot>tr>td, 
+body[theme="light"] .table>tfoot>tr>th, 
+body[theme="light"] .table>thead>tr>td, 
+body[theme="light"] .table>thead>tr>th {
+    line-height:20px;
+}
+
 body[theme="light"] .progress-bar {
    color: #000;
 }

+
+body[theme="light"] .progress-offline .progress-bar-success {
+    background-image: linear-gradient(grey 0px, grey 100%);
+}
+}
+
 body[theme="light"] .table-hover > tbody > tr:hover > td {
    background: #E6E6E6;
 }
@@ -75,4 +94,10 @@ body[theme="light"] .service-status .warning {

 body[theme="light"] .service-day-status-icon {
    background-color: #ebebeb;
+}
+
+body[theme="light"] footer p a, 
+body[theme="light"] footer p a:hover {
+    color: #333333;
+    text-decoration: none;
 }
@@ -1,5 +1,5 @@
 body {
-    padding-top: 70px !important;
+    padding-top:70px !important;
    padding-bottom: 30px !important;
 }

@@ -8,14 +8,27 @@ body {
    min-height: 40px !important;
 }

+.navbar-inner{
+    margin:0 auto;
+}
+
+.pl-md-unset {
+    max-width: 95vw;
+}
+
 .navbar-collapse:not([aria-expanded]) .navbar-nav .dropdown-toggle {
    margin-top: 18px;
    padding: 0 !important;
 }

+.navbar-toggle {
+    margin-right:0
+}
+
 .navbar-brand {
    font-size: 20px;
    text-align: center;
+    padding:12px 0 0 0;
 }

 .node-cell-expand {
@@ -32,18 +45,17 @@ body {
    padding-top: 10px;
 }

-.dropdown {
-    margin-right: 10px;
-}
-
 .navbar-inverse, .nav.navbar-nav {
    background-image: linear-gradient(rgb(60, 60, 60) 0px, rgb(34, 34, 34) 100%) !important;
 }

+.navbar-inverse .navbar-nav>li>a {
+    color:#f1f1f1;
+}
+
 .navbar-inverse .navbar-brand {
    font-size: 20px;
 }
-
 /* 导航部分 结束 */

 /* 正文部分 开始 */
@@ -63,6 +75,15 @@ body {
    text-align: left;
 }

+.table>thead>tr>th{
+  border:none;  
+}
+
+.table .node-group-tag {
+    font-size: 18px;
+    padding-bottom:15px;
+}
+
 .progress {
    margin-bottom: 0;
 }
@@ -78,6 +99,10 @@ body {
    border-top: 0 !important;
 }

+.accordian-body{
+    margin: 10px 0px 10px 18px;
+}
+
 .node-cell.center {
    text-align: center !important;
 }
@@ -147,104 +172,45 @@ body {
 }

 /* 服务页 正文结束 */
-
@media only screen and (max-width: 1200px) {
-    .node-cell.os,
-    .node-cell.location,
-    .node-cell.uptime {
-        display: none;
-        visibility: hidden;
+    .accordian-body{
+        margin: 5px 0px 5px 10px;        
+    }
+    .table .node-group-tag {
+        font-size:16px;
+        padding-bottom:6px;
    }
 }

@media only screen and (max-width: 720px) {
    body {
        font-size: 10px !important;
+        padding-top:60px !important;
    }
-
    .content {
        padding: 0;
+        margin-bottom: 10px;
    }
-
    .node-cell.os,
-    .node-cell.location,
-    .node-cell.uptime {
-        display: none;
-        visibility: hidden;
-    }
-
-    .service-day-status-icon {
-        width: 8px;
-        height: 8px;
-        margin-right: 2px;
-        border-radius: 3px;
-    }
-}
-
-@media only screen and (max-width: 620px) {
-    body {
-        font-size: 10px !important;
-    }
-
-    .content {
-        padding: 0;
-    }
-
-    .node-cell.type,
-    .node-cell.location,
    .node-cell.uptime,
-    .node-cell.traffic {
+    .node-cell.traffic{
        display: none;
        visibility: hidden;
    }
-
-    .service-day-status-icon {
+    .node-cell.location{
+        display: table-cell;
+        visibility: visible;
    }
-}
-
-@media only screen and (max-width: 533px) {
-    body {
-        font-size: 10px !important;
-    }
-
-    .content {
-        padding: 0;
-    }
-
-    .node-cell.os,
-    .node-cell.location,
-    .node-cell.uptime,
-    .node-cell.traffic {
+    .node-cell-os-text,.node-cell-location-text{
        display: none;
        visibility: hidden;
    }
-
-    .service-day-status-icon {
+    .accordian-body{
+        margin: 5px 0px 5px 10px;        
    }
-}
-
-@media only screen and (max-width: 450px) {
-    body {
-        font-size: 10px !important;
-    }
-
-    .content {
-        padding: 0;
-    }
-
-    .node-cell.type,
-    .node-cell.location,
-    .node-cell.uptime,
-    .node-cell.traffic {
-        display: none;
-        visibility: hidden;
-    }
-
-    .node-cell.cpu,
-    .node-cell.ram,
-    .node-cell.hdd {
-        min-width: 25px;
-        max-width: 50px;
+    .table .node-group-tag {
+        font-size:12px;
+        padding-bottom:6px;
    }
 }

@@ -6,10 +6,10 @@
            {{.Version}}</small>
    </div>
 </div>
-<script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
-<script src="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.js"></script>
 <script src="/static/semantic-ui-alerts.min.js"></script>
-<script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
 <script src="/static/main.js?v20230614"></script>
 <script>
    (function () {
@@ -9,8 +9,8 @@
    <meta content="telephone=no" name="format-detection">
    <title>{{.Title}}</title>
    <link rel="stylesheet" type="text/css"
-        href="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.css">
-    <link href="https://cdn.staticfile.org/font-logos/0.17/font-logos.min.css" type="text/css"
+        href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.css">
+    <link href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/font-logos/0.17/font-logos.min.css" type="text/css"
        rel="stylesheet" />
    <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
    <link rel="stylesheet" type="text/css" href="/static/main.css?v2022042314">
@@ -85,7 +85,7 @@
 </div>
 {{template "component/server" .}}
 {{template "common/footer" .}}
-<script src="https://cdn.staticfile.org/clipboard.js/2.0.10/clipboard.min.js" type="application/javascript"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/clipboard.js/2.0.10/clipboard.min.js" type="application/javascript"></script>
 <script>
    var clipboard = new ClipboardJS('.ui.icon.green.mini.button');
    const checkBoxList = document.querySelectorAll('tbody > tr > td > input.nezha-servers[type=checkbox]')
@@ -8,7 +8,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>tty@{{.ServerName}} - {{.Title}}</title>
    <link rel="shortcut icon" type="image/png" href="/static/logo.svg?v20210804" />
-    <link href="https://lf26-cdn-tos.bytecdntp.com/cdn/expire-1-M/xterm/4.11.0/xterm.css" type="text/css" rel="stylesheet"/>
+    <link href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/xterm/4.11.0/xterm.css" type="text/css" rel="stylesheet"/>
 </head>

 <style>
@@ -28,9 +28,9 @@

 <body onresize="onResize()">
    <div id="terminal-container"></div>
-    <script src="https://lf26-cdn-tos.bytecdntp.com/cdn/expire-1-M/xterm/4.11.0/xterm.js" type="application/javascript"></script>
-    <script src="https://lf26-cdn-tos.bytecdntp.com/cdn/expire-1-M/xterm/4.11.0/addons/attach/xterm-addon-attach.js"></script>
-    <script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/xterm/4.11.0/addons/fit/xterm-addon-fit.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/xterm/4.11.0/xterm.js" type="application/javascript"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/xterm/4.11.0/addons/attach/xterm-addon-attach.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/xterm/4.11.0/addons/fit/xterm-addon-fit.js"></script>
    <script>
        let sendResizing = false;

@@ -8,10 +8,10 @@
        </small>
    </div>
 </div>
-<script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
-<script src="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.js"></script>
 <script src="/static/semantic-ui-alerts.min.js"></script>
-<script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
 <script src="/static/main.js?v20230614"></script>
 <script>
    (function () {
@@ -9,10 +9,10 @@
    <meta content="telephone=no" name="format-detection">
    <title>{{.Title}}</title>
    <link rel="stylesheet" type="text/css"
-        href="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.css">
-    <link href="https://cdn.staticfile.org/font-logos/0.17/font-logos.min.css" type="text/css"
+        href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.css">
+    <link href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/font-logos/0.17/font-logos.min.css" type="text/css"
        rel="stylesheet" />
-    <link href="https://cdn.staticfile.org/bootstrap-icons/1.10.3/font/bootstrap-icons.css" type="text/css"
+    <link href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/bootstrap-icons/1.8.1/font/bootstrap-icons.min.css" type="text/css"
        rel="stylesheet" />
    <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
    <link rel="stylesheet" type="text/css" href="/static/main.css?v2022042314">
@@ -15,7 +15,7 @@
            <div v-for="server in group.data" :id="server.ID" class="ui card">
              <div class="content" v-if="server.Host" style="margin-top: 10px; padding-bottom: 5px">
                <div class="header">
-                  <img v-if="server.Host.CountryCode" style="border-radius: 50%;box-shadow:-1px -1px 2px #eee, 1px 1px 2px #000;width:19px;" :src="'https://cdn.staticfile.org/flag-icon-css/6.6.5/flags/1x1/'+server.Host.CountryCode + '.svg'" alt="国家"/>&nbsp;<i v-if='server.Host.Platform == "darwin"'
+                  <img v-if="server.Host.CountryCode" style="border-radius: 50%;box-shadow:-1px -1px 2px #eee, 1px 1px 2px #000;width:19px;" :src="'https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/flag-icon-css/4.1.5/flags/1x1/'+server.Host.CountryCode + '.svg'" alt="国家"/>&nbsp;<i v-if='server.Host.Platform == "darwin"'
                    class="apple icon"></i><i v-else-if='isWindowsPlatform(server.Host.Platform)'
                    class="windows icon"></i><i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                  @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
@@ -10,8 +10,8 @@
    <link rel="shortcut icon" type="image/png" href="/static/logo.svg?v20210804" />

    <link rel="stylesheet" href="/static/theme-daynight/css/main.css?v202108042286">
-    <link href="https://cdn.staticfile.org/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
-    <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
+    <link href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>

    {{if ts .CustomCode}}
    {{.CustomCode|safe}}
@@ -165,8 +165,8 @@
    </footer>

    <script src="/static/theme-daynight/js/main.js?v202102012266"></script>
-    <script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
-    <script src="https://cdn.staticfile.org/limonte-sweetalert2/11.4.4/sweetalert2.all.min.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/limonte-sweetalert2/11.4.4/sweetalert2.all.min.js"></script>

    <script>
        const initData = JSON.parse('{{.Servers}}').servers;
@@ -8,9 +8,9 @@
    <title>{{.Title}}</title>
    <link rel="shortcut icon" type="image/png" href="/static/logo.svg?v20210804" />
    <link rel="stylesheet" href="/static/theme-daynight/css/service.css?v202108042286" />
-    <link rel="stylesheet" href="https://cdn.staticfile.org/mdui/1.0.2/css/mdui.min.css"/>
-    <link href="https://cdn.staticfile.org/font-awesome/6.0.0/css/all.min.css" rel="stylesheet" />
-    <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
+    <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/css/mdui.min.css"/>
+    <link href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/font-awesome/6.0.0/css/all.min.css" rel="stylesheet" />
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>

    {{if ts .CustomCode}}
    {{.CustomCode|safe}}
@@ -14,8 +14,8 @@
    <meta http-equiv="Content-Language" content="zh" />

    <!-- Styles -->
-    <link rel="stylesheet" type="text/css" href="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.css">
-    <link rel="stylesheet" type="text/css" href="https://cdn.staticfile.org/font-awesome/6.0.0/css/all.min.css">
+    <link rel="stylesheet" type="text/css" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.css">
+    <link rel="stylesheet" type="text/css" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/font-awesome/6.0.0/css/all.min.css">
    <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
    <link rel="stylesheet" href="/static/theme-hotaru/css/core.css?v202012121912" type="text/css">
    <link rel="stylesheet" href="/static/theme-hotaru/css/main.css?v202101171153" type="text/css">
@@ -141,10 +141,10 @@
            <a href="/server">{{tr "AdminPanel"}}</a>
        </p>
    </footer>
-    <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.js"></script>
    <script src="/static/semantic-ui-alerts.min.js"></script>
-    <script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
    <script>
        const initData = JSON.parse('{{.Servers}}').servers;
        var statusCards = new Vue({
@@ -9,7 +9,7 @@
  <link rel="shortcut icon" type="image/png" href="/static/logo.svg?v20210804" />

  <!-- MDUI CSS -->
-  <link rel="stylesheet" href="https://cdn.staticfile.org/mdui/1.0.2/css/mdui.min.css"/>
+  <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/css/mdui.min.css"/>
  <link rel="stylesheet" href="/static/theme-mdui/mdui.css" type="text/css">
  <style>
 	.mdui-table td, .mdui-table th{padding: 6px;}
@@ -37,7 +37,7 @@
        <div class="mdui-col" v-for='server in servers' :id="server.ID">
          <div :class="'mdui-card mt' + (server.live?'':' offline')">
            <div class="mdui-card-header">
-	      <img class="mdui-card-header-avatar" :src="'https://cdn.staticfile.org/flag-icon-css/4.1.5/flags/1x1/' + (server.Host.CountryCode?server.Host.CountryCode:'cn') + '.svg'"/>
+	      <img class="mdui-card-header-avatar" :src="'https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/flag-icon-css/4.1.5/flags/1x1/' + (server.Host.CountryCode?server.Host.CountryCode:'cn') + '.svg'"/>
 	      <div class="mdui-card-header-title">@#server.Name#@</div>
 	      <div class="mdui-card-header-subtitle">@#server.Host.CountryCode.toUpperCase()#@ | @#server.Host.Platform#@ @#server.Host.PlatformVersion#@</div>
            </div>
@@ -153,9 +153,9 @@
 {{template "theme-mdui/footer" .}}

  <script src="/static/theme-mdui/mdui.js"></script>
-  <script src="https://cdn.staticfile.org/mdui/1.0.2/js/mdui.min.js"></script>
-  <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/js/mdui.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>

  <script>
    var container=document.querySelector("#container");
@@ -9,7 +9,7 @@
  <link rel="shortcut icon" type="image/png" href="/static/logo.svg?v20210804" />

  <!-- MDUI CSS -->
-  <link rel="stylesheet" href="https://cdn.staticfile.org/mdui/1.0.2/css/mdui.min.css"/>
+  <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/css/mdui.min.css"/>
  <link rel="stylesheet" href="/static/theme-mdui/mdui.css" type="text/css">
  {{if ts .CustomCode}}
  {{.CustomCode|safe}}
@@ -116,9 +116,9 @@
 {{template "theme-mdui/footer" .}}

  <script src="/static/theme-mdui/mdui.js"></script>
-  <script src="https://cdn.staticfile.org/mdui/1.0.2/js/mdui.min.js"></script>
-  <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
-  <script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/js/mdui.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
  <script>
    var container=document.querySelector("#container");
    container.style.minHeight=window.innerHeight-document.body.clientHeight+container.clientHeight+'px';
@@ -8,7 +8,7 @@
  <title>{{.Title}}</title>

  <!-- MDUI CSS -->
-  <link rel="stylesheet" href="https://cdn.staticfile.org/mdui/1.0.2/css/mdui.min.css"/>
+  <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/css/mdui.min.css"/>
  <link rel="stylesheet" href="/static/theme-mdui/mdui.css" type="text/css">
  {{if ts .CustomCode}}
  {{.CustomCode|safe}}
@@ -34,8 +34,8 @@
    </div>
  </div>

-  <script src="https://cdn.staticfile.org/mdui/1.0.2/js/mdui.min.js"></script>
-  <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/mdui/1.0.2/js/mdui.min.js"></script>
+  <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/jquery/3.6.0/jquery.min.js"></script>
  <script>
    var $input = mdui.$('#container').find('.mdui-textfield-input');
    var $dialog = new mdui.Dialog(mdui.$('.mdui-dialog'));
@@ -1,8 +1,7 @@
 {{define "theme-server-status/content-footer"}}
 <footer class="container" style="padding-bottom: 2rem;">
    <p style="text-align: center; font-size: 10px;">
-        {{ .Conf.Site.Brand }} | Theme <a href="https://github.com/cppla/ServerStatus">ServerStatus</a> | Powered by <a
-            href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a> {{.Version}}
+        {{ .Conf.Site.Brand }} | Theme <a target="_blank" href="https://github.com/cppla/ServerStatus">ServerStatus</a> | Powered by <a target="_blank" href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a> {{.Version}}
    </p>
 </footer>
 {{end}}
@@ -44,4 +44,4 @@
        </div>
    </div>
 </div>
-{{end}}
+{{end}}
@@ -1,7 +1,6 @@
 {{define "theme-server-status/header"}}
 <!DOCTYPE html>
 <html lang="{{.Conf.Language}}">
-
 <head>
    <title>{{ .Title }}</title>
    <meta charset="utf-8">
@@ -9,11 +8,13 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="stylesheet" href="/static/theme-server-status/css/bootstrap.min.css">
    <link rel="stylesheet" href="/static/theme-server-status/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20231109">
+    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20231207">
    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css">
    <link rel="stylesheet" href="/static/theme-server-status/css/light.css">
-    <link href="https://cdn.staticfile.org/font-logos/0.17/font-logos.min.css" type="text/css" rel="stylesheet" />
-    <link rel="stylesheet" type="text/css" href="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/font-logos/0.17/font-logos.min.css">
+    <link rel="stylesheet" href="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.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?v20210804" />
    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!--[if lt IE 9]>
@@ -23,12 +24,10 @@
    {{if ts .CustomCode}}
    {{.CustomCode|safe}}
    {{end}}
-
    <script src="/static/theme-server-status/js/jquery.min.js"></script>
    <script src="/static/theme-server-status/js/bootstrap.min.js"></script>
-    <script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
    <script src="/static/theme-server-status/js/mixin.js"></script>
 </head>
-
 <body>
-    {{end}}
+{{end}}
@@ -2,26 +2,30 @@
 {{template "theme-server-status/header" .}}
 <div id="app">
    {{template "theme-server-status/content-nav" .}}
-    <div class="container table-responsive content" style="max-width: 95vw">
+    <div class="container table-responsive content" style="max-width: 95vw" v-for="group in nodes">
        <table class="table table-striped table-condensed table-hover">
            <thead>
            <tr>
-                <th class="node-cell status center">🍀 {{tr "Status"}}</th>
-                <th class="node-cell name">🚀 {{tr "Name"}}</th>
-                <th class="node-cell os">🗂 {{tr "Platform"}}</th>
-                <th class="node-cell location center">🌍 {{tr "Location"}}</th>
-                <th class="node-cell uptime center">⏱️ {{tr "Uptime"}}</th>
-                <th class="node-cell load center">📋{{tr "Load"}}</th>
-                <th class="node-cell network center">🚦 {{tr "NetSpeed"}}↓|↑</th>
-                <th class="node-cell traffic center">📊 {{tr "NetTransfer"}}↓|↑</th>
-                <th class="node-cell cpu center">🎯 {{tr "CpuUsed"}}</th>
-                <th class="node-cell ram center">⚡ {{tr "MemUsed"}}</th>
-                <th class="node-cell hdd center">💾 {{tr "DiskUsed"}}</th>
+                <th class="node-group-tag" colspan="16" style="border:none;">@#(group.Tag!==''?group.Tag:'{{tr "Default"}}')#@</th>
+                </th>
+            </tr>
+            <tr>
+                <th class="node-cell status center">{{tr "Status"}}</th>
+                <th class="node-cell name center">{{tr "Name"}}</th>
+                <th class="node-cell os center">{{tr "Platform"}}</th>
+                <th class="node-cell location center">{{tr "Location"}}</th>
+                <th class="node-cell uptime center">{{tr "Uptime"}}</th>
+                <th class="node-cell load center">{{tr "Load"}}</th>
+                <th class="node-cell network center">{{tr "NetSpeed"}}↓|↑</th>
+                <th class="node-cell traffic center">{{tr "NetTransfer"}}↓|↑</th>
+                <th class="node-cell cpu center">{{tr "CpuUsed"}}</th>
+                <th class="node-cell ram center">{{tr "MemUsed"}}</th>
+                <th class="node-cell hdd center">{{tr "DiskUsed"}}</th>
            </tr>
            </thead>
            <tbody id="servers">
-            <template v-for="(node,index) in nodes">
-                <tr :id="'r'+index" data-toggle="collapse" :data-target="'#rt'+index" class="accordion-toggle"
+            <template v-for="(node,index) in group.data">
+                <tr :id="'r'+node.ID" data-toggle="collapse" :data-target="'#rt'+node.ID" class="accordion-toggle"
                    :class="index % 2 === 0 ? 'odd': 'even'">
                    <td class="node-cell status center">
                        <div class="status-container">
@@ -29,36 +33,36 @@
                            <div v-else class="status-icon offline"></div>
                        </div>
                    </td>
-                    <td class="node-cell name">@#node.name#@</td>
-                    <td class="node-cell os">
+                    <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-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
-                        @#node.os#@
+                        <span class="node-cell-os-text">@#node.os#@</span>
                    </td>
                    <td style="text-align: center;" class="node-cell location">
-                        <i :class="node.location + ' flag'"></i>&nbsp;
-                        <span class="text-uppercase">@#node.location#@</span>
+                        <i :class="'fi fi-' + node.location"></i>
+                        <span class="node-cell-location-text text-uppercase">&nbsp;@#node.location#@</span>
                    </td>
                    <td style="text-align: center;" class="node-cell uptime">@#node.uptime#@</td>
                    <td style="text-align: center;" class="node-cell load">@#node.load#@</td>
                    <td style="text-align: center;" class="node-cell network">@#node.network#@</td>
                    <td style="text-align: center;" class="node-cell traffic">@#node.traffic#@</td>
                    <td class="node-cell cpu">
-                        <div class="progress">
+                        <div :class="['progress', node.online ? 'progress-online' : 'progress-offline']">
                            <div :style="node.cpu.style" :class="node.cpu.class"><small>@#node.cpu.percent#@%</small>
                            </div>
                        </div>
                    </td>
                    <td class="node-cell memory">
-                        <div class="progress">
+                        <div :class="['progress', node.online ? 'progress-online' : 'progress-offline']">
                            <div :style="node.memory.style" :class="node.memory.class">
                                <small>@#node.memory.percent#@%</small>
                            </div>
                        </div>
                    </td>
                    <td class="node-cell hdd">
-                        <div class="progress">
+                        <div :class="['progress', node.online ? 'progress-online' : 'progress-offline']">
                            <div :style="node.hdd.style" :class="node.hdd.class"><small>@#node.hdd.percent#@%</small>
                            </div>
                        </div>
@@ -66,78 +70,72 @@
                </tr>
                <tr class="expandRow" :class="index % 2 === 0 ? 'odd': 'even'">
                    <td colspan="16">
-                        <div class="accordian-body collapse" :id="'rt'+index">
-                            <div style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
-                                <div style="display: flex;align-items: flex-start;justify-content: center;flex-direction: column; width: 450px;max-width: 90vw">
+                        <div class="accordian-body collapse" :id="'rt'+node.ID">
+                            <div style="display: flex;left-items: center;justify-content: center;flex-direction: column; max-width: 89vw">
                                <span class="node-cell-expand">
                                    <span class="node-cell-expand-label">{{tr "Platform"}}:</span>
-                                    @#node.host.Platform#@
-                                </span>
-                                <span class="node-cell-expand">
-                                    <span class="node-cell-expand-label">{{tr "Location"}}:</span>
-                                    <i :class="node.location + ' flag'"></i>
+                                    @#node.host.Platform#@-@#node.host.PlatformVersion#@
+                                    [<span v-if="node.host.Virtualization">@#node.host.Virtualization#@:</span>@#node.host.Arch#@]
                                </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 load">
-                                    <span class="node-cell-expand-label">{{tr "Load"}}:</span>
-                                    @#toFixed2(node.state.Load1)#@ / @#toFixed2(node.state.Load5)#@ /@#toFixed2(node.state.Load15)#@
-                                </span>
-                                    <span class="node-cell-expand">
+                                <span class="node-cell-expand">
                                    <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
                                    @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@
                                </span>
-                                    <span class="node-cell-expand">
+                                <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)#@%)
                                </span>
-                                    <span class="node-cell-expand">
+                                <span 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>
+                                <span class="node-cell-expand">
                                    <span class="node-cell-expand-label">{{tr "NetTransfer"}}:</span>
                                    <i class="arrow alternate circle down outline icon"
                                       style="margin: 0"></i>@#formatByteSize(node.state.NetInTransfer)#@
                                    <i class="arrow alternate circle up outline icon"
                                       style="margin: 0"></i>@#formatByteSize(node.state.NetOutTransfer)#@
                                </span>
-                                    <span 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 class="node-cell-expand load">
+                                    <span class="node-cell-expand-label">{{tr "Load"}}:</span>
+                                    @#toFixed2(node.state.Load1)#@ / @#toFixed2(node.state.Load5)#@ / @#toFixed2(node.state.Load15)#@
                                </span>
-                                    <span class="node-cell-expand">
-                                    <span class="node-cell-expand-label">{{tr "BootTime"}}:</span>
-                                    @#formatTimestamp(node.host.BootTime)#@
-                                </span>
-                                    <span class="node-cell-expand">
-                                    <span class="node-cell-expand-label">{{tr "LastActive"}}:</span>
-                                    @#new Date(node.lastActive).toLocaleString()#@
-                                </span>
-                                    <span class="node-cell-expand" v-if="node.host.Virtualization">
-                                    <span class="node-cell-expand-label">{{tr "Virtualization"}}:</span>
-                                    @#node.host.Virtualization#@
-                                </span>
-                                    <span class="node-cell-expand">
+                                <span class="node-cell-expand">
                                    <span class="node-cell-expand-label">{{tr "ProcessCount"}}:</span>
                                    @#node.state.ProcessCount#@
                                </span>
-                                    <span class="node-cell-expand">
+                                <span class="node-cell-expand">
                                    <span class="node-cell-expand-label">{{tr "ConnCount"}}:</span>
                                    TCP @#node.state.TcpConnCount#@ / UDP @#node.state.UdpConnCount#@
                                </span>
-                                </div>
+                                <span class="node-cell-expand">
+                                    <span class="node-cell-expand-label">{{tr "BootTime"}}:</span>
+                                    @#formatTimestamp(node.host.BootTime)#@
+                                </span>
+                                <span class="node-cell-expand">
+                                    <span class="node-cell-expand-label">{{tr "LastActive"}}:</span>
+                                    @#new Date(node.lastActive).toLocaleString()#@
+                                </span>
+                                <span class="node-cell-expand">
+                                    <span class="node-cell-expand-label">{{tr "Version"}}:</span>
+                                    @#node.host.Version#@
+                                </span>
                            </div>
                        </div>
                    </td>
                </tr>
            </template>
-
            </tbody>
        </table>
-        <br/>
    </div>
    {{template "theme-server-status/content-footer" .}}
 </div>
+
 <script>
    new Vue({
        el: '#app',
@@ -147,8 +145,8 @@
        },
        mixins: [mixinsVue],
        created() {
-            const initData = JSON.parse('{{.Servers}}').servers;
-            this.nodes = this.handleNodes(initData);
+            const initData = JSON.parse('{{.Servers}}').servers;           
+            this.nodes = groupingData(this.handleNodes(initData),"Tag");
            this.initTheme()
        },
        mounted() {
@@ -233,17 +231,17 @@
                return x !== "NaN undefined" ? x : '0B'
            },
            formatPercent(live, used, total) {
-                const percent = live ? (this.toFixed2(used / total * 100) || 0) : 1
+                const percent = live ? (this.toFixed2(used / total * 100) || 0) : 0
                return this.formatPercents(percent)
            },
            formatPercents(percent) {
                if (percent <= 0) {
-                    percent = 1;
+                    percent = 0;
                }
                if (!this.cache[percent]) {
                    this.cache[percent] = {
                        class: 'progress-bar progress-bar-success',
-                        style: `width: ${parseInt(percent)}%`,
+                        style: `width: ${parseInt(percent)+1}%`,
                        percent,
                    }
                    if (percent < 80) {
@@ -281,8 +279,8 @@
                            const lastActive = new Date(ns.LastActive).getTime()
                            data.servers[i].live = data.now - lastActive <= 10 * 1000;
                        }
-                    }
-                    this.nodes = this.handleNodes(data.servers)
+                    }              
+                    this.nodes = groupingData(this.handleNodes(data.servers),"Tag");
                }
                ws.onclose = () => {
                    setTimeout(function () {
@@ -296,13 +294,14 @@
            handleNodes(servers) {
                let nodes = []
                servers?.forEach(server => {
-                    let platform = server.Host.Platform
-                    if (this.isWindowsPlatform(server.Host.Platform)) {
+                    let platform = server.Host.Platform;
+                    if (this.isWindowsPlatform(platform)) {
                        platform = "windows"
                    }else if (platform === "immortalwrt") {
                        platform = "openwrt"
                    }
                    let node = {
+                        ID: server.ID,
                        name: server.Name,
                        os: platform,
                        location: server.Host.CountryCode,
@@ -317,6 +316,7 @@
                        state: server.State,
                        host: server.Host,
                        lastActive: server.LastActive,
+                        Tag: server.Tag,
                    }
                    nodes.push(node)
                })
@@ -328,6 +328,25 @@
        }

    })
+
+    function groupingData(data, field) {
+        let map = new Map();
+        let dest = [];
+
+        data.forEach(item => {
+            if (!map.has(item[field])) {
+                dest.push({
+                    [field]: item[field],
+                    data: [item]
+                });
+                map.set(item[field], item);
+            } else {
+                dest.find(dItem => dItem[field] === item[field]).data.push(item);
+            }
+        });
+
+        return dest;
+    }
 </script>
 {{template "theme-server-status/footer" .}}
-{{end}}
+{{end}}
@@ -6,23 +6,23 @@
        <table class="table table-striped table-condensed service-status">
            <thead>
            <tr>
-                <th class="node-cell" style="min-width: 60px">🍀 {{tr "Status"}}</th>
-                <th class="node-cell" style="min-width: 60px">🚀 {{tr "Name"}}</th>
-                <th class="node-cell center">🗂 {{tr "Details"}}</th>
-                <th class="node-cell center" style="min-width: 80px">⚡️{{tr "AverageLatency"}}</th>
-                <th class="node-cell center" style="min-width: 80px">⏱️ {{tr "30DaysOnline"}}</th>
+                <th class="node-cell center" style="min-width:60px">{{tr "Status"}}</th>
+                <th class="node-cell center" style="min-width:50px">{{tr "Name"}}</th>
+                <th class="node-cell center">{{tr "Details"}}</th>
+                <th class="node-cell center" style="min-width:80px">{{tr "AverageLatency"}}</th>
+                <th class="node-cell center" style="min-width:80px">{{tr "30DaysOnline"}}</th>
            </tr>
            </thead>
            <tbody id="servers">
            <template v-for="service in services">
                <tr>
-                    <td style="text-align: left" class="node-cell">
+                    <td class="node-cell center">
                        <div class="delay-today">
                            <i class="delay-today" :class="service.health.className"></i>
                            @#service.health.text#@
                        </div>
                    </td>
-                    <td class="node-cell">@#service.name#@</td>
+                    <td class="node-cell center">@#service.name#@</td>
                    <td class="node-cell center">
                        <template v-for="(item,index) in service.dayDetail">
                            <div class="service-day-status-icon" :class="item.className"
@@ -44,7 +44,7 @@
        </table>
    </div>

-    <div class="container" style="margin-bottom: 20px;padding:unset;max-width: 95vw">
+    <div class="container" style="padding:unset;max-width: 95vw">
        {{if .CycleTransferStats}}
        <h4 style="text-align: center;">{{tr "CycleTransferStats"}}</h4>
        <div class="table-responsive content">
@@ -241,4 +241,4 @@
    })
 </script>
 {{template "theme-server-status/footer" .}}
-{{end}}
+{{end}}
@@ -14,7 +14,7 @@ NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
 NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.15.2"
+NZ_VERSION="v0.15.4"

 red='\033[0;31m'
 green='\033[0;32m'
@@ -794,11 +794,35 @@ clean_all() {
 }

 select_version() {
-    if command -v docker compose >/dev/null 2>&1; then
-        if docker compose ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            IS_DOCKER_NEZHA=1
+    DOCKER_COMPOSE_COMMAND=""
+    if docker compose version >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker compose"
+        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+            fi
+        fi
+    elif command -v docker-compose >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker-compose"
+        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+            fi
        fi
    fi
+
    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
        IS_DOCKER_NEZHA=0
    else
@@ -1097,4 +1121,4 @@ if [[ $# > 0 ]]; then
 else
    select_version
    show_menu
-fi
+fi
@@ -14,7 +14,7 @@ NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
 NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.15.2"
+NZ_VERSION="v0.15.4"

 red='\033[0;31m'
 green='\033[0;32m'
@@ -792,11 +792,35 @@ clean_all() {
 }

 select_version() {
-    if command -v docker compose >/dev/null 2>&1; then
-        if docker compose ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
-            IS_DOCKER_NEZHA=1
+    DOCKER_COMPOSE_COMMAND=""
+    if docker compose version >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker compose"
+        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "Docker image with nezha-dashboard repository exists:"
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "No Docker images with the nezha-dashboard repository were found."
+            fi
+        fi
+    elif command -v docker-compose >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker-compose"
+        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "Docker image with nezha-dashboard repository exists:"
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "No Docker images with the nezha-dashboard repository were found."
+            fi
        fi
    fi
+
    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
        IS_DOCKER_NEZHA=0
    else
@@ -1093,4 +1117,4 @@ if [[ $# > 0 ]]; then
 else
    select_version
    show_menu
-fi
+fi
Author	SHA1	Message	Date
naiba	83efdc6258	replace statifile cdn with bytedance cdn	2023-12-11 21:53:56 +08:00
github-actions[bot]	bf58ad24b5	update contributors[no ci]	2023-12-08 13:17:02 +00:00
spiritlhl	53581d48fc	更新判断面板是否是通过docker安装的逻辑 (#311 ) * 更新判断面板是否是通过docker安装的逻辑 * Updated logic for determining whether a panel is installed via docker or not	2023-12-08 21:16:36 +08:00
naiba	b00a00e791	Add comment about missing riscv64 image in latest Alpine image	2023-12-08 09:55:17 +08:00
github-actions[bot]	b91f29077c	update contributors[no ci]	2023-12-07 13:59:01 +00:00
nap0oandSuperHsiao	99111a3115	improve server-status theme (#310 ) * Add files via upload * Add files via upload * Add files via upload * improve theme-server-status 1.前台分组展示agent 2.一些小优化 --------- Co-authored-by: SuperHsiao <[email protected]>	2023-12-07 21:58:42 +08:00
github-actions[bot]	30652c3d79	update contributors[no ci]	2023-12-07 13:41:51 +00:00
Mmx	ac0103a1ee	Improve: use alpine as dockerfile base image (#309 ) * build: use alpine as base image * build: use alpine edge instead of latest	2023-12-07 21:41:26 +08:00
github-actions[bot]	f59b31590e	update contributors[no ci]	2023-12-06 14:42:42 +00:00
Applexad	1bcddf1944	installer: fix docker compose command determination (#307 )	2023-12-06 22:42:22 +08:00
卖女孩的小火柴	d790ca04d6	Fix select_version (#306 )	2023-12-06 21:35:24 +08:00
github-actions[bot]	2106ca41e1	update contributors[no ci]	2023-12-06 01:35:54 +00:00
Mmx	927bf13ce4	fix: field name "VerifySSL" to "SkipVerifySSL" in Transport config (#305 )	2023-12-06 09:35:38 +08:00
github-actions[bot]	859e263815	update contributors[no ci]	2023-12-05 15:23:19 +00:00