更新

.idea/dictionaries/zhanlangpc.xml

@@ -1,7 +1,10 @@
 <component name="ProjectDictionaryState">
   <dictionary name="zhanlangpc">
     <words>
+      <w>imei</w>
+      <w>sadd</w>
       <w>smembers</w>
+      <w>srandmember</w>
       <w>srem</w>
     </words>
   </dictionary>

adslib/addata/custom.go

@@ -10,6 +10,19 @@ import (
 	"time"
 )
 
+type CustomAdData struct {
+	Duration       int64         `json:"duration"`
+	ImageURL       string        `json:"image_url"`
+	JsOrderID      string        `json:"js_order_id"`
+	Msg            int64         `json:"msg"`
+	OrderName      string        `json:"order_name"`
+	Result         int64         `json:"result"`
+	Target         string        `json:"target"`
+	TargetAddition []interface{} `json:"target_addition"`
+	UserAgent      string        `json:"user_agent"`
+	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:
@@ -203,6 +216,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 	curMinutefinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
 
 	if curMinutefinishedDispatchCnt < curMinuteNeedDispatchCnt {
+
 		data =
 		{
 			"js_order_id":js_order_id,
@@ -232,11 +246,14 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 
 		target = ads_item['target_url']
 
-		orderName := ads_item['title']
 		if strings.Index(order.Title, "_ios") != -1 {
-			ios_imei, ios_ua = get_ios_ua_imei(dsp)
-		}
-		if ios_ua:
+			iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
+			if err != nil {
+				return err
+			}
+			if iosUa {
+
+			}
 		data['user_agent'] = ios_ua
 		if ads_item.get('imei_replace_flag', 0) == 1 and
 	ios_imei:
@@ -247,6 +264,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 		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 :

adslib/redis_data/redis_data.go

@@ -253,7 +253,7 @@ func SetReqSourceView(adv string, reqSource string, source string) {
 }
 
 // 获取剩余总投放量
-func GetRemainDispatchCount(key string) (int, error)  {
+func GetRemainDispatchCount(key string) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -270,10 +270,9 @@ func GetRemainDispatchCount(key string) (int, error)  {
 	return count, nil
 }
 
-
 // 获取已经投放的量
 // dispatchType: "click", "show"
-func GetFinishedDispatchCount(orderId int64, dispatchType string, curTime time.Time) (int, error)  {
+func GetFinishedDispatchCount(orderId int64, dispatchType string, curTime time.Time) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -293,7 +292,7 @@ func GetFinishedDispatchCount(orderId int64, dispatchType string, curTime time.T
 
 // 增加已经投放的量
 // dispatchType: "click", "show"
-func IncrFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error)  {
+func IncrFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -309,11 +308,11 @@ func IncrFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int,
 
 // 获取当前分钟已经投放的量
 // dispatchType: "click", "show"
-func GetPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, curTime time.Time) (int, error)  {
+func GetPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, curTime time.Time) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	curMinutes := curTime.Hour()*60 + curTime.Minute()
 	key := fmt.Sprintf("order_kpi_%d_%d%d%d_%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), curMinutes, dispatchType)
 	rsp, err := conn.Do("GET", key)
 	if err != nil {
@@ -330,11 +329,11 @@ func GetPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, curTi
 
 // 增加当前分钟已经投放的量
 // dispatchType: "click", "show"
-func IncrPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error)  {
+func IncrPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	curMinutes := curTime.Hour()*60 + curTime.Minute()
 	key := fmt.Sprintf("order_kpi_%d_%d%d%d_%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), curMinutes, dispatchType)
 	rsp, err := conn.Do("INCR", key, incrCnt)
 	if err != nil {
@@ -360,13 +359,13 @@ func SetOrderPlanDispatchCount(orderId int64, dispatchType string, cnt int, curT
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	curMinutes := curTime.Hour()*60 + curTime.Minute()
 	key := fmt.Sprintf("plan_kpi_%d_%d%d%d_%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), curMinutes, dispatchType)
 	conn.Do("SET", key, cnt, 3600*24)
 }
 
 // 获取每分钟要投放的量
-func GetPerMinuteNeedDispatchCnt(orderId int64, curTime time.Time) (int, error){
+func GetPerMinuteNeedDispatchCnt(orderId int64, curTime time.Time) (int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -387,21 +386,21 @@ func GetPerMinuteNeedDispatchCnt(orderId int64, curTime time.Time) (int, error){
 }
 
 // 获取ios的ua和imei
-func GetIosUaImei(ip string) (string, string, error){
+func GetIosUaImei(ip string) (string, string, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
 	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
-	redisKey := fmt.Sprintf("ads_ios_%d_%s", dateInt, ip)
+	iosUaImeiRedisKey := fmt.Sprintf("ads_ios_%d_%s", dateInt, ip)
 
 	// "{'imei': 'F389E3E1-5459-4B30-83A9-1AD504F6293F', 'ua': 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML like Gecko) Mobile/15E148'}"
-	rsp, err := conn.Do("GET", redisKey)
+	rsp, err := conn.Do("GET", iosUaImeiRedisKey)
 	if err != nil {
 		return "", "", err
 	}
 
 	if rsp == nil {
-		redisKey = fmt.Sprintf("new_ios_ua_v2_%d", dateInt)
+		redisKey := fmt.Sprintf("new_ios_ua_v2_%d", dateInt)
 		rsp, err = conn.Do("SRANDMEMBER", redisKey)
 		if err != nil {
 			return "", "", err
@@ -412,17 +411,22 @@ func GetIosUaImei(ip string) (string, string, error){
 
 		conn.Do("SREM", redisKey, rsp)
 
-		tomorrowDateInt := time.Unix(time.Now().Unix()+86400, 0).Format("20060102")
-		set_new_ios_ua(redis_value,tomorrow_day_id)
-		return eval(redis_value)
+		tomorrowDateInt, _ := strconv.Atoi(time.Unix(time.Now().Unix()+86400, 0).Format("20060102"))
+		redisKey = fmt.Sprintf("new_ios_ua_v2_%d", tomorrowDateInt)
+		conn.Do("SADD", redisKey, rsp)
+	}
+
+	if rsp == nil {
+		return "", "", nil
 	}
 
-	redis_ua_value = redis_ua.get_ip_ios_ua(ip)
-	if not redis_ua_value:
-	redis_ua_value = redis_ua.get_new_ios_ua()
-	if redis_ua_value:
-	redis_ua.set_ip_ios_ua(ip,redis_ua_value)
-	imei = redis_ua_value.get('imei','')
-	ua = redis_ua_value.get('ua','')
-	return imei,ua
+	conn.Do("SET", iosUaImeiRedisKey, rsp, 86520)
+
+	var uaImeiInfo struct {
+		Imei string
+		Ua   string
+	}
+	rspBytes, _ := redis.Bytes(rsp, err)
+	json.Unmarshal(rspBytes, &uaImeiInfo)
+	return uaImeiInfo.Imei, uaImeiInfo.Ua, nil
 }