ComposerUpdate

build.cmd

@@ -1,6 +1,3 @@
 @echo off
-@title Composer Plugs Update and Optimize
 @rmdir /s/q vendor thinkphp
-composer update --profile --prefer-dist --optimize-autoloader
-composer dump-autoload --optimize
-exit
+composer update --profile --prefer-dist --no-dev --optimize-autoloader

composer.json

@@ -3,7 +3,7 @@
   "name": "zoujingli/thinkadmin",
   "license": "MIT",
   "homepage": "http://demo.thinkadmin.top",
-  "description": "ThinkAdmin Developer CMF",
+  "description": "ThinkAdmin Developer Framework",
   "authors": [
     {
       "name": "Anyon",
@@ -19,11 +19,5 @@
     "aliyuncs/oss-sdk-php": "^2.2",
     "topthink/think-captcha": "^2.0",
     "zoujingli/weopen-developer": "^1.1"
-  },
-  "repositories": {
-    "packagist": {
-      "type": "composer",
-      "url": "https://packagist.laravel-china.org"
-    }
   }
 }

thinkphp/composer.json

@@ -26,7 +26,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0",
         "johnkary/phpunit-speedtrap": "^1.0",
-        "mikey179/vfsStream": "~1.6",
+        "mikey179/vfsstream": "~1.6",
         "phploc/phploc": "2.*",
         "sebastian/phpcpd": "2.*",
         "squizlabs/php_codesniffer": "2.*",

thinkphp/helper.php

@@ -686,7 +686,13 @@ if (!function_exists('widget')) {
      */
     function widget($name, $data = [])
     {
-        return app()->action($name, $data, 'widget');
+        $result = app()->action($name, $data, 'widget');
+
+        if (is_object($result)) {
+            $result = $result->getContent();
+        }
+
+        return $result;
     }
 }
 

thinkphp/library/think/App.php

@@ -20,7 +20,7 @@ use think\route\Dispatch;
  */
 class App extends Container
 {
-    const VERSION = '5.1.35 LTS';
+    const VERSION = '5.1.39 LTS';
 
     /**
      * 当前模块路径
@@ -179,6 +179,11 @@ class App extends Container
 
         $this->instance('app', $this);
 
+        // 加载环境变量配置文件
+        if (is_file($this->rootPath . '.env')) {
+            $this->env->load($this->rootPath . '.env');
+        }
+
         $this->configExt = $this->env->get('config_ext', '.php');
 
         // 加载惯例配置文件
@@ -196,11 +201,6 @@ class App extends Container
             'vendor_path'  => $this->rootPath . 'vendor' . DIRECTORY_SEPARATOR,
         ]);
 
-        // 加载环境变量配置文件
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
-        }
-
         $this->namespace = $this->env->get('app_namespace', $this->namespace);
         $this->env->set('app_namespace', $this->namespace);
 

thinkphp/library/think/Collection.php

@@ -353,7 +353,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
                 $result = isset($data[$field]) ? $data[$field] : null;
             }
 
-            switch ($operator) {
+            switch (strtolower($operator)) {
                 case '===':
                     return $result === $value;
                 case '!==':

thinkphp/library/think/Console.php

@@ -487,7 +487,10 @@ class Console
     public function getNamespaces()
     {
         $namespaces = [];
-        foreach ($this->commands as $command) {
+        foreach ($this->commands as $name => $command) {
+            if (is_string($command)) {
+                $namespaces = array_merge($namespaces, $this->extractAllNamespaces($name));
+            } else {
                 $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
 
                 foreach ($command->getAliases() as $alias) {
@@ -495,6 +498,8 @@ class Console
                 }
             }
 
+        }
+
         return array_values(array_unique(array_filter($namespaces)));
     }
 

thinkphp/library/think/Controller.php

@@ -158,7 +158,7 @@ class Controller
      */
     protected function fetch($template = '', $vars = [], $config = [])
     {
-        return $this->view->fetch($template, $vars, $config);
+        return Response::create($template, 'view')->assign($vars)->config($config);
     }
 
     /**
@@ -171,7 +171,7 @@ class Controller
      */
     protected function display($content = '', $vars = [], $config = [])
     {
-        return $this->view->display($content, $vars, $config);
+        return Response::create($content, 'view')->assign($vars)->config($config)->isContent(true);
     }
 
     /**

thinkphp/library/think/Log.php

@@ -127,8 +127,10 @@ class Log implements LoggerInterface
         }
 
         if (PHP_SAPI == 'cli') {
+            if (empty($this->config['level']) || in_array($type, $this->config['level'])) {
                 // 命令行日志实时写入
                 $this->write($msg, $type, true);
+            }
         } else {
             $this->log[$type][] = $msg;
         }

thinkphp/library/think/Model.php

@@ -571,7 +571,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                 $this->autoRelationUpdate();
             }
 
-            return false;
+            return true;
         } elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
             // 自动写入更新时间
             $data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
@@ -780,12 +780,19 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         // 删除条件
         $pk = $this->getPk();
 
+        $where = [];
         if (is_string($pk) && isset($this->data[$pk])) {
             $where[] = [$pk, '=', $this->data[$pk]];
-        } elseif (!empty($this->updateWhere)) {
-            $where = $this->updateWhere;
-        } else {
-            $where = null;
+        } elseif (is_array($pk)) {
+            foreach ($pk as $field) {
+                if (isset($this->data[$field])) {
+                    $where[] = [$field, '=', $this->data[$field]];
+                }
+            }
+        }
+
+        if (empty($where)) {
+            $where = empty($this->updateWhere) ? null : $this->updateWhere;
         }
 
         return $where;

thinkphp/library/think/Request.php

@@ -682,6 +682,7 @@ class Request
                 // 判断URL里面是否有兼容模式参数
                 $pathinfo = $_GET[$this->config['var_pathinfo']];
                 unset($_GET[$this->config['var_pathinfo']]);
+                unset($this->get[$this->config['var_pathinfo']]);
             } elseif ($this->isCli()) {
                 // CLI模式下 index.php module/controller/action/params/...
                 $pathinfo = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
@@ -702,6 +703,10 @@ class Request
                 }
             }
 
+            if (!empty($pathinfo)) {
+                unset($this->get[$pathinfo], $this->request[$pathinfo]);
+            }
+
             $this->pathinfo = empty($pathinfo) || '/' == $pathinfo ? '' : ltrim($pathinfo, '/');
         }
 
@@ -1039,7 +1044,7 @@ class Request
 
     protected function getInputData($content)
     {
-        if (false !== strpos($this->contentType(), 'application/json') || 0 === strpos($content, '{"')) {
+        if (false !== strpos($this->contentType(), 'json')) {
             return (array) json_decode($content, true);
         } elseif (strpos($content, '=')) {
             parse_str($content, $data);
@@ -1631,6 +1636,16 @@ class Request
         return false;
     }
 
+    /**
+     * 当前是否JSON请求
+     * @access public
+     * @return bool
+     */
+    public function isJson()
+    {
+        return false !== strpos($this->type(), 'json');
+    }
+
     /**
      * 当前是否Ajax请求
      * @access public

thinkphp/library/think/Url.php

@@ -130,7 +130,9 @@ class Url
             // 匹配路由命名标识
             $url = $match[0];
 
+            if ($domain) {
                 $domain = $match[1];
+            }
 
             if (!is_null($match[2])) {
                 $suffix = $match[2];
@@ -347,6 +349,7 @@ class Url
     // 匹配路由地址
     public function getRuleUrl($rule, &$vars = [], $allowDomain = '')
     {
+        $port = $this->app['request']->port();
         foreach ($rule as $item) {
             list($url, $pattern, $domain, $suffix, $method) = $item;
 
@@ -354,8 +357,8 @@ class Url
                 continue;
             }
 
-            if (!in_array($this->app['request']->port(), [80, 443])) {
-                $domain .= ':' . $this->app['request']->port();
+            if ($port && !in_array($port, [80, 443])) {
+                $domain .= ':' . $port;
             }
 
             if (empty($pattern)) {
@@ -363,11 +366,12 @@ class Url
             }
 
             $type = $this->config['url_common_param'];
+            $keys = [];
 
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
                     $url    = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
-                    unset($vars[$key]);
+                    $keys[] = $key;
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } elseif (2 == $val) {
@@ -375,10 +379,14 @@ class Url
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } else {
+                    $result = null;
+                    $keys   = [];
                     break;
                 }
             }
 
+            $vars = array_diff_key($vars, array_flip($keys));
+
             if (isset($result)) {
                 return $result;
             }

thinkphp/library/think/Validate.php

@@ -519,7 +519,7 @@ class Validate
 
         if (isset($this->append[$field])) {
             // 追加额外的验证规则
-            $rules = array_unique(array_merge($rules, $this->append[$field]));
+            $rules = array_unique(array_merge($rules, $this->append[$field]), SORT_REGULAR);
         }
 
         $i      = 0;
@@ -570,7 +570,7 @@ class Validate
                     $result = str_replace(':attribute', $title, $result);
 
                     if (strpos($result, ':rule') && is_scalar($rule)) {
-                        $msg = str_replace(':rule', (string) $rule, $result);
+                        $result = str_replace(':rule', (string) $rule, $result);
                     }
                 }
 
@@ -934,8 +934,8 @@ class Validate
             if (isset($rule[2])) {
                 $imageType = strtolower($rule[2]);
 
-                if ('jpeg' == $imageType) {
-                    $imageType = 'jpg';
+                if ('jpg' == $imageType) {
+                    $imageType = 'jpeg';
                 }
 
                 if (image_type_to_extension($type, false) != $imageType) {
@@ -1514,12 +1514,12 @@ class Validate
             $scene = $this->currentScene;
         }
 
+        $this->only = $this->append = $this->remove = [];
+
         if (empty($scene)) {
             return;
         }
 
-        $this->only = $this->append = $this->remove = [];
-
         if (method_exists($this, 'scene' . $scene)) {
             call_user_func([$this, 'scene' . $scene]);
         } elseif (isset($this->scene[$scene])) {

thinkphp/library/think/View.php

@@ -160,7 +160,10 @@ class View
      */
     public function filter($filter)
     {
+        if ($filter) {
             $this->filter = $filter;
+        }
+
         return $this;
     }
 

thinkphp/library/think/cache/Driver.php

@@ -249,7 +249,6 @@ abstract class Driver
     {
         if ($this->tag) {
             $key       = $this->getTagkey($this->tag);
-            $prev      = $this->tag;
             $this->tag = null;
 
             if ($this->has($key)) {
@@ -266,7 +265,6 @@ abstract class Driver
             }
 
             $this->set($key, $value, 0);
-            $this->tag = $prev;
         }
     }
 
@@ -360,4 +358,9 @@ abstract class Driver
     {
         return $this->writeTimes;
     }
+
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->handler, $method], $args);
+    }
 }

thinkphp/library/think/cache/driver/File.php

@@ -278,11 +278,13 @@ class File extends Driver
             if (is_dir($path)) {
                 $matches = glob($path . DIRECTORY_SEPARATOR . '*.php');
                 if (is_array($matches)) {
-                    array_map('unlink', $matches);
+                    array_map(function ($v) {
+                        $this->unlink($v);
+                    }, $matches);
                 }
                 rmdir($path);
             } else {
-                unlink($path);
+                $this->unlink($path);
             }
         }
 

thinkphp/library/think/cache/driver/Memcached.php

@@ -67,7 +67,7 @@ class Memcached extends Driver
         }
 
         $this->handler->addServers($servers);
-
+        $this->handler->setOption(\Memcached::OPT_COMPRESSION, false);
         if ('' != $this->options['username']) {
             $this->handler->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
             $this->handler->setSaslAuthData($this->options['username'], $this->options['password']);
@@ -232,7 +232,7 @@ class Memcached extends Driver
                 $this->handler->delete($tagName);
             }
 
-            if (!$this->handler->has($tagName)) {
+            if (!$this->has($tagName)) {
                 $this->handler->set($tagName, '');
             }
 
@@ -255,7 +255,7 @@ class Memcached extends Driver
         if ($this->tag) {
             $tagName = $this->getTagKey($this->tag);
 
-            if ($this->handler->has($tagName)) {
+            if ($this->has($tagName)) {
                 $this->handler->append($tagName, ',' . $name);
             } else {
                 $this->handler->set($tagName, $name);

thinkphp/library/think/db/Builder.php

@@ -313,9 +313,10 @@ abstract class Builder
                     // 使用闭包查询
                     $newQuery = $query->newQuery()->setConnection($this->connection);
                     $value($newQuery);
-                    $whereClause = $this->buildWhere($query, $newQuery->getOptions('where'));
+                    $whereClause = $this->buildWhere($newQuery, $newQuery->getOptions('where'));
 
                     if (!empty($whereClause)) {
+                        $query->bind($newQuery->getBind(false));
                         $str[] = ' ' . $logic . ' ( ' . $whereClause . ' )';
                     }
                 } elseif (is_array($field)) {
@@ -407,7 +408,7 @@ abstract class Builder
             $jsonType = $query->getJsonFieldType($field);
             $bindType = $this->connection->getFieldBindType($jsonType);
         } else {
-            $bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
+            $bindType = isset($binds[$field]) && 'LIKE' != $exp ? $binds[$field] : PDO::PARAM_STR;
         }
 
         if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
@@ -450,7 +451,7 @@ abstract class Builder
         // 模糊匹配
         if (is_array($value)) {
             foreach ($value as $item) {
-                $name    = $query->bind($item, $bindType);
+                $name    = $query->bind($item, PDO::PARAM_STR);
                 $array[] = $key . ' ' . $exp . ' :' . $name;
             }
 
@@ -604,6 +605,10 @@ abstract class Builder
             $value = $this->parseClosure($query, $value);
         }
 
+        if ('=' == $exp && is_null($value)) {
+            return $key . ' IS NULL';
+        }
+
         return $key . ' ' . $exp . ' ' . $value;
     }
 
@@ -651,7 +656,6 @@ abstract class Builder
             $value = $value->getValue();
         } else {
             $value = array_unique(is_array($value) ? $value : explode(',', $value));
-
             $array = [];
 
             foreach ($value as $k => $v) {
@@ -659,10 +663,13 @@ abstract class Builder
                 $array[] = ':' . $name;
             }
 
+            if (count($array) == 1) {
+                return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0];
+            } else {
                 $zone  = implode(',', $array);
-
                 $value = empty($zone) ? "''" : $zone;
             }
+        }
 
         return $key . ' ' . $exp . ' (' . $value . ')';
     }

thinkphp/library/think/db/Connection.php

@@ -1246,22 +1246,14 @@ abstract class Connection
      * @access public
      * @param  Query     $query 查询对象
      * @param  string    $field   字段名
-     * @param  bool      $default   默认值
+     * @param  mixed     $default   默认值
+     * @param  bool      $one   是否返回一个值
      * @return mixed
      */
-    public function value(Query $query, $field, $default = null)
+    public function value(Query $query, $field, $default = null, $one = true)
     {
         $options = $query->getOptions();
 
-        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
-            $cache  = $options['cache'];
-            $result = $this->getCacheData($query, $cache, null, $key);
-
-            if (false !== $result) {
-                return $result;
-            }
-        }
-
         if (isset($options['field'])) {
             $query->removeOption('field');
         }
@@ -1271,7 +1263,19 @@ abstract class Connection
         }
 
         $query->setOption('field', $field);
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            $cache  = $options['cache'];
+            $result = $this->getCacheData($query, $cache, null, $key);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if ($one) {
             $query->setOption('limit', 1);
+        }
 
         // 生成查询SQL
         $sql = $this->builder->select($query);
@@ -1320,7 +1324,7 @@ abstract class Connection
 
         $field = $aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $this->builder->parseKey($query, $field, true) . ') AS tp_' . strtolower($aggregate);
 
-        return $this->value($query, $field, 0);
+        return $this->value($query, $field, 0, false);
     }
 
     /**
@@ -1335,16 +1339,6 @@ abstract class Connection
     {
         $options = $query->getOptions();
 
-        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
-            // 判断查询缓存
-            $cache  = $options['cache'];
-            $result = $this->getCacheData($query, $cache, null, $guid);
-
-            if (false !== $result) {
-                return $result;
-            }
-        }
-
         if (isset($options['field'])) {
             $query->removeOption('field');
         }
@@ -1362,6 +1356,16 @@ abstract class Connection
 
         $query->setOption('field', $field);
 
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            // 判断查询缓存
+            $cache  = $options['cache'];
+            $result = $this->getCacheData($query, $cache, null, $guid);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
         // 生成查询SQL
         $sql = $this->builder->select($query);
 
@@ -1463,9 +1467,7 @@ abstract class Connection
             $value = is_array($val) ? $val[0] : $val;
             $type  = is_array($val) ? $val[1] : PDO::PARAM_STR;
 
-            if (self::PARAM_FLOAT == $type) {
-                $value = (float) $value;
-            } elseif (PDO::PARAM_STR == $type) {
+            if ((self::PARAM_FLOAT == $type || PDO::PARAM_STR == $type) && is_string($value)) {
                 $value = '\'' . addslashes($value) . '\'';
             } elseif (PDO::PARAM_INT == $type && '' === $value) {
                 $value = 0;
@@ -1499,7 +1501,7 @@ abstract class Connection
                 if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
                     $val[0] = 0;
                 } elseif (self::PARAM_FLOAT == $val[1]) {
-                    $val[0] = (float) $val[0];
+                    $val[0] = is_string($val[0]) ? (float) $val[0] : $val[0];
                     $val[1] = PDO::PARAM_STR;
                 }
 

thinkphp/library/think/db/Query.php

@@ -95,14 +95,14 @@ class Query
      * @var array
      */
     protected $timeRule = [
-        'today'      => ['today', 'tomorrow'],
-        'yesterday'  => ['yesterday', 'today'],
-        'week'       => ['this week 00:00:00', 'next week 00:00:00'],
-        'last week'  => ['last week 00:00:00', 'this week 00:00:00'],
-        'month'      => ['first Day of this month 00:00:00', 'first Day of next month 00:00:00'],
-        'last month' => ['first Day of last month 00:00:00', 'first Day of this month 00:00:00'],
-        'year'       => ['this year 1/1', 'next year 1/1'],
-        'last year'  => ['last year 1/1', 'this year 1/1'],
+        'today'      => ['today', 'tomorrow -1second'],
+        'yesterday'  => ['yesterday', 'today -1second'],
+        'week'       => ['this week 00:00:00', 'next week 00:00:00 -1second'],
+        'last week'  => ['last week 00:00:00', 'this week 00:00:00 -1second'],
+        'month'      => ['first Day of this month 00:00:00', 'first Day of next month 00:00:00 -1second'],
+        'last month' => ['first Day of last month 00:00:00', 'first Day of this month 00:00:00 -1second'],
+        'year'       => ['this year 1/1', 'next year 1/1 -1second'],
+        'last year'  => ['last year 1/1', 'this year 1/1 -1second'],
     ];
 
     /**
@@ -133,7 +133,27 @@ class Query
      */
     public function newQuery()
     {
-        return new static($this->connection);
+        $query = new static($this->connection);
+
+        if ($this->model) {
+            $query->model($this->model);
+        }
+
+        if (isset($this->options['table'])) {
+            $query->table($this->options['table']);
+        } else {
+            $query->name($this->name);
+        }
+
+        if (isset($this->options['json'])) {
+            $query->json($this->options['json'], $this->options['json_assoc']);
+        }
+
+        if (isset($this->options['field_type'])) {
+            $query->setJsonFieldType($this->options['field_type']);
+        }
+
+        return $query;
     }
 
     /**
@@ -562,12 +582,12 @@ class Query
                 default:
                     if (function_exists($type)) {
                         // 支持指定函数哈希
-                        $seq = (ord(substr($type($value), 0, 1)) % $rule['num']) + 1;
-                    } else {
-                        // 按照字段的首字母的值分表
-                        $seq = (ord($value{0}) % $rule['num']) + 1;
+                        $value = $type($value);
                     }
+
+                    $seq = (ord(substr($value, 0, 1)) % $rule['num']) + 1;
             }
+
             return $this->getTable() . '_' . $seq;
         }
         // 当设置的分表字段不在查询条件或者数据中
@@ -1512,6 +1532,7 @@ class Query
     {
         if ($field instanceof $this) {
             $this->options['where'] = $field->getOptions('where');
+            $this->bind($field->getBind(false));
             return $this;
         }
 
@@ -1527,7 +1548,7 @@ class Query
         }
 
         if ($field instanceof Expression) {
-            return $this->whereRaw($field, is_array($op) ? $op : []);
+            return $this->whereRaw($field, is_array($op) ? $op : [], $logic);
         } elseif ($strict) {
             // 使用严格模式查询
             $where = [$field, $op, $condition, $logic];
@@ -1538,7 +1559,7 @@ class Query
             $where = $field;
         } elseif (is_string($field)) {
             if (preg_match('/[,=\<\'\"\(\s]/', $field)) {
-                return $this->whereRaw($field, $op);
+                return $this->whereRaw($field, $op, $logic);
             } elseif (is_string($op) && strtolower($op) == 'exp') {
                 $bind = isset($param[2]) && is_array($param[2]) ? $param[2] : null;
                 return $this->whereExp($field, $condition, $bind, $logic);
@@ -2197,12 +2218,12 @@ class Query
     }
 
     /**
-     * 设置需要追加输出的属性
+     * 设置需要附加的输出属性
      * @access public
-     * @param  array $append 需要追加的属性
+     * @param  array $append   属性列表
      * @return $this
      */
-    public function append(array $append)
+    public function append(array $append = [])
     {
         $this->options['append'] = $append;
         return $this;
@@ -2469,7 +2490,7 @@ class Query
         if (is_array($value)) {
             $this->bind = array_merge($this->bind, $value);
         } else {
-            $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_';
+            $name = $name ?: 'ThinkBind_' . (count($this->bind) + 1) . '_' . mt_rand() . '_';
 
             $this->bind[$name] = [$value, $type];
             return $name;
@@ -3355,13 +3376,13 @@ class Query
 
         // 输出属性控制
         if (!empty($options['visible'])) {
-            $result->visible($options['visible']);
+            $result->visible($options['visible'], true);
         } elseif (!empty($options['hidden'])) {
-            $result->hidden($options['hidden']);
+            $result->hidden($options['hidden'], true);
         }
 
         if (!empty($options['append'])) {
-            $result->append($options['append']);
+            $result->append($options['append'], true);
         }
 
         // 关联查询

thinkphp/library/think/db/builder/Mysql.php

@@ -62,7 +62,7 @@ class Mysql extends Builder
         $bind = $this->connection->getFieldsBind($options['table']);
 
         foreach ($dataSet as $k => $data) {
-            $data = $this->parseData($query, $data, $allowFields, $bind, '_' . $k);
+            $data = $this->parseData($query, $data, $allowFields, $bind);
 
             $values[] = '( ' . implode(',', array_values($data)) . ' )';
 
@@ -129,7 +129,7 @@ class Mysql extends Builder
             // JSON字段支持
             list($field, $name) = explode('->', $key, 2);
 
-            return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$.' . str_replace('->', '.', $name) . '\')';
+            return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')';
         } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
             list($table, $key) = explode('.', $key, 2);
 

thinkphp/library/think/db/connector/Mysql.php

@@ -136,7 +136,27 @@ class Mysql extends Connection
      */
     protected function getExplain($sql)
     {
-        $pdo    = $this->linkID->query("EXPLAIN " . $sql);
+        $pdo = $this->linkID->prepare("EXPLAIN " . $this->queryStr);
+
+        foreach ($this->bind as $key => $val) {
+            // 占位符
+            $param = is_int($key) ? $key + 1 : ':' . $key;
+
+            if (is_array($val)) {
+                if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
+                    $val[0] = 0;
+                } elseif (self::PARAM_FLOAT == $val[1]) {
+                    $val[0] = is_string($val[0]) ? (float) $val[0] : $val[0];
+                    $val[1] = PDO::PARAM_STR;
+                }
+
+                $result = $pdo->bindValue($param, $val[0], $val[1]);
+            } else {
+                $result = $pdo->bindValue($param, $val);
+            }
+        }
+
+        $pdo->execute();
         $result = $pdo->fetch(PDO::FETCH_ASSOC);
         $result = array_change_key_case($result);
 

thinkphp/library/think/exception/DbException.php

@@ -26,7 +26,7 @@ class DbException extends Exception
      * @param  string    $sql
      * @param  int       $code
      */
-    public function __construct($message, array $config, $sql, $code = 10500)
+    public function __construct($message, array $config = [], $sql = '', $code = 10500)
     {
         $this->message = $message;
         $this->code    = $code;

thinkphp/library/think/exception/ValidateException.php

@@ -18,7 +18,7 @@ class ValidateException extends \RuntimeException
     public function __construct($error, $code = 0)
     {
         $this->error   = $error;
-        $this->message = is_array($error) ? implode("\n\r", $error) : $error;
+        $this->message = is_array($error) ? implode(PHP_EOL, $error) : $error;
         $this->code    = $code;
     }
 

thinkphp/library/think/facade/Config.php

@@ -23,7 +23,7 @@ use think\Facade;
  * @method array set(mixed $name, mixed $value = null) static 设置配置参数
  * @method array reset(string $name ='') static 重置配置参数
  * @method void remove(string $name = '') static 移除配置
- * @method void setYaconf(mixed $$yaconf) static 设置开启Yaconf 或者指定配置文件名
+ * @method void setYaconf(mixed $yaconf) static 设置开启Yaconf 或者指定配置文件名
  */
 class Config extends Facade
 {

thinkphp/library/think/log/driver/File.php

@@ -107,7 +107,7 @@ class File
         $info['timestamp'] = date($this->config['time_format']);
 
         foreach ($message as $type => $msg) {
-            $msg = is_array($msg) ? implode("\r\n", $msg) : $msg;
+            $msg = is_array($msg) ? implode(PHP_EOL, $msg) : $msg;
             if (PHP_SAPI == 'cli') {
                 $info['msg']  = $msg;
                 $info['type'] = $type;
@@ -212,14 +212,14 @@ class File
     protected function parseCliLog($info)
     {
         if ($this->config['json']) {
-            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
+            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
         } else {
             $now = $info['timestamp'];
             unset($info['timestamp']);
 
-            $message = implode("\r\n", $info);
+            $message = implode(PHP_EOL, $info);
 
-            $message = "[{$now}]" . $message . "\r\n";
+            $message = "[{$now}]" . $message . PHP_EOL;
         }
 
         return $message;
@@ -242,13 +242,13 @@ class File
 
         if ($this->config['json']) {
             $info = $requestInfo + $info;
-            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
+            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
         }
 
-        array_unshift($info, "---------------------------------------------------------------\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
+        array_unshift($info, "---------------------------------------------------------------" . PHP_EOL . "\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
         unset($info['timestamp']);
 
-        return implode("\r\n", $info) . "\r\n";
+        return implode(PHP_EOL, $info) . PHP_EOL;
     }
 
     protected function getDebugLog(&$info, $append, $apart)

thinkphp/library/think/model/Collection.php

@@ -24,8 +24,10 @@ class Collection extends BaseCollection
      */
     public function load($relation)
     {
+        if (!$this->isEmpty()) {
             $item = current($this->items);
             $item->eagerlyResultSet($this->items, $relation);
+        }
 
         return $this;
     }

thinkphp/library/think/model/Relation.php

@@ -58,6 +58,16 @@ abstract class Relation
         return $this->query->getModel();
     }
 
+    /**
+     * 获取当前的关联模型类的实例
+     * @access public
+     * @return Query
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
     /**
      * 设置当前关联为自关联
      * @access public
@@ -129,6 +139,17 @@ abstract class Relation
         }
     }
 
+    /**
+     * 更新数据
+     * @access public
+     * @param  array $data 更新数据
+     * @return integer|string
+     */
+    public function update(array $data = [])
+    {
+        return $this->query->update($data);
+    }
+
     /**
      * 删除记录
      * @access public

thinkphp/library/think/model/concern/Attribute.php

@@ -327,9 +327,13 @@ trait Attribute
             $method = 'set' . Loader::parseName($name, 1) . 'Attr';
 
             if (method_exists($this, $method)) {
+                $origin = $this->data;
                 $value  = $this->$method($value, array_merge($this->data, $data));
 
                 $this->set[$name] = true;
+                if (is_null($value) && $origin !== $this->data) {
+                    return;
+                }
             } elseif (isset($this->type[$name])) {
                 // 类型转换
                 $value = $this->writeTransform($value, $this->type[$name]);
@@ -371,9 +375,7 @@ trait Attribute
             switch ($type) {
                 case 'datetime':
                 case 'date':
-                    $format = !empty($param) ? $param : $this->dateFormat;
-                    $format .= strpos($format, 'u') || false !== strpos($format, '\\') ? '' : '.u';
-                    $value = $this->formatDateTime($format);
+                    $value = $this->formatDateTime('Y-m-d H:i:s.u');
                     break;
                 case 'timestamp':
                 case 'integer':
@@ -386,8 +388,7 @@ trait Attribute
             'date',
             'timestamp',
         ])) {
-            $format = strpos($this->dateFormat, 'u') || false !== strpos($this->dateFormat, '\\') ? '' : '.u';
-            $value  = $this->formatDateTime($this->dateFormat . $format);
+            $value = $this->formatDateTime('Y-m-d H:i:s.u');
         } else {
             $value = time();
         }
@@ -438,9 +439,8 @@ trait Attribute
                 }
                 break;
             case 'datetime':
-                $format = !empty($param) ? $param : $this->dateFormat;
                 $value = is_numeric($value) ? $value : strtotime($value);
-                $value  = $this->formatDateTime($format, $value);
+                $value = $this->formatDateTime('Y-m-d H:i:s.u', $value);
                 break;
             case 'object':
                 if (is_object($value)) {

thinkphp/library/think/model/concern/Conversion.php

@@ -131,37 +131,51 @@ trait Conversion
     public function toArray()
     {
         $item       = [];
-        $visible = [];
-        $hidden  = [];
+        $hasVisible = false;
+
+        foreach ($this->visible as $key => $val) {
+            if (is_string($val)) {
+                if (strpos($val, '.')) {
+                    list($relation, $name)      = explode('.', $val);
+                    $this->visible[$relation][] = $name;
+                } else {
+                    $this->visible[$val] = true;
+                    $hasVisible          = true;
+                }
+                unset($this->visible[$key]);
+            }
+        }
+
+        foreach ($this->hidden as $key => $val) {
+            if (is_string($val)) {
+                if (strpos($val, '.')) {
+                    list($relation, $name)     = explode('.', $val);
+                    $this->hidden[$relation][] = $name;
+                } else {
+                    $this->hidden[$val] = true;
+                }
+                unset($this->hidden[$key]);
+            }
+        }
 
         // 合并关联数据
         $data = array_merge($this->data, $this->relation);
 
-        // 过滤属性
-        if (!empty($this->visible)) {
-            $array = $this->parseAttr($this->visible, $visible);
-            if (!empty($array)) {
-                $data = array_intersect_key($data, array_flip($array));
-            }
-        }
-
-        if (empty($array) && !empty($this->hidden)) {
-            $array = $this->parseAttr($this->hidden, $hidden);
-            $data  = array_diff_key($data, array_flip($array));
-        }
-
         foreach ($data as $key => $val) {
             if ($val instanceof Model || $val instanceof ModelCollection) {
                 // 关联模型对象
-                if (isset($visible[$key])) {
-                    $val->visible($visible[$key]);
-                } elseif (isset($hidden[$key])) {
-                    $val->hidden($hidden[$key]);
+                if (isset($this->visible[$key]) && is_array($this->visible[$key])) {
+                    $val->visible($this->visible[$key]);
+                } elseif (isset($this->hidden[$key]) && is_array($this->hidden[$key])) {
+                    $val->hidden($this->hidden[$key]);
                 }
                 // 关联模型对象
+                if (!isset($this->hidden[$key]) || true !== $this->hidden[$key]) {
                     $item[$key] = $val->toArray();
-            } else {
-                // 模型属性
+                }
+            } elseif (isset($this->visible[$key])) {
+                $item[$key] = $this->getAttr($key);
+            } elseif (!isset($this->hidden[$key]) && !$hasVisible) {
                 $item[$key] = $this->getAttr($key);
             }
         }
@@ -175,10 +189,12 @@ trait Conversion
 
                     if (!$relation) {
                         $relation = $this->getAttr($key);
+                        if ($relation) {
                             $relation->visible($name);
                         }
+                    }
 
-                    $item[$key] = $relation->append($name)->toArray();
+                    $item[$key] = $relation ? $relation->append($name)->toArray() : [];
                 } elseif (strpos($name, '.')) {
                     list($key, $attr) = explode('.', $name);
                     // 追加关联对象属性
@@ -186,10 +202,12 @@ trait Conversion
 
                     if (!$relation) {
                         $relation = $this->getAttr($key);
+                        if ($relation) {
                             $relation->visible([$attr]);
                         }
+                    }
 
-                    $item[$key] = $relation->append([$attr])->toArray();
+                    $item[$key] = $relation ? $relation->append([$attr])->toArray() : [];
                 } else {
                     $item[$name] = $this->getAttr($name, $item);
                 }
@@ -252,28 +270,4 @@ trait Conversion
         return $collection;
     }
 
-    /**
-     * 解析隐藏及显示属性
-     * @access protected
-     * @param  array $attrs  属性
-     * @param  array $result 结果集
-     * @return array
-     */
-    protected function parseAttr($attrs, &$result)
-    {
-        $array = [];
-
-        foreach ($attrs as $key => $val) {
-            if (is_array($val)) {
-                $result[$key] = $val;
-            } elseif (strpos($val, '.')) {
-                list($key, $name) = explode('.', $val);
-                $result[$key][]   = $name;
-            } else {
-                $array[] = $val;
-            }
-        }
-
-        return $array;
-    }
 }

thinkphp/library/think/model/concern/RelationShip.php

@@ -204,7 +204,7 @@ trait RelationShip
             $relationResult = $this->$method();
 
             if (isset($withRelationAttr[$relationName])) {
-                $relationResult->withAttr($withRelationAttr[$relationName]);
+                $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
             }
 
             $this->relation[$relation] = $relationResult->getRelation($subRelation, $closure);
@@ -248,7 +248,7 @@ trait RelationShip
             $relationResult = $this->$relation();
 
             if (isset($withRelationAttr[$relationName])) {
-                $relationResult->withAttr($withRelationAttr[$relationName]);
+                $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
             }
 
             $relationResult->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $join);
@@ -290,7 +290,7 @@ trait RelationShip
             $relationResult = $this->$relation();
 
             if (isset($withRelationAttr[$relationName])) {
-                $relationResult->withAttr($withRelationAttr[$relationName]);
+                $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
             }
 
             $relationResult->eagerlyResult($result, $relation, $subRelation, $closure, $join);

thinkphp/library/think/model/concern/SoftDelete.php

@@ -235,7 +235,8 @@ trait SoftDelete
         $field = $this->getDeleteTimeField(true);
 
         if ($field) {
-            $query->useSoftDelete($field, $this->defaultSoftDelete);
+            $condition = is_null($this->defaultSoftDelete) ? ['null', ''] : ['=', $this->defaultSoftDelete];
+            $query->useSoftDelete($field, $condition);
         }
     }
 }

thinkphp/library/think/model/relation/BelongsTo.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\Loader;
 use think\Model;
 
@@ -49,7 +50,7 @@ class BelongsTo extends OneToOne
      */
     public function getRelation($subRelation = '', $closure = null)
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -79,7 +80,7 @@ class BelongsTo extends OneToOne
      */
     public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*', &$aggregateAlias = '')
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -111,7 +112,7 @@ class BelongsTo extends OneToOne
             return 0;
         }
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -140,13 +141,17 @@ class BelongsTo extends OneToOne
         $relation   = basename(str_replace('\\', '/', $this->model));
         $localKey   = $this->localKey;
         $foreignKey = $this->foreignKey;
+        $softDelete = $this->query->getOptions('soft_delete');
 
         return $this->parent->db()
             ->alias($model)
             ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
                 $query->table([$table => $relation])
                     ->field($relation . '.' . $localKey)
-                    ->whereExp($model . '.' . $foreignKey, '=' . $relation . '.' . $localKey);
+                    ->whereExp($model . '.' . $foreignKey, '=' . $relation . '.' . $localKey)
+                    ->when($softDelete, function ($query) use ($softDelete, $relation) {
+                        $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+                    });
             });
     }
 
@@ -168,11 +173,15 @@ class BelongsTo extends OneToOne
         }
 
         $fields     = $this->getRelationQueryFields($fields, $model);
+        $softDelete = $this->query->getOptions('soft_delete');
 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
             ->join([$table => $relation], $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType)
+            ->when($softDelete, function ($query) use ($softDelete, $relation) {
+                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            })
             ->where($where);
     }
 

thinkphp/library/think/model/relation/BelongsToMany.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\Collection;
 use think\db\Query;
 use think\Exception;
@@ -166,7 +167,7 @@ class BelongsToMany extends Relation
      */
     public function getRelation($subRelation = '', $closure = null)
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -377,7 +378,7 @@ class BelongsToMany extends Relation
 
         $pk = $result->$pk;
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -401,7 +402,7 @@ class BelongsToMany extends Relation
      */
     public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*', &$aggregateAlias = '')
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -428,7 +429,7 @@ class BelongsToMany extends Relation
     protected function eagerlyManyToMany($where, $relation, $subRelation = '', $closure = null)
     {
         // 预载入关联查询 支持嵌套预载入
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 

thinkphp/library/think/model/relation/HasMany.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\db\Query;
 use think\Loader;
 use think\Model;
@@ -48,7 +49,7 @@ class HasMany extends Relation
      */
     public function getRelation($subRelation = '', $closure = null)
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -163,7 +164,7 @@ class HasMany extends Relation
             return 0;
         }
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
             if ($return && is_string($return)) {
                 $name = $return;
@@ -186,7 +187,7 @@ class HasMany extends Relation
      */
     public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*', &$aggregateAlias = '')
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -216,7 +217,7 @@ class HasMany extends Relation
         $this->query->removeWhereField($this->foreignKey);
 
         // 预载入关联查询 支持嵌套预载入
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -266,11 +267,11 @@ class HasMany extends Relation
     /**
      * 批量保存当前关联数据对象
      * @access public
-     * @param  array $dataSet   数据集
+     * @param  array|\think\Collection $dataSet   数据集
      * @param  boolean $replace 是否自动识别更新和写入
      * @return array|false
      */
-    public function saveAll(array $dataSet, $replace = true)
+    public function saveAll($dataSet, $replace = true)
     {
         $result = [];
 
@@ -295,11 +296,15 @@ class HasMany extends Relation
         $table      = $this->query->getTable();
         $model      = basename(str_replace('\\', '/', get_class($this->parent)));
         $relation   = basename(str_replace('\\', '/', $this->model));
+        $softDelete = $this->query->getOptions('soft_delete');
 
         return $this->parent->db()
             ->alias($model)
             ->field($model . '.*')
             ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
+            ->when($softDelete, function ($query) use ($softDelete, $relation) {
+                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            })
             ->group($relation . '.' . $this->foreignKey)
             ->having('count(' . $id . ')' . $operator . $count);
     }
@@ -322,12 +327,16 @@ class HasMany extends Relation
         }
 
         $fields     = $this->getRelationQueryFields($fields, $model);
+        $softDelete = $this->query->getOptions('soft_delete');
 
         return $this->parent->db()
             ->alias($model)
             ->group($model . '.' . $this->localKey)
             ->field($fields)
             ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
+            ->when($softDelete, function ($query) use ($softDelete, $relation) {
+                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            })
             ->where($where);
     }
 

thinkphp/library/think/model/relation/HasManyThrough.php

@@ -11,8 +11,8 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\db\Query;
-use think\Exception;
 use think\Loader;
 use think\Model;
 use think\model\Relation;
@@ -24,6 +24,12 @@ class HasManyThrough extends Relation
     // 中间表模型
     protected $through;
 
+    /**
+     * 中间主键
+     * @var string
+     */
+    protected $throughPk;
+
     /**
      * 架构函数
      * @access public
@@ -38,9 +44,10 @@ class HasManyThrough extends Relation
     {
         $this->parent     = $parent;
         $this->model      = $model;
-        $this->through    = $through;
+        $this->through    = (new $through)->db();
         $this->foreignKey = $foreignKey;
         $this->throughKey = $throughKey;
+        $this->throughPk  = $this->through->getPk();
         $this->localKey   = $localKey;
         $this->query      = (new $model)->db();
     }
@@ -54,7 +61,7 @@ class HasManyThrough extends Relation
      */
     public function getRelation($subRelation = '', $closure = null)
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -74,7 +81,28 @@ class HasManyThrough extends Relation
      */
     public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
     {
-        return $this->parent;
+        $model         = App::parseName(App::classBaseName($this->parent));
+        $throughTable  = $this->through->getTable();
+        $pk            = $this->throughPk;
+        $throughKey    = $this->throughKey;
+        $relation      = (new $this->model)->db();
+        $relationTable = $relation->getTable();
+        $softDelete    = $this->query->getOptions('soft_delete');
+
+        if ('*' != $id) {
+            $id = $relationTable . '.' . $relation->getPk();
+        }
+
+        return $this->parent->db()
+            ->alias($model)
+            ->field($model . '.*')
+            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
+            ->join($relationTable, $relationTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
+            ->when($softDelete, function ($query) use ($softDelete, $relationTable) {
+                $query->where($relationTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            })
+            ->group($relationTable . '.' . $this->throughKey)
+            ->having('count(' . $id . ')' . $operator . $count);
     }
 
     /**
@@ -86,45 +114,225 @@ class HasManyThrough extends Relation
      */
     public function hasWhere($where = [], $fields = null)
     {
-        throw new Exception('relation not support: hasWhere');
+        $model        = App::parseName(App::classBaseName($this->parent));
+        $throughTable = $this->through->getTable();
+        $pk           = $this->throughPk;
+        $throughKey   = $this->throughKey;
+        $modelTable   = (new $this->model)->db()->getTable();
+
+        if (is_array($where)) {
+            $this->getQueryWhere($where, $modelTable);
+        }
+
+        $fields     = $this->getRelationQueryFields($fields, $model);
+        $softDelete = $this->query->getOptions('soft_delete');
+
+        return $this->parent->db()
+            ->alias($model)
+            ->join($throughTable, $throughTable . '.' . $this->foreignKey . '=' . $model . '.' . $this->localKey)
+            ->join($modelTable, $modelTable . '.' . $throughKey . '=' . $throughTable . '.' . $this->throughPk)
+            ->when($softDelete, function ($query) use ($softDelete, $modelTable) {
+                $query->where($modelTable . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            })
+            ->group($modelTable . '.' . $this->throughKey)
+            ->where($where)
+            ->field($fields);
     }
 
     /**
-     * 预载入关联查询
-     * @access public
+     * 预载入关联查询（数据集）
+     * @access protected
      * @param  array   $resultSet   数据集
      * @param  string  $relation    当前关联名
-     * @param  string   $subRelation 子关联名
-     * @param  \Closure $closure     闭包
+     * @param  mixed   $subRelation 子关联名
+     * @param  Closure $closure     闭包
      * @return void
      */
-    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
-    {}
+    public function eagerlyResultSet(array &$resultSet, $relation, $subRelation = '', $closure = null)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        $range = [];
+        foreach ($resultSet as $result) {
+            // 获取关联外键列表
+            if (isset($result->$localKey)) {
+                $range[] = $result->$localKey;
+            }
+        }
+
+        if (!empty($range)) {
+            $this->query->removeWhereField($foreignKey);
+
+            $data = $this->eagerlyWhere([
+                [$this->foreignKey, 'in', $range],
+            ], $foreignKey, $relation, $subRelation, $closure);
+
+            // 关联属性名
+            $attr = App::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                $pk = $result->$localKey;
+                if (!isset($data[$pk])) {
+                    $data[$pk] = [];
+                }
+
+                foreach ($data[$pk] as &$relationModel) {
+                    $relationModel->setParent(clone $result);
+                }
+
+                // 设置关联属性
+                $result->setRelation($attr, $this->resultSetBuild($data[$pk]));
+            }
+        }
+    }
 
     /**
-     * 预载入关联查询 返回模型对象
-     * @access public
+     * 预载入关联查询（数据）
+     * @access protected
      * @param  Model   $result      数据对象
      * @param  string  $relation    当前关联名
-     * @param  string   $subRelation 子关联名
-     * @param  \Closure $closure     闭包
+     * @param  mixed   $subRelation 子关联名
+     * @param  Closure $closure     闭包
      * @return void
      */
-    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
-    {}
+    public function eagerlyResult($result, $relation, $subRelation = '', $closure = null)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+        $pk         = $result->$localKey;
+
+        $this->query->removeWhereField($foreignKey);
+
+        $data = $this->eagerlyWhere([
+            [$foreignKey, '=', $pk],
+        ], $foreignKey, $relation, $subRelation, $closure);
+
+        // 关联数据封装
+        if (!isset($data[$pk])) {
+            $data[$pk] = [];
+        }
+
+        foreach ($data[$pk] as &$relationModel) {
+            $relationModel->setParent(clone $result);
+        }
+
+        $result->setRelation(App::parseName($relation), $this->resultSetBuild($data[$pk]));
+    }
+
+    /**
+     * 关联模型预查询
+     * @access public
+     * @param  array   $where       关联预查询条件
+     * @param  string  $key         关联键名
+     * @param  string  $relation    关联名
+     * @param  mixed   $subRelation 子关联
+     * @param  Closure $closure
+     * @return array
+     */
+    protected function eagerlyWhere(array $where, $key, $relation, $subRelation = '', $closure = null)
+    {
+        // 预载入关联查询 支持嵌套预载入
+        $throughList = $this->through->where($where)->select();
+        $keys        = $throughList->column($this->throughPk, $this->throughPk);
+
+        if ($closure instanceof Closure) {
+            $closure($this->query);
+        }
+
+        $list = $this->query->where($this->throughKey, 'in', $keys)->select();
+
+        // 组装模型数据
+        $data = [];
+        $keys = $throughList->column($this->foreignKey, $this->throughPk);
+
+        foreach ($list as $set) {
+            $data[$keys[$set->{$this->throughKey}]][] = $set;
+        }
+
+        return $data;
+    }
 
     /**
      * 关联统计
      * @access public
      * @param  Model   $result  数据对象
-     * @param  \Closure $closure 闭包
+     * @param  Closure $closure 闭包
      * @param  string  $aggregate 聚合查询方法
      * @param  string  $field 字段
      * @param  string  $name 统计字段别名
      * @return integer
      */
-    public function relationCount($result, $closure, $aggregate = 'count', $field = '*', &$name = '')
-    {}
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*', &$name = null)
+    {
+        $localKey = $this->localKey;
+
+        if (!isset($result->$localKey)) {
+            return 0;
+        }
+
+        if ($closure instanceof Closure) {
+            $return = $closure($this->query);
+            if ($return && is_string($return)) {
+                $name = $return;
+            }
+        }
+
+        $alias        = App::parseName(App::classBaseName($this->model));
+        $throughTable = $this->through->getTable();
+        $pk           = $this->throughPk;
+        $throughKey   = $this->throughKey;
+        $modelTable   = $this->parent->getTable();
+
+        if (false === strpos($field, '.')) {
+            $field = $alias . '.' . $field;
+        }
+
+        return $this->query
+            ->alias($alias)
+            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
+            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
+            ->where($throughTable . '.' . $this->foreignKey, $result->$localKey)
+            ->$aggregate($field);
+    }
+
+    /**
+     * 创建关联统计子查询
+     * @access public
+     * @param  Closure $closure 闭包
+     * @param  string  $aggregate 聚合查询方法
+     * @param  string  $field 字段
+     * @param  string  $name 统计字段别名
+     * @return string
+     */
+    public function getRelationCountQuery($closure = null, $aggregate = 'count', $field = '*', &$name = null)
+    {
+        if ($closure instanceof Closure) {
+            $return = $closure($this->query);
+            if ($return && is_string($return)) {
+                $name = $return;
+            }
+        }
+
+        $alias        = App::parseName(App::classBaseName($this->model));
+        $throughTable = $this->through->getTable();
+        $pk           = $this->throughPk;
+        $throughKey   = $this->throughKey;
+        $modelTable   = $this->parent->getTable();
+
+        if (false === strpos($field, '.')) {
+            $field = $alias . '.' . $field;
+        }
+
+        return $this->query
+            ->alias($alias)
+            ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
+            ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
+            ->whereExp($throughTable . '.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
+            ->fetchSql()
+            ->$aggregate($field);
+    }
 
     /**
      * 执行基础查询（仅执行一次）
@@ -134,10 +342,9 @@ class HasManyThrough extends Relation
     protected function baseQuery()
     {
         if (empty($this->baseQuery) && $this->parent->getData()) {
-            $through      = $this->through;
             $alias        = Loader::parseName(basename(str_replace('\\', '/', $this->model)));
-            $throughTable = $through::getTable();
-            $pk           = (new $through)->getPk();
+            $throughTable = $this->through->getTable();
+            $pk           = $this->throughPk;
             $throughKey   = $this->throughKey;
             $modelTable   = $this->parent->getTable();
             $fields       = $this->getQueryFields($alias);

thinkphp/library/think/model/relation/HasOne.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\db\Query;
 use think\Loader;
 use think\Model;
@@ -50,7 +51,7 @@ class HasOne extends OneToOne
     {
         $localKey = $this->localKey;
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -79,7 +80,7 @@ class HasOne extends OneToOne
      */
     public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*', &$aggregateAlias = '')
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -111,7 +112,7 @@ class HasOne extends OneToOne
             return 0;
         }
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
             if ($return && is_string($return)) {
                 $name = $return;
@@ -139,13 +140,17 @@ class HasOne extends OneToOne
         $relation   = basename(str_replace('\\', '/', $this->model));
         $localKey   = $this->localKey;
         $foreignKey = $this->foreignKey;
+        $softDelete = $this->query->getOptions('soft_delete');
 
         return $this->parent->db()
             ->alias($model)
             ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
                 $query->table([$table => $relation])
                     ->field($relation . '.' . $foreignKey)
-                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey);
+                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey)
+                    ->when($softDelete, function ($query) use ($softDelete, $relation) {
+                        $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+                    });
             });
     }
 
@@ -167,11 +172,15 @@ class HasOne extends OneToOne
         }
 
         $fields     = $this->getRelationQueryFields($fields, $model);
+        $softDelete = $this->query->getOptions('soft_delete');
 
         return $this->parent->db()
             ->alias($model)
             ->field($fields)
             ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
+            ->when($softDelete, function ($query) use ($softDelete, $relation) {
+                $query->where($relation . strstr($softDelete[0], '.'), '=' == $softDelete[1][0] ? $softDelete[1][1] : null);
+            })
             ->where($where);
     }
 

thinkphp/library/think/model/relation/MorphMany.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\db\Query;
 use think\Exception;
 use think\Loader;
@@ -53,7 +54,7 @@ class MorphMany extends Relation
      */
     public function getRelation($subRelation = '', $closure = null)
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -197,7 +198,7 @@ class MorphMany extends Relation
             return 0;
         }
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -224,7 +225,7 @@ class MorphMany extends Relation
      */
     public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*', &$aggregateAlias = '')
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $return = $closure($this->query);
 
             if ($return && is_string($return)) {
@@ -253,7 +254,7 @@ class MorphMany extends Relation
         // 预载入关联查询 支持嵌套预载入
         $this->query->removeOption('where');
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 

thinkphp/library/think/model/relation/MorphOne.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\db\Query;
 use think\Exception;
 use think\Loader;
@@ -53,7 +54,7 @@ class MorphOne extends Relation
      */
     public function getRelation($subRelation = '', $closure = null)
     {
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 
@@ -186,7 +187,7 @@ class MorphOne extends Relation
     protected function eagerlyMorphToOne($where, $relation, $subRelation = '', $closure = null)
     {
         // 预载入关联查询 支持嵌套预载入
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
         }
 

thinkphp/library/think/model/relation/MorphTo.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\Exception;
 use think\Loader;
 use think\Model;

thinkphp/library/think/model/relation/OneToOne.php

@@ -11,6 +11,7 @@
 
 namespace think\model\relation;
 
+use Closure;
 use think\db\Query;
 use think\Exception;
 use think\Loader;
@@ -87,7 +88,7 @@ abstract class OneToOne extends Relation
             $joinOn = $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey;
         }
 
-        if ($closure) {
+        if ($closure instanceof Closure) {
             // 执行闭包查询
             $closure($query);
             // 使用withField指定获取关联的字段，如
@@ -311,7 +312,7 @@ abstract class OneToOne extends Relation
     protected function eagerlyWhere($where, $key, $relation, $subRelation = '', $closure = null)
     {
         // 预载入关联查询 支持嵌套预载入
-        if ($closure) {
+        if ($closure instanceof Closure) {
             $closure($this->query);
 
             if ($field = $this->query->getOptions('with_field')) {

thinkphp/library/think/response/Redirect.php

@@ -87,11 +87,12 @@ class Redirect extends Response
     /**
      * 记住当前url后跳转
      * @access public
+     * @param string $url 指定记住的url
      * @return $this
      */
-    public function remember()
+    public function remember($url = null)
     {
-        $this->app['session']->set('redirect_url', $this->app['request']->url());
+        $this->app['session']->set('redirect_url', $url ?: $this->app['request']->url());
 
         return $this;
     }

thinkphp/library/think/response/View.php

@@ -18,9 +18,16 @@ class View extends Response
     // 输出参数
     protected $options = [];
     protected $vars    = [];
+    protected $config  = [];
     protected $filter;
     protected $contentType = 'text/html';
 
+    /**
+     * 是否内容渲染
+     * @var bool
+     */
+    protected $isContent = false;
+
     /**
      * 处理数据
      * @access protected
@@ -32,7 +39,19 @@ class View extends Response
         // 渲染模板输出
         return $this->app['view']
             ->filter($this->filter)
-            ->fetch($data, $this->vars);
+            ->fetch($data, $this->vars, $this->config, $this->isContent);
+    }
+
+    /**
+     * 设置是否为内容渲染
+     * @access public
+     * @param  bool $content
+     * @return $this
+     */
+    public function isContent($content = true)
+    {
+        $this->isContent = $content;
+        return $this;
     }
 
     /**
@@ -68,6 +87,12 @@ class View extends Response
         return $this;
     }
 
+    public function config($config)
+    {
+        $this->config = $config;
+        return $this;
+    }
+
     /**
      * 视图内容过滤
      * @access public

thinkphp/library/think/route/Dispatch.php

@@ -11,9 +11,9 @@
 
 namespace think\route;
 
+use think\App;
 use think\Container;
 use think\exception\ValidateException;
-use think\App;
 use think\Request;
 use think\Response;
 
@@ -183,7 +183,8 @@ abstract class Dispatch
         } else {
             $data    = ob_get_clean();
             $content = false === $data ? '' : $data;
-            $status   = '' === $content && $this->request->isAjax() ? 204 : 200;
+            $status  = '' === $content && $this->request->isJson() ? 204 : 200;
+
             $response = Response::create($content, '', $status);
         }
 

thinkphp/library/think/route/Rule.php

@@ -642,9 +642,8 @@ abstract class Rule
     protected function checkCrossDomain($request)
     {
         if (!empty($this->option['cross_domain'])) {
-
             $header = [
-                'Access-Control-Allow-Origin'  => '*',
+                'Access-Control-Allow-Credentials' => 'true',
                 'Access-Control-Allow-Methods'     => 'GET, POST, PATCH, PUT, DELETE',
                 'Access-Control-Allow-Headers'     => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With',
             ];
@@ -653,6 +652,16 @@ abstract class Rule
                 $header = array_merge($header, $this->option['header']);
             }
 
+            if (!isset($header['Access-Control-Allow-Origin'])) {
+                $httpOrigin = $request->header('origin');
+
+                if ($httpOrigin && strpos(config('cookie.domain'), $httpOrigin)) {
+                    $header['Access-Control-Allow-Origin'] = $httpOrigin;
+                } else {
+                    $header['Access-Control-Allow-Origin'] = '*';
+                }
+            }
+
             $this->option['header'] = $header;
 
             if ($request->method(true) == 'OPTIONS') {

thinkphp/library/think/route/RuleGroup.php

@@ -118,8 +118,8 @@ class RuleGroup extends Rule
      */
     public function check($request, $url, $completeMatch = false)
     {
-        if ($dispatch = $this->checkCrossDomain($request)) {
         // 跨域OPTIONS请求
+        if ($dispatch = $this->checkCrossDomain($request)) {
             return $dispatch;
         }
 

thinkphp/library/think/route/RuleItem.php

@@ -149,11 +149,6 @@ class RuleItem extends Rule
      */
     public function checkRule($request, $url, $match = null, $completeMatch = false)
     {
-        if ($dispatch = $this->checkCrossDomain($request)) {
-            // 允许跨域
-            return $dispatch;
-        }
-
         // 检查参数有效性
         if (!$this->checkOption($this->option, $request)) {
             return false;
@@ -169,6 +164,15 @@ class RuleItem extends Rule
         }
 
         if (false !== $match) {
+            if (!empty($option['cross_domain'])) {
+                if ($dispatch = $this->checkCrossDomain($request)) {
+                    // 允许跨域
+                    return $dispatch;
+                }
+
+                $option['header'] = $this->option['header'];
+            }
+
             // 检查前置行为
             if (isset($option['before']) && false === $this->checkBefore($option['before'])) {
                 return false;

thinkphp/library/think/route/dispatch/Module.php

@@ -12,7 +12,6 @@
 namespace think\route\dispatch;
 
 use ReflectionMethod;
-use think\Controller;
 use think\exception\ClassNotFoundException;
 use think\exception\HttpException;
 use think\Loader;

thinkphp/library/think/route/dispatch/Url.php

@@ -60,7 +60,7 @@ class Url extends Dispatch
             $controller = !empty($path) ? array_shift($path) : null;
         }
 
-        if ($controller && !preg_match('/^[A-Za-z][\w|\.]*$/', $controller)) {
+        if ($controller && !preg_match('/^[A-Za-z0-9][\w|\.]*$/', $controller)) {
             throw new HttpException(404, 'controller not exists:' . $controller);
         }
 

thinkphp/library/think/session/driver/Redis.php

@@ -124,7 +124,7 @@ class Redis implements SessionHandlerInterface
      */
     public function destroy($sessID)
     {
-        return $this->handler->delete($this->config['session_name'] . $sessID) > 0;
+        return $this->handler->del($this->config['session_name'] . $sessID) > 0;
     }
 
     /**

vendor/aliyuncs/oss-sdk-php/CHANGELOG.md

@@ -1,39 +1,44 @@
 # ChangeLog - Aliyun OSS SDK for PHP
 
+## v2.3.1 / 2019-011-15
+
+* translate chinese comments into english
+* Added: endpoint validity check
+
 ## v2.3.0 / 2018-01-05
 
-* 修复：putObject支持创建空文件
-* 修复：createBucket支持IA/Archive
-* 增加：支持restoreObject
-* 增加：支持Symlink功能
-* 增加：支持getBucketLocation
-* 增加：支持getBucketMeta
-* 增加：支持代理服务器Proxy
+* Fixed: putObject support creating empty files
+* Fixed: createBucket support IA/Archive
+* Added: support restoreObject
+* Added: support the Symlink feature
+* Added: support getBucketLocation
+* Added: support getBucketMeta
+* Added: support proxy server Proxy
 
 ## v2.2.4 / 2017-04-25
 
-* fix getObject to local file bug
+* Fixed getObject to local file bug
 
 ## v2.2.3 / 2017-04-14
 
-* fix md5 check
+* Fixed md5 check
 
 ## v2.2.2 / 2017-01-18
 
-* 解决在php7上运行连接数和内存bug
+* Resolve to run the connection number and memory bug on php7
 
 ## v2.2.1 / 2016-12-01
 
-* 禁止http curl自动填充Accept-Encoding
+* No HTTP curl is allowed to automatically populate accept-encoding
 
 ## v2.2.0 / 2016-11-22
 
-* 修复PutObject/CompleteMultipartUpload的返回值问题(#26)
+* Fixed PutObject/CompleteMultipartUpload return values(#26)
 
 ## v2.1.0 / 2016-11-12
 
-* 增加[RTMP](https://help.aliyun.com/document_detail/44297.html)接口
-* 增加支持[图片服务](https://help.aliyun.com/document_detail/44686.html)
+* Added[RTMP](https://help.aliyun.com/document_detail/44297.html)interface
+* Add support[image service](https://help.aliyun.com/document_detail/44686.html)
 
 ## v2.0.7 / 2016-06-17
 
@@ -46,47 +51,47 @@
 
 ## v2.0.5
 
-* 增加Add/Delete/Get BucketCname接口
+* Added Add/Delete/Get BucketCname interface
 
 ## v2.0.4
 
-* 增加Put/Get Object Acl接口
+* Added Put/Get Object Acl interface
 
 ## v2.0.3
 
-* 修复Util中的常量定义在低于5.6的PHP版本中报错的问题
+* Fixing the constants in Util is defined in a PHP version that is less than 5.6.
 
 ## v2.0.2
 
-* 修复multipart上传时无法指定Content-Type的问题
+* The problem of content-type cannot be specified when restoring multipart uploads
 
 ## v2.0.1
 
-* 增加对ListObjects/ListMultipartUploads时特殊字符的处理
-* 提供接口获取OssException中的详细信息
+* Increase the ListObjects/ListMultipartUploads special characters
+* Provides the interface to get the details of the OssException
 
 
 ## 2015.11.25
 
-* **大版本升级，不再兼容以前接口，新版本对易用性做了很大的改进，建议用户迁移到新版本。**
+* **Large version upgrade, no longer compatible with previous interface, new version has made great improvements to ease of use, suggesting that users migrate to a new version.**
 
-## 修改内容
+## Modify the content
 
-* 不再支持PHP 5.2版本
+* PHP 5.2 is no longer supported
 
-### 新增内容
+### Add the cotent
 
-* 引入命名空间
-* 接口命名修正，采用驼峰式命名
-* 接口入参修改，把常用参数从Options参数中提出来
-* 接口返回结果修改，对返回结果进行处理，用户可以直接得到容易处理的数据结构　
-* OssClient的构造函数变更
-* 支持CNAME和IP格式的Endpoint地址
-* 重新整理sample文件组织结构，使用function组织功能点
-* 增加设置连接超时，请求超时的接口
-* 去掉Object Group相关的已经过时的接口
-* OssException中的message改为英文
+* Introduce namespace
+* Interface naming and modification, using hump naming
+* The interface is modified, and the common parameters are extracted from the Options parameter.
+* The interface returns the result modification, processing the return result, and the user can directly get the data structure easily processed　
+* OssClient's constructor changes
+* The Endpoint address that support CNAME and IP formats
+* Rearrange the sample file organization structure and use function to organize the function points
+* Add an interface that sets the connection timeout and requests timeout
+* Remove the outdated interface associated with the Object Group
+* The message in the OssException is changed to English
 
-### 问题修复
+### Repair problem
 
-* object名称校验不完备
+* The object name is not complete

vendor/aliyuncs/oss-sdk-php/samples/Bucket.php

@@ -8,28 +8,28 @@ $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 $bucket = Common::getBucketName();
 
-//******************************* 简单使用 ****************************************************************
+//******************************* Simple Usage****************************************************************
 
-//创建bucket
+// Create a bucket
 $ossClient->createBucket($bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
 Common::println("bucket $bucket created");
 
-// 判断Bucket是否存在
+// Check whether a bucket exists
 $doesExist = $ossClient->doesBucketExist($bucket);
 Common::println("bucket $bucket exist? " . ($doesExist ? "yes" : "no"));
 
-// 获取Bucket列表
+// Get the bucket list
 $bucketListInfo = $ossClient->listBuckets();
 
-// 设置bucket的ACL
+// Set bucket ACL
 $ossClient->putBucketAcl($bucket, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE);
 Common::println("bucket $bucket acl put");
-// 获取bucket的ACL
+// Get bucket ACL
 $acl = $ossClient->getBucketAcl($bucket);
 Common::println("bucket $bucket acl get: " . $acl);
 
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions ****************************************************
 
 createBucket($ossClient, $bucket);
 doesBucketExist($ossClient, $bucket);
@@ -39,13 +39,13 @@ getBucketAcl($ossClient, $bucket);
 listBuckets($ossClient);
 
 /**
- * 创建一个存储空间
- * acl 指的是bucket的访问控制权限，有三种，私有读写，公共读私有写，公共读写。
- * 私有读写就是只有bucket的拥有者或授权用户才有权限操作
- * 三种权限分别对应 (OssClient::OSS_ACL_TYPE_PRIVATE，OssClient::OSS_ACL_TYPE_PUBLIC_READ, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE)
+ * Create a new bucket
+ * acl indicates the access permission of a bucket, including: private, public-read-only/private-read-write, and public read-write.
+ * Private indicates that only the bucket owner or authorized users can access the data..
+ * The three permissions are separately defined by (OssClient::OSS_ACL_TYPE_PRIVATE,OssClient::OSS_ACL_TYPE_PUBLIC_READ, OssClient::OSS_ACL_TYPE_PUBLIC_READ_WRITE)
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 要创建的存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket Name of the bucket to create
  * @return null
  */
 function createBucket($ossClient, $bucket)
@@ -61,10 +61,10 @@ function createBucket($ossClient, $bucket)
 }
 
 /**
- *  判断Bucket是否存在
+ * Check whether a bucket exists.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  */
 function doesBucketExist($ossClient, $bucket)
 {
@@ -83,10 +83,11 @@ function doesBucketExist($ossClient, $bucket)
 }
 
 /**
- * 删除bucket，如果bucket不为空则bucket无法删除成功， 不为空表示bucket既没有object，也没有未完成的multipart上传时的parts
+ * Delete a bucket. If the bucket is not empty, the deletion fails.
+ * A bucket which is not empty indicates that it does not contain any objects or parts that are not completely uploaded during multipart upload
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 待删除的存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket Name of the bucket to delete
  * @return null
  */
 function deleteBucket($ossClient, $bucket)
@@ -102,10 +103,10 @@ function deleteBucket($ossClient, $bucket)
 }
 
 /**
- * 设置bucket的acl配置
+ * Set bucket ACL
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function putBucketAcl($ossClient, $bucket)
@@ -123,10 +124,10 @@ function putBucketAcl($ossClient, $bucket)
 
 
 /**
- * 获取bucket的acl配置
+ * Get bucket ACL
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getBucketAcl($ossClient, $bucket)
@@ -144,9 +145,9 @@ function getBucketAcl($ossClient, $bucket)
 
 
 /**
- * 列出用户所有的Bucket
+ * List all buckets
  *
- * @param OssClient $ossClient OssClient实例
+ * @param OssClient $ossClient OssClient instance
  * @return null
  */
 function listBuckets($ossClient)

vendor/aliyuncs/oss-sdk-php/samples/BucketCors.php

@@ -11,9 +11,9 @@ if (is_null($ossClient)) exit(1);
 $bucket = Common::getBucketName();
 
 
-//******************************* 简单使用 ****************************************************************
+//******************************* Simple usage****************************************************************
 
-// 设置cors配置
+// Set cors configuration
 $corsConfig = new CorsConfig();
 $rule = new CorsRule();
 $rule->addAllowedHeader("x-oss-header");
@@ -24,15 +24,15 @@ $corsConfig->addRule($rule);
 $ossClient->putBucketCors($bucket, $corsConfig);
 Common::println("bucket $bucket corsConfig created:" . $corsConfig->serializeToXml());
 
-// 获取cors配置
+// Get cors configuration
 $corsConfig = $ossClient->getBucketCors($bucket);
 Common::println("bucket $bucket corsConfig fetched:" . $corsConfig->serializeToXml());
 
-// 删除cors配置
+// Delete cors configuration
 $ossClient->deleteBucketCors($bucket);
 Common::println("bucket $bucket corsConfig deleted");
 
-//******************************* 完整用法参考下面函数  *****************************************************
+//******************************* For complete usage, see the following functions  *****************************************************
 
 putBucketCors($ossClient, $bucket);
 getBucketCors($ossClient, $bucket);
@@ -40,10 +40,10 @@ deleteBucketCors($ossClient, $bucket);
 getBucketCors($ossClient, $bucket);
 
 /**
- * 设置bucket的cors配置
+ * Set bucket cores
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function putBucketCors($ossClient, $bucket)
@@ -67,10 +67,10 @@ function putBucketCors($ossClient, $bucket)
 }
 
 /**
- * 获取并打印bucket的cors配置
+ * Get and print the cors configuration of a bucket
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getBucketCors($ossClient, $bucket)
@@ -88,10 +88,10 @@ function getBucketCors($ossClient, $bucket)
 }
 
 /**
- * 删除bucket的所有的cors配置
+ * Delete all cors configuraiton of a bucket
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteBucketCors($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/samples/BucketLifecycle.php

@@ -11,9 +11,9 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//******************************* 简单使用 *******************************************************
+//******************************* Simple Usage *******************************************************
 
-//设置lifecycle规则
+// Set lifecycle configuration
 $lifecycleConfig = new LifecycleConfig();
 $actions = array();
 $actions[] = new LifecycleAction("Expiration", "Days", 3);
@@ -22,16 +22,16 @@ $lifecycleConfig->addRule($lifecycleRule);
 $ossClient->putBucketLifecycle($bucket, $lifecycleConfig);
 Common::println("bucket $bucket lifecycleConfig created:" . $lifecycleConfig->serializeToXml());
 
-//获取lifecycle规则
+// Get lifecycle configuration
 $lifecycleConfig = $ossClient->getBucketLifecycle($bucket);
 Common::println("bucket $bucket lifecycleConfig fetched:" . $lifecycleConfig->serializeToXml());
 
-//删除bucket的lifecycle配置
+// Delete bucket lifecycle configuration
 $ossClient->deleteBucketLifecycle($bucket);
 Common::println("bucket $bucket lifecycleConfig deleted");
 
 
-//***************************** 完整用法参考下面函数  ***********************************************
+//***************************** For complete usage, see the following functions  ***********************************************
 
 putBucketLifecycle($ossClient, $bucket);
 getBucketLifecycle($ossClient, $bucket);
@@ -39,10 +39,10 @@ deleteBucketLifecycle($ossClient, $bucket);
 getBucketLifecycle($ossClient, $bucket);
 
 /**
- * 设置bucket的生命周期配置
+ * Set bucket lifecycle configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function putBucketLifecycle($ossClient, $bucket)
@@ -67,10 +67,10 @@ function putBucketLifecycle($ossClient, $bucket)
 }
 
 /**
- * 获取bucket的生命周期配置
+ * Get bucket lifecycle configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getBucketLifecycle($ossClient, $bucket)
@@ -88,10 +88,10 @@ function getBucketLifecycle($ossClient, $bucket)
 }
 
 /**
- * 删除bucket的生命周期配置
+ * Delete bucket lifecycle configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteBucketLifecycle($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/samples/BucketLogging.php

@@ -8,21 +8,21 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//*******************************简单使用***************************************************************
+//*******************************Simple Usage ***************************************************************
 
-// 设置Bucket访问日志记录规则, 访问日志文件的存放位置是同bucket下的access.log前缀的文件
+// Set bucket access logging rules. Access logs are stored under the same bucket with a 'access.log' prefix.
 $ossClient->putBucketLogging($bucket, $bucket, "access.log", array());
 Common::println("bucket $bucket lifecycleConfig created");
 
-// 获取Bucket访问日志记录规则
+// Get bucket access logging rules
 $loggingConfig = $ossClient->getBucketLogging($bucket, array());
 Common::println("bucket $bucket lifecycleConfig fetched:" . $loggingConfig->serializeToXml());
 
-// 删除Bucket访问日志记录规则
+// Delete bucket access logging rules
 $loggingConfig = $ossClient->getBucketLogging($bucket, array());
 Common::println("bucket $bucket lifecycleConfig deleted");
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions ****************************************************
 
 putBucketLogging($ossClient, $bucket);
 getBucketLogging($ossClient, $bucket);
@@ -30,16 +30,16 @@ deleteBucketLogging($ossClient, $bucket);
 getBucketLogging($ossClient, $bucket);
 
 /**
- * 设置bucket的Logging配置
+ * Set bucket logging configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function putBucketLogging($ossClient, $bucket)
 {
     $option = array();
-    //访问日志存放在本bucket下
+    // Access logs are stored in the same bucket.
     $targetBucket = $bucket;
     $targetPrefix = "access.log";
 
@@ -54,10 +54,10 @@ function putBucketLogging($ossClient, $bucket)
 }
 
 /**
- * 获取bucket的Logging配置
+ * Get bucket logging configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getBucketLogging($ossClient, $bucket)
@@ -76,10 +76,10 @@ function getBucketLogging($ossClient, $bucket)
 }
 
 /**
- * 删除bucket的Logging配置
+ * Delete bucket logging configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteBucketLogging($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/samples/BucketReferer.php

@@ -9,26 +9,26 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//******************************* 简单使用 ****************************************************************
+//******************************* Simple Usage ****************************************************************
 
-//设置referer白名单
+// Set referer whitelist
 $refererConfig = new RefererConfig();
 $refererConfig->setAllowEmptyReferer(true);
 $refererConfig->addReferer("www.aliiyun.com");
 $refererConfig->addReferer("www.aliiyuncs.com");
 $ossClient->putBucketReferer($bucket, $refererConfig);
 Common::println("bucket $bucket refererConfig created:" . $refererConfig->serializeToXml());
-//获取Referer白名单
+// Get referer whitelist
 $refererConfig = $ossClient->getBucketReferer($bucket);
 Common::println("bucket $bucket refererConfig fetched:" . $refererConfig->serializeToXml());
 
-//删除referer白名单
+// Delete referrer whitelist
 $refererConfig = new RefererConfig();
 $ossClient->putBucketReferer($bucket, $refererConfig);
 Common::println("bucket $bucket refererConfig deleted");
 
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions ****************************************************
 
 putBucketReferer($ossClient, $bucket);
 getBucketReferer($ossClient, $bucket);
@@ -36,10 +36,10 @@ deleteBucketReferer($ossClient, $bucket);
 getBucketReferer($ossClient, $bucket);
 
 /**
- * 设置bucket的防盗链配置
+ * Set bucket referer configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function putBucketReferer($ossClient, $bucket)
@@ -59,10 +59,10 @@ function putBucketReferer($ossClient, $bucket)
 }
 
 /**
- * 获取bucket的防盗链配置
+ * Get bucket referer configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getBucketReferer($ossClient, $bucket)
@@ -80,11 +80,11 @@ function getBucketReferer($ossClient, $bucket)
 }
 
 /**
- * 删除bucket的防盗链配置
- * Referer白名单不能直接清空，只能通过重新设置来覆盖之前的规则。
+ * Delete bucket referer configuration
+ * Referer whitelist cannot be directly deleted. So use a empty one to overwrite it.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteBucketReferer($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/samples/BucketWebsite.php

@@ -9,22 +9,22 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//*******************************简单使用***************************************************************
+//******************************* Simple Usage ***************************************************************
 
-// 设置Bucket的静态网站托管模式
+// Set bucket static website configuration
 $websiteConfig = new WebsiteConfig("index.html", "error.html");
 $ossClient->putBucketWebsite($bucket, $websiteConfig);
 Common::println("bucket $bucket websiteConfig created:" . $websiteConfig->serializeToXml());
 
-// 查看Bucket的静态网站托管状态
+// Get bucket static website configuration
 $websiteConfig = $ossClient->getBucketWebsite($bucket);
 Common::println("bucket $bucket websiteConfig fetched:" . $websiteConfig->serializeToXml());
 
-// 删除Bucket的静态网站托管模式
+// Delete bucket static website configuration
 $ossClient->deleteBucketWebsite($bucket);
 Common::println("bucket $bucket websiteConfig deleted");
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions  ****************************************************
 
 putBucketWebsite($ossClient, $bucket);
 getBucketWebsite($ossClient, $bucket);
@@ -32,10 +32,10 @@ deleteBucketWebsite($ossClient, $bucket);
 getBucketWebsite($ossClient, $bucket);
 
 /**
- * 设置bucket的静态网站托管模式配置
+ * Sets bucket static website configuration
  *
  * @param $ossClient OssClient
- * @param  $bucket string 存储空间名称
+ * @param  $bucket string bucket name
  * @return null
  */
 function putBucketWebsite($ossClient, $bucket)
@@ -52,10 +52,10 @@ function putBucketWebsite($ossClient, $bucket)
 }
 
 /**
- * 获取bucket的静态网站托管状态
+ * Get bucket static website configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getBucketWebsite($ossClient, $bucket)
@@ -73,10 +73,10 @@ function getBucketWebsite($ossClient, $bucket)
 }
 
 /**
- * 删除bucket的静态网站托管模式配置
+ * Delete bucket static website configuration
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteBucketWebsite($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/samples/Callback.php

@@ -7,12 +7,12 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//*******************************简单使用***************************************************************
+//******************************* Simple Usage ***************************************************************
 
-/** putObject 使用callback上传内容到oss文件
-  * callbackurl参数指定请求回调的服务器url
-  * callbackbodytype参数可为application/json或application/x-www-form-urlencoded, 可选参数，默认为application/x-www-form-urlencoded
-  * OSS_CALLBACK_VAR参数可以不设置
+/**  putObject Upload content to an OSS file using callback.
+  * The callbackurl specifies the server url for the request callback.
+  * The callbackbodytype can be application/json or application/x-www-form-urlencoded,the optional parameters,the default for the application/x - WWW - form - urlencoded
+  * Users can choose not to set OSS_BACK_VAR
   */
 $url =
     '{
@@ -35,17 +35,17 @@ Common::println($result['body']);
 Common::println($result['info']['http_code']);
 
 /**
-  * completeMultipartUpload 使用callback上传内容到oss文件
-  * callbackurl参数指定请求回调的服务器url
-  * callbackbodytype参数可为application/json或application/x-www-form-urlencoded, 可选参数，默认为application/x-www-form-urlencoded
-  * OSS_CALLBACK_VAR参数可以不设置
+  * completeMultipartUpload  Upload content to an OSS file using callback.
+  * callbackurl specifies the server url for the request callback
+  * The callbackbodytype can be application/json or application/x-www-form-urlencoded,the optional parameters,the default for the application/x - WWW - form - urlencoded
+  * Users can choose not to set OSS_BACK_VAR.
  */
 $object = "multipart-callback-test.txt";
 $copiedObject = "multipart-callback-test.txt.copied";
 $ossClient->putObject($bucket, $copiedObject, file_get_contents(__FILE__));
 
 /**
-  *  step 1. 初始化一个分块上传事件, 也就是初始化上传Multipart, 获取upload id
+  *  step 1. Initialize a block upload event, that is, a multipart upload process to get an upload id
   */
 $upload_id = $ossClient->initiateMultipartUpload($bucket, $object);
 

vendor/aliyuncs/oss-sdk-php/samples/Common.php

@@ -14,7 +14,7 @@ use OSS\Core\OssException;
 /**
  * Class Common
  *
- * 示例程序【Samples/*.php】 的Common类，用于获取OssClient实例和其他公用方法
+ * The Common class for 【Samples/*.php】 used to obtain OssClient instance and other common functions
  */
 class Common
 {
@@ -24,9 +24,9 @@ class Common
     const bucket = Config::OSS_TEST_BUCKET;
 
     /**
-     * 根据Config配置，得到一个OssClient实例
+     * Get an OSSClient instance according to config.
      *
-     * @return OssClient 一个OssClient实例
+     * @return OssClient An OssClient instance
      */
     public static function getOssClient()
     {
@@ -46,7 +46,7 @@ class Common
     }
 
     /**
-     * 工具方法，创建一个存储空间，如果发生异常直接exit
+     * A tool function which creates a bucket and exists the process if there are exceptions
      */
     public static function createBucket()
     {
@@ -81,4 +81,4 @@ class Common
     }
 }
 
-Common::createBucket();
+# Common::createBucket();

vendor/aliyuncs/oss-sdk-php/samples/Config.php

@@ -3,13 +3,13 @@
 /**
  * Class Config
  *
- * 执行Sample示例所需要的配置，用户在这里配置好Endpoint，AccessId， AccessKey和Sample示例操作的
- * bucket后，便可以直接运行RunAll.php, 运行所有的samples
+ * Make configurations required by the sample.
+ * Users can run RunAll.php which runs all the samples after configuring Endpoint, AccessId, and AccessKey.
  */
 final class Config
 {
-    const OSS_ACCESS_ID = '';
-    const OSS_ACCESS_KEY = '';
-    const OSS_ENDPOINT = '';
-    const OSS_TEST_BUCKET = '';
+    const OSS_ACCESS_ID = 'update me';
+    const OSS_ACCESS_KEY = 'update me';
+    const OSS_ENDPOINT = 'update me';
+    const OSS_TEST_BUCKET = 'update me';
 }

vendor/aliyuncs/oss-sdk-php/samples/Image.php

@@ -9,54 +9,54 @@ $ossClient = Common::getOssClient();
 $download_file = "download.jpg";
 if (is_null($ossClient)) exit(1);
 
-//*******************************简单使用***************************************************************
+//******************************* Simple Usage ***************************************************************
 
-// 先把本地的example.jpg上传到指定$bucket, 命名为$object
+// Upload example.jpg to the specified bucket and rename it to $object.
 $ossClient->uploadFile($bucketName, $object, "example.jpg");
 
-// 图片缩放
+// Image resize
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/resize,m_fixed,h_100,w_100", );
 $ossClient->getObject($bucketName, $object, $options);
 printImage("imageResize",$download_file);
 
-// 图片裁剪
+// Image crop
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/crop,w_100,h_100,x_100,y_100,r_1", );
 $ossClient->getObject($bucketName, $object, $options);
 printImage("iamgeCrop", $download_file);
 
-// 图片旋转
+// Image rotate
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/rotate,90", );
 $ossClient->getObject($bucketName, $object, $options);
 printImage("imageRotate", $download_file);
 
-// 图片锐化
+// Image sharpen
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/sharpen,100", );
 $ossClient->getObject($bucketName, $object, $options);
 printImage("imageSharpen", $download_file);
 
-// 图片水印
+// Add watermark into a image
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/watermark,text_SGVsbG8g5Zu-54mH5pyN5YqhIQ", );
 $ossClient->getObject($bucketName, $object, $options);
 printImage("imageWatermark", $download_file);
 
-// 图片格式转换
+// Image format convertion
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/format,png", );
 $ossClient->getObject($bucketName, $object, $options);
 printImage("imageFormat", $download_file);
 
-// 获取图片信息
+// Get image information
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => $download_file,
     OssClient::OSS_PROCESS => "image/info", );
@@ -65,7 +65,7 @@ printImage("imageInfo", $download_file);
 
 
 /**
- *  生成一个带签名的可用于浏览器直接打开的url, URL的有效期是3600秒
+ * Generate a signed url which could be used in browser to access the object. The expiration time is 1 hour.
  */
  $timeout = 3600;
 $options = array(
@@ -74,7 +74,7 @@ $options = array(
 $signedUrl = $ossClient->signUrl($bucketName, $object, $timeout, "GET", $options);
 Common::println("rtmp url: \n" . $signedUrl);
 
-//最后删除上传的$object
+// Finally delete the $object uploaded.
 $ossClient->deleteObject($bucketName, $object);     
 
 function printImage($func, $imageFile)

vendor/aliyuncs/oss-sdk-php/samples/LiveChannel.php

@@ -8,11 +8,14 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//******************************* 简单使用 *******************************************************
+//******************************* Simple Usage *******************************************************
 
 /**
-    创建一个直播频道
-    频道的名称是test_rtmp_live。直播生成的m3u8文件叫做test.m3u8，该索引文件包含3片ts文件，每片ts文件的时长为5秒（这只是一个建议值，具体的时长取决于关键帧）。
+ * Create a Live Channel
+ * The live channel's name is test_rtmp_live.
+ * The play url file is named as test.m3u8, which includes 3 ts files.
+ * The time period of each file is 5 seconds.(It is recommneded value only for demo purpose, the actual period depends on the key frame.)
+ *
  */
 $config = new LiveChannelConfig(array(
             'description' => 'live channel test',
@@ -29,9 +32,9 @@ Common::println("bucket $bucket liveChannel created:\n" .
 "playurls: ". $info->getPlayUrls()[0] . "\n");
 
 /**
-    对创建好的频道，可以使用listBucketLiveChannels来进行列举已达到管理的目的。
-    prefix可以按照前缀过滤list出来的频道。
-    max_keys表示迭代器内部一次list出来的频道的最大数量，这个值最大不能超过1000，不填写的话默认为100。
+  * You can use listBucketLiveChannels to list and manage all existing live channels.
+  * Prefix can be used to filter listed live channels by prefix.
+  * Max_keys indicates the maximum numbers of live channels that can be listed in an iterator at one time. Its value is 1000 in maximum and 100 by default.
  */
 $list = $ossClient->listBucketLiveChannels($bucket);
 Common::println("bucket $bucket listLiveChannel:\n" . 
@@ -50,7 +53,9 @@ foreach($list->getChannelList()  as $list)
     "list live channel getNextMarker: ". $list->getLastModified() . "\n");
 }
 /**
-    创建直播频道之后拿到推流用的play_url（rtmp推流的url，如果Bucket不是公共读写权限那么还需要带上签名，见下文示例）和推流用的publish_url（推流产生的m3u8文件的url）
+  * Obtain the play_url (url used for rtmp stream pushing.
+  * If the the bucket is not globally readable and writable,
+  * the url must be signed as shown in the following.) and pulish_url (the url included in the m3u8 file generated in stream pushing) used to push streams.
  */
 $play_url = $ossClient->signRtmpUrl($bucket, "test_rtmp_live", 3600, array('params' => array('playlistName' => 'playlist.m3u8')));
 Common::println("bucket $bucket rtmp url: \n" . $play_url);
@@ -58,12 +63,13 @@ $play_url = $ossClient->signRtmpUrl($bucket, "test_rtmp_live", 3600);
 Common::println("bucket $bucket rtmp url: \n" . $play_url);
 
 /**
-   创建好直播频道，如果想把这个频道禁用掉（断掉正在推的流或者不再允许向一个地址推流），应该使用putLiveChannelStatus接口，将频道的status改成“Disabled”，如果要将一个禁用状态的频道启用，那么也是调用这个接口，将status改成“Enabled”
+  * If you want to disable a created live channel (disable the pushing streaming or do not allow stream pushing to an IP address), call putLiveChannelStatus to change the channel status to "Disabled".
+  * If you want to enable a disabled live channel, call PutLiveChannelStatus to chanage the channel status to "Enabled".
  */
 $resp = $ossClient->putLiveChannelStatus($bucket, "test_rtmp_live", "enabled");
 
 /**
-    创建好直播频道之后调用getLiveChannelInfo可以得到频道相关的信息
+  * You can callLiveChannelInfo to get the information about a live channel.
  */
 $info = $ossClient->getLiveChannelInfo($bucket, 'test_rtmp_live');
 Common::println("bucket $bucket LiveChannelInfo:\n" . 
@@ -75,7 +81,7 @@ Common::println("bucket $bucket LiveChannelInfo:\n" .
 "live channel info playListName: ". $info->getPlayListName() . "\n");
 
 /**
-    如果想查看一个频道历史推流记录，可以调用getLiveChannelHistory。目前最多可以看到10次推流的记录
+  * Gets the historical pushing streaming records by calling getLiveChannelHistory. Now the max records to return is 10.
  */
 $history = $ossClient->getLiveChannelHistory($bucket, "test_rtmp_live");
 if (count($history->getLiveRecordList()) != 0)
@@ -90,9 +96,9 @@ if (count($history->getLiveRecordList()) != 0)
 }
 
 /**
-    对于正在推流的频道调用get_live_channel_stat可以获得流的状态信息。
-    如果频道正在推流，那么stat_result中的所有字段都有意义。
-    如果频道闲置或者处于“Disabled”状态，那么status为“Idle”或“Disabled”，其他字段无意义。
+  * Get the live channel's status by calling getLiveChannelStatus.
+  * If the live channel is receiving the pushing stream, all attributes in stat_result are valid.
+  * If the live channel is idle or disabled, then the status is idle or Disabled and other attributes have no meaning.
  */
 $status = $ossClient->getLiveChannelStatus($bucket, "test_rtmp_live");
 Common::println("bucket $bucket listLiveChannel:\n" . 
@@ -108,9 +114,9 @@ Common::println("bucket $bucket listLiveChannel:\n" .
 "live channel status AdioCodec: ". $status->getAudioCodec() . "\n");
 
 /**
- *  如果希望利用直播推流产生的ts文件生成一个点播列表，可以使用postVodPlaylist方法。
- *  指定起始时间为当前时间减去60秒，结束时间为当前时间，这意味着将生成一个长度为60秒的点播视频。
- *  播放列表指定为“vod_playlist.m3u8”，也就是说这个接口调用成功之后会在OSS上生成一个名叫“vod_playlist.m3u8”的播放列表文件。
+ * If you want to generate a play url from the ts files generated from pushing streaming, call postVodPlayList.
+ * Specify the start time to 60 seconds before the current time and the end time to the current time, which means that a video of 60 seconds is generated.
+ * The playlist file is specified to “vod_playlist.m3u8”, which means that a palylist file named vod_playlist.m3u8 is created after the interface is called.
  */
 $current_time = time();
 $ossClient->postVodPlaylist($bucket,
@@ -120,6 +126,6 @@ $ossClient->postVodPlaylist($bucket,
 );
 
 /**
- *  如果一个直播频道已经不打算再使用了，那么可以调用delete_live_channel来删除频道。
+  *  Call delete_live_channel to delete a live channel if it will no longer be in used.
  */
 $ossClient->deleteBucketLiveChannel($bucket, "test_rtmp_live");

vendor/aliyuncs/oss-sdk-php/samples/MultipartUpload.php

@@ -9,27 +9,27 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//*******************************简单使用***************************************************************
+//******************************* Simple usage ***************************************************************
 
 /**
- * 查看完整用法中的 "putObjectByRawApis"函数，查看使用基础的分片上传api进行文件上传，用户可以基于这个自行实现断点续传等功能
+ * See the putObjectByRawAPis usage in complete example to check out basic multipart upload APIs which can be used as resumable upload.
  */
 
-// 使用分片上传接口上传文件, 接口会根据文件大小决定是使用普通上传还是分片上传
+// Upload a file using the multipart upload interface, which determines to use simple upload or multipart upload based on the file size.
 $ossClient->multiuploadFile($bucket, "file.php", __FILE__, array());
 Common::println("local file " . __FILE__ . " is uploaded to the bucket $bucket, file.php");
 
 
-// 上传本地目录到bucket内的targetdir子目录中
+// Upload local directory's data into target dir
 $ossClient->uploadDir($bucket, "targetdir", __DIR__);
 Common::println("local dir " . __DIR__ . " is uploaded to the bucket $bucket, targetdir/");
 
 
-// 列出当前未完成的分片上传
+// List the incomplete multipart uploads
 $listMultipartUploadInfo = $ossClient->listMultipartUploads($bucket, array());
 
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions ****************************************************
 
 multiuploadFile($ossClient, $bucket);
 putObjectByRawApis($ossClient, $bucket);
@@ -37,10 +37,10 @@ uploadDir($ossClient, $bucket);
 listMultipartUploads($ossClient, $bucket);
 
 /**
- * 通过multipart上传文件
+ * Upload files using multipart upload
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function multiuploadFile($ossClient, $bucket)
@@ -60,17 +60,17 @@ function multiuploadFile($ossClient, $bucket)
 }
 
 /**
- * 使用基本的api分阶段进行分片上传
+ * Use basic multipart upload for file upload.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @throws OssException
  */
 function putObjectByRawApis($ossClient, $bucket)
 {
     $object = "test/multipart-test.txt";
     /**
-     *  step 1. 初始化一个分块上传事件, 也就是初始化上传Multipart, 获取upload id
+     *  step 1. Initialize a block upload event, that is, a multipart upload process to get an upload id
      */
     try {
         $uploadId = $ossClient->initiateMultipartUpload($bucket, $object);
@@ -81,7 +81,7 @@ function putObjectByRawApis($ossClient, $bucket)
     }
     print(__FUNCTION__ . ": initiateMultipartUpload OK" . "\n");
     /*
-     * step 2. 上传分片
+     * step 2. Upload parts
      */
     $partSize = 10 * 1024 * 1024;
     $uploadFile = __FILE__;
@@ -104,7 +104,7 @@ function putObjectByRawApis($ossClient, $bucket)
             $contentMd5 = OssUtil::getMd5SumForFile($uploadFile, $fromPos, $toPos);
             $upOptions[$ossClient::OSS_CONTENT_MD5] = $contentMd5;
         }
-        //2. 将每一分片上传到OSS
+        //2. Upload each part to OSS
         try {
             $responseUploadPart[] = $ossClient->uploadPart($bucket, $object, $uploadId, $upOptions);
         } catch (OssException $e) {
@@ -122,7 +122,7 @@ function putObjectByRawApis($ossClient, $bucket)
         );
     }
     /**
-     * step 3. 完成上传
+     * step 3. Complete the upload
      */
     try {
         $ossClient->completeMultipartUpload($bucket, $object, $uploadId, $uploadParts);
@@ -135,10 +135,10 @@ function putObjectByRawApis($ossClient, $bucket)
 }
 
 /**
- * 按照目录上传文件
+ * Upload by directories
  *
  * @param OssClient $ossClient OssClient
- * @param string $bucket 存储空间名称
+ * @param string $bucket bucket name
  *
  */
 function uploadDir($ossClient, $bucket)
@@ -156,7 +156,7 @@ function uploadDir($ossClient, $bucket)
 }
 
 /**
- * 获取当前未完成的分片上传列表
+ * Get ongoing multipart uploads
  *
  * @param $ossClient OssClient
  * @param $bucket   string

vendor/aliyuncs/oss-sdk-php/samples/Object.php

@@ -7,9 +7,9 @@ use OSS\Core\OssException;
 $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
-//*******************************简单使用***************************************************************
+//******************************* Simple usage ***************************************************************
 
-// 简单上传变量的内容到oss文件
+// Upload the in-memory string (hi, oss) to an OSS file
 $result = $ossClient->putObject($bucket, "b.file", "hi, oss");
 Common::println("b.file is created");
 Common::println($result['x-oss-request-id']);
@@ -17,7 +17,7 @@ Common::println($result['etag']);
 Common::println($result['content-md5']);
 Common::println($result['body']);
 
-// 上传本地文件
+// Uploads a local file to an OSS file
 $result = $ossClient->uploadFile($bucket, "c.file", __FILE__);
 Common::println("c.file is created");
 Common::println("b.file is created");
@@ -26,21 +26,21 @@ Common::println($result['etag']);
 Common::println($result['content-md5']);
 Common::println($result['body']);
 
-// 下载object到本地变量
+// Download an oss object as an in-memory variable
 $content = $ossClient->getObject($bucket, "b.file");
 Common::println("b.file is fetched, the content is: " . $content);
 
-// 给object添加symlink
+// Add a symlink to an object
 $content = $ossClient->putSymlink($bucket, "test-symlink", "b.file");
 Common::println("test-symlink is created");
 Common::println($result['x-oss-request-id']);
 Common::println($result['etag']);
 
-// 获取symlink
+// Get a symlink
 $content = $ossClient->getSymlink($bucket, "test-symlink");
 Common::println("test-symlink refer to : " . $content[OssClient::OSS_SYMLINK_TARGET]);
 
-// 下载object到本地文件
+// Download an object to a local file.
 $options = array(
     OssClient::OSS_FILE_DOWNLOAD => "./c.file.localcopy",
 );
@@ -48,26 +48,26 @@ $ossClient->getObject($bucket, "c.file", $options);
 Common::println("b.file is fetched to the local file: c.file.localcopy");
 Common::println("b.file is created");
 
-// 拷贝object
+// Copy an object
 $result = $ossClient->copyObject($bucket, "c.file", $bucket, "c.file.copy");
 Common::println("lastModifiedTime: " . $result[0]);
 Common::println("ETag: " . $result[1]);
 
-// 判断object是否存在
+// Check whether an object exists
 $doesExist = $ossClient->doesObjectExist($bucket, "c.file.copy");
 Common::println("file c.file.copy exist? " . ($doesExist ? "yes" : "no"));
 
-// 删除object
+// Delete an object
 $result = $ossClient->deleteObject($bucket, "c.file.copy");
 Common::println("c.file.copy is deleted");
 Common::println("b.file is created");
 Common::println($result['x-oss-request-id']);
 
-// 判断object是否存在
+// Check whether an object exists
 $doesExist = $ossClient->doesObjectExist($bucket, "c.file.copy");
 Common::println("file c.file.copy exist? " . ($doesExist ? "yes" : "no"));
 
-// 批量删除object
+// Delete multiple objects in batch
 $result = $ossClient->deleteObjects($bucket, array("b.file", "c.file"));
 foreach($result as $object)
     Common::println($object);
@@ -75,7 +75,7 @@ foreach($result as $object)
 sleep(2);
 unlink("c.file.localcopy");
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions ****************************************************
 
 listObjects($ossClient, $bucket);
 listAllObjects($ossClient, $bucket);
@@ -93,10 +93,10 @@ doesObjectExist($ossClient, $bucket);
 getSymlink($ossClient, $bucket);
 putSymlink($ossClient, $bucket);
 /**
- * 创建虚拟目录
+ * Create a 'virtual' folder
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function createObjectDir($ossClient, $bucket)
@@ -112,12 +112,12 @@ function createObjectDir($ossClient, $bucket)
 }
 
 /**
- * 把本地变量的内容到文件
+ * Upload in-memory data to oss
  *
- * 简单上传,上传指定变量的内存值作为object的内容
+ * Simple upload---upload specified in-memory data to an OSS object
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function putObject($ossClient, $bucket)
@@ -137,10 +137,10 @@ function putObject($ossClient, $bucket)
 
 
 /**
- * 上传指定的本地文件内容
+ * Uploads a local file to OSS
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function uploadFile($ossClient, $bucket)
@@ -160,11 +160,12 @@ function uploadFile($ossClient, $bucket)
 }
 
 /**
- * 列出Bucket内所有目录和文件, 注意如果符合条件的文件数目超过设置的max-keys， 用户需要使用返回的nextMarker作为入参，通过
- * 循环调用ListObjects得到所有的文件，具体操作见下面的 listAllObjects 示例
+ * Lists all files and folders in the bucket. 
+ * Note if there's more items than the max-keys specified, the caller needs to use the nextMarker returned as the value for the next call's maker paramter.
+ * Loop through all the items returned from ListObjects.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function listObjects($ossClient, $bucket)
@@ -187,8 +188,8 @@ function listObjects($ossClient, $bucket)
         return;
     }
     print(__FUNCTION__ . ": OK" . "\n");
-    $objectList = $listObjectInfo->getObjectList(); // 文件列表
-    $prefixList = $listObjectInfo->getPrefixList(); // 目录列表
+    $objectList = $listObjectInfo->getObjectList(); // object list
+    $prefixList = $listObjectInfo->getPrefixList(); // directory list
     if (!empty($objectList)) {
         print("objectList:\n");
         foreach ($objectList as $objectInfo) {
@@ -204,15 +205,15 @@ function listObjects($ossClient, $bucket)
 }
 
 /**
- * 列出Bucket内所有目录和文件， 根据返回的nextMarker循环得到所有Objects
+ * Lists all folders and files under the bucket. Use nextMarker repeatedly to get all objects.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function listAllObjects($ossClient, $bucket)
 {
-    //构造dir下的文件和虚拟目录
+    // Create dir/obj 'folder' and put some files into it.
     for ($i = 0; $i < 100; $i += 1) {
         $ossClient->putObject($bucket, "dir/obj" . strval($i), "hi");
         $ossClient->createObjectDir($bucket, "dir/obj" . strval($i));
@@ -238,7 +239,7 @@ function listAllObjects($ossClient, $bucket)
             printf($e->getMessage() . "\n");
             return;
         }
-        // 得到nextMarker，从上一次listObjects读到的最后一个文件的下一个文件开始继续获取文件列表
+        // Get the nextMarker, and it would be used as the next call's marker parameter to resume from the last call
         $nextMarker = $listObjectInfo->getNextMarker();
         $listObject = $listObjectInfo->getObjectList();
         $listPrefix = $listObjectInfo->getPrefixList();
@@ -251,10 +252,10 @@ function listAllObjects($ossClient, $bucket)
 }
 
 /**
- * 获取object的内容
+ * Get the content of an object.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getObject($ossClient, $bucket)
@@ -277,10 +278,10 @@ function getObject($ossClient, $bucket)
 }
 
 /**
- * put symlink
+ * Put symlink
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient  The Instance of OssClient
+ * @param string $bucket bucket name
  * @return null
  */
 function putSymlink($ossClient, $bucket)
@@ -305,10 +306,10 @@ function putSymlink($ossClient, $bucket)
 }
 
 /**
- * 获取symlink
+ * Get symlink
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient  OssClient instance
+ * @param string $bucket  bucket name
  * @return null
  */
 function getSymlink($ossClient, $bucket)
@@ -333,13 +334,13 @@ function getSymlink($ossClient, $bucket)
 }
 
 /**
- * get_object_to_local_file
+ * Get_object_to_local_file
  *
- * 获取object
- * 将object下载到指定的文件
+ * Get object
+ * Download object to a specified file.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getObjectToLocalFile($ossClient, $bucket)
@@ -369,11 +370,11 @@ function getObjectToLocalFile($ossClient, $bucket)
 }
 
 /**
- * 拷贝object
- * 当目的object和源object完全相同时，表示修改object的meta信息
+ * Copy object
+ * When the source object is same as the target one, copy operation will just update the metadata.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function copyObject($ossClient, $bucket)
@@ -395,11 +396,11 @@ function copyObject($ossClient, $bucket)
 }
 
 /**
- * 修改Object Meta
- * 利用copyObject接口的特性：当目的object和源object完全相同时，表示修改object的meta信息
+ * Update Object Meta
+ * it leverages the feature of copyObject： when the source object is just the target object, the metadata could be updated via copy
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function modifyMetaForObject($ossClient, $bucket)
@@ -425,10 +426,10 @@ function modifyMetaForObject($ossClient, $bucket)
 }
 
 /**
- * 获取object meta, 也就是getObjectMeta接口
+ * Get object meta, that is, getObjectMeta
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function getObjectMeta($ossClient, $bucket)
@@ -452,10 +453,10 @@ function getObjectMeta($ossClient, $bucket)
 }
 
 /**
- * 删除object
+ * Delete an object
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteObject($ossClient, $bucket)
@@ -473,10 +474,10 @@ function deleteObject($ossClient, $bucket)
 
 
 /**
- * 批量删除object
+ * Delete multiple objects in batch
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function deleteObjects($ossClient, $bucket)
@@ -495,10 +496,10 @@ function deleteObjects($ossClient, $bucket)
 }
 
 /**
- * 判断object是否存在
+ * Check whether an object exists
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  */
 function doesObjectExist($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/samples/RunAll.php

@@ -9,5 +9,5 @@ require_once __DIR__ . '/BucketReferer.php';
 require_once __DIR__ . '/BucketLogging.php';
 require_once __DIR__ . '/BucketWebsite.php';
 require_once __DIR__ . '/Signature.php';
-require_once __DIR__ . '/Object.php';
+require_once __DIR__ . '/Object1.php';
 require_once __DIR__ . '/MultipartUpload.php';

vendor/aliyuncs/oss-sdk-php/samples/Signature.php

@@ -10,33 +10,33 @@ $bucket = Common::getBucketName();
 $ossClient = Common::getOssClient();
 if (is_null($ossClient)) exit(1);
 
-//******************************* 简单使用 ***************************************************************
+//******************************* Simple Usage ***************************************************************
 
 $ossClient->uploadFile($bucket, "a.file", __FILE__);
 
-// 生成GetObject的签名url，用户可以使用这个url直接在浏览器下载
+// Generate a signed url for getting an object. The URL can be used in browser directly to download the file.
 $signedUrl = $ossClient->signUrl($bucket, "a.file", 3600);
 Common::println($signedUrl);
 
-// 生成用于putObject的签名URL，用户可以直接用put方法使用这个url上传文件到 "a.file"
+// Generate the signed url for putting an object. User can use put method with this url to upload a file to "a.file".
 $signedUrl = $ossClient->signUrl($bucket, "a.file", "3600", "PUT");
 Common::println($signedUrl);
 
-// 生成从本地文件上传PutObject的签名url, 用户可以直接使用这个url把本地文件上传到　"a.file"
+// Generate the signed url for putting an object from local file. The url can be used directly to upload the file to "a.file".
 $signedUrl = $ossClient->signUrl($bucket, "a.file", 3600, "PUT", array('Content-Type' => 'txt'));
 Common::println($signedUrl);
 
-//******************************* 完整用法参考下面函数 ****************************************************
+//******************************* For complete usage, see the following functions ****************************************************
 
 getSignedUrlForPuttingObject($ossClient, $bucket);
 getSignedUrlForPuttingObjectFromFile($ossClient, $bucket);
 getSignedUrlForGettingObject($ossClient, $bucket);
 
 /**
- * 生成GetObject的签名url,主要用于私有权限下的读访问控制
+ * Generate the signed url for getObject() to control read accesses under private privilege
  *
- * @param $ossClient OssClient OssClient实例
- * @param $bucket string 存储空间名称
+ * @param $ossClient OssClient OssClient instance
+ * @param $bucket string bucket name
  * @return null
  */
 function getSignedUrlForGettingObject($ossClient, $bucket)
@@ -52,7 +52,7 @@ function getSignedUrlForGettingObject($ossClient, $bucket)
     }
     print(__FUNCTION__ . ": signedUrl: " . $signedUrl . "\n");
     /**
-     * 可以类似的代码来访问签名的URL，也可以输入到浏览器中去访问
+     * Use similar code to access the object by url, or use browser to access the object.
      */
     $request = new RequestCore($signedUrl);
     $request->set_method('GET');
@@ -67,10 +67,10 @@ function getSignedUrlForGettingObject($ossClient, $bucket)
 }
 
 /**
- * 生成PutObject的签名url,主要用于私有权限下的写访问控制
+ * Generate the signed url for PutObject to control write accesses under private privilege.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @return null
  * @throws OssException
  */
@@ -105,11 +105,10 @@ function getSignedUrlForPuttingObject($ossClient, $bucket)
 }
 
 /**
- * 生成PutObject的签名url,主要用于私有权限下的写访问控制， 用户可以利用生成的signedUrl
- * 从文件上传文件
+ * Generate the signed url for PutObject's signed url. User could use the signed url to upload file directly.
  *
- * @param OssClient $ossClient OssClient实例
- * @param string $bucket 存储空间名称
+ * @param OssClient $ossClient OssClient instance
+ * @param string $bucket bucket name
  * @throws OssException
  */
 function getSignedUrlForPuttingObjectFromFile($ossClient, $bucket)

vendor/aliyuncs/oss-sdk-php/src/OSS/Core/MimeTypes.php

@@ -5,16 +5,17 @@ namespace OSS\Core;
 /**
  * Class MimeTypes
  *
- * 在上传文件的时候，根据文件的缺省名，得到其对应的Content-type
+ * The map of a file's extention name to its corresponding Content-Type value in the file upload request.
+ * If the file extention name is not predefined in this class, getMimetype() returns null.
  *
  * @package OSS\Core
  */
 class MimeTypes
 {
     /**
-     * 根据文件名，获取http协议header中的content-type应该填写的数据
+     * Get the content-type value of http header from the file's extension name.
      *
-     * @param string $name 缺省名
+     * @param string $name Default file extension name.
      * @return string content-type
      */
     public static function getMimetype($name)

vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssException.php

@@ -5,8 +5,8 @@ namespace OSS\Core;
 /**
  * Class OssException
  *
- * OssClient在使用的时候，所抛出的异常，用户在使用OssClient的时候，要Try住相关代码，
- * try的Exception应该是OssException，其中会得到相关异常原因
+ * This is the class that OSSClient is expected to thrown, which the caller needs to handle properly.
+ * It has the OSS specific errors which is useful for troubleshooting.
  *
  * @package OSS\Core
  */

vendor/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php

@@ -5,7 +5,7 @@ namespace OSS\Core;
 /**
  * Class OssUtil
  *
- * Oss工具类，主要供OssClient使用，用户也可以使用本类进行返回结果的格式化
+ * Oss Util class for OssClient. The caller could use it for formating the result from OssClient.
  *
  * @package OSS
  */
@@ -20,10 +20,10 @@ class OssUtil
     const OSS_MIN_PART_SIZE = 102400; // 100KB
 
     /**
-     * 生成query params
+     * Generate query params
      *
-     * @param array $options 关联数组
-     * @return string 返回诸如 key1=value1&key2=value2
+     * @param array $options: a key-value pair array.
+     * @return string: the key-value list in the format such as key1=value1&key2=value2
      */
     public static function toQueryString($options = array())
     {
@@ -38,7 +38,7 @@ class OssUtil
     }
 
     /**
-     * 转义字符替换
+     * Html encoding '<', '>', '&', '\', '"' in subject parameter. 
      *
      * @param string $subject
      * @return string
@@ -51,7 +51,7 @@ class OssUtil
     }
 
     /**
-     * 检查是否是中文编码
+     * Check whether the string includes any chinese character
      *
      * @param $str
      * @return int
@@ -62,10 +62,10 @@ class OssUtil
     }
 
     /**
-     * 检测是否GB2312编码
+     * Checks if the string is encoded by GB2312.
      *
      * @param string $str
-     * @return boolean false UTF-8编码  TRUE GB2312编码
+     * @return boolean false UTF-8 encoding  TRUE GB2312 encoding
      */
     public static function isGb2312($str)
     {
@@ -87,7 +87,7 @@ class OssUtil
     }
 
     /**
-     * 检测是否GBK编码
+     * Checks if the string is encoded by GBK
      *
      * @param string $str
      * @param boolean $gbk
@@ -114,13 +114,13 @@ class OssUtil
     }
 
     /**
-     * 检验bucket名称是否合法
-     * bucket的命名规范：
-     * 1. 只能包括小写字母，数字
-     * 2. 必须以小写字母或者数字开头
-     * 3. 长度必须在3-63字节之间
+     * Checks if the bucket name is valid
+     * bucket naming rules
+     * 1. Can only include lowercase letters, numbers, or dashes
+     * 2. Must start and end with lowercase letters or numbers
+     * 3. Must be within a length from 3 to 63 bytes.
      *
-     * @param string $bucket Bucket名称
+     * @param string $bucket Bucket name
      * @return boolean
      */
     public static function validateBucket($bucket)
@@ -133,11 +133,11 @@ class OssUtil
     }
 
     /**
-     * 检验object名称是否合法
-     * object命名规范:
-     * 1. 规则长度必须在1-1023字节之间
-     * 2. 使用UTF-8编码
-     * 3. 不能以 "/" "\\"开头
+     * Checks if object name is valid
+     * object naming rules:
+     * 1. Must be within a length from 1 to 1023 bytes
+     * 2. Cannot start with '/' or '\\'.
+     * 3. Must be encoded in UTF-8.
      *
      * @param string $object Object名称
      * @return boolean
@@ -155,7 +155,7 @@ class OssUtil
 
 
     /**
-     * 判断字符串$str是不是以$findMe开始
+     * Checks if $str starts with $findMe
      *
      * @param string $str
      * @param string $findMe
@@ -170,8 +170,9 @@ class OssUtil
         }
     }
 
+
     /**
-     * 生成createBucketXmlBody接口的xml消息
+     * Generate the xml message of createBucketXmlBody.
      *
      * @param string $storageClass
      * @return string
@@ -184,7 +185,7 @@ class OssUtil
     }
 
     /**
-     * 检验$options
+     * validate $options
      *
      * @param array $options
      * @throws OssException
@@ -199,7 +200,7 @@ class OssUtil
     }
 
     /**
-     * 检查上传文件的内容是否合法
+     * check whether the Content is valid.
      *
      * @param $content string
      * @throws OssException
@@ -212,7 +213,7 @@ class OssUtil
     }
 
     /**
-     * 校验BUCKET/OBJECT/OBJECT GROUP是否为空
+     * Check if BUCKET/OBJECT/OBJECT GROUP is empty.
      *
      * @param  string $name
      * @param  string $errMsg
@@ -227,7 +228,7 @@ class OssUtil
     }
 
     /**
-     * 仅供测试使用的接口,请勿使用
+     * This is a method for test only. DO NOT USE.
      *
      * @param $filename
      * @param $size
@@ -268,7 +269,7 @@ BBB;
     }
 
     /**
-     * 得到文件的md5编码
+     * Get MD5 of the file.
      *
      * @param $filename
      * @param $from_pos
@@ -318,7 +319,7 @@ BBB;
     }
 
     /**
-     * 检测是否windows系统，因为windows系统默认编码为GBK
+     * Check if the OS is Windows. The default encoding in Windows is GBK.
      *
      * @return bool
      */
@@ -328,7 +329,9 @@ BBB;
     }
 
     /**
-     * 主要是由于windows系统编码是gbk，遇到中文时候，如果不进行转换处理会出现找不到文件的问题
+     * Encodes the file path from GBK to UTF-8.
+     * The default encoding in Windows is GBK. 
+     * And if the file path is in Chinese, the file would not be found without the transcoding to UTF-8.
      *
      * @param $file_path
      * @return string
@@ -342,9 +345,9 @@ BBB;
     }
 
     /**
-     * 判断用户输入的endpoint是否是 xxx.xxx.xxx.xxx:port 或者 xxx.xxx.xxx.xxx的ip格式
+     * Check if the endpoint is in the IPv4 format, such as xxx.xxx.xxx.xxx:port or xxx.xxx.xxx.xxx.
      *
-     * @param string $endpoint 需要做判断的endpoint
+     * @param string $endpoint The endpoint to check.
      * @return boolean
      */
     public static function isIPFormat($endpoint)
@@ -360,7 +363,44 @@ BBB;
     }
 
     /**
-     * 生成DeleteMultiObjects接口的xml消息
+     * Get the host:port from endpoint.
+     *
+     * @param string $endpoint the endpoint.
+     * @return boolean
+     */
+    public static function getHostPortFromEndpoint($endpoint)
+    {
+        $str = $endpoint;
+        $pos = strpos($str, "://");
+        if ($pos !== false) {
+            $str = substr($str, $pos+3);
+        }
+    
+        $pos = strpos($str, '#');
+        if ($pos !== false) {
+            $str = substr($str, 0, $pos);
+        }
+    
+        $pos = strpos($str, '?');
+        if ($pos !== false) {
+            $str = substr($str, 0, $pos);
+        }
+    
+        $pos = strpos($str, '/');
+        if ($pos !== false) {
+            $str = substr($str, 0, $pos);
+        }
+    
+        $pos = strpos($str, '@');
+        if ($pos !== false) {
+            $str = substr($str, $pos+1);
+        }
+        
+        return $str;
+    }
+
+    /**
+     * Generate the xml message of DeleteMultiObjects.
      *
      * @param string[] $objects
      * @param bool $quiet
@@ -379,7 +419,7 @@ BBB;
     }
 
     /**
-     * 生成CompleteMultipartUpload接口的xml消息
+     * Generate the xml message of CompleteMultipartUpload.
      *
      * @param array[] $listParts
      * @return string
@@ -396,7 +436,7 @@ BBB;
     }
 
     /**
-     * 读取目录
+     * Read the directory, return a associative array in which the MD5 is the named key and the <path,filanme> is the value.
      *
      * @param string $dir
      * @param string $exclude

vendor/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php

@@ -3,7 +3,7 @@ namespace OSS\Http;
 
 
 /**
- * Handles all HTTP requests using cURL and manages the responses.
+ * Handle all HTTP requests using cURL and manages the responses.
  *
  * @version 2011.06.07
  * @copyright 2006-2011 Ryan Parman
@@ -75,7 +75,7 @@ class RequestCore
     public $method;
 
     /**
-     * Stores the proxy settings to use for the request.
+     * Store the proxy settings to use for the request.
      */
     public $proxy = null;
 
@@ -170,14 +170,14 @@ class RequestCore
     public $registered_streaming_write_callback = null;
 
     /**
-     * 请求超时时间， 默认是5184000秒，6天
+     * The request timeout time, which is 5,184,000 seconds,that is, 6 days by default
      *
      * @var int
      */
     public $timeout = 5184000;
 
     /**
-     * 连接超时时间，默认是10秒
+     * The connection timeout time, which is 10 seconds by default
      *
      * @var int
      */
@@ -216,7 +216,7 @@ class RequestCore
     // CONSTRUCTOR/DESTRUCTOR
 
     /**
-     * Constructs a new instance of this class.
+     * Construct a new instance of this class.
      *
      * @param string $url (Optional) The URL to request or service endpoint to query.
      * @param string $proxy (Optional) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
@@ -249,7 +249,7 @@ class RequestCore
     }
 
     /**
-     * Destructs the instance. Closes opened file handles.
+     * Destruct the instance. Closes opened file handles.
      *
      * @return $this A reference to the current instance.
      */
@@ -271,7 +271,7 @@ class RequestCore
     // REQUEST METHODS
 
     /**
-     * Sets the credentials to use for authentication.
+     * Set the credentials to use for authentication.
      *
      * @param string $user (Required) The username to authenticate with.
      * @param string $pass (Required) The password to authenticate with.
@@ -285,7 +285,7 @@ class RequestCore
     }
 
     /**
-     * Adds a custom HTTP header to the cURL request.
+     * Add a custom HTTP header to the cURL request.
      *
      * @param string $key (Required) The custom HTTP header to set.
      * @param mixed $value (Required) The value to assign to the custom HTTP header.
@@ -298,7 +298,7 @@ class RequestCore
     }
 
     /**
-     * Removes an HTTP header from the cURL request.
+     * Remove an HTTP header from the cURL request.
      *
      * @param string $key (Required) The custom HTTP header to set.
      * @return $this A reference to the current instance.
@@ -324,7 +324,7 @@ class RequestCore
     }
 
     /**
-     * Sets a custom useragent string for the class.
+     * Set a custom useragent string for the class.
      *
      * @param string $ua (Required) The useragent string to use.
      * @return $this A reference to the current instance.
@@ -373,7 +373,7 @@ class RequestCore
     }
 
     /**
-     * Sets the length in bytes to read from the stream while streaming up.
+     * Set the length in bytes to read from the stream while streaming up.
      *
      * @param integer $size (Required) The length in bytes to read from the stream.
      * @return $this A reference to the current instance.
@@ -386,7 +386,7 @@ class RequestCore
     }
 
     /**
-     * Sets the resource to read from while streaming up. Reads the stream from its current position until
+     * Set the resource to read from while streaming up. Reads the stream from its current position until
      * EOF or `$size` bytes have been read. If `$size` is not given it will be determined by <php:fstat()> and
      * <php:ftell()>.
      *
@@ -414,7 +414,7 @@ class RequestCore
     }
 
     /**
-     * Sets the file to read from while streaming up.
+     * Set the file to read from while streaming up.
      *
      * @param string $location (Required) The readable location to read from.
      * @return $this A reference to the current instance.
@@ -428,7 +428,7 @@ class RequestCore
     }
 
     /**
-     * Sets the resource to write to while streaming down.
+     * Set the resource to write to while streaming down.
      *
      * @param resource $resource (Required) The writeable resource to write to.
      * @return $this A reference to the current instance.
@@ -441,7 +441,7 @@ class RequestCore
     }
 
     /**
-     * Sets the file to write to while streaming down.
+     * Set the file to write to while streaming down.
      *
      * @param string $location (Required) The writeable location to write to.
      * @return $this A reference to the current instance.
@@ -631,7 +631,7 @@ class RequestCore
     }
 
     /**
-     * Prepares and adds the details of the cURL request. This can be passed along to a <php:curl_multi_exec()>
+     * Prepare and adds the details of the cURL request. This can be passed along to a <php:curl_multi_exec()>
      * function.
      *
      * @return resource The handle for the cURL object.
@@ -685,7 +685,6 @@ class RequestCore
 
         // Enable a proxy connection if requested.
         if ($this->proxy) {
-
             $host = $this->proxy['host'];
             $host .= ($this->proxy['port']) ? ':' . $this->proxy['port'] : '';
             curl_setopt($curl_handle, CURLOPT_PROXY, $host);
@@ -830,7 +829,7 @@ class RequestCore
     }
 
     /**
-     * Sends the request, calling necessary utility functions to update built-in properties.
+     * Send the request, calling necessary utility functions to update built-in properties.
      *
      * @param boolean $parse (Optional) Whether to parse the response with ResponseCore or not.
      * @return string The resulting unparsed data from the request.

vendor/aliyuncs/oss-sdk-php/src/OSS/Http/ResponseCore.php

@@ -8,25 +8,25 @@ namespace OSS\Http;
 class ResponseCore
 {
     /**
-     * Stores the HTTP header information.
+     * Store the HTTP header information.
      */
     public $header;
 
     /**
-     * Stores the SimpleXML response.
+     * Store the SimpleXML response.
      */
     public $body;
 
     /**
-     * Stores the HTTP response code.
+     * Store the HTTP response code.
      */
     public $status;
 
     /**
-     * Constructs a new instance of this class.
+     * Construct a new instance of this class.
      *
      * @param array $header (Required) Associative array of HTTP headers (typically returned by <RequestCore::get_response_header()>).
-     * @param string $body (Required) XML-formatted response from AWS.
+     * @param string $body (Required) XML-formatted response from OSS.
      * @param integer $status (Optional) HTTP response status code from the request.
      * @return Mixed Contains an <php:array> `header` property (HTTP headers as an associative array), a <php:SimpleXMLElement> or <php:string> `body` property, and an <php:integer> `status` code.
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/BucketInfo.php

@@ -4,7 +4,7 @@ namespace OSS\Model;
 
 
 /**
- * Bucket信息，ListBuckets接口返回数据
+ * Bucket information class. This is the type of element in BucketListInfo's
  *
  * Class BucketInfo
  * @package OSS\Model
@@ -26,7 +26,7 @@ class BucketInfo
     }
 
     /**
-     * 得到bucket所在的region
+     * Get bucket location
      *
      * @return string
      */
@@ -36,7 +36,7 @@ class BucketInfo
     }
 
     /**
-     * 得到bucket的名称
+     * Get bucket name
      *
      * @return string
      */
@@ -46,7 +46,7 @@ class BucketInfo
     }
 
     /**
-     * 得到bucket的创建时间
+     * Get bucket creation time.
      *
      * @return string
      */
@@ -56,20 +56,20 @@ class BucketInfo
     }
 
     /**
-     * bucket所在的region
+     * bucket region
      *
      * @var string
      */
     private $location;
     /**
-     * bucket的名称
+     * bucket name
      *
      * @var string
      */
     private $name;
 
     /**
-     * bucket的创建事件
+     * bucket creation time
      *
      * @var string
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/BucketListInfo.php

@@ -5,7 +5,7 @@ namespace OSS\Model;
 /**
  * Class BucketListInfo
  *
- * ListBuckets接口返回的数据类型
+ * It's the type of return value of ListBuckets.
  *
  * @package OSS\Model
  */
@@ -21,7 +21,7 @@ class BucketListInfo
     }
 
     /**
-     * 得到BucketInfo列表
+     * Get the BucketInfo list
      *
      * @return BucketInfo[]
      */
@@ -31,7 +31,7 @@ class BucketListInfo
     }
 
     /**
-     * BucketInfo信息列表
+     * BucketInfo list
      *
      * @var array
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/CorsConfig.php

@@ -22,7 +22,7 @@ class CorsConfig implements XmlConfig
     }
 
     /**
-     * 得到CorsRule列表
+     * Get CorsRule list
      *
      * @return CorsRule[]
      */
@@ -33,7 +33,7 @@ class CorsConfig implements XmlConfig
 
 
     /**
-     * 添加一条CorsRule
+     * Add a new CorsRule
      *
      * @param CorsRule $rule
      * @throws OssException
@@ -47,7 +47,7 @@ class CorsConfig implements XmlConfig
     }
 
     /**
-     * 从xml数据中解析出CorsConfig
+     * Parse CorsConfig from the xml.
      *
      * @param string $strXml
      * @throws OssException
@@ -78,7 +78,7 @@ class CorsConfig implements XmlConfig
     }
 
     /**
-     * 生成xml字符串
+     * Serialize the object into xml string.
      *
      * @return string
      */
@@ -105,7 +105,7 @@ class CorsConfig implements XmlConfig
     const OSS_MAX_RULES = 10;
 
     /**
-     * orsRule列表
+     * CorsRule list
      *
      * @var CorsRule[]
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/CorsRule.php

@@ -13,7 +13,7 @@ use OSS\Core\OssException;
 class CorsRule
 {
     /**
-     * Rule中增加一条allowedOrigin
+     * Add an allowedOrigin rule
      *
      * @param string $allowedOrigin
      */
@@ -25,7 +25,7 @@ class CorsRule
     }
 
     /**
-     * Rule中增加一条allowedMethod
+     * Add an allowedMethod rule
      *
      * @param string $allowedMethod
      */
@@ -37,7 +37,7 @@ class CorsRule
     }
 
     /**
-     * Rule中增加一条allowedHeader
+     * Add an allowedHeader rule
      *
      * @param string $allowedHeader
      */
@@ -49,7 +49,7 @@ class CorsRule
     }
 
     /**
-     * Rule中增加一条exposeHeader
+     * Add an exposeHeader rule
      *
      * @param string $exposeHeader
      */
@@ -77,7 +77,7 @@ class CorsRule
     }
 
     /**
-     * 得到AllowedHeaders列表
+     * Get the AllowedHeaders list
      *
      * @return string[]
      */
@@ -87,7 +87,7 @@ class CorsRule
     }
 
     /**
-     * 得到AllowedOrigins列表
+     * Get the AllowedOrigins list
      *
      * @return string[]
      */
@@ -97,7 +97,7 @@ class CorsRule
     }
 
     /**
-     * 得到AllowedMethods列表
+     * Get the AllowedMethods list
      *
      * @return string[]
      */
@@ -107,7 +107,7 @@ class CorsRule
     }
 
     /**
-     * 得到ExposeHeaders列表
+     * Get the ExposeHeaders list
      *
      * @return string[]
      */
@@ -117,7 +117,7 @@ class CorsRule
     }
 
     /**
-     * 根据提供的xmlRule， 把this按照一定的规则插入到$xmlRule中
+     * Serialize all the rules into the xml represented by parameter $xmlRule
      *
      * @param \SimpleXMLElement $xmlRule
      * @throws OssException

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleAction.php

@@ -71,7 +71,7 @@ class LifecycleAction
     }
 
     /**
-     * appendToXml 把actions插入到xml中
+     * Use appendToXml to insert actions into xml.
      *
      * @param \SimpleXMLElement $xmlRule
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleConfig.php

@@ -13,7 +13,7 @@ use OSS\Core\OssException;
 class LifecycleConfig implements XmlConfig
 {
     /**
-     * 从xml数据中解析出LifecycleConfig
+     * Parse the xml into this object.
      *
      * @param string $strXml
      * @throws OssException
@@ -48,7 +48,7 @@ class LifecycleConfig implements XmlConfig
 
 
     /**
-     * 生成xml字符串
+     * Serialize the object to xml
      *
      * @return string
      */
@@ -65,7 +65,7 @@ class LifecycleConfig implements XmlConfig
 
     /**
      *
-     * 添加LifecycleRule
+     * Add a LifecycleRule
      *
      * @param LifecycleRule $lifecycleRule
      * @throws OssException
@@ -79,7 +79,7 @@ class LifecycleConfig implements XmlConfig
     }
 
     /**
-     *  将配置转换成字符串，便于用户查看
+     *  Serialize the object into xml string.
      *
      * @return string
      */
@@ -89,7 +89,7 @@ class LifecycleConfig implements XmlConfig
     }
 
     /**
-     * 得到所有的生命周期规则
+     * Get all lifecycle rules.
      *
      * @return LifecycleRule[]
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleRule.php

@@ -12,7 +12,7 @@ namespace OSS\Model;
 class LifecycleRule
 {
     /**
-     * 得到规则ID
+     * Get Id
      *
      * @return string
      */
@@ -22,7 +22,7 @@ class LifecycleRule
     }
 
     /**
-     * @param string $id 规则ID
+     * @param string $id Rule Id
      */
     public function setId($id)
     {
@@ -30,7 +30,7 @@ class LifecycleRule
     }
 
     /**
-     * 得到文件前缀
+     * Get a file prefix
      *
      * @return string
      */
@@ -40,9 +40,9 @@ class LifecycleRule
     }
 
     /**
-     * 设置文件前缀
+     * Set a file prefix
      *
-     * @param string $prefix 文件前缀
+     * @param string $prefix The file prefix
      */
     public function setPrefix($prefix)
     {
@@ -50,7 +50,7 @@ class LifecycleRule
     }
 
     /**
-     * Lifecycle规则的状态
+     * Get Lifecycle status
      *
      * @return string
      */
@@ -60,7 +60,7 @@ class LifecycleRule
     }
 
     /**
-     * 设置Lifecycle规则状态
+     * Set Lifecycle status
      *
      * @param string $status
      */
@@ -90,9 +90,9 @@ class LifecycleRule
     /**
      * LifecycleRule constructor.
      *
-     * @param string $id 规则ID
-     * @param string $prefix 文件前缀
-     * @param string $status 规则状态，可选[self::LIFECYCLE_STATUS_ENABLED, self::LIFECYCLE_STATUS_DISABLED]
+     * @param string $id rule Id
+     * @param string $prefix File prefix
+     * @param string $status Rule status, which has the following valid values: [self::LIFECYCLE_STATUS_ENABLED, self::LIFECYCLE_STATUS_DISABLED]
      * @param LifecycleAction[] $actions
      */
     public function __construct($id, $prefix, $status, $actions)

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelListInfo.php

@@ -5,7 +5,7 @@ namespace OSS\Model;
 /**
  * Class LiveChannelListInfo
  *
- * ListBucketLiveChannels接口返回数据
+ * The data returned by ListBucketLiveChannels
  *
  * @package OSS\Model
  * @link http://help.aliyun.com/document_detail/oss/api-reference/bucket/GetBucket.html

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/LoggingConfig.php

@@ -42,7 +42,7 @@ class LoggingConfig implements XmlConfig
     }
 
     /**
-     *  序列化成xml字符串
+     *  Serialize to xml string
      *
      */
     public function serializeToXml()

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectInfo.php

@@ -6,11 +6,11 @@ namespace OSS\Model;
  *
  * Class ObjectInfo
  *
- * listObjects接口中返回的Object列表中的类
+ * The element type of ObjectListInfo, which is the return value type of listObjects
  *
- * listObjects接口返回数据中包含两个Array
- * 一个是拿到的Object列表【可以理解成对应文件系统中的文件列表】
- * 一个是拿到的Prefix列表【可以理解成对应文件系统中的目录列表】
+ * The return value of listObjects includes two arrays
+ * One is the returned ObjectListInfo, which is similar to a file list in a file system.
+ * The other is the returned prefix list, which is similar to a folder list in a file system.
  *
  * @package OSS\Model
  */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectListInfo.php

@@ -5,7 +5,7 @@ namespace OSS\Model;
 /**
  * Class ObjectListInfo
  *
- * ListObjects接口返回数据
+ * The class of return value of ListObjects
  *
  * @package OSS\Model
  * @link http://help.aliyun.com/document_detail/oss/api-reference/bucket/GetBucket.html
@@ -87,7 +87,7 @@ class ObjectListInfo
     }
 
     /**
-     * 返回ListObjects接口返回数据中的ObjectInfo列表
+     * Get the ObjectInfo list.
      *
      * @return ObjectInfo[]
      */
@@ -97,7 +97,7 @@ class ObjectListInfo
     }
 
     /**
-     * 返回ListObjects接口返回数据中的PrefixInfo列表
+     * Get the PrefixInfo list
      *
      * @return PrefixInfo[]
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/PrefixInfo.php

@@ -5,10 +5,10 @@ namespace OSS\Model;
 /**
  * Class PrefixInfo
  *
- * listObjects接口中返回的Prefix列表中的类
- * listObjects接口返回数据中包含两个Array:
- * 一个是拿到的Object列表【可以理解成对应文件系统中的文件列表】
- * 一个是拿到的Prefix列表【可以理解成对应文件系统中的目录列表】
+ * ListObjects return Prefix list of classes
+ * The returned data contains two arrays
+ * One is to get the list of objects【Can be understood as the corresponding file system file list】
+ * One is to get Prefix list【Can be understood as the corresponding file system directory list】
  *
  * @package OSS\Model
  * @link http://help.aliyun.com/document_detail/oss/api-reference/bucket/GetBucket.html

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/RefererConfig.php

@@ -29,7 +29,7 @@ class RefererConfig implements XmlConfig
 
 
     /**
-     * 把RefererConfig序列化成xml
+     * serialize the RefererConfig object into xml string
      *
      * @return string
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/StorageCapacityConfig.php

@@ -29,7 +29,7 @@ class StorageCapacityConfig implements XmlConfig
     }
 
     /**
-     * 把StorageCapacityConfig序列化成xml
+     * Serialize StorageCapacityConfig into xml
      *
      * @return string
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/UploadInfo.php

@@ -5,7 +5,7 @@ namespace OSS\Model;
 /**
  * Class UploadInfo
  *
- * ListMultipartUpload接口得到的UploadInfo
+ * The return value of ListMultipartUpload
  *
  * @package OSS\Model
  */

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/WebsiteConfig.php

@@ -40,7 +40,7 @@ class WebsiteConfig implements XmlConfig
     }
 
     /**
-     * 把WebsiteConfig序列化成xml
+     * Serialize the WebsiteConfig object into xml string.
      *
      * @return string
      * @throws OssException

vendor/aliyuncs/oss-sdk-php/src/OSS/Model/XmlConfig.php

@@ -10,7 +10,7 @@ interface XmlConfig
 {
 
     /**
-     * 接口定义，实现此接口的类都需要实现从xml数据解析的函数
+     * Interface method: Parse the object from the xml.
      *
      * @param string $strXml
      * @return null
@@ -18,7 +18,7 @@ interface XmlConfig
     public function parseFromXml($strXml);
 
     /**
-     * 接口定义，实现此接口的类，都需要实现把子类序列化成xml字符串的接口
+     * Interface method: Serialize the object into xml.
      *
      * @return string
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/AclResult.php

@@ -5,8 +5,7 @@ namespace OSS\Result;
 use OSS\Core\OssException;
 
 /**
- * Class AclResult getBucketAcl接口返回结果类，封装了
- * 返回的xml数据的解析
+ * The type of the return value of getBucketAcl, it wraps the data parsed from xml.
  *
  * @package OSS\Result
  */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/AppendResult.php

@@ -11,7 +11,7 @@ use OSS\Core\OssException;
 class AppendResult extends Result
 {
     /**
-     * 结果中part的next-append-position
+     * Get the value of next-append-position from append's response headers
      *
      * @return int
      * @throws OssException

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/ExistResult.php

@@ -3,8 +3,7 @@
 namespace OSS\Result;
 
 /**
- * Class ExistResult 检查bucket和object是否存在的返回结果，
- * 根据返回response的http status判断
+ * Class ExistResult checks if bucket or object exists, according to the http status in response headers.
  * @package OSS\Result
  */
 class ExistResult extends Result
@@ -18,8 +17,8 @@ class ExistResult extends Result
     }
 
     /**
-     * 根据返回http状态码判断，[200-299]即认为是OK, 判断是否存在的接口，404也认为是一种
-     * 有效响应
+     * Check if the response status is OK according to the http status code.
+     * [200-299]: OK; [404]: Not found. It means the object or bucket is not found--it's a valid response too.
      *
      * @return bool
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetCorsResult.php

@@ -18,8 +18,7 @@ class GetCorsResult extends Result
     }
 
     /**
-     * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种
-     * 有效响应
+     * Check if the response is OK, according to the http status. [200-299]:OK, the Cors config could be got; [404]: not found--no Cors config.
      *
      * @return bool
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetLifecycleResult.php

@@ -12,7 +12,7 @@ use OSS\Model\LifecycleConfig;
 class GetLifecycleResult extends Result
 {
     /**
-     *  解析Lifestyle数据
+     *  Parse the LifecycleConfig object from the response
      *
      * @return LifecycleConfig
      */
@@ -25,8 +25,8 @@ class GetLifecycleResult extends Result
     }
 
     /**
-     * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种
-     * 有效响应
+     * Check if the response is OK according to the http status.
+     * [200-299]: OK, and the LifecycleConfig could be got; [404] The Life cycle config is not found.
      *
      * @return bool
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetLocationResult.php

@@ -4,8 +4,8 @@ namespace OSS\Result;
 use OSS\Core\OssException;
 
 /**
- * Class GetLocationResult getBucketLocation接口返回结果类，封装了
- * 返回的xml数据的解析
+ * Class GetLocationResult getBucketLocation interface returns the result class, encapsulated
+ * The returned xml data is parsed
  *
  * @package OSS\Result
  */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetLoggingResult.php

@@ -12,7 +12,7 @@ use OSS\Model\LoggingConfig;
 class GetLoggingResult extends Result
 {
     /**
-     * 解析LoggingConfig数据
+     * Parse LoggingConfig data
      *
      * @return LoggingConfig
      */
@@ -25,8 +25,8 @@ class GetLoggingResult extends Result
     }
 
     /**
-     * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种
-     * 有效响应
+     * Judged according to the return HTTP status code, [200-299] that is OK, get the bucket configuration interface,
+     * 404 is also considered a valid response
      *
      * @return bool
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetRefererResult.php

@@ -12,7 +12,7 @@ use OSS\Model\RefererConfig;
 class GetRefererResult extends Result
 {
     /**
-     * 解析RefererConfig数据
+     * Parse RefererConfig data
      *
      * @return RefererConfig
      */
@@ -25,8 +25,8 @@ class GetRefererResult extends Result
     }
 
     /**
-     * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种
-     * 有效响应
+     * Judged according to the return HTTP status code, [200-299] that is OK, get the bucket configuration interface,
+     * 404 is also considered a valid response
      *
      * @return bool
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetStorageCapacityResult.php

@@ -5,8 +5,8 @@ namespace OSS\Result;
 use OSS\Core\OssException;
 
 /**
- * Class AclResult getBucketAcl接口返回结果类，封装了
- * 返回的xml数据的解析
+ * Class AclResult  GetBucketAcl interface returns the result class, encapsulated
+ * The returned xml data is parsed
  *
  * @package OSS\Result
  */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/GetWebsiteResult.php

@@ -11,7 +11,7 @@ use OSS\Model\WebsiteConfig;
 class GetWebsiteResult extends Result
 {
     /**
-     * 解析WebsiteConfig数据
+     * Parse WebsiteConfig data
      *
      * @return WebsiteConfig
      */
@@ -24,8 +24,8 @@ class GetWebsiteResult extends Result
     }
 
     /**
-     * 根据返回http状态码判断，[200-299]即认为是OK, 获取bucket相关配置的接口，404也认为是一种
-     * 有效响应
+     * Judged according to the return HTTP status code, [200-299] that is OK, get the bucket configuration interface,
+     * 404 is also considered a valid response
      *
      * @return bool
      */

vendor/aliyuncs/oss-sdk-php/src/OSS/Result/HeaderResult.php

@@ -11,7 +11,7 @@ namespace OSS\Result;
 class HeaderResult extends Result
 {
     /**
-     * 把返回的ResponseCore中的header作为返回数据
+     * The returned ResponseCore header is used as the return data
      *
      * @return array
      */