openharmony/print_print_fwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/print_print_fwk synced 2024-11-23 08:59:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!289 扫描框架访问的文件夹路径修改el1为el2

Browse Source 
Merge pull request !289 from 刘昊苏/master
This commit is contained in:
openharmony_ci 2024-08-16 07:28:37 +00:00 committed by Gitee
commit 9363c8c082
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/init/printservice.cfg
View File

@ -14,12 +14,12 @@
"mkdir /data/service/el1/public/print_service/cups/serverbin/filter 0750 print print",
"mkdir /data/service/el1/public/print_service/cups/datadir 0750 print print",
"mkdir /data/service/el1/public/print_service/cups/datadir/model 0750 print print",
"mkdir /data/service/el1/public/print_service/sane 0755 print print",
"mkdir /data/service/el1/public/print_service/sane/backend 0755 print print",
"mkdir /data/service/el1/public/print_service/sane/config 0755 print print",
"mkdir /data/service/el1/public/print_service/sane/data 0755 print print",
"mkdir /data/service/el1/public/print_service/sane/lock 0755 print print",
"mkdir /data/service/el1/public/print_service/sane/tmp 0700 root root"
"mkdir /data/service/el2/public/print_service/sane 0755 print print",
"mkdir /data/service/el2/public/print_service/sane/backend 0755 print print",
"mkdir /data/service/el2/public/print_service/sane/config 0755 print print",
"mkdir /data/service/el2/public/print_service/sane/data 0755 print print",
"mkdir /data/service/el2/public/print_service/sane/lock 0755 print print",
"mkdir /data/service/el2/public/print_service/sane/tmp 0700 root root"
]
}
],

4
services/scan_service/src/scan_service_ability.cpp
View File

@ -1598,7 +1598,7 @@ void ScanServiceAbility::GeneratePictureBatch(const std::string &scannerId, std:
static_cast<unsigned long>(scanQueue.size()), static_cast<unsigned long>(scanTaskMap.size()));
SCAN_HILOGI("nowScanId :[%{public}d], nextPicId: [%{public}d]", nowScanId, nextPicId);
file_name = "scan_tmp"+ std::to_string(nowScanId) +".jpg";
std::string outputDir = "/data/service/el1/public/print_service/sane/tmp/";
std::string outputDir = "/data/service/el2/public/print_service/sane/tmp/";
output_file = outputDir.append(file_name);
ofp = fopen(output_file.c_str(), "w");
if (ofp == nullptr) {
@ -1633,7 +1633,7 @@ void ScanServiceAbility::GeneratePictureSingle(const std::string &scannerId, std
static_cast<unsigned long>(scanQueue.size()), static_cast<unsigned long>(scanTaskMap.size()));
SCAN_HILOGI("nowScanId :[%{public}d], nextPicId: [%{public}d]", nowScanId, nextPicId);
file_name = "scan_tmp"+ std::to_string(nowScanId) +".jpg";
std::string outputDir = "/data/service/el1/public/print_service/sane/tmp/";
std::string outputDir = "/data/service/el2/public/print_service/sane/tmp/";
output_file = outputDir.append(file_name);
ofp = fopen(output_file.c_str(), "w");
if (ofp == nullptr) {

2
services/scan_service/src/scan_system_data.cpp
View File

@ -23,7 +23,7 @@
#include "scan_system_data.h"
namespace {
const std::string SCANNER_LIST_FILE = "/data/service/el1/public/print_service/sane/tmp/scanner_list.json";
const std::string SCANNER_LIST_FILE = "/data/service/el2/public/print_service/sane/tmp/scanner_list.json";
const std::string SCANNER_LIST_VERSION = "v1";
} // namespace