Add support for global acceleration downlink traffic in charts (#78)

Author: sy-records

cos-sdk-v5/src/Monitor/Charts.php

@@ -97,7 +97,8 @@ public static function traffic($data)
         $series = [
             ['name' => '外网下行流量', 'data' => $data['internet']],
             ['name' => '内网下行流量', 'data' => $data['internal']],
-            ['name' => 'CDN 回源流量', 'data' => $data['cdn']]
+            ['name' => 'CDN 回源流量', 'data' => $data['cdn']],
+            ['name' => '全球加速下行流量', 'data' => $data['accelerate']],
         ];
 
         return self::generateChartScript('cos-traffic-chart', '流量', $series, $data['date'], 'MB');

cos-sdk-v5/src/Monitor/DataPoints.php

@@ -25,6 +25,7 @@ class DataPoints
     const METRIC_STORAGE = 'StdStorage'; // 标准存储-存储空间
     const METRIC_OBJECT_NUMBER = 'StdObjectNumber'; // 标准存储-对象数量
 
+    const METRIC_ACCELER_TRAFFIC_DOWN = 'AccelerTrafficDown'; // 全球加速下行流量
     const METRIC_INTERNET_TRAFFIC = 'InternetTraffic'; // 外网下行流量
     const METRIC_INTERNAL_TRAFFIC = 'InternalTraffic'; // 内网下行流量
     const METRIC_CDN_ORIGIN_TRAFFIC = 'CdnOriginTraffic'; // CDN 回源流量
@@ -252,11 +253,15 @@ public function getTraffic()
         $params = $this->buildParams(self::METRIC_CDN_ORIGIN_TRAFFIC);
         $cdn = $this->request($params);
 
+        $params = $this->buildParams(self::METRIC_ACCELER_TRAFFIC_DOWN);
+        $accelerate = $this->request($params);
+
         return [
             'date' => $date,
             'internet' => array_map([$this, 'bytes2MB'], $internet->Values ?? []),
             'internal' => array_map([$this, 'bytes2MB'], $internal->Values ?? []),
             'cdn' => array_map([$this, 'bytes2MB'], $cdn->Values ?? []),
+            'accelerate' => array_map([$this, 'bytes2MB'], $accelerate->Values ?? []),
         ];
     }
 

readme.txt

@@ -5,7 +5,7 @@ Tags: COS, 腾讯云, 对象存储, Tencent, Qcloud
 Requires at least: 4.6
 Tested up to: 6.7
 Requires PHP: 7.2
-Stable tag: 2.6.2
+Stable tag: 2.6.3
 License: Apache2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0.html
 
@@ -105,6 +105,7 @@ License URI: http://www.apache.org/licenses/LICENSE-2.0.html
 
 = Stable =
 
+- Add support for global acceleration downlink traffic in charts
 - Fix URL style appending logic
 
 = Other =

sync-qcloud-cos.php

@@ -3,7 +3,7 @@
 Plugin Name: Sync QCloud COS
 Plugin URI: https://qq52o.me/2518.html
 Description: 使用腾讯云对象存储服务 COS 作为附件存储空间。(Using Tencent Cloud Object Storage Service COS as Attachment Storage Space.)
-Version: 2.6.2
+Version: 2.6.3
 Author: 沈唁
 Author URI: https://qq52o.me
 License: Apache2.0
@@ -27,7 +27,7 @@
 use SyncQcloudCos\Monitor\DataPoints;
 use SyncQcloudCos\Object\Head;
 
-define('COS_VERSION', '2.6.2');
+define('COS_VERSION', '2.6.3');
 define('COS_PLUGIN_SLUG', 'sync-qcloud-cos');
 define('COS_PLUGIN_PAGE', plugin_basename(dirname(__FILE__)) . '%2F' . basename(__FILE__));
 
@@ -131,12 +131,11 @@ function cos_check_bucket($cos_options)
         } elseif ($errorCode == ErrorCode::ACCESS_DENIED) {
             $message = '<code>SecretID</code> 或 <code>SecretKey</code> 有误，请检查配置信息！';
         }
-        echo "<div class='error'><p><strong>{$message}</strong></p></div>";
     } catch (\Throwable $e) {
         $message = (string)$e;
-        echo "<div class='error'><p><strong>{$message}</strong></p></div>";
     }
 
+    echo "<div class='error'><p><strong>{$message}</strong></p></div>";
     return false;
 }
 
@@ -561,14 +560,14 @@ function cos_delete_remote_attachment($post_id)
 add_action('delete_attachment', 'cos_delete_remote_attachment');
 
 // 当upload_path为根目录时，需要移除URL中出现的“绝对路径”
-function cos_modefiy_img_url($url, $post_id)
+function cos_modify_img_url($url, $post_id)
 {
     // 移除 ./ 和 项目根路径
     return str_replace(['./', get_home_path()], '', $url);
 }
 
 if (cos_get_option('upload_path') == '.') {
-    add_filter('wp_get_attachment_url', 'cos_modefiy_img_url', 30, 2);
+    add_filter('wp_get_attachment_url', 'cos_modify_img_url', 30, 2);
 }
 
 function cos_sanitize_file_name($filename)
@@ -938,7 +937,7 @@ function cos_sync_setting_form($cos_options)
                     <input type="hidden" name="type" value="qcloud_cos_all">
                     <td>
                         <input type="submit" class="button button-secondary" value="开始同步"/>
-                        <p><b>注意：如果是首次同步，执行时间将会非常长（根据你的历史附件数量），有可能会因为执行时间过长，导致页面显示超时或者报错。<br> 所以，建议附件数量过多的用户，直接使用官方的<a target="_blank" rel="nofollow" href="https://cloud.tencent.com/document/product/436/63143">COSCLI 工具</a>进行迁移，具体可参考<a target="_blank" rel="nofollow" href="https://qq52o.me/2809.html">使用 COSCLI 快速迁移本地数据到 COS</a></b></p>
+                        <p><b>注意：如果是首次同步，执行时间将会非常长（根据你的历史附件数量），有可能会因为执行时间过长，导致页面显示超时或者报错。<br> 所以建议附件数量过多的用户，直接使用官方的<a target="_blank" rel="nofollow" href="https://cloud.tencent.com/document/product/436/63143">COSCLI 工具</a>进行迁移，具体可参考<a target="_blank" rel="nofollow" href="https://qq52o.me/2809.html">使用 COSCLI 快速迁移本地数据到 COS</a></b></p>
                     </td>
                 </tr>
             </table>
@@ -1104,7 +1103,7 @@ function cos_ci_image_slim_page($options)
                           <input type="checkbox" name="ci_image_slim_mode[]" value="API" {$checked_mode_api} />
                           <span class="slider round"></span>
                         </label>
-                        <p>开通极智压缩的 API 使用方式，开通后可在图片时通过极智压缩参数（需要配置配置图片处理样式<code>?imageSlim</code>）对图片进行压缩；</p>
+                        <p>开通极智压缩的 API 使用方式，开通后可在图片时通过极智压缩参数（需要配置图片处理样式<code>?imageSlim</code>）对图片进行压缩；</p>
                     </td>
                 </tr>
                 <tr>
@@ -1383,7 +1382,7 @@ function cos_document_page($options)
     }
 
     $disableSubmit = !$status ? 'disabled=disabled' : '';
-    $disableMessage = !$status ? "<p>如需使用请先访问 <a href='https://console.cloud.tencent.com/ci/bucket?bucket={$bucket}&region={$options['regional']}&type=document' target='_blank'>腾讯云控制台</a>开启。</p>" : '';
+    $disableMessage = !$status ? "<p>如需使用请先访问 <a href='https://console.cloud.tencent.com/ci/bucket?bucket={$bucket}&region={$options['regional']}&type=document' target='_blank'>腾讯云控制台</a> 开启。</p>" : '';
 
     return <<<EOF
         <form method="post">