diff --git a/install-cacic/installcacic.cpp b/install-cacic/installcacic.cpp index 049cfbc..2a9e862 100644 --- a/install-cacic/installcacic.cpp +++ b/install-cacic/installcacic.cpp @@ -58,10 +58,21 @@ void InstallCacic::run(QStringList argv, int argc) { //TO DO: Fazer download do serviço #ifdef Q_OS_WIN oCacicComm->ftpDownload("agentes/cacic.exe"); - QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", false, &ok, QStringList("-install")); + + QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", + false, + &ok, + QStringList("-install"); #else oCacicComm->ftpDownload("agentes/cacic"); - QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic", false, &ok, QStringList("-install")); + QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic", + false, + &ok, + QStringList("-install", + "cacic", + !configs["reply"].toObject()["te_senha_adm_agente"].isNull() ? + configs["reply"].toObject()["te_senha_adm_agente"].toString : + "ADMINCACIC"); #endif if (!ok) std::cout << "Erro ao iniciar o processo: " @@ -70,7 +81,7 @@ void InstallCacic::run(QStringList argv, int argc) { std::cout << "Instalação realizada com sucesso."; } } else { - std::cout << "Falha ao pegar configurações: " << configs["error"].toString(); + std::cout << "Falha ao pegar configurações: " << configs["error"].toString().toStdString(); } } else diff --git a/src/cacic_computer.cpp b/src/cacic_computer.cpp index 98195d9..4a2b264 100644 --- a/src/cacic_computer.cpp +++ b/src/cacic_computer.cpp @@ -53,6 +53,8 @@ QJsonObject CACIC_Computer::toJsonObject() count++; } json["networkDevices"] = network; + json["nmComputador"] = QJsonValue::fromVariant(QString("TODO")); + json["versaoAgente"] = QJsonValue::fromVariant(QString("TODO")); return json; } -- libgit2 0.21.2