From 1d3cf3b7d3b65f32b9e25b1b2598b93dcfc84d04 Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Tue, 16 Jul 2019 11:30:53 +0800
Subject: [PATCH] fix some error

---
 ad_interface.py         | 20 -------------
 ad_interface_tornado.py |  6 +---
 add_task_1min.py        | 30 --------------------
 adlist.py               | 63 -----------------------------------------
 server.py               |  1 +
 up_oss.py               |  1 +
 6 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 ad_interface.py
 delete mode 100644 add_task_1min.py
 delete mode 100644 adlist.py

diff --git a/ad_interface.py b/ad_interface.py
deleted file mode 100644
index 47bb5bc..0000000
--- a/ad_interface.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-# pip install flask-restful
-from flask import Flask, jsonify
-from flask_restful import reqparse, abort, Api, Resource
-from log.mylog import define_logger
-import logging
-from adlist import Adlist
-
-define_logger("/data/logs/promotion.log")
-log = logging.getLogger(__name__)
-
-app = Flask(__name__)
-api = Api(app)
-
-# 设置路由
-api.add_resource(Adlist, '/adlist')
-
-if __name__ == '__main__':
-	app.run(host='0.0.0.0', debug=True, port=7777)
diff --git a/ad_interface_tornado.py b/ad_interface_tornado.py
index a05faf8..86a5c7d 100644
--- a/ad_interface_tornado.py
+++ b/ad_interface_tornado.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-import os
-import json
-import time
-import hashlib
-import urllib.request
+# 推广系统对外接口，提供与客户端之间的广告信息接口及每分钟执行一次的缓存变更操作
 import tornado.ioloop
 import tornado.web
 import json
diff --git a/add_task_1min.py b/add_task_1min.py
deleted file mode 100644
index 7779706..0000000
--- a/add_task_1min.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- coding:utf-8 -*-
-from tornado import web, ioloop
-import datetime
-import time
-
-class MainHandler(web.RequestHandler):
-	def get(self):
-		self.write('Hello Kingsome, I am alive!')
-
-
-def add_task():
-	# print '2s ', datetime.datetime.now()
-	time.sleep(2)
-	print(
-	"执行f2s")
-
-
-def remove_task():
-	# print '5s ', datetime.datetime.now()
-	print(
-	"执行f5s")
-
-
-if __name__ == '__main__':
-	application = web.Application([(r'/', MainHandler), ])
-	application.listen(8081)
-	ioloop.PeriodicCallback(add_task, 2000).start()  # start scheduler 每隔2s执行一次f2s
-	ioloop.PeriodicCallback(remove_task, 5000).start()  # start scheduler 每隔5s执行一次f5s
-	ioloop.IOLoop.instance().start()
\ No newline at end of file
diff --git a/adlist.py b/adlist.py
deleted file mode 100644
index ebbeda1..0000000
--- a/adlist.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-# pip install flask-restful
-from flask import Flask, jsonify
-from flask_restful import reqparse, abort, Api, Resource
-from log.mylog import define_logger
-import logging
-from mysql.mmysql import MysqlBase
-from config import mysql_promotion_config
-from myredis.myredis import my_redis, expire_time
-import datetime
-
-define_logger("/data/logs/adlist.log")
-log = logging.getLogger(__name__)
-
-parser = reqparse.RequestParser()
-parser.add_argument('gameid')
-parser.add_argument('locationid')
-parser.add_argument('num')
-
-parser.add_argument('begin_time')
-parser.add_argument('end_time')
-parser.add_argument('ad_num')
-parser.add_argument('ad_title')
-parser.add_argument('ad_body')
-parser.add_argument('ad_image')
-parser.add_argument('ad_url')
-parser.add_argument('ad_sort')
-parser.add_argument('status')
-parser.add_argument('companyid')
-mydb = MysqlBase(**mysql_promotion_config)
-
-
-class Adlist(Resource):
-	def __init__(self):
-		self.args = parser.parse_args()
-		self.limit = 20
-
-	def init_ad(self):
-		# 初始化广告信息，将广告明细写入缓存Redis
-		pass
-
-
-	def get(self):
-		gameid = self.args['gameid']
-		locationid = self.args['locationid']
-		num = self.args['num'] or self.limit
-		if num > self.limit:
-			num = self.limit
-
-		now = datetime.datetime.today().strftime('%Y-%m-%d')
-		ad_list_per = my_redis.smembers(f"{gameid}#{locationid}#per")
-		ad_list_int = []
-		for i in range(num):
-			ad_list_int.append(my_redis.spop(f"{gameid}#{locationid}#{now}"))
-		ad_list = ad_list_int + ad_list_per
-
-		ad_info = []
-		for item in ad_list:
-			ad_info.append(my_redis.smembers[item])
-
-		return jsonify({'code': 200, 'message': {'total': len(ad_list), 'result': ad_info}})
-
diff --git a/server.py b/server.py
index fb79290..5113e7b 100644
--- a/server.py
+++ b/server.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 # pip install flask-restful
+# 内部接口入口，用于提供推广系统所需的位置，公司，广告的新增/删除/变更/返回列表等接口
 from flask import Flask, jsonify
 from flask_restful import reqparse, abort, Api, Resource
 from log.mylog import define_logger
diff --git a/up_oss.py b/up_oss.py
index 7c3032d..d8613f1 100644
--- a/up_oss.py
+++ b/up_oss.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# 文件上传接口，现网将部署到ops-manager服务器
 from __future__ import absolute_import
 # pip install flask-restful
 from flask import Flask, jsonify