scottk/wlan-cloud-ucentralgw
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git synced 2025-11-03 04:07:50 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Framework update

Browse Source
This commit is contained in:
stephb9959
2021-11-30 20:46:04 -08:00
parent 5f325e75d5
commit a5e7c1dc8a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
81 83

20
src/framework/MicroService.h
View File

@@ -2050,7 +2050,7 @@ namespace OpenWifi {
EndPoint_(EndPoint), EndPoint_(EndPoint),
QueryData_(QueryData), QueryData_(QueryData),
msTimeout_(msTimeout) {}; msTimeout_(msTimeout) {};
inline int Do(Poco::JSON::Object::Ptr &ResponseObject); inline Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject);
private: private:
std::string Type_; std::string Type_;
std::string EndPoint_; std::string EndPoint_;
@@ -2071,7 +2071,7 @@ namespace OpenWifi {
msTimeout_(msTimeout), msTimeout_(msTimeout),
Body_(Body){}; Body_(Body){};
inline int Do(Poco::JSON::Object::Ptr &ResponseObject); inline Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject);
private: private:
std::string Type_; std::string Type_;
@@ -2093,7 +2093,7 @@ namespace OpenWifi {
QueryData_(QueryData), QueryData_(QueryData),
msTimeout_(msTimeout), msTimeout_(msTimeout),
Body_(Body){}; Body_(Body){};
inline int Do(Poco::JSON::Object::Ptr &ResponseObject); inline Poco::Net::HTTPServerResponse::HTTPStatus Do(Poco::JSON::Object::Ptr &ResponseObject);
private: private:
std::string Type_; std::string Type_;
std::string EndPoint_; std::string EndPoint_;
@@ -2293,7 +2293,7 @@ namespace OpenWifi {
QueryData, QueryData,
5000); 5000);
Poco::JSON::Object::Ptr Response; 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")) { if(Response->has("tokenInfo") && Response->has("userInfo")) {
UInfo.from_json(Response); UInfo.from_json(Response);
if(IsTokenExpired(UInfo.webtoken)) { if(IsTokenExpired(UInfo.webtoken)) {
@@ -3563,7 +3563,7 @@ namespace OpenWifi {
void DoDelete() final {}; 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 { try {
auto Services = MicroService::instance().GetServices(Type_); auto Services = MicroService::instance().GetServices(Type_);
for(auto const &Svc:Services) { for(auto const &Svc:Services) {
@@ -3597,10 +3597,10 @@ namespace OpenWifi {
{ {
std::cerr << E.displayText() << std::endl; 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 { try {
auto Services = MicroService::instance().GetServices(Type_); auto Services = MicroService::instance().GetServices(Type_);
for(auto const &Svc:Services) { for(auto const &Svc:Services) {
@@ -3645,10 +3645,10 @@ namespace OpenWifi {
{ {
std::cerr << E.displayText() << std::endl; 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 { try {
auto Services = MicroService::instance().GetServices(Type_); auto Services = MicroService::instance().GetServices(Type_);
for(auto const &Svc:Services) { for(auto const &Svc:Services) {
@@ -3693,7 +3693,7 @@ namespace OpenWifi {
{ {
std::cerr << E.displayText() << std::endl; std::cerr << E.displayText() << std::endl;
} }
return -1; return Poco::Net::HTTPServerResponse::HTTP_GATEWAY_TIMEOUT;
} }