Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/DbQuery.php

@@ -132,10 +132,16 @@ class Home extends Base {
         if(app()->requestHas('from')){
         if(app()->requestHas('from')){
             // 如果是发件箱
             // 如果是发件箱
             if($folder == '发件箱'){
             if($folder == '发件箱'){
-                $where['to'] = app()->request('from');
-                if(!$where['to']){
+                $tos = app()->request('from');
+                if(!$tos){
                     // 不让查询数据
                     // 不让查询数据
                     $where['id'] = 0;
                     $where['id'] = 0;
+                }else {
+                    $tos = array_map(function ($v){
+                        return "find_in_set('".addcslashes($v,"'")."',`to`)";
+                    },is_array($tos) ? $tos : [$tos]);
+
+                    $where['_'][] = '('.implode(' or ',$tos).')';
                 }
                 }
             }else{
             }else{
                 $where['from'] = app()->request('from');
                 $where['from'] = app()->request('from');

@@ -28,6 +28,12 @@ trait DbQuery {
      */
      */
     protected int $cache = 0;
     protected int $cache = 0;
 
 
+    /**
+     * 没有数据时 也缓存
+     * @var bool
+     */
+    protected bool $cacheNoData = true;
+
 
 
     public function getClient()
     public function getClient()
     {
     {
@@ -51,8 +57,9 @@ trait DbQuery {
      * @author：dc
      * @author：dc
      * @time 2024/8/14 14:04
      * @time 2024/8/14 14:04
      */
      */
-    public function cache(int $ttl){
+    public function cache(int $ttl,bool $noData = true){
         $this->cache = $ttl;
         $this->cache = $ttl;
+        $this->cacheNoData = $noData;
         return $this;
         return $this;
     }
     }
 
 
@@ -254,9 +261,7 @@ trait DbQuery {
      * @time 2023/2/17 11:03
      * @time 2023/2/17 11:03
      */
      */
     public function value(string|array $sql){
     public function value(string|array $sql){
-
         return $this->getCacheData($sql,null,\PDO::FETCH_COLUMN);
         return $this->getCacheData($sql,null,\PDO::FETCH_COLUMN);
-
         $query = $this->query($sql);
         $query = $this->query($sql);
         if($query){
         if($query){
             return $query->fetch(\PDO::FETCH_COLUMN);
             return $query->fetch(\PDO::FETCH_COLUMN);
@@ -280,7 +285,13 @@ trait DbQuery {
             $key = 'data:'.md5(is_string($sql) ? $sql : json_encode($sql));
             $key = 'data:'.md5(is_string($sql) ? $sql : json_encode($sql));
             if(redis()->has($key)){
             if(redis()->has($key)){
                 $this->cache = 0;
                 $this->cache = 0;
-                return redis()->get($key,$default);
+                $data =  redis()->get($key,$default);
+                if(!$this->cacheNoData){
+                    if($data || $data === 0){
+                        return $data;
+                    }
+                }
+
             }
             }
         }
         }
         $query = $this->query($sql);
         $query = $this->query($sql);

@@ -251,7 +251,7 @@ class Mail {
         $blacklist = redis()->get('blacklist:'.$email_id);
         $blacklist = redis()->get('blacklist:'.$email_id);
         $blackFolder = '';
         $blackFolder = '';
         if($blacklist){
         if($blacklist){
-            $blackFolder = $db->value(folderSql::originFolder($email_id,'垃圾箱'));
+            $blackFolder = $db->cache(86400*30)->value(folderSql::originFolder($email_id,'垃圾箱'));
         }
         }
 
 
         //
         //
@@ -281,11 +281,11 @@ class Mail {
 
 
 
 
             $uids = array_column($uids,'UID');
             $uids = array_column($uids,'UID');
-            $existsUids = $db->all(listsSql::getUids($email_id,$folder_id,$uids));
-            if($existsUids){
-                $existsUids = array_column($existsUids,'uid');
-                // 获取不存在数据库的uid
-                $uids = array_diff($uids,$existsUids);
+            foreach ($uids as $k=>$uid){
+                if($db->cache(86400*30,false)->value(listsSql::first(dbWhere(['email_id'=>$email_id,'folder_id'=>$folder_id,'uid'=>$uid]),'count(*) as c'))){
+
+                    unset($uids[$k]);
+                }
             }
             }
         
         
 
 
@@ -313,7 +313,7 @@ class Mail {
             $unseen = $db->count(listsSql::listCount(dbWhere([
             $unseen = $db->count(listsSql::listCount(dbWhere([
                 'seen'  => 0,
                 'seen'  => 0,
                 'deleted'  => 0,
                 'deleted'  => 0,
-                'email_id'  => $email_id,
+                // 'email_id'  => $email_id,
                 'folder_id'  => $folder_id,
                 'folder_id'  => $folder_id,
             ])));
             ])));
             $db->update(
             $db->update(

@@ -37,14 +37,14 @@ class MailFun {
      * @time 2023/3/27 13:55
      * @time 2023/3/27 13:55
      */
      */
     public static function mb_coding(string $str,array $appcode=[]){
     public static function mb_coding(string $str,array $appcode=[]){
-        $str = trim($str," \t\n\r");
+        $str = trim($str);
         $str = (new Header())->decode($str);
         $str = (new Header())->decode($str);
-        try {
-            $encode = mb_detect_encoding($str, array("ASCII",'UTF-8',"GB2312","GBK",'BIG5'));
-            if($encode && $encode != 'UTF-8'){
-                $str = mb_convert_encoding($str, 'UTF-8', $encode);
-            }
-        }catch (\Throwable $e){}
+        // try {
+        //     $encode = mb_detect_encoding($str, array("ASCII",'UTF-8',"GB2312","GBK",'BIG5'));
+        //     if($encode && $encode != 'UTF-8'){
+        //         $str = mb_convert_encoding($str, 'UTF-8', $encode);
+        //     }
+        // }catch (\Throwable $e){}
 
 
 
 
         return $str;
         return $str;