diff --git a/README.md b/README.md index 7a6333b..0e7cede 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 哪吒面板 -![dashboard](https://img.shields.io/badge/管理面板-v0.3.4-brightgreen?style=for-the-badge&logo=github) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) +![dashboard](https://img.shields.io/badge/管理面板-v0.3.5-brightgreen?style=for-the-badge&logo=github) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) 系统状态监控报警、API(SSL证书变更、即将到期、到期)/TCP端口存活/PING 监控、计划任务(可以定时在Agent上执行命令，备份、重启、What ever you want)、极省资源，64M 服务器也能装 agent。 diff --git a/resource/static/theme-daynight/favicon.png b/resource/static/theme-daynight/favicon.png deleted file mode 100644 index 75d2107..0000000 Binary files a/resource/static/theme-daynight/favicon.png and /dev/null differ diff --git a/resource/static/theme-daynight/logo.png b/resource/static/theme-daynight/logo.png deleted file mode 100644 index 8c78fc4..0000000 Binary files a/resource/static/theme-daynight/logo.png and /dev/null differ diff --git a/resource/template/theme-daynight/home.html b/resource/template/theme-daynight/home.html index 21397e6..4e72b8a 100644 --- a/resource/template/theme-daynight/home.html +++ b/resource/template/theme-daynight/home.html @@ -7,7 +7,7 @@ {{.Title}} - + @@ -18,64 +18,170 @@ {{end}} - -
- -

　/　

　/　

-

  • @#server.live?'Running':'Down'#@

  • @#server.Name#@

  • @#server.Host.Platform#@
  • @#server.Host.CountryCode.toUpperCase()#@
  • @#formatByteSize(server.State.MemUsed)#@ / @#formatByteSize(server.Host.MemTotal)#@
  • @#server.State?secondToDate(server.State.Uptime):'-'#@
  • @#formatByteSize(server.State.SwapUsed)#@ / @#formatByteSize(server.Host.SwapTotal)#@
  • @#formatByteSize(server.State.DiskUsed)#@ / @#formatByteSize(server.Host.DiskTotal)#@
  • @#formatByteSize(server.State.NetInSpeed)#@/s
  • @#formatByteSize(server.State.NetOutSpeed)#@/s

  • CPU

    @#formatPercent(server.live,server.State.CPU,100).percent#@%

  • RAM

    @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%

  • 硬盘

    @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%

+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+

　/　

+ +
+
+

　/　

+ +
+
+
+
+
+
    +
  • +
    +

    @#server.live?'Running':'Down'#@

    +
    +
    • +
  • +

    @#server.Name#@

    +
    • +
    • +
  • @#server.Host.Platform#@
    • +
  • @#server.Host.CountryCode.toUpperCase()#@
    • +
  • @#formatByteSize(server.State.MemUsed)#@ / @#formatByteSize(server.Host.MemTotal)#@
    • +
  • @#server.State?secondToDate(server.State.Uptime):'-'#@
    • +
  • @#formatByteSize(server.State.SwapUsed)#@ / @#formatByteSize(server.Host.SwapTotal)#@
    • +
  • @#formatByteSize(server.State.DiskUsed)#@ / @#formatByteSize(server.Host.DiskTotal)#@
    • +
  • @#formatByteSize(server.State.NetInSpeed)#@/s
    • +
  • @#formatByteSize(server.State.NetOutSpeed)#@/s
    • +
  • +
    +
    +

    CPU

    +
    +
    +
    +

    @#formatPercent(server.live,server.State.CPU,100).percent#@%

    +
    +
    +
    +
    • +
  • +
    +
    +

    RAM

    +
    +
    +
    +

    @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%

    +
    +
    +
    +
    • +
  • +
    +
    +

    硬盘

    +
    +
    +
    +

    @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%

    +
    +
    +
    +
    • +
+
+
+
- - - + - - + + - - - - - + + + + + + - - + - + + {{end}} \ No newline at end of file diff --git a/resource/template/theme-daynight/service.html b/resource/template/theme-daynight/service.html index 435b3cb..95d2452 100644 --- a/resource/template/theme-daynight/service.html +++ b/resource/template/theme-daynight/service.html @@ -30,7 +30,8 @@ {{end}} - + {{statusName (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}} {{end}} diff --git a/service/dao/dao.go b/service/dao/dao.go index 143e7ed..1cf8016 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -34,7 +34,7 @@ var CronLock sync.RWMutex var Crons map[uint64]*model.Cron var Cron *cron.Cron -var Version = "v0.3.4" +var Version = "v0.3.5" func ReSortServer() { ServerLock.RLock()