improve: status-server主题network页 (#422 )

Default主题fixbug (#421 )
* default主题fixbug 1.补上误删的网页title 2.修复network页纵坐标数值显示不全 3.修复network，多个legend导致的遮挡主图表问题 * fix * fix * fix * fix * fix * fix
2024-09-11 21:50:40 +08:00 · 2024-09-07 14:44:30 +08:00 · 2024-09-06 15:31:54 +00:00 · 2024-09-06 23:31:38 +08:00 · 2024-09-03 08:54:07 +08:00 · 2024-09-02 23:19:43 +08:00
49 changed files with 1201 additions and 726 deletions
@@ -4,54 +4,138 @@ on:
  push:
    tags:
      - "v*"
-  workflow_dispatch:

 jobs:
-  release:
+  build:
+    strategy:
+      fail-fast: true
+      matrix:
+        goos: [linux, windows]
+        goarch: [amd64]
+        include:
+          - goos: linux
+            goarch: s390x
+          - goos: linux
+            goarch: arm64
+            
+    name: Build artifacts
    runs-on: ubuntu-latest
+    container:
+      image: goreleaser/goreleaser-cross:v1.21
+    env:
+      GOOS: ${{ matrix.goos }}
+      GOARCH: ${{ matrix.goarch }}
+      GOARM: ${{ matrix.goarm }}
+    outputs:
+      tag_name: ${{ steps.extract_branch.outputs.tag }}
    steps:
+      - run: git config --global --add safe.directory /__w/nezha/nezha
      - uses: actions/checkout@v4

      - name: Fetch IPInfo GeoIP Database
-        env: 
+        if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+        env:
          IPINFO_TOKEN: ${{ secrets.IPINFO_TOKEN }}
        run: |
          rm pkg/geoip/geoip.db
-          wget -O pkg/geoip/geoip.db https://ipinfo.io/data/free/country.mmdb?token=${IPINFO_TOKEN}
+          wget -qO pkg/geoip/geoip.db https://ipinfo.io/data/free/country.mmdb?token=${IPINFO_TOKEN}
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21.x"
+     
+      - name: Build
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: build --single-target --clean --skip=validate
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dashboard-${{ env.GOOS }}-${{ env.GOARCH }}
+          path: |
+            ./dist/*/*
+
+  release:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    needs: build
+    name: Release
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./assets
+
+      - name: Archive and compress binaries
+        run: |
+          for file in assets/*/*/*; do
+            if [ -f "$file" ]; then
+              chmod +x "$file"
+              zip -jr "$file.zip" "$file"
+            fi
+          done
+
+      - name: Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "assets/*/*/*.zip"
+          generateReleaseNotes: true
+
+      - name: Purge jsdelivr cache
+        run: |
+          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/install.sh
+          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/nezha-agent.service
+          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/docker-compose.yaml
+          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/config.yaml
+          LOWER_USERNAME=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/install.sh
+          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/nezha-agent.service
+          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/docker-compose.yaml
+          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/config.yaml
+
+      - name: Trigger sync
+        env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          GH_DEBUG: api
+        run: |
+          gh workflow run sync-release.yml
+
+  release-docker:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    needs: build
+    name: Release Docker images
+    steps:
+      - uses: actions/checkout@v4
+        
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./assets
+
+      - name: Fix permissions
+        run: |
+          chmod -R +x ./assets/*
+          mkdir dist
+          mv ./assets/*/*/* ./dist

      - name: Extract branch name
        run: |
          export TAG_NAME=$(echo ${GITHUB_REF#refs/tags/})
          echo "tag=$TAG_NAME" >> $GITHUB_OUTPUT
        id: extract_branch
-
-      - name: xgo build
-        uses: crazy-max/ghaction-xgo@v2
-        with:
-          xgo_version: latest
-          go_version: 1.21.x
-          dest: dist
-          pkg: cmd/dashboard
-          prefix: dashboard
-          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64,windows/amd64,windows/386,windows/arm64 # linux/386,
-          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
-
-      - name: fix dist
-        run: |
-          ls -al dist/
-          mv dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
-
-      - name: Log in to the GHCR
+         
+      - name: Log into GHCR
        uses: docker/login-action@master
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}

      - name: Log in to the AliyunCS
        uses: docker/login-action@master
@@ -68,13 +152,13 @@ jobs:

      - name: Set up image name
        run: |
-          GHRC_IMAGE_NAME=$(echo "ghcr.io/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]')
+          GHCR_IMAGE_NAME=$(echo "ghcr.io/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]')
          if [ ${{ github.repository_owner }} = "naiba" ]
            then ALI_IMAGE_NAME=$(echo "registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard")
            else ALI_IMAGE_NAME=$(echo "registry.cn-shanghai.aliyuncs.com/${{ github.repository_owner }}/nezha-dashboard" | tr '[:upper:]' '[:lower:]')
          fi
-          echo "::set-output name=GHRC_IMAGE_NAME::$GHRC_IMAGE_NAME"
-          echo "::set-output name=ALI_IMAGE_NAME::$ALI_IMAGE_NAME"
+          echo "GHCR_IMAGE_NAME=$GHCR_IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "ALI_IMAGE_NAME=$ALI_IMAGE_NAME" >> $GITHUB_OUTPUT
        id: image-name

      - name: Build dasbboard image And Push
@@ -82,49 +166,10 @@ jobs:
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm,linux/s390x,linux/riscv64 # linux/386,
+          platforms: linux/amd64,linux/arm64,linux/s390x
          push: true
          tags: |
-            ${{ steps.image-name.outputs.GHRC_IMAGE_NAME }}:latest
-            ${{ steps.image-name.outputs.GHRC_IMAGE_NAME }}:${{ steps.extract_branch.outputs.tag }}
+            ${{ steps.image-name.outputs.GHCR_IMAGE_NAME }}:latest
+            ${{ steps.image-name.outputs.GHCR_IMAGE_NAME }}:${{ steps.extract_branch.outputs.tag }}
            ${{ steps.image-name.outputs.ALI_IMAGE_NAME }}:latest
            ${{ steps.image-name.outputs.ALI_IMAGE_NAME }}:${{ steps.extract_branch.outputs.tag }}
-
-      - name: Compress dist files
-        run: |
-          for file in dist/*; do
-            if [ -f "$file" ]; then
-              zip -r "$file.zip" "$file"
-            fi
-          done
-
-      - name: Release
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: "dist/*.zip"
-          generateReleaseNotes: true
-
-      - name: Purge jsdelivr cache
-        run: |
-          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/install.sh
-          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/nezha-agent.service
-          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/docker-compose.yaml
-          curl -s https://purge.jsdelivr.net/gh/${{ github.repository_owner }}/nezha@master/script/config.yaml
-          LOWER_USERNAME=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
-          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/install.sh
-          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/nezha-agent.service
-          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/docker-compose.yaml
-          curl -s https://purge.jsdelivr.net/gh/$LOWER_USERNAME/nezha@master/script/config.yaml
-
-      - name: Trigger sync
-        if: ${{ env.SYNCED == 0 }}
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            await github.rest.actions.createWorkflowDispatch({
-            owner: 'naiba',
-            repo: 'nezha',
-            workflow_id: 'sync-release.yml',
-            ref: 'master'
-            })
@@ -1,43 +0,0 @@
-name: Run Tests on PR
-
-on:
-  pull_request:
-    branches:
-      - master
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: "^1.21.3"
-      - name: Unit test
-        run: |
-          go test -v ./...
-      - name: Run Gosec Security Scanner
-        uses: securego/gosec@master
-        with:
-          args: --exclude=G104,G402 ./...
-      - name: xgo build
-        uses: crazy-max/ghaction-xgo@v2
-        with:
-          xgo_version: latest
-          go_version: 1.21.x
-          dest: dist
-          pkg: cmd/dashboard
-          prefix: dashboard
-          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64,windows/amd64,windows/386,windows/arm64 # linux/386,
-          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
-      - name: fix dist
-        run: |
-          ls -al dist/
-          mv dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
-
@@ -10,40 +10,36 @@ on:
      - "go.sum"
      - "resource/**"
      - ".github/workflows/test.yml"
+  pull_request:
+    branches:
+      - master

 jobs:
  tests:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu, windows, macos]
+        
+    runs-on: ${{ matrix.os }}-latest
    env:
      GO111MODULE: on
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+        
+      - uses: actions/setup-go@v5
        with:
-          go-version: "^1.21.3"
+          go-version: "1.21.x"
+          
      - name: Unit test
        run: |
          go test -v ./...
+          
+      - name: Build test
+        run: go build -v ./cmd/dashboard
+          
      - name: Run Gosec Security Scanner
+        if: runner.os == 'Linux'
        uses: securego/gosec@master
        with:
          args: --exclude=G104,G402 ./...
-      - name: xgo build
-        uses: crazy-max/ghaction-xgo@v2
-        with:
-          xgo_version: latest
-          go_version: 1.21.x
-          dest: dist
-          pkg: cmd/dashboard
-          prefix: dashboard
-          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64,windows/amd64,windows/386,windows/arm64 # linux/386,
-          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
-      - name: fix dist
-        run: |
-          ls -al dist/
-          mv dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
@@ -0,0 +1,71 @@
+version: 2
+before:
+  hooks:
+    - go mod tidy -v
+builds:
+  - id: linux_arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+    ldflags:
+      - -s -w
+      - -X github.com/naiba/nezha/service/singleton.Version={{.Version}}
+      - -extldflags "-static -fpic"
+    flags:
+      - -trimpath
+    goos:
+      - linux
+    goarch:
+      - arm64
+    main: ./cmd/dashboard
+    binary: dashboard-{{ .Os }}-{{ .Arch }}
+  - id: linux_amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-linux-gnu-gcc
+    ldflags:
+      - -s -w
+      - -X github.com/naiba/nezha/service/singleton.Version={{.Version}}
+      - -extldflags "-static -fpic"
+    flags:
+      - -trimpath
+    goos:
+      - linux
+    goarch:
+      - amd64
+    main: ./cmd/dashboard
+    binary: dashboard-{{ .Os }}-{{ .Arch }}
+  - id: linux_s390x
+    env:
+      - CGO_ENABLED=1
+      - CC=s390x-linux-gnu-gcc
+    ldflags:
+      - -s -w
+      - -X github.com/naiba/nezha/service/singleton.Version={{.Version}}
+      - -extldflags "-static -fpic"
+    flags:
+      - -trimpath
+    goos:
+      - linux
+    goarch:
+      - s390x
+    main: ./cmd/dashboard
+    binary: dashboard-{{ .Os }}-{{ .Arch }}
+  - id: windows_amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-w64-mingw32-gcc
+    ldflags:
+      - -s -w
+      - -X github.com/naiba/nezha/service/singleton.Version={{.Version}}
+      - -extldflags "-static -fpic"
+    flags:
+      - -trimpath
+    goos:
+      - windows
+    goarch:
+      - amd64
+    main: ./cmd/dashboard
+    binary: dashboard-{{ .Os }}-{{ .Arch }}
+snapshot:
+  version_template: "dashboard"
@@ -1,16 +1,12 @@
-# latest 镜像还没有 riscv64 https://hub.docker.com/_/alpine/tags
-FROM alpine:edge
+FROM alpine AS certs
+RUN apk update && apk add ca-certificates
+
+FROM busybox:stable-musl

 ARG TARGETOS
 ARG TARGETARCH

-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/*
-
+COPY --from=certs /etc/ssl/certs /etc/ssl/certs
 COPY ./script/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

@@ -19,4 +15,6 @@ COPY dist/dashboard-${TARGETOS}-${TARGETARCH} ./app

 VOLUME ["/dashboard/data"]
 EXPOSE 80 5555
+ARG TZ=Asia/Shanghai
+ENV TZ=$TZ
 ENTRYPOINT ["/entrypoint.sh"]
@@ -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.18.3-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.19.0-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>
@@ -44,8 +44,8 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/AkkiaS7" title="Akkia"><img src="https://avatars.githubusercontent.com/u/68485070?v=4" width="50;" alt="Akkia"/></a>
 <a href="https://github.com/Erope" title="卖女孩的小火柴"><img src="https://avatars.githubusercontent.com/u/44471469?v=4" width="50;" alt="卖女孩的小火柴"/></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/dysf888" title="黑歌"><img src="https://avatars.githubusercontent.com/u/47450409?v=4" width="50;" alt="黑歌"/></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/dysf888" title="黑歌"><img src="https://avatars.githubusercontent.com/u/47450409?v=4" width="50;" alt="黑歌"/></a>
 <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>
@@ -1,7 +1,6 @@
 package controller

 import (
-	"encoding/json"
 	"fmt"
 	"html/template"
 	"io/fs"
@@ -277,7 +276,7 @@ func natGateway(c *gin.Context) {
 	rpc.NezhaHandlerSingleton.CreateStream(streamId)
 	defer rpc.NezhaHandlerSingleton.CloseStream(streamId)

-	taskData, err := json.Marshal(model.TaskNAT{
+	taskData, err := utils.Json.Marshal(model.TaskNAT{
 		StreamID: streamId,
 		Host:     natConfig.Host,
 	})
@@ -2,7 +2,6 @@ package controller

 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -199,7 +198,7 @@ func (oa *oauth2controller) callback(c *gin.Context) {
 			if err == nil {
 				defer resp.Body.Close()
 				var cloudflareUserInfo *cloudflare.UserInfo
-				if err := json.NewDecoder(resp.Body).Decode(&cloudflareUserInfo); err == nil {
+				if err := utils.Json.NewDecoder(resp.Body).Decode(&cloudflareUserInfo); err == nil {
 					user = cloudflareUserInfo.MapToNezhaUser()
 				}
 			}
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"time"
+	_ "time/tzdata"

 	"github.com/naiba/nezha/cmd/dashboard/controller"
 	"github.com/naiba/nezha/cmd/dashboard/rpc"
@@ -1,6 +1,7 @@
 package model

 import (
+	"slices"
 	"strings"
 	"time"

@@ -44,19 +45,6 @@ func percentage(used, total uint64) float64 {
 	return float64(used) * 100 / float64(total)
 }

-func maxSliceValue(slice []float64) float64 {
-	if len(slice) != 0 {
-		max := slice[0]
-		for _, val := range slice {
-			if max < val {
-				max = val
-			}
-		}
-		return max
-	}
-	return 0
-}
-
 // Snapshot 未通过规则返回 struct{}{}, 通过返回 nil
 func (u *Rule) Snapshot(cycleTransferStats *CycleTransferStats, server *Server, db *gorm.DB) interface{} {
 	// 监控全部但是排除了此服务器
@@ -145,7 +133,7 @@ func (u *Rule) Snapshot(cycleTransferStats *CycleTransferStats, server *Server,
 					temp = append(temp, tempStat.Temperature)
 				}
 			}
-			src = maxSliceValue(temp)
+			src = slices.Max(temp)
 		}
 	}

@@ -2,169 +2,217 @@ package ddns

 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
+	"net/url"
+
+	"github.com/naiba/nezha/pkg/utils"
 )

+const baseEndpoint = "https://api.cloudflare.com/client/v4/zones"
+
 type ProviderCloudflare struct {
-	Secret string
+	secret       string
+	zoneId       string
+	recordId     string
+	domainConfig *DomainConfig
 }

-func (provider *ProviderCloudflare) UpdateDomain(domainConfig *DomainConfig) bool {
-	if domainConfig == nil {
-		return false
-	}
+type cfReq struct {
+	Name    string `json:"name"`
+	Type    string `json:"type"`
+	Content string `json:"content"`
+	TTL     uint32 `json:"ttl"`
+	Proxied bool   `json:"proxied"`
+}

-	zoneID, err := provider.getZoneID(domainConfig.FullDomain)
+type cfResp struct {
+	Result []struct {
+		ID   string `json:"id"`
+		Name string `json:"name"`
+	} `json:"result"`
+}
+
+func NewProviderCloudflare(s string) *ProviderCloudflare {
+	return &ProviderCloudflare{
+		secret: s,
+	}
+}
+
+func (provider *ProviderCloudflare) UpdateDomain(domainConfig *DomainConfig) error {
+	if domainConfig == nil {
+		return fmt.Errorf("获取 DDNS 配置失败")
+	}
+	provider.domainConfig = domainConfig
+
+	err := provider.getZoneID()
 	if err != nil {
-		log.Printf("无法获取 zone ID: %s\n", err)
-		return false
+		return fmt.Errorf("无法获取 zone ID: %s", err)
 	}

 	// 当IPv4和IPv6同时成功才算作成功
-	var resultV4 = true
-	var resultV6 = true
-	if domainConfig.EnableIPv4 {
-		if !provider.addDomainRecord(zoneID, domainConfig, true) {
-			resultV4 = false
+	if provider.domainConfig.EnableIPv4 {
+		if err = provider.addDomainRecord(true); err != nil {
+			return err
 		}
 	}

-	if domainConfig.EnableIpv6 {
-		if !provider.addDomainRecord(zoneID, domainConfig, false) {
-			resultV6 = false
+	if provider.domainConfig.EnableIpv6 {
+		if err = provider.addDomainRecord(false); err != nil {
+			return err
 		}
 	}

-	return resultV4 && resultV6
+	return nil
 }

-func (provider *ProviderCloudflare) addDomainRecord(zoneID string, domainConfig *DomainConfig, isIpv4 bool) bool {
-	record, err := provider.findDNSRecord(zoneID, domainConfig.FullDomain, isIpv4)
+func (provider *ProviderCloudflare) addDomainRecord(isIpv4 bool) error {
+	err := provider.findDNSRecord(isIpv4)
 	if err != nil {
-		log.Printf("查找 DNS 记录时出错: %s\n", err)
-		return false
+		return fmt.Errorf("查找 DNS 记录时出错: %s", err)
 	}

-	if record == nil {
+	if provider.recordId == "" {
 		// 添加 DNS 记录
-		return provider.createDNSRecord(zoneID, domainConfig, isIpv4)
+		return provider.createDNSRecord(isIpv4)
 	} else {
 		// 更新 DNS 记录
-		return provider.updateDNSRecord(zoneID, record["id"].(string), domainConfig, isIpv4)
+		return provider.updateDNSRecord(isIpv4)
 	}
 }

-func (provider *ProviderCloudflare) getZoneID(domain string) (string, error) {
-	_, realDomain := SplitDomain(domain)
-	url := fmt.Sprintf("https://api.cloudflare.com/client/v4/zones?name=%s", realDomain)
-	body, err := provider.sendRequest("GET", url, nil)
+func (provider *ProviderCloudflare) getZoneID() error {
+	_, realDomain := splitDomain(provider.domainConfig.FullDomain)
+	zu, _ := url.Parse(baseEndpoint)
+
+	q := zu.Query()
+	q.Set("name", realDomain)
+	zu.RawQuery = q.Encode()
+
+	body, err := provider.sendRequest("GET", zu.String(), nil)
 	if err != nil {
-		return "", err
+		return err
 	}

-	var res map[string]interface{}
-	err = json.Unmarshal(body, &res)
+	res := &cfResp{}
+	err = utils.Json.Unmarshal(body, res)
 	if err != nil {
-		return "", err
+		return err
 	}

-	result := res["result"].([]interface{})
+	result := res.Result
 	if len(result) > 0 {
-		zoneID := result[0].(map[string]interface{})["id"].(string)
-		return zoneID, nil
+		provider.zoneId = result[0].ID
+		return nil
 	}

-	return "", fmt.Errorf("找不到 Zone ID")
+	return fmt.Errorf("找不到 Zone ID")
 }

-func (provider *ProviderCloudflare) findDNSRecord(zoneID string, domain string, isIPv4 bool) (map[string]interface{}, error) {
-	var ipType = "A"
-	if !isIPv4 {
+func (provider *ProviderCloudflare) findDNSRecord(isIPv4 bool) error {
+	var ipType string
+	if isIPv4 {
+		ipType = "A"
+	} else {
 		ipType = "AAAA"
 	}
-	url := fmt.Sprintf("https://api.cloudflare.com/client/v4/zones/%s/dns_records?type=%s&name=%s", zoneID, ipType, domain)
-	body, err := provider.sendRequest("GET", url, nil)
+
+	de, _ := url.JoinPath(baseEndpoint, provider.zoneId, "dns_records")
+	du, _ := url.Parse(de)
+
+	q := du.Query()
+	q.Set("name", provider.domainConfig.FullDomain)
+	q.Set("type", ipType)
+	du.RawQuery = q.Encode()
+
+	body, err := provider.sendRequest("GET", du.String(), nil)
 	if err != nil {
-		return nil, err
+		return err
 	}

-	var res map[string]interface{}
-	err = json.Unmarshal(body, &res)
+	res := &cfResp{}
+	err = utils.Json.Unmarshal(body, res)
 	if err != nil {
-		return nil, err
+		return err
 	}

-	result := res["result"].([]interface{})
+	result := res.Result
 	if len(result) > 0 {
-		return result[0].(map[string]interface{}), nil
+		provider.recordId = result[0].ID
+		return nil
 	}

-	return nil, nil // 没有找到 DNS 记录
+	return nil
 }

-func (provider *ProviderCloudflare) createDNSRecord(zoneID string, domainConfig *DomainConfig, isIPv4 bool) bool {
-	var ipType = "A"
-	var ipAddr = domainConfig.Ipv4Addr
-	if !isIPv4 {
+func (provider *ProviderCloudflare) createDNSRecord(isIPv4 bool) error {
+	var ipType, ipAddr string
+	if isIPv4 {
+		ipType = "A"
+		ipAddr = provider.domainConfig.Ipv4Addr
+	} else {
 		ipType = "AAAA"
-		ipAddr = domainConfig.Ipv6Addr
+		ipAddr = provider.domainConfig.Ipv6Addr
 	}
-	url := fmt.Sprintf("https://api.cloudflare.com/client/v4/zones/%s/dns_records", zoneID)
-	data := map[string]interface{}{
-		"type":    ipType,
-		"name":    domainConfig.FullDomain,
-		"content": ipAddr,
-		"ttl":     60,
-		"proxied": false,
+
+	de, _ := url.JoinPath(baseEndpoint, provider.zoneId, "dns_records")
+	data := &cfReq{
+		Name:    provider.domainConfig.FullDomain,
+		Type:    ipType,
+		Content: ipAddr,
+		TTL:     60,
+		Proxied: false,
 	}
-	jsonData, _ := json.Marshal(data)
-	_, err := provider.sendRequest("POST", url, jsonData)
-	return err == nil
+
+	jsonData, _ := utils.Json.Marshal(data)
+	_, err := provider.sendRequest("POST", de, jsonData)
+	return err
 }

-func (provider *ProviderCloudflare) updateDNSRecord(zoneID string, recordID string, domainConfig *DomainConfig, isIPv4 bool) bool {
-	var ipType = "A"
-	var ipAddr = domainConfig.Ipv4Addr
-	if !isIPv4 {
+func (provider *ProviderCloudflare) updateDNSRecord(isIPv4 bool) error {
+	var ipType, ipAddr string
+	if isIPv4 {
+		ipType = "A"
+		ipAddr = provider.domainConfig.Ipv4Addr
+	} else {
 		ipType = "AAAA"
-		ipAddr = domainConfig.Ipv6Addr
+		ipAddr = provider.domainConfig.Ipv6Addr
 	}
-	url := fmt.Sprintf("https://api.cloudflare.com/client/v4/zones/%s/dns_records/%s", zoneID, recordID)
-	data := map[string]interface{}{
-		"type":    ipType,
-		"name":    domainConfig.FullDomain,
-		"content": ipAddr,
-		"ttl":     60,
-		"proxied": false,
+
+	de, _ := url.JoinPath(baseEndpoint, provider.zoneId, "dns_records", provider.recordId)
+	data := &cfReq{
+		Name:    provider.domainConfig.FullDomain,
+		Type:    ipType,
+		Content: ipAddr,
+		TTL:     60,
+		Proxied: false,
 	}
-	jsonData, _ := json.Marshal(data)
-	_, err := provider.sendRequest("PATCH", url, jsonData)
-	return err == nil
+
+	jsonData, _ := utils.Json.Marshal(data)
+	_, err := provider.sendRequest("PATCH", de, jsonData)
+	return err
 }

 // 以下为辅助方法，如发送 HTTP 请求等
 func (provider *ProviderCloudflare) sendRequest(method string, url string, data []byte) ([]byte, error) {
-	client := &http.Client{}
 	req, err := http.NewRequest(method, url, bytes.NewBuffer(data))
 	if err != nil {
 		return nil, err
 	}

-	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", provider.Secret))
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", provider.secret))
 	req.Header.Add("Content-Type", "application/json")

-	resp, err := client.Do(req)
+	resp, err := utils.HttpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
 	defer func(Body io.ReadCloser) {
 		err := Body.Close()
 		if err != nil {
-			log.Printf("NEZHA>> 无法关闭HTTP响应体流: %s\n", err.Error())
+			log.Printf("NEZHA>> 无法关闭HTTP响应体流: %s", err.Error())
 		}
 	}(resp.Body)

@@ -1,5 +1,7 @@
 package ddns

+import "golang.org/x/net/publicsuffix"
+
 type DomainConfig struct {
 	EnableIPv4 bool
 	EnableIpv6 bool
@@ -10,5 +12,11 @@ type DomainConfig struct {

 type Provider interface {
 	// UpdateDomain Return is updated
-	UpdateDomain(domainConfig *DomainConfig) bool
+	UpdateDomain(*DomainConfig) error
+}
+
+func splitDomain(domain string) (prefix string, realDomain string) {
+	realDomain, _ = publicsuffix.EffectiveTLDPlusOne(domain)
+	prefix = domain[:len(domain)-len(realDomain)-1]
+	return prefix, realDomain
 }
@@ -2,6 +2,6 @@ package ddns

 type ProviderDummy struct{}

-func (provider *ProviderDummy) UpdateDomain(domainConfig *DomainConfig) bool {
-	return false
+func (provider *ProviderDummy) UpdateDomain(domainConfig *DomainConfig) error {
+	return nil
 }
@@ -1,40 +0,0 @@
-package ddns
-
-import (
-	"golang.org/x/net/publicsuffix"
-	"net/http"
-	"strings"
-)
-
-func (provider ProviderWebHook) FormatWebhookString(s string, config *DomainConfig, ipType string) string {
-	if config == nil {
-		return s
-	}
-
-	result := strings.TrimSpace(s)
-	result = strings.Replace(s, "{ip}", config.Ipv4Addr, -1)
-	result = strings.Replace(result, "{domain}", config.FullDomain, -1)
-	result = strings.Replace(result, "{type}", ipType, -1)
-	// remove \r
-	result = strings.Replace(result, "\r", "", -1)
-	return result
-}
-
-func SetStringHeadersToRequest(req *http.Request, headers []string) {
-	if req == nil {
-		return
-	}
-	for _, element := range headers {
-		kv := strings.SplitN(element, ":", 2)
-		if len(kv) == 2 {
-			req.Header.Add(kv[0], kv[1])
-		}
-	}
-}
-
-// SplitDomain 分割域名为前缀和一级域名
-func SplitDomain(domain string) (prefix string, realDomain string) {
-	realDomain, _ = publicsuffix.EffectiveTLDPlusOne(domain)
-	prefix = domain[:len(domain)-len(realDomain)-1]
-	return prefix, realDomain
-}
@@ -5,145 +5,180 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/hex"
-	"encoding/json"
+	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/naiba/nezha/pkg/utils"
 )

-const (
-	url = "https://dnspod.tencentcloudapi.com"
-)
+const te = "https://dnspod.tencentcloudapi.com"

 type ProviderTencentCloud struct {
-	SecretID  string
-	SecretKey string
+	secretID     string
+	secretKey    string
+	domainConfig *DomainConfig
+	resp         *tcResp
 }

-func (provider *ProviderTencentCloud) UpdateDomain(domainConfig *DomainConfig) bool {
-	if domainConfig == nil {
-		return false
+type tcReq struct {
+	RecordType string `json:"RecordType"`
+	Domain     string `json:"Domain"`
+	RecordLine string `json:"RecordLine"`
+	Subdomain  string `json:"Subdomain,omitempty"`
+	SubDomain  string `json:"SubDomain,omitempty"` // As is
+	Value      string `json:"Value,omitempty"`
+	TTL        uint32 `json:"TTL,omitempty"`
+	RecordId   uint64 `json:"RecordId,omitempty"`
+}
+
+type tcResp struct {
+	Response struct {
+		RecordList []struct {
+			RecordId uint64
+			Value    string
+		}
+		Error struct {
+			Code string
+		}
 	}
+}
+
+func NewProviderTencentCloud(id, key string) *ProviderTencentCloud {
+	return &ProviderTencentCloud{
+		secretID:  id,
+		secretKey: key,
+	}
+}
+
+func (provider *ProviderTencentCloud) UpdateDomain(domainConfig *DomainConfig) error {
+	if domainConfig == nil {
+		return fmt.Errorf("获取 DDNS 配置失败")
+	}
+	provider.domainConfig = domainConfig

 	// 当IPv4和IPv6同时成功才算作成功
-	var resultV4 = true
-	var resultV6 = true
-	if domainConfig.EnableIPv4 {
-		if !provider.addDomainRecord(domainConfig, true) {
-			resultV4 = false
+	var err error
+	if provider.domainConfig.EnableIPv4 {
+		if err = provider.addDomainRecord(true); err != nil {
+			return err
 		}
 	}

-	if domainConfig.EnableIpv6 {
-		if !provider.addDomainRecord(domainConfig, false) {
-			resultV6 = false
+	if provider.domainConfig.EnableIpv6 {
+		if err = provider.addDomainRecord(false); err != nil {
+			return err
 		}
 	}

-	return resultV4 && resultV6
+	return err
 }

-func (provider *ProviderTencentCloud) addDomainRecord(domainConfig *DomainConfig, isIpv4 bool) bool {
-	record, err := provider.findDNSRecord(domainConfig.FullDomain, isIpv4)
+func (provider *ProviderTencentCloud) addDomainRecord(isIpv4 bool) error {
+	err := provider.findDNSRecord(isIpv4)
 	if err != nil {
-		log.Printf("查找 DNS 记录时出错: %s\n", err)
-		return false
+		return fmt.Errorf("查找 DNS 记录时出错: %s", err)
 	}

-	if errResponse, ok := record["Error"].(map[string]interface{}); ok {
-		if errCode, ok := errResponse["Code"].(string); ok && errCode == "ResourceNotFound.NoDataOfRecord" { // 没有找到 DNS 记录
-			// 添加 DNS 记录
-			return provider.createDNSRecord(domainConfig.FullDomain, domainConfig, isIpv4)
-		} else {
-			log.Printf("查询 DNS 记录时出错，错误代码为: %s\n", errCode)
-		}
+	if provider.resp.Response.Error.Code == "ResourceNotFound.NoDataOfRecord" { // 没有找到 DNS 记录
+		return provider.createDNSRecord(isIpv4)
+	} else if provider.resp.Response.Error.Code != "" {
+		return fmt.Errorf("查询 DNS 记录时出错，错误代码为: %s", provider.resp.Response.Error.Code)
 	}

 	// 默认情况下更新 DNS 记录
-	return provider.updateDNSRecord(domainConfig.FullDomain, record["RecordList"].([]interface{})[0].(map[string]interface{})["RecordId"].(float64), domainConfig, isIpv4)
+	return provider.updateDNSRecord(isIpv4)
 }

-func (provider *ProviderTencentCloud) findDNSRecord(domain string, isIPv4 bool) (map[string]interface{}, error) {
-	var ipType = "A"
-	if !isIPv4 {
+func (provider *ProviderTencentCloud) findDNSRecord(isIPv4 bool) error {
+	var ipType string
+	if isIPv4 {
+		ipType = "A"
+	} else {
 		ipType = "AAAA"
 	}
-	_, realDomain := SplitDomain(domain)
-	prefix, _ := SplitDomain(domain)
-	data := map[string]interface{}{
-		"RecordType": ipType,
-		"Domain":     realDomain,
-		"RecordLine": "默认",
-		"Subdomain":  prefix,
+
+	prefix, realDomain := splitDomain(provider.domainConfig.FullDomain)
+	data := &tcReq{
+		RecordType: ipType,
+		Domain:     realDomain,
+		RecordLine: "默认",
+		Subdomain:  prefix,
 	}
-	jsonData, _ := json.Marshal(data)
+
+	jsonData, _ := utils.Json.Marshal(data)
 	body, err := provider.sendRequest("DescribeRecordList", jsonData)
 	if err != nil {
-		return nil, err
+		return err
 	}

-	var res map[string]interface{}
-	err = json.Unmarshal(body, &res)
+	provider.resp = &tcResp{}
+	err = utils.Json.Unmarshal(body, provider.resp)
 	if err != nil {
-		return nil, err
+		return err
 	}

-	result := res["Response"].(map[string]interface{})
-	return result, nil
+	return nil
 }

-func (provider *ProviderTencentCloud) createDNSRecord(domain string, domainConfig *DomainConfig, isIPv4 bool) bool {
-	var ipType = "A"
-	var ipAddr = domainConfig.Ipv4Addr
-	if !isIPv4 {
+func (provider *ProviderTencentCloud) createDNSRecord(isIPv4 bool) error {
+	var ipType, ipAddr string
+	if isIPv4 {
+		ipType = "A"
+		ipAddr = provider.domainConfig.Ipv4Addr
+	} else {
 		ipType = "AAAA"
-		ipAddr = domainConfig.Ipv6Addr
+		ipAddr = provider.domainConfig.Ipv6Addr
 	}
-	_, realDomain := SplitDomain(domain)
-	prefix, _ := SplitDomain(domain)
-	data := map[string]interface{}{
-		"RecordType": ipType,
-		"RecordLine": "默认",
-		"Domain":     realDomain,
-		"SubDomain":  prefix,
-		"Value":      ipAddr,
-		"TTL":        600,
+
+	prefix, realDomain := splitDomain(provider.domainConfig.FullDomain)
+	data := &tcReq{
+		RecordType: ipType,
+		RecordLine: "默认",
+		Domain:     realDomain,
+		SubDomain:  prefix,
+		Value:      ipAddr,
+		TTL:        600,
 	}
-	jsonData, _ := json.Marshal(data)
+
+	jsonData, _ := utils.Json.Marshal(data)
 	_, err := provider.sendRequest("CreateRecord", jsonData)
-	return err == nil
+	return err
 }

-func (provider *ProviderTencentCloud) updateDNSRecord(domain string, recordID float64, domainConfig *DomainConfig, isIPv4 bool) bool {
-	var ipType = "A"
-	var ipAddr = domainConfig.Ipv4Addr
-	if !isIPv4 {
+func (provider *ProviderTencentCloud) updateDNSRecord(isIPv4 bool) error {
+	var ipType, ipAddr string
+	if isIPv4 {
+		ipType = "A"
+		ipAddr = provider.domainConfig.Ipv4Addr
+	} else {
 		ipType = "AAAA"
-		ipAddr = domainConfig.Ipv6Addr
+		ipAddr = provider.domainConfig.Ipv6Addr
 	}
-	_, realDomain := SplitDomain(domain)
-	prefix, _ := SplitDomain(domain)
-	data := map[string]interface{}{
-		"RecordType": ipType,
-		"RecordLine": "默认",
-		"Domain":     realDomain,
-		"SubDomain":  prefix,
-		"Value":      ipAddr,
-		"TTL":        600,
-		"RecordId":   recordID,
+
+	prefix, realDomain := splitDomain(provider.domainConfig.FullDomain)
+	data := &tcReq{
+		RecordType: ipType,
+		RecordLine: "默认",
+		Domain:     realDomain,
+		SubDomain:  prefix,
+		Value:      ipAddr,
+		TTL:        600,
+		RecordId:   provider.resp.Response.RecordList[0].RecordId,
 	}
-	jsonData, _ := json.Marshal(data)
+
+	jsonData, _ := utils.Json.Marshal(data)
 	_, err := provider.sendRequest("ModifyRecord", jsonData)
-	return err == nil
+	return err
 }

 // 以下为辅助方法，如发送 HTTP 请求等
 func (provider *ProviderTencentCloud) sendRequest(action string, data []byte) ([]byte, error) {
-	client := &http.Client{}
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
+	req, err := http.NewRequest("POST", te, bytes.NewBuffer(data))
 	if err != nil {
 		return nil, err
 	}
@@ -151,8 +186,8 @@ func (provider *ProviderTencentCloud) sendRequest(action string, data []byte) ([
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-TC-Version", "2021-03-23")

-	provider.signRequest(provider.SecretID, provider.SecretKey, req, action, string(data))
-	resp, err := client.Do(req)
+	provider.signRequest(provider.secretID, provider.secretKey, req, action, string(data))
+	resp, err := utils.HttpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -2,58 +2,109 @@ package ddns

 import (
 	"bytes"
-	"log"
+	"fmt"
 	"net/http"
+	"net/url"
 	"strings"
+
+	"github.com/naiba/nezha/pkg/utils"
 )

 type ProviderWebHook struct {
-	URL           string
-	RequestMethod string
-	RequestBody   string
-	RequestHeader string
+	url           string
+	requestMethod string
+	requestBody   string
+	requestHeader string
+	domainConfig  *DomainConfig
 }

-func (provider *ProviderWebHook) UpdateDomain(domainConfig *DomainConfig) bool {
+func NewProviderWebHook(s, rm, rb, rh string) *ProviderWebHook {
+	return &ProviderWebHook{
+		url:           s,
+		requestMethod: rm,
+		requestBody:   rb,
+		requestHeader: rh,
+	}
+}
+
+func (provider *ProviderWebHook) UpdateDomain(domainConfig *DomainConfig) error {
 	if domainConfig == nil {
-		return false
+		return fmt.Errorf("获取 DDNS 配置失败")
+	}
+	provider.domainConfig = domainConfig
+
+	if provider.domainConfig.FullDomain == "" {
+		return fmt.Errorf("failed to update an empty domain")
 	}

-	if domainConfig.FullDomain == "" {
-		log.Println("NEZHA>> Failed to update an empty domain")
-		return false
-	}
-	updated := false
-	client := &http.Client{}
-	if domainConfig.EnableIPv4 && domainConfig.Ipv4Addr != "" {
-		url := provider.FormatWebhookString(provider.URL, domainConfig, "ipv4")
-		body := provider.FormatWebhookString(provider.RequestBody, domainConfig, "ipv4")
-		header := provider.FormatWebhookString(provider.RequestHeader, domainConfig, "ipv4")
-		headers := strings.Split(header, "\n")
-		req, err := http.NewRequest(provider.RequestMethod, url, bytes.NewBufferString(body))
-		if err == nil && req != nil {
-			SetStringHeadersToRequest(req, headers)
-			if _, err := client.Do(req); err != nil {
-				log.Printf("NEZHA>> Failed to update a domain: %s. Cause by: %s\n", domainConfig.FullDomain, err.Error())
-			} else {
-				updated = true
-			}
+	if provider.domainConfig.EnableIPv4 && provider.domainConfig.Ipv4Addr != "" {
+		req, err := provider.prepareRequest(true)
+		if err != nil {
+			return fmt.Errorf("failed to update a domain: %s. Cause by: %v", provider.domainConfig.FullDomain, err)
+		}
+		if _, err := utils.HttpClient.Do(req); err != nil {
+			return fmt.Errorf("failed to update a domain: %s. Cause by: %v", provider.domainConfig.FullDomain, err)
 		}
 	}
-	if domainConfig.EnableIpv6 && domainConfig.Ipv6Addr != "" {
-		url := provider.FormatWebhookString(provider.URL, domainConfig, "ipv6")
-		body := provider.FormatWebhookString(provider.RequestBody, domainConfig, "ipv6")
-		header := provider.FormatWebhookString(provider.RequestHeader, domainConfig, "ipv6")
-		headers := strings.Split(header, "\n")
-		req, err := http.NewRequest(provider.RequestMethod, url, bytes.NewBufferString(body))
-		if err == nil && req != nil {
-			SetStringHeadersToRequest(req, headers)
-			if _, err := client.Do(req); err != nil {
-				log.Printf("NEZHA>> Failed to update a domain: %s. Cause by: %s\n", domainConfig.FullDomain, err.Error())
-			} else {
-				updated = true
-			}
+
+	if provider.domainConfig.EnableIpv6 && provider.domainConfig.Ipv6Addr != "" {
+		req, err := provider.prepareRequest(false)
+		if err != nil {
+			return fmt.Errorf("failed to update a domain: %s. Cause by: %v", provider.domainConfig.FullDomain, err)
+		}
+		if _, err := utils.HttpClient.Do(req); err != nil {
+			return fmt.Errorf("failed to update a domain: %s. Cause by: %v", provider.domainConfig.FullDomain, err)
 		}
 	}
-	return updated
+	return nil
+}
+
+func (provider *ProviderWebHook) prepareRequest(isIPv4 bool) (*http.Request, error) {
+	u, err := url.Parse(provider.url)
+	if err != nil {
+		return nil, fmt.Errorf("failed parsing url: %v", err)
+	}
+
+	// Only handle queries here
+	q := u.Query()
+	for p, vals := range q {
+		for n, v := range vals {
+			vals[n] = provider.formatWebhookString(v, isIPv4)
+		}
+		q[p] = vals
+	}
+
+	u.RawQuery = q.Encode()
+	body := provider.formatWebhookString(provider.requestBody, isIPv4)
+	header := provider.formatWebhookString(provider.requestHeader, isIPv4)
+	headers := strings.Split(header, "\n")
+
+	req, err := http.NewRequest(provider.requestMethod, u.String(), bytes.NewBufferString(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed creating new request: %v", err)
+	}
+
+	utils.SetStringHeadersToRequest(req, headers)
+	return req, nil
+}
+
+func (provider *ProviderWebHook) formatWebhookString(s string, isIPv4 bool) string {
+	var ipAddr, ipType string
+	if isIPv4 {
+		ipAddr = provider.domainConfig.Ipv4Addr
+		ipType = "ipv4"
+	} else {
+		ipAddr = provider.domainConfig.Ipv6Addr
+		ipType = "ipv6"
+	}
+
+	r := strings.NewReplacer(
+		"{ip}", ipAddr,
+		"{domain}", provider.domainConfig.FullDomain,
+		"{type}", ipType,
+		"\r", "",
+	)
+
+	result := r.Replace(strings.TrimSpace(s))
+	return result
 }
@@ -3,6 +3,7 @@ package utils
 import (
 	"crypto/rand"
 	"math/big"
+	"net/http"
 	"os"
 	"regexp"
 	"strings"
@@ -86,3 +87,15 @@ func Uint64SubInt64(a uint64, b int64) uint64 {
 	}
 	return a - uint64(b)
 }
+
+func SetStringHeadersToRequest(req *http.Request, headers []string) {
+	if req == nil {
+		return
+	}
+	for _, element := range headers {
+		kv := strings.SplitN(element, ":", 2)
+		if len(kv) == 2 {
+			req.Header.Add(kv[0], kv[1])
+		}
+	}
+}
@@ -653,7 +653,37 @@ other = "Disable Switch Template in Frontend"
 other = "Servers On World Map"

 [NAT]
-other = "NAT"
+other = "NAT Traversal"
+
+[LocalService]
+other = "Local service"
+
+[LocalServicePlaceholder]
+other = "192.168.1.1:80 (with port)"
+
+[BindHostname]
+other = "Bind hostname"

 [NetworkSpiterList]
-other = "Network Monitor"
+other = "Network Monitor"
+
+[Refresh]
+other = "Refresh"
+
+[CopyPath]
+other = "Copy Path"
+
+[Goto]
+other = "Go to"
+
+[GotoHeadline]
+other = "Go to a Folder"
+
+[GotoGo]
+other = "Go"
+
+[GotoClose]
+other = "Cancel"
+
+[FMError]
+other = "Agent returned an error, please view the console for details. To open a new connection, reopen the FM again."
@@ -653,7 +653,37 @@ other = "Deshabilitar Cambio de Plantilla en Frontend"
 other = "Servidores en el mapa mundial"

 [NAT]
-other = "NAT"
+other = "NAT traversal"
+
+[LocalService]
+other = "Servicio de red local"
+
+[LocalServicePlaceholder]
+other = "192.168.1.1:80 (con puerto)"
+
+[BindHostname]
+other = "Vincular nombre de host"

 [NetworkSpiterList]
-other = "Red Monitor"
+other = "Monitor de red"
+
+[Refresh]
+other = "Actualizar"
+
+[CopyPath]
+other = "Copiar ruta"
+
+[Goto]
+other = "Ir a"
+
+[GotoHeadline]
+other = "Ir a una carpeta"
+
+[GotoGo]
+other = "Ir"
+
+[GotoClose]
+other = "Cancelar"
+
+[FMError]
+other = "Agent devolvió un error, consulte la consola para obtener más detalles. Para abrir una nueva conexión, vuelva a abrir el FM."
@@ -655,5 +655,35 @@ other = "服务器世界分布图"
 [NAT]
 other = "内网穿透"

+[LocalService]
+other = "内网服务"
+
+[LocalServicePlaceholder]
+other = "192.168.1.1:80(带端口)"
+
+[BindHostname]
+other = "绑定域名"
+
 [NetworkSpiterList]
 other = "网络监控"
+
+[Refresh]
+other = "刷新"
+
+[CopyPath]
+other = "复制路径"
+
+[Goto]
+other = "跳往"
+
+[GotoHeadline]
+other = "跳往文件夹"
+
+[GotoGo]
+other = "确认"
+
+[GotoClose]
+other = "取消"
+
+[FMError]
+other = "Agent 返回了错误，请查看控制台获取详细信息。要建立新连接，请重新打开 FM。"
@@ -50,7 +50,7 @@ other = "新增計劃任務"
 other = "名稱"

 [Scheduler]
-other = "計劃"
+other = "排程"

 [BackUp]
 other = "備份"
@@ -80,37 +80,37 @@ other = "特定伺服器"
 other = "輸入ID/名稱以搜尋"

 [NotificationMethodGroup]
-other = "通知方式組"
+other = "通知群組"

 [PushSuccessMessages]
-other = "推送成功的消息"
+other = "推送成功的訊息"

 [TaskType]
 other = "任務類型"

 [CronTask]
-other = "計劃任務"
+other = "排程任務"

 [TriggerTask]
 other = "觸發任務"

 [TheFormaOfTheScheduleIs]
-other = "計劃的格式為："
+other = "排程的格式為："

 [SecondsMinutesHoursDaysMonthsWeeksSeeDetails]
 other = "秒 分 時 天 月 星期，詳情見"

 [ScheduleExpressionFormat]
-other = "計劃表達式格式"
+other = "排程表達式格式"

 [IntroductionOfCommands]
-other = "命令說明：編寫命令時類似於 shell/bat 腳本。建議不要換行，多個命令可用 <code>&&</code> 或 <code>&</code> 連接，若出現命令無法找到的情況，可能是由於 <code>PATH</code> 環境變量配置問題。在 <code>Linux</code> 伺服器上，可在命令開頭加入 <code>source ~/.bashrc</code>，或使用命令的絕對路徑執行。"
+other = "命令說明：編寫命令時類似於 shell/bat 腳本。建議不要換行，多個命令可用 <code>&&</code> 或 <code>&</code> 連接，若出現命令無法找到的情況，可能是由於 <code>PATH</code> 環境變數配置問題。在 <code>Linux</code> 伺服器上，可在命令開頭加入 <code>source ~/.bashrc</code>，或使用命令的絕對路徑執行。"

 [AddMonitor]
 other = "新增監控"

 [Blog]
-other = "博客"
+other = "部落格"

 [Target]
 other = "目標"
@@ -158,7 +158,7 @@ other = "新增通知方式"
 other = "分組"

 [DoNotSendTestMessages]
-other = "不發送測試信息"
+other = "不發送測試訊息"

 [RequestMethod]
 other = "請求方式"
@@ -221,7 +221,7 @@ other = "排序"
 other = "越大越靠前"

 [Secret]
-other = "密鑰"
+other = "金鑰"

 [Note]
 other = "備註"
@@ -254,10 +254,10 @@ other = "忽略所有"
 other = "觸發執行"

 [DeleteScheduledTask]
-other = "刪除計劃任務"
+other = "刪除排程任務"

 [ConfirmToDeleteThisScheduledTask]
-other = "確認刪除此計劃任務？"
+other = "確認刪除此排程任務？"

 [AccessDenied]
 other = "訪問被拒絕"
@@ -407,7 +407,7 @@ other = "流量"
 other = "負載"

 [ProcessCount]
-other = "進程數"
+other = "行程數"

 [ConnCount]
 other = "連接數"
@@ -422,7 +422,7 @@ other = "活動"
 other = "版本"

 [NetSpeed]
-other = "網絡"
+other = "網路"

 [Uptime]
 other = "在線"
@@ -458,7 +458,7 @@ other = "狀態"
 other = "可用性"

 [AverageLatency]
-other = "平均響應時間"
+other = "平均回應時間"

 [CycleTransferStats]
 other = "周期性流量統計"
@@ -524,7 +524,7 @@ other = "發生錯誤"
 other = "系統錯誤"

 [NetworkError]
-other = "網絡錯誤"
+other = "網路錯誤"

 [ServicesStatus]
 other = "服務狀態"
@@ -536,7 +536,7 @@ other = "伺服器管理"
 other = "服務監控"

 [ScheduledTasks]
-other = "計劃任務"
+other = "排程任務"

 [ApiManagement]
 other = "API 管理"
@@ -614,7 +614,7 @@ other = "對遊客隱藏"
 other = "菜單"

 [NetworkSpiter]
-other = "網絡"
+other = "網路"

 [EnableShowInService]
 other = "在服務中顯示"
@@ -653,7 +653,37 @@ other = "禁止前台切換主題"
 other = "伺服器世界分布圖"

 [NAT]
-other = "NAT"
+other = "NAT穿透"
+
+[LocalService]
+other = "內網服務"
+
+[LocalServicePlaceholder]
+other = "192.168.1.1:80(帶埠號)"
+
+[BindHostname]
+other = "綁定網域"

 [NetworkSpiterList]
-other = "網絡監控"
+other = "網路監控"
+
+[Refresh]
+other = "重新整理"
+
+[CopyPath]
+other = "複製路徑"
+
+[Goto]
+other = "跳至"
+
+[GotoHeadline]
+other = "跳至資料夾"
+
+[GotoGo]
+other = "確定"
+
+[GotoClose]
+other = "取消"
+
+[FMError]
+other = "Agent 回傳了錯誤，請查看主控台獲取詳細資訊。要建立新連線，請重新開啟 FM。"
@@ -0,0 +1,36 @@
+{
+    "name": "Nezha",
+    "short_name": "Nezha",
+    "icons": [
+        {
+            "src": "/static/manifest-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/static/manifest-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "/static/manifest-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/static/manifest-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ],
+    "start_url": "/",
+    "display": "standalone",
+    "theme_color": "#000000",
+    "background_color": "#000000",
+    "lang": "eu-US",
+    "dir": "auto"
+}
@@ -0,0 +1,36 @@
+{
+    "name": "哪吒监控",
+    "short_name": "哪吒监控",
+    "icons": [
+        {
+            "src": "/static/manifest-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/static/manifest-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "/static/manifest-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/static/manifest-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ],
+    "start_url": "/",
+    "display": "standalone",
+    "theme_color": "#000000",
+    "background_color": "#000000",
+    "lang": "zh-CN",
+    "dir": "auto"
+}
@@ -13,7 +13,18 @@ const mixinsVue = {
        this.isMobile = this.checkIsMobile();
        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate;
    },
+    mounted() {
+        this.initDropdown();
+    },
    methods: {
+        initDropdown() {
+            if(this.isMobile) $('.ui.dropdown').dropdown({
+                action: 'hide',
+                on: 'click',
+                duration: 100,
+                direction: 'direction'
+            });
+        },
        toggleTemplate(template) {
            if( template != this.preferredTemplate){
                this.preferredTemplate = template;
@@ -381,6 +381,7 @@ td.ping-network-quality {
 }

 .network-box .chartTitle {
+    cursor: pointer;
    text-align: center;
    font-size: 18px;
    margin: 18px 0px 15px 0px;
@@ -480,7 +481,12 @@ footer p{
        padding-top:60px !important;
    }
    .nezha {
-        min-height: calc(74.5vh);
+        min-height: calc(100vh - 90px);
+        min-height: calc(var(--vh, 1vh) * 100 - 90px);
+    }
+    #chartbox {
+        min-height: calc(100vh - 170px);
+        min-height: calc(var(--vh, 1vh) * 100 - 170px);    
    }
    .content {
        padding: 0;
@@ -26,7 +26,9 @@ const mixinsVue = {
        this.semiTransparent = this.initSemiTransparent();
        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate;
        this.colors = this.theme == "dark" ? this.colorsDark : this.colorsLight;
+        this.setBenchmarkHeight();
        window.addEventListener('scroll', this.handleScroll);
+        window.addEventListener('resize', this.setBenchmarkHeight());
    },
    destroyed() {
        window.removeEventListener('scroll', this.handleScroll);
@@ -152,6 +154,10 @@ const mixinsVue = {
        },
        checkIsMobile() { // 检测设备类型,页面宽度小于768px认为是移动设备
            return window.innerWidth <= 768;
+        },
+        setBenchmarkHeight() {
+            let vh = window.innerHeight * 0.01;
+            document.documentElement.style.setProperty('--vh', `${vh}px`);
        }
    }
 }
@@ -13,11 +13,11 @@
                <input type="number" name="ServerID" placeholder="1">
            </div>
            <div class="field">
-                <label>内网服务</label>
-                <input type="text" name="Host" placeholder="192.168.1.1:80(带端口)">
+                <label>{{tr "LocalService"}}</label>
+                <input type="text" name="Host" placeholder="{{tr "LocalServicePlaceholder"}}">
            </div>
            <div class="field">
-                <label>绑定域名</label>
+                <label>{{tr "BindHostname"}}</label>
                <input type="text" name="Domain" placeholder="router.app.yourdomain.com">
            </div>
        </form>
@@ -58,9 +58,9 @@
        <mdui-dropdown>
            <mdui-button-icon slot="trigger" icon="menu"></mdui-button-icon>
            <mdui-menu>
-                <mdui-menu-item id="refresh">Refresh</mdui-menu-item>
-                <mdui-menu-item id="copy">Copy path</mdui-menu-item>
-                <mdui-menu-item id="goto">Go to</mdui-menu-item>
+                <mdui-menu-item id="refresh">{{tr "Refresh"}}</mdui-menu-item>
+                <mdui-menu-item id="copy">{{tr "CopyPath"}}</mdui-menu-item>
+                <mdui-menu-item id="goto">{{tr "Goto"}}</mdui-menu-item>
            </mdui-menu>
        </mdui-dropdown>
        <span id="current-directory"></span>
@@ -70,16 +70,16 @@
    <mdui-list id="file-list" class="file-list"></mdui-list>

    <mdui-dialog id="error-dialog" headline="Error"
-        description="Agent returned an error, please view the console for details. To open a new connection, reopen the FM again."></mdui-dialog>
+        description="{{tr "FMError"}}"></mdui-dialog>

    <mdui-dialog id="upd-modal" class="modal">
        <mdui-linear-progress id="upd-progress"></mdui-linear-progress>
    </mdui-dialog>

-    <mdui-dialog id="goto-dialog" headline="Go to a folder" close-on-overlay-click>
+    <mdui-dialog id="goto-dialog" headline="{{tr "GotoHeadline"}}" close-on-overlay-click>
        <mdui-text-field id="goto-text" variant="outlined" value=""></mdui-text-field>
-        <mdui-button id="goto-go" slot="action" variant="text">Go</mdui-button>
-        <mdui-button id="goto-close" slot="action" variant="tonal">Close</mdui-button>
+        <mdui-button id="goto-go" slot="action" variant="text">{{tr "GotoGo"}}</mdui-button>
+        <mdui-button id="goto-close" slot="action" variant="tonal">{{tr "GotoClose"}}</mdui-button>
    </mdui-dialog>

    <script>
@@ -221,7 +221,7 @@

            const checkCompletion = setInterval(() => {
                if (isUpCompleted) {
-                    clearInterval(checkCompletion); // 任务完成后停止检查
+                    clearInterval(checkCompletion);
                    hideUpdModal();
                    resetUpdState();
                    listFile();
@@ -480,6 +480,7 @@
                const file = event.target.files[0];
                if (file) {
                    await uploadFile(file);
+                    isUpCompleted = false;
                }
            });

@@ -16,8 +16,8 @@
                    <th>ID</th>
                    <th>{{tr "Name"}}</th>
                    <th>Agent ID</th>
-                    <th>内网服务</th>
-                    <th>绑定域名</th>
+                    <th>{{tr "LocalService"}}</th>
+                    <th>{{tr "BindHostname"}}</th>
                    <th>{{tr "Administration"}}</th>
                </tr>
            </thead>
@@ -63,6 +63,7 @@
    <script src="https://unpkg.com/[email protected]/lib/xterm.js"></script>
    <script src="https://unpkg.com/@xterm/[email protected]/lib/addon-fit.js"></script>
    <script src="https://unpkg.com/@xterm/[email protected]/lib/addon-web-links.js"></script>
+    <script src="https://unpkg.com/@xterm/[email protected]/lib/addon-attach.js"></script>
    <script>
        let sendResizing = false;

@@ -106,7 +107,9 @@
            cursorBlink: true,
        });
        const socket = new WebSocket((window.location.protocol == 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/terminal/' + '{{.SessionID}}');
-        socket.binaryType = 'arraybuffer';
+
+        const attachAddon = new AttachAddon.AttachAddon(socket);
+        term.loadAddon(attachAddon);

        const fitAddon = new FitAddon.FitAddon();
        term.loadAddon(fitAddon);
@@ -261,22 +261,23 @@
        const x = readableBytes(bs)
        return x != "NaN undefined" ? x : '0B'
      },
-      getCoreAndGHz(str){
-        if((str || []).hasOwnProperty(0) === false){
-            return '';
+      getCoreAndGHz(arr) {
+        if ((arr || []).length === 0) {
+          return '';
        }
-        str = str[0];
-	    let GHz = str.match(/(\d|\.)+GHz/g);
-	    let Core = str.match(/(\d|\.)+ Physical/g);
-	    GHz = GHz!==null?GHz.hasOwnProperty(0)===false?'':GHz[0]:''
-	    Core = Core!==null?Core.hasOwnProperty(0)===false?'?':Core[0]:'?'
-	    if(Core === '?'){
-	        let Core = str.match(/(\d|\.)+ Virtual/g);
-	        Core = Core!==null?Core.hasOwnProperty(0)===false?'?':Core[0]:'?'
-	        return Core.replace('Virtual','Core')
-	    }
-	    return Core.replace('Physical','Core');
-	   
+        let totalCores = 0;
+        arr.forEach(str => {
+          let coreMatch = str.match(/(\d+(\.\d+)?) Physical/g);
+          let coreCount = 0;
+          if (coreMatch) {
+            coreCount = parseFloat(coreMatch[0]);
+            } else {
+            let coreMatch = str.match(/(\d+(\.\d+)?) Virtual/g);
+            coreCount = coreMatch ? parseFloat(coreMatch[0]) : 0;
+          }
+            totalCores += coreCount;
+        });
+        return `${totalCores} Cores`;
      },
      getByteToGB(bs){
        return (bs/1024/1024/1024).toFixed(2) + 'GB'
@@ -3,12 +3,21 @@
 <html lang="{{.Conf.Language}}">

 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{ .Title }}</title>
+    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <meta content="telephone=no" name="format-detection">
-    <title>{{.Title}}</title>
-    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="theme-color" content="#000000" />
+    {{ if eq .Conf.Language "zh-CN" }}
+        <link rel="manifest" href="/static/manifest-zh-CN.json?v20240905" />
+    {{ else }}
+        <link rel="manifest" href="/static/manifest-en-US.json?v20240905" />
+    {{ end }}
+    <link rel="apple-touch-startup-image" href="/static/logo.svg" />
+    <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/[email protected]/assets/font-logos.css">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/font/bootstrap-icons.min.css">
@@ -21,7 +30,7 @@
    <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="/static/semantic-ui-alerts.min.js"></script>
-    <script src="/static/theme-default/js/mixin.js?v20240302"></script>
+    <script src="/static/theme-default/js/mixin.js?v20240911"></script>
    <script>
        document.documentElement.setAttribute('nz-theme', window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light');
    </script>
@@ -194,7 +194,7 @@
            ]
        },
        mixins: [mixinsVue],
-            created() {
+        created() {
            this.servers = JSON.parse('{{.Servers}}').servers;
            this.group()
        },
@@ -474,21 +474,23 @@
                const sizes = ["B", "K", "M", "G", "T", "P", "E", "Z", "Y"];
                return parseFloat((bytes / Math.pow(1024, i)).toFixed(2)) + sizes[i];
            },
-            getCoreAndGHz(str){
-                if ((str || []).hasOwnProperty(0) === false) {
+            getCoreAndGHz(arr) {
+                if ((arr || []).length === 0) {
                    return '';
                }
-                str = str[0];
-                let GHz = str.match(/(\d|\.)+GHz/g);
-                let Core = str.match(/(\d|\.)+ Physical/g);
-                GHz = GHz !== null ? GHz.hasOwnProperty(0) === false ? '' : GHz[0] : ''
-                Core = Core !== null ? Core.hasOwnProperty(0) === false ? '?' : Core[0] : '?'
-                if (Core === '?') {
-                    let Core = str.match(/(\d|\.)+ Virtual/g);
-                    Core = Core !== null ? Core.hasOwnProperty(0) === false ? '?' : Core[0] : '?'
-                    return Core.replace('Virtual', 'Core')
-                }
-                return Core.replace('Physical', 'Core');
+                let totalCores = 0;
+                arr.forEach(str => {
+                    let coreMatch = str.match(/(\d+(\.\d+)?) Physical/g);
+                    let coreCount = 0;
+                    if (coreMatch) {
+                        coreCount = parseFloat(coreMatch[0]);
+                    } else {
+                        let coreMatch = str.match(/(\d+(\.\d+)?) Virtual/g);
+                        coreCount = coreMatch ? parseFloat(coreMatch[0]) : 0;
+                    }
+                    totalCores += coreCount;
+                });
+                return `${totalCores} Cores`;
            },
            getK2Gb(bs){
                bs = bs / 1024 / 1024 / 1024;
@@ -7,7 +7,7 @@
        </a>
        <a class='item' href="/"><i class="home icon"></i>{{tr "Home"}}</a>
        <template v-if="isMobile"> 
-            <div class="item ui simple dropdown">
+            <div class="item ui dropdown" :class="{ simple: !isMobile }">
                <div class="text"><i class="bi bi-gear-wide-connected icon" style="margin-right:3px;"></i>{{tr "Feature" }}<i class="dropdown icon" style="margin-right:0px;"></i></div>
                <div class="menu">
                    <a href="/service" class="item"><i class="rss icon"></i>{{tr "Services" }}</a>
@@ -20,7 +20,7 @@
            <a href="/network" class="item"><i class="bi bi-hdd-network icon"></i>{{tr "NetworkSpiter"}}</a>
        </template>
        {{ if not .Conf.DisableSwitchTemplateInFrontend }}        
-            <div class="item ui simple dropdown">
+            <div class="item ui dropdown" :class="{ simple: !isMobile }">
                <div class="text"><i class="bi bi-incognito icon" style="margin-right:3px;"></i>{{tr "Template" }}<i class="dropdown icon" style="margin-right:0px;"></i></div>
                <div class="menu"> 
                    <a v-for="(item, index) in adaptedTemplates" :key="index" @click="toggleTemplate(item.key)" class="item">
@@ -18,7 +18,7 @@
        </div>
    </div>
    <div class="ui container">
-        <div ref="chartDom" style="margin-top: 15px;height: 520px;overflow: hidden"></div>
+        <div ref="chartDom" style="margin-top: 15px;height: auto;overflow: hidden"></div>
    </div>
 </div>

@@ -36,7 +36,11 @@
            defaultTemplate: {{.Conf.Site.Theme}},
            templates: {{.Themes}},
            servers: initData,
-            option: {
+            option: {}
+        },
+        mixins: [mixinsVue],
+        created() {
+            this.option = {
                tooltip: {
                    trigger: 'axis',
                    position: function (pt) {
@@ -69,17 +73,9 @@
                    right: this.isMobile ? '8%' : '3.8%',
                },
                backgroundColor: '',
-                toolbox: {
-                    feature: {
-                        dataZoom: {
-                            yAxisIndex: 'none'
-                        },
-                        restore: {},
-                        saveAsImage: {}
-                    }
-                },
                dataZoom: [
                    {
+                        type: 'slider',
                        start: 0,
                        end: 100
                    }
@@ -93,10 +89,8 @@
                    boundaryGap: false
                },
                series: [],
-            },
-            chartOnOff: true,
+            }
        },
-        mixins: [mixinsVue],
        mounted() {
            this.renderChart();
            this.parseMonitorInfo(monitorInfo);
@@ -236,6 +230,20 @@
                this.option.title.text = monitorInfo.result[0].server_name;
                this.option.series = tSeries;
                this.option.legend.data = tLegendData;
+                const maxLegendsPerRowMobile = localStorage.getItem("maxLegendsPerRowMobile") ? localStorage.getItem("maxLegendsPerRowMobile") : 2;
+                const maxLegendsPerRowPc = localStorage.getItem("maxLegendsPerRowPc") ? localStorage.getItem("maxLegendsPerRowPc") : 6;
+                const autoIncrement = Math.floor((tLegendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 28 : 34);
+                const height = 520 + autoIncrement;
+                const gridTop = 60 + autoIncrement;
+                this.option.grid = {
+                    left: this.isMobile ? '8%' : '3.8%',
+                    right: this.isMobile ? '8%' : '3.8%',
+                    top: gridTop
+                };
+                this.myChart.resize({
+                    width: 'auto',
+                    height: height
+                });
                this.myChart.clear();
                this.myChart.setOption(this.option);
            },
@@ -1,5 +1,5 @@
 {{define "theme-server-status/footer"}}
-    </div>
+    </section>
    <footer class="container-fluid">
        <p>{{ .Conf.Site.Brand }} | Theme ServerStatus | Powered by <a target="_blank" href="https://github.com/naiba/nezha">{{tr "NezhaMonitoring"}}</a> {{.Version}}</p>
    </footer>
@@ -2,11 +2,21 @@
 <!DOCTYPE html>
 <html lang="{{.Conf.Language}}">
 <head>
-    <title>{{ .Title }}</title>
+    <title>{{.Title}}</title>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta content="telephone=no" name="format-detection">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="theme-color" content="#000000" />
+    {{if eq .Conf.Language "zh-CN"}}
+        <link rel="manifest" href="/static/manifest-zh-CN.json?v20240905" />
+    {{else}}
+        <link rel="manifest" href="/static/manifest-en-US.json?v20240905" />
+    {{end}}
+    <link rel="apple-touch-startup-image" href="/static/logo.svg" />
+    <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]/font/bootstrap-icons.min.css">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/assets/font-logos.css">
@@ -16,10 +26,10 @@
    <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>
-    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v202408016">
+    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20240909">
    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css?v202408011">
    <link rel="stylesheet" href="/static/theme-server-status/css/light.css?v20240811">
-    <script src="/static/theme-server-status/js/mixin.js?v20240811"></script>
+    <script src="/static/theme-server-status/js/mixin.js?v20240907"></script>
 </head>
 <body>
 <div id="app">
@@ -18,7 +18,7 @@
    <tbody id="servers">
    <template v-for="(node,index) in nodesNoTag">
        <tr :id="'r'+node.ID" data-toggle="collapse" :data-target="'#rt'+node.ID" class="accordion-toggle" :class="index % 2 === 0 ? 'odd': 'even'" 
-        aria-expanded="false" @click="showCharts($event, node.ID)">
+        aria-expanded="false" @click="showCharts(node.ID)">
            <td class="node-cell status center">
                <div class="status-container">
                    <div v-if="node.online" class="status-icon online"></div>
@@ -143,7 +143,7 @@
                            @#node.host.Version#@
                        </span>
                        <span class="node-echarts-expand">
-                            <div class="chartbox" chartbox-show="0" :key="node.ID" :ref="`chart${node.ID}`" style="width: 100%; height: auto;"></div>
+                            <div class="chartbox" :id="`chart-${node.ID}`" chartbox-show="0" :key="node.ID" style="width: 100%; height: auto;"></div>
                        </span>
                    </div>
                </div>
@@ -21,7 +21,7 @@
    <tbody id="servers">
    <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'" aria-expanded="false" @click="showCharts($event, node.ID)">
+            :class="index % 2 === 0 ? 'odd': 'even'" aria-expanded="false" @click="showCharts(node.ID)">
            <td class="node-cell status center">
                <div class="status-container">
                    <div v-if="node.online" class="status-icon online"></div>
@@ -146,7 +146,7 @@
                            @#node.host.Version#@
                        </span>
                        <span class="node-echarts-expand">
-                            <div class="chartbox" chartbox-show="0" :key="node.ID" :ref="`chart${node.ID}`" style="width: 100%; height: auto;"></div>
+                            <div class="chartbox" :id="`chart-${node.ID}`" chartbox-show="0" :key="node.ID" style="width: 100%; height: auto;"></div>
                        </span>
                    </div>
                </div>
@@ -3,15 +3,15 @@
 {{template "theme-server-status/menu" .}}   
 <!--  showGroup true -->
 <template v-if="showGroup">
-    <section class="container-fluid table-responsive content" v-for="group in nodesTag">
+    <div class="container-fluid table-responsive content" v-for="group in nodesTag">
        {{template "theme-server-status/home-group-true" .}} 
-    </section>
+    </div>
 </template>
 <!--  showGroup false -->
 <template v-else>
-    <section class="container-fluid table-responsive content">
+    <div class="container-fluid table-responsive content">
        {{template "theme-server-status/home-group-false" .}}
-    </section>
+    </div>
 </template>
 <div class="modal fade" id="mapChartBox" tabindex="-1" role="dialog" aria-labelledby="mapChartTitle" aria-hidden="true" style="padding-left:0">
    <div class="modal-dialog modal-lg modal-dialog-centered">
@@ -162,7 +162,10 @@
                const tooltipBackgroundColor = this.theme == "dark" ? "#ffffff" : '#ffffff';
                const tooltipBorderColor = this.theme == "dark" ? "#ffffff" : "#ffffff"; 
                const fontSize = this.isMobile ? 10 : 12;
-                const fontColor = this.theme == "dark" ? "#000000" : "#000000";     
+                const fontColor = this.theme == "dark" ? "#000000" : "#000000"; 
+                const showLoadingMaskColor = this.theme == "dark" ? 'rgba(28, 29, 38, 1)' : 'rgba(249, 249, 249, 1)';
+                const showLoadingTextColor = this.theme == "dark" ? 'rgba(241, 241, 241, 1)' : 'rgba(0, 0, 0, 1)';
+                const showLoadingColor = inRangeColor;    
                const chartContainer = document.getElementById('mapChart');
                const mapChart = echarts.init(chartContainer, '', { // init图表
                    renderer: 'canvas',
@@ -170,6 +173,13 @@
                    width: width,
                    height: height,
                });
+                mapChart.showLoading({
+                    text: 'loading',
+                    textColor: showLoadingTextColor,
+                    color: showLoadingColor,
+                    maskColor: showLoadingMaskColor,
+                    zlevel: 2
+                });
                fetch(this.staticUrl + '/maps/' + this.countryMapGeoFile)
                    .then(response => response.json())
                    .then(worldMap => {
@@ -224,7 +234,10 @@
                                }
                            ]
                        };
-                        mapChart.setOption(option);
+                        setTimeout(() => {
+                            mapChart.hideLoading();
+                            mapChart.setOption(option);
+                        }, 1000);
                    });
            },
            isWindowsPlatform(str) {
@@ -470,24 +483,27 @@
                // 如果所有元素的 Temperature 都为 0，则返回一个默认值 0
                return 0;
            },
-            showCharts(event, id) {
-                const chartContainer = this.$refs[`chart${id}`][0];
-                const chartboxShow = chartContainer.getAttribute('chartbox-show');
-                chartContainer.setAttribute('chartbox-show', chartboxShow === '0' ? '1' : '0');
-                const isAriaExpandedFalse = event.currentTarget.getAttribute('aria-expanded') === 'false';
-                if (!isAriaExpandedFalse) return;
+            showCharts(id,changeChartboxShow=true) {
+                const chartContainer = document.getElementById(`chart-${id}`);
+                if(changeChartboxShow){
+                    const chartboxShow = chartContainer.getAttribute('chartbox-show');
+                    chartContainer.setAttribute('chartbox-show', chartboxShow === '0' ? '1' : '0');
+                    const collapseContainer = document.getElementById(`r${id}`);
+                    const isAriaExpandedFalse = collapseContainer.getAttribute('aria-expanded') === 'false';
+                    if (!isAriaExpandedFalse) return;
+                }
                // 发起数据请求
                const url = `/api/v1/monitor/${id}`;
                fetch(url)
                    .then(response => response.json())
                    .then(data => {
                        if (data.result) { // 数据请求成功，更新数据并渲染图表
-                            this.chartDataList[id - 1] = data.result;
+                            this.chartDataList[id] = data.result;
                            this.$nextTick(() => {
                                this.renderCharts(id);
                            });
                        } else {
-                            console.log('this agent (id:'+ id + ') has no monitor.');
+                            console.log('this server (id:'+ id + ') has no monitor.');
                        }
                    })
                    .catch(error => {
@@ -495,76 +511,116 @@
                    });
            },
            renderCharts(id, reload = false) {
-                if (!this.chartDataList[id - 1]) return;
-                const chartData = this.chartDataList[id - 1];
-                const chartContainer = this.$refs[`chart${id}`][0];
-                if (reload) { //点击切换亮色/暗色风格模式时,重新载入echarts图表的逻辑,
-                    // 第一步,查找已经渲染出的图表容器,并销毁它
+                if (!this.chartDataList[id]) return;
+                const chartData = this.chartDataList[id];
+                const chartContainer = document.getElementById(`chart-${id}`);
+                if (reload) {
                    const existingChart = echarts.getInstanceByDom(chartContainer);
                    if (existingChart) existingChart.dispose();
-                    // 第二步,如果图表容器处于不可见状态chartboxShow=0,不重新渲染出新的图表,
-                    // 如果图表容器处于可见状态chartboxShow=1,重新渲染出新的图表
                    const chartboxShow = chartContainer.getAttribute('chartbox-show');
                    if ( chartboxShow === '0' ) return; 
                }
-                // 定义图表参数值
                const MaxTCPPingValue = {{.Conf.MaxTCPPingValue}} ? {{.Conf.MaxTCPPingValue}} : 300;
                const fontSize = this.isMobile ? 10 : 14;
-                const gridLeft = this.isMobile ? 25 : 36;
+                const gridLeft = (MaxTCPPingValue > 500) ? (this.isMobile ? 36 : 42) : (this.isMobile ? 25 : 36);
                const gridRight = this.isMobile ? 5 : 20;
                const legendLeft = this.isMobile ? 'center' : 'center';
                const legendTop = this.isMobile ? 5 : 5;
                const legendPadding= this.isMobile ? [5,0,5,0] : [5,0,5,0];
                const systemDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
                const theme = localStorage.getItem("theme") ? localStorage.getItem("theme") : systemDarkMode;
-                const chartTheme = theme == "dark" ? "dark" : "default";
-                const fontColor = theme == "dark" ? "#f1f1f1" : "#000000";
+                const chartTheme = this.theme == "dark" ? "dark" : "default";
+                const fontColor = this.theme == "dark" ? "#f1f1f1" : "#000000";
                const backgroundColor = theme == "dark" ? '' : '';
                const tooltipBackgroundColor = this.theme == "dark" ? (this.semiTransparent ? "rgba(28,29,38,0.85)" : "rgba(28,29,38,1)") : (this.semiTransparent ? "rgba(255,255,255,0.85)" : "rgba(255,255,255,1)");
                const tooltipBorderColor = this.theme == "dark" ? (this.semiTransparent ? "rgba(28,29,38,0.9)" : "rgba(28,29,38,1)") : (this.semiTransparent ? "rgba(255,255,255,0.9)" : "rgba(255,255,255,1)");
                const lineStyleWidth = this.isMobile ? 1 : 2;
                const splitLineWidth = this.isMobile ? 0.5 : 1;
-                // 渲染图表
-                const chart = echarts.init(chartContainer, chartTheme, {
+                const markLineItemStyleOpacity = this.semiTransparent ? 1 : 0.75;
+                const markLineLineStyleWidth = this.isMobile ? 0.15 : 0.3;
+                const chart = echarts.init(chartContainer, chartTheme, { // init图表
                    renderer: 'canvas',
                    useDirtyRect: false,
                    width: 'auto',
-                    height: 300,
+                    height: 300
                });
-                const xAxisData = chartData[0].created_at.map(time => new Date(time).toLocaleString());
-                const seriesData = chartData.map(item => {
+                let legendData = [];
+                let seriesData = [];
+                chartData.forEach((item,key)=> {
                    let loss = 0;
-                    const data = item.avg_delay.map((avgDelay, index) => {                        
-                        if(avgDelay > 0 && avgDelay < MaxTCPPingValue){
-                            loss += avgDelay > 0.9 * MaxTCPPingValue ? 1 : 0;
-                            return [item.created_at[index], avgDelay.toFixed(2)];
-                        }else{
+                    let totalLossRate = 0;
+                    let legendName = '';
+                    let data = { main: [], markLine: []};
+                    item.avg_delay.forEach((avgDelay, index) => {
+                        const threshold = 0.9 * MaxTCPPingValue; // 定义阀值,用于判断是否丢包
+                        // 定义丢包 1. avgDelay==0  2. avgDelay>=MaxTCPPingValue 3. avgDelay>=threshold
+                        if(avgDelay == 0 || avgDelay >= MaxTCPPingValue){ //绝对丢包
                            loss += 1;
+                            const lossrate = 100 * loss / (index + 1);
+                            if(lossrate != 100) {
+                                data['markLine'].push({
+                                    xAxis: item.created_at[index],
+                                    label: { show: false },
+                                    emphasis: { disabled: true },
+                                    lineStyle: { type: "solid" }
+                                });
+                            }
+                        } else if (avgDelay >= threshold && avgDelay < MaxTCPPingValue){ // 相对丢包
+                            loss += 1;
+                            const lossrate = 100 * loss / (index + 1);
+                            if(lossrate != 100) {
+                                data['main'].push(
+                                    [item.created_at[index], avgDelay, lossrate]
+                                );
+                                data['markLine'].push({
+                                    xAxis: item.created_at[index],
+                                    label: { show: false },
+                                    emphasis: { disabled: true },
+                                    lineStyle: { type: "solid" }
+                                });
+                            }
+                        } else { // 未丢包
+                            const lossrate = 100 * loss / (index + 1);
+                            data['main'].push(
+                                [item.created_at[index], avgDelay, lossrate]
+                            );
                        }
                    });
-                    const lossRate = ((loss / item.created_at.length) * 100).toFixed(1);
-                    item.monitor_name = item.monitor_name.includes("%") ? item.monitor_name : `${item.monitor_name} ${lossRate}%`;
-                    return {
-                        name: item.monitor_name,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        data: data,
-                        connectNulls: true,
-                        legendHoverLink: false,
-                        emphasis: {
-                            disabled: true
-                        },
-                        lineStyle: {
-                            width: lineStyleWidth
-                        }  
-                    };
+                    totalLossRate = ((loss / item.created_at.length) * 100).toFixed(1);
+                    legendName = `${item.monitor_name} ${totalLossRate}%`;
+                    legendData.push(legendName);
+                    seriesData.push(
+                        {
+                            name: legendName,
+                            type: 'line',
+                            smooth: true,
+                            symbol: 'none',
+                            connectNulls: true,
+                            legendHoverLink: false,
+                            emphasis: {
+                                disabled: true
+                            },
+                            lineStyle: {
+                                width: lineStyleWidth
+                            },  
+                            data: data['main'],
+                            markLine: {
+                                symbol: "none",
+                                symbolSize :0,
+                                data: data['markLine'],
+                                itemStyle: { 
+                                    opacity: markLineItemStyleOpacity
+                                },
+                                lineStyle:{
+                                    width: markLineLineStyleWidth
+                                }
+                            }
+                        }
+                    );
                });
-
-                const legendData = chartData.map(item => item.monitor_name);
                const maxLegendsPerRowMobile = localStorage.getItem("maxLegendsPerRowMobile") ? localStorage.getItem("maxLegendsPerRowMobile") : 3;
                const maxLegendsPerRowPc = localStorage.getItem("maxLegendsPerRowPc") ? localStorage.getItem("maxLegendsPerRowPc") : 6;
-                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28);
+                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28);            
                const height = 300 + autoIncrement;
                const gridTop = 40 + autoIncrement;
                const legendIcon = this.isMobile ? 'rect' : ""; 
@@ -574,39 +630,24 @@
                    width: 'auto',
                    height: height
                });
-
                const option = {
+                    color: this.colors,
                    backgroundColor: backgroundColor,
+                    textStyle: {
+                        fontSize: fontSize,
+                        color: fontColor
+                    },
+                    grid: {
+                        top: gridTop,
+                        left: gridLeft,
+                        right: gridRight,
+                    },
                    title: {
-                        show: false
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        backgroundColor: tooltipBackgroundColor,
-                        borderColor: tooltipBorderColor,
-                        textStyle: {
-                            fontSize: fontSize,
-                            color: fontColor
-                        }
-                    },
-                    legend: {
-                        data: legendData,
-                        show: true,
-                        icon: legendIcon,
-                        textStyle: {
-                            fontSize: fontSize,
-                            color: fontColor
-                        },
-                        top: legendTop,
-                        bottom: 0,
-                        left: legendLeft,
-                        padding: legendPadding,
-                        itemWidth: itemWidth,
-                        itemHeight: itemHeight,
+                        show: false,
                    },
+                    series: seriesData.flat(),
                    xAxis: {
                        type: 'time',
-                        data: xAxisData,
                        axisLabel: {
                            textStyle: {
                                fontSize: fontSize
@@ -626,30 +667,57 @@
                            }
                        }
                    },
+                    legend: {
+                        data: legendData,
+                        show: true,
+                        icon: legendIcon,
+                        textStyle: {
+                            fontSize: fontSize,
+                            color: fontColor
+                        },
+                        top: legendTop,
+                        bottom: 0,
+                        left: legendLeft,
+                        padding: legendPadding,
+                        itemWidth: itemWidth,
+                        itemHeight: itemHeight,
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        backgroundColor: tooltipBackgroundColor,
+                        borderColor: tooltipBorderColor,
+                        textStyle: {
+                            fontSize: fontSize,
+                            color: fontColor
+                        },
+                        formatter: function (params) {
+                            let tooltipContent = '';
+                            const formattedTime = new Date(params[0].value[0]).toLocaleString(); 
+                            tooltipContent += `<span style="line-height:2em">${formattedTime}</span><br>`;
+                            params.forEach(param => {
+                                const formattedTime = new Date(param.value[0]).toLocaleString();
+                                if (!param.seriesName.includes('stack')) {
+                                    const name = param.seriesName.replace(/\s\d+(\.\d+)?%$/, '');
+                                    tooltipContent += `<span style="line-height:2em">${param.marker} ${name} ${param.value[2].toFixed(1)}% ${param.value[1].toFixed(2)}</span><br>`;
+                                }
+                            });
+                            return tooltipContent;
+                        }
+                    },
                    dataZoom: [
                        {
                            type: 'slider',
                            start: 0,
                            end: 100
                        }
-                    ],
-                    series: seriesData,
-                    textStyle: {
-                        fontSize: fontSize,
-                        color: fontColor
-                    },
-                    grid: {
-                        top: gridTop,
-                        left: gridLeft,
-                        right: gridRight
-                    }
+                    ]
                };
                chart.setOption(option);
            },
-            reloadCharts() { // 重新加载所有图表
+            reloadCharts() {
                this.servers.forEach(node => {
                    const id = node.ID;
-                    const chartData = this.chartDataList[id - 1];
+                    const chartData = this.chartDataList[id];
                    if (chartData) {
                        this.renderCharts(id,true);
                    }
@@ -64,6 +64,6 @@
        </nav>
    </div>
 </header>
-<div class="nezha">
+<section class="nezha">
 {{end}}

@@ -15,7 +15,7 @@
            </li>
        </ul>
    </div>
-    <div class="chartTitle"><i class="chartCountryCode" :class="'fi fi-' + chartCountryCode"></i> @#chartTitle#@</div>
+    <div class="chartTitle" @click="showCharts(nextServerId)"><i class="chartCountryCode" :class="'fi fi-' + chartCountryCode"></i> @#chartTitle#@</div>
    <div id="chartbox" style="width:100%;height:auto;"></div>
 </div>
 {{template "theme-server-status/footer" .}}
@@ -32,7 +32,8 @@
            chartTitle: '',
            chartCountryCode: '',
            chart: null,
-            currentServerId: ''
+            currentServerId: '',
+            nextServerId: '',
        },
        mixins: [mixinsVue],
        created() {
@@ -66,37 +67,47 @@
                if(!this.chartDataList[id]) return;
                if(this.chart) this.disposeCharts(this.chart);
                this.currentServerId = id;
+                this.nextServerId = this.getNextServerId(id);
                this.chartCountryCode = this.getServerCountryCode(id);
                this.chartTitle = this.chartDataList[id][0].server_name;
                const chartData = this.chartDataList[id];
                const chartContainer = document.getElementById('chartbox');
-                // 定义图表参数值
                const MaxTCPPingValue = {{.Conf.MaxTCPPingValue}} ? {{.Conf.MaxTCPPingValue}} : 300;
-                const autoheight = this.isMobile ? (window.innerHeight - 200) : (window.innerHeight - 250);
+                const autoheight = this.isMobile ? (window.innerHeight - 180) : (window.innerHeight - 250);
                const fontSize = this.isMobile ? 10 : 14;
-                const gridLeft = this.isMobile ? 30 : 36;
+                const gridLeft = (MaxTCPPingValue > 500) ? (this.isMobile ? 36 : 42) : (this.isMobile ? 30 : 36);
                const gridRight = this.isMobile ? 12 : 20;
                const legendLeft = this.isMobile ? 'center' : 'center';
                const legendTop = this.isMobile ? 5 : 5;
                const legendPadding= this.isMobile ? [5,0,5,0] : [5,0,5,0];
                const fontColor = this.theme == "dark" ? "#f1f1f1" : "#000000";
+                const chartTheme = this.theme == "dark" ? "dark" : "default";
                const backgroundColor = this.theme == "dark" ? '' : '';
                const tooltipBackgroundColor = this.theme == "dark" ? (this.semiTransparent ? "rgba(28,29,38,0.85)" : "rgba(28,29,38,1)") : (this.semiTransparent ? "rgba(255,255,255,0.85)" : "rgba(255,255,255,1)");
                const tooltipBorderColor = this.theme == "dark" ? (this.semiTransparent ? "rgba(28,29,38,0.9)" : "rgba(28,29,38,1)") : (this.semiTransparent ? "rgba(255,255,255,0.9)" : "rgba(255,255,255,1)");
                const lineStyleWidth = this.isMobile ? 1 : 2;
                const splitLineWidth = this.isMobile ? 0.5 : 1;
-                const splitLineColor = this.theme == "dark" ? "rgba(110, 112, 121, 0.95)" : "rgba(224, 230, 241, 0.95)";
-                const markPointLabelColor = this.theme == "dark" ? "#111111" : "#000000";
-                const markPointItemStyleOpacity = this.semiTransparent ? 1 : 0.75;
+                const markPointSymbolSize = this.isMobile ? 36 : 42;
+                const markPointItemStyleOpacity = this.semiTransparent ? 1 : 1;
+                const markPointFontSize = this.isMobile ? 8 : 10;
                const markLineItemStyleOpacity = this.semiTransparent ? 1 : 0.75;
                const markLineLineStyleWidth = this.isMobile ? 0.15 : 0.3;
-                this.chart = echarts.init(chartContainer, '', { // init图表
+                const showLoadingMaskColor = this.theme == "dark" ? 'rgba(0, 0, 0, 0)' : 'rgba(255, 255, 255, 0)';
+                const showLoadingTextColor = this.theme == "dark" ? 'rgba(241, 241, 241, 1)' : 'rgba(0, 0, 0, 1)';
+                const showLoadingColor = this.theme == "dark" ? '#D2B206' : '#FFDF32';
+                this.chart = echarts.init(chartContainer, chartTheme, { // init图表
                    renderer: 'canvas',
                    useDirtyRect: false,
                    width: 'auto',
                    height: autoheight,
                });
-                // 获取图表数据
+                this.chart.showLoading({
+                    text: 'loading',
+                    textColor: showLoadingTextColor,
+                    color: showLoadingColor,
+                    maskColor: showLoadingMaskColor,
+                    zlevel: 2
+                });
                let legendData = [];
                let seriesData = [];
                chartData.forEach((item,key)=> {
@@ -111,9 +122,6 @@
                            loss += 1;
                            const lossrate = 100 * loss / (index + 1);
                            if(lossrate != 100) {
-                                data['main'].push(
-                                    [item.created_at[index], MaxTCPPingValue, lossrate]
-                                );
                                data['markLine'].push({
                                    xAxis: item.created_at[index],
                                    label: { show: false },
@@ -142,11 +150,9 @@
                            );
                        }
                    });
-                    // 处理legendData
                    totalLossRate = ((loss / item.created_at.length) * 100).toFixed(1);
                    legendName = `${item.monitor_name} ${totalLossRate}%`;
                    legendData.push(legendName);
-                    // 处理seriesData
                    seriesData.push(
                        {
                            name: legendName,
@@ -182,10 +188,9 @@
                                        itemStyle: { 
                                            opacity: markPointItemStyleOpacity
                                        }, 
-                                        symbolSize: 30, 
+                                        symbolSize: markPointSymbolSize, 
                                        label: { 
-                                            fontSize: 8,
-                                            color: markPointLabelColor,
+                                            fontSize: markPointFontSize,
                                            formatter: function (params) {
                                                return Math.round(params.value);
                                            }
@@ -198,10 +203,9 @@
                                        itemStyle: { 
                                            opacity: markPointItemStyleOpacity
                                        }, 
-                                        symbolSize: 30, 
+                                        symbolSize: markPointSymbolSize, 
                                        label: { 
-                                            fontSize: 8,
-                                            color: markPointLabelColor,
+                                            fontSize: markPointFontSize,
                                            offset: [0, 8],
                                            formatter: function (params) {
                                                return Math.round(params.value);
@@ -218,7 +222,8 @@
                const maxLegendsPerRowPc = localStorage.getItem("maxLegendsPerRowPc") ? localStorage.getItem("maxLegendsPerRowPc") : 6;
                const autoIncrement = Math.floor((legendData.length - 1) / (this.isMobile ? maxLegendsPerRowMobile : maxLegendsPerRowPc)) * (this.isMobile ? 20 : 28);
                const height = autoheight + autoIncrement;
-                const gridTop = 40 + autoIncrement;
+                const gridTop = this.isMobile ? ( 60 + autoIncrement) : (80 + autoIncrement);
+                const gridBottom = this.isMobile ? 70 : 90;
                const legendIcon = this.isMobile ? 'rect' : ""; 
                const itemWidth = this.isMobile ? 10 : 25;
                const itemHeight = this.isMobile ? 10 : 14;
@@ -228,28 +233,22 @@
                });
                // 设置图表配置项
                const option = {
-                    // 全局调色盘
                    color: this.colors,
-                    // 背景颜色
                    backgroundColor: backgroundColor,
-                    // 文字样式
                    textStyle: {
                        fontSize: fontSize,
                        color: fontColor
                    },
-                    // 图表网格设置
                    grid: {
                        top: gridTop,
                        left: gridLeft,
-                        right: gridRight
+                        right: gridRight,
+                        bottom: gridBottom
                    },
-                    // 图表标题设置
                    title: {
                        show: false,
                    },
-                    // 图表系列数据设置
                    series: seriesData.flat(),
-                    // X轴设置
                    xAxis: {
                        type: 'time',
                        axisLabel: {
@@ -258,7 +257,6 @@
                            }
                        }
                    },
-                    // Y轴设置
                    yAxis: {
                        type: 'value',
                        axisLabel: {
@@ -268,12 +266,10 @@
                        },
                        splitLine: {
                            lineStyle: {
-                                width: splitLineWidth,
-                                color: splitLineColor
+                                width: splitLineWidth
                            }
                        }
                    },
-                    // 图例设置
                    legend: {
                        data: legendData,
                        show: true,
@@ -289,7 +285,6 @@
                        itemWidth: itemWidth,
                        itemHeight: itemHeight,
                    },
-                    // 提示框设置
                    tooltip: {
                        trigger: 'axis',
                        backgroundColor: tooltipBackgroundColor,
@@ -312,7 +307,6 @@
                            return tooltipContent;
                        }
                    },
-                    // 数据缩放设置
                    dataZoom: [
                        {
                            type: 'slider',
@@ -321,17 +315,16 @@
                        }
                    ]
                };
-                // 设置图表的配置选项
-                this.chart.setOption(option);
+                setTimeout(() => {
+                    this.chart.hideLoading();
+                    this.chart.setOption(option);
+                }, 1000);
            },
-            reloadCharts() { // 重新加载所有图表
-                this.servers.forEach(node => {
-                    const id = node.ID;
-                    const chartData = this.chartDataList[id];
-                    if (chartData) {
-                        this.renderCharts(id,true);
-                    }
-                });
+            reloadCharts() {
+                const chartData = this.chartDataList[this.currentServerId];
+                if (chartData) {
+                    this.renderCharts(this.currentServerId,true);
+                }
            },
            disposeCharts(chart){
                chart.dispose();
@@ -341,6 +334,16 @@
                const result = this.servers.find(item => item.ID == id);
                return result.Host.CountryCode ? result.Host.CountryCode : 'rb';
            },
+            getNextServerId(id) {
+                const currentIndex = this.servers.findIndex(item => item.ID === id);
+                if (currentIndex === -1) {
+                    return this.servers[0].ID;
+                }
+                // 判断是否有下一个元素
+                const nextIndex = currentIndex + 1;
+                // 如果有下一个元素，返回下一个元素的 ID；否则返回第一个元素的 ID
+                return nextIndex < this.servers.length ? this.servers[nextIndex].ID : this.servers[0].ID;
+            },
            initSearch() {
                $('#dropdown-search').on('keyup', function() {
                    var searchTerm = $(this).val().toLowerCase();
@@ -3,24 +3,24 @@
 {{template "theme-server-status/menu" .}}
 <!--  showGroup true -->
 <template v-if="showGroup">
-    <section v-if="servicesTag.length === 0" class="container-fluid content" style="min-height: .01%;overflow-x: auto;">
+    <div v-if="servicesTag.length === 0" class="container-fluid content" style="min-height: .01%;overflow-x: auto;">
        <p>No Valid Service Monitor Configuration Entries Found. Please Verify in the <a href="/monitor">Admin Panel</a>.</p>
-    </section>
-    <section v-else class="container-fluid content" style="min-height: .01%;overflow-x: auto;" v-for="group in servicesTag">
+    </div>
+    <div v-else class="container-fluid content" style="min-height: .01%;overflow-x: auto;" v-for="group in servicesTag">
        {{template "theme-server-status/service-group-true" .}} 
-    </section>
+    </div>
 </template>
 <!--  showGroup false -->
 <template v-else>
-    <section v-if="servicesNoTag.length === 0" class="container-fluid content" style="min-height: .01%;overflow-x: auto;">
+    <div v-if="servicesNoTag.length === 0" class="container-fluid content" style="min-height: .01%;overflow-x: auto;">
        <p>No Valid Service Monitor Configuration Entries Found. Please Verify in the <a href="/monitor">Admin Panel</a>.</p>
-    </section>
-    <section v-else class="container-fluid content" style="min-height: .01%;overflow-x: auto;">
+    </div>
+    <div v-else class="container-fluid content" style="min-height: .01%;overflow-x: auto;">
        {{template "theme-server-status/service-group-false" .}}
-    </section>
+    </div>
 </template>
 {{if .CycleTransferStats}}
-    <section class="container-fluid content table-responsive">
+    <div class="container-fluid content table-responsive">
        <table class="table table-striped table-condensed table-hover">
            <thead>
                <tr class="node-group-tag">
@@ -67,7 +67,7 @@
                {{end}}
            </tbody>
        </table>
-    </section>
+    </div>
 {{end}}
 {{template "theme-server-status/footer" .}}
 <script>
@@ -12,7 +12,7 @@ NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard"
 NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.18.3"
+NZ_VERSION="v0.19.0"

 red='\033[0;31m'
 green='\033[0;32m'
@@ -604,7 +604,7 @@ restart_and_update_standalone() {
        NZ_DASHBOARD_URL="https://${GITHUB_URL}/naibahq/nezha/releases/download/$version/dashboard-linux-$os_arch.zip"
    fi

-    sudo wget -qO $NZ_DASHBOARD_PATH/app.zip $NZ_DASHBOARD_URL >/dev/null 2>&1 && sudo unzip -qq $NZ_DASHBOARD_PATH/app.zip -d $NZ_DASHBOARD_PATH && sudo mv $NZ_DASHBOARD_PATH/dist/dashboard-linux-$os_arch $NZ_DASHBOARD_PATH/app && sudo rm -r $NZ_DASHBOARD_PATH/app.zip $NZ_DASHBOARD_PATH/dist
+    sudo wget -qO $NZ_DASHBOARD_PATH/app.zip $NZ_DASHBOARD_URL >/dev/null 2>&1 && sudo unzip -qq -o $NZ_DASHBOARD_PATH/app.zip -d $NZ_DASHBOARD_PATH && sudo mv $NZ_DASHBOARD_PATH/dashboard-linux-$os_arch $NZ_DASHBOARD_PATH/app && sudo rm $NZ_DASHBOARD_PATH/app.zip

    if [ "$os_alpine" != 1 ]; then
        sudo systemctl enable nezha-dashboard
@@ -12,7 +12,7 @@ NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard"
 NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.18.3"
+NZ_VERSION="v0.19.0"

 red='\033[0;31m'
 green='\033[0;32m'
@@ -598,7 +598,7 @@ restart_and_update_standalone() {
        NZ_DASHBOARD_URL="https://${GITHUB_URL}/naibahq/nezha/releases/download/$version/dashboard-linux-$os_arch.zip"
    fi

-    sudo wget -qO $NZ_DASHBOARD_PATH/app.zip $NZ_DASHBOARD_URL >/dev/null 2>&1 && sudo unzip -qq $NZ_DASHBOARD_PATH/app.zip -d $NZ_DASHBOARD_PATH && sudo mv $NZ_DASHBOARD_PATH/dist/dashboard-linux-$os_arch $NZ_DASHBOARD_PATH/app && sudo rm -r $NZ_DASHBOARD_PATH/app.zip $NZ_DASHBOARD_PATH/dist
+    sudo wget -qO $NZ_DASHBOARD_PATH/app.zip $NZ_DASHBOARD_URL >/dev/null 2>&1 && sudo unzip -qq -o $NZ_DASHBOARD_PATH/app.zip -d $NZ_DASHBOARD_PATH && sudo mv $NZ_DASHBOARD_PATH/dashboard-linux-$os_arch $NZ_DASHBOARD_PATH/app && sudo rm $NZ_DASHBOARD_PATH/app.zip

    if [ "$os_alpine" != 1 ]; then
        sudo systemctl enable nezha-dashboard
@@ -159,7 +159,7 @@ func (s *NezhaHandler) ReportSystemInfo(c context.Context, r *pb.Host) (*pb.Rece

 		} else {
 			// 虽然会在启动时panic, 可以断言不会走这个分支, 但是考虑到动态加载配置或者其它情况, 这里输出一下方便检查奇奇怪怪的BUG
-			log.Printf("NEZHA>> 未找到对应的DDNS配置(%s), 或者是provider填写不正确, 请前往config.yml检查你的设置\n", singleton.ServerList[clientID].DDNSProfile)
+			log.Printf("NEZHA>> 未找到对应的DDNS配置(%s), 或者是provider填写不正确, 请前往config.yml检查你的设置", singleton.ServerList[clientID].DDNSProfile)
 		}

 	}
@@ -3,86 +3,72 @@ package singleton
 import (
 	"fmt"
 	"log"
+	"slices"

 	ddns2 "github.com/naiba/nezha/pkg/ddns"
 )

-func RetryableUpdateDomain(provider ddns2.Provider, config *ddns2.DomainConfig, maxRetries int) bool {
-	if nil == config {
-		return false
+const (
+	ProviderWebHook      = "webhook"
+	ProviderCloudflare   = "cloudflare"
+	ProviderTencentCloud = "tencentcloud"
+)
+
+type ProviderFunc func(*ddns2.DomainConfig) ddns2.Provider
+
+func RetryableUpdateDomain(provider ddns2.Provider, domainConfig *ddns2.DomainConfig, maxRetries int) {
+	if domainConfig == nil {
+		return
 	}
 	for retries := 0; retries < maxRetries; retries++ {
-		log.Printf("NEZHA>> 正在尝试更新域名(%s)DDNS(%d/%d)\n", config.FullDomain, retries+1, maxRetries)
-		if provider.UpdateDomain(config) {
-			log.Printf("NEZHA>> 尝试更新域名(%s)DDNS成功\n", config.FullDomain)
-			return true
+		log.Printf("NEZHA>> 正在尝试更新域名(%s)DDNS(%d/%d)", domainConfig.FullDomain, retries+1, maxRetries)
+		if err := provider.UpdateDomain(domainConfig); err != nil {
+			log.Printf("NEZHA>> 尝试更新域名(%s)DDNS失败: %v", domainConfig.FullDomain, err)
+		} else {
+			log.Printf("NEZHA>> 尝试更新域名(%s)DDNS成功", domainConfig.FullDomain)
+			break
 		}
 	}
-	log.Printf("NEZHA>> 尝试更新域名(%s)DDNS失败\n", config.FullDomain)
-	return false
 }

+// Deprecated
 func GetDDNSProviderFromString(provider string) (ddns2.Provider, error) {
 	switch provider {
-	case "webhook":
-		return &ddns2.ProviderWebHook{
-			URL:           Conf.DDNS.WebhookURL,
-			RequestMethod: Conf.DDNS.WebhookMethod,
-			RequestBody:   Conf.DDNS.WebhookRequestBody,
-			RequestHeader: Conf.DDNS.WebhookHeaders,
-		}, nil
-	case "dummy":
-		return &ddns2.ProviderDummy{}, nil
-	case "cloudflare":
-		return &ddns2.ProviderCloudflare{
-			Secret: Conf.DDNS.AccessSecret,
-		}, nil
-	case "tencentcloud":
-		return &ddns2.ProviderTencentCloud{
-			SecretID:  Conf.DDNS.AccessID,
-			SecretKey: Conf.DDNS.AccessSecret,
-		}, nil
+	case ProviderWebHook:
+		return ddns2.NewProviderWebHook(Conf.DDNS.WebhookURL, Conf.DDNS.WebhookMethod, Conf.DDNS.WebhookRequestBody, Conf.DDNS.WebhookHeaders), nil
+	case ProviderCloudflare:
+		return ddns2.NewProviderCloudflare(Conf.DDNS.AccessSecret), nil
+	case ProviderTencentCloud:
+		return ddns2.NewProviderTencentCloud(Conf.DDNS.AccessID, Conf.DDNS.AccessSecret), nil
+	default:
+		return new(ddns2.ProviderDummy), fmt.Errorf("无法找到配置的DDNS提供者 %s", provider)
 	}
-	return &ddns2.ProviderDummy{}, fmt.Errorf("无法找到配置的DDNS提供者%s", Conf.DDNS.Provider)
 }

 func GetDDNSProviderFromProfile(profileName string) (ddns2.Provider, error) {
 	profile, ok := Conf.DDNS.Profiles[profileName]
 	if !ok {
-		return &ddns2.ProviderDummy{}, fmt.Errorf("未找到配置项 %s", profileName)
+		return new(ddns2.ProviderDummy), fmt.Errorf("未找到配置项 %s", profileName)
 	}

 	switch profile.Provider {
-	case "webhook":
-		return &ddns2.ProviderWebHook{
-			URL:           profile.WebhookURL,
-			RequestMethod: profile.WebhookMethod,
-			RequestBody:   profile.WebhookRequestBody,
-			RequestHeader: profile.WebhookHeaders,
-		}, nil
-	case "dummy":
-		return &ddns2.ProviderDummy{}, nil
-	case "cloudflare":
-		return &ddns2.ProviderCloudflare{
-			Secret: profile.AccessSecret,
-		}, nil
-	case "tencentcloud":
-		return &ddns2.ProviderTencentCloud{
-			SecretID:  profile.AccessID,
-			SecretKey: profile.AccessSecret,
-		}, nil
+	case ProviderWebHook:
+		return ddns2.NewProviderWebHook(profile.WebhookURL, profile.WebhookMethod, profile.WebhookRequestBody, profile.WebhookHeaders), nil
+	case ProviderCloudflare:
+		return ddns2.NewProviderCloudflare(profile.AccessSecret), nil
+	case ProviderTencentCloud:
+		return ddns2.NewProviderTencentCloud(profile.AccessID, profile.AccessSecret), nil
+	default:
+		return new(ddns2.ProviderDummy), fmt.Errorf("无法找到配置的DDNS提供者 %s", profile.Provider)
 	}
-	return &ddns2.ProviderDummy{}, fmt.Errorf("无法找到配置的DDNS提供者%s", profile.Provider)
 }

 func ValidateDDNSProvidersFromProfiles() error {
-	validProviders := map[string]bool{"webhook": true, "dummy": true, "cloudflare": true, "tencentcloud": true}
-	providers := make(map[string]string)
-	for profileName, profile := range Conf.DDNS.Profiles {
-		if _, ok := validProviders[profile.Provider]; !ok {
+	validProviders := []string{ProviderWebHook, ProviderCloudflare, ProviderTencentCloud}
+	for _, profile := range Conf.DDNS.Profiles {
+		if ok := slices.Contains(validProviders, profile.Provider); !ok {
 			return fmt.Errorf("无法找到配置的DDNS提供者%s", profile.Provider)
 		}
-		providers[profileName] = profile.Provider
 	}
 	return nil
 }
Author	SHA1	Message	Date
nap0o	f32f127dfc	improve: status-server主题network页 (#422 )	2024-09-11 21:50:40 +08:00
nap0o	f78ba281fb	Default主题fixbug (#421 ) * default主题fixbug 1.补上误删的网页title 2.修复network页纵坐标数值显示不全 3.修复network，多个legend导致的遮挡主图表问题 * fix * fix * fix * fix * fix * fix	2024-09-07 14:44:30 +08:00
github-actions[bot]	7f9f9a9129	update contributors[no ci]	2024-09-06 15:31:54 +00:00
nap0o	b701efd9b5	server-status和default主题：feat & improve & fix (#420 ) * feat & improve & fix 1. 增加WebAppManifest文件,实现把哪吒监控网页伪装成app放在移动端桌面 2. vps地图分布图增加数据异步加载loading效果 3. 修复echart图表纵坐标轴因数值过大显示不全bug * 刷新CDN缓存 * fix footer * 4.提升service页echarts图表相关体验 5.用设置基准1vh的方法解决footer页脚位置在移动端各种浏览器显示不一致的问题 6.修复section标签的使用位置 * 刷新CDN缓存	2024-09-06 23:31:38 +08:00
UUBulb	511f43784e	fix dashboard install script (#419 )	2024-09-03 08:54:07 +08:00
UUBulb	3f6112a919	fix: docker image (#418 )	2024-09-02 23:19:43 +08:00
UUBulb	23751440c6	[ci][docker]: use matrix to reduce build time & change base image to busybox (#417 ) * ci: use matrix to reduce build time * docker: change base image to busybox * reuse workflows * only download ipinfo db on tag pushes * goreleaser	2024-09-02 22:13:13 +08:00
UUBulb	989c9f9740	fix/fm: reset upload state after completion (#416 )	2024-08-28 23:23:23 +08:00
UUBulb	71508f8724	修复多CPU在默认主题和AngelKanade下显示的问题，完善内网穿透本地化文本 (#415 )	2024-08-25 11:33:25 +08:00
UUBulb	eb6dd2855e	refactor: ddns (#414 ) * refactor ddns * update webhook	2024-08-24 11:11:06 +08:00
naiba	64da3c7438	chore: back to attach addon	2024-08-21 23:42:05 +08:00