amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 12:13:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

自动复制证书至可执行目录

Browse Source
This commit is contained in:
xiongziliang 2019-04-01 10:37:11 +08:00
parent 9247cb9571
commit d1f722939d
5 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZLToolKit

@ -1 +1 @@
Subproject commit 086b14bdc9924f7f86f53d0fa542b8568bff5bc8
Subproject commit e79d24b51051ed9b3bd9c66b9d8ace3c76a0411a

4
tests/CMakeLists.txt
View File

@ -1,4 +1,6 @@
#查找SDL2是否安装
execute_process(COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/ssl.pem ${EXECUTABLE_OUTPUT_PATH}/)
#查找SDL2是否安装
find_package(SDL2 QUIET)
if (SDL2_FOUND)
include_directories(${SDL2_INCLUDE_DIR})

0
tests/test_server.pem → tests/ssl.pem
View File

14
tests/test_httpApi.cpp
View File

@ -112,26 +112,16 @@ int main(int argc,char *argv[]){
//加载配置文件，如果配置文件不存在就创建一个
loadIniConfig();
#ifdef ENABLE_OPENSSL
//请把证书"test_httpApi.pem"放置在本程序可执行程序同目录下
try{
//加载证书，证书包含公钥和私钥
SSL_Initor::Instance().loadServerPem((exePath() + ".pem").data());
}catch(...){
ErrorL << "请把证书:" << (exeName() + ".pem") << "放置在本程序可执行程序同目录下:" << exeDir() << endl;
return 0;
}
#endif //ENABLE_OPENSSL
//加载证书，证书包含公钥和私钥
SSL_Initor::Instance().loadServerPem((exeDir() + "ssl.pem").data());
//开启http服务器
TcpServer::Ptr httpSrv(new TcpServer());
httpSrv->start<EchoWebSocketSession>(mINI::Instance()[Http::kPort]);//默认80
#ifdef ENABLE_OPENSSL
//如果支持ssl，还可以开启https服务器
TcpServer::Ptr httpsSrv(new TcpServer());
httpsSrv->start<SSLEchoWebSocketSession>(mINI::Instance()[Http::kSSLPort]);//默认443
#endif //ENABLE_OPENSSL
InfoL << "你可以在浏览器输入:http://127.0.0.1/api/my_api?key0=val0&key1=参数1" << endl;

11
tests/test_server.cpp
View File

@ -274,15 +274,8 @@ int main(int argc,char *argv[]) {
" rtsp地址 : rtsp://127.0.0.1/live/0\n"
" rtmp地址 : rtmp://127.0.0.1/live/0";
//请把证书"test_server.pem"放置在本程序可执行程序同目录下
try {
//加载证书，证书包含公钥和私钥
SSL_Initor::Instance().loadServerPem((exePath() + ".pem").data());
} catch (...) {
ErrorL << "请把证书:" << (exeName() + ".pem") << "放置在本程序可执行程序同目录下:" << exeDir() << endl;
proxyMap.clear();
return 0;
}
//加载证书，证书包含公钥和私钥
SSL_Initor::Instance().loadServerPem((exeDir() + "ssl.pem").data());
uint16_t shellPort = mINI::Instance()[Shell::kPort];
uint16_t rtspPort = mINI::Instance()[Rtsp::kPort];