Skip to content

Commit d7d58ae

Browse files
修复自动分群并自动发送的消息,因为没有传递参数,造成自动发送不正常的BUG
1 parent 21d7453 commit d7d58ae

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ghost_sa(鬼策)可以理解为不带前端界面的神策服务端。
2121

2222
4.移动端激活回调
2323

24-
5.站外阅读监测支持(也可用于邮件打开监测)
24+
5.站外阅读监测与服务端二维码返回支持(也可用于邮件打开监测)
2525

2626
6.根据用户行为,触发动作
2727

component/db_func.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def select_all_project():
360360
return result[0],result[1]
361361

362362
def select_usergroup_jobs_plan(project):
363-
sql = """select id,func,repeatable,priority from {project}_usergroup_plan where enable_policy in (8,28)""".format(project=project)
363+
sql = """select id,func,repeatable,priority,enable_policy from {project}_usergroup_plan where enable_policy in (8,28)""".format(project=project)
364364
result = do_tidb_select(sql=sql)
365365
return result[0],result[1]
366366

scheduler.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ def get_task_day():
2525
for plan in plan_result:
2626
times = get_next_time(timer = plan[2],current_time = int(time.time()))
2727
for time_1 in times:
28-
insert_scheduler_job(project = project[0],group_id = plan[0],datetime = time_1['time_int'],data = {'datetime_int':time_1['time_int'],'datetime_tuple':time_1['time_tuple'],'datetime':time.strftime("%Y-%m-%d %H:%M:%S", time_1['time_tuple']),'date':time.strftime("%Y-%m-%d", time_1['time_tuple']),'func':json.loads(plan[1])},priority=plan[3] if plan[3] else 13,status=16)
28+
func_loads = json.loads(plan[1])
29+
func_loads['args']['noti_status'] = plan[4]
30+
insert_scheduler_job(project = project[0],group_id = plan[0],datetime = time_1['time_int'],data = {'datetime_int':time_1['time_int'],'datetime_tuple':time_1['time_tuple'],'datetime':time.strftime("%Y-%m-%d %H:%M:%S", time_1['time_tuple']),'date':time.strftime("%Y-%m-%d", time_1['time_tuple']),'func':func_loads},priority=plan[3] if plan[3] else 13,status=16)
2931
write_to_log(filename = 'scheduler', defname = 'get_task_day', result = '项目'+str(project[0])+'计划'+str(plan[0])+'已添加时间'+time.strftime("%Y-%m-%d %H:%M:%S", time_1['time_tuple']))
3032
write_to_log(filename = 'scheduler', defname = 'get_task_day', result = '项目'+str(project[0])+'计划'+str(plan[0])+'已添加计划条目'+str(len(times)))
3133
def do_all_task():

0 commit comments

Comments
 (0)