Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-12 19:24:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化Parser代码命名

Browse Source
This commit is contained in:
xia-chu
2023-06-10 11:04:52 +08:00
committed by 夏楚
parent 52c7bc1d34
commit af0ebf4633
24 changed files with 156 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_httpApi.cpp
View File

@@ -43,7 +43,7 @@ void initEventListener(){
static onceToken s_token([](){
NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastHttpRequest,[](BroadcastHttpRequestArgs){
//const Parser &parser,HttpSession::HttpResponseInvoker &invoker,bool &consumed
if(strstr(parser.Url().data(),"/api/") != parser.Url().data()){
if(strstr(parser.url().data(),"/api/") != parser.url().data()){
return;
}
//url以"/api/起始，说明是http api"
@@ -51,11 +51,11 @@ void initEventListener(){
_StrPrinter printer;
////////////////method////////////////////
printer << "\r\nmethod:\r\n\t" << parser.Method();
printer << "\r\nmethod:\r\n\t" << parser.method();
////////////////url/////////////////
printer << "\r\nurl:\r\n\t" << parser.Url();
printer << "\r\nurl:\r\n\t" << parser.url();
////////////////protocol/////////////////
printer << "\r\nprotocol:\r\n\t" << parser.Tail();
printer << "\r\nprotocol:\r\n\t" << parser.protocol();
///////////////args//////////////////
printer << "\r\nargs:\r\n";
for(auto &pr : parser.getUrlArgs()){
@@ -67,7 +67,7 @@ void initEventListener(){
printer << "\t" << pr.first << " : " << pr.second << "\r\n";
}
////////////////content/////////////////
printer << "\r\ncontent:\r\n" << parser.Content();
printer << "\r\ncontent:\r\n" << parser.content();
auto contentOut = printer << endl;
////////////////我们测算异步回复，当然你也可以同步回复/////////////////
@@ -113,7 +113,7 @@ int main(int argc,char *argv[]){
TcpServer::Ptr httpsSrv(new TcpServer());
httpsSrv->start<HttpsSession>(mINI::Instance()[Http::kSSLPort]);//默认443
InfoL << "你可以在浏览器输入:http://127.0.0.1/api/my_api?key0=val0&key1=参数1" << endl;
InfoL << "你可以在浏览器输入:http://127.0.0.1/api/my_api?key0=val0&key1=参数1";
sem.wait();
return 0;

12
tests/test_httpClient.cpp
View File

@@ -86,9 +86,9 @@ int main(int argc, char *argv[]) {
for (auto &pr: parser.getHeader()) {
printer << pr.first << ":" << pr.second << "\r\n";
}
InfoL << "status:" << parser.Url() << "\r\n"
InfoL << "status:" << parser.status() << "\r\n"
<< "header:\r\n" << (printer << endl)
<< "\r\nbody:" << parser.Content();
<< "\r\nbody:" << parser.content();
}
});
@@ -122,9 +122,9 @@ int main(int argc, char *argv[]) {
for (auto &pr: parser.getHeader()) {
printer << pr.first << ":" << pr.second << "\r\n";
}
InfoL << "status:" << parser.Url() << "\r\n"
InfoL << "status:" << parser.status() << "\r\n"
<< "header:\r\n" << (printer << endl)
<< "\r\nbody:" << parser.Content();
<< "\r\nbody:" << parser.content();
}
});
@@ -159,9 +159,9 @@ int main(int argc, char *argv[]) {
for (auto &pr: parser.getHeader()) {
printer << pr.first << ":" << pr.second << "\r\n";
}
InfoL << "status:" << parser.Url() << "\r\n"
InfoL << "status:" << parser.status() << "\r\n"
<< "header:\r\n" << (printer << endl)
<< "\r\nbody:" << parser.Content();
<< "\r\nbody:" << parser.content();
}
});

2
tests/test_wsServer.cpp
View File

@@ -83,7 +83,7 @@ struct EchoSessionCreator {
//返回的Session必须派生于SendInterceptor，可以返回null(拒绝连接)
Session::Ptr operator()(const Parser &header, const HttpSession &parent, const Socket::Ptr &pSock) {
// return nullptr;
if (header.Url() == "/") {
if (header.url() == "/") {
return std::make_shared<SessionTypeImp<EchoSession> >(header, parent, pSock);
}
return std::make_shared<SessionTypeImp<EchoSessionWithUrl> >(header, parent, pSock);