优化文件结构

.idea/api_project.iml

@@ -5,7 +5,7 @@
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PackageRequirementsSettings">

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Pipenv (apitest)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
   <component name="PyCharmProfessionalAdvertiser">
     <option name="shown" value="true" />
   </component>

common/action.py

@@ -12,7 +12,7 @@ import ast
 from common.crypto.encrypt_data import EncryptData
 from common.database.mysql_client import MysqlClient
 from common.utils.decorators import singleton
-from common.utils.load_and_execute_script import LoadScript
+from common.validation.load_and_execute_script import LoadScript
 from common.validation.extractor import Extractor
 from common.validation.validator import Validator
 

common/bif_functions/__init__.py

@@ -7,7 +7,7 @@
 # EMAIL:        262667641@qq.com
 # Date:         2021/1/12 14:02
 # -------------------------------------------------------------------------------
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()
 from .bif_datetime import *

common/bif_functions/bif_str.py

@@ -7,7 +7,7 @@
 # EMAIL:        262667641@qq.com
 # Date:         2021/1/12 15:12
 # -------------------------------------------------------------------------------
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 __all__ = ['substr', 'str_join']
 

common/crypto/__init__.py

@@ -7,6 +7,6 @@
 @time: 2023/3/14 14:23
 @desc:
 """
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()

common/crypto/encryption_main.py

@@ -1,35 +0,0 @@
-import sys
-
-sys.path.append("./common")
-sys.path.append("../")
-from common.crypto import logger
-from extensions import sign
-from common.crypto.encryption_rsa import Rsa
-
-
-@logger.log_decorator()
-def do_encrypt(method, data):
-	if method == "MD5":
-		try:
-			res = sign.md5_sign(data)
-			return res
-		except Exception as e:
-			logger.error(f"MD5 加密失败：{e}")
-	elif method == "sha1":
-		try:
-			res = sign.sha1_sign(data)
-			return res
-		except Exception as e:
-			logger.error(f"sha1 加密失败：{e}")
-	elif method == 'rsa':
-		try:
-			res = Rsa(data).rsa_encrypt()
-			return res
-		except Exception as e:
-			logger.error(f"Rsa 加密失败：{e}")
-	else:
-		return data
-
-
-if __name__ == '__main__':
-	do_encrypt("sha1", {})

common/crypto/encryption_str.py

@@ -12,6 +12,7 @@ import base64
 import binascii
 import hashlib
 
+import ddddocr
 from pyDes import des, CBC, PAD_PKCS5
 
 
@@ -87,7 +88,7 @@ class Des:
     def __init__(self, text, key):
         self.text = text  # 原始字符串
         self.KEY = key  # 这个key是固定问开发，
-
+    
     def des_encrypt(self):
         """DES 加密
         Returns:加密后字符串，16进制
@@ -101,7 +102,7 @@ class Des:
         secret_bytes = des_obj.encrypt(self.text.encode("utf-8"), padmode=PAD_PKCS5)
         # 返回为16进制
         return binascii.b2a_hex(secret_bytes)
-
+    
     def des_decrypt(self):
         """
         DES 解密
@@ -131,6 +132,7 @@ def add_to_16(text: str):
         add = 16 - len(b_text) % 16
     return b_text + b'\0' * add
 
+
 # class AesEcb:
 #
 #     def __init__(self, text: str, key: str):
@@ -192,3 +194,24 @@ def add_to_16(text: str):
 #         msg_text = self.aes.decrypt(res)
 #         decrypt_text = self.unpad(msg_text).decode('utf8')
 #         return decrypt_text
+
+
+def captcha(file_path):
+    """
+    失败图片验证码
+    Args:
+        file_path:
+
+    Returns:返回图片的验证码
+
+    """
+    orc = ddddocr.DdddOcr()
+    
+    with open(file_path, 'rb') as f:
+        img_bytes = f.read()
+    res = orc.classification(img_bytes)
+    print(str(res))
+    return res
+
+if __name__ == '__main__':
+    captcha('../../image/origina388l.png')

common/data_extraction/__init__.py

@@ -7,6 +7,6 @@
 @time: 2023/3/14 14:21
 @desc:
 """
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()

common/database/__init__.py

@@ -7,6 +7,6 @@
 @time: 2023/3/13 14:48
 @desc:
 """
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()

common/file_handling/__init__.py

@@ -7,6 +7,6 @@
 @time: 2023/3/14 14:27
 @desc:
 """
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()

common/http_client/__init__.py

@@ -1,3 +1,3 @@
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()

common/log_utils/__init__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# encoding: utf-8
+"""
+@author: kira
+@contact: 262667641@qq.com
+@file: __init__.py.py
+@time: 2023/7/24 14:58
+@desc:
+"""

common/parsing/__init__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# encoding: utf-8
+"""
+@author: kira
+@contact: 262667641@qq.com
+@file: __init__.py.py
+@time: 2023/7/24 14:57
+@desc:
+"""

common/utils/captcha.py

@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-"""
-@author: kira
-@contact: 262667641@qq.com
-@file: captcha.py
-@time: 2022/1/11 10:26
-@desc:
-"""
-
-import ddddocr
-
-
-def captcha(file_path):
-	"""
-	失败图片验证码
-	Args:
-	    file_path:
-    
-	Returns:返回图片的验证码
- 
-	"""
-	orc = ddddocr.DdddOcr()
-	
-	with open(file_path, 'rb') as f:
-		img_bytes = f.read()
-	res = orc.classification(img_bytes)
-	print(str(res))
-
-
-if __name__ == '__main__':
-	file = r'/image/origina388l.png'
-	captcha(file)

common/validation/__init__.py

@@ -1,3 +1,3 @@
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()

common/validation/load_and_execute_script.py

@@ -2,10 +2,10 @@ import importlib.util
 import os
 import sys
 
-sys.path.append('../../common')
-sys.path.append('../../common/utils')
+sys.path.append('..')
+sys.path.append('../utils')
 
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()
 

excel_converter.py

@@ -2,8 +2,8 @@ import os.path
 
 from common.config import Config
 from common.file_handling.excel import DoExcel
-from common.utils.parsing_openapi import parsing_openapi
-from common.utils.parsing_postman import parsing_postman
+from common.parsing.parsing_openapi import parsing_openapi
+from common.parsing.parsing_postman import parsing_postman
 
 
 class ExcelConverter:

extensions/__init__.py

@@ -7,7 +7,7 @@
 @time: 2023/3/14 16:21
 @desc:
 """
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 
 logger = MyLogger()
 

test_script/test_api.py

@@ -1,14 +1,12 @@
 import time
 import unittest
 from ddt import ddt, data
-from functools import partial
 
 from common import bif_functions
 from common.action import Action
 from common.config import Config
-from common.database.mysql_client import MysqlClient
 from common.file_handling.do_excel import DoExcel
-from common.utils.mylogger import MyLogger
+from common.log_utils.mylogger import MyLogger
 from extensions import dynamic_scaling_methods
 
 test_file = Config.test_case  # 获取 excel 文件路径