* 新增根据进程id，强制退出关联进程

* 解决子进程无法退出的bug

Author: jadehh

CONTRIBUTING.md

@@ -1,13 +1,19 @@
 ### 更新日志
 
-#### JadeV2.2.7 - 2024-06-12
-* 使用线程监听程序异常问题，不在阻塞主线程
+#### JadeV2.2.8 - 2024-06-13
+* 新增根据进程id，强制退出关联进程
 * 解决子进程无法退出的bug
 ---
 
 <details onclose>
 <summary>查看更多更新日志</summary>
 
+#### JadeV2.2.7 - 2024-06-12
+* 使用线程监听程序异常问题，不在阻塞主线程
+* 解决子进程无法退出的bug
+---
+
+
 #### JadeV2.2.6 - 2024-06-11
 * 解决Windows下打包由路径引发的bug
 ---

jade/jade_threading.py

@@ -32,7 +32,7 @@ def exit_gracefully(self, signum, frame):
 
 class MonitorLDKThread(Thread):
     def __init__(self, pyldk, JadeLog, ldkqueue, time=60 * 60, max_session_size=1, feature_id_list=None,
-                 max_featuer_id=None, exit_queue=None):
+                 max_featuer_id=None, process_id_queue=None):
         self.pyldk = pyldk
         self.JadeLog = JadeLog
         self.ldkqueue = ldkqueue
@@ -41,13 +41,13 @@ def __init__(self, pyldk, JadeLog, ldkqueue, time=60 * 60, max_session_size=1, f
         self.max_featuer_id = max_featuer_id
         self.max_session_size = max_session_size
         self.handlequeue = Queue(maxsize=max_session_size)
-        self.exit_queue = exit_queue
+        self.process_id_queue = process_id_queue
         super(MonitorLDKThread, self).__init__()
         self.start()
 
     def exit(self):
         self.JadeLog.ERROR("加密狗异常,程序退出")
-        Exit(-800, self.exit_queue)
+        Exit(-800, self.process_id_queue)
 
     def logout(self):
         handle = self.handlequeue.get()

jade/jade_tools.py

@@ -20,6 +20,7 @@
 import signal
 import string
 import random
+import psutil
 
 def zh_ch(string):
     """
@@ -29,15 +30,13 @@ def zh_ch(string):
     """
     return string.encode("gbk").decode('UTF-8', errors='ignore')
 
-def Exit(exit_number,exit_queue=None):
+def Exit(exit_number,process_id_queue=None):
     """
     强制结束
     """
-    if exit_queue:
-        for i in range(exit_queue.qsize()):
-            process = exit_queue.get()
-            process.kill()
     time.sleep(1)
+    if process_id_queue:
+        clear_process_queue(process_id_queue)
     os._exit(exit_number)
 
 def getNumberofString(string):
@@ -485,15 +484,12 @@ def GetExitSignal(func,*args):
     while not killer.kill_now:
         time.sleep(1)
     Exit(-1)
-def ldk_release(ldkqueue,JadeLog=None,exit_queue=None):
+def ldk_release(ldkqueue,JadeLog=None,process_id_queue=None):
     if JadeLog:
         JadeLog.DEBUG("准备释放加密狗登录", True)
-    if exit_queue:
+    if process_id_queue:
         JadeLog.DEBUG("准备清除子进程",True)
-        if exit_queue:
-            for i in range(exit_queue.qsize()):
-                process = exit_queue.get()
-                process.kill()
+        clear_process_queue(process_id_queue)
     if ldkqueue.qsize() > 0:
         pyldk, handle = ldkqueue.get()
         pyldk.adapter.logout(handle)
@@ -508,6 +504,18 @@ def get_file_size(filename):
     size = os.path.getsize(filename)
     return size
 
+def clear_process_queue(process_id_queue):
+    for i in range(process_id_queue.qsize()):
+        clear_process(process_id_queue.get())
+
+
+def clear_process(process_id):
+    process = psutil.Process(process_id)
+    for proc in process.children(recursive=True):
+        proc.kill()
+    process.kill()
+
+
 if __name__ == '__main__':
     key = "HgEWN6tv_HeVqbh7M_Q-XT6NCVETFeIspgE17Xh30Co="
     #encryption_model("container_det_768-576_slim.onnx","HgEWN6tv_HeVqbh7M_Q-XT6NCVETFeIspgE17Xh30Co=")

setup.py

@@ -50,7 +50,7 @@ def get_app_version():
     package_data={'': ['*Run','*png']},
     include_package_data=True,
     platforms="any",
-    install_requires=["easycython","pyinstaller","cryptography==3.4.8","cffi"]  # 这个项目需要的第三方库
+    install_requires=["easycython","pyinstaller","cryptography==3.4.8","cffi","psutil"]  # 这个项目需要的第三方库
 )