From c08d24470897befad296a57f1d83d5f8943960e4 Mon Sep 17 00:00:00 2001
From: wuaho <wuaho@legu.cc>
Date: Tue, 28 Sep 2021 14:19:15 +0800
Subject: [PATCH] 111

---
 api/api_v1/check_data/service.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/api/api_v1/check_data/service.py b/api/api_v1/check_data/service.py
index 30d8f4e..4600472 100644
--- a/api/api_v1/check_data/service.py
+++ b/api/api_v1/check_data/service.py
@@ -72,15 +72,22 @@ async def check_data(game, data_in: schemas.CheckData):
         fail_list.append('<p style="color:yellow;font-size:17px;">警告：记录数大于一条</p>')
 
     for k, t in check_type.items():
-        if isinstance(df[k][0], str) and t == 'json':
-            try:
-                json.loads(df[k][0])
-                pass_list.append(f'<p style="color:green;font-size:17px;">通过：字段{k} 是期望的类型</p>')
-                continue
-            except:
+        if t == 'json':
+
+            if isinstance(df[k][0], str):
+                try:
+                    json.loads(df[k][0])
+                    pass_list.append(f'<p style="color:green;font-size:17px;">通过：字段{k} 是期望的类型</p>')
+                    continue
+                except:
+                    fail_list.append(
+                        f"""<p style="color:red;font-size:17px;">错误：字段{k} 期望{t}类型，不是json格式</p>""")
+                    continue
+            else:
                 fail_list.append(
-                    f"""<p style="color:red;font-size:17px;">错误：字段{k} 期望{t}类型，不是json格式</p>""")
+                    f"""<p style="color:red;font-size:17px;">错误：字段{k} 期望{t}类型，得到{re.findall("'(.*)'>", str(type(df[k][0])))[0]}</p>""")
                 continue
+
         if not isinstance(df[k][0], getattr(type_map, t)):
             fail_list.append(
                 f"""<p style="color:red;font-size:17px;">错误：字段{k} 期望{t}类型，得到->{re.findall("'(.*)'>", str(type(df[k][0])))[0]}</p>""")