管理员权限，兼容旧fb上报

modules/backend/handler/power/power.go

@@ -81,11 +81,11 @@ func EditUserPower(c *gin.Context) {
 		a.Msg = "账户不存在"
 		return
 	}
-	if user.Role == values.UserRoleAdmin {
+	//if user.Role == values.UserRoleAdmin {
-		a.Code = values.CodeParam
+	//	a.Code = values.CodeParam
-		a.Msg = "不可修改超级管理员"
+	//	a.Msg = "不可修改超级管理员"
-		return
+	//	return
-	}
+	//}
 	update := map[string]interface{}{}
 	if req.Power != nil {
 		// if user.Power == *req.Power {

modules/web/handler/ad.go

@@ -11,9 +11,9 @@ import (
 
 // UploadFBReq 上报fb数据
 type UploadFBReq struct {
-	ChannelID int    `json:"ChannelID" binding:"required"`
+	ChannelID int    `json:"ChannelID"`
-	FBC       string `json:"FBC" binding:"required"`
+	FBC       string `json:"FBC"`
-	FBP       string `json:"FBP" binding:"required"`
+	FBP       string `json:"FBP"`
 }
 
 func UploadFB(c *gin.Context) {
@@ -21,15 +21,28 @@ func UploadFB(c *gin.Context) {
 	defer func() {
 		a.Response()
 	}()
-	// req := new(UploadFBReq)
+	req := new(UploadFBReq)
-	// if !a.S(req) {
+	// 兼容旧方式，检查是否有请求体，如果没有则跳过参数校验
-	// 	return
+	if c.Request.ContentLength > 0 {
-	// }
+		if !a.S(req) {
+			return
+		}
+	}
 	ip := a.GetRemoteIP()
 	ua := c.Request.Header.Get("User-Agent")
 	fbc := c.Request.Header.Get("fbc")
 	fbp := c.Request.Header.Get("fbp")
-	log.Debug("upload FB fbc:%v,fbp:%v,ip:%v,user-agent:%v", fbc, fbp, ip, ua)
+	channelId := a.Channel
+	if fbc == "" {
+		fbc = req.FBC
+	}
+	if fbp == "" {
+		fbp = req.FBP
+	}
+	if req.ChannelID != 0 {
+		channelId = req.ChannelID
+	}
+	log.Debug("upload FB channel:%d, fbc:%v,fbp:%v,ip:%v,user-agent:%v", channelId, fbc, fbp, ip, ua)
 	if ip == "" {
 		return
 	}
@@ -38,7 +51,7 @@ func UploadFB(c *gin.Context) {
 		return
 	}
 
-	pa := &common.PlayerADData{IP: ip, ChannelID: a.Channel, FBC: fbc, FBP: fbp}
+	pa := &common.PlayerADData{IP: ip, ChannelID: channelId, FBC: fbc, FBP: fbp}
 	db.Mysql().Get(pa)
 	if pa.ID > 0 {
 		return