From 56ebc432d5703f1fd6e72932cb6096a8bfa88926 Mon Sep 17 00:00:00 2001
From: naiba <hi@nai.ba>
Date: Fri, 20 Aug 2021 13:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=82=20=E6=9F=A5=E7=9C=8B=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=AF=BC=E8=87=B4=E7=9A=84=20WebSSH=20=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                               | 2 +-
 cmd/agent/main.go                       | 7 -------
 cmd/dashboard/controller/common_page.go | 2 +-
 service/dao/dao.go                      | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 94e2477..7f23c9e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.9.29&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.7.0-brightgreen?style=for-the-badge&logo=linux">
+<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.9.30&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.7.0-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>哪吒监控</b> 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警，命令批量执行和计划任务。</p>	
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index b4b61a2..5fee32c 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -63,13 +63,6 @@ const (
 	networkTimeOut = time.Second * 5  // 普通网络超时
 )
 
-type windowSize struct {
-	Rows uint16 `json:"rows"`
-	Cols uint16 `json:"cols"`
-	X    uint16
-	Y    uint16
-}
-
 func main() {
 	// 来自于 GoReleaser 的版本号
 	monitor.Version = version
diff --git a/cmd/dashboard/controller/common_page.go b/cmd/dashboard/controller/common_page.go
index e26ac7f..cad348b 100644
--- a/cmd/dashboard/controller/common_page.go
+++ b/cmd/dashboard/controller/common_page.go
@@ -37,13 +37,13 @@ type commonPage struct {
 func (cp *commonPage) serve() {
 	cr := cp.r.Group("")
 	cr.Use(mygin.Authorize(mygin.AuthorizeOption{}))
+	cr.GET("/terminal/:id", cp.terminal)
 	cr.POST("/view-password", cp.issueViewPassword)
 	cr.Use(cp.checkViewPassword) // 前端查看密码鉴权
 	cr.GET("/", cp.home)
 	cr.GET("/service", cp.service)
 	cr.GET("/ws", cp.ws)
 	cr.POST("/terminal", cp.createTerminal)
-	cr.GET("/terminal/:id", cp.terminal)
 }
 
 type viewPasswordForm struct {
diff --git a/service/dao/dao.go b/service/dao/dao.go
index bb73d75..367fe8c 100644
--- a/service/dao/dao.go
+++ b/service/dao/dao.go
@@ -13,7 +13,7 @@ import (
 	pb "github.com/naiba/nezha/proto"
 )
 
-var Version = "v0.9.29" // ！！记得修改 README 中的 badge 版本！！
+var Version = "v0.9.30" // ！！记得修改 README 中的 badge 版本！！
 
 var (
 	Conf  *model.Config