From 31636cb6bfae29840f5188cc619f57645972fca0 Mon Sep 17 00:00:00 2001
From: kf_wuhao <15392746632@qq.com>
Date: Fri, 2 Apr 2021 19:52:57 +0800
Subject: [PATCH] update

---
 handler_data/ta_handler.py | 13 ++++++++++---
 routers/point.py           |  8 +++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/handler_data/ta_handler.py b/handler_data/ta_handler.py
index a69ff43..7c71f2c 100644
--- a/handler_data/ta_handler.py
+++ b/handler_data/ta_handler.py
@@ -21,9 +21,16 @@ class TaHandler:
         msg['properties'] = data.pop('properties')
         if msg['#type'] == 'track':
             msg['properties'].update(data)
-        elif data['#type'] == 'user':
-            data['#type'] = 'user' + data['#event_name']
-            msg['properties']['#user_id'] = data['#user_id']
+        elif msg['#type'] == 'user':
+            msg['#type'] = 'user_' + msg['#event_name']
+            if msg.get('#user_id'):
+                msg['properties']['#user_id'] = msg['#user_id']
+
+            if "#event_name" in msg:
+                del msg["#event_name"]
+            if "#event_time" in msg:
+                del msg["#event_time"]
+
         return msg
 
 
diff --git a/routers/point.py b/routers/point.py
index 7e9febf..28231c5 100644
--- a/routers/point.py
+++ b/routers/point.py
@@ -17,13 +17,15 @@ async def point(request: Request, items: DataModel):
         rdb = request.app.state.redis
         data_factory = request.app.state.data_factory
         output_factory = request.app.state.output_factory
-        appid = items.public['b01']
+        appid = items.public.get('b01')
+        if not appid:
+            return {'code': -1, 'msg': '必须要appid'}
         output_factory.name = settings.OUTPUT_NAME[appid]
         for item in items.data:
             data: dict = restore_field(item)
             sign = data.pop('sign')
             properties = data.pop('properties')
-            if not check_sign(sign, settings.SALT.get(appid,''), data, properties):
+            if not check_sign(sign, settings.SALT.get(appid, ''), data, properties):
                 # continue
                 return {"code": -1, 'msg': '签名错误'}
             single_data = dict(**public_data, **data, properties=properties)
@@ -36,4 +38,4 @@ async def point(request: Request, items: DataModel):
         return {"code": 0, 'msg': 'ok'}
     except Exception as e:
         msg = traceback.format_exc()
-        return {"code": -1, 'msg': msg}
+        print(msg)