Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

internal/demo/register/check_login.go

@@ -48,17 +48,7 @@ func CheckLoginLimit(c *gin.Context) {
 
 	var Limited bool
 	var LimitError error
-	Limited, LimitError = imdb.IsLimitLoginIp(ip)
-	if LimitError != nil {
-		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, ip)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError})
-		return
-	}
-	if Limited {
-		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), Limited, ip, req.UserID)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.LoginLimit, "errMsg": "ip limited Login"})
-		return
-	}
+	// 指定账户指定ip才能登录
 	Limited, LimitError = imdb.IsLimitUserLoginIp(user.UserID, ip)
 	if LimitError != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, ip)
@@ -70,6 +60,20 @@ func CheckLoginLimit(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.LoginLimit, "errMsg": "user ip limited Login"})
 		return
 	}
+
+	// 该ip不能登录
+	Limited, LimitError = imdb.IsLimitLoginIp(ip)
+	if LimitError != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, ip)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError})
+		return
+	}
+	if Limited {
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), Limited, ip, req.UserID)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.LoginLimit, "errMsg": "ip limited Login"})
+		return
+	}
+
 	Limited, LimitError = imdb.UserIsBlock(user.UserID)
 	if LimitError != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, user.UserID)

internal/push/getui/push.go

@@ -88,9 +88,11 @@ type Android struct {
 }
 
 type Notification struct {
-	Title     string `json:"title"`
-	Body      string `json:"body"`
-	ClickType string `json:"click_type"`
+	Title       string `json:"title"`
+	Body        string `json:"body"`
+	ChannelID   string `json:"channelID"`
+	ChannelName string `json:"ChannelName"`
+	ClickType   string `json:"click_type"`
 }
 
 type Options struct {
@@ -135,9 +137,11 @@ func (g *Getui) Push(userIDList []string, title, detailContent, operationID stri
 		}{Alias: []string{userIDList[0]}},
 	}
 	pushReq.PushMessage.Notification = Notification{
-		Title:     title,
-		Body:      detailContent,
-		ClickType: "startapp",
+		Title:       title,
+		Body:        detailContent,
+		ClickType:   "startapp",
+		ChannelID:   config.Config.Push.Getui.ChannelID,
+		ChannelName: config.Config.Push.Getui.ChannelName,
 	}
 	pushReq.PushChannel.Ios.Aps.Sound = "default"
 	pushReq.PushChannel.Ios.Aps.Alert = Alert{