test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-02 11:58:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
bwcx_jzy 2023-03-10 13:40:27 +08:00
parent bbddbbaa23
commit 21e4d20a20
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/server/src/test/java/TestCron.java
View File

@ -20,7 +20,6 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;

6
web-vue/src/utils/upload-pieces.js
View File

@ -108,9 +108,11 @@ export const uploadPieces = ({ file, uploadCallback, success, process, error })
**/
const concurrentUpload = () => {
const startTime = new Date().getTime();
// 设置初始化进度（避免第一份分片卡顿）
process(0.01, 1, total, new Date().getTime() - startTime);
concurrentExecution(chunkList, uploadFileConcurrent, (curItem) => {
return new Promise((resolve, reject) => {
const { chunk, end } = getChunkInfo(file, curItem, chunkSize);
const { chunk } = getChunkInfo(file, curItem, chunkSize);
const chunkInfo = {
chunk,
currentChunk: curItem,
@ -125,7 +127,7 @@ export const uploadPieces = ({ file, uploadCallback, success, process, error })
uploaded.push(chunkInfo.currentChunk + 1);
const sd = parseInt((uploaded.length / chunkInfo.chunkCount) * 100);
// console.log(chunk);
process(sd, end, total, new Date().getTime() - startTime);
process(sd, Math.min(uploaded.length * chunkSize, total), total, new Date().getTime() - startTime);
//
/***
* 创建文件上传参数