From 8bd856c3c2f70ff2490d022e573fa086239498f2 Mon Sep 17 00:00:00 2001
From: wanli <wanliofficial@aliyun.com>
Date: Sat, 24 Jul 2021 09:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=9B=91=E6=8E=A7=E6=A8=A1=E5=9D=97):=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=85=88=E8=AE=BE=E5=A4=87=E4=B8=8A=E7=BA=BF=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B9=9F=E5=8F=AF=E4=BB=A5=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E5=88=B0=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/__init__.py                | 6 +++---
 backend/view/monitor.py                | 8 +++-----
 frontend/src/views/system/monitor.vue  | 4 ++--
 tools/build_out/tests/http_interval.py | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/backend/app/__init__.py b/backend/app/__init__.py
index 26c3edd..c5999c9 100644
--- a/backend/app/__init__.py
+++ b/backend/app/__init__.py
@@ -3,12 +3,12 @@
 
 import os
 import json
-from .signal_manager import signalManager
-from .setting import config
 import logging
+from .setting import config
+from .signal_manager import signalManager
 from controller import initConnect
 
-logger = logging.getLogger("ApplicationManager")
+logger = logging.getLogger(__name__)
 
 def loadSettings(path=None):
     global config
diff --git a/backend/view/monitor.py b/backend/view/monitor.py
index 78b0821..2632ac2 100644
--- a/backend/view/monitor.py
+++ b/backend/view/monitor.py
@@ -1,7 +1,7 @@
 '''
 Author: your name
 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
 Description: In User Settings Edit
 FilePath: \evm-store\backend\view\monitor.py
@@ -167,9 +167,9 @@ class NotifyHandler(BaseWebsocket):
             className = self.__class__.__name__
             message = json.loads(message)
             # 判断消息类型
-            if message.get("type"):
+            if message.get("type") and message.get("token"):
                 # 获取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":
@@ -245,9 +245,7 @@ class MainHandler(BaseHandler):
 
         try:
             data = tornado.escape.json_decode(self.request.body)
-
             logger.info(data)
-
             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}]}
diff --git a/frontend/src/views/system/monitor.vue b/frontend/src/views/system/monitor.vue
index 161f6c6..30f4192 100644
--- a/frontend/src/views/system/monitor.vue
+++ b/frontend/src/views/system/monitor.vue
@@ -612,7 +612,7 @@ export default {
           // this.systemHistory = systemList;
           // this.evmHistory = evmList;
           // this.lvglHistory = lvglList;
-          // 清空图标数据
+          // 清空图表数据
         })
         .catch((err) => {
           console.log(err);
@@ -683,7 +683,7 @@ export default {
   mounted() {},
   destroyed() {
     // 页面关闭则销毁该数据库
-    // monitor.deleteDB()
+    monitor.deleteDB()
   },
   created() {
     monitor
diff --git a/tools/build_out/tests/http_interval.py b/tools/build_out/tests/http_interval.py
index a7fa28d..eff0554 100644
--- a/tools/build_out/tests/http_interval.py
+++ b/tools/build_out/tests/http_interval.py
@@ -1,7 +1,7 @@
 '''
 Author: your name
 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
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\tests\http_interval.py
-- 
2.24.1