|
@@ -20,7 +20,6 @@ def getSource():
|
|
|
try:
|
|
|
# 获取传入的params参数
|
|
|
get_data = request.args.to_dict()
|
|
|
- fields = get_data.get('fields')
|
|
|
# # 对参数进行操作
|
|
|
sql = 'select source, task_type, spider_name, machine, source_desc, task_type_desc, spider_name_desc from crawler_source'
|
|
|
|
|
@@ -28,16 +27,6 @@ def getSource():
|
|
|
if not result:
|
|
|
return jsonify({'code': '200', 'result': [], 'message': '没有更多数据'})
|
|
|
source_list = list()
|
|
|
-
|
|
|
- # [
|
|
|
- # {
|
|
|
- # 'description': task_type_desc,
|
|
|
- # 'type': [
|
|
|
- # {
|
|
|
- # 'spider_name': spider_name,
|
|
|
- # 'description': spider_name_desc
|
|
|
- # }
|
|
|
- # ],
|
|
|
for source, task_type, spider_name, machine, source_desc, task_type_desc, spider_name_desc in result:
|
|
|
source_dict = {
|
|
|
'task_type': [
|
|
@@ -64,8 +53,8 @@ def getSource():
|
|
|
@app.route("/v1/crawler/task/insert", methods=["POST"])
|
|
|
def insertTask():
|
|
|
try:
|
|
|
- data = request.form
|
|
|
- outer_info = data.get(('spider_link'))
|
|
|
+ data = request.json
|
|
|
+ outer_info = data.get('spider_link')
|
|
|
source = data.get('source')
|
|
|
exist_outer_info = list()
|
|
|
for link in outer_info:
|
|
@@ -75,6 +64,15 @@ def insertTask():
|
|
|
exist_outer_info.append(link)
|
|
|
if exist_outer_info:
|
|
|
return jsonify({'code': 200, 'message': '名单重复', 'repeat_list': exist_outer_info})
|
|
|
+
|
|
|
+ # 字段转换
|
|
|
+ data['min_publish_time'] = int(data['min_publish_time'] / 1000)
|
|
|
+ data['next_time'] = int(data['next_time'] / 1000)
|
|
|
+ data['insert_time'] = int(time.time())
|
|
|
+ data['update_time'] = int(time.time())
|
|
|
+ data['spider_link'] = str(data['spider_link'])
|
|
|
+ data['user_tag'] = ','.join(data['user_tag']) if data['user_tag'] else '',
|
|
|
+ data['user_content_tag'] = ','.join(data['user_content_tag']) if data['user_content_tag'] else '',
|
|
|
# 获取到一个以键且为逗号分隔的字符串,返回一个字符串
|
|
|
keys = ','.join(data.keys())
|
|
|
values = ','.join(['%s'] * len(data))
|
|
@@ -134,8 +132,8 @@ def getOneTask():
|
|
|
@app.route("/v1/crawler/task/update", methods=["POST"])
|
|
|
def updateTask():
|
|
|
try:
|
|
|
- task_id = request.form.get('task_id')
|
|
|
- spider_link = request.form.get('spider_link')
|
|
|
+ task_id = request.json.get('task_id')
|
|
|
+ spider_link = request.json.get('spider_link')
|
|
|
print(spider_link, task_id)
|
|
|
|
|
|
sql = f"""UPDATE crawler_task SET spider_link='{spider_link}' where task_id = {task_id}"""
|
|
@@ -160,16 +158,16 @@ def get_user_info(source):
|
|
|
@app.route("/v1/crawler/author/create", methods=["POST"])
|
|
|
def createUser():
|
|
|
get_media_url = 'http://videotest-internal.yishihui.com/longvideoapi/user/virtual/crawler/registerVirtualUser'
|
|
|
- spider_link = request.form.get('spider_link')
|
|
|
- source = request.form.get('source')
|
|
|
- task_type = request.form.get('task_type')
|
|
|
- applets_status = request.form.get('applets_status')
|
|
|
- app_status = request.form.get('app_status')
|
|
|
- user_tag = request.form.get('user_tag')
|
|
|
- user_content_tag = request.form.get('user_content_tag')
|
|
|
+ spider_link = request.json.get('spider_link')
|
|
|
+ source = request.json.get('source')
|
|
|
+ task_type = request.json.get('task_type')
|
|
|
+ applets_status = request.json.get('applets_status')
|
|
|
+ app_status = request.json.get('app_status')
|
|
|
+ user_tag = request.json.get('user_tag')
|
|
|
+ user_content_tag = request.json.get('user_content_tag')
|
|
|
success_list = list()
|
|
|
fail_list = list()
|
|
|
- for author_url in eval(spider_link):
|
|
|
+ for author_url in spider_link:
|
|
|
try:
|
|
|
post_data = {
|
|
|
# 'count': 1, # (必须)账号个数:传1
|
|
@@ -195,8 +193,8 @@ def createUser():
|
|
|
task_type=task_type,
|
|
|
applets_status=applets_status,
|
|
|
app_status=app_status,
|
|
|
- user_tag=user_tag,
|
|
|
- user_content_tag=user_content_tag,
|
|
|
+ user_tag=','.join(user_tag) if user_tag else '',
|
|
|
+ user_content_tag=','.join(user_content_tag) if user_content_tag else '',
|
|
|
insert_time=int(time.time()),
|
|
|
update_time=int(time.time())
|
|
|
)
|