|
@@ -7,6 +7,9 @@ from sqlalchemy import Table
|
|
|
import json
|
|
|
import time
|
|
|
|
|
|
+layout_create_action = 'layout_create'
|
|
|
+ad_plan_create_action = 'ad_plan_create'
|
|
|
+
|
|
|
|
|
|
def run(user_id, log_ad, db, cookie_canuse):
|
|
|
sql_session = db.DBSession()
|
|
@@ -140,7 +143,7 @@ def create_layout(user_id, layout_name, wechat_json, log_ad, db, cookie_canuse):
|
|
|
wechat_json = json.loads(wechat_json)
|
|
|
for _ in wechat_json:
|
|
|
action_info = {'user_id': user_id, 'service_name': _['service_name'], 'wechat_name': _['wechat_name'],
|
|
|
- 'action_type': json.dumps({'action_type': 'layout_create', 'object_name': layout_name}),
|
|
|
+ 'action_type': json.dumps({'action_type': layout_create_action, 'object_name': layout_name}),
|
|
|
'status': 'todo'}
|
|
|
record_insert = sql_tools.save_action_record(action_record_info=action_info,
|
|
|
table_action_record=action_record_table)
|
|
@@ -170,12 +173,13 @@ def create_layout(user_id, layout_name, wechat_json, log_ad, db, cookie_canuse):
|
|
|
except:
|
|
|
pass
|
|
|
# TODO:截图,传回错误信息
|
|
|
-
|
|
|
- sql_tools.action_record(res, sql_session, user_id, layout_name, action_record_table, service_name, wechat_name)
|
|
|
+ action_type = layout_create_action
|
|
|
+ sql_tools.action_record(res, sql_session, action_type, user_id, layout_name, action_record_table, service_name,
|
|
|
+ wechat_name)
|
|
|
log_ad.refresh_driver()
|
|
|
|
|
|
# 成功一个record,更新一个record
|
|
|
- log_ad.driver.quite()
|
|
|
+ log_ad.driver.quit()
|
|
|
|
|
|
|
|
|
def create_ad_plan(user_id, ad_plan_name, wechat_json, log_ad, db, cookie_canuse):
|
|
@@ -187,6 +191,7 @@ def create_ad_plan(user_id, ad_plan_name, wechat_json, log_ad, db, cookie_canuse
|
|
|
action_record_table = Table('action_record', db.metadata,
|
|
|
autoload=True, autoload_with=db.engine)
|
|
|
sql_session = db.DBSession()
|
|
|
+ action_type = ad_plan_create_action
|
|
|
# 等待页面加载完成
|
|
|
|
|
|
# 1.cookies保存
|
|
@@ -220,7 +225,8 @@ def create_ad_plan(user_id, ad_plan_name, wechat_json, log_ad, db, cookie_canuse
|
|
|
layout_name = typesetting_dict['idea']['jump_type-page_type']
|
|
|
if not sql_tools.check_layout_alive(sql_session, service_name, wechat_name, layout_name):
|
|
|
res = {'sucess': False, 'result_info': '公众号对应落地页未创建'}
|
|
|
- sql_tools.action_record(res, sql_session, user_id, ad_plan_name, action_record_table, service_name,
|
|
|
+ sql_tools.action_record(res, sql_session, action_type, user_id, ad_plan_name, action_record_table,
|
|
|
+ service_name,
|
|
|
wechat_name)
|
|
|
continue
|
|
|
if sql_tools.check_plan_alive(sql_session, service_name, wechat_name, ad_plan_name):
|
|
@@ -241,7 +247,8 @@ def create_ad_plan(user_id, ad_plan_name, wechat_json, log_ad, db, cookie_canuse
|
|
|
pass
|
|
|
# 截图,传回错误信息
|
|
|
|
|
|
- sql_tools.action_record(res, sql_session, user_id, ad_plan_name, action_record_table, service_name, wechat_name)
|
|
|
+ sql_tools.action_record(res, sql_session, action_type, user_id, ad_plan_name, action_record_table, service_name,
|
|
|
+ wechat_name)
|
|
|
log_ad.refresh_driver()
|
|
|
|
|
|
# 成功一个record,更新一个record
|