From ea867bb596f81d5fa1ec48e257683f3a46a61ebf Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Wed, 18 Dec 2024 09:31:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/ets/common/service/indexService.ts | 73 ++----------------- 1 file changed, 8 insertions(+), 65 deletions(-) diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index e10510b4..c1e1d23e 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -22,19 +22,6 @@ import fs from '@ohos.file.fs'; let num = 0 -async function copyFileSync(fileUrl) { - return new Promise(async (resolve, reject) => { - try { - const fileName = fileUrl.split('/')[fileUrl.split('/').length-1] - let realUri = globalThis.context.cacheDir + "/" + fileName - let file = await fs.open(fileUrl); - fs.copyFileSync(file.fd, realUri) - resolve() - } catch (err) { - reject(err) - } - }) -} // 打包当天日志文件 async function compressCurrentLogs() { @@ -57,24 +44,23 @@ async function getCopyFiles() { fs.mkdirSync(globalThis.context.cacheDir + '/temp') } await compressCurrentLogs() - const date = '2024_11_28' + let now = new Date() + const date = `${now.getFullYear()}_${now.getMonth() + 1}_${now.getDate()}` let inFile = '/mnt/hmdfs/100/account/device_view/local/files/logs/' + date; let outFile = globalThis.context.cacheDir + '/temp/' + date - fs.copyFileSync(inFile, outFile) + if (fs.accessSync(inFile)) { + fs.copyFileSync(inFile, outFile) + } await compressFile(globalThis.context.cacheDir + '/temp/', globalThis.context.cacheDir + '/' + 'logs.zip') fs.rmdirSync(globalThis.context.cacheDir + '/temp'); } export async function uploadLogFile() { - // test('/data/log/hilog/hilog.115.20210101-200003') - // return - let filename = 'test.zip' + let filename = 'logs.zip' await getCopyFiles() - // return let uploadTask: request.UploadTask - let stat = fs.statSync(globalThis.context.cacheDir + '/' + filename) - console.log(stat.size) + console.log(stat.size / 1024 / 1024) let uploadConfig: request.UploadConfig = { header: { 'Accept': '*/*', 'Content-Type': 'multipart/form-data' }, url: `http://88.22.20.117:8082/der2/services/upload??fileName=${filename}`, @@ -89,7 +75,7 @@ export async function uploadLogFile() { }) uploadTask.on('complete', () => { console.log('progressing上传完成') - // fs.rmdirSync(globalThis.context.cacheDir + '/' + 'logs.zip'); + fs.rmdirSync(globalThis.context.cacheDir + '/' + 'logs.zip'); }) uploadTask.on("headerReceive", header => { console.log(JSON.stringify(header)) @@ -102,49 +88,6 @@ export async function uploadLogFile() { } } -async function test(fileUrl) { - const fileName = fileUrl.split('/')[fileUrl.split('/').length-1] - let realUri = globalThis.context.cacheDir + "/" + fileName - console.log('progressing上传realUri', realUri) - //复制选择的文件到沙箱cache文件夹 - try { - fs.copyFileSync(fileUrl, realUri) - } catch (err) { - console.log('copyFileSync', JSON.stringify(err)) - } - let uploadTask: request.UploadTask - let uploadConfig: request.UploadConfig = { - url: 'http://88.22.24.104:8989/public/base/upload', - header: { 'Accept': '*/*', 'Content-Type': 'multipart/form-data' }, - method: "POST", - files: [{ - filename: fileName, - name: fileName, - uri: `internal://cache/${fileName}`, - type: fileName.split('.')[fileName.split('.').length-1] - }], - data: [{ name: fileName, value: fileName }], - } - try { - request.uploadFile(globalThis.context, uploadConfig).then((data) => { - uploadTask = data; - uploadTask.on("progress", (size, tot) => { - console.log('progressing上传中', "进度" + size + '/' + tot) - - }) - uploadTask.on("complete", () => { - console.log('progressing上传完成') - fs.rmdirSync(fileUrl); - - }) - }).catch((e) => { - console.log('progressing上传失败', JSON.stringify(e)) - }) - } catch (err) { - console.log('progressing上传失败2', JSON.stringify(err)) - } -} - export async function compressFile(inFile, outFile) { let options: zlib.Options = { level: zlib.CompressLevel.COMPRESS_LEVEL_DEFAULT_COMPRESSION, From 22d6e134e98b8b599963dc47e314ed9249a77d34 Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Wed, 18 Dec 2024 09:33:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/service/indexService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index c1e1d23e..b4659ed3 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -63,7 +63,7 @@ export async function uploadLogFile() { console.log(stat.size / 1024 / 1024) let uploadConfig: request.UploadConfig = { header: { 'Accept': '*/*', 'Content-Type': 'multipart/form-data' }, - url: `http://88.22.20.117:8082/der2/services/upload??fileName=${filename}`, + url: `http://88.22.20.117:8082/der2/services/upload?fileName=${filename}`, files: [{ filename, name: filename, uri: `internal://cache/${filename}`, type: "zip" }], data: [{ name: filename, value: filename }], } From e6dbf5d7f8678b967e4a9e106c4e11a97fb14479 Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Wed, 18 Dec 2024 09:35:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/common/service/indexService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index b4659ed3..4351a8c7 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -63,7 +63,7 @@ export async function uploadLogFile() { console.log(stat.size / 1024 / 1024) let uploadConfig: request.UploadConfig = { header: { 'Accept': '*/*', 'Content-Type': 'multipart/form-data' }, - url: `http://88.22.20.117:8082/der2/services/upload?fileName=${filename}`, + url: `http://192.168.32.105:8082/der2/services/upload?fileName=${filename}`, files: [{ filename, name: filename, uri: `internal://cache/${filename}`, type: "zip" }], data: [{ name: filename, value: filename }], }