✨ feat: 后台服务器备注 close #72

2026-02-05 21:20:06 +00:00 · 2021-01-20 19:24:59 +08:00
parent 29bc810a8f
commit ec17948fe4
12 changed files with 83 additions and 66 deletions
--- a/cmd/dashboard/controller/common_page.go
+++ b/cmd/dashboard/controller/common_page.go
@@ -1,6 +1,7 @@
 package controller

 import (
+	"log"
 	"net/http"
 	"time"

@@ -36,51 +37,65 @@ type ServiceItem struct {
 }

 func (p *commonPage) service(c *gin.Context) {
-	var ms []model.Monitor
-	dao.DB.Find(&ms)
-	year, month, day := time.Now().Date()
-	today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
-	var mhs []model.MonitorHistory
-	dao.DB.Where("created_at >= ?", today.AddDate(0, 0, -29)).Find(&mhs)
+	var msm map[uint64]*ServiceItem

-	msm := make(map[uint64]*ServiceItem)
-	for i := 0; i < len(ms); i++ {
-		msm[ms[i].ID] = &ServiceItem{
-			Monitor: ms[i],
-			Delay:   &[30]float32{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			Up:      &[30]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			Down:    &[30]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	var cached bool
+	if _, has := c.Get(model.CtxKeyAuthorizedUser); !has {
+		data, has := dao.Cache.Get(model.CacheKeyServicePage)
+		if has {
+			log.Println("use cache")
+			msm = data.(map[uint64]*ServiceItem)
+			cached = true
 		}
 	}

-	// 整合数据
-	todayStatus := make(map[uint64][]bool)
-	for i := 0; i < len(mhs); i++ {
-		dayIndex := 29
-		if mhs[i].CreatedAt.Before(today) {
-			dayIndex = 28 - (int(today.Sub(mhs[i].CreatedAt).Hours()) / 24)
-		} else {
-			todayStatus[mhs[i].MonitorID] = append(todayStatus[mhs[i].MonitorID], mhs[i].Successful)
-		}
-		if mhs[i].Successful {
-			msm[mhs[i].MonitorID].TotalUp++
-			msm[mhs[i].MonitorID].Delay[dayIndex] = (msm[mhs[i].MonitorID].Delay[dayIndex]*float32(msm[mhs[i].MonitorID].Up[dayIndex]) + mhs[i].Delay) / float32(msm[mhs[i].MonitorID].Up[dayIndex]+1)
-			msm[mhs[i].MonitorID].Up[dayIndex]++
-		} else {
-			msm[mhs[i].MonitorID].TotalDown++
-			msm[mhs[i].MonitorID].Down[dayIndex]++
-		}
-	}
+	if !cached {
+		msm = make(map[uint64]*ServiceItem)
+		var ms []model.Monitor
+		dao.DB.Find(&ms)
+		year, month, day := time.Now().Date()
+		today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
+		var mhs []model.MonitorHistory
+		dao.DB.Where("created_at >= ?", today.AddDate(0, 0, -29)).Find(&mhs)

-	// 当日最后 20 个采样作为当前状态
-	for _, m := range msm {
-		for i := len(todayStatus[m.Monitor.ID]) - 1; i >= 0 && i >= (len(todayStatus[m.Monitor.ID])-1-20); i-- {
-			if todayStatus[m.Monitor.ID][i] {
-				m.CurrentUp++
-			} else {
-				m.CurrentDown++
+		for i := 0; i < len(ms); i++ {
+			msm[ms[i].ID] = &ServiceItem{
+				Monitor: ms[i],
+				Delay:   &[30]float32{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+				Up:      &[30]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+				Down:    &[30]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			}
 		}
+		// 整合数据
+		todayStatus := make(map[uint64][]bool)
+		for i := 0; i < len(mhs); i++ {
+			dayIndex := 29
+			if mhs[i].CreatedAt.Before(today) {
+				dayIndex = 28 - (int(today.Sub(mhs[i].CreatedAt).Hours()) / 24)
+			} else {
+				todayStatus[mhs[i].MonitorID] = append(todayStatus[mhs[i].MonitorID], mhs[i].Successful)
+			}
+			if mhs[i].Successful {
+				msm[mhs[i].MonitorID].TotalUp++
+				msm[mhs[i].MonitorID].Delay[dayIndex] = (msm[mhs[i].MonitorID].Delay[dayIndex]*float32(msm[mhs[i].MonitorID].Up[dayIndex]) + mhs[i].Delay) / float32(msm[mhs[i].MonitorID].Up[dayIndex]+1)
+				msm[mhs[i].MonitorID].Up[dayIndex]++
+			} else {
+				msm[mhs[i].MonitorID].TotalDown++
+				msm[mhs[i].MonitorID].Down[dayIndex]++
+			}
+		}
+		// 当日最后 20 个采样作为当前状态
+		for _, m := range msm {
+			for i := len(todayStatus[m.Monitor.ID]) - 1; i >= 0 && i >= (len(todayStatus[m.Monitor.ID])-1-20); i-- {
+				if todayStatus[m.Monitor.ID][i] {
+					m.CurrentUp++
+				} else {
+					m.CurrentDown++
+				}
+			}
+		}
+		// 未登录人员缓存十分钟
+		dao.Cache.Set(model.CacheKeyServicePage, msm, time.Minute*10)
 	}

 	c.HTML(http.StatusOK, "theme-"+dao.Conf.Site.Theme+"/service", mygin.CommonEnvironment(c, gin.H{
--- a/cmd/dashboard/controller/member_api.go
+++ b/cmd/dashboard/controller/member_api.go
@@ -108,6 +108,7 @@ type serverForm struct {
 	DisplayIndex int
 	Secret       string
 	Tag          string
+	Note         string
 }

 func (ma *memberAPI) addOrEditServer(c *gin.Context) {
@@ -122,6 +123,7 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
 		s.DisplayIndex = sf.DisplayIndex
 		s.ID = sf.ID
 		s.Tag = sf.Tag
+		s.Note = sf.Note
 		if sf.ID == 0 {
 			s.Secret = utils.MD5(fmt.Sprintf("%s%s%d", time.Now(), sf.Name, admin.ID))
 			s.Secret = s.Secret[:10]
--- a/cmd/dashboard/controller/oauth2.go
+++ b/cmd/dashboard/controller/oauth2.go
@@ -28,14 +28,14 @@ func (oa *oauth2controller) serve() {

 func (oa *oauth2controller) login(c *gin.Context) {
 	state := utils.RandStringBytesMaskImprSrcUnsafe(6)
-	dao.Cache.Set(fmt.Sprintf("%s%s", model.CtxKeyOauth2State, c.ClientIP()), state, 0)
+	dao.Cache.Set(fmt.Sprintf("%s%s", model.CacheKeyOauth2State, c.ClientIP()), state, 0)
 	url := oa.oauth2Config.AuthCodeURL(state, oauth2.AccessTypeOnline)
 	c.Redirect(http.StatusFound, url)
 }

 func (oa *oauth2controller) callback(c *gin.Context) {
 	// 验证登录跳转时的 State
-	state, ok := dao.Cache.Get(fmt.Sprintf("%s%s", model.CtxKeyOauth2State, c.ClientIP()))
+	state, ok := dao.Cache.Get(fmt.Sprintf("%s%s", model.CacheKeyOauth2State, c.ClientIP()))
 	if !ok || state.(string) != c.Query("state") {
 		mygin.ShowErrorPage(c, mygin.ErrInfo{
 			Code:  http.StatusBadRequest,