调整

ads_handler.go

@@ -170,6 +170,11 @@ func adsHandler(c *gin.Context) {
 		device.SetIpReqTime(ip, time.Now().Unix())
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_1", cityCode)
 	}
+
+	if adslib.GetConf().TestMode {
+		needControl = false
+	}
+
 	//### 检查是否是ip黑名单
 	isIpBlack, err := ads_checker.CheckBlackIp(ip)
 	if err != nil {

adslib/addata/xiaomi.go

@@ -66,10 +66,10 @@ type AdData struct {
 	TargetAddition []AdAction `json:"target_addition,omitempty"`
 	Target         string     `json:"target,omitempty"`
 	ImageUrl       string     `json:"image_url,omitempty"`
-	Duration       int64      `json:"duration"`
+	Duration       int64      `json:"duration,omitempty"`
 	VideoUrl       string     `json:"video_url,omitempty"`
 	JsOrderId      int64      `json:"js_order_id,omitempty"`
-	UserAgent      string     `json:"user_agent, omitempty"`
+	UserAgent      string     `json:"user_agent,omitempty"`
 	DpReport       string     `json:"dp_report,omitempty"`
 	Dp             string     `json:"dp,omitempty"`
 	OrderName      string     `json:"order_name,omitempty"`
@@ -112,19 +112,17 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 	}
 
 	client := &http.Client{}
-	fmt.Printf("req url: %s\n", reqUrl)
+	log.WithField("request_id", dsp.RequestId).Infof("req url: %s", reqUrl)
 	req, err := http.NewRequest("GET", reqUrl, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	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("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")
@@ -132,17 +130,22 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 
 	resp, err := client.Do(req)
 	if err != nil {
+		log.WithField("request_id", dsp.RequestId).Errorf("http failed: %s", err)
 		return nil, err
 	}
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
-	fmt.Printf("rsp body: %s\n", body)
 	if err != nil {
+		log.WithField("request_id", dsp.RequestId).Errorf("read http body failed: %s", err)
 		return nil, err
 	}
+
+	log.WithField("request_id", dsp.RequestId).Infof("rsp: %s", string(body))
+
 	rsp := XiaoMiAdInfoRsp{}
-	err = json.Unmarshal(body, &rsp)
+	err = json.Unmarshal([]byte(string(body)), &rsp)
 	if err != nil {
+		log.WithField("request_id", dsp.RequestId).Errorf("unmarshal http rsp failed: %s, rsp: %s", err, string(body))
 		return nil, err
 	}
 

adslib/device/device.go

@@ -110,9 +110,11 @@ func GetMiDeviceConf(ip string, randNum int, specialDeviceNum int) (*DeviceConf,
 	}
 
 	rspBytes, _ := redis.Bytes(rsp, err)
+	rspStr := strings.ReplaceAll(string(rspBytes), "u", "")
+	rspStr = strings.ReplaceAll(string(rspStr), "'", "\"")
 
 	d := DeviceConf{}
-	err = json.Unmarshal(rspBytes, &d)
+	err = json.Unmarshal([]byte(rspStr), &d)
 	if err != nil {
 		return nil, redisKey, err
 	}

adslib/redis_data/redis_data.go

@@ -8,6 +8,7 @@ import (
 	"miads/adslib"
 	"miads/adslib/ads_redis"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -54,9 +55,12 @@ func GetChannelFlag(reqSource string, business string) (ChannelFlag, error) {
 	}
 
 	rspBytes, _ := redis.Bytes(rsp, err)
+	rspStr := strings.ReplaceAll(string(rspBytes), "'", "\"")
+	rspStr = strings.ReplaceAll(rspStr, "L", "")
+	log.Info(rspStr)
 
 	channelFlag := ChannelFlag{}
-	err = json.Unmarshal(rspBytes, &channelFlag)
+	err = json.Unmarshal([]byte(rspStr), &channelFlag)
 	if err != nil {
 		return ChannelFlag{}, err
 	}