harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

Merge remote-tracking branch 'origin/upload_dev' into upload_dev

Browse Source
This commit is contained in:
surenjun 2025-01-02 11:47:21 +08:00
commit 71107441e3
1 changed files with 9 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
entry/src/main/ets/common/service/indexService.ts
View File

@ -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,27 +44,26 @@ 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
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}`,
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 }],
}
@ -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,