Skip to content

统一风格 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

统一风格 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8a9eb4
修改健名
allowing Jun 3, 2019
ceb5edc
Update readme.md
allowing Jun 3, 2019
4068d3c
Merge pull request #1 from allowing/patch-1
allowing Jun 3, 2019
aeebd1b
Merge pull request #2 from allowing/patch-2
allowing Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ Add the following in app/filesystems.php:
'bucket' => '<OSS bucket name>',
'endpoint'     => '<the endpoint of OSS, E.g: oss-cn-hangzhou.aliyuncs.com | custom domain, E.g:img.abc.com>', // OSS 外网节点或自定义外部域名
           //'endpoint_internal' => '<internal endpoint [OSS内网节点] 如：oss-cn-shenzhen-internal.aliyuncs.com>', // v2.0.4 新增配置属性，如果为空，则默认使用 endpoint 配置(由于内网上传有点小问题未解决，请大家暂时不要使用内网节点上传，正在与阿里技术沟通中)
'cdnDomain'     => '<CDN domain, cdn域名>', // 如果isCName为true, getUrl会判断cdnDomain是否设定来决定返回的url，如果cdnDomain未设置，则使用endpoint来生成url，否则使用cdn
'cdn_domain'     => '<CDN domain, cdn域名>', // 如果isCName为true, getUrl会判断cdnDomain是否设定来决定返回的url，如果cdnDomain未设置，则使用endpoint来生成url，否则使用cdn
'ssl'           => <true|false> // true to use 'https://' and false to use 'http://'. default is false,
'isCName'       => <true|false> // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url， false: 则使用外部节点生成url
'is_c_name'       => <true|false> // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url， false: 则使用外部节点生成url
'debug'         => <true|false>
],
...
Expand Down
4 changes: 2 additions & 2 deletions src/AliOssServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public function boot()
$accessId = $config['access_id'];
$accessKey = $config['access_key'];

$cdnDomain = empty($config['cdnDomain']) ? '' : $config['cdnDomain'];
$cdnDomain = empty($config['cdn_domain']) ? '' : $config['cdn_domain'];
$bucket = $config['bucket'];
$ssl = empty($config['ssl']) ? false : $config['ssl'];
$isCname = empty($config['isCName']) ? false : $config['isCName'];
$isCname = empty($config['is_c_name']) ? false : $config['is_c_name'];
$debug = empty($config['debug']) ? false : $config['debug'];

$endPoint = $config['endpoint']; // 默认作为外部节点
Expand Down