ck 4 rokov pred
rodič
commit
bb4583bb29
3 zmenil súbory, kde vykonal 11 pridanie a 2 odobranie
  1. 9 1
      handlers/GitHookHandler.py
  2. 1 1
      handlers/PitcherPanelHandler.py
  3. 1 0
      urls.py

+ 9 - 1
handlers/GitHookHandler.py

@@ -1,7 +1,7 @@
 from handlers.HandlerBase import BaseHandler
 import os
 from model import DingTalkUtils
-
+import json
 
 class DataCenerHook(BaseHandler):
 
@@ -19,3 +19,11 @@ class QcWebHook(BaseHandler):
         val2 = os.popen('cd /root/dev/QcWebServer && git pull')  # dev
         DingTalkUtils.send('QcWebServer代码更新:\n[master]\n '+val.read()+'\n[dev]\n'+val2.read())
         self.write('ok')
+
+
+class GetVersion(BaseHandler):
+    def get(self):
+        version = "v1.2.1"
+        msg = "1.原公众号总数据变为投手数据中投手投放号 2.现公众号总数据一个公众号一条数据 "
+
+        self.write(json.dumps({"version": version, "msg": msg}))

+ 1 - 1
handlers/PitcherPanelHandler.py

@@ -188,7 +188,7 @@ class ChannelPitcherSummary(BaseHandler):
             state = arg.get("state")
             start = arg.get("start")
             end = arg.get("end")
-            data, total, total_data = get_channel_summary(user_id,channel, pitcher, page, page_size, order_by, order, state, location,start,end)
+            data, total, total_data = get_pitcher_channel_summary(user_id,channel, pitcher, page, page_size, order_by, order, state, location,start,end)
             if arg.get("download"):
                 self.write_download("channel_"+str(int(time.time())), data)
             else:

+ 1 - 0
urls.py

@@ -7,6 +7,7 @@ from handlers import OperateHandler
 
 
 urls = [
+    (r'/data/version',GetVersion),  # 获取版本号
     (r'/data/pitcher_panel/daily', PitcherPanelDaily),  # 投手日期汇总
     (r'/data/pitcher_panel/overview', PitcherPanelOverview),  # 投手今天概况
     (r'/data/channel_stat/overview', ChannelOverview),  # 公众号广告投放数据