update

.idea/dictionaries/jiantaoli.xml

@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="jiantaoli">
+    <words>
+      <w>kuxin</w>
+      <w>zhiku</w>
+    </words>
+  </dictionary>
+</component>

ads_handler.go

@@ -1,14 +1,17 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"hash"
 	"math/rand"
 	"miads/adslib"
 	"miads/adslib/addata"
 	"miads/adslib/ads_checker"
 	"miads/adslib/city"
 	"miads/adslib/device"
+	"miads/adslib/encrypt"
 	"miads/adslib/graylog"
 	"miads/adslib/ip2region"
 	"miads/adslib/redis_data"
@@ -19,7 +22,13 @@ import (
 	"time"
 )
 
-var DECRYPT_KEY = "%videoopen%!@#$%"
+var SECERET_KEY = "%videoopen%!@#$%"
+
+type Response struct {
+	Result int `json:"result"`
+	Msg string`json:"msg"`
+	AdsResult string`json:"ads_result"`
+}
 
 func adsHandler(c *gin.Context) {
 	c.Header("Content-Type", "application/json")
@@ -353,8 +362,9 @@ func adsHandler(c *gin.Context) {
 		adData, xiaomiResponse, xiaomiRspAction, adDataNum, err = addata.GetAdsInfos(&dspInfo, advertiser)
 	}
 
-	//can_mix_flag = 1
-	//xiaomi_response_flag = 0
+	canMixFlag := 0
+	xiaomiResponseFlag := 0
+	response := Response{}
 	if adData != nil &&  len(adData.TargetAddition) > 1 {
 		realTarget := ""
 		if adData.Target != ""{
@@ -412,101 +422,113 @@ func adsHandler(c *gin.Context) {
 				serverActionResponse["server_video_timer"]=1
 			}
 		}
-		//response_report_flag = 1
 
 		// 增加跟随订单
-		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)
+		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
+			}
 		}
+
 		//# 检查最后是否有click
 		//last_target_addition_infos = ads_item_new.get('target_addition',[])
-		//for last_target_addition_info in last_target_addition_infos:
-		//if last_target_addition_info['type']=="CLICK":
-		//can_mix_flag = 0
-		//break
-		//if last_target_addition_info['type']=="VIDEO_TIMER":
-		//can_mix_flag = 0
-		//break
-		//if new_ads_flag==0:
-		//response.update(ads_item_new)
-		//else:
-		//encrypt_ads_item = self.prpcrypt_tools.to_encrypt_content(json.dumps(ads_item_new))
-		//response['ads_result']=encrypt_ads_item
-		//hour = int(time.strftime("%H",time.localtime(time.time())))
-		//if (hour>=0 and hour<=23) and replace_flag==1:
-		//random_num = abs(hash(ads_imei))%(10 ** 4)
-		//if random_num<3000:
-		//response_report_flag = 1
-		//else:
-		//response_report_flag = 0
-		//if response_report_flag==1:
-		//try:
-		//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)
-		//except:
-		//log.send_try_except()
+		for _, targetAddition  := range adData.TargetAddition {
+			if targetAddition.Type =="CLICK" || targetAddition.Type == "VIDEO_TIMER" {
+				canMixFlag = 0
+				break
+			}
+		}
+
+		if request.NewAdsFlag==0 {
+			//response.update(ads_item_new)
+		} else {
+			jsonBytes, err := json.Marshal(*adData)
+			if err != nil {
+				return err
+			}
+			encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(SECERET_KEY))
+			response.AdsResult = encryptData
+		}
+
+		hour, _ := strconv.Atoi(time.Now().Format("01"))
+		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 {
+		response.Result = 2
+		response.Msg = "no ads"
+		if xiaomiResponseFlag==1 {
+			response.Result = 0
+			response.Msg = "ok"
+		}
+		// 增加打底广告
+		if (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku")  && !needCotrol ==1 && !isBlackImei {
+			shortMessage := "kong"
+			// 先跑定投
+			customAdData, err := addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 0, xiaomiResponseFlag)
+			if err != nil {
+				return err
+			}
+			// 定投没有就跑其他的
+			if customAdData == nil {
+				customAdData, err = addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 1, xiaomiResponseFlag)
+				if err != nil {
+					return err
+				}
+			}
+			device.SetAdsTagLog(advertiser, dspInfo.ReqSource,"ADS_ZIYOU_GET", cityCode)  // 广告获取成功
+			if customAdData != nil {
+				shortMessage = "ads_tt_thirds"
+			}
+			if customAdData != nil && customAdData.OrderName  == "mh_dsp" && xiaomiResponseFlag==0 {
+				//redis_device.set_ads_tag_log(advertiser,req_source,'ADS_ZIYOU_MH',dsp_city_code)  # 广告获取成功
+				//#如果是外部dsp，走这个逻辑
+				//from thirds import xiaomi_extra
+				//extra_item,ads_item = yield xiaomi_extra.get_ads_infos(dsp_info)
+				//short_message = "ads_vast_response"
+			}
+			//if extra_item and extra_item['order_name']=="xiaodu_dsp" and xiaomi_response_flag==0:
+			//redis_device.set_ads_tag_log(advertiser,req_source,'ADS_ZIYOU_XIAODU',dsp_city_code)  # 广告获取成功
+			//from thirds import xiaodu
+			//extra_item,_ = yield xiaodu.get_ads_infos(dsp_info)
+			//short_message = "ads_xiaodu_response"
+			//if extra_item is not None and short_message in ['ads_xiaodu_response','ads_vast_response','ads_tt_thirds']:
+			//response_data_report = {}
+			//response_data_report['ip'] = ads_ip
+			//response_data_report['short_message'] =  short_message
+			//response_data_report['req_source'] = req_source
+			//response_data_report['response_vast'] = json.dumps(extra_item)
+			//response_data_report['order_name']=order_name
+			//response_data_report['advertiser']=advertiser
+			//log.send_to_graylog_tornado(gelf_data=response_data_report)
+			//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
+		}
 	}
-	//if can_mix_flag==1:
-	//response['result'] = 2
-	//response['msg'] = 'no ads'
-	//if xiaomi_response_flag==1:
-	//response['result'] = 0
-	//response['msg'] = 'ok'
-	//#增加打底广告
-	//if req_source in ['kuxin','zhiku'] and freq_contro_flag==1 and device_black_flag==0:
-	//short_message = "kong"
-	//## 先跑定投
-	//from thirds import tt_thirds
-	//ads_item,extra_item = yield tt_thirds.get_ads_infos(dsp_info,fix_flag=0,xiaomi_has_flag=xiaomi_response_flag)
-	//## 定投没有就跑其他的
-	//if not extra_item:
-	//from thirds import tt_thirds
-	//ads_item,extra_item = yield tt_thirds.get_ads_infos(dsp_info,fix_flag=1,xiaomi_has_flag=xiaomi_response_flag)
-	//redis_device.set_ads_tag_log(advertiser,req_source,'ADS_ZIYOU_GET',dsp_city_code)  # 广告获取成功
-	//if extra_item:
-	//short_message = "ads_tt_thirds"
-	//order_name = extra_item['order_name']
-	//if extra_item and extra_item['order_name'] == 'mh_dsp' and xiaomi_response_flag==0:
-	//redis_device.set_ads_tag_log(advertiser,req_source,'ADS_ZIYOU_MH',dsp_city_code)  # 广告获取成功
-	//#如果是外部dsp，走这个逻辑
-	//from thirds import xiaomi_extra
-	//extra_item,ads_item = yield xiaomi_extra.get_ads_infos(dsp_info)
-	//short_message = "ads_vast_response"
-	//if extra_item and extra_item['order_name']=="xiaodu_dsp" and xiaomi_response_flag==0:
-	//redis_device.set_ads_tag_log(advertiser,req_source,'ADS_ZIYOU_XIAODU',dsp_city_code)  # 广告获取成功
-	//from thirds import xiaodu
-	//extra_item,_ = yield xiaodu.get_ads_infos(dsp_info)
-	//short_message = "ads_xiaodu_response"
-	//if extra_item is not None and short_message in ['ads_xiaodu_response','ads_vast_response','ads_tt_thirds']:
-	//response_data_report = {}
-	//response_data_report['ip'] = ads_ip
-	//response_data_report['short_message'] =  short_message
-	//response_data_report['req_source'] = req_source
-	//response_data_report['response_vast'] = json.dumps(extra_item)
-	//response_data_report['order_name']=order_name
-	//response_data_report['advertiser']=advertiser
-	//log.send_to_graylog_tornado(gelf_data=response_data_report)
-	//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:

adslib/addata/custom.go

@@ -6,7 +6,6 @@ import (
 	"miads/adslib"
 	"miads/adslib/redis_data"
 	"miads/adslib/utils"
-	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -25,28 +24,39 @@ type CustomAdData struct {
 	VideoURL       string        `json:"video_url"`
 }
 
-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 CombineOrderBy(adData *AdData, advertiser string, dsp *utils.DspParam) (*AdData, error) {
+	customAdData, err := GetCustomAdsInfos(dsp, advertiser, 1, 0, 0)
+	if err != nil {
+		return adData, err
+	}
+	if customAdData == nil {
+		return adData, nil
+	}
+
+	if len(customAdData.TargetAddition) == 0 {
+		return adData, nil
+	}
+
+	maxExchangeLen := len(customAdData.TargetAddition)
+	// 最多替换数量, 不知道为啥是2
+	if maxExchangeLen > 2 {
+		maxExchangeLen = 2
+	}
+
+	hasClickTarget := false
+	for i := 0; i < maxExchangeLen; i++ {
+		adData.TargetAddition[i].Urls = customAdData.TargetAddition[i].Urls
+		if customAdData.TargetAddition[i].Type == "CLICK" {
+			adData.TargetAddition[i].Type = "CLICK"
+			hasClickTarget = true
+		}
+	}
+
+	if hasClickTarget {
+		adData.Target = customAdData.Target
+		adData.JsOrderId = customAdData.JsOrderID
+	}
+	return adData, nil
 }
 
 
@@ -147,28 +157,25 @@ func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int,error) {
 	return needDispatchCount, nil
 }
 
-func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) {
-	ua = dsp.ua_client
-	req_source = dsp.req_source
-
-	order, err := getOneAds(dsp, order_type, fix_flag)
+func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) (*CustomAdData, error){
+	order, err := getOneAds(dsp, orderType, fixFlag)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if order == nil {
-		return nil
+		return nil, nil
 	}
 
 	if xiaomiHasFlag == 1 {
 		if strings.Index(order.Title, "_ios") > 0 {
-			return nil
+			return nil, nil
 		}
 	}
 
 	// 获取剩余时间内的值
 	needDispatchCnt, err := getNeedDispatchCount(order)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if needDispatchCnt < 1 {
@@ -182,55 +189,49 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 	if err != nil {
 		return nil, err
 	}
-	finishClickCnt, err := redis_data.GetFinishedDispatchCount(order.OrderID, "click", curTime)
-	if err != nil {
-		return nil, err
-	}
 
-	redis_data.SetPlanDispatchCount(order.OrderID, "show", needDispatchCount, time.Now().Unix())
+	fmt.Sprintf("finish show cnt: %d\n", finishShowCnt)
+	redis_data.SetPlanDispatchCount(order.OrderID, "show", needDispatchCnt, curTime)
 
 	// 计算曲线比例
 	rate := float32(order.ShowKpi) / float32(needDispatchCnt)
 
-	curMinutes := curTime.Hour() * 60 + curTime.Minute()
-	key := "time_" + strconv.Itoa(curMinutes)
+	lineValue := 0
 	if order.LineType == 1 {
-		// 定制曲线
-		key = fmt.Sprintf("time_%d_%d", order.OrderID, curMinutes)
+		// 订单定制曲线
+		lineValue, err = redis_data.GetOrderPerMinuteNeedDispatchCnt(order.OrderID, curTime)
+	} else {
+		lineValue, err = redis_data.GetPerMinuteNeedDispatchCnt(curTime)
 	}
-
-	lineValue, err := redis_data.GetPerMinuteNeedDispatchCnt(order.OrderID, curTime)
 	if err != nil {
 		return nil, err
 	}
 	// 当前分钟需要放出去的数量
 	curMinuteNeedDispatchCnt := int(float32(lineValue) * rate)
-	if dispatchCnt < 1 {
-		dispatchCnt = 1
+	if curMinuteNeedDispatchCnt < 1 {
+		curMinuteNeedDispatchCnt = 1
 	}
 
-	redis_data.SetOrderPlanDispatchCount(order.OrderID, "show", dispatchCnt, curTime)
+	redis_data.SetOrderPlanDispatchCount(order.OrderID, "show", curMinuteNeedDispatchCnt, curTime)
 
 	// 获取当前分钟已经完成的下发
-	curMinutefinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
-
-	if curMinutefinishedDispatchCnt < curMinuteNeedDispatchCnt {
-
+	curMinuteFinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
+	if curMinuteFinishedDispatchCnt < curMinuteNeedDispatchCnt {
 		data := CustomAdData{
-			Duration:       5,
-			JsOrderID:      order.JsOrderID,
-			OrderName:      order.Title,
-			UserAgent:      dsp.UaOrigin,
+			Duration:  5,
+			JsOrderID: order.JsOrderID,
+			OrderName: order.Title,
+			UserAgent: dsp.UaOrigin,
 		}
 
 		//放量
 		_, err := redis_data.IncrFinishedDispatchCount(order.OrderID, "show", 1, curTime)
 		if err != nil {
-			return err
+			return nil, err
 		}
-		_, err := redis_data.IncrPreMinuteFinishedDispatchCount(order.OrderID, "show", 1, curTime)
+		_, err = redis_data.IncrPreMinuteFinishedDispatchCount(order.OrderID, "show", 1, curTime)
 		if err != nil {
-			return err
+			return nil, err
 		}
 
 		showUrl := order.ShowURL
@@ -240,7 +241,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 		if strings.Index(order.Title, "_ios") != -1 {
 			iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 			if err != nil {
-				return err
+				return nil, err
 			}
 			if iosUa != "" {
 				data.UserAgent = iosUa
@@ -274,7 +275,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 			if r < 40 && xiaomiHasFlag == 0 {
 				iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 				if err != nil {
-					return err
+					return nil, err
 				}
 				if iosUa != "" {
 					data.UserAgent = iosUa
@@ -290,7 +291,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 					clickUrl = strings.ReplaceAll(clickUrl, "__OS__", "1")
 					targetUrl = strings.ReplaceAll(targetUrl, "__OS__", "1")
 				}
-		} else {
+			} else {
 				// 判断是否需要替换imei
 				if order.ImeiReplaceFlag == 1 {
 					showUrl = strings.ReplaceAll(showUrl, "__IMEI__", dsp.RealMd5Imei)
@@ -303,6 +304,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 					clickUrl = strings.ReplaceAll(clickUrl, "__OS__", "0")
 					targetUrl = strings.ReplaceAll(targetUrl, "__OS__", "0")
 				}
+			}
 		}
 
 		if strings.Index(order.Title, "__IP__") != -1 {
@@ -313,32 +315,31 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 
 		var addi *AdAction
 		if orderType == 0 {
-			addi = genMonitorAction("VIEW", 5, order.Title, dsp.ReqSource, showUrl)
+			addi = genMonitorAction("VIEW",  order.Title, dsp.ReqSource, showUrl)
 		} else {
-			addi = genMonitorAction("VIEW", 5, order.Title, "follow", showUrl)
+			addi = genMonitorAction("VIEW",  order.Title, "follow", showUrl)
 		}
 
 		data.TargetAddition = append(data.TargetAddition, *addi)
 
-		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)
-		#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))
+		r := rand.Intn( 1000)
+		clickRate := int(float32(order.ClickKpi) / float32(order.ShowKpi) * 1000)
+		if r < clickRate {
+			//下发点击
+			addi = genMonitorAction("CLICK", order.Title, dsp.ReqSource, clickUrl)
+			data.TargetAddition = append(data.TargetAddition, *addi)
+			md5Skip := utils.Md5(targetUrl)
+			redis_data.IncrFinishedDispatchCount(order.OrderID, "click", 1, curTime)
+			realTarget := adslib.GetConf().Host + fmt.Sprintf("?action=LOADING&req_source=%s&advertiser=%s&skip=%s&skip_other=%s",
+				dsp.ReqSource, "", order.Title, md5Skip)
+			// 塞入缓存中
+			redis_data.SetSkipInfo(md5Skip, targetUrl)
+			data.Target = realTarget
+			return &data, nil
+		}
 	}
-	#获取当前已经放出去的次数
-	raise gen.Return((None, None))
+
+	return nil, nil
 }
 
 

adslib/addata/xiaomi.go

@@ -67,7 +67,7 @@ type AdData struct {
 	ImageUrl       string `json:"image_url"`
 	Duration       int64
 	VideoUrl       string `json:"video_url"`
-	JsOrderId      string `json:"js_order_id"`
+	JsOrderId      int64 `json:"js_order_id"`
 	UserAgent      string `json:"user_agent"`
 	DpReport       string `json:"dp_report"`
 	Dp             string `json:"dp"`

adslib/redis_data/redis_data.go

@@ -215,7 +215,7 @@ func SetAdsRequestNum(advertiser string, bannerid int) {
 	conn.Do("incr", redisKey)
 }
 
-// 设置skipredis
+// 设置skip redis
 func SetSkipInfo(md5Skip string, skipUrl string) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
@@ -364,8 +364,29 @@ func SetOrderPlanDispatchCount(orderId int64, dispatchType string, cnt int, curT
 	conn.Do("SET", key, cnt, 3600*24)
 }
 
-// 获取每分钟要投放的量
-func GetPerMinuteNeedDispatchCnt(orderId int64, curTime time.Time) (int, error) {
+// 获取总量每分钟要投放的量
+func GetPerMinuteNeedDispatchCnt(curTime time.Time) (int, error) {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	curMinutes := curTime.Minute() + (curTime.Hour() * 60)
+	key := fmt.Sprintf("time_%d", curMinutes)
+	rsp, err := conn.Do("GET", key)
+
+	if err != nil {
+		return 0, err
+	}
+
+	if rsp == nil {
+		return 0, nil
+	}
+
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+// 获取订单每分钟要投放的量
+func GetOrderPerMinuteNeedDispatchCnt(orderId int64, curTime time.Time) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -430,3 +451,4 @@ func GetIosUaImei(ip string) (string, string, error) {
 	json.Unmarshal(rspBytes, &uaImeiInfo)
 	return uaImeiInfo.Imei, uaImeiInfo.Ua, nil
 }
+

adslib/utils/string.go

@@ -1,6 +1,9 @@
 package utils
 
-import "regexp"
+import (
+	"hash/crc32"
+	"regexp"
+)
 
 func Rstrip(str string) string {
 	if str == "" {
@@ -10,3 +13,15 @@ func Rstrip(str string) string {
 	reg := regexp.MustCompile("\\0+$")
 	return reg.ReplaceAllString(str, "")
 }
+
+func Hash(string) int {
+	v := int(crc32.ChecksumIEEE([]byte(s)))
+	if v >= 0 {
+		return v
+	}
+	if -v >= 0 {
+		return -v
+	}
+	// v == MinInt
+	return 0
+}

request.go

@@ -50,7 +50,7 @@ func (self *Request) Parse(c *gin.Context) {
 
 	// 进行解密
 	if self.NewAdsFlag == 1 && self.content != "" {
-		contentDecode, err := encrypt.Decrypt(self.content, []byte(DECRYPT_KEY))
+		contentDecode, err := encrypt.Decrypt(self.content, []byte(SECERET_KEY))
 		if err != nil {
 			fmt.Printf("error: %s", err)
 			c.String(404, "decode failed")