From 83803ad995f1c674313cb6d927b0ae6e49a1e6f0 Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Thu, 3 Jul 2025 17:06:46 +0800 Subject: [PATCH] fix:log Signed-off-by: zhouoaoteng --- .../main/ets/FileExtensionAbility/Common.ts | 40 +++++++++++++++---- .../FileExtensionAbility.ts | 12 +++--- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts index 51cd8b8f..2bd78c8a 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,44 +17,68 @@ import hilog from '@ohos.hilog'; const BUNDLE_NAME = 'docs'; const DOMAIN_CODE = 0x0001; const SLICE_PREFIX_URI = 12; +const SHORT_FILE_LENGTH = 20; +const PLAIN_TEXT_LENGTH = 4; +const MIN_FILE_LENGTH = 3; const TAG = 'ExternalFileManager'; const FILE_PREFIX_NAME = 'file://'; function checkUri(uri: string): boolean { try { if (uri?.indexOf(FILE_PREFIX_NAME) === 0) { - hilog.info(DOMAIN_CODE, TAG, 'uri is ' + uri); + hilog.info(DOMAIN_CODE, TAG, 'uri is ' + getAnonyString(uri)); return true; } else { - hilog.error(DOMAIN_CODE, TAG, 'checkUri failed, uri is ' + uri); + hilog.error(DOMAIN_CODE, TAG, 'checkUri failed, uri is ' + getAnonyString(uri)); return false; } } catch (error) { - hilog.error(DOMAIN_CODE, TAG, 'checkUri error, uri is ' + uri); + hilog.error(DOMAIN_CODE, TAG, 'checkUri error, uri is ' + getAnonyString(uri)); return false; } } +function getAnonyString(uri): string { + let res = ''; + let tmpStr = '********'; + let len = uri.length; + if (len < MIN_FILE_LENGTH) { + return tmpStr; + } + + if (len <= SHORT_FILE_LENGTH) { + res += uri[0]; + res += tmpStr; + res += uri[len - 1]; + } else { + res += uri.substring(0, PLAIN_TEXT_LENGTH); + res += tmpStr; + res += uri.substring(len - PLAIN_TEXT_LENGTH); + } + + return res; +} + function getPath(uri): string { let sep = '://'; let arr = uri.split(sep); let minLength = 2; if (arr.length < minLength) { - hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is:' + uri); + hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is:' + getAnonyString(uri)); return ''; } let path = uri.replace(arr[0] + sep, ''); if (arr[1].indexOf('/') > 0 && arr[1].split('/')[0] === BUNDLE_NAME) { path = path.replace(arr[1].split('/')[0], ''); } else { - hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is ' + uri); + hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is ' + getAnonyString(uri)); return ''; } if (path.charAt(path.length - 1) === '/') { path = path.substr(0, path.length - 1); } - hilog.info(DOMAIN_CODE, TAG, 'getPath after ' + path); + hilog.info(DOMAIN_CODE, TAG, 'getPath after ' + getAnonyString(path)); return path; } @@ -140,7 +164,7 @@ function decodeUri(uri): string { } export { - getPath, checkUri, encodePathOfUri, decodeUri, uriReturnObject, infosReturnObject, fdReturnObject, boolReturnObject, resultsResultObject, + getPath, checkUri, encodePathOfUri, decodeUri, getAnonyString, uriReturnObject, infosReturnObject, fdReturnObject, boolReturnObject, resultsResultObject, fileinfoReturnObject, rootsReturnObject, BUNDLE_NAME, DOMAIN_CODE, FILE_PREFIX_NAME, TAG }; diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index d19fdf42..5622d555 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,7 +21,7 @@ import fileExtensionInfo from '@ohos.file.fileExtensionInfo'; import hilog from '@ohos.hilog'; import { getListFileInfos, getScanFileInfos, buildFilterOptions, buildNoFilterOptions, hasFilter } from './ListScanFileInfo'; import type { Fileinfo } from './Common'; -import { getPath, checkUri, uriReturnObject, encodePathOfUri, decodeUri, BUNDLE_NAME, DOMAIN_CODE, fileinfoReturnObject } from './Common'; +import { getPath, checkUri, uriReturnObject, encodePathOfUri, decodeUri, getAnonyString, BUNDLE_NAME, DOMAIN_CODE, fileinfoReturnObject } from './Common'; import { FILE_PREFIX_NAME, TAG, fdReturnObject, boolReturnObject, rootsReturnObject } from './Common'; import { infosReturnObject, resultsResultObject } from './Common'; @@ -183,7 +183,7 @@ export default class FileExtAbility extends Extension { return uriReturnObject('', E_URIS); } try { - hilog.info(DOMAIN_CODE, TAG, 'createFile, uri is ' + parentUri); + hilog.info(DOMAIN_CODE, TAG, 'createFile, uri is ' + getAnonyString(parentUri)); let newFileUri = this.genNewFileUri(parentUri, displayName); let path = getPath(newFileUri); if (fs.accessSync(path)) { @@ -695,14 +695,14 @@ export default class FileExtAbility extends Extension { try { // Processing format: The first character is '/' if (selectFileRelativePath !== undefined && selectFileRelativePath.indexOf('/') === 0) { - hilog.info(DOMAIN_CODE, TAG, 'checkRelativePath-path is ' + selectFileRelativePath); + hilog.info(DOMAIN_CODE, TAG, 'checkRelativePath-path is ' + getAnonyString(selectFileRelativePath)); return true; } else { - hilog.error(DOMAIN_CODE, TAG, 'checkRelativePath error, path is ' + selectFileRelativePath); + hilog.error(DOMAIN_CODE, TAG, 'checkRelativePath error, path is ' + getAnonyString(selectFileRelativePath)); return false; } } catch (error) { - hilog.error(DOMAIN_CODE, TAG, 'checkRelativePath error, path is ' + selectFileRelativePath); + hilog.error(DOMAIN_CODE, TAG, 'checkRelativePath error, path is ' + getAnonyString(selectFileRelativePath)); return false; } } -- Gitee