* 监听加密狗线程支持传入最大feature id,这样就可以满足之前的现场

Author: jadehh

CONTRIBUTING.md

@@ -1,14 +1,18 @@
 ### 更新日志
 
 
-#### JadeV2.1.9 - 2024-05-08
-* 监听加密狗线程，如果传入多个feature id，最后在判断授权是否有效
+#### JadeV2.2.0 - 2024-05-08
+* 监听加密狗线程支持传入最大feature id,这样就可以满足之前的现场
 ---
 
 
 <details onclose>
 <summary>查看更多更新日志</summary>
 
+#### JadeV2.1.9 - 2024-05-08
+* 监听加密狗线程，如果传入多个feature id，最后在判断授权是否有效
+---
+
 #### JadeV2.1.8 - 2024-01-31
 * 新增 RFC 2832格式转时间字符串格式方法
 ---

jade/jade_threading.py

@@ -10,12 +10,13 @@
 from jade.jade_tools import *
 from queue import Queue
 class MonitorLDKThread(Thread):
-    def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_id_list=None):
+    def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_id_list=None,max_featuer_id=None):
         self.pyldk = pyldk
         self.JadeLog = JadeLog
         self.ldkqueue = ldkqueue
         self.time = time
         self.feature_id_list = feature_id_list
+        self.max_featuer_id = max_featuer_id
         self.max_session_size = max_session_size
         self.handlequeue = Queue(maxsize=max_session_size)
         super(MonitorLDKThread, self).__init__()
@@ -34,7 +35,14 @@ def run(self):
             if haspStruct.status != 0:
                 haspStruct, feature_id, login_status = self.pyldk.login()
                 self.pyldk.adapter.logout(haspStruct.handle)
-                self.JadeLog.ERROR("加密狗初始化失败,没有找到该授权,请检查授权ID是否正确,授权ID为:{},当前加密狗授权ID为:{},请重新授权...".format(','.join(str(i) for i in self.feature_id_list),feature_id))
+                self.JadeLog.ERROR("加密狗初始化失败,请检查授权ID是否正确,支持的授权ID为:{},当前加密狗授权ID为:{},请重新授权...".format(','.join(str(i) for i in self.feature_id_list),feature_id))
+        elif self.max_featuer_id:
+            haspStruct, feature_id, login_status = self.pyldk.login()
+            self.pyldk.adapter.logout(haspStruct.handle)
+            if feature_id > self.max_featuer_id:
+                self.JadeLog.ERROR("加密狗初始化失败,请检查授权ID是否正确,最大支持授权ID为:{},当前加密狗授权ID为:{},请重新授权...".format(self.max_featuer_id,feature_id))
+                self.JadeLog.ERROR("加密狗异常,程序退出")
+                Exit(-800)
         else:
             haspStruct, feature_id, login_status = self.pyldk.login()
             self.pyldk.adapter.logout(haspStruct.handle)
@@ -54,6 +62,5 @@ def run(self):
             else:
                 self.JadeLog.DEBUG("加密狗监听正常")
             time.sleep(self.time)
-
         self.JadeLog.ERROR("加密狗异常,程序退出")
         Exit(-800)