✨ batch update server tag

cmd/dashboard/controller/common_page.go

@@ -167,6 +167,8 @@ type Data struct {
 	Servers []*model.Server `json:"servers,omitempty"`
 }
 
+var cloudflareCookiesValidator = regexp.MustCompile("^[A-Za-z0-9-_]+$")
+
 func (cp *commonPage) ws(c *gin.Context) {
 	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
@@ -285,7 +287,7 @@ func (cp *commonPage) terminal(c *gin.Context) {
 			encodedCookies := strings.Split(cloudflareCookies, ".")
 			if len(encodedCookies) == 3 {
 				for i := 0; i < 3; i++ {
-					if valid, _ := regexp.MatchString("^[A-Za-z0-9-_]+$", encodedCookies[i]); !valid {
+					if !cloudflareCookiesValidator.MatchString(encodedCookies[i]) {
 						cloudflareCookies = ""
 						break
 					}

cmd/dashboard/controller/member_api.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/jinzhu/copier"
 
 	"github.com/naiba/nezha/model"
 	"github.com/naiba/nezha/pkg/mygin"
@@ -39,6 +40,7 @@ func (ma *memberAPI) serve() {
 	mr.POST("/cron", ma.addOrEditCron)
 	mr.GET("/cron/:id/manual", ma.manualTrigger)
 	mr.POST("/force-update", ma.forceUpdate)
+	mr.POST("/batch-update-server-group", ma.batchUpdateServerGroup)
 	mr.POST("/notification", ma.addOrEditNotification)
 	mr.POST("/alert-rule", ma.addOrEditAlertRule)
 	mr.POST("/setting", ma.updateSetting)
@@ -537,6 +539,67 @@ func (ma *memberAPI) manualTrigger(c *gin.Context) {
 	})
 }
 
+type BatchUpdateServerGroupRequest struct {
+	Servers []uint64
+	Group   string
+}
+
+func (ma *memberAPI) batchUpdateServerGroup(c *gin.Context) {
+	var req BatchUpdateServerGroupRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusOK, model.Response{
+			Code:    http.StatusBadRequest,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	if err := singleton.DB.Model(&model.Server{}).Where("id in (?)", req.Servers).Update("tag", req.Group).Error; err != nil {
+		c.JSON(http.StatusOK, model.Response{
+			Code:    http.StatusBadRequest,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	singleton.ServerLock.Lock()
+
+	for i := 0; i < len(req.Servers); i++ {
+		serverId := req.Servers[i]
+		var s model.Server
+		copier.Copy(&s, singleton.ServerList[serverId])
+		s.Tag = req.Group
+		// 如果修改了Tag
+		if s.Tag != singleton.ServerList[s.ID].Tag {
+			index := -1
+			for i := 0; i < len(singleton.ServerTagToIDList[s.Tag]); i++ {
+				if singleton.ServerTagToIDList[s.Tag][i] == s.ID {
+					index = i
+					break
+				}
+			}
+			if index > -1 {
+				// 删除旧 Tag-ID 绑定关系
+				singleton.ServerTagToIDList[singleton.ServerList[s.ID].Tag] = append(singleton.ServerTagToIDList[singleton.ServerList[s.ID].Tag][:index], singleton.ServerTagToIDList[singleton.ServerList[s.ID].Tag][index+1:]...)
+			}
+			// 设置新的 Tag-ID 绑定关系
+			singleton.ServerTagToIDList[s.Tag] = append(singleton.ServerTagToIDList[s.Tag], s.ID)
+			if len(singleton.ServerTagToIDList[s.Tag]) == 0 {
+				delete(singleton.ServerTagToIDList, s.Tag)
+			}
+		}
+		singleton.ServerList[s.ID] = &s
+	}
+
+	singleton.ServerLock.Unlock()
+
+	singleton.ReSortServer()
+
+	c.JSON(http.StatusOK, model.Response{
+		Code: http.StatusOK,
+	})
+}
+
 func (ma *memberAPI) forceUpdate(c *gin.Context) {
 	var forceUpdateServers []uint64
 	if err := c.ShouldBindJSON(&forceUpdateServers); err != nil {

cmd/dashboard/controller/oauth2.go

@@ -13,7 +13,7 @@ import (
 	"github.com/xanzy/go-gitlab"
 	"golang.org/x/oauth2"
 	GitHubOauth2 "golang.org/x/oauth2/github"
-	GitlabOauth2 "golang.org/x/oauth2/github"
+	GitlabOauth2 "golang.org/x/oauth2/gitlab"
 
 	"github.com/naiba/nezha/model"
 	"github.com/naiba/nezha/pkg/mygin"
@@ -156,7 +156,7 @@ func (oa *oauth2controller) callback(c *gin.Context) {
 	}
 	var isAdmin bool
 	for _, admin := range strings.Split(singleton.Conf.Oauth2.Admin, ",") {
-		if admin != "" && strings.ToLower(user.Login) == strings.ToLower(admin) {
+		if admin != "" && strings.EqualFold(user.Login, admin) {
 			isAdmin = true
 			break
 		}