This commit is contained in:
2026-05-11 15:15:55 +02:00
parent dcca754a78
commit b37c25ef15
2 changed files with 10 additions and 15 deletions
+10 -12
View File
@@ -88,28 +88,26 @@ Pws2mqtt::~Pws2mqtt()
{ {
} }
void missingHandler(const QHttpServerRequest &request, QHttpServerResponder &responder)
{
QString message = QString("404 Not Found: %1 n'existe pas").arg(request.url().path());
responder.sendResponse(QHttpServerResponse("text/plain; charset=utf-8", message.toUtf8(), QHttpServerResponder::StatusCode::NotFound));
}
void Pws2mqtt::init() void Pws2mqtt::init()
{ {
debug(DEBUGMACRO, "init http server", INFO); debug(DEBUGMACRO, "init http server", INFO);
httpServer->setMissingHandler(httpServer, missingHandler); //httpServer->setMissingHandler(httpServer, missingHandler);
// httpServer->setMissingHandler([](const QHttpServerRequest &request, QHttpServerResponder &&responder) httpServer->setMissingHandler([](const QHttpServerRequest &request, QHttpServerResponder &&responder)
/* { {
(void) responder; (void) responder;
debug(DEBUGMACRO, "body " + request.url().toString(), WARNING); debug(DEBUGMACRO, "body " + request.url().toString(), WARNING);
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
responder.sendResponse(QHttpServerResponse("text/plain; charset=utf-8", message.toUtf8(), QHttpServerResponder::StatusCode::NotFound));
#else
return QHttpServerResponse("404 - Page non trouvée. Route par défaut.", QHttpServerResponse::StatusCode::NotFound); return QHttpServerResponse("404 - Page non trouvée. Route par défaut.", QHttpServerResponse::StatusCode::NotFound);
//responder.write(QHttpServerResponse("404 - Page non trouvée. Route par défaut.", QHttpServerResponse::StatusCode::NotFound)); //responder.write(QHttpServerResponse("404 - Page non trouvée. Route par défaut.", QHttpServerResponse::StatusCode::NotFound));
});*/ #endif
});
httpServer->route("/", [](const QHttpServerRequest &request) httpServer->route("/", [](const QHttpServerRequest &request)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QList<std::pair<QByteArray, QByteArray>> headersList = request.headers().toListOfPairs(); QList<std::pair<QByteArray, QByteArray>> headersList = request.headers().toListOfPairs();
#else #else
QList<std::pair<QByteArray, QByteArray>> headersList = request.headers().toList(); QList<std::pair<QByteArray, QByteArray>> headersList = request.headers().toList();
@@ -187,7 +185,7 @@ void Pws2mqtt::listeningHttp()
//QByteArray data; //QByteArray data;
debug (DEBUGMACRO, "listening http requests", DEBUG); debug (DEBUGMACRO, "listening http requests", DEBUG);
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
this->tcpServer = new QTcpServer(); //httpServer.server.listen(QHostAddress::Any, this->port); this->tcpServer = new QTcpServer(); //httpServer.server.listen(QHostAddress::Any, this->port);
if (!this->tcpServer->listen(QHostAddress::LocalHost, this->listenPort)) if (!this->tcpServer->listen(QHostAddress::LocalHost, this->listenPort))
{ {
-3
View File
@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "qabstracthttpserver.h"
#include "qhttpserver.h"
#include <QString> #include <QString>
#include <QByteArray> #include <QByteArray>
#include <QObject> #include <QObject>
@@ -71,5 +69,4 @@ double windChill(double airT, double vent);
double calculerHumidex(double temperature, double humiditeRelative); double calculerHumidex(double temperature, double humiditeRelative);
void notify (QString notif, QString priority = "low", QString inputPath = "", QString tag = ""); void notify (QString notif, QString priority = "low", QString inputPath = "", QString tag = "");
QString listProperties2notify (QMap <QByteArray, QString> propertyList, QHash <QByteArray, quint8> priority, quint8 minAlert = 0); QString listProperties2notify (QMap <QByteArray, QString> propertyList, QHash <QByteArray, quint8> priority, quint8 minAlert = 0);
void missingHandler(const QHttpServerRequest &request, QHttpServerResponder &responder);