Эх сурвалжийг харах

Z991239-4916 #comment 暂时性的chromium不进行检测

陈良瑜80374463 2 жил өмнө
parent
commit
baccf5a3c0

+ 1 - 1
CMakeLists.txt

@@ -284,7 +284,7 @@ if(CONAN_CACHE_CLEAR)
 	conan_local_remove()
 endif(CONAN_CACHE_CLEAR)
 
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.33@LR04.02_FrameworkLib/dev
+conan_cmake_run(REQUIRES RvcFramework/1.2.0.35@LR04.02_FrameworkLib/dev
 	Audio/2023.0509.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 include(DependencyConanFiles)

+ 1 - 0
Module/mod_chromium/CSocketClient.cpp

@@ -22,6 +22,7 @@ bool checkHttpThreadFun(const std::string url) {
 
 std::pair<bool, std::string> DetectActiveHttp(std::vector<std::string> urlArr)
 {
+	return std::make_pair(true, urlArr[0]);
 	try {
 		std::vector<boost::shared_future<bool>> threadArr;
 #if (defined _WIN32 || defined _WIN64)

+ 1 - 0
Other/libpublicFun/CMakeLists.txt

@@ -5,6 +5,7 @@ set(${MODULE_PREFIX}_SRCS
     publicExport.h
     publicFunExport.cpp
     publicFunExport.h
+    portCheck.cpp
     ${ThirdPartyHeadRoot}/CJson/cJSON.c
     exLog/log.h
     exLog/log.cpp

+ 1 - 17
Other/libpublicFun/portCheck.cpp

@@ -8,9 +8,6 @@
 #include "Wininet.h"  
 #pragma comment(lib,"Wininet.lib") 
 #else
-#include <requests/Exception.hpp>
-#include <requests/Request.hpp>
-#include <requests/Url.hpp>
 #endif
 
 
@@ -70,20 +67,7 @@ bool checkHttpActive(const char* httpUrl)
 #else
 bool checkHttpActive(const char* httpUrl)
 {
-	requests::Request request;
-	requests::Url url(httpUrl);
-
-	try
-	{
-		// ·¢Æð HTTP ÇëÇó£¬×èÈû
-		auto resp = request.get(url);
-		return true;
-	}
-	catch (requests::Exception& e)
-	{
-		std::cout << e.what() << std::endl;
-	}
-	return false;
+	true;
 }
 
 #endif