修复非浏览器环境下没有 window 对象导致的错误 #460
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
July 16, 2020 12:23
|
@nighca 有空看一下 |
nighca
reviewed
Jul 17, 2020
src/utils.ts
Outdated
| } | ||
| return 'https:' | ||
|
|
||
| return 'http:' |
There was a problem hiding this comment.
没有 window 的环境是不是默认 https 好一点
README.md
Outdated
| @@ -197,6 +197,7 @@ qiniu.compressImage(file, options).then(data => { | |||
| * config.checkByMD5: 是否开启 MD5 校验，为布尔值；在断点续传时，开启 MD5 校验会将已上传的分片与当前分片进行 MD5 值比对，若不一致，则重传该分片，避免使用错误的分片。读取分片内容并计算 MD5 需要花费一定的时间，因此会稍微增加断点续传时的耗时，默认为 false，不开启。 | |||
| * config.forceDirect: 是否上传全部采用直传方式，为布尔值；为 `true` 时则上传方式全部为直传 form 方式，禁用断点续传，默认 `false`。 | |||
| * config.chunkSize: `number`，分片上传时每片的大小，必须为正整数，单位为 `MB`，且最大不能超过 1024，默认值 4。因为 chunk 数最大 10000，所以如果文件以你所设的 `chunkSize` 进行分片并且 chunk 数超过 10000，我们会把你所设的 `chunkSize` 扩大二倍，如果仍不符合则继续扩大，直到符合条件。 | |||
| * config.protocol: 自定义上传域名协议，值为 `https:` 或者 `http:`。 | |||
|
native 那边反应说是可以的, 他们也有 polyfill 处理其他的方面，加参数主要是感觉不同环境下在这里的表现形式差异有点大，有的环境是没有，有的是别的形式，如果后面再有其他的形式，这里就没法很好处理了，所以考虑加个参数 |
|
你还记不记得我们最初为什么不直接 HTTPS…我想了下，好像直接 HTTPS 就好了，暂时想不到什么正经的环境会只支持 HTTP 不支持 HTTPS？ |
比如私有云？ |
added 2 commits
July 22, 2020 17:28
nighca
reviewed
Jul 22, 2020
README.md
Outdated
| @@ -191,6 +191,7 @@ qiniu.compressImage(file, options).then(data => { | |||
| * config.useCdnDomain: 表示是否使用 cdn 加速域名，为布尔值，`true` 表示使用，默认为 `false`。 | |||
| * config.disableStatisticsReport: 是否禁用日志报告，为布尔值，默认为 `false`。 | |||
| * config.uphost: 上传 `host`，类型为 `string`， 如果设定该参数则优先使用该参数作为上传地址，默认为 `null`。 | |||
| * config.upProtocol: 自定义上传域名协议，值为 `https:` 或者 `http:`。 | |||
src/api.ts
Outdated
| return utils.request(url, { method: 'GET' }) | ||
| } | ||
|
|
||
| /** 获取上传url */ | ||
| export async function getUploadUrl(config: Config, token: string): Promise<string> { | ||
| const protocol = utils.getAPIProtocol() | ||
| const protocol = config.upProtocol || 'https:' |
added 3 commits
July 22, 2020 17:35
added 2 commits
July 22, 2020 18:53
nighca
reviewed
Jul 22, 2020
src/__tests__/api.test.ts
Outdated
| } | ||
|
|
||
| let url: string | ||
| const token = '4TUDv7mcubtP5yWqzrZiI0YEVLSLEu3NlVvCxT-D:UUEt7wiIOSlS7AoCx9w_pABEFtI=:eyJkZWxldGVBZnRlckRheXMiOjEsInJldHVybkJvZHkiOiJ7XCJrZXlcIjpcIiQoa2V5KVwiLFwiaGFzaFwiOlwiJChldGFnKVwiLFwiZnNpemVcIjokKGZzaXplKSxcImJ1Y2tldFwiOlwiJChidWNrZXQpXCIsXCJuYW1lXCI6XCIkKHg6bmFtZSlcIn0iLCJzY29wZSI6ImtpbmRvbSIsImRlYWRsaW5lIjoxNTk1NDEzNjQxfQ==' |
There was a problem hiding this comment.
这个哪儿来的？一直有效吗？这边会发真实请求吗
建议是单测的话不去依赖真实的线上接口，mock 掉就好
lzfee0227
reviewed
Jul 22, 2020
README.md
Outdated
| @@ -191,6 +191,7 @@ qiniu.compressImage(file, options).then(data => { | |||
| * config.useCdnDomain: 表示是否使用 cdn 加速域名，为布尔值，`true` 表示使用，默认为 `false`。 | |||
| * config.disableStatisticsReport: 是否禁用日志报告，为布尔值，默认为 `false`。 | |||
| * config.uphost: 上传 `host`，类型为 `string`， 如果设定该参数则优先使用该参数作为上传地址，默认为 `null`。 | |||
| * config.upprotocol: 自定义上传域名协议，值为 `https:` 或者 `http:`。 | |||
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: CarlJi, lzfee0227, nighca, winddies The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #459
考虑到 #354 ，感觉加个参数可能更合适点