* 解决传入多个feature id,加密狗不满足条件,程序不退出的bug

Author: jadehh

CONTRIBUTING.md

@@ -1,14 +1,18 @@
 ### 更新日志
 
 
-#### JadeV2.2.0 - 2024-05-08
-* 监听加密狗线程支持传入最大feature id,这样就可以满足之前的现场
+#### JadeV2.2.1 - 2024-05-09
+* 解决传入多个feature id,加密狗不满足条件,程序不退出的bug
 ---
 
 
 <details onclose>
 <summary>查看更多更新日志</summary>
 
+#### JadeV2.2.0 - 2024-05-08
+* 监听加密狗线程支持传入最大feature id,这样就可以满足之前的现场
+---
+
 #### JadeV2.1.9 - 2024-05-08
 * 监听加密狗线程，如果传入多个feature id，最后在判断授权是否有效
 ---

jade/jade_threading.py

@@ -22,6 +22,10 @@ def __init__(self,pyldk,JadeLog,ldkqueue,time=60*60,max_session_size=1,feature_i
         super(MonitorLDKThread, self).__init__()
         self.start()
 
+    def exit(self):
+        self.JadeLog.ERROR("加密狗异常,程序退出")
+        Exit(-800)
+
     def logout(self):
         handle = self.handlequeue.get()
         self.pyldk.adapter.logout(handle)
@@ -36,13 +40,13 @@ def run(self):
                 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.exit()
         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)
+                self.exit()
         else:
             haspStruct, feature_id, login_status = self.pyldk.login()
             self.pyldk.adapter.logout(haspStruct.handle)
@@ -62,5 +66,4 @@ def run(self):
             else:
                 self.JadeLog.DEBUG("加密狗监听正常")
             time.sleep(self.time)
-        self.JadeLog.ERROR("加密狗异常,程序退出")
-        Exit(-800)
+        self.exit()