Skip to content

Commit 691f35b

Browse files
committed
* 初始化的时候就需要校验feature id 是否存在
1 parent 509a59f commit 691f35b

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
### 更新日志
22

3-
#### JadeV2.0.1 - 2023-05-08
4-
* 加密狗如果没有feature id或者获取feature id失败时,需要退出会话
3+
#### JadeV2.0.2 - 2023-05-08
4+
* 初始化的时候就需要校验feature id 是否存在
55
---
66

77
<details onclose>
88
<summary>查看更多更新日志</summary>
99

10+
#### JadeV2.0.1 - 2023-05-08
11+
* 加密狗如果没有feature id或者获取feature id失败时,需要退出会话
12+
---
13+
1014
#### JadeV1.9.9 - 2023-05-08
1115
* 加密狗的监测支持自定义feature id
1216
---

jade/jade_threading.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_i
1515
self.JadeLog = JadeLog
1616
self.ldkqueue = ldkqueue
1717
self.time = time
18-
self.max_session_size = max_session_size
1918
self.feature_id = feature_id
19+
self.max_session_size = max_session_size
2020
self.handlequeue = Queue(maxsize=max_session_size)
2121
super(MonitorLDKThread, self).__init__()
2222
self.start()
@@ -25,14 +25,12 @@ def logout(self):
2525
handle = self.handlequeue.get()
2626
self.pyldk.adapter.logout(handle)
2727
def run(self):
28-
haspStruct,feature_id = self.pyldk.login()
28+
haspStruct,feature_id,login_status = self.pyldk.login(self.feature_id)
2929
if haspStruct.status == 0:
3030
self.handlequeue.put(haspStruct.handle)
31-
while haspStruct.status == 0:
32-
haspStruct, feature_id = self.pyldk.login()
33-
if self.feature_id is None:
34-
self.feature_id = feature_id
35-
if haspStruct.status == 0:
31+
while haspStruct.status == 0 and login_status:
32+
haspStruct, feature_id,login_status = self.pyldk.login(self.feature_id)
33+
if haspStruct.status == 0 and login_status:
3634
if self.handlequeue.qsize() == self.max_session_size:
3735
self.logout()
3836
self.handlequeue.put(haspStruct.handle)
@@ -41,8 +39,7 @@ def run(self):
4139
self.ldkqueue.put((self.pyldk, haspStruct.handle))
4240
else:
4341
break
44-
if self.pyldk.get_ldk(self.feature_id) is False:
45-
self.logout()
42+
if self.pyldk.get_ldk(feature_id) is False:
4643
break
4744
else:
4845
self.JadeLog.DEBUG("加密狗监听正常")

0 commit comments

Comments
 (0)