优化同步

@@ -27,10 +27,9 @@ class SyncToEsCmd {
 //        pcntl_signal(SIGHUP, $handler);
 //        pcntl_signal(SIGHUP, $handler);
 
 
 
 
-        $es = (new Lib\Es\Es('hg_ai_emails'));
+        $es = es();
         $db = db();
         $db = db();
 
 
-
         while (1){
         while (1){
 
 
             // 检查是否接收到信号
             // 检查是否接收到信号
@@ -42,24 +41,24 @@ class SyncToEsCmd {
             }
             }
 
 
             $id = redis()->lPop('sync_to_es');
             $id = redis()->lPop('sync_to_es');
+            $code = 500;
             if($id){
             if($id){
-                $data = $db->throw()->first(\Model\listsSql::first('`id` = '.$id));
+                $data = $db->first(\Model\listsSql::first('`id` = '.$id));
                 if($data){
                 if($data){
                     // 设置 进程 是否在运行
                     // 设置 进程 是否在运行
-                    $data['is_auto']=$db->throw()->count('select count(*) from `lists_auto` where `list_id` = '.$data['id']) ? 1 : 0;
+                    $data['is_auto']=$db->count('select count(*) from `lists_auto` where `list_id` = '.$data['id']) ? 1 : 0;
 
 
                     $data = $this->getEsData($data);
                     $data = $this->getEsData($data);
                     $doc_id = $data['email_id'].'_'.$data['folder_id'].'_'.$data['uid'];
                     $doc_id = $data['email_id'].'_'.$data['folder_id'].'_'.$data['uid'];
 
 
                     $code = $es->save($doc_id,$data);
                     $code = $es->save($doc_id,$data);
+                }
+            }
+
             if($code!==200){
             if($code!==200){
                 @file_put_contents(LOG_PATH.'/sync_es_fail.log',$id."\n",FILE_APPEND);
                 @file_put_contents(LOG_PATH.'/sync_es_fail.log',$id."\n",FILE_APPEND);
-                        redis()->rPush('sync_to_es',$id);
                 _echo('同步es: '.$doc_id.'===>'.$code);
                 _echo('同步es: '.$doc_id.'===>'.$code);
             }
             }
-                    continue;
-                }
-            }
 
 
             sleep(1);
             sleep(1);
         }
         }

@@ -28,7 +28,7 @@ class MailListV2Es extends Base {
 
 
     public function __construct()
     public function __construct()
     {
     {
-        $this->es = new Es('hg_ai_emails');
+        $this->es = \es();
     }
     }
 
 
     /**
     /**

@@ -629,3 +629,13 @@ function minMaxToArray($min, $max,$len=1000) {
 
 
     return $result;
     return $result;
 }
 }
+
+/**
+ * es
+ * @return \Lib\Es\Es
+ * @author：dc
+ * @time 2025/3/8 23:13
+ */
+function es(){
+    return (new Lib\Es\Es('email_ai_emails',['https://ai-email:3mLbEKwDX9YjUDFm@172.19.0.56:9200']));
+}

@@ -18,7 +18,7 @@ class Es {
 //    private $host = 'https://es-az664rii.public.tencentelasticsearch.com:9200'; // aicc 服务器
 //    private $host = 'https://es-az664rii.public.tencentelasticsearch.com:9200'; // aicc 服务器
     private $host = [
     private $host = [
 //        'http://elastic:1qOtfZhqy4B7IXdIpl_W@192.168.80.129:9200',
 //        'http://elastic:1qOtfZhqy4B7IXdIpl_W@192.168.80.129:9200',
-        'http://elastic:L6PY7r4FsHmEBYFK@127.0.0.1:9200',
+//        'https://ai-email:3mLbEKwDX9YjUDFm@172.19.0.56:9200'
 //        'https://ai-email:3mLbEKwDX9YjUDFm@172.19.0.56:9200'
 //        'https://ai-email:3mLbEKwDX9YjUDFm@172.19.0.56:9200'
     ]; //内网地址  公网要加ip白名单
     ]; //内网地址  公网要加ip白名单