x

@@ -13,13 +13,13 @@ use Model\listsSql;
  * @package Controller
  * @package Controller
  */
  */
 class Test {
 class Test {
- public function home(){
-     return 404;
- }
+    public function home(){
+        return 404;
+    }
 
 
     public function a(){
     public function a(){
 
 
-return 404;
+// return 404;
 
 
 //        $urlGetSign = function ($mobile){
 //        $urlGetSign = function ($mobile){
 //            $time = time();
 //            $time = time();
@@ -82,35 +82,45 @@ return 404;
         $login = $imap->login();
         $login = $imap->login();
         if($login->isOk()) {
         if($login->isOk()) {
             $uid = (int) app()->request('uid');
             $uid = (int) app()->request('uid');
-             $page = (int) app()->request('page',1);
+            $page = (int) app()->request('page',1);
+            $f = app()->request('f','INBOX');
+
 //            foreach ($imap->getFolders()->all() as $a){
 //            foreach ($imap->getFolders()->all() as $a){
 //                echo $a->folder;
 //                echo $a->folder;
 //                echo '=>';
 //                echo '=>';
 //                echo $a->getParseFolder();
 //                echo $a->getParseFolder();
 //                echo '|';
 //                echo '|';
 //            };
 //            };
-            $folder = $imap->folder('INBOX');
-            
+            $folder = $imap->folder($f=='INBOX'?$f:base64_decode($f));
+
             if($uid){
             if($uid){
                 $msg = $folder->msg()->uid([$uid])->get()->first();
                 $msg = $folder->msg()->uid([$uid])->get()->first();
-                
+
                 return $msg->body->getHtml();
                 return $msg->body->getHtml();
             }
             }
-            
-            
+            echo "<div style='display: flex'><div style='width: 200px;'>";
+
+            foreach ($imap->getFolders()->all() as $fl){
+                echo "<p><a href=\"?mid={$email['id']}&f=".base64_encode($fl->folder)."\">".($fl->getParseFolder())."</a></p>";
+            }
+
+            echo "</div><div>";
+
             echo '总共有：';
             echo '总共有：';
             echo $folder->getTotal();
             echo $folder->getTotal();
             echo "<br>";
             echo "<br>";
             echo "<br>";
             echo "<br>";
-            echo '<a href="?mid='.$email['id'].'&page='.($page+1).'">下一页</a>';
+            echo '<a href="?mid='.$email['id'].'&page='.($page-1).'&f='.$f.'">上一页</a>';
+            echo '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+            echo '<a href="?mid='.$email['id'].'&page='.($page+1).'&f='.$f.'">下一页</a>';
             echo "<br>";
             echo "<br>";
             echo "<hr>";
             echo "<hr>";
 
 
 
 
             $msgs = $folder->msg()->forPage($page)->get();
             $msgs = $folder->msg()->forPage($page)->get();
             if ($msgs) {
             if ($msgs) {
-                $msgs->each(function ($msg) use($email){
-                    echo '<p><a href="?mid='.$email['id'].'&uid='.$msg->uid.'">'.$msg->uid.'==>'.$msg->header->getSubject().' =====> '.date('Y-m-d H:i:s',strtotime($msg->date)).'</a></p>';
+                $msgs->each(function ($msg) use($email,$f){
+                    echo '<p><a href="?mid='.$email['id'].'&uid='.$msg->uid.'&f='.$f.'">'.$msg->uid.'==>'.$msg->header->getSubject().' =====> '.date('Y-m-d H:i:s',strtotime($msg->date)).'</a></p>';
                 });
                 });
 //                echo $msg->header->getSubject();
 //                echo $msg->header->getSubject();
 //                echo '<br>-------------------------------------------------<br>';
 //                echo '<br>-------------------------------------------------<br>';
@@ -132,6 +142,7 @@ return 404;
             echo $login->getMessage();
             echo $login->getMessage();
         }
         }
 
 
+        echo "</div></div>";
     }
     }
 
 
 
 

@@ -134,6 +134,10 @@ class MailListV2Es2 extends Base {
         $where['source'] = 2; // ai邮件群体
         $where['source'] = 2; // ai邮件群体
         if(count($this->getEmails('id')) == 1) $where['email_id'] = $this->getEmails('id');
         if(count($this->getEmails('id')) == 1) $where['email_id'] = $this->getEmails('id');
 
 
+        if($ids){
+            unset($where['is_hots'],$where['is_auto']);
+        }
+
         $query = [
         $query = [
             'bool'=>[
             'bool'=>[
                 'must'  =>  []
                 'must'  =>  []