From 65e18b1afdc2d20695950d69c0e3ad2606518bf2 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 20 Jul 2022 18:00:00 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- sa_profile/dhardware.cfg | 8 ++++++++ .../src/resourcemanager/db_adapter.cpp | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sa_profile/dhardware.cfg b/sa_profile/dhardware.cfg index 4011ebe7..f78483a4 100644 --- a/sa_profile/dhardware.cfg +++ b/sa_profile/dhardware.cfg @@ -1,4 +1,12 @@ { + "jobs" : [{ + "name" : "services:dhardware", + "cmds" : [ + "mkdir /data/service/el1/public/database 0711 ddms ddms", + "mkdir /data/service/el1/public/dtbhardware_manager_service 02770 dhardware ddms", + ] + } + ], "services" : [{ "name" : "dhardware", "path" : ["/system/bin/sa_main", "/system/profile/dhardware.xml"], diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp index 092d2dab..5c93e061 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp @@ -51,7 +51,9 @@ DistributedKv::Status DBAdapter::GetKvStorePtr() .encrypt = false, .autoSync = true, .securityLevel = DistributedKv::SecurityLevel::S1, - .kvStoreType = DistributedKv::KvStoreType::SINGLE_VERSION + .kvStoreType = DistributedKv::KvStoreType::SINGLE_VERSION, + .area = EL1, + .baseDir = std::string("/data/service/el1/public/database/") + appId_.appId }; return kvDataMgr_.GetSingleKvStore(options, appId_, storeId_, kvStoragePtr_); } -- Gitee From 98509f585b8a327d515cec573adff2442f603dbf Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 21 Jul 2022 10:22:03 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/resourcemanager/db_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp index 5c93e061..58a1036e 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp @@ -52,7 +52,7 @@ DistributedKv::Status DBAdapter::GetKvStorePtr() .autoSync = true, .securityLevel = DistributedKv::SecurityLevel::S1, .kvStoreType = DistributedKv::KvStoreType::SINGLE_VERSION, - .area = EL1, + .area = DistributedKv::EL1, .baseDir = std::string("/data/service/el1/public/database/") + appId_.appId }; return kvDataMgr_.GetSingleKvStore(options, appId_, storeId_, kvStoragePtr_); -- Gitee From 216cee15121e0789b627b0f30cf118749436a1b3 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 22 Jul 2022 09:12:51 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- sa_profile/dhardware.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa_profile/dhardware.cfg b/sa_profile/dhardware.cfg index f78483a4..0515c7e8 100644 --- a/sa_profile/dhardware.cfg +++ b/sa_profile/dhardware.cfg @@ -3,7 +3,7 @@ "name" : "services:dhardware", "cmds" : [ "mkdir /data/service/el1/public/database 0711 ddms ddms", - "mkdir /data/service/el1/public/dtbhardware_manager_service 02770 dhardware ddms", + "mkdir /data/service/el1/public/database/dtbhardware_manager_service 02770 dhardware ddms" ] } ], -- Gitee From 779002aca90a44b42cb979d13cf7a9dfb3a5e609 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 22 Jul 2022 18:45:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- sa_profile/dhardware.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sa_profile/dhardware.cfg b/sa_profile/dhardware.cfg index 0515c7e8..016417b9 100644 --- a/sa_profile/dhardware.cfg +++ b/sa_profile/dhardware.cfg @@ -15,6 +15,9 @@ "ondemand" : true, "apl" : "system_core", "permission" : ["ohos.permission.DISTRIBUTED_DATASYNC"], + "jobs" :{ + "on-start" : "services:dhardware" + } "secon" : "u:r:dhardware:s0" }] } \ No newline at end of file -- Gitee From b259647a6da3ac6804992f822c7c7ba11f28f3f3 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Mon, 25 Jul 2022 14:42:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- sa_profile/dhardware.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sa_profile/dhardware.cfg b/sa_profile/dhardware.cfg index 016417b9..e546b39e 100644 --- a/sa_profile/dhardware.cfg +++ b/sa_profile/dhardware.cfg @@ -15,9 +15,9 @@ "ondemand" : true, "apl" : "system_core", "permission" : ["ohos.permission.DISTRIBUTED_DATASYNC"], - "jobs" :{ + "jobs" : { "on-start" : "services:dhardware" - } + }, "secon" : "u:r:dhardware:s0" }] } \ No newline at end of file -- Gitee From d5ab6b4fdfb6b9270a7fa473c54ff25b4082dd88 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 26 Jul 2022 11:30:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/resourcemanager/db_adapter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp index 58a1036e..e6ac2d8c 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp @@ -30,6 +30,10 @@ namespace DistributedHardware { #undef DH_LOG_TAG #define DH_LOG_TAG "DBAdapter" +namespace { +const std::string DATABASE = "/data/service/el1/public/database/"; +} + DBAdapter::DBAdapter(const std::string &appId, const std::string &storeId, const std::shared_ptr &changeListener) { @@ -53,7 +57,7 @@ DistributedKv::Status DBAdapter::GetKvStorePtr() .securityLevel = DistributedKv::SecurityLevel::S1, .kvStoreType = DistributedKv::KvStoreType::SINGLE_VERSION, .area = DistributedKv::EL1, - .baseDir = std::string("/data/service/el1/public/database/") + appId_.appId + .baseDir = DATABASE + appId_.appId }; return kvDataMgr_.GetSingleKvStore(options, appId_, storeId_, kvStoragePtr_); } -- Gitee From 2fd846ed6605f404385db542ee686d2b612688a2 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 26 Jul 2022 11:31:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/resourcemanager/db_adapter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp index e6ac2d8c..4b6b4477 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp @@ -31,7 +31,7 @@ namespace DistributedHardware { #define DH_LOG_TAG "DBAdapter" namespace { -const std::string DATABASE = "/data/service/el1/public/database/"; +const std::string DATABASE_DIR = "/data/service/el1/public/database/"; } DBAdapter::DBAdapter(const std::string &appId, const std::string &storeId, @@ -57,7 +57,7 @@ DistributedKv::Status DBAdapter::GetKvStorePtr() .securityLevel = DistributedKv::SecurityLevel::S1, .kvStoreType = DistributedKv::KvStoreType::SINGLE_VERSION, .area = DistributedKv::EL1, - .baseDir = DATABASE + appId_.appId + .baseDir = DATABASE_DIR + appId_.appId }; return kvDataMgr_.GetSingleKvStore(options, appId_, storeId_, kvStoragePtr_); } -- Gitee