From cbe19ea6066a600cbd0b5110db5d43f8252d14a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 13 六月 2024 11:23:53 +0800
Subject: [PATCH] L撤成交进度相关改进

---
 utils/socket_util.py |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/utils/socket_util.py b/utils/socket_util.py
index 852a822..fc493e2 100644
--- a/utils/socket_util.py
+++ b/utils/socket_util.py
@@ -4,8 +4,15 @@
 
 # 娣诲姞鏁版嵁澶�
 import json
+import socket
 
 from utils import crypt_util
+
+
+def create_socket(addr, port):
+    client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  # 鐢熸垚socket锛岃繛鎺erver
+    client.connect((addr, port))
+    return client
 
 
 def load_header(data_bytes):
@@ -26,7 +33,7 @@
             received_size = 0
             # 鍔犱笂璇诲彇澶寸殑鏁版嵁
             received_size += len(buf[header_size:])
-            data += buf[header_size:].decode('utf-8')
+            data += buf[header_size:]
             while not received_size == content_length:
                 r_data = sk.recv(10240)
                 received_size += len(r_data)
@@ -44,7 +51,7 @@
     str_list = []
     for k in dataJson:
         if type(dataJson[k]) == dict:
-            str_list.append(f"{k}={json.dumps(dataJson[k])}")
+            str_list.append(f"{k}={json.dumps(dataJson[k], separators=(',', ':'))}")
         else:
             str_list.append(f"{k}={dataJson[k]}")
     str_list.sort()
@@ -62,14 +69,28 @@
     str_list = []
     for k in dataJson:
         if type(dataJson[k]) == dict:
-            str_list.append(f"{k}={json.dumps(dataJson[k],separators=(',',':'))}")
+            str_list.append(f"{k}={json.dumps(dataJson[k], separators=(',', ':'))}")
         else:
             str_list.append(f"{k}={dataJson[k]}")
     str_list.sort()
     str_list.append("%Yeshi2014@#.")
     new_sign = crypt_util.md5_encrypt("&".join(str_list))
-    #print("鍔犲瘑鍓嶅瓧绗︿覆","&".join(str_list))
+    # print("鍔犲瘑鍓嶅瓧绗︿覆","&".join(str_list))
     if sign == new_sign:
         return True
     else:
-        return False
\ No newline at end of file
+        return False
+
+
+# 绔彛鏄惁琚崰鐢�
+def is_port_bind(port):
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    result = sock.connect_ex(('127.0.0.1', port))
+    if result == 0:
+        return True
+    else:
+        return False
+
+
+if __name__ == "__main__":
+    pass

--
Gitblit v1.8.0