逻辑初步完成

.idea/dictionaries/jiantaoli.xml

@@ -2,10 +2,23 @@
   <dictionary name="jiantaoli">
     <words>
       <w>admd</w>
+      <w>andrioid</w>
       <w>androidid</w>
+      <w>arsi</w>
+      <w>dalvik</w>
+      <w>gelf</w>
+      <w>idfa</w>
       <w>immd</w>
       <w>ipdd</w>
       <w>kuxin</w>
+      <w>miao</w>
+      <w>miui</w>
+      <w>moyuntv</w>
+      <w>rstrip</w>
+      <w>sismember</w>
+      <w>videofinish</w>
+      <w>videoopen</w>
+      <w>videotimer</w>
       <w>zhiku</w>
       <w>ziyou</w>
     </words>

ads_handler.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"hash"
 	"math/rand"
 	"miads/adslib"
 	"miads/adslib/addata"
@@ -22,8 +21,6 @@ import (
 	"time"
 )
 
-var SECERET_KEY = "%videoopen%!@#$%"
-
 type Response struct {
 	Result    int    `json:"result"`
 	Msg       string `json:"msg"`
@@ -34,7 +31,7 @@ type Response struct {
 func adsHandler(c *gin.Context) {
 	c.Header("Content-Type", "application/json")
 
-	request := Request{}
+	request := adslib.Request{}
 	request.Parse(c)
 	//uaClientOrigin := utils.GetArgument(c, "ua","")
 	//originMac := utils.GetArgument(c, "mac","")
@@ -141,9 +138,9 @@ func adsHandler(c *gin.Context) {
 		}
 
 		hour, _ := strconv.Atoi(time.Now().Format("01"))
-		tmpCrontrolInterval, ok := freqControlConf.GetControlTime(hour)
+		tmpControlInterval, ok := freqControlConf.GetControlTime(hour)
 		if ok {
-			freqControlInterval = tmpCrontrolInterval
+			freqControlInterval = tmpControlInterval
 		}
 	}
 
@@ -311,7 +308,7 @@ func adsHandler(c *gin.Context) {
 	dspInfo.Init()
 	dspInfo.DspCityCode = cityCode
 	dspInfo.Imei = imei
-	dspInfo.OriginImei = request.Imei
+	dspInfo.OriginImei = originImei
 	dspInfo.OsVersion = request.OsVersion
 	dspInfo.Mac = strings.ToUpper(request.Mac)
 	dspInfo.OriginMac = request.Mac
@@ -353,22 +350,20 @@ func adsHandler(c *gin.Context) {
 	}
 
 	var adData *addata.AdData
-	var xiaomiResponse []addata.XiaomiAdData
-	xiaomiRspAction := make(map[string]int, 100)
-	var adDataNum int
 
 	// 非频率控制，设备黑名单，ip黑名单，白名单渠道,并且替换了小米设备的
-	if canRequest && !isBlackImei && reqChannelFlag.ChannelFlag == 1 && flowFlag == 1 && !isIpBlack && advertiser == "xiaomi" && request.ReqSource != "" && !isBlackImei && !needControl && (replaceFlag == 1 || request.IsMiDevice()) {
-		adData, xiaomiResponse, xiaomiRspAction, adDataNum, err = addata.GetAdsInfos(&dspInfo, advertiser)
+	if canRequest && !isBlackImei && reqChannelFlag.ChannelFlag == 1 && flowFlag == 1 && !isIpBlack && advertiser == "xiaomi" && request.ReqSource != "" && !needControl && (replaceFlag == 1 || request.IsMiDevice()) {
+		adData, err = addata.GetAdsInfos(&dspInfo, advertiser)
 	}
 
 	canMixFlag := 0
 	xiaomiResponseFlag := 0
 	response := Response{}
 	if adData != nil && len(adData.TargetAddition) > 1 {
+		xiaomiResponseFlag = 1
 		realTarget := ""
 		if adData.Target != "" {
-			md5Skip := utils.Md5(addata.Target)
+			md5Skip := utils.Md5(adData.Target)
 			conf := adslib.GetConf()
 			realTarget = conf.Host + fmt.Sprintf("?action=LOADING&req_source=%s&advertiser=video&skip=%s&brand=%s&request_id=%s&skip_other=%s",
 				dspInfo.ReqSource, "", dspInfo.Brand, dspInfo.RequestId, md5Skip)
@@ -381,7 +376,7 @@ func adsHandler(c *gin.Context) {
 		adData.UserAgent = uaClient
 
 		if dspInfo.ReqSource == "kuxin" && adData.Target != "" {
-			adData.DpReport = fmt.Sprintf("%s?action=DP_CLICK&advertiser=video&req_source=%s", common.get_request_host(None), dspInfo.ReqSource)
+			adData.DpReport = fmt.Sprintf("%s?action=DP_CLICK&advertiser=video&req_source=%s", adslib.GetConf().HostIos, dspInfo.ReqSource)
 			adData.Dp = adslib.GetConf().DpTest
 		}
 		if dspInfo.SendPhoneType == 0 {
@@ -427,7 +422,8 @@ 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 {
-				return err
+				c.String(404, err.Error())
+				return
 			}
 		}
 
@@ -445,19 +441,12 @@ func adsHandler(c *gin.Context) {
 		} else {
 			jsonBytes, err := json.Marshal(*adData)
 			if err != nil {
-				return err
+				c.String(404, err.Error())
+				return
 			}
-			encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(SECERET_KEY))
+			encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(adslib.GetConf().SecretKey))
 			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
@@ -467,18 +456,25 @@ func adsHandler(c *gin.Context) {
 			response.Msg = "ok"
 		}
 		// 增加打底广告
-		if (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") && !needCotrol == 1 && !isBlackImei {
+		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 {
-				return err
+				c.String(404, err.Error())
+				return
 			}
+
 			// 定投没有就跑其他的
 			if customAdData == nil {
 				customAdData, err = addata.GetCustomAdsInfos(&dspInfo, advertiser, 0, 1, xiaomiResponseFlag)
 				if err != nil {
-					return err
+					c.String(404, err.Error())
+					return
 				}
 			}
 			device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "ADS_ZIYOU_GET", cityCode) // 广告获取成功
@@ -487,15 +483,6 @@ func adsHandler(c *gin.Context) {
 			}
 
 			if customAdData != nil && (shortMessage == "ads_vast_response" || shortMessage == "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)
-
 				adDataBytes, err := json.Marshal(*adData)
 				if err != nil {
 					fmt.Sprintf("marshal addata failed: %s\n", err)
@@ -575,9 +562,9 @@ func adsHandler(c *gin.Context) {
 						c.String(404, err.Error())
 						return
 					}
-					encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(SECERET_KEY))
+					encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(adslib.GetConf().SecretKey))
 					response.AdsResult = encryptData
-					//self.report_graylog(json.dumps(extra_item))
+					graylog.ReportGrayLog(request, dspInfo, 0, 0)
 					rspBytes, err := json.Marshal(response)
 					if err != nil {
 						c.String(404, err.Error())
@@ -588,7 +575,7 @@ func adsHandler(c *gin.Context) {
 				} else {
 					customAdData.Result = 0
 					customAdData.Msg = "ok"
-					//self.report_graylog(json_response)
+					graylog.ReportGrayLog(request, dspInfo, 0, 0)
 					rspBytes, err := json.Marshal(customAdData)
 					if err != nil {
 						c.String(404, err.Error())
@@ -608,7 +595,7 @@ func adsHandler(c *gin.Context) {
 	}
 
 	if request.NewAdsFlag == 0 {
-		//self.report_graylog(json_response)
+		graylog.ReportGrayLog(request, dspInfo, 0, 0)
 	}
 	device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "DS_REQ", cityCode) // 所有请求
 	c.String(200, string(rspBytes))

adslib/addata/custom.go

@@ -41,7 +41,7 @@ func CombineOrderBy(adData *AdData, advertiser string, dsp *utils.DspParam) (*Ad
 
 	if hasClickTarget {
 		adData.Target = customAdData.Target
-		adData.JsOrderId = customAdData.JsOrderID
+		adData.JsOrderId = customAdData.JsOrderId
 	}
 	return adData, nil
 }
@@ -205,7 +205,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fi
 	if curMinuteFinishedDispatchCnt < curMinuteNeedDispatchCnt {
 		data := AdData{
 			Duration:  5,
-			JsOrderID: order.JsOrderID,
+			JsOrderId: order.JsOrderID,
 			OrderName: order.Title,
 			UserAgent: dsp.UaOrigin,
 		}

adslib/addata/xiaomi.go

@@ -101,7 +101,7 @@ func getAdsReqUrl(dsp *utils.DspParam) string {
 }
 
 // 获取广告信息
-func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdData, map[string]int, int, error) {
+func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 	reqUrl := getAdsReqUrl(dsp)
 
 	if dsp.SendPhoneType == 0 {
@@ -114,7 +114,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 	fmt.Printf("req url: %s\n", reqUrl)
 	req, err := http.NewRequest("GET", reqUrl, nil)
 	if err != nil {
-		return nil, nil, nil, 0, err
+		return nil,  err
 	}
 
 	req.Header.Set(",authority", "m.video.xiaomi.com")
@@ -131,18 +131,18 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return nil, nil, nil, 0, err
+		return nil, err
 	}
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
 	fmt.Printf("rsp body: %s\n", body)
 	if err != nil {
-		return nil, nil, nil, 0, err
+		return nil,  err
 	}
 	rsp := XiaoMiAdInfoRsp{}
 	err = json.Unmarshal(body, &rsp)
 	if err != nil {
-		return nil, nil, nil, 0, err
+		return nil, err
 	}
 
 	adsDataNum := len(rsp.Data)
@@ -151,7 +151,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 	}
 
 	if rsp.Result != 1 {
-		return nil, nil, xiaomiResponseAction, adsDataNum, nil
+		return nil, nil
 	}
 
 	// bom渠道不处理
@@ -171,7 +171,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 	}
 
 	if len(rsp.Data) == 0 {
-		return nil, nil, xiaomiResponseAction, 0, nil
+		return nil, nil
 	}
 	///last_infos = xiaomi_mix.xiaomi_fuse(data, dsp.req_source)
 
@@ -193,10 +193,10 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 			continue
 		}
 
-		targetParms := targetParseUrl.Query()
+		targetParams := targetParseUrl.Query()
 
-		targetUrl := targetParms.Get("url")
-		event := targetParms.Get("event")
+		targetUrl := targetParams.Get("url")
+		event := targetParams.Get("event")
 
 		if targetUrl != "" {
 			switch event {
@@ -218,7 +218,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 		}
 
 		if event == "VIDEO_TIMER" {
-			timeStr := targetParms.Get("time")
+			timeStr := targetParams.Get("time")
 			if timeStr != "" {
 				videoTimeDuration, _ := strconv.Atoi(timeStr)
 				dsp.VideoTimeDuration = videoTimeDuration
@@ -260,7 +260,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 
 	fmt.Printf("%+v, addata_num: %d\n", xiaomiResponseAction, adsDataNum)
 	if len(gotoUrls) == 0 {
-		return nil, rsp.Data, xiaomiResponseAction, adsDataNum, nil
+		return nil, nil
 	}
 
 	fmt.Printf("goto urls: %+v\nshow urls: %+v\nclick_urls: %+v\nclose urls: %+v\nvideo finish urls: %+v\nimagurls: %+v\nvideo urls:%+v\n",
@@ -268,7 +268,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 
 	adsData, err := CombineLastAdsInfos(dsp, advertiser, gotoUrls, showUrls, clickUrls, closeUrls, videoFinishUrls, videoTimerUrls, imageUrls, videoUrls)
 	if err != nil {
-		return nil, nil, nil, 0, err
+		return nil, err
 	}
 
 	fmt.Printf("addata: %+v\n", adsData)
@@ -278,7 +278,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, []XiaomiAdDat
 	} else if dsp.SendPhoneType == 1 {
 		redis_data.SetAdsRequestNum(advertiser, 1)
 	}
-	return adsData, rsp.Data, xiaomiResponseAction, adsDataNum, nil
+	return adsData, nil
 }
 
 func getActionsConf(advertiser string) []string {
@@ -303,11 +303,11 @@ func getDurationConf(advertiser string) int {
 
 func getCombinationActionsConf(advertiser string) []adslib.CombinationActionsConf {
 	svrConf := adslib.GetConf()
-	combi_actions, ok := svrConf.CombinationActions[advertiser]
+	combinationActions, ok := svrConf.CombinationActions[advertiser]
 	if !ok {
 		return []adslib.CombinationActionsConf{}
 	}
-	return combi_actions
+	return combinationActions
 }
 
 // 组装最后的广告信息

adslib/addata/xiaomi_extra.go

@@ -1,204 +0,0 @@
-package addata
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"miads/adslib/graylog"
-	"miads/adslib/utils"
-	"net/http"
-	"net/url"
-	"strconv"
-)
-
-// 获取请求的信息
-func getRequestInfo(dsp utils.DspParam) (string,error) {
-	ipdd := combineIpdd(dsp)
-	url := fmt.Sprintf("http://delivery.maihehd.com/d/vast/3.0?pos=147&ip=%s&ipdd=%s", dsp.Ip, ipdd)
-
-	client := &http.Client{}
-	fmt.Printf("req url: %s\n", url)
-	req, err := http.NewRequest("GET",  url, nil)
-	if err != nil {
-		return "", err
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	fmt.Printf("rsp body: %s\n", body)
-	if err != nil {
-		return "", err
-	}
-
-	graylog.LogApi("ads_mi_extra_res", string(body), "", "")
-	return string(body), nil
-}
-
-// 组装ipdd
-func combineIpdd(dsp utils.DspParam) string {
-	admd5 := utils.Md5(dsp.Androidid)
-	ipdd := url.Values{}
-	ipdd.Set("device_type", strconv.Itoa(0))
-	ipdd.Set("os_version", dsp.OsVersion)
-	ipdd.Set("os", strconv.Itoa(1))
-	ipdd.Set("imei", dsp.OriginImei)
-	ipdd.Set("immd5", dsp.RealMd5Imei)
-	ipdd.Set("androidid", dsp.Androidid)
-	ipdd.Set("admd5", admd5)
-	ipdd.Set("mac", dsp.Mac)
-	ipdd.Set("device_name", dsp.Model)
-	ipdd.Set("sr", dsp.ScreenSize)
-
-	return ipdd.Encode()
-}
-
-// 将xml转为array
-func GetXiaomiExtraAdsInfo(dsp utils.DspParam) {
-	advertiser := "vast"
-	xmlResult = getRequestInfo(dsp)
-try:
-	soup = BeautifulSoup(xml_result, 'xml')
-except:
-	raise gen.Return(({},[]))
-	// 获取视频总时长duration
-try:
-	duration_arr = str(soup.Duration.text).split(":")
-except:
-	raise gen.Return(({},[]))
-	video_all_time = int(duration_arr[0])*3600+int(duration_arr[1])*60+int(duration_arr[2])
-	### 获取点击率
-	click_rate = common.my_int(soup.ClickRate.text)
-	ads_ua = dsp_info.ua
-	### 获取md5_imei
-	if dsp_info.replace_flag==0:
-	md5_imei = hashlib.md5(dsp_info.imei).hexdigest()
-	else:
-	md5_imei = dsp_info.imei
-	track_arr = soup.find_all("Tracking")
-	action_infos = []
-	percent_duration = int(video_all_time/4.0)
-	click_rand_duration = random.randint(5,10)
-	first_flag = 0
-	second_flag = 0
-	third_flag = 0
-	start_urls = []
-	complete_urls = []
-	firstQuartile_urls = []
-	midpoint_urls = []
-	thirdQuartile_urls = []
-	for track_info in track_arr:
-	url = track_info.text
-	url = url.replace('__IMEI__',md5_imei)
-	event_name = track_info['event']
-	if event_name == "start":
-	start_urls.append(url)
-	if event_name == "complete":
-	complete_urls.append(url)
-	if event_name == "firstQuartile":
-	first_flag = 1
-	firstQuartile_urls.append(url)
-	if event_name == "midpoint":
-	second_flag = 1
-	midpoint_urls.append(url)
-	if event_name == "thirdQuartile":
-	third_flag = 1
-	thirdQuartile_urls.append(url)
-	### 排序
-	if len(start_urls):
-	action_event_dict={}
-	action_event_dict['type']="start"
-	action_event_dict['duration']=percent_duration
-	action_event_dict['urls']=start_urls
-	action_event_dict['weight']=100
-	action_infos.append(action_event_dict)
-	if len(firstQuartile_urls):
-	action_event_dict={}
-	action_event_dict['type']="firstQuartile"
-	action_event_dict['duration']=percent_duration
-	action_event_dict['urls']=firstQuartile_urls
-	action_event_dict['weight']=90
-	action_event_dict['timer_flag']=1
-	action_infos.append(action_event_dict)
-	if len(midpoint_urls):
-	action_event_dict={}
-	action_event_dict['type']="midpoint"
-	action_event_dict['duration']=percent_duration
-	action_event_dict['urls']=midpoint_urls
-	action_event_dict['weight']=80
-	action_event_dict['timer_flag']=2
-	action_infos.append(action_event_dict)
-	if len(thirdQuartile_urls):
-	action_event_dict={}
-	action_event_dict['type']="thirdQuartile"
-	action_event_dict['duration']=percent_duration
-	action_event_dict['urls']=thirdQuartile_urls
-	action_event_dict['weight']=70
-	action_event_dict['timer_flag']=3
-	action_infos.append(action_event_dict)
-	if len(complete_urls):
-	action_event_dict={}
-	action_event_dict['type']="complete"
-	action_event_dict['duration']=percent_duration
-	action_event_dict['urls']=complete_urls
-	action_event_dict['weight']=60
-	action_infos.append(action_event_dict)
-	action_infos = sorted(action_infos, key=itemgetter('weight'), reverse=True)
-	### 修正每个action的duration
-	for action_info in action_infos:
-	### 控制view的时间
-	if action_info['type']=="start" and first_flag==1:
-	action_info['duration']=percent_duration
-	elif action_info['type']=="start" and first_flag==0:
-	action_info['duration']=video_all_time
-	### 控制第一个timer时间
-	if action_info['type']=="firstQuartile" and action_info['timer_flag']==1 and second_flag==1:
-	action_info['duration']=percent_duration
-	elif action_info['type']=="firstQuartile" and action_info['timer_flag']==1 and second_flag==0:
-	action_info['duration']=video_all_time-percent_duration
-	### 控制第二个timer时间
-	if action_info['type']=='midpoint' and action_info['timer_flag']==2 and third_flag==1:
-	action_info['duration']=percent_duration
-	elif action_info['type']=='midpoint' and action_info['timer_flag']==2 and third_flag==0:
-	action_info['duration']=video_all_time-percent_duration*2
-	click_url = soup.find('ClickThrough').text
-	click_arr = soup.find_all('ClickTracking')
-	click_urls = []
-	for click_info in click_arr:
-	url = click_info.text
-	click = url.replace('__IMEI__',md5_imei)
-	click_urls.append(click)
-	click_event_dict = {}
-	has_click = 0
-	if click:
-	click_event_dict['type'] = "CLICK"
-	click_event_dict['duration']=click_rand_duration
-	click_event_dict['urls'] = click_urls
-	### 先组装click是否可以下发
-	click_info_dict = combine_ads_action_infos(click_urls,advertiser,dsp_info,"CLICK",1,click_rate,click_rand_duration)
-	if len(click_info_dict['urls']):
-	has_click=1
-	last_action_infos = []
-	sum_duration = 0
-	for action_info in action_infos:
-	action_info_dict = combine_ads_action_infos(action_info['urls'],advertiser,dsp_info,action_info['type'],0,click_rate,action_info['duration'])
-	sum_duration+=action_info['duration']
-	last_action_infos.append(action_info_dict)
-	if has_click and sum_duration>=click_rand_duration:
-	last_action_infos.append(click_info_dict)
-	redis_tools.set_ads_distribute_action_num(advertiser,'CLICK')
-	break
-	if len(last_action_infos):
-	redis_tools.set_ads_request_num(advertiser)
-	ads_item = {}
-	ads_item['target_addition'] = last_action_infos
-	ads_item['target'] = click_url
-	ads_item['image_url'] = ""
-	ads_item['duration'] = video_all_time
-	ads_item['video_url'] = ""
-	ads_item['user_agent'] = ads_ua
-	raise gen.Return((ads_item,[]))
-}

adslib/config.go

@@ -7,7 +7,7 @@ import (
 
 type SvrConf struct {
 	HostIos            string                                `toml:"Host_Ios"`
-	HostAndoird        string                                `toml:"Host_Andoird"`
+	HostAndroid        string                                `toml:"Host_Android"`
 	Host               string                                `toml:"Host"`
 	HostScript         string                                `toml:"Host_script"`
 	HostMiao           string                                `toml:"Host_miao"`
@@ -21,6 +21,7 @@ type SvrConf struct {
 	AdsDuration        map[string]int                        `toml:"Ads_Duration"`
 	ActionWeight       ActionWeight                          `toml:"action_weight"`
 	CombinationActions map[string][]CombinationActionsConf   `toml:"combination_actions"`
+	SecretKey          string                                `toml:"secret_key"`
 }
 type FlogControlItem struct {
 	Percent  int `toml:"percent"`
@@ -46,7 +47,7 @@ var once sync.Once
 
 func GetConf() *SvrConf {
 	once.Do(func () {
-		_, err := toml.DecodeFile("../../conf/config.toml", &svrConf)
+		_, err := toml.DecodeFile("./conf/config.toml", &svrConf)
 		if err != nil {
 			panic(err)
 		}

adslib/graylog/graylog.go

@@ -1,8 +1,13 @@
 package graylog
+
 import (
 	"encoding/json"
-	"github.com/gin-gonic/gin"
+	"fmt"
 	"github.com/robertkowalski/graylog-golang"
+	"miads/adslib"
+	"miads/adslib/utils"
+	"net/url"
+	"time"
 )
 var grayLog  *gelf.Gelf
 
@@ -18,6 +23,7 @@ func init() {
 
 func Log(log interface{}) {
 	logStr, _ := json.Marshal(log)
+	fmt.Printf("graylog: %s\n", logStr)
 	grayLog.Log(string(logStr))
 }
 
@@ -37,54 +43,36 @@ func LogApi(shortMsg string, desc string, extraDesc string, reqSource string) {
 }
 
 // 发送返回日志
-func ReportGrayLog(c *gin.Context, uid int, response string, jsonFlag int) {
-	path := c.Request.URL.Path
-	reqTs := c.Request.Time()
-	ip = req.headers.get('X-Forwarded-For',"")
-	req_source_ip = req_data.get('ip',[])
-	if len(req_source_ip):
-	check_req_source_flag = redis_ip.check_req_source(req_data.get('req_source',[])[0])
-	if check_req_source_flag:
-	ip = req_source_ip[0]
-	if ip=="":
-	ip = self.request.headers.get("X-Real-IP","")
-	if ip=="":
-	ip = req.remote_ip
-	if ip.find(",") > 0:
-	ip = ip.split(",")[0]
-	device_id = req_data.get('device_id,', '')
-	request = urllib.unquote(urllib.urlencode(req_data, 'utf-8'))
-	province,city,city_code = ip_location_helper.get_region_by_ip(ip)
-	gelf_data = {}
-	gelf_data['short_message'] = 'ads_api_log'
-	gelf_data['_user_id'] = user_id
-	gelf_data['_device_id'] = device_id
-	gelf_data['_ip'] = ip
-	gelf_data['_uri'] = path
-	gelf_data['_province']=province
-	gelf_data['_city']=city
-	gelf_data['_city_code']=city_code
-	for key,value in req_data.items():
-	if str(key) in ['ip']:
-	continue
-	gelf_data['_{0}'.format(key)] = common.my_str(value[0])
-	req_len = 102400
-	gelf_data['_request'] = request[0:req_len]
-	#json_response = json.dumps(response)
-	### 结果不上报了
-	json_response = ""
-	if len(json_response) < req_len and len(json_response) > 60:
-try:
-	json_response = json.dumps(
-		response, indent=4, sort_keys=True,
-		ensure_ascii=False).encode("utf-8")
-except:
-	send_try_except()
-try:
-	json_response = json_response.decode("utf-8")
-except:
-	pass
-	gelf_data['_response'] = json_response[0:req_len]
-	gelf_data['_response_time'] = round(req_ts * 1000.0, 2)
-	send_to_graylog_tornado(gelf_data, req=req, req_data=cur_req_data)
+func ReportGrayLog(req adslib.Request, dsp utils.DspParam, uid int, jsonFlag int) {
+	gelfData := make(map[string]interface{}, 100)
+	gelfData["short_message"] = "ads_api_log"
+	gelfData["_user_id"] = uid
+	gelfData["_device_id"] = req.DeviceId
+	gelfData["_ip"] = dsp.Ip
+	gelfData["_uri"] = req.QueryString
+	gelfData["_province"]=dsp.Province
+	gelfData["_city"]=dsp.City
+	gelfData["_city_code"]=dsp.DspCityCode
+
+	var reqData url.Values
+	if jsonFlag == 0 {
+		reqData, _ = url.ParseQuery(req.QueryString)
+	} else {
+		err := json.Unmarshal([]byte(req.Body), &reqData)
+		if err != nil {
+			fmt.Print("parse error")
+		}
+	}
+	for k, v := range reqData {
+		if k == "ip" {
+			continue
+		}
+		gelfData["_" + k] = v
+	}
+
+	gelfData["_request"] = reqData.Encode()
+	gelfData["_response"] = ""
+	gelfData["_response_time"] = time.Now().UnixNano() / 1000
+
+	Log(gelfData)
 }

request.go

@@ -1,13 +1,16 @@
-package main
+package adslib
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"io/ioutil"
 	"miads/adslib/encrypt"
 	"miads/adslib/utils"
 	"net/url"
 	"strings"
+	"time"
 )
 
 type Request struct {
@@ -24,12 +27,25 @@ type Request struct {
 	ReqSource   string `json:"req_source"`
 	Mac         string `json:"mac"`
 	ReqSourceIp string `json:"ip"`
+	DeviceId	string `json:"device_id"`
 
 	NewAdsFlag int64
 	content    string
+
+	RequestTime int64 `json:"-"`
+	QueryString string `json:"-"`
+	Body string `json:"-"`
 }
 
 func (self *Request) Parse(c *gin.Context) {
+	self.RequestTime = time.Now().Unix()
+	self.QueryString = c.Request.URL.RawQuery
+
+	body, _ := c.GetRawData()
+	self.Body = string(body)
+	// 取了body要塞回去
+	c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+
 	self.Imei = utils.GetArgument(c, "imei", "")
 	self.Idfa = utils.GetArgument(c, "idfa", "")
 	self.Model = utils.GetArgument(c, "model", "")
@@ -43,6 +59,7 @@ func (self *Request) Parse(c *gin.Context) {
 	self.ReqSource = utils.GetArgument(c, "req_source", "")
 	self.Mac = utils.GetArgument(c, "mac", "")
 	self.ReqSourceIp = utils.GetArgument(c, "ip", "")
+	self.DeviceId = utils.GetArgument(c, "device_id", "")
 
 	self.NewAdsFlag = utils.GetIntArgument(c, "new_ads_flag", 0)
 	self.content = utils.GetArgument(c, "ads_content", "")
@@ -50,7 +67,7 @@ func (self *Request) Parse(c *gin.Context) {
 
 	// 进行解密
 	if self.NewAdsFlag == 1 && self.content != "" {
-		contentDecode, err := encrypt.Decrypt(self.content, []byte(SECERET_KEY))
+		contentDecode, err := encrypt.Decrypt(self.content, []byte(GetConf().SecretKey))
 		if err != nil {
 			fmt.Printf("error: %s", err)
 			c.String(404, "decode failed")

adslib/utils/string.go

@@ -14,7 +14,7 @@ func Rstrip(str string) string {
 	return reg.ReplaceAllString(str, "")
 }
 
-func Hash(string) int {
+func Hash(s string) int {
 	v := int(crc32.ChecksumIEEE([]byte(s)))
 	if v >= 0 {
 		return v

go.mod

@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/BurntSushi/toml v0.3.1
+	github.com/beanstalkd/go-beanstalk v0.0.0-20200526060843-1cc502ecaf3c
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/jarcoal/httpmock v1.0.5

go.sum

@@ -1,5 +1,7 @@
 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/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=