Skip to content

Commit 2c72a07

Browse files
committed
* 加密狗监测模块支持多个加密狗的id
1 parent e442551 commit 2c72a07

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

CONTRIBUTING.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
### 更新日志
22

3-
#### JadeV2.0.3 - 2023-05-11
4-
* 打包的时候新增是否压缩lib包参数
3+
#### JadeV2.0.3 - 2023-05-22
4+
* 加密狗监测模块支持多个加密狗的id
55
---
66

7-
87
<details onclose>
98
<summary>查看更多更新日志</summary>
109

10+
11+
#### JadeV2.0.3 - 2023-05-11
12+
* 打包的时候新增是否压缩lib包参数
13+
---
14+
1115
#### JadeV2.0.2 - 2023-05-08
1216
* 初始化的时候就需要校验feature id 是否存在
1317
---

jade/jade_threading.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
from jade.jade_tools import *
1111
from queue import Queue
1212
class MonitorLDKThread(Thread):
13-
def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_id=None):
13+
def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_id_list=None):
1414
self.pyldk = pyldk
1515
self.JadeLog = JadeLog
1616
self.ldkqueue = ldkqueue
1717
self.time = time
18-
self.feature_id = feature_id
18+
self.feature_id_list = feature_id_list
1919
self.max_session_size = max_session_size
2020
self.handlequeue = Queue(maxsize=max_session_size)
2121
super(MonitorLDKThread, self).__init__()
@@ -25,11 +25,13 @@ def logout(self):
2525
handle = self.handlequeue.get()
2626
self.pyldk.adapter.logout(handle)
2727
def run(self):
28-
haspStruct,feature_id,login_status = self.pyldk.login(self.feature_id)
29-
if haspStruct.status == 0:
30-
self.handlequeue.put(haspStruct.handle)
28+
for feature_id in self.feature_id_list:
29+
haspStruct,feature_id,login_status = self.pyldk.login(feature_id)
30+
if haspStruct.status == 0:
31+
self.handlequeue.put(haspStruct.handle)
32+
break
3133
while haspStruct.status == 0 and login_status:
32-
haspStruct, feature_id,login_status = self.pyldk.login(self.feature_id)
34+
haspStruct, feature_id,login_status = self.pyldk.login(feature_id)
3335
if haspStruct.status == 0 and login_status:
3436
if self.handlequeue.qsize() == self.max_session_size:
3537
self.logout()

0 commit comments

Comments
 (0)