Merge branch 'master' of http://git.kingsome.cn/ops/ops_interface

data_channel/gamelog_external.py

@@ -2,8 +2,8 @@
 #被mp系统调用，用于同步(第三方传递日志需要)appkey到gamelog的相应配置文件
 import requests
 import logging
-from ops.mansible import AnsibleAPI
-from ops.mmysql import MysqlBase
+from myops.mansible import AnsibleAPI
+from myops.mmysql import MysqlBase
 import time
 from config.config import args
 log = logging.getLogger(__name__)

data_channel/mp2shushu.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import requests
 import logging
-from ops.ss_virtual_create import SS_Virtual_command
+from myops.ss_virtual_create import SS_Virtual_command
 import json
 log = logging.getLogger(__name__)
 import pdb
@@ -9,7 +9,7 @@ import pdb
 class Mp2shushu():
     def __init__(self, gameid, channel):
         self.mp_url = f"http://10.10.5.4:2333/api/open/promotion/co-list?channelid={channel}&gameid={gameid}"
-        self.filename = "/data/git/ops_interface/ops/csv/2001_b_n.csv"
+        self.filename = "/data/git/ops_interface/myops/csv/2001_b_n.csv"
 
     def get_ad_list(self):
         r = requests.get(self.mp_url)

data_channel/produce_ss_csv.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 import pdb
-from ops.mp_interface import MpInterface
+from myops.mpsetting import Mpdata
 
 
 class ProduceSSCsv:
     def __init__(self):
-        # self.base_path = "/data/git/ops_interface/ops/csv"
+        # self.base_path = "/data/git/ops_interface/myops/csv"
         self.base_path = "/tmp/"
         self.gameid_list = [1004, 1001, 2001, 1011]
         self.channelid = 6001
@@ -19,7 +19,7 @@ class ProduceSSCsv:
 
 
     def run(self):
-        mi = MpInterface()
+        mi = Mpdata()
 
         for gameid in self.gameid_list:
             data = mi.get_co_list(gameid, self.channelid)

myops/csv/1004_button_name.csv

@@ -0,0 +1,53 @@
+button_name,button_name_cn
+mainrankbtn#main,排行榜点击次数(登录界面)
+addmoneybtn#main,金币加号点击次数(登录界面)
+settingbtn#main,设置点击次数(登录界面)
+signbtn#main,签到点击次数(登录界面)
+shopbtn#main,商店点击次数(登录界面)
+coinbtn#main,免费金币点击次数(登录界面)
+traderbtn#main,神秘商人点击次数(登录界面)
+cakehousebtn#main,蛋糕房点击次数(登录界面)
+offline_normal#,离线收益单倍领取人数(登录界面)
+offline_double#,离线收益三倍领取人数(登录界面)
+offline_update#1,升级一次离线收益人数(登录界面)
+offline_update#2,升级二次离线收益人数(登录界面)
+redpackbtn#main,红包点击次数(登录界面)
+settingbtn#game,设置点击次数(游戏界面)
+cakehousebtn#game,蛋糕房点击次数(游戏界面)
+traderbtn#game,神秘商人点击次数(游戏界面)
+addmoneybtn#game,金币加号点击次数(游戏界面)
+bookmarkbtn#main,收藏游戏的人数(游戏界面)
+customerbtn#game,点击客服次数(游戏界面)
+customer#bt_success,进入客服对话框人数(游戏界面)
+daygiftdouble#,开局弹框点击三倍奖励人数
+challengeCubeOpen#normal,超越好友宝箱开启数
+playrebornbtn#gameover,复活继续点击次数
+stagecookietoget#gameover,挽回损失点击人数
+stagedoubleget#gameover,双倍领取奖励人数
+buyquan#10001,兑换2元话费人数
+buyquan#10002,兑换5元话费人数
+buyquan#10003,兑换10元话费人数
+buyquan#10004,兑换15元话费人数
+buyquan#10005,兑换20元话费人数
+buyquan#10006,兑换50元话费人数
+buy#100,奶酪出售
+buy#101,草莓出售
+buy#102,奶油出售
+buy#103,葡萄出售
+buy#104,小麦出售
+buy#105,橘子出售
+buy#106,牛奶出售
+buy#107,桃子出售
+buy#108,柠檬出售
+buy#109,樱桃出售
+buy#110,巧克力出售
+buy#111,苹果出售
+buy#112,香料出售
+buy#113,黄油出售
+buy#114,冰块出售
+stageover#1,通过关卡1
+stageover#2,通过关卡2
+stageover#3,通过关卡3
+stageover#4,通过关卡4
+stageover#5,通过关卡5
+stageover#6,通过关卡6

myops/csv/2001_b_n.csv

@@ -0,0 +1,24 @@
+b_n,b_n_china
+wx5183864ab7af5343,火柴人挑战
+wxa279240fe15684bf,火柴人探险寻宝
+wx4553770d33651fff,蜗牛探险之旅
+wx411387cf980c03a4,植物斗僵尸
+wxf1439517533e8128,恐龙酷跑
+wx5c5ee0062bbe0f34,王者雪球推手
+wxb67f20e031a667b7,我要当国王
+wx734ec00e1e490bb5,猜字高手
+wx9c910aaee370b95d,疯狂滑板
+wx687b277ddffe3eaf,枪神计划
+wx0f396fa5d17034f7,超级求生
+wx06ce93cb02162dc1,完美救援
+wxbb0b00982cbd1b4f,蛋蛋环游世界
+wx7d84fae7fe8796d7,超神坦克
+wx9a09ef090c2eb911,锤子小英雄
+wxcc0126aec244ce23,冲鸭彩虹屁
+wx863a58ff6a6ef427,疯狂撸玉米
+wx40231b004aa2d01e,模拟停车
+wx93c5fb7591fe1aa3,火柴人弓箭手
+wxcd778c740cb72626,极速摩托车
+wx157a805b5675ccbb,枪火射击
+wx9626878ba22b417b,穿越大冒险
+wx81128cd788129605,完美切菜

myops/csv/2001_b_n.csv.old

@@ -0,0 +1,22 @@
+b_n,b_n_china
+wx5183864ab7af5343,火柴人挑战
+wxa279240fe15684bf,火柴人探险寻宝
+wx4553770d33651fff,蜗牛探险之旅
+wx5c5ee0062bbe0f34,王者雪球推手
+wxb67f20e031a667b7,我要当国王
+wx734ec00e1e490bb5,猜字高手
+wx9c910aaee370b95d,疯狂滑板
+wx411387cf980c03a4,植物斗僵尸
+wx0f396fa5d17034f7,超级求生
+wx06ce93cb02162dc1,完美救援
+wxf1439517533e8128,恐龙酷跑
+wxbb0b00982cbd1b4f,蛋蛋环游世界
+wx7d84fae7fe8796d7,超神坦克
+wx687b277ddffe3eaf,枪神计划
+wx9a09ef090c2eb911,锤子小英雄
+wxcc0126aec244ce23,冲鸭彩虹屁
+wx863a58ff6a6ef427,疯狂撸玉米
+wx40231b004aa2d01e,模拟停车
+wx93c5fb7591fe1aa3,火柴人弓箭手
+wxcd778c740cb72626,极速摩托车
+wx157a805b5675ccbb,枪火射击

myops/mpsetting.py

@@ -2,7 +2,7 @@
 import requests
 
 
-class MpInterface:
+class Mpdata:
 
     def __init__(self):
         self.base_url = "https://mp.kingsome.cn/api/open/cfg/all?"

myops/ss_virtual_create.py

@@ -34,7 +34,7 @@ class SS_Virtual_command:
 
 
     def upload_gameid(self):
-        filename = "/data/git/ops_interface/ops/csv/gameid.csv"
+        filename = "/data/git/ops_interface/myops/csv/gameid.csv"
         projectId = int(19)
         createParam = {"commonHeader": {"projectId": 19},
             "mainColumn": {"property": {"columnName": "gameid", "tableType": 0}},
@@ -54,7 +54,7 @@ class SS_Virtual_command:
 
 
     def upload_2001_b_n(self):
-        filename = "/data/git/ops_interface/ops/csv/2001_b_n.csv"
+        filename = "/data/git/ops_interface/myops/csv/2001_b_n.csv"
         projectId = int(22)
         createParam = {"commonHeader": {"projectId": 22},
             "mainColumn": {"property": {"columnName": "#vp@b_n", "tableType": 0, "subTableType": "vprop_sql"}},
@@ -73,7 +73,7 @@ class SS_Virtual_command:
             return False
 
     def upload_1004_button_name(self):
-        filename = "/data/git/ops_interface/ops/csv/1004_button_name.csv"
+        filename = "/data/git/ops_interface/myops/csv/1004_button_name.csv"
         projectId = int(19)
         createParam = {"commonHeader": {"projectId": 19},
             "mainColumn": {"property": {"columnName": "#vp@button_name", "tableType": 0, "subTableType": "vprop_sql"}},
@@ -95,9 +95,9 @@ class SS_Virtual_command:
 
 def main():
     ss = SS_Virtual_command()
-    ss.upload_gameid()
+    #ss.upload_gameid()
     #ss.upload_2001_b_n()
-    #ss.upload_1004_button_name()
+    ss.upload_1004_button_name()
 
 if __name__ == "__main__":
     main()

web.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-# ops 通用接口
+# myops 通用接口
 # python web.py --port=6013
 import tornado.ioloop
 import tornado.web
 import tornado.options
 from tornado import gen
 
-from ops.mylog import define_logger
+from myops.mylog import define_logger
 import logging
 
 from config.config import *
@@ -14,7 +14,7 @@ import pdb
 from data_channel.gamelog_external import Build_Gamelog_Config
 from data_channel.mp2shushu import Mp2shushu
 
-define_logger("/data/logs/ops/ops_interface.log")
+define_logger("/data/logs/myops/ops_interface.log")
 log = logging.getLogger(__name__)
 tornado.options.define("port", default=interface_port, type=int, help="run server on the given port.")