Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
evm-store
Project overview
Project overview
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
wanli
evm-store
Commits
9b869e37
Commit
9b869e37
authored
Jul 26, 2021
by
wanli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix(): 修复json数据解码错误问题
parent
106b9d00
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
9 deletions
+13
-9
backend/view/monitor.py
backend/view/monitor.py
+9
-3
frontend/src/views/system/monitor.vue
frontend/src/views/system/monitor.vue
+1
-2
tools/build_out/tests/http_interval.py
tools/build_out/tests/http_interval.py
+3
-4
No files found.
backend/view/monitor.py
View file @
9b869e37
'''
Author: your name
Date: 2021-06-29 19:33:41
LastEditTime: 2021-07-2
5 17:18:11
LastEditTime: 2021-07-2
6 16:20:58
LastEditors: Please set LastEditors
Description: In User Settings Edit
FilePath:
\
evm-store
\b
ackend
\v
iew
\
monitor.py
...
...
@@ -337,9 +337,15 @@ class DeviceMessageHandler(BaseHandler):
logger
.
info
(
self
.
request
.
body
)
return
None
data
=
""
try
:
# data = tornado.escape.json_decode(self.request.body)
data
=
tornado
.
escape
.
json_decode
(
self
.
request
.
body
)
except
:
data
=
str
(
self
.
request
.
body
,
encoding
=
"ISO-8859-1"
)
try
:
# data = tornado.escape.json_decode(self.request.body)
# data = str(self.request.body, encoding="ISO-8859-1")
data
=
json
.
loads
(
data
)
logger
.
info
(
data
)
data
.
get
(
"system"
,
{})
.
update
({
...
...
@@ -354,9 +360,9 @@ class DeviceMessageHandler(BaseHandler):
NotifyHandler
.
broadcastMessage
(
data
)
self
.
write
(
json
.
dumps
({
'code'
:
100
,
'message'
:
'success'
}))
except
Exception
as
e
:
traceback
.
print_exc
()
logger
.
info
(
self
.
request
.
body
)
logger
.
error
(
e
)
traceback
.
print_exc
()
def
make_app
():
return
tornado
.
web
.
Application
([
...
...
frontend/src/views/system/monitor.vue
View file @
9b869e37
...
...
@@ -693,10 +693,9 @@ export default {
console
.
error
(
err
);
});
}
this
.
$message
.
success
(
res
.
msg
);
console
.
log
(
res
);
})
.
catch
((
err
)
=>
{
this
.
$message
.
error
(
err
.
msg
);
console
.
error
(
err
);
});
},
...
...
tools/build_out/tests/http_interval.py
View file @
9b869e37
'''
Author: your name
Date: 2021-07-22 19:01:41
LastEditTime: 2021-07-26 1
0:22:30
LastEditTime: 2021-07-26 1
3:05:19
LastEditors: Please set LastEditors
Description: In User Settings Edit
FilePath:
\
evm-store
\t
ools
\b
uild_out
\t
ests
\
http_interval.py
...
...
@@ -16,7 +16,7 @@ from threading import Timer, Thread
def
send_request
(
imei
):
payload
=
{
"system"
:
{
"free_size"
:
1769792
,
"free_space_size"
:
5156864
,
"used_space_size"
:
1134592
},
"lvgl"
:
{
"total_size"
:
100
,
"free_cnt"
:
50
,
"free_size"
:
23
,
"free_biggest_size"
:
53
,
"used_cnt"
:
78
,
"used_pct"
:
43
,
"frag_pct"
:
76
},
"lvgl"
:
{
"total_size"
:
100
,
"free_cnt"
:
50
,
"free_size"
:
23
,
"free_biggest_size"
:
53
,
"used_cnt"
:
78
,
"used_pct"
:
43
,
"frag_pct"
:
0
},
"evm"
:
{
"heap_total_size"
:
2097152
,
"heap_used_size"
:
575072
,
"heap_map_size"
:
8192
,
"stack_total_size"
:
102400
,
"stack_used_size"
:
1312
},
"image"
:
[
{
"uri"
:
"evue_launcher"
,
"length"
:
13515
,
"png_total_count"
:
0
,
...
...
@@ -94,8 +94,7 @@ def send_request(imei):
'png_file_size'
:
random
.
randint
(
0
,
10000
)
})
r
=
requests
.
post
(
"http://localhost:3000/api/v1/evm_store/monitor"
,
data
=
json
.
dumps
(
payload
))
r
=
requests
.
post
(
"http://store.evmiot.com/api/v1/evm_store/monitor"
,
data
=
json
.
dumps
(
payload
))
print
(
r
.
status_code
)
print
(
r
.
json
())
...
...
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