正在显示
1 个修改的文件
包含
6 行增加
和
12 行删除
@@ -44,7 +44,7 @@ class SyncToEsCmd { | @@ -44,7 +44,7 @@ class SyncToEsCmd { | ||
44 | $data = $db->first(\Model\listsSql::first('`id` = '.$id)); | 44 | $data = $db->first(\Model\listsSql::first('`id` = '.$id)); |
45 | if($data){ | 45 | if($data){ |
46 | // 设置 进程 是否在运行 | 46 | // 设置 进程 是否在运行 |
47 | -// redis()->set('sync_my_pid:'.getmypid(),time(),86400); | 47 | + redis()->set('sync_my_pid:'.getmypid(),time(),86400); |
48 | 48 | ||
49 | $data['is_auto']=$db->count('select count(*) from `lists_auto` where `list_id` = '.$data['id']) ? 1 : 0; | 49 | $data['is_auto']=$db->count('select count(*) from `lists_auto` where `list_id` = '.$data['id']) ? 1 : 0; |
50 | 50 | ||
@@ -74,17 +74,11 @@ class SyncToEsCmd { | @@ -74,17 +74,11 @@ class SyncToEsCmd { | ||
74 | $data['uuid'] = $data['id']; | 74 | $data['uuid'] = $data['id']; |
75 | unset($data['id']); | 75 | unset($data['id']); |
76 | } | 76 | } |
77 | - if(!empty($data['from'])){ | ||
78 | - $data['from'] = [ | ||
79 | - 'email' => $data['from'], | ||
80 | - 'name' => $data['from_name']??'' | ||
81 | - ]; | ||
82 | - }else{ | ||
83 | - $data['from'] = [ | ||
84 | - 'email' => '', | ||
85 | - 'name' => '' | ||
86 | - ]; | ||
87 | - } | 77 | + |
78 | + $data['from'] = [ | ||
79 | + 'email' => $data['from'], | ||
80 | + 'name' => $data['from_name']??'' | ||
81 | + ]; | ||
88 | unset($data['from_name']); | 82 | unset($data['from_name']); |
89 | unset($data['date']); | 83 | unset($data['date']); |
90 | if(!empty($data['created_at'])){ | 84 | if(!empty($data['created_at'])){ |
-
请 注册 或 登录 后发表评论