🐛 fix shit

* 修改国旗图标为4*3的大国旗

* Update main.css

.github/workflows/release.yml

@@ -22,11 +22,11 @@ jobs:
         uses: crazy-max/ghaction-xgo@v2
         with:
           xgo_version: latest
-          go_version: 1.20.x
+          go_version: 1.21
           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,
+          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64 # linux/386,
           v: true
           x: false
           race: false

.github/workflows/test-on-pr.yml

@@ -25,11 +25,11 @@ jobs:
         uses: crazy-max/ghaction-xgo@v2
         with:
           xgo_version: latest
-          go_version: 1.20.x
+          go_version: 1.21
           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,
+          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64 # linux/386,
           v: true
           x: false
           race: false

.github/workflows/test.yml

@@ -32,11 +32,11 @@ jobs:
         uses: crazy-max/ghaction-xgo@v2
         with:
           xgo_version: latest
-          go_version: 1.20.x
+          go_version: 1.21
           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,
+          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64 # linux/386,
           v: true
           x: false
           race: false

README.md

@@ -42,21 +42,21 @@ 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/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>
 <a href="https://github.com/lemoeo" title="Lemoe"><img src="https://avatars.githubusercontent.com/u/18618627?v=4" width="50;" alt="Lemoe"/></a>
 <a href="https://github.com/cantoblanco" title="Kris"><img src="https://avatars.githubusercontent.com/u/116849421?v=4" width="50;" alt="Kris"/></a>
 <a href="https://github.com/nap0o" title="nap0o"><img src="https://avatars.githubusercontent.com/u/144927971?v=4" width="50;" alt="nap0o"/></a>
-<a href="https://github.com/uubulb" title="UUBulb"><img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="UUBulb"/></a>
-<a href="https://github.com/spiritLHLS" title="spiritlhl"><img src="https://avatars.githubusercontent.com/u/103393591?v=4" width="50;" alt="spiritlhl"/></a>
-<a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
 <a href="https://github.com/CosmosZ-code" title="CosmosZ-code"><img src="https://avatars.githubusercontent.com/u/81398224?v=4" width="50;" alt="CosmosZ-code"/></a>
-<a href="https://github.com/lvgj-stack" title="Ko no dio"><img src="https://avatars.githubusercontent.com/u/38449861?v=4" width="50;" alt="Ko no dio"/></a>
+<a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
-<a href="https://github.com/hhhkkk520" title="Kris"><img src="https://avatars.githubusercontent.com/u/52115472?v=4" width="50;" alt="Kris"/></a>
+<a href="https://github.com/spiritLHLS" title="spiritlhl"><img src="https://avatars.githubusercontent.com/u/103393591?v=4" width="50;" alt="spiritlhl"/></a>
 <a href="https://github.com/1ridic" title="1ridic"><img src="https://avatars.githubusercontent.com/u/88495501?v=4" width="50;" alt="1ridic"/></a>
+<a href="https://github.com/hhhkkk520" title="Kris"><img src="https://avatars.githubusercontent.com/u/52115472?v=4" width="50;" alt="Kris"/></a>
+<a href="https://github.com/lvgj-stack" title="Ko no dio"><img src="https://avatars.githubusercontent.com/u/38449861?v=4" width="50;" alt="Ko no dio"/></a>
+<a href="https://github.com/uubulb" title="UUBulb"><img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="UUBulb"/></a>
 <a href="https://github.com/Mmx233" title="Mmx"><img src="https://avatars.githubusercontent.com/u/36563672?v=4" width="50;" alt="Mmx"/></a>
 <a href="https://github.com/rootmelo92118" title="rootmelo92118"><img src="https://avatars.githubusercontent.com/u/32770959?v=4" width="50;" alt="rootmelo92118"/></a>
+<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/iilemon" title="Sean"><img src="https://avatars.githubusercontent.com/u/33201711?v=4" width="50;" alt="Sean"/></a>
 <a href="https://github.com/fscarmen" title="fscarmen"><img src="https://avatars.githubusercontent.com/u/62703343?v=4" width="50;" alt="fscarmen"/></a>
 <a href="https://github.com/ch8o" title="no-name-now"><img src="https://avatars.githubusercontent.com/u/9103372?v=4" width="50;" alt="no-name-now"/></a>
@@ -66,8 +66,8 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/coreff" title="Core F"><img src="https://avatars.githubusercontent.com/u/38347122?v=4" width="50;" alt="Core F"/></a>
 <a href="https://github.com/colour93" title="玖叁"><img src="https://avatars.githubusercontent.com/u/64313711?v=4" width="50;" alt="玖叁"/></a>
 <a href="https://github.com/arkylin" title="凌"><img src="https://avatars.githubusercontent.com/u/35104502?v=4" width="50;" alt="凌"/></a>
-<a href="https://github.com/zhucaidan" title="zhucaidan"><img src="https://avatars.githubusercontent.com/u/47970938?v=4" width="50;" alt="zhucaidan"/></a>
 <a href="https://github.com/ysicing" title="缘生"><img src="https://avatars.githubusercontent.com/u/8605565?v=4" width="50;" alt="缘生"/></a>
+<a href="https://github.com/sunnywangzi" title="wang"><img src="https://avatars.githubusercontent.com/u/88769439?v=4" width="50;" alt="wang"/></a>
 <a href="https://github.com/unclezs" title="unclezs"><img src="https://avatars.githubusercontent.com/u/42318775?v=4" width="50;" alt="unclezs"/></a>
 <a href="https://github.com/yuanweize" title="I"><img src="https://avatars.githubusercontent.com/u/30067203?v=4" width="50;" alt="I"/></a>
 <a href="https://github.com/guoyongchang" title="guoyongchang"><img src="https://avatars.githubusercontent.com/u/10484506?v=4" width="50;" alt="guoyongchang"/></a>

cmd/dashboard/controller/member_api.go

@@ -301,8 +301,6 @@ type serverForm struct {
 	Note         string
 	HideForGuest string
 	EnableDDNS   string
-	EnableIPv4   string
-	EnableIpv6   string
 	DDNSDomain   string
 }
 
@@ -320,8 +318,6 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
 		s.Note = sf.Note
 		s.HideForGuest = sf.HideForGuest == "on"
 		s.EnableDDNS = sf.EnableDDNS == "on"
-		s.EnableIPv4 = sf.EnableIPv4 == "on"
-		s.EnableIpv6 = sf.EnableIpv6 == "on"
 		s.DDNSDomain = sf.DDNSDomain
 		if s.ID == 0 {
 			s.Secret, err = utils.GenerateRandomString(18)

go.mod

@@ -1,9 +1,11 @@
 module github.com/naiba/nezha
 
-go 1.20
+go 1.21
+
+toolchain go1.21.3
 
 require (
-	code.cloudfoundry.org/bytefmt v0.0.0-20240405144452-ebb2996022ca
+	code.cloudfoundry.org/bytefmt v0.0.0-20240322144145-4816192cb114
 	code.gitea.io/sdk/gitea v0.17.1
 	github.com/BurntSushi/toml v1.3.2
 	github.com/gin-contrib/pprof v1.4.0
@@ -20,15 +22,15 @@ require (
 	github.com/samber/lo v1.39.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
-	github.com/xanzy/go-gitlab v0.102.0
+	github.com/xanzy/go-gitlab v0.100.0
-	golang.org/x/crypto v0.22.0
+	golang.org/x/crypto v0.21.0
-	golang.org/x/oauth2 v0.19.0
+	golang.org/x/oauth2 v0.18.0
-	golang.org/x/sync v0.7.0
+	golang.org/x/sync v0.6.0
 	golang.org/x/text v0.14.0
-	google.golang.org/grpc v1.63.0
+	google.golang.org/grpc v1.62.1
 	google.golang.org/protobuf v1.33.0
 	gorm.io/driver/sqlite v1.5.5
-	gorm.io/gorm v1.25.9
+	gorm.io/gorm v1.25.8
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -44,6 +46,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
@@ -73,10 +76,11 @@ require (
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,5 +1,5 @@
-code.cloudfoundry.org/bytefmt v0.0.0-20240405144452-ebb2996022ca h1:pyybVFhefCroOyqu71Rrnm0eORYFJMvTDsAsyPLjvEI=
+code.cloudfoundry.org/bytefmt v0.0.0-20240322144145-4816192cb114 h1:7KJsK0gPah7XfO46ARJA2TUXHZaJEnPI80mzxQLre68=
-code.cloudfoundry.org/bytefmt v0.0.0-20240405144452-ebb2996022ca/go.mod h1:21qd3QlOUZT1oQ2RccnLvWRu7CZWSN+3ZlUh2mzoE10=
+code.cloudfoundry.org/bytefmt v0.0.0-20240322144145-4816192cb114/go.mod h1:TNAH6xe5WOszc47+zM7NnpaJWBR8oYt12BUf4WLIZ98=
 code.gitea.io/sdk/gitea v0.17.1 h1:3jCPOG2ojbl8AcfaUCRYLT5MUcBMFwS0OSK2mA5Zok8=
 code.gitea.io/sdk/gitea v0.17.1/go.mod h1:aCnBqhHpoEWA180gMbaCtdX9Pl6BWBAuuP2miadoTNM=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
@@ -14,10 +14,13 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0=
 github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
@@ -32,8 +35,10 @@ github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SU
 github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
 github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
@@ -44,26 +49,33 @@ github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXS
 github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v47 v47.1.0 h1:Cacm/WxQBOa9lF0FT0EMjZ2BWMetQ1TQfyurn4yF1z8=
 github.com/google/go-github/v47 v47.1.0/go.mod h1:VPZBXNbFSJGjyjFRUKo9vZGawTajnWzC/YjGw/oFKi0=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f h1:f00RU+zOX+B3rLAmMMkzHUF2h1z4DeYR9tTCvEq2REY=
+github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07 h1:57oOH2Mu5Nw16KnZAVLdlUjmPH/TSYCKTJgG0OVfX0Y=
+github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
 github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
 github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
@@ -87,6 +99,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -97,6 +110,7 @@ github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNa
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
@@ -111,8 +125,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
-github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
+github.com/onsi/ginkgo/v2 v2.17.0 h1:kdnunFXpBjbzN56hcJHrXZ8M+LOkenKA7NnBzTNigTI=
+github.com/onsi/ginkgo/v2 v2.17.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
+github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
 github.com/ory/graceful v0.1.3 h1:FaeXcHZh168WzS+bqruqWEw/HgXWLdNv2nJ+fbhxbhc=
 github.com/ory/graceful v0.1.3/go.mod h1:4zFz687IAF7oNHHiB586U4iL+/4aV09o/PYLE34t2bA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
@@ -125,11 +141,13 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
@@ -168,8 +186,8 @@ github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/xanzy/go-gitlab v0.102.0 h1:ExHuJ1OTQ2yt25zBMMj0G96ChBirGYv8U7HyUiYkZ+4=
+github.com/xanzy/go-gitlab v0.100.0 h1:jaOtYj5nWI19+9oVVmgy233pax2oYqucwetogYU46ks=
-github.com/xanzy/go-gitlab v0.102.0/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI=
+github.com/xanzy/go-gitlab v0.100.0/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -184,8 +202,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -196,15 +214,15 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
+golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
-golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
+golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -218,18 +236,20 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -240,14 +260,18 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
-google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
@@ -267,8 +291,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
 gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
-gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8=
+gorm.io/gorm v1.25.8 h1:WAGEZ/aEcznN4D03laj8DKnehe1e9gYQAjW8xyPRdeo=
-gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.8/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

model/server.go

@@ -18,8 +18,6 @@ type Server struct {
 	DisplayIndex int    // 展示排序，越大越靠前
 	HideForGuest bool   // 对游客隐藏
 	EnableDDNS   bool   // 是否启用DDNS 未在配置文件中启用DDNS 或 DDNS检查时间为0时此项无效
-	EnableIPv4   bool   // 是否启用DDNS IPv4
-	EnableIpv6   bool   // 是否启用DDNS IPv6
 	DDNSDomain   string // DDNS中的前缀 如基础域名为abc.oracle DDNSName为mjj 就会把mjj.abc.oracle解析服务器IP 为空则停用
 
 	Host       *Host      `gorm:"-"`
@@ -56,5 +54,5 @@ func (s Server) Marshal() template.JS {
 	note, _ := utils.Json.Marshal(s.Note)
 	secret, _ := utils.Json.Marshal(s.Secret)
 	ddnsDomain, _ := utils.Json.Marshal(s.DDNSDomain)
-	return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s,"HideForGuest": %s,"EnableDDNS": %s,"EnableIPv4": %s,"EnableIpv6": %s,"DDNSDomain": %s}`, s.ID, name, secret, s.DisplayIndex, tag, note, boolToString(s.HideForGuest), boolToString(s.EnableDDNS), boolToString(s.EnableIPv4), boolToString(s.EnableIpv6), ddnsDomain)) // #nosec
+	return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s,"HideForGuest": %s,"EnableDDNS": %s,"DDNSDomain": %s}`, s.ID, name, secret, s.DisplayIndex, tag, note, boolToString(s.HideForGuest), boolToString(s.EnableDDNS), ddnsDomain)) // #nosec
 }

resource/l10n/en-US.toml

@@ -32,10 +32,10 @@ other = "Logout"
 other = "Login"
 
 [ConfirmLogout]
-other = "Do you want to Logout?"
+other = "Confirm Logout?"
 
 [AfterLoggingOutYouHaveToLoginAgain]
-other = "You need to Login again to continue"
+other = "You need to login again after logout to continue"
 
 [Cancel]
 other = "Cancel"
@@ -227,7 +227,7 @@ other = "Secret"
 other = "Note"
 
 [LinuxOneKeyInstall]
-other = "Linux One-Command Install"
+other = "Linux One-Key Install"
 
 [NoDomainAlert]
 other = "Set CDN bypassed Domain/IP in setting before using this function"
@@ -257,7 +257,7 @@ other = "Execute by Trigger"
 other = "Delete Scheduled Task"
 
 [ConfirmToDeleteThisScheduledTask]
-other = "Are you sure you want to Delete?"
+other = "Confirm Delete?"
 
 [AccessDenied]
 other = "Access Denied"
@@ -293,7 +293,7 @@ other = "Delete Notification Method"
 other = "Confirm to Delete This Notification Method?"
 
 [ForceUpdate]
-other = "Force to Update"
+other = "Force Update"
 
 [SelectAll]
 other = "Select All"
@@ -302,7 +302,7 @@ other = "Select All"
 other = "Version"
 
 [OneKeyInstall]
-other = "One-Command Install"
+other = "One-Key Install"
 
 [ClickToCopy]
 other = "Click To Copy"
@@ -398,7 +398,7 @@ other = "Virtualization"
 other = "Swap"
 
 [NetTransfer]
-other = "Usage"
+other = "Transfer"
 
 [Load]
 other = "Load"
@@ -419,7 +419,7 @@ other = "Last Active"
 other = "Version"
 
 [NetSpeed]
-other = "NIC"
+other = "Speed"
 
 [Uptime]
 other = "Uptime"
@@ -473,7 +473,7 @@ other = "Next check"
 other = "Current Usage"
 
 [VerifyPassword]
-other = "Please enter your password"
+other = "Verify Password"
 
 [LightMode]
 other = "Light Mode"
@@ -482,7 +482,7 @@ other = "Light Mode"
 other = "Dark Mode"
 
 [FollowSystem]
-other = "System Auto"
+other = "Follow System"
 
 [GridLayout]
 other = "Grid Layout"
@@ -619,12 +619,6 @@ other = "Enable Show in Service"
 [EnableDDNS]
 other = "Enable DDNS"
 
-[EnableIPv4]
-other = "Enable DDNS IPv4"
-
-[EnableIpv6]
-other = "Enable DDNS IPv6"
-
 [DDNSDomain]
 other = "DDNS Domain"
 
@@ -635,10 +629,7 @@ other = "Feature"
 other = "Template"
 
 [Stat]
-other = "Asset"
+other = "Stat"
 
 [DisableSwitchTemplateInFrontend]
 other = "Disable Switch Template in Frontend"
-
-[ServersOnWorldMap]
-other = "Servers On World Map"

resource/l10n/es-ES.toml

@@ -619,12 +619,6 @@ other = "Mostrar en servicio"
 [EnableDDNS]
 other = "Habilitar DDNS"
 
-[EnableIPv4]
-other = "Habilitar DDNS IPv4"
-
-[EnableIpv6]
-other = "Habilitar DDNS IPv6"
-
 [DDNSDomain]
 other = "Dominio DDNS"
 
@@ -639,6 +633,3 @@ other = "Stat"
 
 [DisableSwitchTemplateInFrontend]
 other = "Deshabilitar Cambio de Plantilla en Frontend"
-
-[ServersOnWorldMap]
-other = "Servidores en el mapa mundial"

resource/l10n/zh-CN.toml

@@ -619,12 +619,6 @@ other = "在服务中显示"
 [EnableDDNS]
 other = "启用DDNS"
 
-[EnableIPv4]
-other = "启用DDNS IPv4"
-
-[EnableIpv6]
-other = "启用DDNS IPv6"
-
 [DDNSDomain]
 other = "DDNS域名"
 
@@ -639,6 +633,3 @@ other = "信息"
 
 [DisableSwitchTemplateInFrontend]
 other = "禁止前台切换模板"
-
-[ServersOnWorldMap]
-other = "服务器世界分布图"

resource/l10n/zh-TW.toml

@@ -619,12 +619,6 @@ other = "在服務中顯示"
 [EnableDDNS]
 other = "啟用DDNS"
 
-[EnableIPv4]
-other = "啟用DDNS IPv4"
-
-[EnableIpv6]
-other = "啟用DDNS IPv6"
-
 [DDNSDomain]
 other = "DDNS網域"
 
@@ -639,6 +633,3 @@ other = "信息"
 
 [DisableSwitchTemplateInFrontend]
 other = "禁止前台切換主題"
-
-[ServersOnWorldMap]
-other = "伺服器世界分布圖"

resource/static/main.js

@@ -327,16 +327,6 @@ function addOrEditServer(server, conf) {
   } else {
     modal.find(".ui.enableddns.checkbox").checkbox("set unchecked");
   }
-  if (server && server.EnableIPv4) {
-    modal.find(".ui.enableipv4.checkbox").checkbox("set checked");
-  } else {
-    modal.find(".ui.enableipv4.checkbox").checkbox("set unchecked");
-  }
-  if (server && server.EnableIpv6) {
-    modal.find(".ui.enableipv6.checkbox").checkbox("set checked");
-  } else {
-    modal.find(".ui.enableipv6.checkbox").checkbox("set unchecked");
-  }
   showFormModal(".server.modal", "#serverForm", "/api/server");
 }
 

resource/static/theme-default/css/main.css

@@ -10,6 +10,14 @@
   .ui.card>.content>.header:not(.ui),.ui.cards>.card>.content>.header:not(.ui) {
     margin-top:0.4em !important;
   }
+  .ui.card>.content>.header,.ui.cards>.card>.content>.header {
+    padding-top: 0.5rem;
+    display: flex;
+    color: rgba(0, 0, 0, .85);
+    align-items: center;
+    padding-bottom: .2em;
+    border-bottom: 1px solid rgba(0, 0, 0, .2);
+  }
   .ui.menu .item>img:not(.ui){
     width: 2.2rem;
   }

resource/static/theme-server-status/css/dark.css

@@ -157,16 +157,3 @@ body[theme="dark"] footer p a:hover {
     color: #f1f1f1;
     text-decoration: none;
 }
-
-body[theme="dark"] .modal-content{
-    background-color: #1c1d26;
-    color: #f1f1f1;
-}
-
-body[theme="dark"] .modal-header{
-    border-bottom-color:#080808;
-}
-
-body[theme="dark"] .modal-header i{
-    color: #f1f1f1;
-}

resource/static/theme-server-status/css/light.css

@@ -132,16 +132,3 @@ body[theme="light"] footer p a:hover {
     color: #333333;
     text-decoration: none;
 }
-
-body[theme="light"] .modal-content{
-    background-color: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
-}
-
-body[theme="light"] .modal-header{
-    border-bottom-color:#f1f1f1;
-}
-
-body[theme="light"] .modal-header i{
-    color: rgba(0, 0, 0, 0.87);
-}

resource/static/theme-server-status/css/main.css

@@ -281,42 +281,10 @@ body {
 .service-status .tooltip-inner {
     max-width: 500px;
 }
+
+
+
 /* 服务页 正文结束 */
-
-
-/* 服务器分布图 */
-#mapChartBox{
-    z-index: 999999999;
-}
-
-.modal-content{
-    display: flex;
-    flex-direction: column;
-    pointer-events: auto;
-}
-
-.modal-dialog-centered{
-    margin: 0 auto;
-    width: 1134px;
-    max-width: 1134px;
-    display: flex;
-    align-items: center; /* 垂直居中 */
-    justify-content: center; /* 水平居中 */
-    min-height: calc(100%) /* 确保模态框占据整个视口高度 */
-}
-
-.modal-header{
-    position: relative;
-}
-
-.modal-header i{
-    cursor: pointer;
-    position: absolute;
-    font-size: 2em;
-    top: 13px;
-    right: 13px;
-}
-
 @media only screen and (max-width: 1200px) {
     .accordian-body{
         margin: 5px 0px 5px 10px;        
@@ -397,16 +365,6 @@ body {
     .toolbox {
         right: 18px;
     }
-    .modal-dialog-centered{
-        width: 95%;
-    }
-    .modal-title{
-        line-height: 0.5;
-    }
-    .modal-header i{
-        top: 8px;
-        right: 8px;
-    }
 }
 
 @media only screen and (min-width: 768px) {

resource/static/theme-server-status/js/html5shiv.js

@@ -21,7 +21,7 @@
   /** Name of the expando, to work with multiple documents or to re-shiv one document */
   var expando = '_html5shiv';
 
-  /** The id for the documents expando */
+  /** The id for the the documents expando */
   var expanID = 0;
 
   /** Cached data for each document */

resource/template/common/footer.html

@@ -10,7 +10,7 @@
 <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.js"></script>
 <script src="/static/semantic-ui-alerts.min.js"></script>
 <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
-<script src="/static/main.js?v20240330"></script>
+<script src="/static/main.js?v20240224"></script>
 <script>
     (function () {
         updateLang({{.LANG }});

resource/template/component/server.html

@@ -32,18 +32,6 @@
                     <label>{{tr "EnableDDNS"}}</label>
                 </div>
             </div>
-            <div class="field">
-                <div class="ui enableipv4 checkbox">
-                    <input name="EnableIPv4" type="checkbox" tabindex="0" />
-                    <label>{{tr "EnableIPv4"}}</label>
-                </div>
-            </div>
-            <div class="field">
-                <div class="ui enableipv6 checkbox">
-                    <input name="EnableIpv6" type="checkbox" tabindex="0" />
-                    <label>{{tr "EnableIpv6"}}</label>
-                </div>
-            </div>
             <div class="field">
                 <label>{{tr "DDNSDomain"}}</label>
                 <input type="text" name="DDNSDomain" placeholder="{{tr "DDNSDomain"}}">

resource/template/dashboard-default/server.html

@@ -30,8 +30,6 @@
                     <th>{{tr "VersionNumber"}}</th>
                     <th>{{tr "HideForGuest"}}</th>
                     <th>{{tr "EnableDDNS"}}</th>
-                    <th>{{tr "EnableIPv4"}}</th>
-                    <th>{{tr "EnableIpv6"}}</th>
                     <th>{{tr "DDNSDomain"}}</th>
                     <th>{{tr "Secret"}}</th>
                     <th>{{tr "OneKeyInstall"}}</th>
@@ -50,8 +48,6 @@
                     <td>{{$server.Host.Version}}</td>
                     <td>{{$server.HideForGuest}}</td>
                     <td>{{$server.EnableDDNS}}</td>
-                    <td>{{$server.EnableIPv4}}</td>
-                    <td>{{$server.EnableIpv6}}</td>
                     <td>{{$server.DDNSDomain}}</td>
                     <td>
                         <button class="ui icon green mini button" data-clipboard-text="{{$server.Secret}}" data-tooltip="{{tr "ClickToCopy"}}">

resource/template/theme-angel-kanade/footer.html

@@ -13,7 +13,7 @@
 <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/semantic-ui/2.4.1/semantic.min.js"></script>
 <script src="/static/semantic-ui-alerts.min.js"></script>
 <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
-<script src="/static/main.js?v20240330"></script>
+<script src="/static/main.js?v20240224"></script>
 <script src="/static/theme-default/js/mixin.js?v20240302"></script>
 <script>
     (function () {

resource/template/theme-daynight/network.html

@@ -20,281 +20,357 @@
 </head>
 
 <body data-theme="light" data-gridlist="grid">
-    <header>
+<header>
-        <section class="nav-bar clearfix">
+    <section class="nav-bar clearfix">
-            <figure class="logo">
+        <figure class="logo">
-                <a href="/">
+            <a href="/">
-                    <img src="/static/logo.svg?v20210804" alt='{{tr "NezhaMonitoring"}}' width="50" height="50">
+                <img src="/static/logo.svg?v20210804" alt='{{tr "NezhaMonitoring"}}' width="50" height="50">
-                </a>
+            </a>
-                <a href="/">{{.Conf.Site.Brand}}</a>
+            <a href="/">{{.Conf.Site.Brand}}</a>
-            </figure>
+        </figure>
-            <div class="icon-container">
+        <div class="icon-container">
-                <div class="row cf">
+            <div class="row cf">
-                    <div class="three col">
+                <div class="three col">
-                        <div class="hamburger" id="hamburger-icon"><span class="line"></span><span
+                    <div class="hamburger" id="hamburger-icon"><span class="line"></span><span
-                                class="line"></span><span class="line"></span></div>
+                            class="line"></span><span class="line"></span></div>
-                    </div>
-                </div>
-            </div>
-            <nav class="nav-menu">
-                <ul>
-                    <li><a href="/">{{tr "Home"}}</a></li>
-                    <li><a href="/service">{{tr "Services"}}</a></li>
-                    <li><a href="/network">{{tr "NetworkSpiter"}}</a></li>
-                    {{if .Admin}}
-                    <li><a href="/server">{{tr "AdminPanel"}}</a></li>
-                    {{else}}
-                    <li><a href="/login">{{tr "Login"}}</a></li>
-                    {{end}}
-                </ul>
-            </nav>
-        </section>
-    </header>
-
-    <main>
-        <div id="network">
-            <div class="server-info-container" v-for='server in servers' :id="server.ID">
-                <div class="info-body" @click="redirectNetwork(server.ID)">
-                    <ul class="server-info-body-container">
-                        <li>
-                            <h3>@#server.Name#@</h3>
-                        </li>
-                        <li><img :src="'/static/theme-daynight/img/flag/'+(server.Host&&server.Host.CountryCode?server.Host.CountryCode.toUpperCase():'CN')+'.png'"
-                                :title="server.Host.CountryCode.toUpperCase()" /></li>
-                    </ul>
                 </div>
             </div>
         </div>
-        <div class="network-chart" style="height: 800px;overflow: hidden">
+        <nav class="nav-menu">
-            <div id="monitor-info-container" style="height: 520px;max-width: 1400px">
-            </div>
-        </div>
-        <div class="sidebar-container">
             <ul>
-                <li><i class="fas fa-sun" title='{{tr "LightMode"}}'></i><span>{{tr "LightMode"}}</span></li>
+                <li><a href="/">{{tr "Home"}}</a></li>
-                <li><i class="fas fa-moon" title='{{tr "DarkMode"}}'></i><span>{{tr "DarkMode"}}</span></li>
+                <li><a href="/service">{{tr "Services"}}</a></li>
-                <li><i class="fas fa-th" title='{{tr "GridLayout"}}'></i><span>{{tr "GridLayout"}}</span></li>
+                <li><a href="/network">{{tr "NetworkSpiter"}}</a></li>
-                <li><i class="fas fa-list-ul" title='{{tr "ListLayout"}}'></i><span>{{tr "ListLayout"}}</span></li>
+                {{if .Admin}}
+                <li><a href="/server">{{tr "AdminPanel"}}</a></li>
+                {{else}}
+                <li><a href="/login">{{tr "Login"}}</a></li>
+                {{end}}
             </ul>
-        </div>
+        </nav>
-    </main>
-
-    <section class="dark-light-toggle">
-        <label class="switcher">
-            <input type="checkbox" name="theme" id="dark-light" />
-            <div>
-                <i class="fas fa-adjust"></i>
-            </div>
-        </label>
     </section>
+</header>
 
-    <!-- Back to top button -->
+<main>
-    <a id="back-to-top"></a>
+    <div id="network">
+        <div class="server-info-container" v-for='server in servers' :id="server.ID" style="font-size: .6em">
+            <div class="info-body" @click="redirectNetwork(server.ID)">
+                <ul class="server-info-body-container">
+                    <li>
+                        <h3>@#server.Name#@</h3>
+                    </li>
+                    <li><img :src="'/static/theme-daynight/img/flag/'+(server.Host&&server.Host.CountryCode?server.Host.CountryCode.toUpperCase():'CN')+'.png'"
+                             :title="server.Host.CountryCode.toUpperCase()" /></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="network-chart" style="height: 800px;overflow: hidden">
+        <div id="monitor-info-container" style="height: 520px;max-width: 1400px">
+        </div>
+    </div>
+    <div class="sidebar-container">
+        <ul>
+            <li><i class="fas fa-sun" title='{{tr "LightMode"}}'></i><span>{{tr "LightMode"}}</span></li>
+            <li><i class="fas fa-moon" title='{{tr "DarkMode"}}'></i><span>{{tr "DarkMode"}}</span></li>
+            <li><i class="fas fa-th" title='{{tr "GridLayout"}}'></i><span>{{tr "GridLayout"}}</span></li>
+            <li><i class="fas fa-list-ul" title='{{tr "ListLayout"}}'></i><span>{{tr "ListLayout"}}</span></li>
+        </ul>
+    </div>
+</main>
 
-    <footer>
+<section class="dark-light-toggle">
-        <div class="footer-container">
+    <label class="switcher">
-            <div><a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "NezhaMonitoring"}} ·
+        <input type="checkbox" name="theme" id="dark-light" />
-                    {{.Version}}</a>
+        <div>
-                <p>&copy; <span id="copyright-date">
+            <i class="fas fa-adjust"></i>
+        </div>
+    </label>
+</section>
+
+<!-- Back to top button -->
+<a id="back-to-top"></a>
+
+<footer>
+    <div class="footer-container">
+        <div><a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "NezhaMonitoring"}} · {{.Version}}</a>
+            <p>&copy; <span id="copyright-date">
                         <script>document.getElementById('copyright-date').appendChild(document.createTextNode(new Date().getFullYear()))</script>
                     </span> · <a href="https://blog.jackiesung.com" target="_blank">Theme designed by Jackie Sung</a>
-                </p>
+            </p>
-            </div>
         </div>
-    </footer>
+    </div>
+</footer>
 
-    <script src="/static/theme-daynight/js/main.js?v202102012266"></script>
+<script src="/static/theme-daynight/js/main.js?v202102012266"></script>
-    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
-    <script
+<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/limonte-sweetalert2/11.4.4/sweetalert2.all.min.js"></script>
-        src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/limonte-sweetalert2/11.4.4/sweetalert2.all.min.js"></script>
 
-    <script>
+<script>
-        const monitorInfo = JSON.parse('{{.MonitorInfos}}');
+    const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
-        const initData = JSON.parse('{{.Servers}}').servers;
+    const initData = JSON.parse('{{.Servers}}').servers;
-        let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
+    let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
-        // 基于准备好的dom，初始化echarts实例
+    if (MaxTCPPingValue == null) {
-        const myChart = echarts.init(document.getElementById('monitor-info-container'));
+        MaxTCPPingValue = 1000;
-
+    }
-        // 使用刚指定的配置项和数据显示图表。
+    new Vue({
-        var statusCards = new Vue({
+        el: '#app',
-            el: '#network',
+        delimiters: ['@#', '#@'],
-            delimiters: ['@#', '#@'],
+        data: {
-            data: {
+            page: 'network',
-                servers: initData,
+            defaultTemplate: {{.Conf.Site.Theme}},
-                cache: [],
+            templates: {{.Themes}},
-                option: {
+            servers: initData,
-                    tooltip: {
+            option: {
-                        trigger: 'axis',
+                tooltip: {
-                        position: function (pt) {
+                    trigger: 'axis',
-                            return [pt[0], '10%'];
+                    position: function (pt) {
-                        },
+                        return [pt[0], '10%'];
-                        formatter: function (params) {
-                            let result = params[0].axisValueLabel + "<br />";
-                            params.forEach(function (item) {
-                                result += item.marker + item.seriesName + ": " + item.value[1].toFixed(2) + " ms<br />";
-                            })
-                            return result;
-                        },
-                        confine: true,
-                        transitionDuration: 0
                     },
-                    title: {
+                    formatter: function(params){
-                        left: 'center',
+                        let result = params[0].axisValueLabel + "<br />";
-                        text: "",
+                        params.forEach(function(item){
-                        textStyle: {}
+                            result += item.marker + item.seriesName + ": " + item.value[1].toFixed(2) + " ms<br />";
+                         })
+                        return result;
                     },
-                    legend: {
+                    confine: true,
-                        top: '5%',
+                    transitionDuration: 0
-                        data: [],
+                },
-                        textStyle: {
+                title: {
-                            fontSize: 14
+                    left: 'center',
-                        }
+                    text: "",
-                    },
+                    textStyle: {}
-                    toolbox: {
+                },
-                        feature: {
+                legend: {
-                            dataZoom: {
+                    top: '5%',
-                                yAxisIndex: 'none'
+                    data: [],
-                            },
+                    textStyle: {
-                            restore: {},
+                        fontSize: 14
-                            saveAsImage: {}
-                        }
-                    },
-                    dataZoom: [
-                        {
-                            start: 94,
-                            end: 100
-                        }
-                    ],
-                    xAxis: {
-                        type: 'time',
-                        boundaryGap: false
-                    },
-                    yAxis: {
-                        type: 'value',
-                        boundaryGap: [0, '100%']
-                    },
-                    series: [],
-                }
-            },
-            mounted() {
-                this.DarkMode();
-                this.parseMonitorInfo(monitorInfo);
-                window.addEventListener('resize', this.resizeHandle);
-            },
-            destroyed() {
-                window.removeEventListener('resize', this.resizeHandle)
-            },
-            methods: {
-                DarkMode() {
-                    const hour = new Date(Date.now()).getHours()
-                    if (hour > 17 || hour < 4) {
-                        document.querySelector("input[name=theme]").checked = true;
-                        document.getElementsByTagName("BODY")[0].setAttribute('data-theme', 'dark');
-                        document.getElementById("monitor-info-container").style.backgroundColor = "#1E1E1E";
                     }
                 },
-                redirectNetwork(id) {
+                grid: {
+                    left: '8%',
+                    right: '8%',
+                },
+                backgroundColor: 'rgba(255, 255, 255, 0.8)',
+                toolbox: {
+                    feature: {
+                        dataZoom: {
+                            yAxisIndex: 'none'
+                        },
+                        restore: {},
+                        saveAsImage: {}
+                    }
+                },
+                dataZoom: [
+                    {
+                        start: 0,
+                        end: 100
+                    }
+                ],
+                xAxis: {
+                    type: 'time',
+                    boundaryGap: false
+                },
+                yAxis: {
+                    type: 'value',
+                    boundaryGap: false
+                },
+                series: [],
+            },
+            chartOnOff: true,
+        },
+        mixins: [mixinsVue],
+        mounted() {
+            this.renderChart();
+            this.parseMonitorInfo(monitorInfo);
+            window.addEventListener('resize', this.resizeHandle);
+        },
+        destroyed () {
+            window.removeEventListener('resize', this.resizeHandle)
+        },
+        methods: {
+            getFontLogoClass(str) {
+                if (["almalinux",
+                        "alpine",
+                        "aosc",
+                        "apple",
+                        "archlinux",
+                        "archlabs",
+                        "artix",
+                        "budgie",
+                        "centos",
+                        "coreos",
+                        "debian",
+                        "deepin",
+                        "devuan",
+                        "docker",
+                        "elementary",
+                        "fedora",
+                        "ferris",
+                        "flathub",
+                        "freebsd",
+                        "gentoo",
+                        "gnu-guix",
+                        "illumos",
+                        "kali-linux",
+                        "linuxmint",
+                        "mageia",
+                        "mandriva",
+                        "manjaro",
+                        "nixos",
+                        "openbsd",
+                        "opensuse",
+                        "pop-os",
+                        "raspberry-pi",
+                        "redhat",
+                        "rocky-linux",
+                        "sabayon",
+                        "slackware",
+                        "snappy",
+                        "solus",
+                        "tux",
+                        "ubuntu",
+                        "void",
+                        "zorin"].indexOf(str)
+                    > -1) {
+                    return str;
+                }
+                if (['openwrt', 'linux', "immortalwrt"].indexOf(str) > -1) {
+                    return 'tux';
+                }
+                if (str == 'amazon') {
+                    return 'redhat';
+                }
+                if (str == 'arch') {
+                    return 'archlinux';
+                }
+                return '';
+            },
+            redirectNetwork(id) {
                     this.getMonitorHistory(id)
-                        .then(function (monitorInfo) {
+                    .then(function(monitorInfo) {
-                            var vm = network.__vue__;
+                          var vm = app.__vue__;
-                            vm.parseMonitorInfo(monitorInfo);
+                          vm.parseMonitorInfo(monitorInfo);
-                        })
+                    })
-                        .catch(function (error) {
+                    .catch(function(error){
-                            window.location.href = "/404";
+                        window.location.href = "/404";
-                        })
+                    })
                 },
-                getMonitorHistory(id) {
+            getMonitorHistory(id) {
-                    return $.ajax({
+                  return $.ajax({
-                        url: "/api/v1/monitor/" + id,
+                    url: "/api/v1/monitor/"+id,
-                        method: "GET"
+                    method: "GET"
-                    });
+                  });
-                },
+            },
-                parseMonitorInfo(monitorInfo) {
+            parseMonitorInfo(monitorInfo) {
-                    let tSeries = [];
+                let tSeries = [];
-                    let tLegendData = [];
+                let tLegendData = [];
-                    var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
+                var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
-                    for (let i = 0; i < monitorInfo.result.length; i++) {
+                let maxPing = 0;
-                        var lcolor = lcolors[i % lcolors.length];
+                for (let i = 0; i < monitorInfo.result.length; i++) {
-                        var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
+                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                        var rgbaColorBar = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.35)';
+                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                        let loss = 0;
+                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
-                        let data = [];
+                            maxPing = avgDelay;
-                        let datal = [];
-                        for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                            avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                            if (avgDelay > 0 && avgDelay < MaxTCPPingValue) {
-                                data.push([monitorInfo.result[i].created_at[j], avgDelay]);
-                            }
-                            else {
-                                loss += 1;
-                                datal.push({
-                                    xAxis: monitorInfo.result[i].created_at[j],
-                                    label: { show: false },
-                                    emphasis: { disabled: true },
-                                    lineStyle: {
-                                        type: "solid",
-                                        color: rgbaColorBar
-                                    }
-                                });
-                            }
                         }
-                        lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
+                	 }
-                        if (lossRate > 99) {
+                }
-                            datal = [];
+                for (let i = 0; i < monitorInfo.result.length; i++) {
+                    var lcolor = lcolors[i % lcolors.length];
+                    var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
+                    var rgbaColorBar = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.35)';
+                    let loss = 0;
+                    let data = [];
+                    let datal = [];
+                    for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
+                        avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
+                        if (avgDelay > 0 && avgDelay < MaxTCPPingValue) {
+                            data.push([monitorInfo.result[i].created_at[j], avgDelay]);
                         }
-                        legendName = monitorInfo.result[i].monitor_name + " " + lossRate + "%";
+                        else {
-                        tLegendData.push(legendName);
+                            loss += 1;
-                        tSeries.push({
+                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
+                        }
+                    }
+                    lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
+                    if (lossRate > 99) {
+                        datal = [];
+                    }
+                    legendName = monitorInfo.result[i].monitor_name +" "+ lossRate + "%";
+                    tLegendData.push(legendName);
+                    tSeries.push({
                             name: legendName,
                             type: 'line',
                             smooth: true,
                             symbol: 'none',
                             data: data,
-                            markLine: {
-                                symbol: "none",
-                                symbolSize: 0,
-                                data: datal
-                            },
                             markPoint: {
                                 data: [
                                     { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
                                     { type: 'min', symbol: 'pin', name: 'Min', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8, offset: [0, 7.5] }, symbolRotate: 180 }
                                 ]
                             }
-                        });
+                    });
-                    }
+                    tSeries.push({
-                    this.option.title.text = monitorInfo.result[0].server_name;
+                            name: legendName,
-                    this.option.series = tSeries;
+                            type: 'bar',
-                    this.option.legend.data = tLegendData;
+                            smooth: true,
-                    myChart.clear();
+                            symbol: 'none',
-                    myChart.setOption(this.option);
+                            data: datal,
-                },
+                            itemStyle: { color: rgbaColorBar }
-                resizeHandle() {
+                    });
-                    myChart.resize();
+                }
-                },
+                this.option.title.text = monitorInfo.result[0].server_name;
-            }
+                this.option.series = tSeries;
-        });
+                this.option.legend.data = tLegendData;
-    </script>
+                this.myChart.clear();
+                this.myChart.setOption(this.option);
+            },
+                this.option.title.text = monitorInfo.result[0].server_name;
+                this.option.series = tSeries;
+                this.option.legend.data = tLegendData;
+                this.myChart.clear();
+                this.myChart.setOption(this.option);
+            },
+            isWindowsPlatform(str) {
+                return str.includes('Windows')
+            },
+            renderChart() {
+              this.myChart = echarts.init(this.$refs.chartDom);
+              this.myChart.setOption(this.option);
+            },
+            resizeHandle () {
+              this.myChart.resize();
+            },
+        },
+        beforeDestroy() {
+            this.myChart.dispose();
+            this.myChart = null;
+        },
+    });
+</script>
 </body>
 <style>
-    #network {
+#network {
-        width: calc(100vw - 6em);
+    display: grid;
-        max-width: 1400px;
+    /*grid-template-columns: repeat(5, 1fr);*/
-        margin: 1em auto;
+    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
-    }
+    grid-gap: 1em;
-
+    width: 100%;
-    #monitor-info-container {
+    width: calc(100vw - 6em);
-        margin: 0em auto;
+    max-width: 1400px;
-        align-content: start;
+    margin: 1em auto;
-        background-color: #F1F1F2;
+    align-content: start;
-    }
+}
-
+#monitor-info-container{
-    .server-info-container {
+    margin: 0em auto;
-        font-size: .6em;
+    align-content: start;
-        width: fit-content;
+    background-color: #F1F1F2;
-        display: inline-block;
+}
-    }
 </style>
 
 </html>
 {{end}}
+

resource/template/theme-default/home.html

@@ -15,7 +15,7 @@
             <div v-for="server in group.data" :id="server.ID" class="ui card">
               <div class="content" v-if="server.Host" style="margin-top: 10px; padding-bottom: 5px">
                 <div class="header">
-                <i style="width: 22px;border-radius: 4px;" :class="'fi fi-' + server.Host.CountryCode"></i>&nbsp;<i v-if='server.Host.Platform == "darwin"'
+                <img v-if="server.Host.CountryCode" style="border-radius: 5px;width:22px;" :src="'https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/6.6.5/flags/4x3/'+server.Host.CountryCode + '.svg'" alt="国家"/>&nbsp;<i v-if='server.Host.Platform == "darwin"'
                     class="apple icon"></i><i v-else-if='isWindowsPlatform(server.Host.Platform)'
                     class="windows icon"></i><i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                   @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@

resource/template/theme-default/network.html

@@ -28,6 +28,9 @@
     const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
     const initData = JSON.parse('{{.Servers}}').servers;
     let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
+    if (MaxTCPPingValue == null) {
+        MaxTCPPingValue = 1000;
+    }
     new Vue({
         el: '#app',
         delimiters: ['@#', '#@'],
@@ -183,6 +186,15 @@
                 let tSeries = [];
                 let tLegendData = [];
                 var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
+                let maxPing = 0;
+                for (let i = 0; i < monitorInfo.result.length; i++) {
+                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
+                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
+                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
+                            maxPing = avgDelay;
+                        }
+                	 }
+                }
                 for (let i = 0; i < monitorInfo.result.length; i++) {
                     var lcolor = lcolors[i % lcolors.length];
                     var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
@@ -197,15 +209,7 @@
                         }
                         else {
                             loss += 1;
-                            datal.push({
+                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
-                                xAxis: monitorInfo.result[i].created_at[j],
-                                label: { show: false },
-                                emphasis: { disabled: true },
-                                lineStyle: {
-                                    type: "solid",
-                                    color: rgbaColorBar
-                                }
-                            });
                         }
                     }
                     lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
@@ -220,11 +224,6 @@
                             smooth: true,
                             symbol: 'none',
                             data: data,
-                            markLine: {
-                                symbol: "none",
-                                symbolSize :0,
-                                data: datal
-                            },
                             markPoint: {
                                 data: [
                                     { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
@@ -232,6 +231,14 @@
                                 ]
                             }
                     });
+                    tSeries.push({
+                            name: legendName,
+                            type: 'bar',
+                            smooth: true,
+                            symbol: 'none',
+                            data: datal,
+                            itemStyle: { color: rgbaColorBar }
+                    });
                 }
                 this.option.title.text = monitorInfo.result[0].server_name;
                 this.option.series = tSeries;

resource/template/theme-mdui/network.html

@@ -55,6 +55,9 @@
     const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
     const initData = JSON.parse('{{.Servers}}').servers;
     let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
+    if (MaxTCPPingValue == null) {
+        MaxTCPPingValue = 1000;
+    }
     new Vue({
         el: '#app',
         delimiters: ['@#', '#@'],
@@ -206,6 +209,15 @@
                 let tSeries = [];
                 let tLegendData = [];
                 var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
+                let maxPing = 0;
+                for (let i = 0; i < monitorInfo.result.length; i++) {
+                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
+                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
+                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
+                            maxPing = avgDelay;
+                        }
+                	 }
+                }
                 for (let i = 0; i < monitorInfo.result.length; i++) {
                     var lcolor = lcolors[i % lcolors.length];
                     var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
@@ -220,15 +232,7 @@
                         }
                         else {
                             loss += 1;
-                            datal.push({
+                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
-                                xAxis: monitorInfo.result[i].created_at[j],
-                                label: { show: false },
-                                emphasis: { disabled: true },
-                                lineStyle: {
-                                    type: "solid",
-                                    color: rgbaColorBar
-                                }
-                            });
                         }
                     }
                     lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
@@ -243,11 +247,6 @@
                             smooth: true,
                             symbol: 'none',
                             data: data,
-                            markLine: {
-                                symbol: "none",
-                                symbolSize :0,
-                                data: datal
-                            },
                             markPoint: {
                                 data: [
                                     { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
@@ -255,6 +254,14 @@
                                 ]
                             }
                     });
+                    tSeries.push({
+                            name: legendName,
+                            type: 'bar',
+                            smooth: true,
+                            symbol: 'none',
+                            data: datal,
+                            itemStyle: { color: rgbaColorBar }
+                    });
                 }
                 this.option.title.text = monitorInfo.result[0].server_name;
                 this.option.series = tSeries;

resource/template/theme-server-status/content-footer.html

@@ -5,9 +5,6 @@
     </p>
 </footer>
 <aside class="toolbox">
-    <span v-if="page=='index' && countryMapChartData.length!=0" class="showMapChart">
-        <i @click="showMapChart" data-toggle="modal" data-target="#mapChartBox" class="bi bi-geo-alt"></i>
-    </span>
     <span class="toggleView">
         <i v-if="showGroup" @click="toggleView" class="show-nogroup bi bi-justify"></i>
         <i v-else @click="toggleView" class="show-group bi bi-view-stacked"></i>

resource/template/theme-server-status/header.html

@@ -8,9 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/theme-server-status/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20240407">
+    <link rel="stylesheet" href="/static/theme-server-status/css/main.css?v20240225">
-    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css?v20240407">
+    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css">
-    <link rel="stylesheet" href="/static/theme-server-status/css/light.css?v20240407">
+    <link rel="stylesheet" href="/static/theme-server-status/css/light.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/assets/font-logos.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/[email protected]/css/flag-icons.min.css">
@@ -28,7 +28,6 @@
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/echarts/map/js/world.js" integrity="md5-ZmUzMzZlOGQyYzk2NTgwNGRlMzRlNTliZDgyYTY1OGUgIC0=" crossorigin="anonymous"></script>
     <script src="/static/theme-server-status/js/mixin.js?v20240302"></script>
 </head>
 <body>

resource/template/theme-server-status/network.html

@@ -22,6 +22,9 @@
     const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
     const initData = JSON.parse('{{.Servers}}').servers;
     let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
+    if (MaxTCPPingValue == null) {
+        MaxTCPPingValue = 1000;
+    }
     new Vue({
         el: '#app',
         delimiters: ['@#', '#@'],
@@ -169,6 +172,15 @@
                 let tSeries = [];
                 let tLegendData = [];
                 var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
+                let maxPing = 0;
+                for (let i = 0; i < monitorInfo.result.length; i++) {
+                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
+                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
+                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
+                            maxPing = avgDelay;
+                        }
+                	 }
+                }
                 for (let i = 0; i < monitorInfo.result.length; i++) {
                     var lcolor = lcolors[i % lcolors.length];
                     var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
@@ -183,15 +195,7 @@
                         }
                         else {
                             loss += 1;
-                            datal.push({
+                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
-                                xAxis: monitorInfo.result[i].created_at[j],
-                                label: { show: false },
-                                emphasis: { disabled: true },
-                                lineStyle: {
-                                    type: "solid",
-                                    color: rgbaColorBar
-                                }
-                            });
                         }
                     }
                     lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
@@ -206,11 +210,6 @@
                             smooth: true,
                             symbol: 'none',
                             data: data,
-                            markLine: {
-                                symbol: "none",
-                                symbolSize :0,
-                                data: datal
-                            },
                             markPoint: {
                                 data: [
                                     { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
@@ -218,6 +217,14 @@
                                 ]
                             }
                     });
+                    tSeries.push({
+                            name: legendName,
+                            type: 'bar',
+                            smooth: true,
+                            symbol: 'none',
+                            data: datal,
+                            itemStyle: { color: rgbaColorBar }
+                    });
                 }
                 this.option.title.text = monitorInfo.result[0].server_name;
                 this.option.series = tSeries;

script/install.sh

@@ -14,7 +14,7 @@ NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
 NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.16.0"
+NZ_VERSION="v0.15.9"
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -100,64 +100,22 @@ pre_check() {
             Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard"
         fi
     fi
+
 }
 
-installation_check() {
+confirm() {
-    if docker compose version >/dev/null 2>&1; then
+    if [[ $# > 1 ]]; then
-        DOCKER_COMPOSE_COMMAND="docker compose"
+        echo && read -e -p "$1 [默认$2]: " temp
-        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+        if [[ x"${temp}" == x"" ]]; then
-            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            temp=$2
-            if [ -n "$NEZHA_IMAGES" ]; then
-                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
-                echo "$NEZHA_IMAGES"
-                IS_DOCKER_NEZHA=1
-                FRESH_INSTALL=0
-                return
-            else
-                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
-            fi
-        fi
-    elif command -v docker-compose >/dev/null 2>&1; then
-        DOCKER_COMPOSE_COMMAND="docker-compose"
-        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
-            if [ -n "$NEZHA_IMAGES" ]; then
-                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
-                echo "$NEZHA_IMAGES"
-                IS_DOCKER_NEZHA=1
-                FRESH_INSTALL=0
-                return
-            else
-                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
-            fi
         fi
+    else
+        read -e -p "$1 [y/n]: " temp
     fi
-
+    if [[ x"${temp}" == x"y" || x"${temp}" == x"Y" ]]; then
-    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
+        return 0
-        IS_DOCKER_NEZHA=0
+    else
-        FRESH_INSTALL=0
+        return 1
-    fi
-}
-
-select_version() {
-    if [[ -z $IS_DOCKER_NEZHA ]]; then
-        echo -e "${yellow}请自行选择您的安装方式（如果你是安装Agent，输入哪个都是一样的）：\n1. Docker\n2. 独立安装${plain}"
-        while true; do
-            read -e -r -p "请输入选择 [1-2]：" option
-            case "${option}" in
-                1)
-                    IS_DOCKER_NEZHA=1
-                    break
-                    ;;
-                2)
-                    IS_DOCKER_NEZHA=0
-                    break
-                    ;;
-                *)
-                    echo "${red}请输入正确的数字 [1-2]${plain}"
-                    ;;
-            esac
-        done
     fi
 }
 
@@ -228,7 +186,7 @@ install_dashboard() {
     echo -e "> 安装面板"
 
     # 哪吒监控文件夹
-    if [[ ! $FRESH_INSTALL == 0 ]]; then
+    if [ ! -d "${NZ_DASHBOARD_PATH}/docker-compose.yaml" ]; then
         mkdir -p $NZ_DASHBOARD_PATH
     else
         echo "您可能已经安装过面板端，重复安装会覆盖数据，请注意备份。"
@@ -250,10 +208,17 @@ install_dashboard() {
 
     chmod 777 -R $NZ_DASHBOARD_PATH
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    command -v docker >/dev/null 2>&1
-        install_dashboard_docker
+    if [[ $? != 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        echo -e "正在安装 Docker"
-        install_dashboard_standalone
+        bash <(curl -sL https://${Get_Docker_URL}) ${Get_Docker_Argu} >/dev/null 2>&1
+        if [[ $? != 0 ]]; then
+            echo -e "${red}下载脚本失败，请检查本机能否连接 ${Get_Docker_URL}${plain}"
+            return 0
+        fi
+        systemctl enable docker.service
+        systemctl start docker.service
+        echo -e "${green}Docker${plain} 安装成功"
     fi
 
     modify_dashboard_config 0
@@ -263,34 +228,43 @@ install_dashboard() {
     fi
 }
 
-install_dashboard_docker() {
-    if [[ ! $FRESH_INSTALL == 0 ]]; then
-        command -v docker >/dev/null 2>&1
-        if [[ $? != 0 ]]; then
-            echo -e "正在安装 Docker"
-            if [ "$os_alpine" != 1 ]; then
-                bash <(curl -sL https://${Get_Docker_URL}) ${Get_Docker_Argu} >/dev/null 2>&1
-                if [[ $? != 0 ]]; then
-                    echo -e "${red}下载脚本失败，请检查本机能否连接 ${Get_Docker_URL}${plain}"
-                    return 0
-                fi
-                systemctl enable docker.service
-                systemctl start docker.service
-            else
-                apk add docker docker-compose >/dev/null 2>&1
-                rc-update add docker
-                rc-service docker start
-            fi
-            echo -e "${green}Docker${plain} 安装成功"
-            installation_check
-        fi
-    fi
-}
-
 install_dashboard_standalone() {
+    install_base
+
+    echo -e "> 安装面板"
+
+    # 哪吒监控文件夹
+    if [ ! -d "${NZ_DASHBOARD_PATH}/app" ]; then
+        mkdir -p $NZ_DASHBOARD_PATH
+    else
+        echo "您可能已经安装过面板端，重复安装会覆盖数据，请注意备份。"
+        read -e -r -p "是否退出安装? [Y/n] " input
+        case $input in
+        [yY][eE][sS] | [yY])
+            echo "退出安装"
+            exit 0
+            ;;
+        [nN][oO] | [nN])
+            echo "继续安装"
+            ;;
+        *)
+            echo "退出安装"
+            exit 0
+            ;;
+        esac
+    fi
+
     if [ ! -d "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" ] || [ ! -d "${NZ_DASHBOARD_PATH}/resource/static/custom" ]; then
         mkdir -p "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" "${NZ_DASHBOARD_PATH}/resource/static/custom" >/dev/null 2>&1
     fi
+
+    chmod 777 -R $NZ_DASHBOARD_PATH
+
+    modify_dashboard_config_standalone 0
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 selinux() {
@@ -430,13 +404,11 @@ modify_agent_config() {
 modify_dashboard_config() {
     echo -e "> 修改面板配置"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    echo -e "正在下载 Docker 脚本"
-        echo -e "正在下载 Docker 脚本"
+    wget -t 2 -T 10 -O /tmp/nezha-docker-compose.yaml https://${GITHUB_RAW_URL}/script/docker-compose.yaml >/dev/null 2>&1
-        wget -t 2 -T 10 -O /tmp/nezha-docker-compose.yaml https://${GITHUB_RAW_URL}/script/docker-compose.yaml >/dev/null 2>&1
+    if [[ $? != 0 ]]; then
-        if [[ $? != 0 ]]; then
+        echo -e "${red}下载脚本失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
-            echo -e "${red}下载脚本失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
+        return 0
-            return 0
-        fi
     fi
 
     wget -t 2 -T 10 -O /tmp/nezha-config.yaml https://${GITHUB_RAW_URL}/script/config.yaml >/dev/null 2>&1
@@ -478,37 +450,88 @@ modify_dashboard_config() {
     sed -i "s/nz_github_oauth_client_secret/${nz_github_oauth_client_secret}/" /tmp/nezha-config.yaml
     sed -i "s/nz_language/zh-CN/" /tmp/nezha-config.yaml
     sed -i "s/nz_site_title/${nz_site_title}/" /tmp/nezha-config.yaml
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    sed -i "s/nz_site_port/${nz_site_port}/" /tmp/nezha-docker-compose.yaml
-        sed -i "s/nz_site_port/${nz_site_port}/" /tmp/nezha-docker-compose.yaml
+    sed -i "s/nz_grpc_port/${nz_grpc_port}/g" /tmp/nezha-docker-compose.yaml
-        sed -i "s/nz_grpc_port/${nz_grpc_port}/g" /tmp/nezha-docker-compose.yaml
+    sed -i "s/nz_image_url/${Docker_IMG}/" /tmp/nezha-docker-compose.yaml
-        sed -i "s/nz_image_url/${Docker_IMG}/" /tmp/nezha-docker-compose.yaml
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
-        sed -i "s/80/${nz_site_port}/" /tmp/nezha-config.yaml
-    fi
 
     mkdir -p $NZ_DASHBOARD_PATH/data
     mv -f /tmp/nezha-config.yaml ${NZ_DASHBOARD_PATH}/data/config.yaml
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    mv -f /tmp/nezha-docker-compose.yaml ${NZ_DASHBOARD_PATH}/docker-compose.yaml
-        mv -f /tmp/nezha-docker-compose.yaml ${NZ_DASHBOARD_PATH}/docker-compose.yaml
+
+    echo -e "面板配置 ${green}修改成功，请稍等重启生效${plain}"
+
+    restart_and_update
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
+modify_dashboard_config_standalone() {
+    echo -e "> 修改面板配置"
+
+    echo -e "正在下载配置模板"
+
+    wget -t 2 -T 10 -O /tmp/nezha-config.yaml https://${GITHUB_RAW_URL}/script/config.yaml >/dev/null 2>&1
+    if [[ $? != 0 ]]; then
+        echo -e "${red}下载文件失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
+        return 0
     fi
 
-    if [[ $IS_DOCKER_NEZHA == 0 ]]; then
+    echo "关于 GitHub Oauth2 应用：在 https://github.com/settings/developers 创建，无需审核，Callback 填 http(s)://域名或IP/oauth2/callback" &&
-        echo -e "正在下载服务文件"
+        echo "关于 Gitee Oauth2 应用：在 https://gitee.com/oauth/applications 创建，无需审核，Callback 填 http(s)://域名或IP/oauth2/callback" &&
-        if [ "$os_alpine" != 1 ]; then
+        read -ep "请输入 OAuth2 提供商(github/gitlab/jihulab/gitee，默认 github): " nz_oauth2_type &&
-            wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICE https://${GITHUB_RAW_URL}/script/nezha-dashboard.service >/dev/null 2>&1
+        read -ep "请输入 Oauth2 应用的 Client ID: " nz_github_oauth_client_id &&
-        else
+        read -ep "请输入 Oauth2 应用的 Client Secret: " nz_github_oauth_client_secret &&
-            wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-dashboard >/dev/null 2>&1
+        read -ep "请输入 GitHub/Gitee 登录名作为管理员，多个以逗号隔开: " nz_admin_logins &&
-            chmod +x $NZ_DASHBOARD_SERVICERC
+        read -ep "请输入站点标题: " nz_site_title &&
-            if [[ $? != 0 ]]; then
+        read -ep "请输入站点访问端口: (默认 8008)" nz_site_port &&
-                echo -e "${red}文件下载失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
+        read -ep "请输入用于 Agent 接入的 RPC 端口: (默认 5555)" nz_grpc_port
-                return 0
+
-            fi
+    if [[ -z "${nz_admin_logins}" || -z "${nz_github_oauth_client_id}" || -z "${nz_github_oauth_client_secret}" || -z "${nz_site_title}" ]]; then
+        echo -e "${red}所有选项都不能为空${plain}"
+        before_show_menu
+        return 1
+    fi
+
+    if [[ -z "${nz_site_port}" ]]; then
+        nz_site_port=8008
+    fi
+    if [[ -z "${nz_grpc_port}" ]]; then
+        nz_grpc_port=5555
+    fi
+    if [[ -z "${nz_oauth2_type}" ]]; then
+        nz_oauth2_type=github
+    fi
+
+    sed -i "s/nz_oauth2_type/${nz_oauth2_type}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_admin_logins/${nz_admin_logins}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_grpc_port/${nz_grpc_port}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_id/${nz_github_oauth_client_id}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_secret/${nz_github_oauth_client_secret}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_language/zh-CN/" /tmp/nezha-config.yaml
+    sed -i "s/nz_site_title/${nz_site_title}/" /tmp/nezha-config.yaml
+    sed -i "s/80/${nz_site_port}/" /tmp/nezha-config.yaml
+
+    mkdir -p $NZ_DASHBOARD_PATH/data
+    mv -f /tmp/nezha-config.yaml ${NZ_DASHBOARD_PATH}/data/config.yaml
+
+    echo -e "正在下载服务文件"
+
+    if [ "$os_alpine" != 1 ]; then
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICE https://${GITHUB_RAW_URL}/script/nezha-dashboard.service >/dev/null 2>&1
+    else
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-dashboard >/dev/null 2>&1
+        chmod +x $NZ_DASHBOARD_SERVICERC
+        if [[ $? != 0 ]]; then
+            echo -e "${red}文件下载失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
+            return 0
         fi
     fi
 
     echo -e "面板配置 ${green}修改成功，请稍等重启生效${plain}"
 
-    restart_and_update
+    restart_and_update_standalone
 
     if [[ $# == 0 ]]; then
         before_show_menu
@@ -520,10 +543,15 @@ restart_and_update() {
 
     cd $NZ_DASHBOARD_PATH
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        restart_and_update_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        docker compose pull
-        restart_and_update_standalone
+        docker compose down
+        docker compose up -d
+    else
+        docker-compose pull
+        docker-compose down
+        docker-compose up -d
     fi
 
     if [[ $? == 0 ]]; then
@@ -538,13 +566,11 @@ restart_and_update() {
     fi
 }
 
-restart_and_update_docker() {
-    $DOCKER_COMPOSE_COMMAND pull
-    $DOCKER_COMPOSE_COMMAND down
-    $DOCKER_COMPOSE_COMMAND up -d
-}
-
 restart_and_update_standalone() {
+    echo -e "> 重启并更新面板"
+
+    cd $NZ_DASHBOARD_PATH
+
     if [ "$os_alpine" != 1 ]; then
         systemctl stop nezha-dashboard
     else
@@ -561,15 +587,27 @@ restart_and_update_standalone() {
         rc-update add nezha-dashboard
         rc-service nezha-dashboard restart
     fi
+
+    if [[ $? == 0 ]]; then
+        echo -e "${green}哪吒监控 重启成功${plain}"
+        echo -e "默认管理面板地址：${yellow}域名:站点访问端口${plain}"
+    else
+        echo -e "${red}重启失败，可能是因为启动时间超过了两秒，请稍后查看日志信息${plain}"
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 start_dashboard() {
     echo -e "> 启动面板"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        start_dashboard_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose up -d
-        start_dashboard_standalone
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose up -d
     fi
 
     if [[ $? == 0 ]]; then
@@ -583,25 +621,34 @@ start_dashboard() {
     fi
 }
 
-start_dashboard_docker() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND up -d
-}
-
 start_dashboard_standalone() {
+    echo -e "> 启动面板"
+
     if [ "$os_alpine" != 1 ]; then
         systemctl start nezha-dashboard
     else
         rc-service nezha-dashboard start
     fi
+
+    if [[ $? == 0 ]]; then
+        echo -e "${green}哪吒监控 启动成功${plain}"
+    else
+        echo -e "${red}启动失败，请稍后查看日志信息${plain}"
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 stop_dashboard() {
     echo -e "> 停止面板"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        stop_dashboard_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose down
-        stop_dashboard_standalone
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose down
     fi
 
     if [[ $? == 0 ]]; then
@@ -615,25 +662,19 @@ stop_dashboard() {
     fi
 }
 
-stop_dashboard_docker() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND down
-}
-
 stop_dashboard_standalone() {
+    echo -e "> 停止面板"
+
     if [ "$os_alpine" != 1 ]; then
         systemctl stop nezha-dashboard
     else
         rc-service nezha-dashboard stop
     fi
-}
 
-show_dashboard_log() {
+    if [[ $? == 0 ]]; then
-    echo -e "> 获取面板日志"
+        echo -e "${green}哪吒监控 停止成功${plain}"
-
+    else
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+        echo -e "${red}停止失败，请稍后查看日志信息${plain}"
-        show_dashboard_log_docker
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
-        show_dashboard_log_standalone
     fi
 
     if [[ $# == 0 ]]; then
@@ -641,27 +682,48 @@ show_dashboard_log() {
     fi
 }
 
-show_dashboard_log_docker() {
+show_dashboard_log() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND logs -f
+    echo -e "> 获取面板日志"
+
+    docker compose version
+    if [[ $? == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose logs -f
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose logs -f
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 show_dashboard_log_standalone() {
+    echo -e "> 获取面板日志"
+
     if [ "$os_alpine" != 1 ]; then
         journalctl -xf -u nezha-dashboard.service
     else
-        tail -n 10 /var/log/nezha-dashboard.err
+        echo "很抱歉，OpenRC 无此功能"
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
     fi
 }
 
 uninstall_dashboard() {
     echo -e "> 卸载管理面板"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        uninstall_dashboard_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose down
-        uninstall_dashboard_standalone
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose down
     fi
 
+    rm -rf $NZ_DASHBOARD_PATH
+    docker rmi -f ghcr.io/naiba/nezha-dashboard >/dev/null 2>&1
+    docker rmi -f registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard >/dev/null 2>&1
     clean_all
 
     if [[ $# == 0 ]]; then
@@ -669,14 +731,9 @@ uninstall_dashboard() {
     fi
 }
 
-uninstall_dashboard_docker() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND down
-    rm -rf $NZ_DASHBOARD_PATH
-    docker rmi -f ghcr.io/naiba/nezha-dashboard >/dev/null 2>&1
-    docker rmi -f registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard >/dev/null 2>&1
-}
-
 uninstall_dashboard_standalone() {
+    echo -e "> 卸载管理面板"
+
     rm -rf $NZ_DASHBOARD_PATH
 
     if [ "$os_alpine" != 1 ]; then
@@ -690,6 +747,12 @@ uninstall_dashboard_standalone() {
     else
         rm $NZ_DASHBOARD_SERVICERC
     fi
+
+    clean_all
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 show_agent_log() {
@@ -698,7 +761,7 @@ show_agent_log() {
     if [ "$os_alpine" != 1 ]; then
         journalctl -xf -u nezha-agent.service
     else
-        tail -n 10 /var/log/nezha-agent.err
+        echo "很抱歉，OpenRC 无此功能"
     fi
 
     if [[ $# == 0 ]]; then
@@ -748,6 +811,59 @@ clean_all() {
     fi
 }
 
+select_version() {
+    DOCKER_COMPOSE_COMMAND=""
+    if docker compose version >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker compose"
+        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+            fi
+        fi
+    elif command -v docker-compose >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker-compose"
+        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "存在带有 nezha-dashboard 仓库的 Docker 镜像："
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "未找到带有 nezha-dashboard 仓库的 Docker 镜像。"
+            fi
+        fi
+    fi
+
+    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
+        IS_DOCKER_NEZHA=0
+    else
+        echo -e "${yellow}请自行选择您的安装方式（如果你是安装Agent，输入哪个都是一样的）：\n1. Docker\n2. 独立安装${plain}"
+        while true; do
+            read -e -r -p "请输入数字 [1-2]：" option
+            case "${option}" in
+            1)
+                IS_DOCKER_NEZHA=1
+                break
+                ;;
+            2)
+                IS_DOCKER_NEZHA=0
+                break
+                ;;
+            *)
+                echo "输入有误，请重新输入"
+                ;;
+            esac
+        done
+    fi
+}
+
 show_usage() {
     echo "哪吒监控 管理脚本使用方法: "
     echo "--------------------------------------------------------"
@@ -792,7 +908,8 @@ show_menu() {
     ${green}0.${plain}  退出脚本
     "
     echo && read -ep "请输入选择 [0-13]: " num
-    case "${num}" in
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+        case "${num}" in
         0)
             exit 0
             ;;
@@ -838,14 +955,65 @@ show_menu() {
         *)
             echo -e "${red}请输入正确的数字 [0-13]${plain}"
             ;;
-    esac
+        esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case "${num}" in
+        0)
+            exit 0
+            ;;
+        1)
+            install_dashboard_standalone
+            ;;
+        2)
+            modify_dashboard_config_standalone
+            ;;
+        3)
+            start_dashboard_standalone
+            ;;
+        4)
+            stop_dashboard_standalone
+            ;;
+        5)
+            restart_and_update_standalone
+            ;;
+        6)
+            show_dashboard_log_standalone
+            ;;
+        7)
+            uninstall_dashboard_standalone
+            ;;
+        8)
+            install_agent
+            ;;
+        9)
+            modify_agent_config
+            ;;
+        10)
+            show_agent_log
+            ;;
+        11)
+            uninstall_agent
+            ;;
+        12)
+            restart_agent
+            ;;
+        13)
+            update_script
+            ;;
+        *)
+            echo -e "${red}请输入正确的数字 [0-13]${plain}"
+            ;;
+        esac
+    else
+        select_version
+    fi
 }
 
 pre_check
-installation_check
 
 if [[ $# > 0 ]]; then
-    case $1 in
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+        case $1 in
         "install_dashboard")
             install_dashboard 0
             ;;
@@ -891,7 +1059,83 @@ if [[ $# > 0 ]]; then
             update_script 0
             ;;
         *) show_usage ;;
-    esac
+        esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case $1 in
+        "install_dashboard")
+            install_dashboard_standalone 0
+            ;;
+        "modify_dashboard_config")
+            modify_dashboard_config_standalone 0
+            ;;
+        "start_dashboard")
+            start_dashboard_standalone 0
+            ;;
+        "stop_dashboard")
+            stop_dashboard_standalone 0
+            ;;
+        "restart_and_update")
+            restart_and_update_standalone 0
+            ;;
+        "show_dashboard_log")
+            show_dashboard_log_standalone 0
+            ;;
+        "uninstall_dashboard")
+            uninstall_dashboard_standalone 0
+            ;;
+        "install_agent")
+            shift
+            if [ $# -ge 3 ]; then
+                install_agent "$@"
+            else
+                install_agent 0
+            fi
+            ;;
+        "modify_agent_config")
+            modify_agent_config 0
+            ;;
+        "show_agent_log")
+            show_agent_log 0
+            ;;
+        "uninstall_agent")
+            uninstall_agent 0
+            ;;
+        "restart_agent")
+            restart_agent 0
+            ;;
+        "update_script")
+            update_script 0
+            ;;
+        *) show_usage ;;
+        esac
+    else
+        case $1 in
+        "install_agent")
+            shift
+            if [ $# -ge 3 ]; then
+                install_agent "$@"
+            else
+                install_agent 0
+            fi
+            ;;
+        "modify_agent_config")
+            modify_agent_config 0
+            ;;
+        "show_agent_log")
+            show_agent_log 0
+            ;;
+        "uninstall_agent")
+            uninstall_agent 0
+            ;;
+        "restart_agent")
+            restart_agent 0
+            ;;
+        "update_script")
+            update_script 0
+            ;;
+        *) show_usage ;;
+        esac
+    fi
 else
     select_version
     show_menu

script/install_en.sh

@@ -14,7 +14,7 @@ NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
 NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
 NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
 NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
-NZ_VERSION="v0.16.0"
+NZ_VERSION="v0.15.9"
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -101,60 +101,19 @@ pre_check() {
     fi
 }
 
-installation_check() {
+confirm() {
-    if docker compose version >/dev/null 2>&1; then
+    if [[ $# > 1 ]]; then
-        DOCKER_COMPOSE_COMMAND="docker compose"
+        echo && read -e -p "$1 [默认$2]: " temp
-        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+        if [[ x"${temp}" == x"" ]]; then
-            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            temp=$2
-            if [ -n "$NEZHA_IMAGES" ]; then
-                echo "Docker image with nezha-dashboard repository exists:"
-                echo "$NEZHA_IMAGES"
-                IS_DOCKER_NEZHA=1
-                return
-            else
-                echo "No Docker images with the nezha-dashboard repository were found."
-            fi
-        fi
-    elif command -v docker-compose >/dev/null 2>&1; then
-        DOCKER_COMPOSE_COMMAND="docker-compose"
-        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
-            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
-            if [ -n "$NEZHA_IMAGES" ]; then
-                echo "Docker image with nezha-dashboard repository exists:"
-                echo "$NEZHA_IMAGES"
-                IS_DOCKER_NEZHA=1
-                return
-            else
-                echo "No Docker images with the nezha-dashboard repository were found."
-            fi
         fi
+    else
+        read -e -p "$1 [y/n]: " temp
     fi
-
+    if [[ x"${temp}" == x"y" || x"${temp}" == x"Y" ]]; then
-    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
+        return 0
-        IS_DOCKER_NEZHA=0
+    else
-        FRESH_INSTALL=0
+        return 1
-    fi
-}
-
-select_version() {
-    if [[ -z $IS_DOCKER_NEZHA ]]; then
-        echo -e "${yellow}Select your installation method(Input anything is ok if you are installing agent):\n1. Docker\n2. Standalone${plain}"
-        while true; do
-            read -e -r -p "Please enter [1-2]: " option
-            case "${option}" in
-                1)
-                    IS_DOCKER_NEZHA=1
-                    break
-                    ;;
-                2)
-                    IS_DOCKER_NEZHA=0
-                    break
-                    ;;
-                *)
-                    echo "${red}Please enter the correct number [1-2]${plain}"
-                    ;;
-            esac
-        done
     fi
 }
 
@@ -225,7 +184,7 @@ install_dashboard() {
     echo -e "> Install Panel"
 
     # Nezha Monitoring Folder
-    if [[ ! $FRESH_INSTALL == 0 ]]; then
+    if [ ! -d "${NZ_DASHBOARD_PATH}/docker-compose.yaml" ]; then
         mkdir -p $NZ_DASHBOARD_PATH
     else
         echo "You may have already installed the dashboard, repeated installation will overwrite the data, please pay attention to backup."
@@ -246,10 +205,17 @@ install_dashboard() {
     fi
     chmod 777 -R $NZ_DASHBOARD_PATH
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    command -v docker >/dev/null 2>&1
-        install_dashboard_docker
+    if [[ $? != 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        echo -e "Installing Docker"
-        install_dashboard_standalone
+        bash <(curl -sL https://${Get_Docker_URL}) ${Get_Docker_Argu} >/dev/null 2>&1
+        if [[ $? != 0 ]]; then
+            echo -e "${red}Script failed to get, please check if the network can link ${Get_Docker_URL}${plain}"
+            return 0
+        fi
+        systemctl enable docker.service
+        systemctl start docker.service
+        echo -e "${green}Docker${plain} installed successfully"
     fi
 
     modify_dashboard_config 0
@@ -259,34 +225,43 @@ install_dashboard() {
     fi
 }
 
-install_dashboard_docker() {
-    if [[ ! $FRESH_INSTALL == 0 ]]; then
-        command -v docker >/dev/null 2>&1
-        if [[ $? != 0 ]]; then
-            echo -e "Installing Docker"
-            if [ "$os_alpine" != 1 ]; then
-                bash <(curl -sL https://${Get_Docker_URL}) ${Get_Docker_Argu} >/dev/null 2>&1
-                if [[ $? != 0 ]]; then
-                    echo -e "${red}Script failed to get, please check if the network can link ${Get_Docker_URL}${plain}"
-                    return 0
-                fi
-                systemctl enable docker.service
-                systemctl start docker.service
-            else
-                apk add docker docker-compose >/dev/null 2>&1
-                rc-update add docker
-                rc-service docker start
-            fi
-            echo -e "${green}Docker${plain} installed successfully"
-            installation_check
-        fi
-    fi
-}
-
 install_dashboard_standalone() {
+    install_base
+
+    echo -e "> Install Panel"
+
+    # Nezha Monitoring Folder
+    if [ ! -d "${NZ_DASHBOARD_PATH}/app" ]; then
+        mkdir -p $NZ_DASHBOARD_PATH
+    else
+        echo "You may have already installed the dashboard, repeated installation will overwrite the data, please pay attention to backup."
+        read -e -r -p "Exit the installation? [Y/n] " input
+        case $input in
+        [yY][eE][sS] | [yY])
+            echo "Exit the installation."
+            exit 0
+            ;;
+        [nN][oO] | [nN])
+            echo "Continue."
+            ;;
+        *)
+            echo "Exit the installation."
+            exit 0
+            ;;
+        esac
+    fi
+
     if [ ! -d "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" ] || [ ! -d "${NZ_DASHBOARD_PATH}/resource/static/custom" ]; then
         mkdir -p "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" "${NZ_DASHBOARD_PATH}/resource/static/custom" >/dev/null 2>&1
     fi
+
+    chmod 777 -R $NZ_DASHBOARD_PATH
+
+    modify_dashboard_config_standalone 0
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 selinux() {
@@ -426,13 +401,11 @@ modify_agent_config() {
 modify_dashboard_config() {
     echo -e "> Modify Panel Configuration"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    echo -e "Download Docker Script"
-        echo -e "Download Docker Script"
+    wget -t 2 -T 10 -O /tmp/nezha-docker-compose.yaml https://${GITHUB_RAW_URL}/script/docker-compose.yaml >/dev/null 2>&1
-        wget -t 2 -T 10 -O /tmp/nezha-docker-compose.yaml https://${GITHUB_RAW_URL}/script/docker-compose.yaml >/dev/null 2>&1
+    if [[ $? != 0 ]]; then
-        if [[ $? != 0 ]]; then
+        echo -e "${red}Script failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
-            echo -e "${red}Script failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+        return 0
-            return 0
-        fi
     fi
 
     wget -t 2 -T 10 -O /tmp/nezha-config.yaml https://${GITHUB_RAW_URL}/script/config.yaml >/dev/null 2>&1
@@ -474,37 +447,88 @@ modify_dashboard_config() {
     sed -i "s/nz_github_oauth_client_secret/${nz_github_oauth_client_secret}/" /tmp/nezha-config.yaml
     sed -i "s/nz_site_title/${nz_site_title}/" /tmp/nezha-config.yaml
     sed -i "s/nz_language/en-US/" /tmp/nezha-config.yaml
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    sed -i "s/nz_site_port/${nz_site_port}/" /tmp/nezha-docker-compose.yaml
-        sed -i "s/nz_site_port/${nz_site_port}/" /tmp/nezha-docker-compose.yaml
+    sed -i "s/nz_grpc_port/${nz_grpc_port}/g" /tmp/nezha-docker-compose.yaml
-        sed -i "s/nz_grpc_port/${nz_grpc_port}/g" /tmp/nezha-docker-compose.yaml
+    sed -i "s/nz_image_url/${Docker_IMG}/" /tmp/nezha-docker-compose.yaml
-        sed -i "s/nz_image_url/${Docker_IMG}/" /tmp/nezha-docker-compose.yaml
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
-        sed -i "s/80/${nz_site_port}/" /tmp/nezha-config.yaml
-    fi
 
     mkdir -p $NZ_DASHBOARD_PATH/data
     mv -f /tmp/nezha-config.yaml ${NZ_DASHBOARD_PATH}/data/config.yaml
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    mv -f /tmp/nezha-docker-compose.yaml ${NZ_DASHBOARD_PATH}/docker-compose.yaml
-        mv -f /tmp/nezha-docker-compose.yaml ${NZ_DASHBOARD_PATH}/docker-compose.yaml
+
+    echo -e "Dashboard configuration ${green} modified successfully, please wait for Dashboard self-restart to take effect${plain}"
+
+    restart_and_update
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
+modify_dashboard_config_standalone() {
+    echo -e "> Modify Panel Configuration"
+
+    echo -e "Download configuration template"
+
+    wget -t 2 -T 10 -O /tmp/nezha-config.yaml https://${GITHUB_RAW_URL}/script/config.yaml >/dev/null 2>&1
+    if [[ $? != 0 ]]; then
+        echo -e "${red}File failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+        return 0
     fi
 
-    if [[ $IS_DOCKER_NEZHA == 0 ]]; then
+    echo "About the GitHub Oauth2 application: create it at https://github.com/settings/developers, no review required, and fill in the http(s)://domain_or_IP/oauth2/callback" &&
-        echo -e "Downloading service file"
+        echo "(Not recommended) About the Gitee Oauth2 application: create it at https://gitee.com/oauth/applications, no auditing required, and fill in the http(s)://domain_or_IP/oauth2/callback" &&
-        if [ "$os_alpine" != 1 ]; then
+        read -ep "Please enter the OAuth2 provider (github/gitlab/jihulab/gitee, default github): " nz_oauth2_type &&
-            wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICE https://${GITHUB_RAW_URL}/script/nezha-dashboard.service >/dev/null 2>&1
+        read -ep "Please enter the Client ID of the Oauth2 application: " nz_github_oauth_client_id &&
-        else
+        read -ep "Please enter the Client Secret of the Oauth2 application: " nz_github_oauth_client_secret &&
-            wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-dashboard >/dev/null 2>&1
+        read -ep "Please enter your GitHub/Gitee login name as the administrator, separated by commas: " nz_admin_logins &&
-            chmod +x $NZ_DASHBOARD_SERVICERC
+        read -ep "Please enter the site title: " nz_site_title &&
-            if [[ $? != 0 ]]; then
+        read -ep "Please enter the site access port: (default 8008)" nz_site_port &&
-                echo -e "${red}File failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+        read -ep "Please enter the RPC port to be used for Agent access: (default 5555)" nz_grpc_port
-                return 0
+
-            fi
+    if [[ -z "${nz_admin_logins}" || -z "${nz_github_oauth_client_id}" || -z "${nz_github_oauth_client_secret}" || -z "${nz_site_title}" ]]; then
+        echo -e "${red}All options cannot be empty${plain}"
+        before_show_menu
+        return 1
+    fi
+
+    if [[ -z "${nz_site_port}" ]]; then
+        nz_site_port=8008
+    fi
+    if [[ -z "${nz_grpc_port}" ]]; then
+        nz_grpc_port=5555
+    fi
+    if [[ -z "${nz_oauth2_type}" ]]; then
+        nz_oauth2_type=github
+    fi
+
+    sed -i "s/nz_oauth2_type/${nz_oauth2_type}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_admin_logins/${nz_admin_logins}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_grpc_port/${nz_grpc_port}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_id/${nz_github_oauth_client_id}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_secret/${nz_github_oauth_client_secret}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_language/zh-CN/" /tmp/nezha-config.yaml
+    sed -i "s/nz_site_title/${nz_site_title}/" /tmp/nezha-config.yaml
+    sed -i "s/80/${nz_site_port}/" /tmp/nezha-config.yaml
+
+    mkdir -p $NZ_DASHBOARD_PATH/data
+    mv -f /tmp/nezha-config.yaml ${NZ_DASHBOARD_PATH}/data/config.yaml
+
+    echo -e "Downloading service file"
+
+    if [ "$os_alpine" != 1 ]; then
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICE https://${GITHUB_RAW_URL}/script/nezha-dashboard.service >/dev/null 2>&1
+    else
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-dashboard >/dev/null 2>&1
+        chmod +x $NZ_DASHBOARD_SERVICERC
+        if [[ $? != 0 ]]; then
+            echo -e "${red}File failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+            return 0
         fi
     fi
 
     echo -e "Dashboard configuration ${green} modified successfully, please wait for Dashboard self-restart to take effect${plain}"
 
-    restart_and_update
+    restart_and_update_standalone
 
     if [[ $# == 0 ]]; then
         before_show_menu
@@ -516,10 +540,15 @@ restart_and_update() {
 
     cd $NZ_DASHBOARD_PATH
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        restart_and_update_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        docker compose pull
-        restart_and_update_standalone
+        docker compose down
+        docker compose up -d
+    else
+        docker-compose pull
+        docker-compose down
+        docker-compose up -d
     fi
 
     if [[ $? == 0 ]]; then
@@ -534,13 +563,11 @@ restart_and_update() {
     fi
 }
 
-restart_and_update_docker() {
-    $DOCKER_COMPOSE_COMMAND pull
-    $DOCKER_COMPOSE_COMMAND down
-    $DOCKER_COMPOSE_COMMAND up -d
-}
-
 restart_and_update_standalone() {
+    echo -e "> Restart and Update the Panel"
+
+    cd $NZ_DASHBOARD_PATH
+
     if [ "$os_alpine" != 1 ]; then
         systemctl stop nezha-dashboard
     else
@@ -557,15 +584,27 @@ restart_and_update_standalone() {
         rc-update add nezha-dashboard
         rc-service nezha-dashboard restart
     fi
+
+    if [[ $? == 0 ]]; then
+        echo -e "${green}Nezha Monitoring Restart Successful${plain}"
+        echo -e "Default panel address: ${yellow}domain:Site_access_port${plain}"
+    else
+        echo -e "${red}The restart failed, probably because the boot time exceeded two seconds, please check the log information later${plain}"
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 start_dashboard() {
     echo -e "> Start Panel"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        start_dashboard_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose up -d
-        start_dashboard_standalone
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose up -d
     fi
 
     if [[ $? == 0 ]]; then
@@ -579,25 +618,34 @@ start_dashboard() {
     fi
 }
 
-start_dashboard_docker() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND up -d
-}
-
 start_dashboard_standalone() {
+    echo -e "> Start Panel"
+
     if [ "$os_alpine" != 1 ]; then
         systemctl start nezha-dashboard
     else
         rc-service nezha-dashboard start
     fi
+
+    if [[ $? == 0 ]]; then
+        echo -e "${green}Nezha Monitoring Start Successful${plain}"
+    else
+        echo -e "${red}Failed to start, please check the log message later${plain}"
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 stop_dashboard() {
     echo -e "> Stop Panel"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        stop_dashboard_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose down
-        stop_dashboard_standalone
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose down
     fi
 
     if [[ $? == 0 ]]; then
@@ -611,25 +659,19 @@ stop_dashboard() {
     fi
 }
 
-stop_dashboard_docker() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND down
-}
-
 stop_dashboard_standalone() {
+    echo -e "> Stop Panel"
+
     if [ "$os_alpine" != 1 ]; then
         systemctl stop nezha-dashboard
     else
         rc-service nezha-dashboard stop
     fi
-}
 
-show_dashboard_log() {
+    if [[ $? == 0 ]]; then
-    echo -e "> View Panel Log"
+        echo -e "${green}Nezha Monitoring Stop Successful${plain}"
-
+    else
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+        echo -e "${red}Failed to stop, please check the log message later${plain}"
-        show_dashboard_log_docker
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
-        show_dashboard_log_standalone
     fi
 
     if [[ $# == 0 ]]; then
@@ -637,27 +679,48 @@ show_dashboard_log() {
     fi
 }
 
-show_dashboard_log_docker() {
+show_dashboard_log() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND logs -f
+    echo -e "> View Panel Log"
+
+    docker compose version
+    if [[ $? == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose logs -f
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose logs -f
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 show_dashboard_log_standalone() {
+    echo -e "> View Panel Log"
+
     if [ "$os_alpine" != 1 ]; then
         journalctl -xf -u nezha-dashboard.service
     else
-        tail -n 10 /var/log/nezha-dashboard.err
+        echo "Sorry, OpenRC do not have this feature yet."
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
     fi
 }
 
 uninstall_dashboard() {
     echo -e "> Uninstall Panel"
 
-    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+    docker compose version
-        uninstall_dashboard_docker
+    if [[ $? == 0 ]]; then
-    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        cd $NZ_DASHBOARD_PATH && docker compose down
-        uninstall_dashboard_standalone
+    else
+        cd $NZ_DASHBOARD_PATH && docker-compose down
     fi
 
+    rm -rf $NZ_DASHBOARD_PATH
+    docker rmi -f ghcr.io/naiba/nezha-dashboard >/dev/null 2>&1
+    docker rmi -f registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard >/dev/null 2>&1
     clean_all
 
     if [[ $# == 0 ]]; then
@@ -665,14 +728,9 @@ uninstall_dashboard() {
     fi
 }
 
-uninstall_dashboard_docker() {
-    cd $NZ_DASHBOARD_PATH && $DOCKER_COMPOSE_COMMAND down
-    rm -rf $NZ_DASHBOARD_PATH
-    docker rmi -f ghcr.io/naiba/nezha-dashboard >/dev/null 2>&1
-    docker rmi -f registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard >/dev/null 2>&1
-}
-
 uninstall_dashboard_standalone() {
+    echo -e "> Uninstall Panel"
+
     rm -rf $NZ_DASHBOARD_PATH
 
     if [ "$os_alpine" != 1 ]; then
@@ -686,6 +744,12 @@ uninstall_dashboard_standalone() {
     else
         rm $NZ_DASHBOARD_SERVICERC
     fi
+
+    clean_all
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
 }
 
 show_agent_log() {
@@ -694,7 +758,7 @@ show_agent_log() {
     if [ "$os_alpine" != 1 ]; then
         journalctl -xf -u nezha-agent.service
     else
-        tail -n 10 /var/log/nezha-agent.err
+        echo "Sorry, OpenRC do not have this feature yet."
     fi
 
     if [[ $# == 0 ]]; then
@@ -744,6 +808,59 @@ clean_all() {
     fi
 }
 
+select_version() {
+    DOCKER_COMPOSE_COMMAND=""
+    if docker compose version >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker compose"
+        if $DOCKER_COMPOSE_COMMAND ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "Docker image with nezha-dashboard repository exists:"
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "No Docker images with the nezha-dashboard repository were found."
+            fi
+        fi
+    elif command -v docker-compose >/dev/null 2>&1; then
+        DOCKER_COMPOSE_COMMAND="docker-compose"
+        if $DOCKER_COMPOSE_COMMAND -f "$NZ_DASHBOARD_PATH/docker-compose.yaml" config >/dev/null 2>&1; then
+            NEZHA_IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep -w "nezha-dashboard")
+            if [ -n "$NEZHA_IMAGES" ]; then
+                echo "Docker image with nezha-dashboard repository exists:"
+                echo "$NEZHA_IMAGES"
+                IS_DOCKER_NEZHA=1
+                return
+            else
+                echo "No Docker images with the nezha-dashboard repository were found."
+            fi
+        fi
+    fi
+
+    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
+        IS_DOCKER_NEZHA=0
+    else
+        echo -e "${yellow}Select your installation method(Input anything is ok if you are installing agent):\n1. Docker\n2. Standalone${plain}"
+        while true; do
+            read -e -r -p "Input a number [1-2]: " option
+            case "${option}" in
+            1)
+                IS_DOCKER_NEZHA=1
+                break
+                ;;
+            2)
+                IS_DOCKER_NEZHA=0
+                break
+                ;;
+            *)
+                echo "Wrong input, try again"
+                ;;
+            esac
+        done
+    fi
+}
+
 show_usage() {
     echo "Nezha Monitor Management Script Usage: "
     echo "--------------------------------------------------------"
@@ -788,7 +905,8 @@ show_menu() {
     ${green}0.${plain}  Exit Script
     "
     echo && read -ep "Please enter [0-13]: " num
-    case "${num}" in
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+        case "${num}" in
         0)
             exit 0
             ;;
@@ -834,14 +952,63 @@ show_menu() {
         *)
             echo -e "${red}Please enter the correct number [0-13]${plain}"
             ;;
-    esac
+        esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case "${num}" in
+        0)
+            exit 0
+            ;;
+        1)
+            install_dashboard_standalone
+            ;;
+        2)
+            modify_dashboard_config_standalone
+            ;;
+        3)
+            start_dashboard_standalone
+            ;;
+        4)
+            stop_dashboard_standalone
+            ;;
+        5)
+            restart_and_update_standalone
+            ;;
+        6)
+            show_dashboard_log_standalone
+            ;;
+        7)
+            uninstall_dashboard_standalone
+            ;;
+        8)
+            install_agent
+            ;;
+        9)
+            modify_agent_config
+            ;;
+        10)
+            show_agent_log
+            ;;
+        11)
+            uninstall_agent
+            ;;
+        12)
+            restart_agent
+            ;;
+        13)
+            update_script
+            ;;
+        *)
+            echo -e "${red}Please enter the correct number [0-13]${plain}"
+            ;;
+        esac
+    fi
 }
 
 pre_check
-installation_check
 
 if [[ $# > 0 ]]; then
-    case $1 in
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
+        case $1 in
         "install_dashboard")
             install_dashboard 0
             ;;
@@ -887,7 +1054,83 @@ if [[ $# > 0 ]]; then
             update_script 0
             ;;
         *) show_usage ;;
-    esac
+        esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case $1 in
+        "install_dashboard")
+            install_dashboard_standalone 0
+            ;;
+        "modify_dashboard_config")
+            modify_dashboard_config_standalone 0
+            ;;
+        "start_dashboard")
+            start_dashboard_standalone 0
+            ;;
+        "stop_dashboard")
+            stop_dashboard_standalone 0
+            ;;
+        "restart_and_update")
+            restart_and_update_standalone 0
+            ;;
+        "show_dashboard_log")
+            show_dashboard_log_standalone 0
+            ;;
+        "uninstall_dashboard")
+            uninstall_dashboard_standalone 0
+            ;;
+        "install_agent")
+            shift
+            if [ $# -ge 3 ]; then
+                install_agent "$@"
+            else
+                install_agent 0
+            fi
+            ;;
+        "modify_agent_config")
+            modify_agent_config 0
+            ;;
+        "show_agent_log")
+            show_agent_log 0
+            ;;
+        "uninstall_agent")
+            uninstall_agent 0
+            ;;
+        "restart_agent")
+            restart_agent 0
+            ;;
+        "update_script")
+            update_script 0
+            ;;
+        *) show_usage ;;
+        esac
+    else
+        case $1 in
+        "install_agent")
+            shift
+            if [ $# -ge 3 ]; then
+                install_agent "$@"
+            else
+                install_agent 0
+            fi
+            ;;
+        "modify_agent_config")
+            modify_agent_config 0
+            ;;
+        "show_agent_log")
+            show_agent_log 0
+            ;;
+        "uninstall_agent")
+            uninstall_agent 0
+            ;;
+        "restart_agent")
+            restart_agent 0
+            ;;
+        "update_script")
+            update_script 0
+            ;;
+        *) show_usage ;;
+        esac
+    fi
 else
     select_version
     show_menu

script/nezha-agent

@@ -1,19 +1,62 @@
 #!/sbin/openrc-run
 supervisor=supervise-daemon
 name=nezha-agent
-output_log=/var/log/${name}.log
+supervise_daemon_args="--stdout /var/log/${name}.log --stderr /var/log/${name}.err"
-error_log=/var/log/${name}.err
 SERVER="nz_grpc_host:nz_grpc_port" #Dashboard 地址 ip:port
 SECRET="nz_client_secret" #SECRET
+NZ_BASE_PATH="/opt/nezha"
+NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
 pidfile="/run/${RC_SVCNAME}.pid"
 command="/opt/nezha/agent/nezha-agent"
 command_args="-s ${SERVER} -p ${SECRET}"
 command_background=true
-
 depend() {
 	need net
 }
-
+checkconfig() {
+	GITHUB_URL="github.com"
+	if [ ! -f "${NZ_AGENT_PATH}/nezha-agent" ]; then
+		if [[ $(uname -m | grep 'x86_64') != "" ]]; then
+			os_arch="amd64"
+		elif [[ $(uname -m | grep 'i386\|i686') != "" ]]; then
+			os_arch="386"
+		elif [[ $(uname -m | grep 'aarch64\|armv8b\|armv8l') != "" ]]; then
+			os_arch="arm64"
+		elif [[ $(uname -m | grep 'arm') != "" ]]; then
+			os_arch="arm"
+		elif [[ $(uname -m | grep 's390x') != "" ]]; then
+			os_arch="s390x"
+		elif [[ $(uname -m | grep 'riscv64') != "" ]]; then
+			os_arch="riscv64"
+		fi
+		local version=$(curl -m 10 -sL "https://api.github.com/repos/nezhahq/agent/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+		if [ ! -n "$version" ]; then
+			version=$(curl -m 10 -sL "https://fastly.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g')
+		fi
+		if [ ! -n "$version" ]; then
+			version=$(curl -m 10 -sL "https://gcore.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g')
+		fi
+		if [ ! -n "$version" ]; then
+			echo -e "获取版本号失败，请检查本机能否链接 https://api.github.com/repos/nezhahq/agent/releases/latest"
+			return 0
+		else
+			echo -e "当前最新版本为: ${version}"
+		fi
+		wget -t 2 -T 10 -O nezha-agent_linux_${os_arch}.zip https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_linux_${os_arch}.zip >/dev/null 2>&1
+		if [[ $? != 0 ]]; then
+			echo -e "Release 下载失败，请检查本机能否连接 ${GITHUB_URL}${plain}"
+			return 0
+		fi
+		mkdir -p $NZ_AGENT_PATH
+		chmod 755 -R $NZ_AGENT_PATH
+		unzip -qo nezha-agent_linux_${os_arch}.zip && mv nezha-agent $NZ_AGENT_PATH && rm -rf nezha-agent_linux_${os_arch}.zip README.md
+	fi
+	if [ ! -x "${NZ_AGENT_PATH}/nezha-agent" ]; then
+		chmod +x ${NZ_AGENT_PATH}/nezha-agent
+	fi
+}
 start_pre() {
-	checkpath -f -m 0644 -o root:root "/var/log/${name}.log"
+	if [ "${RC_CMD}" != "restart" ]; then
+		checkconfig || return $?
+	fi
 }

script/nezha-dashboard

@@ -1,8 +1,4 @@
 #!/sbin/openrc-run
-supervisor=supervise-daemon
-name=nezha-dashboard
-output_log=/var/log/${name}.log
-error_log=/var/log/${name}.err
 pidfile="/run/${RC_SVCNAME}.pid"
 command="/opt/nezha/dashboard/app"
 command_args=""
@@ -10,9 +6,11 @@ command_background=true
 directory="/opt/nezha/dashboard"
 
 depend() {
-	  need net
+	need net
 }
 
-start_pre() {
+reload() {
-    checkpath -f -m 0644 -o root:root "/var/log/${name}.log"
+  ebegin "Reloading ${RC_SVCNAME}"
+  start-stop-daemon --signal HUP --pidfile "${pidfile}"
+  eend $?
 }

service/rpc/nezha.go

@@ -127,8 +127,8 @@ func (s *NezhaHandler) ReportSystemInfo(c context.Context, r *pb.Host) (*pb.Rece
 			ipv4, ipv6, _ := utils.SplitIPAddr(host.IP)
 			maxRetries := int(singleton.Conf.DDNS.MaxRetries)
 			config := &ddns.DomainConfig{
-				EnableIPv4: singleton.ServerList[clientID].EnableIPv4,
+				EnableIPv4: true,
-				EnableIpv6: singleton.ServerList[clientID].EnableIpv6,
+				EnableIpv6: true,
 				FullDomain: serverDomain,
 				Ipv4Addr:   ipv4,
 				Ipv6Addr:   ipv6,

service/singleton/servicesentinel.go

@@ -172,7 +172,7 @@ func (ss *ServiceSentinel) Monitors() []*model.Monitor {
 	return monitors
 }
 
-// loadMonitorHistory 加载服务监控器的历史状态信息
+// LoadStats 加载服务监控器的历史状态信息
 func (ss *ServiceSentinel) loadMonitorHistory() {
 	var monitors []*model.Monitor
 	err := DB.Find(&monitors).Error