Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dt_analysis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoyanbin
dt_analysis
Commits
25b805b8
Commit
25b805b8
authored
Sep 02, 2023
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
e434b1d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
14 deletions
+22
-14
survey.go
api/mobile/survey.go
+2
-1
ipaddr.go
service/ipaddr.go
+6
-5
common_api.go
utils/common_api.go
+3
-3
serialize.go
utils/serialize.go
+11
-5
No files found.
api/mobile/survey.go
View file @
25b805b8
...
...
@@ -47,7 +47,8 @@ func CreateSurveyLog(c *gin.Context) {
var
req
model
.
SurveyLog
_
=
c
.
ShouldBindJSON
(
&
req
)
ipData
,
_
:=
service
.
GetIpaddr
(
c
.
ClientIP
())
//ipData, _ := service.GetIpaddr(c.ClientIP())
ipData
,
_
:=
service
.
GetIpaddr
(
"125.34.219.138"
)
fmt
.
Println
(
ipData
)
req
.
CreateTime
=
utils
.
NowTime
()
...
...
service/ipaddr.go
View file @
25b805b8
...
...
@@ -22,7 +22,7 @@ func GetIpaddr(ip string) (utils.IpData, string) {
beforetime
:=
nowtime
.
Add
(
d
)
global
.
GVA_DB
.
Table
(
"ipaddr"
)
.
Where
(
"ip = ? and code = ? and create_time > "
,
ip
,
4
00
,
beforetime
)
.
First
(
&
data
)
global
.
GVA_DB
.
Table
(
"ipaddr"
)
.
Where
(
"ip = ? and code = ? and create_time > "
,
ip
,
2
00
,
beforetime
)
.
First
(
&
data
)
if
data
.
Id
>
0
{
ipDataDb
:=
new
(
utils
.
IpData
)
utils
.
UnserislizeJson
(
data
.
Data
,
ipDataDb
)
...
...
@@ -32,10 +32,11 @@ func GetIpaddr(ip string) (utils.IpData, string) {
ipData
:=
utils
.
GetIpaddr
(
ip
)
IpaddrData
:=
model
.
Ipaddr
{
Ip
:
ip
,
Code
:
ipData
.
Code
,
TaskNo
:
ipData
.
TaskNo
,
Data
:
string
(
utils
.
SerializeJson
(
ipData
.
Data
)),
Ip
:
ip
,
Code
:
ipData
.
Code
,
TaskNo
:
ipData
.
TaskNo
,
Data
:
string
(
utils
.
SerializeJson
(
ipData
.
Data
)),
CreateTime
:
utils
.
NowTime
(),
}
global
.
GVA_DB
.
Table
(
"ipaddr"
)
.
Create
(
&
IpaddrData
)
...
...
utils/common_api.go
View file @
25b805b8
...
...
@@ -7,10 +7,10 @@ import (
func
GetIpaddr
(
ip
string
)
GetIpaddrReply
{
url
:=
global
.
GVA_CONFIG
.
Ipaddr
.
Url
data
:=
new
(
GetIpaddrReq
)
data
.
Ip
=
ip
data
:=
map
[
string
]
string
{}
data
[
"ip"
]
=
ip
resp
:=
GetIpaddrPost
(
url
,
data
,
global
.
GVA_CONFIG
.
Ipaddr
.
Appcode
,
1
)
resp
:=
GetIpaddrPost
Url
(
url
,
data
,
global
.
GVA_CONFIG
.
Ipaddr
.
Appcode
,
1
)
reply
:=
new
(
GetIpaddrReply
)
...
...
utils/serialize.go
View file @
25b805b8
...
...
@@ -193,11 +193,16 @@ func PostWithFormData(method, url string, postData *map[string]string, token str
return
string
(
data
)
}
func
GetIpaddrPost
(
url
string
,
data
interface
{}
,
token
string
,
isPrt
int
)
string
{
func
GetIpaddrPost
Url
(
posturl
string
,
data
map
[
string
]
string
,
token
string
,
isPrt
int
)
string
{
// 超时时间:10秒
client
:=
&
http
.
Client
{
Timeout
:
10
*
time
.
Second
}
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
)
...
...
@@ -205,14 +210,15 @@ func GetIpaddrPost(url string, data interface{}, token string, isPrt int) string
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
!=
""
{
reqest
.
Header
.
Add
(
"Authorization"
,
"APPCODE "
+
token
)
//fmt.Println("token:" + token)
}
reqest
.
Header
.
Add
(
"Content-Type"
,
"application/
json
"
)
reqest
.
Header
.
Add
(
"Connection"
,
"keep-alive"
)
reqest
.
Header
.
Add
(
"Content-Type"
,
"application/
x-www-form-urlencoded
"
)
//
reqest.Header.Add("Connection", "keep-alive")
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment