Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
inspect_report
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
zhengjinlei
inspect_report
Commits
916e7ea8
Commit
916e7ea8
authored
Mar 25, 2020
by
lvshibao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将用户名加入到req
parent
8ffa0ee6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
tasksapi.py
src/inspect_report/api/tasksapi.py
+2
-0
account.py
src/inspect_report/utils/account.py
+4
-1
No files found.
src/inspect_report/api/tasksapi.py
View file @
916e7ea8
...
@@ -242,6 +242,8 @@ class TasksApi(viewsets.ViewSet):
...
@@ -242,6 +242,8 @@ class TasksApi(viewsets.ViewSet):
:param req:
:param req:
:return:
:return:
"""
"""
username
=
req
.
data
.
get
(
'username'
,
''
)
logger
.
info
(
'username获取: '
+
username
)
task_id
=
req
.
data
.
get
(
'task'
,
''
)
task_id
=
req
.
data
.
get
(
'task'
,
''
)
start_date
=
req
.
data
.
get
(
'start_date'
,
(
datetime
.
now
()
+
timedelta
(
days
=-
1
))
.
strftime
(
'
%
Y-
%
m-
%
d'
))
start_date
=
req
.
data
.
get
(
'start_date'
,
(
datetime
.
now
()
+
timedelta
(
days
=-
1
))
.
strftime
(
'
%
Y-
%
m-
%
d'
))
end_date
=
req
.
data
.
get
(
'end_date'
,
datetime
.
now
()
.
strftime
(
'
%
Y-
%
m-
%
d'
))
end_date
=
req
.
data
.
get
(
'end_date'
,
datetime
.
now
()
.
strftime
(
'
%
Y-
%
m-
%
d'
))
...
...
src/inspect_report/utils/account.py
View file @
916e7ea8
...
@@ -7,6 +7,7 @@ from requests.cookies import RequestsCookieJar
...
@@ -7,6 +7,7 @@ from requests.cookies import RequestsCookieJar
from
functools
import
wraps
from
functools
import
wraps
from
rest_framework.request
import
Request
from
rest_framework.request
import
Request
from
rest_framework.response
import
Response
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -35,7 +36,9 @@ def get_account_info(func):
...
@@ -35,7 +36,9 @@ def get_account_info(func):
cookie_jar
=
transfer_cookie
(
req
.
COOKIES
)
cookie_jar
=
transfer_cookie
(
req
.
COOKIES
)
info
=
requests
.
get
(
'http://172.17.1.74:8248/getUserInfo'
,
cookies
=
cookie_jar
)
info
=
requests
.
get
(
'http://172.17.1.74:8248/getUserInfo'
,
cookies
=
cookie_jar
)
# logger.info('req中的query_params为: ', req.query_params)
# logger.info('req中的query_params为: ', req.query_params)
logger
.
info
(
'info中的text为: '
+
info
.
text
)
if
info
.
json
()[
'code'
]
!=
200
:
return
Response
({
'code'
:
-
1
,
'msg'
:
'未能获取用户信息'
})
req
.
data
.
set
(
'username'
,
info
.
json
()[
'data'
][
'userInfo'
][
'name'
])
return
func
(
obj
,
req
,
*
args
,
**
kw
)
return
func
(
obj
,
req
,
*
args
,
**
kw
)
return
account_info
return
account_info
...
...
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