diff --git a/build b/build index 6139554..2ebc651 100644 --- a/build +++ b/build @@ -1 +1 @@ -52 \ No newline at end of file +56 \ No newline at end of file diff --git a/src/framework/MicroService.h b/src/framework/MicroService.h index 8a3c5ee..714d3d8 100644 --- a/src/framework/MicroService.h +++ b/src/framework/MicroService.h @@ -2042,15 +2042,15 @@ namespace OpenWifi { class OpenAPIRequestGet { public: - explicit OpenAPIRequestGet( std::string Type, - std::string EndPoint, - Types::StringPairVec & QueryData, + explicit OpenAPIRequestGet( const std::string & Type, + const std::string & EndPoint, + const Types::StringPairVec & QueryData, uint64_t msTimeout): - Type_(std::move(Type)), - EndPoint_(std::move(EndPoint)), + Type_(Type), + EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout) {}; - inline int Do(Poco::JSON::Object::Ptr &ResponseObject); + inline Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject); private: std::string Type_; std::string EndPoint_; @@ -2060,18 +2060,18 @@ namespace OpenWifi { class OpenAPIRequestPut { public: - explicit OpenAPIRequestPut( std::string Type, - std::string EndPoint, - Types::StringPairVec & QueryData, - Poco::JSON::Object Body, + explicit OpenAPIRequestPut( const std::string & Type, + const std::string & EndPoint, + const Types::StringPairVec & QueryData, + const Poco::JSON::Object & Body, uint64_t msTimeout): - Type_(std::move(Type)), - EndPoint_(std::move(EndPoint)), + Type_(Type), + EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout), - Body_(std::move(Body)){}; + Body_(Body){}; - inline int Do(Poco::JSON::Object::Ptr &ResponseObject); + inline Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject); private: std::string Type_; @@ -2083,17 +2083,17 @@ namespace OpenWifi { class OpenAPIRequestPost { public: - explicit OpenAPIRequestPost( std::string Type, - std::string EndPoint, - Types::StringPairVec & QueryData, - Poco::JSON::Object Body, + explicit OpenAPIRequestPost( const std::string & Type, + const std::string & EndPoint, + const Types::StringPairVec & QueryData, + const Poco::JSON::Object & Body, uint64_t msTimeout): - Type_(std::move(Type)), - EndPoint_(std::move(EndPoint)), + Type_(Type), + EndPoint_(EndPoint), QueryData_(QueryData), msTimeout_(msTimeout), - Body_(std::move(Body)){}; - inline int Do(Poco::JSON::Object::Ptr &ResponseObject); + Body_(Body){}; + inline Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject); private: std::string Type_; std::string EndPoint_; @@ -2293,7 +2293,7 @@ namespace OpenWifi { QueryData, 5000); Poco::JSON::Object::Ptr Response; - if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) { + if(Req.Do(Response)==Poco::Net::HTTPServerResponse::HTTP_OK) { if(Response->has("tokenInfo") && Response->has("userInfo")) { UInfo.from_json(Response); if(IsTokenExpired(UInfo.webtoken)) { @@ -3563,7 +3563,7 @@ namespace OpenWifi { void DoDelete() final {}; }; - inline int OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject) { + inline Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject) { try { auto Services = MicroService::instance().GetServices(Type_); for(auto const &Svc:Services) { @@ -3597,10 +3597,10 @@ namespace OpenWifi { { std::cerr << E.displayText() << std::endl; } - return -1; + return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT; } - inline int OpenAPIRequestPut::Do(Poco::JSON::Object::Ptr &ResponseObject) { + inline Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestPut::Do(Poco::JSON::Object::Ptr &ResponseObject) { try { auto Services = MicroService::instance().GetServices(Type_); for(auto const &Svc:Services) { @@ -3645,10 +3645,10 @@ namespace OpenWifi { { std::cerr << E.displayText() << std::endl; } - return -1; + return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT; } - int OpenAPIRequestPost::Do(Poco::JSON::Object::Ptr &ResponseObject) { + inline Poco::Net::HTTPServerResponse::HTTPStatus OpenAPIRequestPost::Do(Poco::JSON::Object::Ptr &ResponseObject) { try { auto Services = MicroService::instance().GetServices(Type_); for(auto const &Svc:Services) { @@ -3693,7 +3693,7 @@ namespace OpenWifi { { std::cerr << E.displayText() << std::endl; } - return -1; + return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT; }