Selaa lähdekoodia

去掉了', "

罗俊辉 11 kuukautta sitten
vanhempi
commit
8862a28107

+ 10 - 4
applications/routes.py

@@ -108,10 +108,16 @@ def Routes(mysql_client):
             port="recall_videos",
             trace_id=trace_id
         )
-        result = await recall_videos(
-            trace_id=trace_id,
-            mysql_client=mysql_client
-        )
+        try:
+            result = await recall_videos(
+                trace_id=trace_id,
+                mysql_client=mysql_client
+            )
+        except Exception as e:
+            result = {
+                "traceId": trace_id,
+                "error": e
+            }
         return jsonify(result)
 
     return my_blueprint

+ 7 - 4
applications/schedule/process_schedule.py

@@ -84,7 +84,6 @@ async def recall_videos(trace_id, mysql_client):
     vid_list = [vid1, vid2, vid3]
     unEmptyList = [i for i in vid_list if i]
     L = []
-    print(unEmptyList)
     if unEmptyList:
         logging(
             code="1002",
@@ -101,9 +100,13 @@ async def recall_videos(trace_id, mysql_client):
                 index=index
             )
             L.append(temp)
+        result = {
+            "traceId": trace_id,
+            "miniprogramList": L
+        }
 
     else:
-        L = {
+        result = {
             "traceId": trace_id,
             "Message": "No Videos Found now, Please try again in one minute"
         }
@@ -111,7 +114,7 @@ async def recall_videos(trace_id, mysql_client):
         code="1002",
         info="返回结果",
         function="process",
-        data=L,
+        data=result,
         trace_id=trace_id
     )
-    return L
+    return result

+ 11 - 10
applications/schedule/search_schedule.py

@@ -172,16 +172,17 @@ class SearchMethod(object):
                     info="通过baidu搜索失败---{}".format(text),
                     trace_id=trace_id,
                 )
-                xigua_result = xigua_search(keyword=text, sensitive_words=cls.s_words)
-                if xigua_result:
-                    return {"platform": "xg_search", "result": xigua_result[0]}
-                else:
-                    logging(
-                        code="7001",
-                        info="通过西瓜搜索失败---{}, 启用兜底方式".format(text),
-                        trace_id=trace_id,
-                    )
-                    return None
+                return None
+                # xigua_result = xigua_search(keyword=text, sensitive_words=cls.s_words)
+                # if xigua_result:
+                #     return {"platform": "xg_search", "result": xigua_result[0]}
+                # else:
+                #     logging(
+                #         code="7001",
+                #         info="通过西瓜搜索失败---{}, 启用兜底方式".format(text),
+                #         trace_id=trace_id,
+                #     )
+                #     return None
 
 
 async def video_sender(video_obj, user, trace_id, platform):

+ 1 - 1
hypercorn_config.toml

@@ -1,5 +1,5 @@
 reload = true
-bind = "0.0.0.0:9111"
+bind = "0.0.0.0:8111"
 workers = 4
 keep_alive_timeout = 120  # 保持连接的最大秒数,根据需要调整
 graceful_timeout = 30    # 重启或停止之前等待当前工作完成的时间