继续更新

.idea/dictionaries/zhanlangpc.xml

@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="zhanlangpc">
+    <words>
+      <w>smembers</w>
+    </words>
+  </dictionary>
+</component>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

ads_handler.go

@@ -79,7 +79,7 @@ func adsHandler(c *gin.Context) {
 			Ip string
 			Imei string
 			Model string
-			NetworkType string `json:"network_type"`
+			NetworkType int `json:"network_type"`
 			Provice string
 			City string
 			ScreeSize string `json:"screen_size"`
@@ -396,29 +396,29 @@ func adsHandler(c *gin.Context) {
 			//extra_infos = []
 		}
 
-		adDataNew, err := xiaomi_mix.combine_mix_infos_v2(ads_item,extra_infos)
-
 		// 组装返回去的action
-		//target_addition_infos = ads_item.get('target_addition')
-		//server_action_response = {"server_view":0,"server_click":0,"server_close":0,"server_video_finish":0,"server_video_timer":0}
-		//for target_info in target_addition_infos:
-		//if target_info['type']=="VIEW":
-		//server_action_response['server_view']=1
-		//redis_device.set_req_source_view('xiaomi',req_source,'xiafa')
-		//if target_info['type']=="CLICK":
-		//server_action_response['server_click']=1
-		//if target_info['type']=="CLOSE":
-		//server_action_response['server_close']=1
-		//if target_info['type']=="VIDEO_FINISH":
-		//server_action_response['server_video_finish']=1
-		//if target_info['type']=="VIDEO_TIMER":
-		//server_action_response['server_video_timer']=1
+		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")
+			} 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
+			}
+		}
 		//response_report_flag = 1
 
-		//#增加跟随订单
-		//if len(target_addition_infos) == 2  and server_action_response['server_video_finish'] == 1 and req_source in ['kuxin','zhiku']:
-		//from thirds import tt_thirds
-		//ads_item_new =yield tt_thirds.combine_order_by(ads_item_new,dsp_info)
+		// 增加跟随订单
+		if len(adData.TargetAddition) == 2  && server_action_response["server_video_finish"] == 1 && (dspInfo.ReqSource == "kuxin" or dspInfo.ReqSource == "zhiku") {
+			//from thirds import tt_thirds
+			//ads_item_new =yield tt_thirds.combine_order_by(ads_item_new,dsp_info)
+		}
 		//# 检查最后是否有click
 		//last_target_addition_infos = ads_item_new.get('target_addition',[])
 		//for last_target_addition_info in last_target_addition_infos:

adslib/addata/custom.go

@@ -0,0 +1,233 @@
+package addata
+
+import (
+	"math/rand"
+	"miads/adslib/redis_data"
+	"miads/adslib/utils"
+)
+
+func CombineOrderBy(adData *AdData, dsp *utils.DspParam) {
+	ads_item, extra_item = yield get_ads_infos(dsp, order_type = 1)
+	if extra_item == None:
+	raise
+	gen.Return(infos)
+	last_target_addition = infos.get('target_addition', [])
+	extra_item_addition = extra_item.get('target_addition', [])
+	if len(extra_item_addition) == 0:
+	raise
+	gen.Return(infos)
+	if len(extra_item_addition) == 1:
+	last_target_addition[0]['urls'].extend(extra_item_addition[0]['urls'])
+	raise
+	gen.Return(infos)
+	else:
+	last_target_addition[0]['urls'].extend(extra_item_addition[0]['urls'])
+	last_target_addition[1]['urls'].extend(extra_item_addition[1]['urls'])
+	infos['target'] = extra_item['target']
+	infos['js_order_id'] = extra_item['js_order_id']
+	last_target_addition[1]['type'] = 'CLICK'
+	raise
+	gen.Return(infos)
+}
+
+
+// 获取一个广告
+func GetOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error){
+	// 取出广告
+	orders, err := redis_data.GetOrderInfos(dsp, fixFlag)
+	if err != nil {
+		return nil, err
+	}
+	if len(orders) == 0 {
+		return nil, nil
+	}
+
+	gotOrders := make([]redis_data.AdOrderInfo, 0, 1000)
+	allKpi := int64(0)
+	for _, order := range orders {
+		if order.OrderType == int64(orderType) {
+			gotOrders = append(gotOrders, order)
+			allKpi += order.ShowKpi
+		}
+	}
+
+	orderRange := make([]int, 0, 1000)
+
+	curRateIdx := 0
+
+	// orderRange中记录的是当前同索引位置的gotOrders里的order的比例上限, 比如如果有两个order [ShowKpi:40, ShowKpi: 60]
+	// 那么orderRange就是 [rate:400, rate: 1000], 所以要按比例取order, 只需要获得在比例上限里随机取一个数, 然后判断落在那个orderRange里,
+	// 对应去gotOrders取同索引里的order即可, 因为算法里有对小于1的比例做补偿， 所以rate上限可能超出1000, rate乘1000而不是100主要是为了
+	// 如果showKpi差异过大， 对大量小于1的订单做补偿, 会影响整体流量分布, 这里放到1000倍， 降低补偿1的影响, 算法复杂度是O(n), 只有三个非嵌套循环
+	for _, order := range gotOrders {
+		rate := int(float32(order.ShowKpi) / float32(allKpi) * 1000)
+
+		// 防止比例过小, 取int后变为0
+		if rate < 1 {
+			rate = 1
+		}
+
+		curRateIdx = curRateIdx + rate
+		orderRange = append(orderRange, curRateIdx)
+	}
+
+	randNum := rand.Intn(curRateIdx)
+	for i, rateRange := range orderRange {
+		if randNum <= rateRange {
+			return &gotOrders[i], nil
+		}
+	}
+	return nil, nil
+}
+
+func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) {
+	ua = dsp.ua_client
+	req_source = dsp.req_source
+
+	ads_item = getOneAds(dsp, order_type, fix_flag)
+	if ads_item is
+None:
+	raise
+	gen.Return((None, None))
+	r = random.randint(0, 100)
+	if xiaomi_has_flag == 1:
+	if ads_item['title'].find("_ios") > 0:
+	raise
+	gen.Return((None, None)) else:
+	r = random.randint(50, 100)
+
+	a = datetime.now()
+
+	#获取剩余时间内的值
+	all_count = get_sub_time_value(ads_item, a)
+	all_count = all_count * 1.0
+
+	#已经投放的key
+	show_key = "order_kpi_%s_%d%d%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day)
+	click_key = "order_kpi_%s_%d%d%d_click_kpi" % (ads_item['order_id'], a.year, a.month, a.day)
+	over_kpi = redis_tools.get_key_int_value(show_key)
+	show_kpi = ads_item['show_kpi']
+	click_kpi = ads_item['click_kpi']
+	if all_count < 1:
+	raise
+	gen.Return((None, None))
+	plan_key = "plan_all_kpi_%s_%d%d%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day)
+	redis_common.redis_ads().set(plan_key, all_count, 60*24*60)
+
+	w_value, rate = get_now_min_value(ads_item, all_count, show_kpi, a)
+	if w_value < 1:
+	w_value = 1
+
+	plan_key = "plan_kpi_%s_%d%d%d_%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day, a.hour*60 + a.minute)
+	redis_common.redis_ads().set(plan_key, w_value, 60*24*60)
+
+	over_key = "order_kpi_%s_%d%d%d_%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day, a.hour*60 + a.minute)
+	o_value = int(redis_tools.get_key_int_value(over_key))
+
+	js_order_id = int(ads_item['js_order_id'])
+	if o_value < w_value:
+	order_name = ads_item['title']
+	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
+	}
+
+	#放量
+	redis_tools.incr_key_value(over_key)
+	redis_tools.incr_key_value(show_key)
+	show_url = ads_item['show_url']
+	click_url = ads_item['click_url']
+
+	target = ads_item['target_url']
+
+	if order_name.find("_ios") > 0:
+	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')
+
+	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 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:
+	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)
+
+	r = random.randint(0, 1000)
+	c_rate = click_kpi * 1.0 / (ads_item['show_kpi']) * 1000
+	if r < c_rate:
+	#下发点击
+	addi = get_monitor_url('CLICK', 1, order_name, req_source, click_url)
+	#addi['urls'].append(click_url)
+	data['target_addition'].append(addi)
+	md5_skip = hashlib.md5(target).hexdigest()
+	redis_tools.incr_key_value(click_key)
+	real_target = ads_config.Host + "?action=LOADING&req_source={0}&advertiser={2}&skip={1}&skip_other={3}".format(
+		req_source, '', order_name, md5_skip)
+	### 塞入缓存中
+	redis_tools.set_skip_info(md5_skip, target)
+	data['target'] = real_target
+	raise
+	gen.Return((None, data))
+	#获取当前已经放出去的次数
+	raise gen.Return((None, None))
+}~

adslib/addata/xiaomi.go

@@ -17,60 +17,60 @@ import (
 )
 
 type XiaomiAdData struct {
-DetailURL   string `json:"detail_url"`
-DisplayType struct {
-Delay    int64  `json:"delay"`
-Name     string `json:"name"`
-RowCount int64  `json:"row_count"`
-} `json:"display_type"`
-Duration   int64  `json:"duration"`
-EmcType    string `json:"emc_type"`
-ID         string `json:"id"`
-ImageURL   string `json:"image_url"`
-Proportion string `json:"proportion"`
-Settings   struct {
-ClickType   string `json:"click_type"`
-HideCloseAt int64  `json:"hide_close_at"`
-LogTime     string `json:"log_time"`
-ShowCloseAt int64  `json:"show_close_at"`
-} `json:"settings"`
-SkipTime        int64    `json:"skip_time"`
-TagID           string   `json:"tag_id"`
-Target          string   `json:"target"`
-TargetAddition  []string `json:"target_addition"`
-TargetAddition1 string   `json:"target_addition1"`
-Title           string   `json:"title"`
-VideoURL        string   `json:"video_url"`
+	DetailURL   string `json:"detail_url"`
+	DisplayType struct {
+		Delay    int64  `json:"delay"`
+		Name     string `json:"name"`
+		RowCount int64  `json:"row_count"`
+	} `json:"display_type"`
+	Duration   int64  `json:"duration"`
+	EmcType    string `json:"emc_type"`
+	ID         string `json:"id"`
+	ImageURL   string `json:"image_url"`
+	Proportion string `json:"proportion"`
+	Settings   struct {
+		ClickType   string `json:"click_type"`
+		HideCloseAt int64  `json:"hide_close_at"`
+		LogTime     string `json:"log_time"`
+		ShowCloseAt int64  `json:"show_close_at"`
+	} `json:"settings"`
+	SkipTime        int64    `json:"skip_time"`
+	TagID           string   `json:"tag_id"`
+	Target          string   `json:"target"`
+	TargetAddition  []string `json:"target_addition"`
+	TargetAddition1 string   `json:"target_addition1"`
+	Title           string   `json:"title"`
+	VideoURL        string   `json:"video_url"`
 }
 
 type XiaoMiAdInfoRsp struct {
-	Data []XiaomiAdData  `json:"data"`
-	Msg    string `json:"msg"`
-	Result int64  `json:"result"`
+	Data   []XiaomiAdData `json:"data"`
+	Msg    string         `json:"msg"`
+	Result int64          `json:"result"`
 }
 
 type AdAction struct {
-	Type string `json:"type"`
-	Duration int `json:"duration"`
-	Urls []string `json:"urls"`
+	Type     string   `json:"type"`
+	Duration int      `json:"duration"`
+	Urls     []string `json:"urls"`
 }
 
 type AdInfo struct {
-	AdActions []AdAction `json:"ads_infos"`
-	PercentBegin int`json:"percent_begin"`
-	PercentEnd int`json:"percent_end"`
+	AdActions    []AdAction `json:"ads_infos"`
+	PercentBegin int        `json:"percent_begin"`
+	PercentEnd   int        `json:"percent_end"`
 }
 
 type AdData struct {
 	TargetAddition []AdAction `json:"target_addition"`
-	Target string
-	ImageUrl string`json:"image_url"`
-	Duration int64
-	VideoUrl string`json:"video_url"`
-	JsOrderId string `json:"js_order_id"`
-	UserAgent string `json:"user_agent"`
-	DpReport string `json:"dp_report"`
-	Dp string `json:"dp"`
+	Target         string
+	ImageUrl       string `json:"image_url"`
+	Duration       int64
+	VideoUrl       string `json:"video_url"`
+	JsOrderId      string `json:"js_order_id"`
+	UserAgent      string `json:"user_agent"`
+	DpReport       string `json:"dp_report"`
+	Dp             string `json:"dp"`
 }
 
 func getAdsReqUrl(dsp *utils.DspParam) string {
@@ -80,7 +80,7 @@ func getAdsReqUrl(dsp *utils.DspParam) string {
 	// 组装 emcp
 	reqUrl = reqUrl + "_emcp=pre_play"
 	// 组装 devid
-	reqUrl = reqUrl + "&_devid="+ dsp.RealMd5Imei
+	reqUrl = reqUrl + "&_devid=" + dsp.RealMd5Imei
 	//  组装 ref
 	reqUrl = reqUrl + "&ref=" + ref
 	// 组装 sn
@@ -96,34 +96,35 @@ func getAdsReqUrl(dsp *utils.DspParam) string {
 	reqUrl = reqUrl + fmt.Sprintf("&_phonetype=%d", dsp.SendPhoneType)
 	return reqUrl
 }
+
 // 获取广告信息
 func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdData, map[string]int, int, error) {
 	reqUrl := getAdsReqUrl(dsp)
 
 	if dsp.SendPhoneType == 0 {
 		device.SetAdsTagLog("xiaomi", dsp.ReqSource, "ADS_XIAOMI", dsp.DspCityCode)
-	} else if dsp.SendPhoneType == 1{
+	} else if dsp.SendPhoneType == 1 {
 		device.SetAdsTagLog("xiaomi", dsp.ReqSource, "ADS_XIAOMI_1", dsp.DspCityCode)
 	}
 
 	client := &http.Client{}
 	fmt.Printf("req url: %s\n", reqUrl)
-	req, err := http.NewRequest("GET", reqUrl,  nil)
+	req, err := http.NewRequest("GET", reqUrl, nil)
 	if err != nil {
 		return nil, nil, nil, 0, err
 	}
 
-	req.Header.Set(",authority","m.video.xiaomi.com")
-	req.Header.Set(",method","GET")
+	req.Header.Set(",authority", "m.video.xiaomi.com")
+	req.Header.Set(",method", "GET")
 	req.Header.Set(",path", reqUrl[26:])
-	req.Header.Set(",scheme","https")
-	req.Header.Set("content-type","application/json")
-	req.Header.Set("accept","text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3")
-	req.Header.Set("accept-encoding","gzip, deflate, br")
-	req.Header.Set("accept-language","zh-CN,zh;q=0.9")
-	req.Header.Set("cache-control","max-age=0")
-	req.Header.Set("upgrade-insecure-requests","1")
-	req.Header.Set("user-agent",dsp.Ua)
+	req.Header.Set(",scheme", "https")
+	req.Header.Set("content-type", "application/json")
+	req.Header.Set("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3")
+	req.Header.Set("accept-encoding", "gzip, deflate, br")
+	req.Header.Set("accept-language", "zh-CN,zh;q=0.9")
+	req.Header.Set("cache-control", "max-age=0")
+	req.Header.Set("upgrade-insecure-requests", "1")
+	req.Header.Set("user-agent", dsp.Ua)
 
 	resp, err := client.Do(req)
 	if err != nil {
@@ -142,8 +143,8 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 	}
 
 	adsDataNum := len(rsp.Data)
-	xiaomiResponseAction := map[string]int {
-		"xiaomi_view":0, "xiaomi_click":0, "xiaomi_close":0, "xiaomi_video_finish":0, "xiaomi_video_timer":0,
+	xiaomiResponseAction := map[string]int{
+		"xiaomi_view": 0, "xiaomi_click": 0, "xiaomi_close": 0, "xiaomi_video_finish": 0, "xiaomi_video_timer": 0,
 	}
 
 	if rsp.Result != 1 {
@@ -196,20 +197,20 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 
 		if targetUrl != "" {
 			switch event {
-				case "VIEW":
-					showUrls = append(showUrls, targetUrl)
-					xiaomiResponseAction["xiaomi_view"] = 1
+			case "VIEW":
+				showUrls = append(showUrls, targetUrl)
+				xiaomiResponseAction["xiaomi_view"] = 1
 			case "CLICK":
-					clickUrls = append(clickUrls, targetUrl)
-					xiaomiResponseAction["xiaomi_click"] = 1
+				clickUrls = append(clickUrls, targetUrl)
+				xiaomiResponseAction["xiaomi_click"] = 1
 			case "CLOSE":
-					closeUrls = append(closeUrls, targetUrl)
-					xiaomiResponseAction["xiaomi_close"] = 1
+				closeUrls = append(closeUrls, targetUrl)
+				xiaomiResponseAction["xiaomi_close"] = 1
 			case "VIDEO_FINISH":
-					videoFinishUrls = append(videoFinishUrls, targetUrl)
-					xiaomiResponseAction["xiaomi_video_finish"] = 1
+				videoFinishUrls = append(videoFinishUrls, targetUrl)
+				xiaomiResponseAction["xiaomi_video_finish"] = 1
 			case "VIDEO_TIMER":
-					videoTimerUrls = append(videoTimerUrls, targetUrl)
+				videoTimerUrls = append(videoTimerUrls, targetUrl)
 			}
 		}
 
@@ -238,7 +239,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 			gotoUrls = append(gotoUrls, targetUrl)
 		}
 	}
-	if dsp.ReqSource ==  "mh" {
+	if dsp.ReqSource == "mh" {
 		closeUrls = videoFinishUrls
 	}
 
@@ -256,7 +257,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 
 	fmt.Printf("%+v, addata_num: %d\n", xiaomiResponseAction, adsDataNum)
 	if len(gotoUrls) == 0 {
-		return nil,  rsp.Data, xiaomiResponseAction, adsDataNum, nil
+		return nil, rsp.Data, xiaomiResponseAction, adsDataNum, nil
 	}
 
 	fmt.Printf("goto urls: %+v\nshow urls: %+v\nclick_urls: %+v\nclose urls: %+v\nvideo finish urls: %+v\nimagurls: %+v\nvideo urls:%+v\n",
@@ -271,7 +272,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 
 	if dsp.SendPhoneType == 0 {
 		redis_data.SetAdsRequestNum(advertiser, 0)
-	} else if dsp.SendPhoneType == 1{
+	} else if dsp.SendPhoneType == 1 {
 		redis_data.SetAdsRequestNum(advertiser, 1)
 	}
 	return adsData, rsp.Data, xiaomiResponseAction, adsDataNum, nil
@@ -309,7 +310,7 @@ func getCombinationActionsConf(advertiser string) []adslib.CombinationActionsCon
 // 组装最后的广告信息
 func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []string, showUrls []string,
 	clickUrls []string, closeUrls []string, videoFinishUrls []string,
-	videoTimerUrls []string, imageUrls []string, videoUrls []string) (*AdData, error){
+	videoTimerUrls []string, imageUrls []string, videoUrls []string) (*AdData, error) {
 
 	// 判断是不是关掉所有Action
 	actions := getActionsConf(advertiser)
@@ -317,7 +318,7 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 		return nil, nil
 	}
 
-	clickChannelFlag, err := redis_data.GetChannelFlag(dsp.ReqSource,"ads_click")
+	clickChannelFlag, err := redis_data.GetChannelFlag(dsp.ReqSource, "ads_click")
 	if err != nil {
 		return nil, err
 	}
@@ -333,7 +334,7 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 	lastInfos := make([]AdInfo, 0, 50)
 	combinationActions := getCombinationActionsConf(advertiser)
 	for _, combAction := range combinationActions {
-		adActionDatas := make([]AdAction, 0 ,20)
+		adActionDatas := make([]AdAction, 0, 20)
 		percentBegin := combAction.PercentBegin
 		percentEnd := combAction.PercentEnd
 		actionGroup := combAction.GroupValue
@@ -360,18 +361,18 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 			}
 
 			// click的控制 控制bom
-			if action =="CLICK" && dsp.RealReqSource=="bom" && dsp.SupClickFlag==0{
+			if action == "CLICK" && dsp.RealReqSource == "bom" && dsp.SupClickFlag == 0 {
 				continue
 			}
 			// show的控制 控制bom
-			if action=="VIEW" && dsp.RealReqSource=="bom" && dsp.SupShowFlag==0 {
+			if action == "VIEW" && dsp.RealReqSource == "bom" && dsp.SupShowFlag == 0 {
 				continue
 			}
-			if action=="CLICK" && !needClick {
+			if action == "CLICK" && !needClick {
 				continue
 			}
 
-			if len(urls)==0 && action=="VIDEO_TIMER" {
+			if len(urls) == 0 && action == "VIDEO_TIMER" {
 				continue
 			}
 
@@ -414,7 +415,7 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 		videoUrl = videoUrls[0]
 	}
 
-	randAdData := make([]AdAction,0, 50)
+	randAdData := make([]AdAction, 0, 50)
 	if len(lastInfos) != 0 {
 		randIdx := rand.Intn(len(lastInfos))
 		randAdData = lastInfos[randIdx].AdActions
@@ -434,7 +435,7 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 
 	// 重新组装duration
 	videoTimerUrls = make([]string, 0, 100)
-	if len(randAdData)>=3 {
+	if len(randAdData) >= 3 {
 		if randAdData[1].Type == "VIDEO_TIMER" {
 			videoTimerUrls = randAdData[1].Urls
 		}
@@ -446,20 +447,19 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 			continue
 		}
 
-
 		if adData.Type == "VIDEO_TIMER" && len(videoTimerUrls) > 0 {
 			adData.Duration = int(dsp.AllDuration) - dsp.VideoTimeDuration
-		} else if adData.Type == "VIDEO_TIMER" && len(videoTimerUrls) == 0{
+		} else if adData.Type == "VIDEO_TIMER" && len(videoTimerUrls) == 0 {
 			adData.Duration = dsp.VideoTimeDuration
 		} else if adData.Type == "VIEW" {
-			if  len(videoTimerUrls) > 0 {
+			if len(videoTimerUrls) > 0 {
 				adData.Duration = dsp.VideoTimeDuration
 			} else {
 				adData.Duration = int(dsp.AllDuration)
 			}
 		}
 
-		if adData.Type != "VIEW"{
+		if adData.Type != "VIEW" {
 			redis_data.SetDistributeActionNum(advertiser, adData.Type, dsp.SendPhoneType)
 		}
 
@@ -504,7 +504,7 @@ func genAdsAction(urls []string, advertiser string,
 	}
 	allShowNum, err := redis_data.GetAdsFeedbackNum(advertiser, action, dsp.SendPhoneType)
 	if err != nil {
-		return nil ,err
+		return nil, err
 	}
 
 	flowControlConf := redis_data.GetFlowPercentDuration(advertiser, action)
@@ -517,7 +517,7 @@ func genAdsAction(urls []string, advertiser string,
 		duration = flowControlConf.Duration
 	}
 
-	lastUrls := make([]string, 0,20)
+	lastUrls := make([]string, 0, 20)
 	if !needControl || allSendNum == 0 || int(
 		float32(allShowNum)/float32(allSendNum)*100) < flowPercent {
 		reportUrl := getReportUrl(action, advertiser, dsp)

adslib/addata/xiaomi_mix.go

@@ -1,3 +0,0 @@
-package addata
-
-combine_mix_infos_v2(ads_item,extra_infos)

adslib/ads_checker/ip.go

@@ -1,7 +1,7 @@
 package ads_checker
 
 import (
-	"miads/lib/ads_redis"
+	"miads/adslib/ads_redis"
 
 	"github.com/gomodule/redigo/redis"
 )

adslib/redis_data/order.go

@@ -0,0 +1,194 @@
+package redis_data
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"github.com/gomodule/redigo/redis"
+	"miads/adslib/ads_redis"
+	"miads/adslib/graylog"
+	"miads/adslib/utils"
+	"strings"
+)
+
+type AdOrderInfo struct {
+	BeginTime       int64  `json:"begin_time"`
+	Channel         string `json:"channel"`
+	City            string `json:"city"`
+	ClickKpi        int64  `json:"click_kpi"`
+	ClickURL        string `json:"click_url"`
+	EndTime         int64  `json:"end_time"`
+	ImeiReplaceFlag int64  `json:"imei_replace_flag"`
+	JsOrderID       int64  `json:"js_order_id"`
+	Level           int64  `json:"level"`
+	LineType        int64  `json:"line_type"`
+	NewRegionFlag   string `json:"new_region_flag"`
+	NoCity          string `json:"no_city"`
+	NoProvince      string `json:"no_province"`
+	OrderID         int64  `json:"order_id"`
+	OrderType       int64  `json:"order_type"`
+	Province        string `json:"province"`
+	RegionFlag      int64  `json:"region_flag"`
+	RegionInfo      string `json:"region_info"`
+	ShowKpi         int64  `json:"show_kpi"`
+	ShowURL         string `json:"show_url"`
+	TargetURL       string `json:"target_url"`
+	Title           string `json:"title"`
+}
+
+func getOrderIds() ([]string, error) {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	rsp, err := conn.Do("SMEMBERS", "order_key")
+	if err != nil {
+		return []string{}, err
+	}
+
+	if rsp == nil {
+		return []string{}, err
+	}
+
+	orderIds, _ := redis.Strings(rsp, err)
+	return orderIds, nil
+}
+
+func getOrderInfo(id string) (*AdOrderInfo, error) {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	rsp, err := conn.Do("GET", id)
+	if err != nil {
+		return nil, err
+	}
+
+	if rsp == nil {
+		return nil, err
+	}
+
+	orderBase64Str, _ := redis.String(rsp, err)
+	orderByte, err := base64.StdEncoding.DecodeString(orderBase64Str)
+	if err != nil {
+		return nil, err
+	}
+
+	a := AdOrderInfo{}
+	err = json.Unmarshal(orderByte, &a)
+	if err != nil {
+		return nil, err
+	}
+	return &a, nil
+}
+
+func GetOrderInfos(dsp *utils.DspParam, fixFlag int) ([]AdOrderInfo, error) {
+	orderIds, err := getOrderIds()
+	if err != nil {
+		return []AdOrderInfo{}, err
+	}
+
+	orders := make([]AdOrderInfo, 0, 50)
+	for _, id := range orderIds {
+		order, err := getOrderInfo(id)
+		if err != nil {
+			continue
+		}
+
+		if order == nil {
+			continue
+		}
+
+		needInsert := true
+		areaFlag := 0 // 0 通投 1 定投
+
+		if dsp != nil {
+			// 判断是否要做渠道剔除
+			channelStr := order.Channel
+			if channelStr != "" {
+				channelArr := strings.Split(channelStr, ",")
+				isValidChannel := false
+				for _, channel := range channelArr {
+					if dsp.ReqSource == channel {
+						isValidChannel = true
+					}
+				}
+				if !isValidChannel {
+					continue
+				}
+			}
+
+			newRegionFlagStr := order.NewRegionFlag
+			newRegionFlagArr := strings.Split(newRegionFlagStr, ",")
+			for _, regionFlag := range newRegionFlagArr {
+				if regionFlag == "1" {
+					// 对省定投
+					if strings.Index(order.Province, dsp.Province) == -1 {
+						needInsert = false
+						break
+					}
+				} else if regionFlag == "2" {
+					// 对市定投
+					if strings.Index(order.City, dsp.City) == -1 {
+						needInsert = false
+						break
+					}
+				} else if regionFlag == "3" {
+					// 对省禁投
+					if order.NoProvince != "" && strings.Index(order.NoProvince, dsp.Province) != -1 {
+						needInsert = false
+						break
+					}
+				} else if regionFlag == "4" {
+					// 对市禁投
+					if order.NoCity != "" && strings.Index(order.NoCity, dsp.City) != -1 {
+						needInsert = false
+						break
+					}
+				} else {
+					continue
+				}
+
+				areaFlag = 1
+			}
+		}
+
+		if !needInsert {
+			return []AdOrderInfo{}, nil
+		}
+
+		if dsp != nil {
+			grayLogData := struct {
+				Ip              string
+				ShortMessage    string `json:"short_message"`
+				ReqSource       string `json:"req_source"`
+				Province        string
+				City            string
+				OrderId         int64  `json:"order_id"`
+				orderProvince   string `json:"order_province"`
+				orderCity       string `json:"order_city"`
+				orderNoProvince string `json:"order_no_province"`
+				orderNoCity     string `json:"order_no_city"`
+			}{
+				Ip:              dsp.Ip,
+				ShortMessage:    "area_result_v2",
+				ReqSource:       dsp.ReqSource,
+				Province:        dsp.Province,
+				City:            dsp.City,
+				OrderId:         order.OrderID,
+				orderProvince:   order.Province,
+				orderCity:       order.City,
+				orderNoProvince: order.NoProvince,
+				orderNoCity:     order.NoCity,
+			}
+			graylog.Log(grayLogData)
+		}
+
+		if fixFlag == 0 && areaFlag == 0 {
+			orders = append(orders, *order)
+		} else if fixFlag == 1 && areaFlag == 1 {
+			orders = append(orders, *order)
+		} else if fixFlag == -1 {
+			orders = append(orders, *order)
+		}
+	}
+
+	return orders, nil
+}

adslib/redis_data/redis_data.go

@@ -6,6 +6,7 @@ import (
 	"github.com/gomodule/redigo/redis"
 	"miads/adslib"
 	"miads/adslib/ads_redis"
+	"strconv"
 	"time"
 )
 
@@ -208,7 +209,7 @@ func SetAdsRequestNum(advertiser string, bannerid int) {
 	defer conn.Close()
 
 	redisKey := fmt.Sprintf("adsv2_%s_%d", advertiser, bannerid)
-	if time.Now().Unix() %100==0 {
+	if time.Now().Unix()%100 == 0 {
 		conn.Do("delete", redisKey)
 	}
 	conn.Do("incr", redisKey)
@@ -219,12 +220,12 @@ func SetSkipInfo(md5Skip string, skipUrl string) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	redisKey:="su_" + md5Skip
-	conn.Do("set" , redisKey, skipUrl, 300)
+	redisKey := "su_" + md5Skip
+	conn.Do("set", redisKey, skipUrl, 300)
 }
 
 // 通过advertiser获取最小的script_order
-func GetMinScriptOrderByAdv(advertiser string) (string, error){
+func GetMinScriptOrderByAdv(advertiser string) (string, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -240,3 +241,13 @@ func GetMinScriptOrderByAdv(advertiser string) (string, error){
 	scriptOrder, _ := redis.String(rsp, err)
 	return scriptOrder, nil
 }
+
+// 设置来源的曝光次数
+func SetReqSourceView(adv string, reqSource string, source string) {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
+	key := fmt.Sprintf("view3_%s_%s_%d_%s", adv, reqSource, dateInt, source)
+	conn.Do("incr", key)
+}