@@ -73,7 +73,7 @@ |
||
| 73 | 73 | * @param string $path |
| 74 | 74 | * @param \DateTimeInterface $expiration |
| 75 | 75 | * @param array $options |
| 76 | - * @return string |
|
| 76 | + * @return \OSS\Http\ResponseCore |
|
| 77 | 77 | * |
| 78 | 78 | * @throws \RuntimeException |
| 79 | 79 | */ |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | public function __construct(array $config, OssClient $client) |
| 23 | 23 | { |
| 24 | 24 | $this->config = $config; |
| 25 | - parent::__construct($client,$config['bucket'], $config['prefix'], $config['options']); |
|
| 25 | + parent::__construct($client, $config['bucket'], $config['prefix'], $config['options']); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -50,19 +50,19 @@ discard block |
||
| 50 | 50 | { |
| 51 | 51 | $url = ''; |
| 52 | 52 | |
| 53 | - if($this->config['ssl']){ |
|
| 53 | + if ($this->config['ssl']) { |
|
| 54 | 54 | $url .= 'https://'; |
| 55 | - }else{ |
|
| 55 | + } else { |
|
| 56 | 56 | $url .= 'http://'; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - if($this->config['isCname']){ |
|
| 59 | + if ($this->config['isCname']) { |
|
| 60 | 60 | $url .= $this->config['cdnDomain']; |
| 61 | - }else{ |
|
| 62 | - $url .= $this->config['bucket'] . '.' . $this->config['endpoint']; |
|
| 61 | + } else { |
|
| 62 | + $url .= $this->config['bucket'].'.'.$this->config['endpoint']; |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - $url .= '/' . ltrim($path, '/'); |
|
| 65 | + $url .= '/'.ltrim($path, '/'); |
|
| 66 | 66 | return $url; |
| 67 | 67 | } |
| 68 | 68 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | if ($this->app->runningInConsole()) { |
| 20 | 20 | $this->publishes([ |
| 21 | - __DIR__ . '/config/config.php' => config_path('aliyun-oss.php'), |
|
| 21 | + __DIR__.'/config/config.php' => config_path('aliyun-oss.php'), |
|
| 22 | 22 | ], 'config'); |
| 23 | 23 | } |
| 24 | 24 | $this->mergeConfigFrom( |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | ); |
| 28 | 28 | |
| 29 | 29 | $this->app->make('filesystem') |
| 30 | - ->extend('aliyun', function ($app, array $config) { |
|
| 30 | + ->extend('aliyun', function($app, array $config) { |
|
| 31 | 31 | $client = $app->get(OssClient::class); |
| 32 | 32 | |
| 33 | - $adapter = new AliyunOssAdapter($config,$client); |
|
| 33 | + $adapter = new AliyunOssAdapter($config, $client); |
|
| 34 | 34 | $filesystem = new Filesystem($adapter, new Config(['disable_asserts' => true])); |
| 35 | 35 | $filesystem->addPlugin(new PutFile()); |
| 36 | 36 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function register() |
| 42 | 42 | { |
| 43 | - $this->app->singleton(OssClient::class, function ($app) { |
|
| 43 | + $this->app->singleton(OssClient::class, function($app) { |
|
| 44 | 44 | $config = $app->get('config')->get('filesystems.disks.aliyun'); |
| 45 | 45 | $ossClient = new OssClient( |
| 46 | 46 | $config['accessId'], |