修复bug

.idea/dictionaries/zhanlangpc.xml

@@ -1,11 +1,17 @@
 <component name="ProjectDictionaryState">
   <dictionary name="zhanlangpc">
     <words>
+      <w>adip</w>
+      <w>ciphertext</w>
+      <w>dingtou</w>
       <w>imei</w>
+      <w>padtext</w>
       <w>sadd</w>
+      <w>scard</w>
       <w>smembers</w>
       <w>srandmember</w>
       <w>srem</w>
+      <w>weigth</w>
     </words>
   </dictionary>
 </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,21 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="GoUnhandledErrorResult" enabled="true" level="WARNING" enabled_by_default="true">
+      <methods>
+        <method importPath="hash" receiver="Hash" name="Write" />
+        <method importPath="strings" receiver="*Builder" name="Write" />
+        <method importPath="strings" receiver="*Builder" name="WriteByte" />
+        <method importPath="bytes" receiver="*Buffer" name="WriteRune" />
+        <method importPath="bytes" receiver="*Buffer" name="Write" />
+        <method importPath="bytes" receiver="*Buffer" name="WriteString" />
+        <method importPath="strings" receiver="*Builder" name="WriteString" />
+        <method importPath="bytes" receiver="*Buffer" name="WriteByte" />
+        <method importPath="strings" receiver="*Builder" name="WriteRune" />
+        <method importPath="math/rand" receiver="*Rand" name="Read" />
+        <method importPath="github.com/gomodule/redigo/redis" receiver="Conn" name="Close" />
+        <method importPath="io" receiver="ReadCloser" name="Close" />
+      </methods>
+    </inspection_tool>
+  </profile>
+</component>

ads_handler.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"io"
 	"math/rand"
 	"miads/adslib"
 	"miads/adslib/addata"
@@ -16,9 +17,13 @@ import (
 	"miads/adslib/redis_data"
 	"miads/adslib/utils"
 	"net/url"
+	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/lestrrat-go/file-rotatelogs"
+	log "github.com/sirupsen/logrus"
 )
 
 type Response struct {
@@ -28,13 +33,39 @@ type Response struct {
 	addata.AdData
 }
 
+func setupLogger(logName string, logLevel log.Level) {
+	writer, err := rotatelogs.New(
+		logName+".%Y%m%d",
+
+		// WithLinkName为最新的日志建立软连接，以方便随着找到当前日志文件
+		rotatelogs.WithLinkName(logName),
+
+		// WithRotationTime设置日志分割的时间，这里设置为一小时分割一次
+		rotatelogs.WithRotationTime(time.Hour),
+
+		// WithMaxAge和WithRotationCount二者只能设置一个，
+		// WithMaxAge设置文件清理前的最长保存时间，
+		// WithRotationCount设置文件清理前最多保存的个数。
+		rotatelogs.WithMaxAge(time.Hour*24*3),
+	)
+
+	if err != nil {
+		log.Errorf("config local file system for logger error: %v", err)
+	}
+
+	log.SetReportCaller(true)
+	log.SetLevel(logLevel)
+	log.SetOutput(io.MultiWriter(writer, os.Stdout))
+}
+
 func adsHandler(c *gin.Context) {
+	setupLogger("log/ads.log", log.TraceLevel)
 	c.Header("Content-Type", "application/json")
 
 	request := adslib.Request{}
 	request.Parse(c)
 
-	fmt.Printf("%+v\n", request)
+	log.Printf("%+v", request)
 	advertiser := "xiaomi"
 	uaClient := request.UaClient
 	// 获取ua
@@ -111,7 +142,9 @@ func adsHandler(c *gin.Context) {
 		graylog.Log(grayLogData)
 	}
 
+	// 定制city code
 	cityCode, err := city.GetCityCode(ipInfo.City)
+	log.Infof("got city code: %d", cityCode)
 	if err != nil {
 		c.String(404, "get city code failed: %s", err)
 		return
@@ -131,11 +164,12 @@ func adsHandler(c *gin.Context) {
 		// 频率控制
 		freqControlConf, err := redis_data.GetFreqCrontolConf(request.ReqSource)
 		if err != nil {
+			log.Errorf("get freq control conf failed: %s", err)
 			c.String(404, "get freq control conf failed: %s", err)
 			return
 		}
 
-		fmt.Printf("freq control conf: %+v\n", freqControlConf)
+		log.Infof("freq control conf: %+v", freqControlConf)
 		hour, _ := strconv.Atoi(time.Now().Format("01"))
 		tmpControlInterval, ok := freqControlConf.GetControlTime(hour)
 		if ok {
@@ -153,16 +187,17 @@ func adsHandler(c *gin.Context) {
 	needControl := false
 	if request.ReqSource != "wzb_h5" && lastReqTime != 0 && time.Now().Unix()-lastReqTime < int64(freqControlInterval) {
 		// 需要凭空
+		log.Infof("need control: %d", lastReqTime)
 		needControl = true
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_0", cityCode)
 	} else {
 		device.SetIpReqTime(ip, time.Now().Unix())
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_1", cityCode)
 	}
-
 	//### 检查是否是ip黑名单
 	isIpBlack, err := ads_checker.CheckBlackIp(ip)
 	if err != nil {
+		log.Errorf("check black ip failed: %s", err)
 		c.String(404, "check black ip failed: %s", err)
 		return
 	}
@@ -174,6 +209,7 @@ func adsHandler(c *gin.Context) {
 	// 获取渠道的黑白性
 	reqChannelFlag, err := redis_data.GetChannelFlag(request.ReqSource, "ads_req")
 	if err != nil {
+		log.Errorf("get req channel flag failed: %s", err)
 		c.String(404, "get req channel flag failed: %s", err)
 		return
 	}
@@ -205,10 +241,12 @@ func adsHandler(c *gin.Context) {
 		randomNum := 3
 		deviceConf, realRedisKey, err := device.GetMiDeviceConf(ip, randomNum, specialDeviceNum)
 		if err != nil {
-			c.String(404, "get req channel flag failed")
+			log.Errorf("get mi device conf failed: %s", err)
+			c.String(404, "get mi device conf failed: %s", err)
 			return
 		}
 		if deviceConf != nil {
+			log.Infof("use cache imei: %+v", deviceConf)
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_CACHE", cityCode) // 通过缓存请求
 			imei = deviceConf.Imei
 			uaClient = deviceConf.Ua
@@ -228,7 +266,8 @@ func adsHandler(c *gin.Context) {
 				fakeImei := ""
 				fakeDeviceConf, leftCnt, err := device.GetDailyFakeDeviceConfByCityCode(cityCode)
 				if err != nil {
-					c.String(404, "get device conf failed")
+					log.Errorf("get device conf failed: %s", err)
+					c.String(404, "get device conf failed: %s", err)
 					return
 				}
 
@@ -237,7 +276,10 @@ func adsHandler(c *gin.Context) {
 				replaceUa := ""
 				if fakeDeviceConf != nil {
 					device.SetAdsTagLog(advertiser, request.ReqSource, "DS_REPL", cityCode)
-					device.SetMiDeviceConf(realRedisKey, *fakeDeviceConf)
+					err := device.SetMiDeviceConf(realRedisKey, *fakeDeviceConf)
+					if err != nil {
+						log.Errorf("set mi device conf failed: %s", err)
+					}
 					imei = fakeDeviceConf.Imei
 					uaClient = fakeDeviceConf.Ua
 					originImei = fakeDeviceConf.OriginImei
@@ -283,6 +325,7 @@ func adsHandler(c *gin.Context) {
 		// 解码ua_client
 		uaClient, _ = url.QueryUnescape(uaClient)
 	} else if request.IsMiDevice() {
+		log.Info("real mi")
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_MI_REAL", cityCode) // 是小米设备
 		userFlag = 3
 		sendPhoneType = 1
@@ -291,14 +334,18 @@ func adsHandler(c *gin.Context) {
 	// 检查下,替换后的设备是否是黑名单, 再次检查， 防止放入cache后， 新增了黑名单
 	isBlackImei, err := device.CheckIsBlackImei(imei, false)
 	if err != nil {
-		c.String(404, "get device conf failed")
+		log.Errorf("get device conf failed: %s", err)
+		c.String(404, "get device conf failed: %s", err)
 		return
 	}
 
+	log.Tracef("replace flag: %d", replaceFlag)
 	if isBlackImei {
 		if replaceFlag == 1 {
+			log.Trace("replace")
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IMEI_REPLACE", cityCode)
 		} else {
+			log.Trace("not replace")
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IMEI", cityCode)
 		}
 	}
@@ -337,6 +384,7 @@ func adsHandler(c *gin.Context) {
 	}
 
 	dspInfo.RealMd5Imei = md5Imei
+	log.Infof("dsp: %+v", dspInfo)
 	//ads_item = None
 	//xiaomi_response = []
 	hour, _ := strconv.Atoi(time.Now().Format("01"))
@@ -349,17 +397,27 @@ func adsHandler(c *gin.Context) {
 		}
 	}
 
+	log.Infof("can request: %t", canRequest)
+
 	var adData *addata.AdData
 
 	// 非频率控制，设备黑名单，ip黑名单，白名单渠道,并且替换了小米设备的
 	if canRequest && !isBlackImei && reqChannelFlag.ChannelFlag == 1 && flowFlag == 1 && !isIpBlack && advertiser == "xiaomi" && request.ReqSource != "" && !needControl && (replaceFlag == 1 || request.IsMiDevice()) {
 		adData, err = addata.GetAdsInfos(&dspInfo, advertiser)
+		if err != nil {
+			log.Errorf("get mi ad data failed: %s", err)
+			c.String(404, "get mi ad data failed: %s", err)
+			return
+		}
+		log.Infof("get mi ads data: %+v", adData)
 	}
 
-	canMixFlag := 0
+	canMixFlag := 1
 	xiaomiResponseFlag := 0
 	response := Response{}
+	response.Msg = "ok"
 	if adData != nil && len(adData.TargetAddition) > 1 {
+		log.Infof("add target js order")
 		xiaomiResponseFlag = 1
 		realTarget := ""
 		if adData.Target != "" {
@@ -372,7 +430,13 @@ func adsHandler(c *gin.Context) {
 			redis_data.SetSkipInfo(md5Skip, adData.Target)
 		}
 		adData.Target = realTarget
-		adData.JsOrderId, _ = redis_data.GetMinScriptOrderByAdv(advertiser)
+		adData.JsOrderId, err = redis_data.GetMinScriptOrderByAdv(advertiser)
+		if err != nil {
+			log.Errorf("get min script order by adv failed: %s", err)
+			c.String(404, "get min script order by adv failed: %s", err)
+			return
+		}
+		log.Infof("got min script order: %d", adData.JsOrderId)
 		adData.UserAgent = uaClient
 
 		if dspInfo.ReqSource == "kuxin" && adData.Target != "" {
@@ -385,21 +449,21 @@ func adsHandler(c *gin.Context) {
 			device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_GET_1", cityCode) // 广告获取成功
 		}
 		device.SetAdsTagLog(advertiser, dspInfo.ReqSource, fmt.Sprintf("ADS_USER_%d", userFlag), cityCode) //  广告类型，缓存，新用户，小米手机
-		// 判断这个渠道是否要去融合和融合的流量占比
-		mixChannelFlag, err := redis_data.GetChannelFlag(dspInfo.ReqSource, "ads_mix")
-		if err != nil {
-			c.String(404, "get device conf failed")
-			return
-		}
+		// // 判断这个渠道是否要去融合和融合的流量占比
+		// mixChannelFlag, err := redis_data.GetChannelFlag(dspInfo.ReqSource, "ads_mix")
+		// if err != nil {
+		// 	log.Errorf("get device conf failed: %s", err)
+		// 	c.String(404, "get device conf failed: %s", err)
+		// 	return
+		// }
 		flowRandomNum = rand.Intn(100)
-		isOverFlow := false
-		//flow_flag = 0
-		if flowRandomNum > mixChannelFlag.Weigth {
-			isOverFlow = true
-		}
-		if mixChannelFlag.ChannelFlag != 1 || isOverFlow {
-			//extra_infos = []
-		}
+		//isOverFlow := false
+		//if flowRandomNum > mixChannelFlag.Weigth {
+		//	isOverFlow = true
+		//}
+		//if mixChannelFlag.ChannelFlag != 1 || isOverFlow {
+		//	//extra_infos = []
+		//}
 
 		// 组装返回去的action
 		serverActionResponse := map[string]int{"server_view": 0, "server_click": 0, "server_close": 0, "server_video_finish": 0, "server_video_timer": 0}
@@ -417,27 +481,33 @@ func adsHandler(c *gin.Context) {
 				serverActionResponse["server_video_timer"] = 1
 			}
 		}
-
+		log.Infof("server action response: %+v", serverActionResponse)
 		// 增加跟随订单
 		if len(adData.TargetAddition) == 2 && serverActionResponse["server_video_finish"] == 1 && (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") {
-			adData, err = addata.CombineOrderBy(adData, advertiser, &dspInfo)
+			log.Infof("add more order")
+			adData, err = addata.CombineOrderBy(adData, &dspInfo)
 			if err != nil {
+				log.Errorf("combine order failed: %s", err)
 				c.String(404, "combine order failed: %s", err.Error())
 				return
 			}
+			log.Infof("get custom order: %+v", adData)
 		}
 
 		//# 检查最后是否有click
-		//last_target_addition_infos = ads_item_new.get('target_addition',[])
+		log.Infof("check ads item new: %+v", adData)
+
 		for _, targetAddition := range adData.TargetAddition {
 			if targetAddition.Type == "CLICK" || targetAddition.Type == "VIDEO_TIMER" {
+				log.Infof("can't mix, targetAddition: %+v", targetAddition)
 				canMixFlag = 0
 				break
 			}
 		}
 
 		if request.NewAdsFlag == 0 {
-			//response.update(ads_item_new)
+			response.AdData = *adData
+			log.Infof("update response: +%v", response)
 		} else {
 			jsonBytes, err := json.Marshal(*adData)
 			if err != nil {
@@ -448,6 +518,8 @@ func adsHandler(c *gin.Context) {
 			response.AdsResult = encryptData
 		}
 	}
+
+	log.Infof("can mix: %d, xiaomi rsp flag: %d", canMixFlag, xiaomiResponseFlag)
 	if canMixFlag == 1 {
 		response.Result = 2
 		response.Msg = "no ads"
@@ -458,15 +530,17 @@ func adsHandler(c *gin.Context) {
 		// 增加打底广告
 		if (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") && !needControl && !isBlackImei {
 			shortMessage := "kong"
-			customAdData, err := addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 0, xiaomiResponseFlag)
+			// 先跑定投
+			customAdData, err := addata.GetCustomAdsInfos(&dspInfo, 0, 0, xiaomiResponseFlag)
 			if err != nil {
 				c.String(404, "get custom ads info failed: %s", err.Error())
 				return
 			}
+			log.Infof("dingtou: %+v", customAdData)
 
 			// 定投没有就跑其他的
 			if customAdData == nil {
-				customAdData, err = addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 1, xiaomiResponseFlag)
+				customAdData, err = addata.GetCustomAdsInfos(&dspInfo, 0, 1, xiaomiResponseFlag)
 				if err != nil {
 					c.String(404, "get fix custom ads info failed: %s", err.Error())
 					return
@@ -478,9 +552,9 @@ func adsHandler(c *gin.Context) {
 			}
 
 			if customAdData != nil && (shortMessage == "ads_vast_response" || shortMessage == "ads_tt_thirds") {
-				adDataBytes, err := json.Marshal(*adData)
+				adDataBytes, err := json.Marshal(*customAdData)
 				if err != nil {
-					fmt.Sprintf("marshal addata failed: %s\n", err)
+					log.Errorf("marshal adData failed: %s\n", err)
 				}
 				grayLogData := struct {
 					Ip           string
@@ -508,43 +582,44 @@ func adsHandler(c *gin.Context) {
 				if len(response.TargetAddition) != 0 && len(customAdData.TargetAddition) != 0 {
 					rspTargetAddition = response.TargetAddition
 					lastAdData.UserAgent = response.UserAgent
-				}
-				//  当只有view的时候
-				if len(customAdData.TargetAddition) == 1 {
-					for _, url := range customAdData.TargetAddition[0].Urls {
-						rspTargetAddition[0].Urls = append(rspTargetAddition[0].Urls, url)
-					}
-				} else {
-					// 当自由订单有view和click的时候
-					for _, url := range customAdData.TargetAddition[0].Urls {
-						rspTargetAddition[0].Urls = append(rspTargetAddition[0].Urls, url)
+					//  当只有view的时候
+					if len(customAdData.TargetAddition) == 1 {
+						for _, targetUrl := range customAdData.TargetAddition[0].Urls {
+							rspTargetAddition[0].Urls = append(rspTargetAddition[0].Urls, targetUrl)
+						}
+					} else {
+						// 当自由订单有view和click的时候
+						for _, targetUrl := range customAdData.TargetAddition[0].Urls {
+							rspTargetAddition[0].Urls = append(rspTargetAddition[0].Urls, targetUrl)
+						}
+
+						for _, targetUrl := range customAdData.TargetAddition[1].Urls {
+							rspTargetAddition[1].Urls = append(rspTargetAddition[1].Urls, targetUrl)
+						}
+						rspTargetAddition[1].Type = "CLICK"
 					}
+					lastAdData.Target = customAdData.Target
+					lastAdData.JsOrderId = customAdData.JsOrderId
+					lastAdData.TargetAddition = rspTargetAddition
+					lastAdData.DpReport = response.DpReport
+					lastAdData.Dp = response.Dp
 
-					for _, url := range customAdData.TargetAddition[1].Urls {
-						rspTargetAddition[1].Urls = append(rspTargetAddition[1].Urls, url)
+					adDataBytes, err := json.Marshal(lastAdData)
+					if err != nil {
+						log.Errorf("marshal adData failed: %s", err)
+					}
+					grayLogData := struct {
+						ShortMessage string `json:"short_message"`
+						ResponseVast string `json:"response_vast"`
+					}{
+						ShortMessage: "third_mix_xiaomi",
+						ResponseVast: string(adDataBytes),
 					}
-					rspTargetAddition[1].Type = "CLICK"
-				}
-				lastAdData.Target = customAdData.Target
-				lastAdData.JsOrderId = customAdData.JsOrderId
-				lastAdData.TargetAddition = rspTargetAddition
-				lastAdData.DpReport = response.DpReport
-				lastAdData.Dp = response.Dp
 
-				adDataBytes, err := json.Marshal(lastAdData)
-				if err != nil {
-					fmt.Sprintf("marshal addata failed: %s\n", err)
+					graylog.Log(grayLogData)
+					log.Infof("replace addata: %+v", lastAdData)
+					customAdData = &lastAdData
 				}
-				grayLogData := struct {
-					ShortMessage string `json:"short_message"`
-					ResponseVast string `json:"response_vast"`
-				}{
-					ShortMessage: "third_mix_xiaomi",
-					ResponseVast: string(adDataBytes),
-				}
-
-				graylog.Log(grayLogData)
-				customAdData = &lastAdData
 			}
 			if customAdData != nil {
 				device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_ZIYOU_HAVE", cityCode) // 广告获取成功
@@ -552,19 +627,27 @@ func adsHandler(c *gin.Context) {
 					response.Result = 0
 					response.Msg = "ok"
 
+					log.Infof("rsp1: %+v", customAdData)
 					jsonBytes, err := json.Marshal(customAdData)
 					if err != nil {
 						c.String(404, "marsha custom addata failed: %s", err.Error())
 						return
 					}
+					log.Infof("rsp1: %s", jsonBytes)
 					encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(adslib.GetConf().SecretKey))
 					response.AdsResult = encryptData
+
+					log.Infof("encrypt: %s", encryptData)
+					s, err := encrypt.Decrypt(encryptData, []byte(adslib.GetConf().SecretKey))
+					log.Info(s, err)
+
 					graylog.ReportGrayLog(request, dspInfo, 0, 0)
 					rspBytes, err := json.Marshal(response)
 					if err != nil {
 						c.String(404, "marshal Response failed: %s", err.Error())
 						return
 					}
+					log.Infof("rsp1: %s", rspBytes)
 					c.String(200, string(rspBytes))
 					return
 				} else {
@@ -593,5 +676,6 @@ func adsHandler(c *gin.Context) {
 		graylog.ReportGrayLog(request, dspInfo, 0, 0)
 	}
 	device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "DS_REQ", cityCode) // 所有请求
+	log.Infof("rsp3: %s", rspBytes)
 	c.String(200, string(rspBytes))
 }

adslib/addata/custom.go

@@ -2,6 +2,7 @@ package addata
 
 import (
 	"fmt"
+	log "github.com/sirupsen/logrus"
 	"math/rand"
 	"miads/adslib"
 	"miads/adslib/redis_data"
@@ -11,8 +12,8 @@ import (
 	"time"
 )
 
-func CombineOrderBy(adData *AdData, advertiser string, dsp *utils.DspParam) (*AdData, error) {
-	customAdData, err := GetCustomAdsInfos(dsp, advertiser, 1, 0, 0)
+func CombineOrderBy(adData *AdData, dsp *utils.DspParam) (*AdData, error) {
+	customAdData, err := GetCustomAdsInfos(dsp, 1, 0, 0)
 	if err != nil {
 		return adData, err
 	}
@@ -47,7 +48,7 @@ func CombineOrderBy(adData *AdData, advertiser string, dsp *utils.DspParam) (*Ad
 }
 
 // 获取一个广告
-func getOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error) {
+func GetOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error) {
 	// 取出广告
 	orders, err := redis_data.GetOrderInfos(dsp, fixFlag)
 	if err != nil {
@@ -127,31 +128,33 @@ func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int, error) {
 		endMinute = endMinute - 1440 + 2
 	}
 
-	key = "time_all_count_" + strconv.Itoa(endMinute)
+	endKey := "time_all_count_" + strconv.Itoa(endMinute)
 	if adData.LineType == 1 {
 		// 定制曲线
-		key = fmt.Sprintf("time_all_count_%d_%d", adData.OrderID, endMinute)
+		endKey = fmt.Sprintf("time_all_count_%d_%d", adData.OrderID, endMinute)
 	}
 
-	endRemainDispatchCnt, err := redis_data.GetRemainDispatchCount(key)
+	endRemainDispatchCnt, err := redis_data.GetRemainDispatchCount(endKey)
 	if err != nil {
 		return 0, err
 	}
-
+	log.Infof("begin need dispatch count key: %s, %d, end: %s, %d", key, beginRemainDispatchCount, endKey, endRemainDispatchCnt)
 	// 结束的剩余值 - 起始剩余值 = 获取区间能跑的值
 	needDispatchCount := beginRemainDispatchCount - endRemainDispatchCnt
 	return needDispatchCount, nil
 }
 
-func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) (*AdData, error) {
-	order, err := getOneAds(dsp, orderType, fixFlag)
+func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHasFlag int) (*AdData, error) {
+	order, err := GetOneAds(dsp, orderType, fixFlag)
 	if err != nil {
+		log.Errorf("get one ads failed: %s", err)
 		return nil, err
 	}
 	if order == nil {
 		return nil, nil
 	}
 
+	log.Infof("begin got custom ad info, xiaomi has flag: %d", xiaomiHasFlag)
 	if xiaomiHasFlag == 1 {
 		if strings.Index(order.Title, "_ios") > 0 {
 			return nil, nil
@@ -176,9 +179,9 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 		return nil, err
 	}
 
-	fmt.Sprintf("finish show cnt: %d\n", finishShowCnt)
 	redis_data.SetPlanDispatchCount(order.OrderID, "show", needDispatchCnt, curTime)
 
+	log.Infof("all count: %d, over kpi: %d, show kpi: %d", needDispatchCnt, finishShowCnt, order.ShowKpi)
 	// 计算曲线比例
 	rate := float32(order.ShowKpi) / float32(needDispatchCnt)
 
@@ -192,6 +195,8 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 	if err != nil {
 		return nil, err
 	}
+	log.Infof("line value: %d, rate: %f", lineValue, rate)
+
 	// 当前分钟需要放出去的数量
 	curMinuteNeedDispatchCnt := int(float32(lineValue) * rate)
 	if curMinuteNeedDispatchCnt < 1 {
@@ -200,8 +205,11 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 
 	redis_data.SetOrderPlanDispatchCount(order.OrderID, "show", curMinuteNeedDispatchCnt, curTime)
 
+	log.Infof("tt thirds: %+v", order)
 	// 获取当前分钟已经完成的下发
 	curMinuteFinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
+
+	log.Infof("o value: %d, w value: %d", curMinuteFinishedDispatchCnt, curMinuteNeedDispatchCnt)
 	if curMinuteFinishedDispatchCnt < curMinuteNeedDispatchCnt {
 		data := AdData{
 			Duration:  5,
@@ -227,6 +235,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 		if strings.Index(order.Title, "_ios") != -1 {
 			iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 			if err != nil {
+				log.Errorf("get ios ua imei failed: %s", err)
 				return nil, err
 			}
 			if iosUa != "" {
@@ -261,6 +270,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 			if r < 40 && xiaomiHasFlag == 0 {
 				iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 				if err != nil {
+					log.Errorf("get ios ua imei failed: %s", err)
 					return nil, err
 				}
 				if iosUa != "" {
@@ -310,19 +320,23 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 
 		r := rand.Intn(1000)
 		clickRate := int(float32(order.ClickKpi) / float32(order.ShowKpi) * 1000)
+		log.Infof("rand: %d, rate: %d", r, clickRate)
 		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)
+			_, err = redis_data.IncrFinishedDispatchCount(order.OrderID, "click", 1, curTime)
+			if err != nil {
+				log.Errorf("incr finished dispatch count failed: %s", err)
+			}
 			realTarget := adslib.GetConf().Host + fmt.Sprintf("?action=LOADING&req_source=%s&advertiser=%s&skip=%s&skip_other=%s",
-				dsp.ReqSource, "", order.Title, md5Skip)
+				dsp.ReqSource, order.Title, "", md5Skip)
 			// 塞入缓存中
 			redis_data.SetSkipInfo(md5Skip, targetUrl)
 			data.Target = realTarget
-			return &data, nil
 		}
+		return &data, nil
 	}
 
 	return nil, nil
@@ -345,7 +359,7 @@ func genMonitorAction(action string, title string, reqSource string, url string)
 	}
 	urlHost := adslib.GetConf().HostIos
 	actionUrl := fmt.Sprintf("%s?action=%s&advertiser=%s&req_source=%s",
-		urlHost, action, reqSource, title)
+		urlHost, action, title, reqSource)
 	adAction.Urls = append(adAction.Urls, actionUrl)
 	return &adAction
 }

adslib/addata/xiaomi.go

@@ -3,6 +3,7 @@ package addata
 import (
 	"encoding/json"
 	"fmt"
+	log "github.com/sirupsen/logrus"
 	"html"
 	"io/ioutil"
 	"math/rand"
@@ -63,17 +64,17 @@ type AdInfo struct {
 
 type AdData struct {
 	TargetAddition []AdAction `json:"target_addition"`
-	Target         string
-	ImageUrl       string `json:"image_url"`
-	Duration       int64
-	VideoUrl       string `json:"video_url"`
-	JsOrderId      int64  `json:"js_order_id"`
-	UserAgent      string `json:"user_agent"`
-	DpReport       string `json:"dp_report"`
-	Dp             string `json:"dp"`
-	OrderName      string `json:"order_name"`
-	Result         int    `json:"result"`
-	Msg            string `json:"msg"`
+	Target         string     `json:"target"`
+	ImageUrl       string     `json:"image_url"`
+	Duration       int64      `json:"duration"`
+	VideoUrl       string     `json:"video_url"`
+	JsOrderId      int64      `json:"js_order_id"`
+	UserAgent      string     `json:"user_agent"`
+	DpReport       string     `json:"dp_report,omitempty"`
+	Dp             string     `json:"dp,omitempty"`
+	OrderName      string     `json:"order_name,omitempty"`
+	Result         int        `json:"result"`
+	Msg            string     `json:"msg"`
 }
 
 func getAdsReqUrl(dsp *utils.DspParam) string {
@@ -114,7 +115,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 	fmt.Printf("req url: %s\n", reqUrl)
 	req, err := http.NewRequest("GET", reqUrl, nil)
 	if err != nil {
-		return nil,  err
+		return nil, err
 	}
 
 	req.Header.Set(",authority", "m.video.xiaomi.com")
@@ -137,7 +138,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 	body, err := ioutil.ReadAll(resp.Body)
 	fmt.Printf("rsp body: %s\n", body)
 	if err != nil {
-		return nil,  err
+		return nil, err
 	}
 	rsp := XiaoMiAdInfoRsp{}
 	err = json.Unmarshal(body, &rsp)
@@ -187,9 +188,9 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 
 	for _, target := range rsp.Data[0].TargetAddition {
 		target := html.UnescapeString(target)
-		targetParseUrl, _ := url.Parse(target)
+		targetParseUrl, err := url.Parse(target)
 		if err != nil {
-			fmt.Printf("parse url failed, url: %s, err: %s", target, err)
+			log.Errorf("parse url failed, url: %s, err: %s", target, err)
 			continue
 		}
 
@@ -266,7 +267,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 	fmt.Printf("goto urls: %+v\nshow urls: %+v\nclick_urls: %+v\nclose urls: %+v\nvideo finish urls: %+v\nimagurls: %+v\nvideo urls:%+v\n",
 		gotoUrls, showUrls, clickUrls, closeUrls, videoFinishUrls, imageUrls, videoUrls)
 
-	adsData, err := CombineLastAdsInfos(dsp, advertiser, gotoUrls, showUrls, clickUrls, closeUrls, videoFinishUrls, videoTimerUrls, imageUrls, videoUrls)
+	adsData, err := CombineLastAdsInfos(dsp, advertiser, gotoUrls, showUrls, clickUrls, closeUrls, videoFinishUrls, videoTimerUrls, videoUrls)
 	if err != nil {
 		return nil, err
 	}
@@ -292,15 +293,6 @@ func getActionsConf(advertiser string) []string {
 	return actions
 }
 
-func getDurationConf(advertiser string) int {
-	svrConf := adslib.GetConf()
-	duration, ok := svrConf.AdsDuration[advertiser]
-	if !ok {
-		return 0
-	}
-	return duration
-}
-
 func getCombinationActionsConf(advertiser string) []adslib.CombinationActionsConf {
 	svrConf := adslib.GetConf()
 	combinationActions, ok := svrConf.CombinationActions[advertiser]
@@ -313,7 +305,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, videoUrls []string) (*AdData, error) {
 
 	// 判断是不是关掉所有Action
 	actions := getActionsConf(advertiser)
@@ -323,10 +315,11 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 
 	clickChannelFlag, err := redis_data.GetChannelFlag(dsp.ReqSource, "ads_click")
 	if err != nil {
+		log.Errorf("get ads_click channel flag failed: %s", err)
 		return nil, err
 	}
 
-	fmt.Printf("click channel flag: %+v\n", clickChannelFlag)
+	log.Tracef("click channel flag: %+v\n", clickChannelFlag)
 
 	clickRandom := rand.Intn(100)
 	needClick := false
@@ -468,6 +461,7 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 
 		canReport, err := redis_data.GetDeviceIpReport(dsp.Imei, dsp.Ip)
 		if err != nil {
+			log.Errorf("get device ip report failed: %s", err)
 			return nil, err
 		}
 
@@ -481,8 +475,8 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 			}
 
 			conf := adslib.GetConf()
-			url := strings.ReplaceAll(conf.HostMiao, "__IMEI__", md5Imei)
-			adData.Urls = append(adData.Urls, url)
+			adDataUrl := strings.ReplaceAll(conf.HostMiao, "__IMEI__", md5Imei)
+			adData.Urls = append(adData.Urls, adDataUrl)
 			redis_data.SetDeviceIpReport(dsp.Imei, dsp.Ip)
 		}
 		rspAdDatas = append(rspAdDatas, adData)
@@ -511,7 +505,6 @@ func genAdsAction(urls []string, advertiser string,
 	}
 
 	flowControlConf := redis_data.GetFlowPercentDuration(advertiser, action)
-	fmt.Printf("%+v\n", flowControlConf)
 
 	flowPercent := 0
 	duration := 0
@@ -523,11 +516,11 @@ func genAdsAction(urls []string, advertiser string,
 	lastUrls := make([]string, 0, 20)
 	if !needControl || allSendNum == 0 || int(
 		float32(allShowNum)/float32(allSendNum)*100) < flowPercent {
-		reportUrl := getReportUrl(action, advertiser, dsp)
+		reportUrl := getReportUrl(action, dsp)
 		lastUrls = append(urls, reportUrl)
 	}
 
-	fmt.Printf("%+v\n", lastUrls)
+	log.Tracef("action: %s, all send: %d,  all show: %d, control: +%v %+v %t\n", action, allSendNum, allShowNum, flowControlConf, lastUrls, needControl)
 
 	if len(lastUrls) == 0 {
 		duration = 0
@@ -544,9 +537,9 @@ func genAdsAction(urls []string, advertiser string,
 }
 
 // 组装上报的url
-func getReportUrl(action string, advertiser string, dsp *utils.DspParam) string {
+func getReportUrl(action string, dsp *utils.DspParam) string {
 	urlHost := adslib.GetConf().HostIos
-	url := fmt.Sprintf("%s?action=%s&advertiser=video&req_source=%s&brand=%s&city_code=%d&request_id=%s&spefial_flag=%d",
+	reportUrl := fmt.Sprintf("%s?action=%s&advertiser=video&req_source=%s&brand=%s&city_code=%d&request_id=%s&spefial_flag=%d",
 		urlHost, action, dsp.ReqSource, dsp.Brand, dsp.DspCityCode, dsp.RequestId, dsp.SendPhoneType)
-	return url
+	return reportUrl
 }

adslib/device/device.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gomodule/redigo/redis"
+	log "github.com/sirupsen/logrus"
 	"math/rand"
 	"miads/adslib/ads_redis"
 	"miads/adslib/utils"
@@ -12,7 +13,6 @@ import (
 	"time"
 )
 
-
 type DeviceConf struct {
 	Imei       string `json:"imei"`
 	OriginImei string `json:"origin_imei"`
@@ -20,7 +20,7 @@ type DeviceConf struct {
 }
 
 func SetAdsTagLog(adv string, reqSource string, key string, cityCode int) {
-	k := fmt.Sprintf("%s___%s___%s___%d",adv,reqSource,key,cityCode)
+	k := fmt.Sprintf("%s___%s___%s___%d", adv, reqSource, key, cityCode)
 	setTagLog(k)
 }
 
@@ -29,9 +29,9 @@ func setTagLog(key string) {
 	defer conn.Close()
 
 	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
-	k := fmt.Sprintf("{%s}___{%d}",key, dateInt)
-	conn.Do("INCR", k)
-	conn.Do("SADD", "fresh_all_keys", k)
+	k := fmt.Sprintf("{%s}___{%d}", key, dateInt)
+	_, _ = conn.Do("INCR", k)
+	_, _ = conn.Do("SADD", "fresh_all_keys", k)
 }
 
 // 存储ip上一次请求时间
@@ -41,7 +41,7 @@ func SetIpReqTime(ip string, reqTime int64) {
 
 	ipKey := strings.ReplaceAll(ip, ".", "")
 	redisKey := "adip_" + ipKey
-	conn.Do("SET", redisKey, reqTime)
+	_, _ = conn.Do("SET", redisKey, reqTime)
 }
 
 // 获取这个ip最近一次请求的时间
@@ -59,7 +59,7 @@ func GetIpReqTime(ip string) (int64, error) {
 		return 0, err
 	}
 	lastReqTime, _ := redis.Int64(rsp, err)
-	return lastReqTime,nil
+	return lastReqTime, nil
 }
 
 func SetMiDeviceConf(key string, d DeviceConf) error {
@@ -70,19 +70,19 @@ func SetMiDeviceConf(key string, d DeviceConf) error {
 	if err != nil {
 		return err
 	}
-	conn.Do("set", key, deviceConfBytes,86400)
+	_, _ = conn.Do("set", key, deviceConfBytes, 86400)
 	return nil
 }
 
 // 获取设备
-func GetMiDeviceConf(ip string , randNum int, specialDeviceNum int) (*DeviceConf, string, error){
+func GetMiDeviceConf(ip string, randNum int, specialDeviceNum int) (*DeviceConf, string, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
 	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
 	rd := 0
-	if specialDeviceNum==0 {
-		rd = rand.Intn(randNum - 1) + 1
+	if specialDeviceNum == 0 {
+		rd = rand.Intn(randNum-1) + 1
 	} else {
 		rd = specialDeviceNum
 	}
@@ -117,14 +117,14 @@ func SetDailyFakeDeviceConfByCityCode(cityCode int, d DeviceConf, dateInt int) e
 	if err != nil {
 		return err
 	}
-	conn.Do("SADD", redisKey, deviceConfBytes)
-	conn.Do("expire", redisKey, 129600)
+	_, _ = conn.Do("SADD", redisKey, deviceConfBytes)
+	_, _ = conn.Do("expire", redisKey, 129600)
 
 	return nil
 }
 
 // 获取每天的设备imei
-func GetDailyFakeDeviceConfByCityCode(cityCode int) (*DeviceConf, int, error){
+func GetDailyFakeDeviceConfByCityCode(cityCode int) (*DeviceConf, int, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -166,8 +166,11 @@ func GetDailyFakeDeviceConfByCityCode(cityCode int) (*DeviceConf, int, error){
 
 	if validDeviceConf != nil {
 		// 用过的device_id放入明天的key中
-		tomorryDateInt, _ :=  strconv.Atoi(time.Now().AddDate(0, 0, 1).Format("20060102"))
-		SetDailyFakeDeviceConfByCityCode(cityCode, *validDeviceConf, tomorryDateInt)
+		tomorrowDateInt, _ := strconv.Atoi(time.Now().AddDate(0, 0, 1).Format("20060102"))
+		err := SetDailyFakeDeviceConfByCityCode(cityCode, *validDeviceConf, tomorrowDateInt)
+		if err != nil {
+			log.Errorf("set daily fake device conf by city code failed: %s", err)
+		}
 	}
 
 	// 获取剩余的量
@@ -189,7 +192,7 @@ func CheckIsBlackImei(imei string, needMd5 bool) (bool, error) {
 	}
 
 	redisKey := "ads_black_device_" + checkImei[0:2]
-	isBlackImei, err := redis.Bool(conn.Do("sismember", redisKey, checkImei))
+	isBlackImei, err := redis.Bool(conn.Do("SISMEMBER", redisKey, checkImei))
 	if err != nil {
 		return false, err
 	}
@@ -203,5 +206,5 @@ func AddCityCodeBlackImei(cityCode int, imei string) {
 	defer conn.Close()
 
 	redisKey := fmt.Sprintf("blic_%d", cityCode)
-	conn.Do("sadd", redisKey, imei)
+	_, _ = conn.Do("sadd", redisKey, imei)
 }

adslib/encrypt/aes.go

@@ -4,10 +4,7 @@ import (
 	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
-	"crypto/rand"
-	"encoding/base64"
 	"encoding/hex"
-	"io"
 )
 
 /*CBC加密 按照golang标准库的例子代码
@@ -17,19 +14,13 @@ import (
 //使用PKCS7进行填充，IOS也是7
 func pkcs7Padding(ciphertext []byte, blockSize int) []byte {
 	padding := blockSize - len(ciphertext)%blockSize
-	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	padtext := bytes.Repeat([]byte{byte(0)}, padding)
 	return append(ciphertext, padtext...)
 }
 
-func pkcs7UnPadding(origData []byte) []byte {
-	length := len(origData)
-	unpadding := int(origData[length-1])
-	return origData[:(length - unpadding)]
-}
-
-func ZeroPadding(ciphertext []byte, blockSize int) []byte {
+func pkcs7UnPadding(ciphertext []byte, blockSize int) []byte {
 	padding := blockSize - len(ciphertext)%blockSize
-	padtext := bytes.Repeat([]byte{0}, padding)//用0去填充
+	padtext := bytes.Repeat([]byte{0}, padding) //用0去填充
 	return append(ciphertext, padtext...)
 }
 
@@ -44,17 +35,12 @@ func AesCBCEncrypt(rawData, key []byte) ([]byte, error) {
 	blockSize := block.BlockSize()
 
 	rawData = pkcs7Padding(rawData, blockSize)
-	//初始向量IV必须是唯一，但不需要保密
-	cipherText := make([]byte, blockSize+len(rawData))
-	//block大小 16
-	iv := cipherText[:blockSize]
-	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
-		panic(err)
-	}
+
+	cipherText := make([]byte, len(rawData))
 
 	//block大小和初始向量大小一定要一致
-	mode := cipher.NewCBCEncrypter(block, iv)
-	mode.CryptBlocks(cipherText[blockSize:], rawData)
+	mode := cipher.NewCBCEncrypter(block, key)
+	mode.CryptBlocks(cipherText, rawData)
 
 	return cipherText, nil
 }
@@ -81,7 +67,7 @@ func AesCBCDecrypt(encryptData, key []byte) ([]byte, error) {
 	// CryptBlocks can work in-place if the two arguments are the same.
 	mode.CryptBlocks(encryptData, encryptData)
 	//解填充
-	encryptData = ZeroPadding(encryptData, blockSize)
+	encryptData = pkcs7UnPadding(encryptData, blockSize)
 	return encryptData, nil
 }
 
@@ -90,7 +76,8 @@ func Encrypt(rawData, key []byte) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return base64.StdEncoding.EncodeToString(data), nil
+	encryptData := hex.EncodeToString(data)
+	return encryptData, nil
 }
 
 func Decrypt(rawData string, key []byte) (string, error) {
@@ -104,4 +91,3 @@ func Decrypt(rawData string, key []byte) (string, error) {
 	}
 	return string(dnData), nil
 }
-

adslib/redis_data/order.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"github.com/gomodule/redigo/redis"
+	log "github.com/sirupsen/logrus"
 	"miads/adslib/ads_redis"
 	"miads/adslib/graylog"
 	"miads/adslib/utils"
@@ -85,10 +86,12 @@ func GetOrderInfos(dsp *utils.DspParam, fixFlag int) ([]AdOrderInfo, error) {
 		return []AdOrderInfo{}, err
 	}
 
+	log.Tracef("order infos: %s", orderIds)
 	orders := make([]AdOrderInfo, 0, 50)
 	for _, id := range orderIds {
 		order, err := getOrderInfo(id)
 		if err != nil {
+			log.Warnf("no order info for: %s", id)
 			continue
 		}
 
@@ -162,10 +165,10 @@ func GetOrderInfos(dsp *utils.DspParam, fixFlag int) ([]AdOrderInfo, error) {
 				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"`
+				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",
@@ -173,10 +176,10 @@ func GetOrderInfos(dsp *utils.DspParam, fixFlag int) ([]AdOrderInfo, error) {
 				Province:        dsp.Province,
 				City:            dsp.City,
 				OrderId:         order.OrderID,
-				orderProvince:   order.Province,
-				orderCity:       order.City,
-				orderNoProvince: order.NoProvince,
-				orderNoCity:     order.NoCity,
+				OrderProvince:   order.Province,
+				OrderCity:       order.City,
+				OrderNoProvince: order.NoProvince,
+				OrderNoCity:     order.NoCity,
 			}
 			graylog.Log(grayLogData)
 		}

adslib/redis_data/redis_data.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gomodule/redigo/redis"
+	log "github.com/sirupsen/logrus"
 	"miads/adslib"
 	"miads/adslib/ads_redis"
 	"strconv"
@@ -11,7 +12,7 @@ import (
 )
 
 type ChannelFlag struct {
-	Weigth      int `json:"weigth""`
+	Weigth      int `json:"weigth"`
 	ChannelFlag int `json:"channel_flag"`
 }
 
@@ -39,7 +40,7 @@ func GetChannelFlag(reqSource string, business string) (*ChannelFlag, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	redisKey := fmt.Sprintf("acfv2_{%s}_{%s}", reqSource, business)
+	redisKey := fmt.Sprintf("acfv2_%s_%s", reqSource, business)
 	rsp, err := conn.Do("GET", redisKey)
 	if err != nil {
 		return nil, err
@@ -121,7 +122,7 @@ func GetAdsFeedbackNum(advertiser string, action string, bannerid int) (int, err
 
 	redisKey := fmt.Sprintf("adsv3_%s_%s_%d", advertiser, action, bannerid)
 	if time.Now().Unix()%100 == 0 {
-		conn.Do("DELETE", redisKey)
+		_, _ = conn.Do("DELETE", redisKey)
 	}
 
 	rsp, err := conn.Do("GET", redisKey)
@@ -164,17 +165,17 @@ func SetDistributeActionNum(advertiser string, action string, bannerid int) {
 	redisKey := fmt.Sprintf("adsv3_%s_%s_%d", advertiser, action, bannerid)
 	curTime := int(time.Now().Unix())
 	if curTime%100 == 0 {
-		conn.Do("delete", redisKey)
+		_, _ = conn.Do("delete", redisKey)
 	}
-	conn.Do("INCR", redisKey)
+	_, _ = conn.Do("INCR", redisKey)
 }
 
 // 获取设备+ip上报是否可以
-func GetDeviceIpReport(deviceid string, ip string) (bool, error) {
+func GetDeviceIpReport(deviceId string, ip string) (bool, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	redisKey := fmt.Sprintf("dim2_%s_'%s'", deviceid, ip)
+	redisKey := fmt.Sprintf("dim2_%s_'%s'", deviceId, ip)
 	rsp, err := conn.Do("GET", redisKey)
 	if err != nil {
 		return false, err
@@ -196,11 +197,11 @@ func SetDeviceIpReport(deviceid string, ip string) {
 	defer conn.Close()
 
 	redisKey := fmt.Sprintf("dim2_%s_'%s'", deviceid, ip)
-	conn.Do("SET", redisKey, time.Now().Unix(), 3*86400)
+	_, _ = conn.Do("SET", redisKey, time.Now().Unix(), 3*86400)
 }
 
 // 设置总请求到广告的次数
-func SetAdsRequestNum(advertiser string, bannerid int) {
+func SetAdsRequestNum(advertiser string, bannerId int) {
 	if advertiser == "" {
 		return
 	}
@@ -208,11 +209,11 @@ func SetAdsRequestNum(advertiser string, bannerid int) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	redisKey := fmt.Sprintf("adsv2_%s_%d", advertiser, bannerid)
+	redisKey := fmt.Sprintf("adsv2_%s_%d", advertiser, bannerId)
 	if time.Now().Unix()%100 == 0 {
-		conn.Do("delete", redisKey)
+		_, _ = conn.Do("delete", redisKey)
 	}
-	conn.Do("incr", redisKey)
+	_, _ = conn.Do("incr", redisKey)
 }
 
 func SetAdsRealRequestNum(advertiser string) {
@@ -224,7 +225,7 @@ func SetAdsRealRequestNum(advertiser string) {
 	defer conn.Close()
 
 	redisKey := fmt.Sprintf("adsv2_request_%s", advertiser)
-	conn.Do("incr", redisKey)
+	_, _ = conn.Do("incr", redisKey)
 }
 
 // 设置skip redis
@@ -233,7 +234,7 @@ func SetSkipInfo(md5Skip string, skipUrl string) {
 	defer conn.Close()
 
 	redisKey := "su_" + md5Skip
-	conn.Do("set", redisKey, skipUrl, 300)
+	_, _ = conn.Do("set", redisKey, skipUrl, 300)
 }
 
 // 通过advertiser获取最小的script_order
@@ -261,7 +262,7 @@ func SetReqSourceView(adv string, reqSource string, source string) {
 
 	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
 	key := fmt.Sprintf("view3_%s_%s_%d_%s", adv, reqSource, dateInt, source)
-	conn.Do("incr", key)
+	_, _ = conn.Do("incr", key)
 }
 
 // 获取剩余总投放量
@@ -327,6 +328,7 @@ func GetPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, curTi
 	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)
+	log.Infof("%s %s", key, rsp)
 	if err != nil {
 		return 0, err
 	}
@@ -362,7 +364,7 @@ func SetPlanDispatchCount(orderId int64, dispatchType string, cnt int, curTime t
 	defer conn.Close()
 
 	key := fmt.Sprintf("plan_all_kpi_%d_%d%d%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), dispatchType)
-	conn.Do("SET", key, cnt, 3600*24)
+	_, _ = conn.Do("SET", key, cnt, 3600*24)
 }
 
 // 设置订单计划投放数量
@@ -373,7 +375,7 @@ func SetOrderPlanDispatchCount(orderId int64, dispatchType string, cnt int, curT
 
 	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)
+	_, _ = conn.Do("SET", key, cnt, 3600*24)
 }
 
 // 获取总量每分钟要投放的量
@@ -442,24 +444,23 @@ func GetIosUaImei(ip string) (string, string, error) {
 			return "", "", nil
 		}
 
-		conn.Do("SREM", redisKey, rsp)
+		_, _ = conn.Do("SREM", redisKey, rsp)
 
 		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
+		_, _ = conn.Do("SADD", redisKey, rsp)
 	}
 
-	conn.Do("SET", iosUaImeiRedisKey, rsp, 86520)
+	_, _ = conn.Do("SET", iosUaImeiRedisKey, rsp, 86520)
 
 	var uaImeiInfo struct {
 		Imei string
 		Ua   string
 	}
 	rspBytes, _ := redis.Bytes(rsp, err)
-	json.Unmarshal(rspBytes, &uaImeiInfo)
+	err = json.Unmarshal(rspBytes, &uaImeiInfo)
+	if err != nil {
+		return "", "", err
+	}
 	return uaImeiInfo.Imei, uaImeiInfo.Ua, nil
 }

go.mod

@@ -4,12 +4,23 @@ go 1.12
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/beanstalkd/go-beanstalk v0.0.0-20200526060843-1cc502ecaf3c
+	github.com/agiledragon/gomonkey v2.0.1+incompatible
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
+	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/jarcoal/httpmock v1.0.5
+	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
+	github.com/jonboulle/clockwork v0.1.0 // indirect
+	github.com/kr/pretty v0.2.0 // indirect
+	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
+	github.com/lestrrat-go/strftime v1.0.1 // indirect
+	github.com/lintianzhi/graylogd v0.0.0-20180503131252-dc68342f04dc // indirect
 	github.com/lionsoul2014/ip2region v2.1.0-release+incompatible
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rafaeljusto/redigomock v2.4.0+incompatible
 	github.com/robertkowalski/graylog-golang v0.0.0-20151121031040-e5295cfa2827
+	github.com/sirupsen/logrus v1.6.0
 	github.com/stretchr/testify v1.4.0
+	github.com/tebeka/strftime v0.1.4 // indirect
 )

go.sum

@@ -1,14 +1,19 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/beanstalkd/go-beanstalk v0.0.0-20200526060843-1cc502ecaf3c h1:D8zSant5V63LdrIHuEoJ82Yiyo1SRXEg+REzRuZnsbk=
-github.com/beanstalkd/go-beanstalk v0.0.0-20200526060843-1cc502ecaf3c/go.mod h1:Q3f6RCbUHp8RHSfBiPUZBojK76rir8Rl+KINuz2/sYs=
+github.com/agiledragon/gomonkey v2.0.1+incompatible h1:DIQT3ZshgGz9pTwBddRSZWDutIRPx2d7UzmjzgWo9q0=
+github.com/agiledragon/gomonkey v2.0.1+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
+github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -23,32 +28,65 @@ github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/jarcoal/httpmock v1.0.5 h1:cHtVEcTxRSX4J0je7mWPfc9BpDpqzXSJ5HbymZmyHck=
 github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
+github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
+github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
+github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
+github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
+github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
+github.com/lestrrat-go/strftime v1.0.1 h1:o7qz5pmLzPDLyGW4lG6JvTKPUfTFXwe+vOamIYWtnVU=
+github.com/lestrrat-go/strftime v1.0.1/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
+github.com/lintianzhi/graylogd v0.0.0-20180503131252-dc68342f04dc h1:7f0qjuEBw/5vUrP2lyIUgAihl0A6H0E79kswNy6edeE=
+github.com/lintianzhi/graylogd v0.0.0-20180503131252-dc68342f04dc/go.mod h1:WTHfLzkGmTEe+nyJqdZhFbAWUkyI30IVS9ytgHDJj0I=
 github.com/lionsoul2014/ip2region v2.1.0-release+incompatible h1:FHT0RIeHl5C1G+V0mhKI+kFoBoDOPBEmF8hVhKZcmNs=
 github.com/lionsoul2014/ip2region v2.1.0-release+incompatible/go.mod h1:+ZBN7PBoh5gG6/y0ZQ85vJDBe21WnfbRrQQwTfliJJI=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rafaeljusto/redigomock v2.4.0+incompatible h1:d7uo5MVINMxnRr20MxbgDkmZ8QRfevjOVgEa4n0OZyY=
 github.com/rafaeljusto/redigomock v2.4.0+incompatible/go.mod h1:JaY6n2sDr+z2WTsXkOmNRUfDy6FN0L6Nk7x06ndm4tY=
 github.com/robertkowalski/graylog-golang v0.0.0-20151121031040-e5295cfa2827 h1:D2Xs0bSuqpKnUOOlK4yu6lloeOs4+oD+pjbOfsxgWu0=
 github.com/robertkowalski/graylog-golang v0.0.0-20151121031040-e5295cfa2827/go.mod h1:jONcYFk83vUF1lv0aERAwaFtDM9wUW4BMGmlnpLJyZY=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/tebeka/strftime v0.1.4 h1:e0FKSyxthD1Xk4cIixFPoyfD33u2SbjNngOaaC3ePoU=
+github.com/tebeka/strftime v0.1.4/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=