From 27dcefa84d62c0a491d159439df9b3d05f7b5c70 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 十二月 2018 10:55:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
Tool/Robot/framework/frame.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Tool/Robot/framework/frame.py b/Tool/Robot/framework/frame.py
index c6f7623..43aad06 100644
--- a/Tool/Robot/framework/frame.py
+++ b/Tool/Robot/framework/frame.py
@@ -173,7 +173,7 @@
# 数据库取出为unicode
clientMac = "abc"
- account = (str(result["Psw"]), accID, clientMac, int(result["Adult"]))
+ account = (str(result["Psw"]), accID, clientMac, int(result["Adult"]), str(result['AppID']))
if account not in self.tokenList:
self.tokenList.append(account)
@@ -189,6 +189,9 @@
def RemoveToken(self, value):
self.tokenList.remove(value)
+ def ClearToken(self):
+ self.tokenList = []
+
class WorkerThread(Thread):
def __init__(self, mgr, dbRobot ):
Thread.__init__(self, None, None, "WorkerThreadPy")
--
Gitblit v1.8.0