xtn-tools-pro 1.0.1.3.1__py3-none-any.whl → 1.0.1.3.2__py3-none-any.whl

xtn_tools_pro/utils/crypto_pro.py

@@ -25,7 +25,7 @@ class XtnDeEnAir:
     BLOCK_SIZE = AES.block_size
 
     @staticmethod
-    def de_data(key: bytes, raw: dict) -> str:
+    def encrypt_dict(key: bytes, raw: dict) -> str:
         """
             加密
         """
@@ -38,15 +38,19 @@ class XtnDeEnAir:
         return result
 
     @staticmethod
-    def en_data(key: bytes, raw: str) -> str:
+    def decrypt_dict(key: bytes, raw: str) -> dict:
         """
             解密
         """
-        cipher = AES.new(key, AES.MODE_ECB)
-        enc = base64.b64decode(raw)
-        decrypted = cipher.decrypt(enc)
-        result = unpad(decrypted, XtnDeEnAir.BLOCK_SIZE).decode('utf-8')
-        return result
+        try:
+            cipher = AES.new(key, AES.MODE_ECB)
+            enc = base64.b64decode(raw)
+            decrypted = cipher.decrypt(enc)
+            result = unpad(decrypted, XtnDeEnAir.BLOCK_SIZE).decode('utf-8')
+            return json.loads(result)
+        except (ValueError, KeyError, json.JSONDecodeError) as e:
+            # raise ValueError(f"解密失败: {e}")
+            return {}
 
 
 class XtnDeEnPro:
@@ -83,7 +87,8 @@ class XtnDeEnPro:
             result = decrypted.decode('utf-8')
             return json.loads(result)
         except (ValueError, KeyError, json.JSONDecodeError) as e:
-            raise ValueError(f"解密失败: {e}")
+            # raise ValueError(f"解密失败: {e}")
+            return {}
 
 
 class XtnDeEnProMax:
@@ -138,7 +143,8 @@ class XtnDeEnProMax:
             result = decrypted.decode('utf-8')
             return json.loads(result)
         except (ValueError, KeyError, json.JSONDecodeError) as e:
-            raise ValueError(f"解密失败: {e}")
+            # raise ValueError(f"解密失败: {e}")
+            return {}
 
 
 if __name__ == '__main__':
@@ -147,15 +153,15 @@ if __name__ == '__main__':
         "task_type": "update_name",
         "task_client": "tiktok",
     }
-    sss = XtnDeEnAir.de_data(key, data)
-    print(sss)
-    print(XtnDeEnAir.en_data(key, sss))
-
-    key_pair = RSA.generate(2048)
-    private_key = key_pair.export_key()
-    public_key = key_pair.publickey().export_key()
-    print(private_key)
-    print(public_key)
-    sss = XtnDeEnProMax.encrypt_dict(public_key, data)
+    sss = XtnDeEnAir.encrypt_dict(key, data)
     print(sss)
-    print(XtnDeEnProMax.decrypt_dict(private_key, sss))
+    print(XtnDeEnAir.decrypt_dict(key, sss))
+
+    # key_pair = RSA.generate(2048)
+    # private_key = key_pair.export_key()
+    # public_key = key_pair.publickey().export_key()
+    # print(private_key)
+    # print(public_key)
+    # sss = XtnDeEnProMax.encrypt_dict(public_key, data)
+    # print(sss)
+    # print(XtnDeEnProMax.decrypt_dict(private_key, sss))

{xtn_tools_pro-1.0.1.3.1.dist-info → xtn_tools_pro-1.0.1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.1.3.1
+Version: 1.0.1.3.2
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn_tools_pro-1.0.1.3.1.dist-info → xtn_tools_pro-1.0.1.3.2.dist-info}/RECORD

@@ -55,7 +55,7 @@ xtn_tools_pro/task_pro/go_fun_v3.py,sha256=GI1OVup-izwDflAaoy_pN6xmCXat59II7v-Mo
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/audio_video.py,sha256=3Im3tGOW6IbmqDcrE1SJUg6eGyLGEyq11Qu6TCutJJw,1115
 xtn_tools_pro/utils/crypto.py,sha256=B6NC2yVxtwrbSZnngudTFRm7YRGKKEusydVVYWwxFHs,5231
-xtn_tools_pro/utils/crypto_pro.py,sha256=CJqK-fJryblKsj2uQN7_Sy8gn7HPCeage53xk1DfQLc,5331
+xtn_tools_pro/utils/crypto_pro.py,sha256=KkTX8ITfawzKEdRw6Oq96ubnGMJrVJag-50JMheXY9c,5608
 xtn_tools_pro/utils/file_utils.py,sha256=vsUgds8I8Z2pL9a4oCv1q0JrZsDP29qLyLyGVqj5sX8,3311
 xtn_tools_pro/utils/helpers.py,sha256=0CTMY7wfSQR_DC9-v1lkKQLpWcB1FL9V_kw_5DOcZ40,4454
 xtn_tools_pro/utils/log.py,sha256=MPT9q1keNYroaw6U9a-Gc0iT0ceUEVTI-Tz2GEiWLUc,11038
@@ -64,9 +64,9 @@ xtn_tools_pro/utils/set_data.py,sha256=UR5S8xBqc4Vk8zpbrNVsxKhwaBAenaEdC7O-N3s7h
 xtn_tools_pro/utils/shell.py,sha256=s6sJedxLLQokcI1hF5YSD3qgGUPK0brNcP-D3-yv54I,3790
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.1.3.1.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.3.1.dist-info/METADATA,sha256=Ivrk4YS7pi60sMP7xUq0323sBBR-9Cpfn3u8MkOkML4,574
-xtn_tools_pro-1.0.1.3.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.3.1.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.3.1.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.3.1.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.3.2.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.3.2.dist-info/METADATA,sha256=E9GDeG_G6ggOAy8PK0XyZn0qkf2mATpdaXJnR46C38I,574
+xtn_tools_pro-1.0.1.3.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.3.2.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.3.2.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.3.2.dist-info/RECORD,,