Commit 8bd856c3 authored by wanli's avatar wanli

🐞 fix(修改资源监控模块): 用户先设备上线,用户也可以接收到消息

parent 0587447b
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
import os import os
import json import json
from .signal_manager import signalManager
from .setting import config
import logging import logging
from .setting import config
from .signal_manager import signalManager
from controller import initConnect from controller import initConnect
logger = logging.getLogger("ApplicationManager") logger = logging.getLogger(__name__)
def loadSettings(path=None): def loadSettings(path=None):
global config global config
......
''' '''
Author: your name Author: your name
Date: 2021-06-29 19:33:41 Date: 2021-06-29 19:33:41
LastEditTime: 2021-07-24 01:18:54 LastEditTime: 2021-07-24 09:49:30
LastEditors: Please set LastEditors LastEditors: Please set LastEditors
Description: In User Settings Edit Description: In User Settings Edit
FilePath: \evm-store\backend\view\monitor.py FilePath: \evm-store\backend\view\monitor.py
...@@ -167,9 +167,9 @@ class NotifyHandler(BaseWebsocket): ...@@ -167,9 +167,9 @@ class NotifyHandler(BaseWebsocket):
className = self.__class__.__name__ className = self.__class__.__name__
message = json.loads(message) message = json.loads(message)
# 判断消息类型 # 判断消息类型
if message.get("type"): if message.get("type") and message.get("token"):
# 获取token值,检验正确与否,获取uuid # 获取token值,检验正确与否,获取uuid
payload = jwt.decode(message.get("token"), config['SECRET_KEY'], verify=True, algorithms=['HS256'], options={'require': ['exp', 'iss', 'sub', 'aud', 'iat', 'data']}, audience="bytecode") payload = jwt.decode(message.get("token"), config['SECRET_KEY'], verify=True, algorithms=['HS256'], options={ 'verify_aud': False })
# 认证包,认证不通过,则剔除该连接 # 认证包,认证不通过,则剔除该连接
if message.get("type") == "auth": if message.get("type") == "auth":
...@@ -245,9 +245,7 @@ class MainHandler(BaseHandler): ...@@ -245,9 +245,7 @@ class MainHandler(BaseHandler):
try: try:
data = tornado.escape.json_decode(self.request.body) data = tornado.escape.json_decode(self.request.body)
logger.info(data) logger.info(data)
self.write(json.dumps({ 'code': 100, 'data': data, 'msg': 'success' })) self.write(json.dumps({ 'code': 100, 'data': data, 'msg': 'success' }))
message = {'imei': '12345678900005', 'type': 'report', 'system': {'free_size': 0}, 'lvgl': {'total_size': 5242880, 'free_cnt': 31, 'free_size': 1279664, 'free_biggest_size': 1205448, 'used_cnt': 832, 'used_pct': 76, 'frag_pct': 6}, 'evm': {'total_size': 2097152, 'free_size': 0, 'gc_usage': 50}, 'image': [{'uri': 'evue_launcher', 'length': 1043, 'png_total_count': 0, 'png_uncompressed_size': 0, 'png_file_size': 0}, {'uri': 'kdgs_1_storyList', 'length': 9608, 'png_total_count': 193, 'png_uncompressed_size': 370884, 'png_file_size': 209807}]} message = {'imei': '12345678900005', 'type': 'report', 'system': {'free_size': 0}, 'lvgl': {'total_size': 5242880, 'free_cnt': 31, 'free_size': 1279664, 'free_biggest_size': 1205448, 'used_cnt': 832, 'used_pct': 76, 'frag_pct': 6}, 'evm': {'total_size': 2097152, 'free_size': 0, 'gc_usage': 50}, 'image': [{'uri': 'evue_launcher', 'length': 1043, 'png_total_count': 0, 'png_uncompressed_size': 0, 'png_file_size': 0}, {'uri': 'kdgs_1_storyList', 'length': 9608, 'png_total_count': 193, 'png_uncompressed_size': 370884, 'png_file_size': 209807}]}
......
...@@ -612,7 +612,7 @@ export default { ...@@ -612,7 +612,7 @@ export default {
// this.systemHistory = systemList; // this.systemHistory = systemList;
// this.evmHistory = evmList; // this.evmHistory = evmList;
// this.lvglHistory = lvglList; // this.lvglHistory = lvglList;
// 清空图数据 // 清空图数据
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
...@@ -683,7 +683,7 @@ export default { ...@@ -683,7 +683,7 @@ export default {
mounted() {}, mounted() {},
destroyed() { destroyed() {
// 页面关闭则销毁该数据库 // 页面关闭则销毁该数据库
// monitor.deleteDB() monitor.deleteDB()
}, },
created() { created() {
monitor monitor
......
''' '''
Author: your name Author: your name
Date: 2021-07-22 19:01:41 Date: 2021-07-22 19:01:41
LastEditTime: 2021-07-24 00:27:21 LastEditTime: 2021-07-24 09:48:09
LastEditors: Please set LastEditors LastEditors: Please set LastEditors
Description: In User Settings Edit Description: In User Settings Edit
FilePath: \evm-store\tools\build_out\tests\http_interval.py FilePath: \evm-store\tools\build_out\tests\http_interval.py
......
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