更新

adslib/addata/custom.go

@@ -13,7 +13,7 @@ import (
 type CustomAdData struct {
 	Duration       int64         `json:"duration"`
 	ImageURL       string        `json:"image_url"`
-	JsOrderID      string        `json:"js_order_id"`
+	JsOrderID      int64        `json:"js_order_id"`
 	Msg            int64         `json:"msg"`
 	OrderName      string        `json:"order_name"`
 	Result         int64         `json:"result"`
@@ -217,67 +217,69 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 
 	if curMinutefinishedDispatchCnt < curMinuteNeedDispatchCnt {
 
-		data =
-		{
-			"js_order_id":js_order_id,
-			"target":"",
-			"video_url":"",
-			"duration":5,
-			"target_addition":[],
-			"image_url":"",
-			"result":0,
-			"msg":0,
-			"user_agent":ua,
-			"order_name":order_name
+		data := CustomAdData{
+			Duration:       5,
+			JsOrderID:      order.JsOrderID,
+			OrderName:      order.Title,
+			UserAgent:      dsp.UaOrigin,
 		}
 
 		//放量
-		newFinishCnt, err := redis_data.IncrFinishedDispatchCount(order.OrderID, "show", 1, curTime)
+		_, err := redis_data.IncrFinishedDispatchCount(order.OrderID, "show", 1, curTime)
 		if err != nil {
 			return err
 		}
-		newCurMinutefinishedCnt, err := redis_data.IncrPreMinuteFinishedDispatchCount(order.OrderID, "show", 1, curTime)
+		_, err := redis_data.IncrPreMinuteFinishedDispatchCount(order.OrderID, "show", 1, curTime)
 		if err != nil {
 			return err
 		}
 
-		show_url = ads_item['show_url']
-		click_url = ads_item['click_url']
-
-		target = ads_item['target_url']
+		showUrl := order.ShowURL
+		clickUrl := order.ClickURL
+		targetUrl := order.TargetURL
 
 		if strings.Index(order.Title, "_ios") != -1 {
 			iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 			if err != nil {
 				return err
 			}
-			if iosUa {
-
+			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)
 			}
-		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')
-		}
 
-		elif
-		order_name.find("_android") > 0 :
-		### 判断是否需要替换imei
-		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 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 if strings.Index(order.Title, "_android") != -1 {
+			// 判断是否需要替换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 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 strings.Index(order.Title, "__OS__") != -1 {
+				showUrl = strings.ReplaceAll(showUrl, "__OS__", "0")
+				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:
 		if r < 40: