add test

.idea/dictionaries/jiantaoli.xml

@@ -19,6 +19,7 @@
       <w>videofinish</w>
       <w>videoopen</w>
       <w>videotimer</w>
+      <w>xiafa</w>
       <w>zhiku</w>
       <w>ziyou</w>
     </words>

ads_handler.go

@@ -33,11 +33,8 @@ func adsHandler(c *gin.Context) {
 
 	request := adslib.Request{}
 	request.Parse(c)
-	//uaClientOrigin := utils.GetArgument(c, "ua","")
-	//originMac := utils.GetArgument(c, "mac","")
-	//clientImei := request.Imei
 
-	fmt.Printf("%+v", request)
+	fmt.Printf("%+v\n", request)
 	advertiser := "xiaomi"
 	uaClient := request.UaClient
 	// 获取ua
@@ -51,7 +48,7 @@ func adsHandler(c *gin.Context) {
 	// 获取ip
 	checkReqSourceFlag, err := ads_checker.CheckReqSource(request.ReqSource)
 	if err != nil {
-		c.String(404, "check req source failed")
+		c.String(404, "check req source failed: %s", err)
 		return
 	}
 
@@ -76,9 +73,10 @@ func adsHandler(c *gin.Context) {
 
 	ipInfo, err := ip2region.Ip2Region(ip)
 	if err != nil {
-		c.String(404, "ip 2 region failed")
+		c.String(404, "ip 2 region failed: %s", err)
 		return
 	}
+	fmt.Printf("ip 2 region: %s, %+v\n", ip, ipInfo)
 
 	// 上報
 	if request.NewAdsFlag == 1 {
@@ -115,7 +113,7 @@ func adsHandler(c *gin.Context) {
 
 	cityCode, err := city.GetCityCode(ipInfo.City)
 	if err != nil {
-		c.String(404, "get city code failed")
+		c.String(404, "get city code failed: %s", err)
 		return
 	}
 
@@ -422,7 +420,7 @@ func adsHandler(c *gin.Context) {
 		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 {
-				c.String(404, err.Error())
+				c.String(404, "combine order failed: %s", err.Error())
 				return
 			}
 		}
@@ -441,7 +439,7 @@ func adsHandler(c *gin.Context) {
 		} else {
 			jsonBytes, err := json.Marshal(*adData)
 			if err != nil {
-				c.String(404, err.Error())
+				c.String(404, "marshal AdData failed: %s", err.Error())
 				return
 			}
 			encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(adslib.GetConf().SecretKey))
@@ -458,14 +456,9 @@ func adsHandler(c *gin.Context) {
 		// 增加打底广告
 		if (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") && !needControl && !isBlackImei {
 			shortMessage := "kong"
-			if err != nil {
-				c.String(404, err.Error())
-				return
-			}
-
 			customAdData, err := addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 0, xiaomiResponseFlag)
 			if err != nil {
-				c.String(404, err.Error())
+				c.String(404, "get custom ads info failed: %s", err.Error())
 				return
 			}
 
@@ -473,7 +466,7 @@ func adsHandler(c *gin.Context) {
 			if customAdData == nil {
 				customAdData, err = addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 1, xiaomiResponseFlag)
 				if err != nil {
-					c.String(404, err.Error())
+					c.String(404, "get fix custom ads info failed: %s", err.Error())
 					return
 				}
 			}
@@ -559,7 +552,7 @@ func adsHandler(c *gin.Context) {
 
 					jsonBytes, err := json.Marshal(customAdData)
 					if err != nil {
-						c.String(404, err.Error())
+						c.String(404, "marsha custom addata failed: %s", err.Error())
 						return
 					}
 					encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(adslib.GetConf().SecretKey))
@@ -567,7 +560,7 @@ func adsHandler(c *gin.Context) {
 					graylog.ReportGrayLog(request, dspInfo, 0, 0)
 					rspBytes, err := json.Marshal(response)
 					if err != nil {
-						c.String(404, err.Error())
+						c.String(404, "marshal Response failed: %s", err.Error())
 						return
 					}
 					c.String(200, string(rspBytes))

adslib/addata/xiaomi_test.go

@@ -93,7 +93,7 @@ func TestGetAdsInfos(t *testing.T) {
 	adslib.GetConf()
 
 	fmt.Printf("dsp: %+v", dsp)
-	addata, d, d1, num, err := GetAdsInfos(&dsp, advertiser)
-	fmt.Printf("%+v %+v %+v %+v %s", addata, d, d1, num, err)
+	addata, err := GetAdsInfos(&dsp, advertiser)
+	fmt.Printf("%+v %s", addata, err)
 }
 

adslib/device/device.go

@@ -29,7 +29,7 @@ func setTagLog(key string) {
 	defer conn.Close()
 
 	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
-	k := fmt.Sprint("{%s}___{%d}",key, dateInt)
+	k := fmt.Sprintf("{%s}___{%d}",key, dateInt)
 	conn.Do("INCR", k)
 	conn.Do("SADD", "fresh_all_keys", k)
 }

adslib/ip2region/ip2region.go

@@ -6,9 +6,11 @@ import (
 )
 
 func Ip2Region(ip string) (*ip2region.IpInfo, error) {
-	fmt.Println("err")
-	region, err := ip2region.New("./ip2region.db")
-	defer region.Close()
+	region, err := ip2region.New("./conf/ip2region.db")
+	if region != nil {
+		defer region.Close()
+	}
+
 	if err != nil {
 		fmt.Println(err)
 		return nil, err

adslib/ip2region/ip2region_test.go

@@ -0,0 +1,23 @@
+package ip2region
+
+import (
+	"fmt"
+	"github.com/lionsoul2014/ip2region/binding/golang/ip2region"
+	"testing"
+)
+
+var r *ip2region.Ip2Region
+func init() {
+	var err error
+	r, err = ip2region.New("../../conf/ip2region.db")
+	if err != nil {
+		fmt.Printf("%s", err)
+	}
+}
+
+func BenchmarkIp2Region(b *testing.B) {
+	ip := "36.161.36.225"
+	for i := 0; i < b.N; i++ {
+		r.MemorySearch(ip)
+	}
+}

adslib/request.go

@@ -19,9 +19,9 @@ type Request struct {
 	Model       string
 	Brand       string
 	ScreenSize  string `json:"screen_size"`
-	NetworkType int `json:"network_type"`
+	NetworkType int `json:"network_type,string"`
 	Androidid   string `json:"android_id"`
-	Platform    int `json:"platform"`
+	Platform    int `json:"platform,string"`
 	OsVersion   string `json:"os_version"`
 	UaClient    string `json:"ua"`
 	ReqSource   string `json:"req_source"`
@@ -77,7 +77,7 @@ func (self *Request) Parse(c *gin.Context) {
 		err = json.Unmarshal([]byte(contentDecode), self)
 		if err != nil {
 			fmt.Println(err)
-			c.String(404, "decode json body failed")
+			c.String(404, "decode json body failed: %s", err)
 			return
 		}