From 3f5cf907d3c5cbc9133342ed5b001461a1147511 Mon Sep 17 00:00:00 2001
From: wudifeixue <wudifeixue@users.noreply.github.com>
Date: Thu, 9 Dec 2021 16:34:07 -0700
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 getDB.py | 65 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/getDB.py b/getDB.py
index 6db3ea43..99f3ad88 100644
--- a/getDB.py
+++ b/getDB.py
@@ -325,14 +325,6 @@ async def OwnerCookies(uid):
     return cookies
 
 
-
-
-
-
-
-
-
-
 def random_hex(length):
     result = hex(random.randint(0,16**length)).replace('0x','').upper()
     if len(result)<length:
@@ -379,7 +371,7 @@ async def GetDaily(Uid,ServerID="cn_gf01"):
             data = json.loads(req.text)
         return data
     except:
-        print("访问失败，请重试！")
+        print("访问每日信息失败，请重试！")
         sys.exit(1)
 
 async def GetSignList():
@@ -395,7 +387,8 @@ async def GetSignList():
             data = json.loads(req.text)
         return data
     except:
-        print("访问失败，请重试！")
+        im = "获取签到奖励列表失败，请重试"
+        print(im)
 
 async def GetSignInfo(Uid,ServerID="cn_gf01"):
     if Uid[0] == '5':
@@ -413,7 +406,8 @@ async def GetSignInfo(Uid,ServerID="cn_gf01"):
             data = json.loads(req.text)
         return data
     except:
-        print("访问失败，请重试！")
+        im = "获取签到信息失败，请重试"
+        print(im)
         
 async def MysSign(Uid,ServerID="cn_gf01"):
     if Uid[0] == '5':
@@ -437,7 +431,8 @@ async def MysSign(Uid,ServerID="cn_gf01"):
         data2 = json.loads(req.text)
         return data2
     except:
-        print("访问失败，请重试！")
+        im = { 'message' : '签到失败，请重试'}
+        return im
     
 async def GetAward(Uid,ServerID="cn_gf01"):
     if Uid[0] == '5':
@@ -457,7 +452,9 @@ async def GetAward(Uid,ServerID="cn_gf01"):
             data = json.loads(req.text)
         return data
     except:
-        print("访问失败，请重试！")
+        im = "访问每月统计失败，请重试！"
+        print(im)
+        return im
         #sys.exit(1)
 
 async def GetInfo(Uid,ck,ServerID="cn_gf01"):
@@ -477,7 +474,7 @@ async def GetInfo(Uid,ck,ServerID="cn_gf01"):
             data = json.loads(req.text)
         return data
     except:
-        print("访问失败，请重试！")
+        print("获取信息失败，请重试！")
         #sys.exit(1)
 
 async def GetSpiralAbyssInfo(Uid, ck,Schedule_type="1",ServerID="cn_gf01"):
@@ -500,7 +497,7 @@ async def GetSpiralAbyssInfo(Uid, ck,Schedule_type="1",ServerID="cn_gf01"):
             data = json.loads(req.text)
         return data
     except:
-        print("1访问失败，请重试！")
+        print("1获取深渊信息失败，请重试！")
         #sys.exit(1)
 
 
@@ -524,7 +521,7 @@ def GetCharacter(Uid,Character_ids, ck,ServerID="cn_gf01"):
         data2 = json.loads(req.text)
         return data2
     except:
-        print("访问失败，请重试！")
+        print("获取人物信息失败，请重试！")
         #sys.exit(1)
 
 async def GetMysInfo(mysid,ck):
@@ -542,7 +539,8 @@ async def GetMysInfo(mysid,ck):
             data = json.loads(req.text)
         return data
     except:
-        im = "err"
+        im = "err，获取米游社信息失败，请重试！"
+        print(im)
         return im
         
 async def GetWeaponInfo(name):
@@ -556,17 +554,22 @@ async def GetWeaponInfo(name):
     return data
 
 async def GetCharInfo(name,mode = 0):
-    str = ""
-    if mode == 1:
-        str = "&talents=1"
-    elif mode == 2:
-        str = "&constellations=1"
-        
-    async with AsyncClient() as client:
-        req = await client.get(
-            url="https://genshin.minigg.cn/?char=" + name + str,
-            headers={
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36',
-                'Referer': 'https://genshin.minigg.cn/index.html'})
-        data = json.loads(req.text)
-    return data
\ No newline at end of file
+    try:
+        str = ""
+        if mode == 1:
+            str = "&talents=1"
+        elif mode == 2:
+            str = "&constellations=1"
+            
+        async with AsyncClient() as client:
+            req = await client.get(
+                url="https://genshin.minigg.cn/?char=" + name + str,
+                headers={
+                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36',
+                    'Referer': 'https://genshin.minigg.cn/index.html'})
+            data = json.loads(req.text)
+        return data
+    except:
+        im = "获取人物信息失败，请重试！"
+        print(im)
+        return im