作者 邓超

es

@@ -74,7 +74,7 @@ class SyncMailToEs { @@ -74,7 +74,7 @@ class SyncMailToEs {
74 if(empty($this->data['is_auto'])){ 74 if(empty($this->data['is_auto'])){
75 $this->data['is_auto'] = 0; 75 $this->data['is_auto'] = 0;
76 } 76 }
77 - $this->es->create($this->data,$id); 77 + $this->es->create($this->getData($this->data),$id);
78 } 78 }
79 else if($this->table == 'lists_auto'){ 79 else if($this->table == 'lists_auto'){
80 $id = db()->first(listsSql::first($this->data['lists_id'],'`email_id`,`folder_id`,`uid`')); 80 $id = db()->first(listsSql::first($this->data['lists_id'],'`email_id`,`folder_id`,`uid`'));
@@ -98,13 +98,32 @@ class SyncMailToEs { @@ -98,13 +98,32 @@ class SyncMailToEs {
98 $lists = db()->all(listsSql::all($this->where,'`email_id`,`folder_id`,`uid`')); 98 $lists = db()->all(listsSql::all($this->where,'`email_id`,`folder_id`,`uid`'));
99 foreach ($lists as $list){ 99 foreach ($lists as $list){
100 $id = $list['email_id'].'_'.$list['folder_id'].'_'.$list['uid']; 100 $id = $list['email_id'].'_'.$list['folder_id'].'_'.$list['uid'];
101 - $this->es->update($id,$this->data); 101 + $this->es->update($id,$this->getData($this->data));
102 } 102 }
103 } 103 }
104 104
105 } 105 }
106 106
107 107
  108 + public function getData($data){
  109 + if(!empty($data['from'])){
  110 + $data['from'] = [
  111 + 'email' => $data['from'],
  112 + 'name' => $data['from_name']??''
  113 + ];
  114 + unset($data['from_name']);
  115 + }
  116 + unset($data['date']);
  117 + if(!empty($data['created_at'])){
  118 + $data['created_at'] = date('Y-m-d\TH:i:s',strtotime($data['created_at']));
  119 + }
  120 + if(!empty($data['updated_at'])){
  121 + $data['updated_at'] = date('Y-m-d\TH:i:s',strtotime($data['updated_at']));
  122 + }
  123 + $data['references'] = empty($data['references']) ? '' : $data['references'];
  124 + return $data;
  125 + }
  126 +
108 127
109 128
110 129