From d75fb1dce61a3883f5fe307f3ba016efbcf9b675 Mon Sep 17 00:00:00 2001
From: zyx0814 <zyx0814@163.com>
Date: Fri, 13 Sep 2024 16:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF=E4=BA=91?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=90=AB=E6=9C=89#=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=BC=A9=E7=95=A5=E5=9B=BE?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/io/io_QCOS.php | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/core/class/io/io_QCOS.php b/core/class/io/io_QCOS.php
index 9561386..bf68246 100644
--- a/core/class/io/io_QCOS.php
+++ b/core/class/io/io_QCOS.php
@@ -271,6 +271,7 @@
                 C::t('cache')->insert_cachedata_by_cachename($setarr,3600);
                 return $readperm;
             }
+
         }
         
         
@@ -683,10 +684,10 @@
                 }
                 if ($oscale > $nscale) {
                     //按宽度等比缩放
-                    return 'imageMogr2/format/'.$format.'/thumbnail/' . $width . 'x' . '/interlace/0 ';
+                    return 'imageMogr2/format/'.$format.'/thumbnail/' . $width . 'x' . '/interlace/0';
                 } else {
                     //按高度度等比缩放
-                    return 'imageMogr2/format/'.$format.'/thumbnail/x' . $height . '/interlace/0 ';
+                    return 'imageMogr2/format/'.$format.'/thumbnail/x' . $height . '/interlace/0';
                 }
             }
             
@@ -933,7 +934,12 @@
             else $thumbname = md5($data['path'].$data['thumbsign'].$extraflag).'_'.$data['thumbsign'].'.'.$thumbext;
             $thumbpath = $thumbpath.$thumbname;
             $defaultspace = $_G['setting']['defaultspacesetting'];
-            $cloudpath = $defaultspace['bz'].':'.$defaultspace['did'] . ':/' .$thumbpath;
+            if($defaultspace['bz'] == 'dzz::'){
+                $cloudpath = $defaultspace['bz'].'::/' .$thumbpath;
+            }else{
+                $cloudpath = $defaultspace['bz'].':'.$defaultspace['did'] . ':/' .$thumbpath;
+            }
+
             $return = IO::moveThumbFile($cloudpath,$url);
             if(isset($return['error'])){
                 return false;
@@ -1036,13 +1042,25 @@
             $hostdata = explode(':',$arr['hostname']);
             $bucketurl = $hostdata[0].'://'.$arr['bucket'].'.cos.'.$hostdata[1].'.myqcloud.com';
             if($readperm == 2  ){
-                $d = ($this->host) ? $this->host .'/'. $arr['object']:$bucketurl.'/'.$arr['object'];
+                $d = ($this->host) ? 'https://'.$this->host .'/'. $arr['object']:$bucketurl.'/'.$arr['object'];
             }else{
 
                 $d = $qcos->getObjectUrl($arr['bucket'], $arr['object'], '+120 minutes');
-                if($this->host) $d = str_replace($bucketurl,$this->host,$d);
-            }
+                if($this->host) {
+                    $secret_id = $this->qcos_config['credentials']['secretId'];
+                    $secret_key = $this->qcos_config['credentials']['secretKey'];
+                    $StartTimestamp = time();
+                    $EndTimestamp = $StartTimestamp + 7200;
 
+                    //请求头
+                    $headers = [];
+                    $fileUri = '/'. $arr['object'];
+                    $authorization = $this->get_authorization($secret_key,$secret_id,$StartTimestamp, $EndTimestamp, $fileUri, $headers);
+                    $d = 'https://'.$this->host .'/'. $arr['object'].'?'. $authorization;
+
+                }
+            }
+            $d = str_replace('#','%23',$d);
 
             return $d;
         }