update

ads_handler.go

@@ -25,9 +25,10 @@ import (
 var SECERET_KEY = "%videoopen%!@#$%"
 
 type Response struct {
-	Result int `json:"result"`
-	Msg string`json:"msg"`
-	AdsResult string`json:"ads_result"`
+	Result    int    `json:"result"`
+	Msg       string `json:"msg"`
+	AdsResult string `json:"ads_result"`
+	addata.AdData
 }
 
 func adsHandler(c *gin.Context) {
@@ -62,7 +63,7 @@ func adsHandler(c *gin.Context) {
 		ip = request.ReqSourceIp
 	}
 
-	if ip=="" {
+	if ip == "" {
 		ip = c.GetHeader("X-Forwarded-For")
 	}
 
@@ -85,24 +86,24 @@ func adsHandler(c *gin.Context) {
 	// 上報
 	if request.NewAdsFlag == 1 {
 		grayLogData := struct {
-			Ip string
-			Imei string
-			Model string
-			NetworkType int `json:"network_type"`
-			Province string
-			City string
-			ScreeSize string `json:"screen_size"`
-			Ua string
-			Brand string
-			Androidid string `json:"android_id"`
+			Ip           string
+			Imei         string
+			Model        string
+			NetworkType  int `json:"network_type"`
+			Province     string
+			City         string
+			ScreeSize    string `json:"screen_size"`
+			Ua           string
+			Brand        string
+			Androidid    string `json:"android_id"`
 			ShortMessage string `json:"short_message"`
-			ReqSource string `json:"req_source"`
+			ReqSource    string `json:"req_source"`
 		}{
 			Ip:           ip,
 			Imei:         request.Imei,
 			Model:        request.Model,
 			NetworkType:  request.NetworkType,
-			Province:      ipInfo.Province,
+			Province:     ipInfo.Province,
 			City:         ipInfo.City,
 			ScreeSize:    request.ScreenSize,
 			Ua:           request.UaClient,
@@ -122,16 +123,16 @@ func adsHandler(c *gin.Context) {
 	}
 
 	// 是否是安卓
-	if request.Imei =="" {
+	if request.Imei == "" {
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_IOS", cityCode)
-		graylog.LogApi("ios_device", request.Idfa,"", request.ReqSource)
+		graylog.LogApi("ios_device", request.Idfa, "", request.ReqSource)
 	} else {
-		device.SetAdsTagLog(advertiser, request.ReqSource,"DS_ANDRIOID", cityCode)
+		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_ANDRIOID", cityCode)
 	}
 
 	freqControlInterval := 600
 	// 深圳，东莞强行用600秒控制, 其他地区从配置读取
-	if strings.Index(ipInfo.City, "深圳")== -1 && strings.Index(ipInfo.City, "东莞")==-1 {
+	if strings.Index(ipInfo.City, "深圳") == -1 && strings.Index(ipInfo.City, "东莞") == -1 {
 		// 频率控制
 		freqControlConf, err := redis_data.GetFreqCrontolConf(request.ReqSource)
 		if err != nil {
@@ -153,13 +154,13 @@ func adsHandler(c *gin.Context) {
 	}
 
 	needControl := false
-	if request.ReqSource != "wzb_h5"  && lastReqTime != 0  && time.Now().Unix() - lastReqTime < int64(freqControlInterval) {
+	if request.ReqSource != "wzb_h5" && lastReqTime != 0 && time.Now().Unix()-lastReqTime < int64(freqControlInterval) {
 		// 需要凭空
 		needControl = true
-		device.SetAdsTagLog(advertiser, request.ReqSource,"DS_FREQ_0", cityCode)
+		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_0", cityCode)
 	} else {
 		device.SetIpReqTime(ip, time.Now().Unix())
-		device.SetAdsTagLog(advertiser, request.ReqSource,"DS_FREQ_1", cityCode)
+		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_1", cityCode)
 	}
 
 	//### 检查是否是ip黑名单
@@ -169,12 +170,12 @@ func adsHandler(c *gin.Context) {
 		return
 	}
 	if isIpBlack {
-		graylog.LogApi("black_ip_list", ip,"", request.ReqSource)
-		device.SetAdsTagLog(advertiser, request.ReqSource,"DS_BLACK_IP", cityCode)
+		graylog.LogApi("black_ip_list", ip, "", request.ReqSource)
+		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IP", cityCode)
 	}
 
 	// 获取渠道的黑白性
-	reqChannelFlag, err := redis_data.GetChannelFlag(request.ReqSource,"ads_req")
+	reqChannelFlag, err := redis_data.GetChannelFlag(request.ReqSource, "ads_req")
 	if err != nil {
 		c.String(404, "get req channel flag failed")
 		return
@@ -182,12 +183,12 @@ func adsHandler(c *gin.Context) {
 	flowWeight := reqChannelFlag.Weigth
 	flowRandomNum := rand.Intn(100)
 
-	flowFlag := 0  // 有效的百分比
-	if flowRandomNum <= flowWeight{
+	flowFlag := 0 // 有效的百分比
+	if flowRandomNum <= flowWeight {
 		flowFlag = 1
 	}
 	if reqChannelFlag.ChannelFlag == 1 {
-		device.SetAdsTagLog(advertiser, request.ReqSource,fmt.Sprintf("DS_REQ_SOURCE_{%d}", reqChannelFlag.ChannelFlag), cityCode)
+		device.SetAdsTagLog(advertiser, request.ReqSource, fmt.Sprintf("DS_REQ_SOURCE_{%d}", reqChannelFlag.ChannelFlag), cityCode)
 	}
 
 	// 替换成小米的设备
@@ -200,10 +201,10 @@ func adsHandler(c *gin.Context) {
 	// 检查是否是小米的设备
 	specialDeviceNum := 0
 	if request.ReqSource == "wzb_h5" {
-		specialDeviceNum = 6  // wzb_h5渠道只綁定一个imei, 具体愿意不知道
+		specialDeviceNum = 6 // wzb_h5渠道只綁定一个imei, 具体愿意不知道
 	}
 	if request.ReqSource == "moyuntv" || (!request.IsMiDevice() &&
-		(!isIpBlack &&  !needControl && reqChannelFlag.ChannelFlag ==1) && flowFlag == 1) {
+		(!isIpBlack && !needControl && reqChannelFlag.ChannelFlag == 1) && flowFlag == 1) {
 		randomNum := 3
 		deviceConf, realRedisKey, err := device.GetMiDeviceConf(ip, randomNum, specialDeviceNum)
 		if err != nil {
@@ -257,7 +258,7 @@ func adsHandler(c *gin.Context) {
 					NewImei      string `json:"new_imei"`
 					IP           string `json:"ip"`
 					City         string `json:"city"`
-					CityCode     int `json:"city_code"`
+					CityCode     int    `json:"city_code"`
 					Province     string
 					HitFlag      int    `json:"hit_flag"`
 					LeftCnt      int    `json:"left_cnt"`
@@ -285,7 +286,7 @@ func adsHandler(c *gin.Context) {
 		// 解码ua_client
 		uaClient, _ = url.QueryUnescape(uaClient)
 	} else if request.IsMiDevice() {
-		device.SetAdsTagLog(advertiser, request.ReqSource,"DS_MI_REAL", cityCode)  // 是小米设备
+		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_MI_REAL", cityCode) // 是小米设备
 		userFlag = 3
 		sendPhoneType = 1
 	}
@@ -301,7 +302,7 @@ func adsHandler(c *gin.Context) {
 		if replaceFlag == 1 {
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IMEI_REPLACE", cityCode)
 		} else {
-			device.SetAdsTagLog(advertiser, request.ReqSource,"DS_BLACK_IMEI", cityCode)
+			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IMEI", cityCode)
 		}
 	}
 
@@ -339,13 +340,12 @@ func adsHandler(c *gin.Context) {
 	}
 
 	dspInfo.RealMd5Imei = md5Imei
-	//response = {'result': 0, 'msg': 'ok','ads_result':''}
 	//ads_item = None
 	//xiaomi_response = []
 	hour, _ := strconv.Atoi(time.Now().Format("01"))
 
 	canRequest := true
-	if 0 <= hour && hour <=1 {
+	if 0 <= hour && hour <= 1 {
 		randNum := rand.Intn(100)
 		if randNum > 5 {
 			canRequest = false
@@ -358,16 +358,16 @@ func adsHandler(c *gin.Context) {
 	var adDataNum int
 
 	// 非频率控制，设备黑名单，ip黑名单，白名单渠道,并且替换了小米设备的
-	if canRequest && !isBlackImei && reqChannelFlag.ChannelFlag == 1 && flowFlag ==1 && !isIpBlack && advertiser == "xiaomi" && request.ReqSource  != "" && !isBlackImei && !needControl && (replaceFlag==1 || request.IsMiDevice()) {
+	if canRequest && !isBlackImei && reqChannelFlag.ChannelFlag == 1 && flowFlag == 1 && !isIpBlack && advertiser == "xiaomi" && request.ReqSource != "" && !isBlackImei && !needControl && (replaceFlag == 1 || request.IsMiDevice()) {
 		adData, xiaomiResponse, xiaomiRspAction, adDataNum, err = addata.GetAdsInfos(&dspInfo, advertiser)
 	}
 
 	canMixFlag := 0
 	xiaomiResponseFlag := 0
 	response := Response{}
-	if adData != nil &&  len(adData.TargetAddition) > 1 {
+	if adData != nil && len(adData.TargetAddition) > 1 {
 		realTarget := ""
-		if adData.Target != ""{
+		if adData.Target != "" {
 			md5Skip := utils.Md5(addata.Target)
 			conf := adslib.GetConf()
 			realTarget = conf.Host + fmt.Sprintf("?action=LOADING&req_source=%s&advertiser=video&skip=%s&brand=%s&request_id=%s&skip_other=%s",
@@ -380,16 +380,16 @@ func adsHandler(c *gin.Context) {
 		adData.JsOrderId, _ = redis_data.GetMinScriptOrderByAdv(advertiser)
 		adData.UserAgent = uaClient
 
-		if dspInfo.ReqSource =="kuxin" && adData.Target != "" {
+		if dspInfo.ReqSource == "kuxin" && adData.Target != "" {
 			adData.DpReport = fmt.Sprintf("%s?action=DP_CLICK&advertiser=video&req_source=%s", common.get_request_host(None), dspInfo.ReqSource)
 			adData.Dp = adslib.GetConf().DpTest
 		}
 		if dspInfo.SendPhoneType == 0 {
-			device.SetAdsTagLog(advertiser,dspInfo.ReqSource,"ADS_GET", cityCode)  // 广告获取成功
-		} else if dspInfo.SendPhoneType==1 {
-			device.SetAdsTagLog(advertiser,dspInfo.ReqSource,"ADS_GET_1", cityCode)  // 广告获取成功
+			device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_GET", cityCode) // 广告获取成功
+		} else if dspInfo.SendPhoneType == 1 {
+			device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_GET_1", cityCode) // 广告获取成功
 		}
-		device.SetAdsTagLog(advertiser, dspInfo.ReqSource, fmt.Sprintf("ADS_USER_%d", userFlag), cityCode)  //  广告类型，缓存，新用户，小米手机
+		device.SetAdsTagLog(advertiser, dspInfo.ReqSource, fmt.Sprintf("ADS_USER_%d", userFlag), cityCode) //  广告类型，缓存，新用户，小米手机
 		// 判断这个渠道是否要去融合和融合的流量占比
 		mixChannelFlag, err := redis_data.GetChannelFlag(dspInfo.ReqSource, "ads_mix")
 		if err != nil {
@@ -402,29 +402,29 @@ func adsHandler(c *gin.Context) {
 		if flowRandomNum > mixChannelFlag.Weigth {
 			isOverFlow = true
 		}
-		if mixChannelFlag.ChannelFlag !=1 || isOverFlow {
+		if mixChannelFlag.ChannelFlag != 1 || isOverFlow {
 			//extra_infos = []
 		}
 
 		// 组装返回去的action
-		serverActionResponse := map[string]int{"server_view":0,"server_click":0,"server_close":0,"server_video_finish":0,"server_video_timer":0}
+		serverActionResponse := map[string]int{"server_view": 0, "server_click": 0, "server_close": 0, "server_video_finish": 0, "server_video_timer": 0}
 		for _, targetInfo := range adData.TargetAddition {
 			if targetInfo.Type == "VIEW" {
-				serverActionResponse["server_view"]=1
-				redis_data.SetReqSourceView(advertiser, dspInfo.ReqSource,"xiafa")
+				serverActionResponse["server_view"] = 1
+				redis_data.SetReqSourceView(advertiser, dspInfo.ReqSource, "xiafa")
 			} else if targetInfo.Type == "CLICK" {
-				serverActionResponse["server_click"]=1
-			} else if targetInfo.Type=="CLOSE" {
-				serverActionResponse["server_close"]=1
-			} else if targetInfo.Type=="VIDEO_FINISH" {
-				serverActionResponse["server_video_finish"]=1
-			} else if targetInfo.Type =="VIDEO_TIMER" {
-				serverActionResponse["server_video_timer"]=1
+				serverActionResponse["server_click"] = 1
+			} else if targetInfo.Type == "CLOSE" {
+				serverActionResponse["server_close"] = 1
+			} else if targetInfo.Type == "VIDEO_FINISH" {
+				serverActionResponse["server_video_finish"] = 1
+			} else if targetInfo.Type == "VIDEO_TIMER" {
+				serverActionResponse["server_video_timer"] = 1
 			}
 		}
 
 		// 增加跟随订单
-		if len(adData.TargetAddition) == 2  && serverActionResponse["server_video_finish"] == 1 && (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") {
+		if len(adData.TargetAddition) == 2 && serverActionResponse["server_video_finish"] == 1 && (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") {
 			adData, err = addata.CombineOrderBy(adData, advertiser, &dspInfo)
 			if err != nil {
 				return err
@@ -433,14 +433,14 @@ func adsHandler(c *gin.Context) {
 
 		//# 检查最后是否有click
 		//last_target_addition_infos = ads_item_new.get('target_addition',[])
-		for _, targetAddition  := range adData.TargetAddition {
-			if targetAddition.Type =="CLICK" || targetAddition.Type == "VIDEO_TIMER" {
+		for _, targetAddition := range adData.TargetAddition {
+			if targetAddition.Type == "CLICK" || targetAddition.Type == "VIDEO_TIMER" {
 				canMixFlag = 0
 				break
 			}
 		}
 
-		if request.NewAdsFlag==0 {
+		if request.NewAdsFlag == 0 {
 			//response.update(ads_item_new)
 		} else {
 			jsonBytes, err := json.Marshal(*adData)
@@ -452,22 +452,22 @@ func adsHandler(c *gin.Context) {
 		}
 
 		hour, _ := strconv.Atoi(time.Now().Format("01"))
-		if 0 <= hour && hour <=23 && replaceFlag ==1 {
+		if 0 <= hour && hour <= 23 && replaceFlag == 1 {
 			randomNum := utils.Hash(imei) % 10000
 			if randomNum < 3000 {
 				//add_beanstalk_response.BeanstalkHandle().add_ads_response_info(md5_imei,ads_ip,web.utf8(province),web.utf8(city),ads_item_new,dsp_city_code,req_source,real_imei,xiaomi_response,xiaomi_action,server_action_response,dsp_info.request_id,xiaomi_ads_data_num)
 			}
 		}
 	}
-	if canMixFlag==1 {
+	if canMixFlag == 1 {
 		response.Result = 2
 		response.Msg = "no ads"
-		if xiaomiResponseFlag==1 {
+		if xiaomiResponseFlag == 1 {
 			response.Result = 0
 			response.Msg = "ok"
 		}
 		// 增加打底广告
-		if (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku")  && !needCotrol ==1 && !isBlackImei {
+		if (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") && !needCotrol == 1 && !isBlackImei {
 			shortMessage := "kong"
 			// 先跑定投
 			customAdData, err := addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 0, xiaomiResponseFlag)
@@ -481,12 +481,12 @@ func adsHandler(c *gin.Context) {
 					return err
 				}
 			}
-			device.SetAdsTagLog(advertiser, dspInfo.ReqSource,"ADS_ZIYOU_GET", cityCode)  // 广告获取成功
+			device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_ZIYOU_GET", cityCode) // 广告获取成功
 			if customAdData != nil {
 				shortMessage = "ads_tt_thirds"
 			}
 
-			if customAdData != nil && (shortMessage ==  "ads_vast_response" || shortMessage == "ads_tt_thirds") {
+			if customAdData != nil && (shortMessage == "ads_vast_response" || shortMessage == "ads_tt_thirds") {
 				//response_data_report = {}
 				//response_data_report['ip'] = ads_ip
 				//response_data_report['short_message'] =  short_message
@@ -496,58 +496,120 @@ func adsHandler(c *gin.Context) {
 				//response_data_report['advertiser']=advertiser
 				//log.send_to_graylog_tornado(gelf_data=response_data_report)
 
-				adDataBytes,  err :=
+				adDataBytes, err := json.Marshal(*adData)
+				if err != nil {
+					fmt.Sprintf("marshal addata failed: %s\n", err)
+				}
 				grayLogData := struct {
-					Ip string
+					Ip           string
 					ShortMessage string `json:"short_message"`
-					ReqSource string `json:"req_source"`
+					ReqSource    string `json:"req_source"`
 					ResponseVast string `json:"response_vast"`
-					OrderName string `json:"order_name"`
-					Advertiser string `json:"advertiser"`
+					OrderName    string `json:"order_name"`
+					Advertiser   string `json:"advertiser"`
 				}{
 					Ip:           ip,
 					ShortMessage: "ads_api_log",
 					ReqSource:    "zhiku",
-					ResponseVast: ""
-					OrderName: customAdData.OrderName,
-					Advertiser:  advertiser,
+					ResponseVast: string(adDataBytes),
+					OrderName:    customAdData.OrderName,
+					Advertiser:   advertiser,
+				}
+
+				graylog.Log(grayLogData)
+			}
+			if shortMessage == "ads_tt_thirds" {
+				// 组装最后的信息
+				lastAdData := addata.AdData{}
+				rspTargetAddition := make([]addata.AdAction, 0, 50)
+				//  当小米有填充的时候
+				if len(response.TargetAddition) != 0 && len(customAdData.TargetAddition) != 0 {
+					rspTargetAddition = response.TargetAddition
+					lastAdData.UserAgent = response.UserAgent
+				}
+				//  当只有view的时候
+				if len(customAdData.TargetAddition) == 1 {
+					for _, url := range customAdData.TargetAddition[0].Urls {
+						rspTargetAddition[0].Urls = append(rspTargetAddition[0].Urls, url)
+					}
+				} else {
+					// 当自由订单有view和click的时候
+					for _, url := range customAdData.TargetAddition[0].Urls {
+						rspTargetAddition[0].Urls = append(rspTargetAddition[0].Urls, url)
+					}
+
+					for _, url := range customAdData.TargetAddition[1].Urls {
+						rspTargetAddition[1].Urls = append(rspTargetAddition[1].Urls, url)
+					}
+					rspTargetAddition[1].Type = "CLICK"
+				}
+				lastAdData.Target = customAdData.Target
+				lastAdData.JsOrderId = customAdData.JsOrderId
+				lastAdData.TargetAddition = rspTargetAddition
+				lastAdData.DpReport = response.DpReport
+				lastAdData.Dp = response.Dp
+
+				adDataBytes, err := json.Marshal(lastAdData)
+				if err != nil {
+					fmt.Sprintf("marshal addata failed: %s\n", err)
+				}
+				grayLogData := struct {
+					ShortMessage string `json:"short_message"`
+					ResponseVast string `json:"response_vast"`
+				}{
+					ShortMessage: "third_mix_xiaomi",
+					ResponseVast: string(adDataBytes),
 				}
 
 				graylog.Log(grayLogData)
+				customAdData = &lastAdData
+			}
+			if customAdData != nil {
+				device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_ZIYOU_HAVE", cityCode) // 广告获取成功
+				if dspInfo.ReqSource == "zhiku" {
+					response.Result = 0
+					response.Msg = "ok"
+
+					jsonBytes, err := json.Marshal(customAdData)
+					if err != nil {
+						c.String(404, err.Error())
+						return
+					}
+					encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(SECERET_KEY))
+					response.AdsResult = encryptData
+					//self.report_graylog(json.dumps(extra_item))
+					rspBytes, err := json.Marshal(response)
+					if err != nil {
+						c.String(404, err.Error())
+						return
+					}
+					c.String(200, string(rspBytes))
+					return
+				} else {
+					customAdData.Result = 0
+					customAdData.Msg = "ok"
+					//self.report_graylog(json_response)
+					rspBytes, err := json.Marshal(customAdData)
+					if err != nil {
+						c.String(404, err.Error())
+						return
+					}
+					c.String(200, string(rspBytes))
+					return
+				}
 			}
-			//if short_message=="ads_tt_thirds":
-			//from thirds import thirds_mix_xiaomi
-			//extra_item = thirds_mix_xiaomi.mix_last_infos(extra_item,response)
-			//if (extra_item) != None:
-			//redis_device.set_ads_tag_log(advertiser,req_source,'ADS_ZIYOU_HAVE',dsp_city_code)  # 广告获取成功
-			//if req_source in ['zhiku']:
-			//response['result']=0
-			//response['msg']='ok'
-			//response['ads_result']= self.prpcrypt_tools.to_encrypt_content(json.dumps(extra_item))
-			//self.report_graylog(json.dumps(extra_item))
-			//self.write(json.dumps(response))
-			//self.finish()
-			//return
-			//else:
-			//extra_item['result']=0
-			//extra_item['msg']="ok"
-			//json_response = json.dumps(extra_item)
-			//self.report_graylog(json_response)
-			//self.write(json_response)
-			//self.finish()
-			//return
 		}
 	}
-	//redis_tools.set_ads_real_request_num(advertiser)
-	//json_response = json.dumps(response)
-	//try:
-	//if new_ads_flag==0:
-	//self.report_graylog(json_response)
-	//redis_device.set_ads_tag_log(advertiser,req_source,'DS_REQ',dsp_city_code)  # 所有请求
-	//except:
-	//pass
-	//self.write(json_response)
-	//self.finish()
-
-	c.String(200, "hehe")
+	redis_data.SetAdsRealRequestNum(advertiser)
+	rspBytes, err := json.Marshal(response)
+	if err != nil {
+		c.String(404, err.Error())
+		return
+	}
+
+	if request.NewAdsFlag == 0 {
+		//self.report_graylog(json_response)
+	}
+	device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "DS_REQ", cityCode) // 所有请求
+	c.String(200, string(rspBytes))
 }

adslib/addata/custom.go

@@ -11,19 +11,6 @@ import (
 	"time"
 )
 
-type CustomAdData struct {
-	Duration       int64         `json:"duration"`
-	ImageURL       string        `json:"image_url"`
-	JsOrderID      int64        `json:"js_order_id"`
-	Msg            int64         `json:"msg"`
-	OrderName      string        `json:"order_name"`
-	Result         int64         `json:"result"`
-	Target         string        `json:"target"`
-	TargetAddition []AdAction `json:"target_addition"`
-	UserAgent      string        `json:"user_agent"`
-	VideoURL       string        `json:"video_url"`
-}
-
 func CombineOrderBy(adData *AdData, advertiser string, dsp *utils.DspParam) (*AdData, error) {
 	customAdData, err := GetCustomAdsInfos(dsp, advertiser, 1, 0, 0)
 	if err != nil {
@@ -59,9 +46,8 @@ func CombineOrderBy(adData *AdData, advertiser string, dsp *utils.DspParam) (*Ad
 	return adData, nil
 }
 
-
 // 获取一个广告
-func getOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error){
+func getOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error) {
 	// 取出广告
 	orders, err := redis_data.GetOrderInfos(dsp, fixFlag)
 	if err != nil {
@@ -110,7 +96,7 @@ func getOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdO
 }
 
 // 获取投放数量
-func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int,error) {
+func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int, error) {
 	beginTime := time.Unix(adData.BeginTime, 0)
 
 	// 获取当前分钟值
@@ -157,7 +143,7 @@ func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int,error) {
 	return needDispatchCount, nil
 }
 
-func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) (*CustomAdData, error){
+func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) (*AdData, error) {
 	order, err := getOneAds(dsp, orderType, fixFlag)
 	if err != nil {
 		return nil, err
@@ -217,7 +203,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 	// 获取当前分钟已经完成的下发
 	curMinuteFinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
 	if curMinuteFinishedDispatchCnt < curMinuteNeedDispatchCnt {
-		data := CustomAdData{
+		data := AdData{
 			Duration:  5,
 			JsOrderID: order.JsOrderID,
 			OrderName: order.Title,
@@ -315,14 +301,14 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 
 		var addi *AdAction
 		if orderType == 0 {
-			addi = genMonitorAction("VIEW",  order.Title, dsp.ReqSource, showUrl)
+			addi = genMonitorAction("VIEW", order.Title, dsp.ReqSource, showUrl)
 		} else {
-			addi = genMonitorAction("VIEW",  order.Title, "follow", showUrl)
+			addi = genMonitorAction("VIEW", order.Title, "follow", showUrl)
 		}
 
 		data.TargetAddition = append(data.TargetAddition, *addi)
 
-		r := rand.Intn( 1000)
+		r := rand.Intn(1000)
 		clickRate := int(float32(order.ClickKpi) / float32(order.ShowKpi) * 1000)
 		if r < clickRate {
 			//下发点击
@@ -342,25 +328,24 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 	return nil, nil
 }
 
-
 func genMonitorAction(action string, title string, reqSource string, url string) *AdAction {
-		duration := 5
-		if action =="VIDEO_TIMER" {
-			duration = 7
-		}
+	duration := 5
+	if action == "VIDEO_TIMER" {
+		duration = 7
+	}
 
-		urlArr := make([]string,0, 50)
-		if url != "" {
-			urlArr = strings.Split(url, "||")
-		}
-		adAction := AdAction{
-			Type:     action,
-			Duration: duration,
-			Urls:     urlArr,
-		}
-		urlHost := adslib.GetConf().HostIos
-		actionUrl := fmt.Sprintf("%s?action=%s&advertiser=%s&req_source=%s",
-			urlHost, action, reqSource, title)
-		adAction.Urls = append(adAction.Urls, actionUrl)
-		return &adAction
+	urlArr := make([]string, 0, 50)
+	if url != "" {
+		urlArr = strings.Split(url, "||")
+	}
+	adAction := AdAction{
+		Type:     action,
+		Duration: duration,
+		Urls:     urlArr,
+	}
+	urlHost := adslib.GetConf().HostIos
+	actionUrl := fmt.Sprintf("%s?action=%s&advertiser=%s&req_source=%s",
+		urlHost, action, reqSource, title)
+	adAction.Urls = append(adAction.Urls, actionUrl)
+	return &adAction
 }

adslib/addata/xiaomi.go

@@ -67,10 +67,13 @@ type AdData struct {
 	ImageUrl       string `json:"image_url"`
 	Duration       int64
 	VideoUrl       string `json:"video_url"`
-	JsOrderId      int64 `json:"js_order_id"`
+	JsOrderId      int64  `json:"js_order_id"`
 	UserAgent      string `json:"user_agent"`
 	DpReport       string `json:"dp_report"`
 	Dp             string `json:"dp"`
+	OrderName      string `json:"order_name"`
+	Result         int    `json:"result"`
+	Msg            string `json:"msg"`
 }
 
 func getAdsReqUrl(dsp *utils.DspParam) string {

adslib/graylog/graylog.go

@@ -1,6 +1,7 @@
 package graylog
 import (
 	"encoding/json"
+	"github.com/gin-gonic/gin"
 	"github.com/robertkowalski/graylog-golang"
 )
 var grayLog  *gelf.Gelf
@@ -34,3 +35,56 @@ func LogApi(shortMsg string, desc string, extraDesc string, reqSource string) {
 	}
 	Log(grayLogData)
 }
+
+// 发送返回日志
+func ReportGrayLog(c *gin.Context, uid int, response string, jsonFlag int) {
+	path := c.Request.URL.Path
+	reqTs := c.Request.Time()
+	ip = req.headers.get('X-Forwarded-For',"")
+	req_source_ip = req_data.get('ip',[])
+	if len(req_source_ip):
+	check_req_source_flag = redis_ip.check_req_source(req_data.get('req_source',[])[0])
+	if check_req_source_flag:
+	ip = req_source_ip[0]
+	if ip=="":
+	ip = self.request.headers.get("X-Real-IP","")
+	if ip=="":
+	ip = req.remote_ip
+	if ip.find(",") > 0:
+	ip = ip.split(",")[0]
+	device_id = req_data.get('device_id,', '')
+	request = urllib.unquote(urllib.urlencode(req_data, 'utf-8'))
+	province,city,city_code = ip_location_helper.get_region_by_ip(ip)
+	gelf_data = {}
+	gelf_data['short_message'] = 'ads_api_log'
+	gelf_data['_user_id'] = user_id
+	gelf_data['_device_id'] = device_id
+	gelf_data['_ip'] = ip
+	gelf_data['_uri'] = path
+	gelf_data['_province']=province
+	gelf_data['_city']=city
+	gelf_data['_city_code']=city_code
+	for key,value in req_data.items():
+	if str(key) in ['ip']:
+	continue
+	gelf_data['_{0}'.format(key)] = common.my_str(value[0])
+	req_len = 102400
+	gelf_data['_request'] = request[0:req_len]
+	#json_response = json.dumps(response)
+	### 结果不上报了
+	json_response = ""
+	if len(json_response) < req_len and len(json_response) > 60:
+try:
+	json_response = json.dumps(
+		response, indent=4, sort_keys=True,
+		ensure_ascii=False).encode("utf-8")
+except:
+	send_try_except()
+try:
+	json_response = json_response.decode("utf-8")
+except:
+	pass
+	gelf_data['_response'] = json_response[0:req_len]
+	gelf_data['_response_time'] = round(req_ts * 1000.0, 2)
+	send_to_graylog_tornado(gelf_data, req=req, req_data=cur_req_data)
+}

adslib/redis_data/redis_data.go

@@ -215,6 +215,18 @@ func SetAdsRequestNum(advertiser string, bannerid int) {
 	conn.Do("incr", redisKey)
 }
 
+func SetAdsRealRequestNum(advertiser string) {
+	if advertiser == "" {
+		return
+	}
+
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	redisKey := fmt.Sprintf("adsv2_request_%s", advertiser)
+	conn.Do("incr", redisKey)
+}
+
 // 设置skip redis
 func SetSkipInfo(md5Skip string, skipUrl string) {
 	conn := ads_redis.RedisConn.Get()
@@ -225,20 +237,20 @@ func SetSkipInfo(md5Skip string, skipUrl string) {
 }
 
 // 通过advertiser获取最小的script_order
-func GetMinScriptOrderByAdv(advertiser string) (string, error) {
+func GetMinScriptOrderByAdv(advertiser string) (int64, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
 	redisKey := "adv_script_" + advertiser
 	rsp, err := conn.Do("GET", redisKey)
 	if err != nil {
-		return "", err
+		return 0, err
 	}
 
 	if rsp == nil {
-		return "", err
+		return 0, err
 	}
-	scriptOrder, _ := redis.String(rsp, err)
+	scriptOrder, _ := redis.Int64(rsp, err)
 	return scriptOrder, nil
 }
 
@@ -451,4 +463,3 @@ func GetIosUaImei(ip string) (string, string, error) {
 	json.Unmarshal(rspBytes, &uaImeiInfo)
 	return uaImeiInfo.Imei, uaImeiInfo.Ua, nil
 }
-