change httpclient state to page

hggq · hggq · commit 37deb653241f · 2026-03-20T22:07:03.000+08:00
diff --git a/controller/src/test_weixin.cpp b/controller/src/test_weixin.cpp
@@ -173,13 +173,13 @@ std::string test_xcxgetphone(std::shared_ptr<httppeer> peer)
     /*
     缓存 access_token
 
-    td::string cache_data = a->state.json["access_token"].to_string();
+    td::string cache_data = a->page.json["access_token"].to_string();
     temp_cache.save(access_token, cache_data, 30);
 
     */
 
     response = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=";
-    response.append(a->state.json["access_token"].to_string());
+    response.append(a->page.json["access_token"].to_string());
     http::obj_val postitem;
     postitem["code"] = code;
     //std::shared_ptr<http::client> b = std::make_shared<http::client>();
@@ -195,7 +195,7 @@ std::string test_xcxgetphone(std::shared_ptr<httppeer> peer)
         return "";
     }
     response.clear();
-    response = a->state.json["phone_info"]["phoneNumber"].to_string();
+    response = a->page.json["phone_info"]["phoneNumber"].to_string();
 
     if (response.size() < 6)
     {
diff --git a/controller/src/testcowaitclient.cpp b/controller/src/testcowaitclient.cpp
@@ -277,7 +277,7 @@ std::string testhttpclient_downfilelist(std::shared_ptr<httppeer> peer)
         tempurl.append(std::to_string(i));
         tempurl.append(urls[1]);
         a->requst_clear();
-        a->state.json.clear();
+        a->page.json.clear();
         std::cout<<tempurl<<std::endl;
         a->get_json(tempurl);
         a->add_header("Connection", "keep-alive");
@@ -289,18 +289,18 @@ std::string testhttpclient_downfilelist(std::shared_ptr<httppeer> peer)
         if (a->get_status() == 200)
         {
             std::cout<<"resp ok"<<std::endl;
-            if(a->state.isjson ==1)
+            if(a->page.isjson ==1)
             {
                 std::cout<<"begin json"<<std::endl;
-                if(a->state.json["code"].to_int()==0)
+                if(a->page.json["code"].to_int()==0)
                 {
-                    if(a->state.json["data"].is_array())
+                    if(a->page.json["data"].is_array())
                     {
                         std::cout<<"is_array"<<std::endl;
                         unsigned int j=0;
-                        for(;j<a->state.json["data"].size();j++)
+                        for(;j<a->page.json["data"].size();j++)
                         {
-                           std::cout<<"fid:" <<a->state.json["data"][j]["aritcleid"].to_string()<<std::endl;
+                           std::cout<<"fid:" <<a->page.json["data"][j]["aritcleid"].to_string()<<std::endl;
                         }
 
                         if(j>0)
@@ -310,12 +310,12 @@ std::string testhttpclient_downfilelist(std::shared_ptr<httppeer> peer)
                         }
 
                     }
-                    else if(a->state.json["data"].is_obj())
+                    else if(a->page.json["data"].is_obj())
                     {
                     
                         std::cout<<"is_obj"<<std::endl;
                     }
-                    std::cout << a->state.content << std::endl;
+                    std::cout << a->page.content << std::endl;
                     continue;
                 }
                 std::cout<<"json error!"<<std::endl;
@@ -381,12 +381,12 @@ std::string testhttpclient_getdownfile(std::shared_ptr<httppeer> peer)
     if (a->get_status() == 200)
     {
         std::cout<<"----get ok----\n"<<std::endl;
-        if(a->state.istxt==false)
+        if(a->page.istxt==false)
         {
-            if(a->state.page.tempfile.size()>0)
+            if(a->page.file.tempfile.size()>0)
             {
-                std::cout<<"filename:"<<a->state.page.filename<<std::endl;
-                fileurl = a->state.page.filename;
+                std::cout<<"filename:"<<a->page.file.filename<<std::endl;
+                fileurl = a->page.file.filename;
  
                 client << "<html><head>";
                 client <<"<meta http-equiv=\"refresh\" content=\"1;url=/downfilecontent\">";
diff --git a/vendor/httpserver/include/httpclient.h b/vendor/httpserver/include/httpclient.h
@@ -111,8 +111,8 @@ class client : public std::enable_shared_from_this<client>
     void set_limit_time(unsigned short t) { timeout_total = t; };
     void clear_limit_time_count() { timeout_count = 0; };
 
-    bool is_file() { return !state.istxt; };
-    bool is_json() { return state.isjson; };
+    bool is_file() { return !page.istxt; };
+    bool is_json() { return page.isjson; };
     bool init_http_sock();
     bool init_https_sock();
 
@@ -166,7 +166,7 @@ class client : public std::enable_shared_from_this<client>
     unsigned char requesttype    = 0;
     bool isssl                   = false;
     std::atomic_bool iswait_exit = false;
-    struct state_t
+    struct page_t
     {
         long long length  = 0;
         unsigned int code = 0;
@@ -180,9 +180,9 @@ class client : public std::enable_shared_from_this<client>
         std::string codemessage;
         std::map<std::string, std::string> header;
         http::cookie cookie;
-        upload_file page;
+        upload_file file;
         http::obj_val json;
-    } state;
+    } page;
 
     std::shared_ptr<asio::ip::tcp::socket> sock                       = {nullptr};
     std::shared_ptr<asio::ssl::stream<asio::ip::tcp::socket>> sslsock = {nullptr};
diff --git a/vendor/httpserver/src/httpclient.cpp b/vendor/httpserver/src/httpclient.cpp

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ std::string testhttpclient_downfilelist(std::shared_ptr<httppeer> peer)`
`277`	`277`	`tempurl.append(std::to_string(i));`
`278`	`278`	`tempurl.append(urls[1]);`
`279`	`279`	`a->requst_clear();`
`280`		`- a->state.json.clear();`
	`280`	`+ a->page.json.clear();`
`281`	`281`	`std::cout<<tempurl<<std::endl;`
`282`	`282`	`a->get_json(tempurl);`
`283`	`283`	`a->add_header("Connection", "keep-alive");`
`@@ -289,18 +289,18 @@ std::string testhttpclient_downfilelist(std::shared_ptr<httppeer> peer)`
`289`	`289`	`if (a->get_status() == 200)`
`290`	`290`	`{`
`291`	`291`	`std::cout<<"resp ok"<<std::endl;`
`292`		`- if(a->state.isjson ==1)`
	`292`	`+ if(a->page.isjson ==1)`
`293`	`293`	`{`
`294`	`294`	`std::cout<<"begin json"<<std::endl;`
`295`		`- if(a->state.json["code"].to_int()==0)`
	`295`	`+ if(a->page.json["code"].to_int()==0)`
`296`	`296`	`{`
`297`		`- if(a->state.json["data"].is_array())`
	`297`	`+ if(a->page.json["data"].is_array())`
`298`	`298`	`{`
`299`	`299`	`std::cout<<"is_array"<<std::endl;`
`300`	`300`	`unsigned int j=0;`
`301`		`- for(;j<a->state.json["data"].size();j++)`
	`301`	`+ for(;j<a->page.json["data"].size();j++)`
`302`	`302`	`{`
`303`		`- std::cout<<"fid:" <<a->state.json["data"][j]["aritcleid"].to_string()<<std::endl;`
	`303`	`+ std::cout<<"fid:" <<a->page.json["data"][j]["aritcleid"].to_string()<<std::endl;`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`if(j>0)`
`@@ -310,12 +310,12 @@ std::string testhttpclient_downfilelist(std::shared_ptr<httppeer> peer)`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`}`
`313`		`- else if(a->state.json["data"].is_obj())`
	`313`	`+ else if(a->page.json["data"].is_obj())`
`314`	`314`	`{`
`315`	`315`
`316`	`316`	`std::cout<<"is_obj"<<std::endl;`
`317`	`317`	`}`
`318`		`- std::cout << a->state.content << std::endl;`
	`318`	`+ std::cout << a->page.content << std::endl;`
`319`	`319`	`continue;`
`320`	`320`	`}`
`321`	`321`	`std::cout<<"json error!"<<std::endl;`
`@@ -381,12 +381,12 @@ std::string testhttpclient_getdownfile(std::shared_ptr<httppeer> peer)`
`381`	`381`	`if (a->get_status() == 200)`
`382`	`382`	`{`
`383`	`383`	`std::cout<<"----get ok----\n"<<std::endl;`
`384`		`- if(a->state.istxt==false)`
	`384`	`+ if(a->page.istxt==false)`
`385`	`385`	`{`
`386`		`- if(a->state.page.tempfile.size()>0)`
	`386`	`+ if(a->page.file.tempfile.size()>0)`
`387`	`387`	`{`
`388`		`- std::cout<<"filename:"<<a->state.page.filename<<std::endl;`
`389`		`- fileurl = a->state.page.filename;`
	`388`	`+ std::cout<<"filename:"<<a->page.file.filename<<std::endl;`
	`389`	`+ fileurl = a->page.file.filename;`
`390`	`390`
`391`	`391`	`client << "<html><head>";`
`392`	`392`	`client <<"<meta http-equiv=\"refresh\" content=\"1;url=/downfilecontent\">";`