From e7f8c6013d777dd5ba10b8d548d2d3db6158d37a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 08 九月 2022 17:04:27 +0800
Subject: [PATCH] '完善'

---
 data_process.py |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/data_process.py b/data_process.py
index ceaad95..967df73 100644
--- a/data_process.py
+++ b/data_process.py
@@ -1,9 +1,12 @@
 # 鏁版嵁澶勭悊
 import decimal
 import json
+import logging
 import time as t
 import random
 import datetime
+
+import authority
 import mysql
 import redis_manager
 import gpcode_manager
@@ -49,8 +52,12 @@
 
 
 def parseType(str):
-    dict = json.loads(str)
-    return dict["type"]
+    try:
+        dict = json.loads(str)
+        return dict["type"]
+    except Exception as e:
+        logging.exception(e)
+        return -1
 
 
 def parseGPCode(str):
@@ -164,14 +171,16 @@
     redis.setex("client-active-{}".format(client_id), 10, host)
 
 
-def getValidClients():
+def getValidL2Clients():
     redis = __redisManager.getRedis();
     keys = redis.keys("client-active-*")
     client_ids = []
     for k in keys:
         _id = k.split("client-active-")[1]
         client_ids.append(_id)
-    return client_ids
+    l2_clients = authority.get_l2_clients()
+
+    return list(set(client_ids).intersection(set(l2_clients)))
 
 
 def getActiveClientIP(client_id):

--
Gitblit v1.8.0