Skip to content

Commit 79bd29c

Browse files
committed
* 加密狗的监测支持自定义feature id
1 parent f6e5d76 commit 79bd29c

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

CONTRIBUTING.md

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

3+
#### JadeV1.9.9 - 2023-04-21
4+
* 加密狗的监测支持自定义feature id
5+
---
6+
7+
8+
<details onclose>
9+
<summary>查看更多更新日志</summary>
10+
311
#### JadeV1.9.8 - 2023-04-21
412
* 加密狗监测线程支持多个加密狗
513
* 如果当前登录的加密狗超过最大限制数量,在查找是否还有新的加密狗
@@ -9,10 +17,6 @@
917
* 如果可执行文件存在的化,则拷贝Output文件夹,如果不存在则不拷贝
1018
---
1119

12-
13-
<details onclose>
14-
<summary>查看更多更新日志</summary>
15-
1620
#### JadeV1.9.6 - 2023-04-03
1721
* 编译的时候也需要将lib包拷贝到release文件夹下
1822
---

jade/jade_threading.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
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):
13+
def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_id=None):
1414
self.pyldk = pyldk
1515
self.JadeLog = JadeLog
1616
self.ldkqueue = ldkqueue
1717
self.time = time
1818
self.max_session_size = max_session_size
19+
self.feature_id = feature_id
1920
self.handlequeue = Queue(maxsize=max_session_size)
2021
super(MonitorLDKThread, self).__init__()
2122
self.start()
@@ -29,6 +30,8 @@ def run(self):
2930
self.handlequeue.put(haspStruct.handle)
3031
while haspStruct.status == 0:
3132
haspStruct, feature_id = self.pyldk.login()
33+
if self.feature_id is None:
34+
self.feature_id = feature_id
3235
if haspStruct.status == 0:
3336
if self.handlequeue.qsize() == self.max_session_size:
3437
self.logout()
@@ -38,7 +41,7 @@ def run(self):
3841
self.ldkqueue.put((self.pyldk, haspStruct.handle))
3942
else:
4043
break
41-
if self.pyldk.get_ldk(feature_id) is False:
44+
if self.pyldk.get_ldk(self.feature_id) is False:
4245
break
4346
else:
4447
self.JadeLog.DEBUG("加密狗监听正常")

0 commit comments

Comments
 (0)