xtn-tools-pro 1.0.1.3.1__tar.gz → 1.0.1.3.2__tar.gz

{xtn-tools-pro-1.0.1.3.1/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.3.2}/PKG-INFO

@@ -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 → xtn-tools-pro-1.0.1.3.2}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.1.3.1",  # 版本
+    version="1.0.1.3.2",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

{xtn-tools-pro-1.0.1.3.1 → xtn-tools-pro-1.0.1.3.2}/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 → xtn-tools-pro-1.0.1.3.2/xtn_tools_pro.egg-info}/PKG-INFO

@@ -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