修改类目接口异常判断

task_worker.py

@@ -10,7 +10,7 @@ from service.hub_ import closeBrowser
 from service.login import login
 from service.login import login
 from service.sync_shop import syncShop, syncShopInfo
 from service.sync_shop import syncShop, syncShopInfo
 from service.upload_video import upload_video
 from service.upload_video import upload_video
-from utils.errors import AppError, ABogusParamsError
+from utils.errors import AppError, ABogusParamsError, CookiesExpiredError
 
 
 
 
 @shared_task(name='sync_shop')
 @shared_task(name='sync_shop')
@@ -26,7 +26,7 @@ def execute_sync_shop(container_name: str):
             'error_type': ''
             'error_type': ''
         }
         }
     except AppError as e:
     except AppError as e:
-        logger.error(f'店铺同步异常:{e}')
+        logger.error(f'店铺同步异常:{e.msg}')
         return {
         return {
             'code': e.code,
             'code': e.code,
             'msg': e.msg,
             'msg': e.msg,
@@ -59,7 +59,7 @@ def execute_sync_shop_info(browser_id: str, listen_url: str, open_url: str):
             'error_type': ''
             'error_type': ''
         }
         }
     except AppError as e:
     except AppError as e:
-        logger.error(f'同步店铺信息异常:{e}')
+        logger.error(f'同步店铺信息异常:{e.msg}')
         return {
         return {
             'code': e.code,
             'code': e.code,
             'msg': e.msg,
             'msg': e.msg,
@@ -89,7 +89,7 @@ def execute_sync_create_template(cookies: dict, template_params: dict, proxies:
             'error_type': ''
             'error_type': ''
         }
         }
     except AppError as e:
     except AppError as e:
-        logger.error(f'创建运费模板异常:{e}')
+        logger.error(f'创建运费模板异常:{e.msg}')
         return {
         return {
             'code': e.code,
             'code': e.code,
             'msg': e.msg,
             'msg': e.msg,
@@ -117,7 +117,7 @@ def execute_doudian_login(account: str, password: str, headers: dict, proxies: d
             'error_type': ''
             'error_type': ''
         }
         }
     except AppError as e:
     except AppError as e:
-        logger.error(f'登录异常:{e}')
+        logger.error(f'登录异常:{e.msg}')
         return {
         return {
             'code': e.code,
             'code': e.code,
             'msg': e.msg,
             'msg': e.msg,
@@ -145,7 +145,7 @@ def execute_doudian_upload_video(task: dict):
             'error_type': ''
             'error_type': ''
         }
         }
     except AppError as e:
     except AppError as e:
-        logger.error(f'上传视频异常:{e}')
+        logger.error(f'上传视频异常:{e.msg}')
         return {
         return {
             'code': e.code,
             'code': e.code,
             'msg': e.msg,
             'msg': e.msg,
@@ -186,7 +186,9 @@ def execute_get_schema(headers: dict, proxy_url: str, category_id: str):
     """获取类目参数"""
     """获取类目参数"""
     try:
     try:
         response = get_schema(headers, proxy_url, category_id)
         response = get_schema(headers, proxy_url, category_id)
-        if response.text and response.json().get('code') == 0:
+        if not response.text:
+            raise ABogusParamsError(data=response.text)
+        if response.json().get('code') == 0:
             result = response.json().get('data', {})
             result = response.json().get('data', {})
             return {
             return {
                 'code': 200,
                 'code': 200,
@@ -194,9 +196,12 @@ def execute_get_schema(headers: dict, proxy_url: str, category_id: str):
                 'data': result,
                 'data': result,
                 'error_type': ''
                 'error_type': ''
             }
             }
-        raise ABogusParamsError(data=response.text)
+        elif response.json().get('code') == 10004 or response.json().get('code') == 10008:
+            raise CookiesExpiredError(data=response.text)
+        raise AppError(msg=response.json().get('message'), data=response.text)
+
     except AppError as e:
     except AppError as e:
-        logger.error(f'获取类目参数失败-->{e}')
+        logger.error(f'获取类目参数失败-->{e.msg}')
         return {
         return {
             'code': e.code,
             'code': e.code,
             'msg': e.msg,
             'msg': e.msg,