diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index 25c6d76..b2a797a 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.cpp @@ -132,10 +132,10 @@ void CTestCacic::testSslConnection() bool ok; QJsonObject json = OCacicComm->comm("", &ok, QJsonObject(), true); QJsonValue jsonvalue = (!json["codestatus"].isNull()) ? - json["codestatus"] : - QJsonValue::fromVariant(-1); - // qDebug() << jsonvalue.toDouble(); - QVERIFY(jsonvalue.toDouble() == 200 || jsonvalue.toDouble() == 302); + json["codestatus"] : + QJsonValue::fromVariant("-1"); +// qDebug()<< jsonvalue.toDouble(); + QVERIFY(jsonvalue.toString() == "200" || jsonvalue.toString() == "302"); } void CTestCacic::testEnCrypt(){ @@ -240,8 +240,9 @@ void CTestCacic::testGetTest() bool ok; QJsonObject envio; envio["computador"] = OCacicComp.toJsonObject(); + qDebug() << envio; OCacicComm->setUrlGerente("http://teste.cacic.cc"); - OCacicComm->comm("/ws/neo/getTest", &ok, envio); + OCacicComm->comm("/ws/neo/getTest", &ok, envio, true); QVERIFY(ok); } diff --git a/gercols/gercols.cpp b/gercols/gercols.cpp index 4a96607..437487c 100644 --- a/gercols/gercols.cpp +++ b/gercols/gercols.cpp @@ -3,19 +3,19 @@ Gercols::Gercols(QObject *parent) { - /* Cria um json de configuração para teste. - *************************************************************************/ - QJsonObject configTeste; - QJsonObject configComputer; - configComputer["operating_system"] = QJsonValue::fromVariant(QString("")); - configComputer["user"] = QJsonValue::fromVariant(QString("")); - configComputer["network_interface"] = QJsonValue::fromVariant(QString("")); - configTeste["computer"] = configComputer; - configTeste["hardware"] = QJsonValue::fromVariant(QString("")); - configTeste["software"] = QJsonValue::fromVariant(QString("")); - - oCacic.setJsonToFile(configTeste,"configReq.json"); - /*************************************************************************/ +// Cria um json de configuração para teste. +// *************************************************************************/ +// QJsonObject configTeste; +// QJsonObject configComputer; +// configComputer["operating_system"] = QJsonValue::fromVariant(QString("")); +// configComputer["user"] = QJsonValue::fromVariant(QString("")); +// configComputer["network_interface"] = QJsonValue::fromVariant(QString("")); +// configTeste["computer"] = configComputer; +// configTeste["hardware"] = QJsonValue::fromVariant(QString("")); +// configTeste["software"] = QJsonValue::fromVariant(QString("")); + +// oCacic.setJsonToFile(configTeste,"configReq.json"); +// /************************************************************************ oColeta = new CColeta; //Pega chave do registro, que será pega na instalação. @@ -35,7 +35,7 @@ void Gercols::run() /* Json de teste sendo excluído */ - oCacic.deleteFile("configReq.json"); +// oCacic.deleteFile("configReq.json"); /***********************************/ oColeta->waitToCollect(); diff --git a/install-cacic/installcacic.cpp b/install-cacic/installcacic.cpp index eb85cb7..2d7ad10 100644 --- a/install-cacic/installcacic.cpp +++ b/install-cacic/installcacic.cpp @@ -93,8 +93,9 @@ void InstallCacic::run(QStringList argv, int argc) { } } else - std::cout << "Nao foi possivel realizar o login.\n " - << jsonLogin["error"].toString().toStdString() << "\n"; + std::cout << "Nao foi possivel realizar o login.\n" + << " Código: " << jsonLogin["codestatus"].toString().toStdString() << "\n" + << " " << jsonLogin["error"].toString().toStdString() << "\n"; } else if ((param.contains("default")) && (param["default"] == "uninstall")){ oCacic.deleteFolder("c:/cacic"); oCacic.removeRegistry("Lightbase", "Cacic"); diff --git a/install-cacic/installcacic.h b/install-cacic/installcacic.h index 8b791d1..ab711c3 100644 --- a/install-cacic/installcacic.h +++ b/install-cacic/installcacic.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "iostream" #include "QLogger.h" diff --git a/src/cacic_comm.cpp b/src/cacic_comm.cpp index 8e2d316..44e0c96 100644 --- a/src/cacic_comm.cpp +++ b/src/cacic_comm.cpp @@ -68,7 +68,7 @@ QJsonObject CacicComm::comm(QString route, bool *ok, const QJsonObject &json, bo } eventLoop.exec(); // sai do looping chamando o "finished()". - jsonObj.insert("codestatus", QJsonValue::fromVariant(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute))); + jsonObj.insert("codestatus", QJsonValue::fromVariant(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString())); if (reply->error() == QNetworkReply::NoError) { //se não houver erro, grava o retorno; diff --git a/src/cacic_software.cpp b/src/cacic_software.cpp index 3f079bc..3255fff 100644 --- a/src/cacic_software.cpp +++ b/src/cacic_software.cpp @@ -102,9 +102,9 @@ QJsonObject cacic_software::coletaArch() packageJson["url"] = urlString.mid(1); } if(line.contains("Installed size")) - packageJson["installed_size"] = line.split(":")[1].mid(1); + packageJson["installedSize"] = line.split(":")[1].mid(1); if(line.contains("Install Date")) - packageJson["install_date"] = line.split(":")[1].mid(1); + packageJson["installDate"] = line.split(":")[1].mid(1); } softwaresJson[packageName] = packageJson; } diff --git a/src/ccoleta.cpp b/src/ccoleta.cpp index a715942..7bb06db 100644 --- a/src/ccoleta.cpp +++ b/src/ccoleta.cpp @@ -43,14 +43,16 @@ bool CColeta::waitToCollect() void CColeta::run() { /* Versão do json de testes */ - QJsonObject coleta = oCacic.getJsonFromFile("configReq.json"); - - if( coleta.contains("hardware") ){ + QJsonObject coleta = oCacic.getJsonFromFile("getConfig.json"); + qDebug() << coleta; + QJsonObject actions = coleta["reply"].toObject()["agentecomputer"].toObject()["actions"].toObject(); + if( actions.contains("col_hard") ){ this->hardwareIsFinish = false; emit beginHardware(); } else this->hardwareIsFinish = true; - if ( coleta.contains("software") ){ + + if ( actions.contains("col_soft") ){ this->softwareIsFinish = false; emit beginSoftware(); } else -- libgit2 0.21.2