Commit 25b805b8 authored by haoyanbin's avatar haoyanbin

1

parent e434b1d4
...@@ -47,7 +47,8 @@ func CreateSurveyLog(c *gin.Context) { ...@@ -47,7 +47,8 @@ func CreateSurveyLog(c *gin.Context) {
var req model.SurveyLog var req model.SurveyLog
_ = c.ShouldBindJSON(&req) _ = c.ShouldBindJSON(&req)
ipData, _ := service.GetIpaddr(c.ClientIP()) //ipData, _ := service.GetIpaddr(c.ClientIP())
ipData, _ := service.GetIpaddr("125.34.219.138")
fmt.Println(ipData) fmt.Println(ipData)
req.CreateTime = utils.NowTime() req.CreateTime = utils.NowTime()
......
...@@ -22,7 +22,7 @@ func GetIpaddr(ip string) (utils.IpData, string) { ...@@ -22,7 +22,7 @@ func GetIpaddr(ip string) (utils.IpData, string) {
beforetime := nowtime.Add(d) beforetime := nowtime.Add(d)
global.GVA_DB.Table("ipaddr").Where("ip = ? and code = ? and create_time > ", ip, 400, beforetime).First(&data) global.GVA_DB.Table("ipaddr").Where("ip = ? and code = ? and create_time > ", ip, 200, beforetime).First(&data)
if data.Id > 0 { if data.Id > 0 {
ipDataDb := new(utils.IpData) ipDataDb := new(utils.IpData)
utils.UnserislizeJson(data.Data, ipDataDb) utils.UnserislizeJson(data.Data, ipDataDb)
...@@ -36,6 +36,7 @@ func GetIpaddr(ip string) (utils.IpData, string) { ...@@ -36,6 +36,7 @@ func GetIpaddr(ip string) (utils.IpData, string) {
Code: ipData.Code, Code: ipData.Code,
TaskNo: ipData.TaskNo, TaskNo: ipData.TaskNo,
Data: string(utils.SerializeJson(ipData.Data)), Data: string(utils.SerializeJson(ipData.Data)),
CreateTime: utils.NowTime(),
} }
global.GVA_DB.Table("ipaddr").Create(&IpaddrData) global.GVA_DB.Table("ipaddr").Create(&IpaddrData)
......
...@@ -7,10 +7,10 @@ import ( ...@@ -7,10 +7,10 @@ import (
func GetIpaddr(ip string) GetIpaddrReply { func GetIpaddr(ip string) GetIpaddrReply {
url := global.GVA_CONFIG.Ipaddr.Url url := global.GVA_CONFIG.Ipaddr.Url
data := new(GetIpaddrReq) data := map[string]string{}
data.Ip = ip data["ip"] = ip
resp := GetIpaddrPost(url, data, global.GVA_CONFIG.Ipaddr.Appcode, 1) resp := GetIpaddrPostUrl(url, data, global.GVA_CONFIG.Ipaddr.Appcode, 1)
reply := new(GetIpaddrReply) reply := new(GetIpaddrReply)
......
...@@ -193,11 +193,16 @@ func PostWithFormData(method, url string, postData *map[string]string, token str ...@@ -193,11 +193,16 @@ func PostWithFormData(method, url string, postData *map[string]string, token str
return string(data) return string(data)
} }
func GetIpaddrPost(url string, data interface{}, token string, isPrt int) string { func GetIpaddrPostUrl(posturl string, data map[string]string, token string, isPrt int) string {
// 超时时间:10秒 // 超时时间:10秒
client := &http.Client{Timeout: 10 * time.Second} client := &http.Client{Timeout: 10 * time.Second}
if isPrt == 1 { if isPrt == 1 {
fmt.Println("请求地址:" + url) fmt.Println("请求地址:" + posturl)
}
urlVal := url.Values{}
for k, v := range data {
urlVal.Add(k, v)
} }
jsonStr, _ := json.Marshal(data) jsonStr, _ := json.Marshal(data)
...@@ -205,14 +210,15 @@ func GetIpaddrPost(url string, data interface{}, token string, isPrt int) string ...@@ -205,14 +210,15 @@ func GetIpaddrPost(url string, data interface{}, token string, isPrt int) string
fmt.Println("请求数据:" + string(jsonStr)) fmt.Println("请求数据:" + string(jsonStr))
} }
reqest, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr)) postData := strings.NewReader(urlVal.Encode())
reqest, err := http.NewRequest("POST", posturl, postData)
if token != "" { if token != "" {
reqest.Header.Add("Authorization", "APPCODE "+token) reqest.Header.Add("Authorization", "APPCODE "+token)
//fmt.Println("token:" + token) //fmt.Println("token:" + token)
} }
reqest.Header.Add("Content-Type", "application/json") reqest.Header.Add("Content-Type", "application/x-www-form-urlencoded")
reqest.Header.Add("Connection", "keep-alive") //reqest.Header.Add("Connection", "keep-alive")
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return "" return ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment