add

adslib/addata/custom.go

@@ -3,8 +3,10 @@ package addata
 import (
 	"fmt"
 	"math/rand"
+	"miads/adslib"
 	"miads/adslib/redis_data"
 	"miads/adslib/utils"
+	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -18,7 +20,7 @@ type CustomAdData struct {
 	OrderName      string        `json:"order_name"`
 	Result         int64         `json:"result"`
 	Target         string        `json:"target"`
-	TargetAddition []interface{} `json:"target_addition"`
+	TargetAddition []AdAction `json:"target_addition"`
 	UserAgent      string        `json:"user_agent"`
 	VideoURL       string        `json:"video_url"`
 }
@@ -157,12 +159,9 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 		return nil
 	}
 
-	r = rand.Intn( 100)
 	if xiaomiHasFlag == 1 {
 		if strings.Index(order.Title, "_ios") > 0 {
 			return nil
-		} else {
-			r = rand.Intn(50)
 		}
 	}
 
@@ -270,55 +269,59 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 				clickUrl = strings.ReplaceAll(clickUrl, "__OS__", "0")
 				targetUrl = strings.ReplaceAll(targetUrl, "__OS__", "0")
 			}
-			if ads_item.get('imei_replace_flag', 0) == 1:
-			show_url = show_url.replace('__IMEI__', dsp.real_md5_imei)
-			click_url = click_url.replace('__IMEI__', dsp.real_md5_imei)
-			target = target.replace('__IMEI__', dsp.real_md5_imei)
-
-			if order_name.find("__OS__") > 0:
-			show_url = show_url.replace('__OS__', '0')
-			click_url = click_url.replace('__OS__', '0')
-			target = target.replace('__OS__', '0')
+		} else {
+			r := rand.Intn(100)
+			if r < 40 && xiaomiHasFlag == 0 {
+				iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
+				if err != nil {
+					return err
+				}
+				if iosUa != "" {
+					data.UserAgent = iosUa
+				}
+				if order.ImeiReplaceFlag == 1 && iosImei != "" {
+					showUrl = strings.ReplaceAll(showUrl, "__IDFA__", iosImei)
+					clickUrl = strings.ReplaceAll(clickUrl, "__IDFA__", iosImei)
+					targetUrl = strings.ReplaceAll(targetUrl, "__IDFA__", iosImei)
+				}
+
+				if strings.Index(order.Title, "__OS__") != -1 {
+					showUrl = strings.ReplaceAll(showUrl, "__OS__", "1")
+					clickUrl = strings.ReplaceAll(clickUrl, "__OS__", "1")
+					targetUrl = strings.ReplaceAll(targetUrl, "__OS__", "1")
+				}
+		} else {
+				// 判断是否需要替换imei
+				if order.ImeiReplaceFlag == 1 {
+					showUrl = strings.ReplaceAll(showUrl, "__IMEI__", dsp.RealMd5Imei)
+					clickUrl = strings.ReplaceAll(clickUrl, "__IMEI__", dsp.RealMd5Imei)
+					targetUrl = strings.ReplaceAll(targetUrl, "__IMEI__", dsp.RealMd5Imei)
+				}
+
+				if strings.Index(order.Title, "__OS__") != -1 {
+					showUrl = strings.ReplaceAll(showUrl, "__OS__", "0")
+					clickUrl = strings.ReplaceAll(clickUrl, "__OS__", "0")
+					targetUrl = strings.ReplaceAll(targetUrl, "__OS__", "0")
+				}
 		}
 
-		else:
-		if r < 40:
-		ios_imei, ios_ua = get_ios_ua_imei(dsp)
-		if ios_ua:
-		data['user_agent'] = ios_ua
-		if ads_item.get('imei_replace_flag', 0) == 1 and
-	ios_imei:
-		show_url = show_url.replace('__IDFA__', ios_imei)
-		click_url = click_url.replace('__IDFA__', ios_imei)
-		target = target.replace('__IDFA__', ios_imei)
-		if order_name.find("__OS__") > 0:
-		show_url = show_url.replace('__OS__', '1')
-		click_url = click_url.replace('__OS__', '1')
-		target = target.replace('__OS__', '1')
-		else:
-		if ads_item.get('imei_replace_flag', 0) == 1:
-		show_url = show_url.replace('__IMEI__', dsp.real_md5_imei)
-		click_url = click_url.replace('__IMEI__', dsp.real_md5_imei)
-		target = target.replace('__IMEI__', dsp.real_md5_imei)
-		if order_name.find("__OS__") > 0:
-		show_url = show_url.replace('__OS__', '0')
-		click_url = click_url.replace('__OS__', '0')
-		target = target.replace('__OS__', '0')
-
-		if order_name.find("__IP__") > 0:
-		show_url = show_url.replace('__IP__', dsp.ip)
-		click_url = click_url.replace('__IP__', dsp.ip)
-		target = target.replace('__IP__', dsp.ip)
-		if order_type == 0:
-		addi = get_monitor_url('VIEW', 5, order_name, req_source, show_url)
-		else:
-		addi = get_monitor_url('VIEW', 5, order_name, 'follow', show_url)
-
-		#addi['urls'].append(show_url)
-		data['target_addition'].append(addi)
+		if strings.Index(order.Title, "__IP__") != -1 {
+			showUrl = strings.ReplaceAll(showUrl, "__IP__", dsp.Ip)
+			clickUrl = strings.ReplaceAll(clickUrl, "__IP__", dsp.Ip)
+			targetUrl = strings.ReplaceAll(targetUrl, "__IP__", dsp.Ip)
+		}
+
+		var addi *AdAction
+		if orderType == 0 {
+			addi = genMonitorAction("VIEW", 5, order.Title, dsp.ReqSource, showUrl)
+		} else {
+			addi = genMonitorAction("VIEW", 5, order.Title, "follow", showUrl)
+		}
+
+		data.TargetAddition = append(data.TargetAddition, *addi)
 
-		r = random.randint(0, 1000)
-		c_rate = click_kpi * 1.0 / (ads_item['show_kpi']) * 1000
+		r = rand.Intn(0, 1000)
+		c_rate = float32(order.ClickKpi) / order * 1000
 		if r < c_rate:
 		#下发点击
 		addi = get_monitor_url('CLICK', 1, order_name, req_source, click_url)
@@ -336,4 +339,27 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 	}
 	#获取当前已经放出去的次数
 	raise gen.Return((None, None))
-}~
+}
+
+
+func genMonitorAction(action string, title string, reqSource string, url string) *AdAction {
+		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
+}