From c2c90842c393d9d1b0f9696bdbe78f07cf331dc7 Mon Sep 17 00:00:00 2001 From: pengtao Date: Wed, 23 Oct 2019 15:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E6=80=A7=E5=8C=96?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_channel/gamelog_external.py | 4 ++-- data_channel/mp2shushu.py | 4 ++-- data_channel/produce_ss_csv.py | 4 ++-- {ops => myops}/__init__.py | 0 {ops => myops}/csv/1004_button_name.csv | 0 {ops => myops}/csv/2001_b_n.csv | 0 {ops => myops}/csv/2001_b_n.csv.old | 0 {ops => myops}/csv/gameid.csv | 0 {ops => myops}/mansible.py | 0 {ops => myops}/mmysql.py | 0 {ops => myops}/mpsetting.py | 0 {ops => myops}/mylog.py | 0 {ops => myops}/ss_virtual_create.py | 6 +++--- web.py | 6 +++--- 14 files changed, 12 insertions(+), 12 deletions(-) rename {ops => myops}/__init__.py (100%) rename {ops => myops}/csv/1004_button_name.csv (100%) rename {ops => myops}/csv/2001_b_n.csv (100%) rename {ops => myops}/csv/2001_b_n.csv.old (100%) rename {ops => myops}/csv/gameid.csv (100%) rename {ops => myops}/mansible.py (100%) rename {ops => myops}/mmysql.py (100%) rename {ops => myops}/mpsetting.py (100%) rename {ops => myops}/mylog.py (100%) rename {ops => myops}/ss_virtual_create.py (94%) diff --git a/data_channel/gamelog_external.py b/data_channel/gamelog_external.py index 0c7f196..dcc55b6 100644 --- a/data_channel/gamelog_external.py +++ b/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__) diff --git a/data_channel/mp2shushu.py b/data_channel/mp2shushu.py index a0b226e..f01d63c 100644 --- a/data_channel/mp2shushu.py +++ b/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) diff --git a/data_channel/produce_ss_csv.py b/data_channel/produce_ss_csv.py index 45910db..87a9dad 100644 --- a/data_channel/produce_ss_csv.py +++ b/data_channel/produce_ss_csv.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- import pdb -from ops.mpsetting import Mpdata +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 diff --git a/ops/__init__.py b/myops/__init__.py similarity index 100% rename from ops/__init__.py rename to myops/__init__.py diff --git a/ops/csv/1004_button_name.csv b/myops/csv/1004_button_name.csv similarity index 100% rename from ops/csv/1004_button_name.csv rename to myops/csv/1004_button_name.csv diff --git a/ops/csv/2001_b_n.csv b/myops/csv/2001_b_n.csv similarity index 100% rename from ops/csv/2001_b_n.csv rename to myops/csv/2001_b_n.csv diff --git a/ops/csv/2001_b_n.csv.old b/myops/csv/2001_b_n.csv.old similarity index 100% rename from ops/csv/2001_b_n.csv.old rename to myops/csv/2001_b_n.csv.old diff --git a/ops/csv/gameid.csv b/myops/csv/gameid.csv similarity index 100% rename from ops/csv/gameid.csv rename to myops/csv/gameid.csv diff --git a/ops/mansible.py b/myops/mansible.py similarity index 100% rename from ops/mansible.py rename to myops/mansible.py diff --git a/ops/mmysql.py b/myops/mmysql.py similarity index 100% rename from ops/mmysql.py rename to myops/mmysql.py diff --git a/ops/mpsetting.py b/myops/mpsetting.py similarity index 100% rename from ops/mpsetting.py rename to myops/mpsetting.py diff --git a/ops/mylog.py b/myops/mylog.py similarity index 100% rename from ops/mylog.py rename to myops/mylog.py diff --git a/ops/ss_virtual_create.py b/myops/ss_virtual_create.py similarity index 94% rename from ops/ss_virtual_create.py rename to myops/ss_virtual_create.py index 6311ea4..1c43f9d 100644 --- a/ops/ss_virtual_create.py +++ b/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"}}, diff --git a/web.py b/web.py index 0cf0f87..eca53dc 100644 --- a/web.py +++ b/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.")