From c52c6f2bfe7cc1c70d132793d0a4f4afb4afe704 Mon Sep 17 00:00:00 2001
From: forecho <caizhenghai@gmail.com>
Date: Thu, 17 Mar 2016 14:58:05 +0800
Subject: [PATCH] fix bug and update readme

---
 OSS.php   | 10 ++++++++--
 README.md | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/OSS.php b/OSS.php
index d5b5702..96dfcbf 100644
--- a/OSS.php
+++ b/OSS.php
@@ -172,11 +172,17 @@ public function createDir($dirName)
 
     /**
      * 获取 Bucket 中所有文件的文件名，返回 Array。
+     * @param array $options = [
+     *      'max-keys'  => max-keys用于限定此次返回object的最大数，如果不设定，默认为100，max-keys取值不能大于1000。
+     *      'prefix'    => 限定返回的object key必须以prefix作为前缀。注意使用prefix查询时，返回的key中仍会包含prefix。
+     *      'delimiter' => 是一个用于对Object名字进行分组的字符。所有名字包含指定的前缀且第一次出现delimiter字符之间的object作为一组元素
+     *      'marker'    => 用户设定结果从marker之后按字母排序的第一个开始返回。
+     * ]
      * @return array
      */
-    public function getAllObjectKey()
+    public function getAllObject($options = [])
     {
-        $objectListing = $this->getClient()->listObjects(['Bucket' => $this->bucket]);
+        $objectListing = $this->getClient()->listObjects($this->bucket, $options);
         $objectKeys = [];
         foreach ($objectListing->getObjectList() as $objectSummary) {
             $objectKeys[] = $objectSummary->getKey();
diff --git a/README.md b/README.md
index e4cf45d..78f4bfb 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,21 @@ components => [
 ```
 
 ```php
+/** @var \yiier\AliyunOSS\OSS $oss */
 $oss = \Yii::$app->get('oss');
 $fh = '/vagrant/php/baseapi/web/storage/image/824edb4e295892aedb8c49e4706606d6.png';
 $oss->upload('824edb4e295892aedb8c49e4706606d6.png', $fh);
+
+或者
+
+$oss->upload('storage/image/824edb4e295892aedb8c49e4706606d6.png', $fh); // 会自动创建文件夹
+
+其他用法
+
+$oss->createDir('storage/image/'); //创建文件夹
+$oss->delete('824edb4e295892aedb8c49e4706606d6.png'); // 删除文件
+$oss->delete('storage/image/824edb4e295892aedb8c49e4706606d6.png'); // 删除文件，如果这个文件是此文件夹的最后一个文件，则会把文件夹一起删除
+$oss->delete('storage/image/'); // 删除文件夹，但是要确保是空文件夹
+$oss->getAllObject(); // 获取根目录下的所有文件名，默认是100个
+$oss->getAllObject(['prefix' => 'storage/image/']); // 获取 `storage/image/` 目录下的所有文件名，默认是100个
 ```
\ No newline at end of file