MOD:merge master

data_manage/public_analysis.py

@@ -615,7 +615,7 @@ def advertisement_rank(user_id, start, end, type, page, page_size, order, order_
     max(is_video) as is_video,
     max(preview_url) as preview_url
     from dw_image_cost_day
-    where (1=1 {op1}  {op_or1})  
+    where  (1=1 {op1}  {op_or1})  
     {op4} {op5} {op8} {op10} {op11}  {op12}  
     {op_time_bigger} {op_time_small}
     group by campaign_id  

handlers/ApiHandler.py

@@ -15,3 +15,22 @@ class YgApiHandler(BaseHandler):
         self.write(json.dumps({"code":200,"msg":"ok"}))
 
 
+class TtApiHandler(BaseHandler):
+
+    def get(self):
+        print('今日头条',self.request.body.decode(encoding='utf-8'))
+        print(self.get_args())
+        path=self.get_args()["path"]
+        task_id=self.get_args()["taskId"]
+        print(path)
+        # MysqlUtils().quchen_text.execute(f"update yangguang_path set path='{path}' where task_id='{task_id}'")
+        self.write(json.dumps({"code":200,"msg":"ok"}))
+
+    def post(self):
+        print('今日头条',self.request.body.decode(encoding='utf-8'))
+        print(self.get_args())
+        path=self.get_args()["path"]
+        task_id=self.get_args()["taskId"]
+        print(path)
+        # MysqlUtils().quchen_text.execute(f"update yangguang_path set path='{path}' where task_id='{task_id}'")
+        self.write(json.dumps({"code":200,"msg":"ok"}))

urls.py

@@ -1,5 +1,5 @@
 from handlers.PitcherPanelHandler import *
-from handlers.ApiHandler import YgApiHandler
+from handlers.ApiHandler import YgApiHandler,TtApiHandler
 from handlers.GitHookHandler import *
 from handlers.PublicAnalysisHandler import *
 from handlers.TaskHandler import *
@@ -35,6 +35,9 @@ urls = [
     # 外部接口
     (r'/api/get_yangguang_data', YgApiHandler),  # 阳光订单回调接口
 
+    # 头条接口
+    (r'/api/get_toutiao_data', TtApiHandler),  # 阳光订单回调接口
+
     # web hook
     (r'/api/git_hook/data_center', DataCenerHook),
     (r'/api/git_hook/qc_web', QcWebHook),