From 1b1c6ca0acc249bfcd62e6484231e59c2cada9a2 Mon Sep 17 00:00:00 2001
From: AdminWhaleFall <whalefall9420@outlook.com>
Date: Tue, 5 Apr 2022 21:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 smsboom.py | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/smsboom.py b/smsboom.py
index 19b2fee..9ad03cb 100644
--- a/smsboom.py
+++ b/smsboom.py
@@ -27,7 +27,7 @@ default_header = {
 # current directory
 path = pathlib.Path(__file__).parent
 
-phone = "19820294268"
+phone = "19820294267"
 
 
 class API(BaseModel):
@@ -37,13 +37,6 @@ class API(BaseModel):
     header: Optional[dict]
     data: Optional[Union[str, dict]]
 
-    @validator('url')
-    def name_must_contain_space(cls, v: str):
-        """验证链接是否正确"""
-        if not v.startswith('https' or 'http'):
-            raise ValueError('url must startswith http(s)!')
-        return v
-
 
 def load_json() -> List[API]:
     """
@@ -74,16 +67,16 @@ def timestamp_new() -> str:
 
 
 def replace_data(content: Union[str, dict]) -> str:
-    if isinstance(content, dict):
-        for key, value in content.items():
-            content[key] = value.replace("[phone]", phone).replace(
-                "[timestamp]", timestamp_new())
-    else:
-        # fix: add str判断
-        if isinstance(content, str):
-            content.replace("[phone]", phone).replace(
-                "[timestamp]", timestamp_new())
-    return content
+    if not phone:
+        return content
+    # 统一转换成 str 再替换.
+    content = str(content).replace("[phone]", phone).replace(
+        "[timestamp]", timestamp_new()).replace("'",'"')
+    # 尝试 json 化
+    try:
+        return json.loads(content)
+    except:
+        return content
 
 
 def handle_API(API: API) -> API:
@@ -105,12 +98,13 @@ async def rqs(API: API):
     # print(API.dict())
     async with httpx.AsyncClient(headers=default_header) as client:
         try:
-            # 判断是否传递 json 数据
-            if isinstance(API.data, dict):
-                r = await client.request(method=API.method, url=API.url, json=API.data, headers=API.header)
+            if not isinstance(API.data, dict):
+                resp = await client.request(method=API.method, headers=API.header,
+                            url=API.url, data=API.data)
             else:
-                r = await client.request(method=API.method, url=API.url, data=API.data, headers=API.header)
-            logger.info(f"{API.desc} {r.text}")
+                resp = await client.request(
+                    method=API.method, headers=API.header, url=API.url, json=API.data)
+            logger.success(f"{API.desc}-{resp.text}")
         except httpx.HTTPError as exc:
             logger.error(f"{API.desc} Error:{exc}")