diff --git a/framework/js/napi/common/include/napi_utils.h b/framework/js/napi/common/include/napi_utils.h index cc5601c339f0058f5d6c2171a219474ebd1b4379..571104bb81468dea75622334ab8e11b0a58bb35a 100644 --- a/framework/js/napi/common/include/napi_utils.h +++ b/framework/js/napi/common/include/napi_utils.h @@ -118,6 +118,8 @@ const std::map CODE_TO_MESSAGE = { { JsErrorCode::PARAMETER_ERROR, "Parameter error" }, { JsErrorCode::PERMISSION_ERROR, "Permission denied" }, { JsErrorCode::ERROR, "Parameter check failed, permission denied, or system error." }, + { JsErrorCode::NTP_UPDATE_ERROR, "Ntp update error" }, + { JsErrorCode::NTP_NOT_UPDATE_ERROR, "Ntp not update error" }, }; class NapiUtils { diff --git a/framework/js/napi/common/src/napi_work.cpp b/framework/js/napi/common/src/napi_work.cpp index 7d5014c95e5949d5b0f0c4c1e8800329334d0716..5431913b93e64dcb2c3750b8b96a86d9792273e4 100644 --- a/framework/js/napi/common/src/napi_work.cpp +++ b/framework/js/napi/common/src/napi_work.cpp @@ -75,7 +75,7 @@ napi_value NapiWork::AsyncEnqueue(napi_env env, ContextBase *ctxt, const std::st NapiExecute execute, NapiComplete complete) { if (ctxt->status != napi_ok) { - auto message = CODE_TO_MESSAGE.find(ctxt->errCode)->second + ". Error message: " + ctxt->errMessage; + auto message = NapiUtils::GetErrorMessage(ctxt->errCode) + ". Error message: " + ctxt->errMessage; NapiUtils::ThrowError(env, message.c_str(), ctxt->errCode); delete ctxt; return NapiUtils::GetUndefinedValue(env); @@ -137,7 +137,7 @@ void NapiWork::GenerateOutput(ContextBase *ctxt) napi_value message = nullptr; napi_value code = nullptr; int32_t jsErrorCode = NapiUtils::ConvertErrorCode(ctxt->errCode); - napi_create_string_utf8(ctxt->env, CODE_TO_MESSAGE.find(jsErrorCode)->second.c_str(), NAPI_AUTO_LENGTH, + napi_create_string_utf8(ctxt->env, NapiUtils::GetErrorMessage(jsErrorCode).c_str(), NAPI_AUTO_LENGTH, &message); napi_create_error(ctxt->env, nullptr, message, &result[RESULT_ERROR]); if (jsErrorCode != JsErrorCode::ERROR) { @@ -167,7 +167,7 @@ napi_value NapiWork::SyncEnqueue(napi_env env, ContextBase *ctxt, const std::str NapiExecute execute, NapiComplete complete) { if (ctxt->status != napi_ok) { - auto message = CODE_TO_MESSAGE.find(ctxt->errCode)->second + ". Error message: " + ctxt->errMessage; + auto message = NapiUtils::GetErrorMessage(ctxt->errCode) + ". Error message: " + ctxt->errMessage; NapiUtils::ThrowError(env, message.c_str(), ctxt->errCode); delete ctxt; return NapiUtils::GetUndefinedValue(env); @@ -199,7 +199,7 @@ napi_value NapiWork::GenerateOutputSync(napi_env env, ContextBase *ctxt) napi_value error = nullptr; napi_value message = nullptr; int32_t jsErrorCode = NapiUtils::ConvertErrorCode(ctxt->errCode); - napi_create_string_utf8(ctxt->env, CODE_TO_MESSAGE.find(jsErrorCode)->second.c_str(), NAPI_AUTO_LENGTH, + napi_create_string_utf8(ctxt->env, NapiUtils::GetErrorMessage(jsErrorCode).c_str(), NAPI_AUTO_LENGTH, &message); napi_create_error(ctxt->env, nullptr, message, &error); if (jsErrorCode != JsErrorCode::ERROR) { diff --git a/framework/js/napi/system_date_time/include/napi_system_date_time.h b/framework/js/napi/system_date_time/include/napi_system_date_time.h index b3a93a12f68e23b039eb2f3954601bd2e846c481..19fb037eb0f039d1cd176336a8ed546cb13f2e9a 100644 --- a/framework/js/napi/system_date_time/include/napi_system_date_time.h +++ b/framework/js/napi/system_date_time/include/napi_system_date_time.h @@ -27,7 +27,6 @@ namespace Time { class NapiSystemDateTime { public: static napi_value SystemDateTimeInit(napi_env env, napi_value exports); - static std::map errcode_; private: static napi_value SetTime(napi_env env, napi_callback_info info);