|
@@ -21,7 +21,16 @@ class Oss extends Core implements Config
|
|
|
$endpoint = "http://oss-cn-".$config['region_id'].".aliyuncs.com";
|
|
|
$bucket = $this->config['bucket'];
|
|
|
$this->host = $config['host'];
|
|
|
- $ossClient = new OssClient($accessKey, $secretKey, $endpoint);
|
|
|
+ list($type, $token, $domain, $bucket) = Dever::load('upload/lib/view/oss')->token($config, $this->config);
|
|
|
+ $data = explode('||', $token);
|
|
|
+ if ($data[0]) {
|
|
|
+ $token = $data[0];
|
|
|
+ $accessKey = $data[1];
|
|
|
+ $secretKey = $data[2];
|
|
|
+ } else {
|
|
|
+ $token = false;
|
|
|
+ }
|
|
|
+ $ossClient = new OssClient($accessKey, $secretKey, $endpoint, false, $token);
|
|
|
|
|
|
$this->getName();
|
|
|
|