Skip to content

Commit d746363

Browse files
author
YangSen-qn
committed
fix: site
1 parent 2ad103c commit d746363

File tree

5 files changed

+31
-37
lines changed

5 files changed

+31
-37
lines changed

‎site/package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"license": "MIT",
1313
"devDependencies": {
1414
"@qiniu/eslint-config": "0.0.6-beta.7",
15-
"@types/create-hmac": "^1.1.0",
16-
"@types/react": "^17.0.5",
17-
"@types/react-dom": "^17.0.5",
15+
"@types/react": "17",
16+
"@types/react-dom": "17",
1817
"@typescript-eslint/eslint-plugin": "~4.10.0",
18+
"buffer": "^6.0.3",
1919
"css-loader": "^5.2.4",
2020
"esbuild-loader": "^2.13.1",
2121
"eslint": "~7.2.0",
@@ -29,15 +29,14 @@
2929
"html-webpack-plugin": "^5.3.1",
3030
"less": "^4.1.1",
3131
"less-loader": "^9.0.0",
32+
"stream-browserify": "^3.0.0",
3233
"style-loader": "^2.0.0",
3334
"typescript": "4.1.5",
3435
"url-loader": "^4.1.1",
3536
"webpack": "^5.37.0",
3637
"webpack-cli": "^4.7.0",
3738
"webpack-dev-server": "^3.11.2",
38-
"webpackbar": "^5.0.0-3",
39-
"buffer": "^6.0.3",
40-
"stream-browserify": "^3.0.0"
39+
"webpackbar": "^5.0.0-3"
4140
},
4241
"dependencies": {
4342
"byte-size": "^7.0.1",

‎site/src/components/App/index.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Queue } from '../Queue'
44
import { Layout } from '../Layout'
55
import { Settings } from '../Settings'
66
import { SelectFile, UniqueFile } from '../SelectFile'
7+
import { getChunks } from '../../../../src/utils/helper'
78

89
import settingIcon from '../Settings/assets/setting.svg'
910
import classnames from './style.less'

‎site/src/components/Settings/index.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ interface IProps { }
88

99
export function Settings(props: IProps) {
1010
const setting = React.useMemo(() => utils.loadSetting(), [])
11-
1211
const [deadline, setDeadline] = React.useState<number>(0)
1312
const [uphost, seUphost] = React.useState<string>(setting.uphost || '')
1413
const [assessKey, setAssessKey] = React.useState<string>(setting.assessKey || '')

‎site/src/upload.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ export enum Status {
1313

1414
// 上传逻辑封装
1515
export function useUpload(file: File) {
16+
const defaultToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:SvCtd4GFhiKQ9mMKvTz7Eu5uMss=:eyJzY29wZSI6InRlc3QteXMiLCJkZWFkbGluZSI6MzUwMDM3NDE5OH0="
1617
const startTimeRef = React.useRef<number | null>(null)
1718
const [state, setState] = React.useState<Status | null>(null)
1819
const [error, setError] = React.useState<Error | null>(null)
19-
const [token, setToken] = React.useState<string | null>(null)
20+
const [token, setToken] = React.useState<string | null>(defaultToken)
2021
const [speedPeak, setSpeedPeak] = React.useState<number | null>(null)
2122
const [completeInfo, setCompleteInfo] = React.useState<any | null>(null)
2223
const [progress, setProgress] = React.useState<UploadProgress | null>(null)
@@ -67,12 +68,13 @@ export function useUpload(file: File) {
6768
// 获取 token
6869
React.useEffect(() => {
6970
const { assessKey, secretKey, bucketName, deadline } = loadSetting()
70-
if (!assessKey || !secretKey || !bucketName || !deadline) {
71+
if (token == null && (!assessKey || !secretKey || !bucketName || !deadline)) {
7172
setError(new Error('请点开设置并输入必要的配置信息'))
7273
return
7374
}
7475

7576
// 线上应该使用服务端生成 token
77+
if (token != null) return
7678
setToken(generateUploadToken({ assessKey, secretKey, bucketName, deadline }))
7779
}, [file])
7880

@@ -95,6 +97,8 @@ export function useUpload(file: File) {
9597
},
9698
{
9799
checkByMD5: true,
100+
chunkSize: 2,
101+
concurrentRequestLimit: 3,
98102
debugLogLevel: 'INFO',
99103
uphost: uphost && uphost.split(',')
100104
}

‎site/yarn.lock‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@
7272
"@typescript-eslint/parser" "~4.10.0"
7373
eslint-config-airbnb "~18.2.0"
7474

75-
"@types/create-hmac@^1.1.0":
76-
version "1.1.0"
77-
resolved "https://registry.yarnpkg.com/@types/create-hmac/-/create-hmac-1.1.0.tgz#d5bc34b65aeaf8f7bbd4a064172ab48318763b63"
78-
integrity sha512-BNYNdzdhOZZQWCOpwvIll3FSvgo3e55Y2M6s/jOY6TuOCwqt3cLmQsK4tSmJ5fayDot8EG4k3+hcZagfww9JlQ==
79-
dependencies:
80-
"@types/node" "*"
81-
8275
"@types/eslint-scope@^3.7.0":
8376
version "3.7.0"
8477
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
@@ -134,30 +127,28 @@
134127
integrity sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==
135128

136129
"@types/prop-types@*":
137-
version "15.7.3"
138-
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
139-
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
130+
version "15.7.15"
131+
resolved "https://mirrors.cloud.tencent.com/npm/@types/prop-types/-/prop-types-15.7.15.tgz#e6e5a86d602beaca71ce5163fadf5f95d70931c7"
132+
integrity sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==
140133

141-
"@types/react-dom@^17.0.5":
142-
version "17.0.5"
143-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.5.tgz#df44eed5b8d9e0b13bb0cd38e0ea6572a1231227"
144-
integrity sha512-ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ==
145-
dependencies:
146-
"@types/react" "*"
134+
"@types/react-dom@17":
135+
version "17.0.26"
136+
resolved "https://mirrors.cloud.tencent.com/npm/@types/react-dom/-/react-dom-17.0.26.tgz#fa7891ba70fd39ddbaa7e85b6ff9175bb546bc1b"
137+
integrity sha512-Z+2VcYXJwOqQ79HreLU/1fyQ88eXSSFh6I3JdrEHQIfYSI0kCQpTGvOrbE6jFGGYXKsHuwY9tBa/w5Uo6KzrEg==
147138

148-
"@types/react@*", "@types/react@^17.0.5":
149-
version "17.0.5"
150-
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz#3d887570c4489011f75a3fc8f965bf87d09a1bea"
151-
integrity sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw==
139+
"@types/react@17":
140+
version "17.0.87"
141+
resolved "https://mirrors.cloud.tencent.com/npm/@types/react/-/react-17.0.87.tgz#998a5e146fbea449986d95a794c0aff47f12b6e6"
142+
integrity sha512-wpg9AbtJ6agjA+BKYmhG6dRWEU/2DHYwMzCaBzsz137ft6IyuqZ5fI4ic1DWL4DrI03Zy78IyVE6ucrXl0mu4g==
152143
dependencies:
153144
"@types/prop-types" "*"
154-
"@types/scheduler" "*"
145+
"@types/scheduler" "^0.16"
155146
csstype "^3.0.2"
156147

157-
"@types/scheduler@*":
158-
version "0.16.1"
159-
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
160-
integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
148+
"@types/scheduler@^0.16":
149+
version "0.16.8"
150+
resolved "https://mirrors.cloud.tencent.com/npm/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
151+
integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
161152

162153
"@typescript-eslint/eslint-plugin@~4.10.0":
163154
version "4.10.0"
@@ -1155,9 +1146,9 @@ cssesc@^3.0.0:
11551146
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
11561147

11571148
csstype@^3.0.2:
1158-
version "3.0.8"
1159-
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
1160-
integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
1149+
version "3.1.3"
1150+
resolved "https://mirrors.cloud.tencent.com/npm/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
1151+
integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
11611152

11621153
damerau-levenshtein@^1.0.6:
11631154
version "1.0.7"

0 commit comments

Comments
 (0)