!2 add with_unsafe_main

Module/mod_chromium/CModTools.cpp

@@ -513,6 +513,9 @@ namespace Chromium {
     {
         CSimpleStringA strChromiumPath = GetCefHead(this->m_pEntity), strCmdLine = "";
         strCmdLine.Append(strChromiumPath).Append(" --url=").Append(mainUrl.c_str());
+
+		if (ConfigManager::getInstance().m_withUnsafeMain)
+			strCmdLine.Append(" --allow-running-insecure-content");
 		if (ConfigManager::getInstance().m_extension_debugOpen)
 			strCmdLine.Append(" --right-menu");
 		if (ConfigManager::getInstance().m_extension_withTerminal && ConfigManager::getInstance().m_extension_headerStr.length() > 0)
@@ -553,7 +556,7 @@ namespace Chromium {
 #if defined(_MSC_VER)
 		return generateCefclientCmd(false, mainUrl);
 #else
-        return generateBrowserCMDForEverything(mainUrl, 0, false);
+        return generateBrowserCMDForEverything(mainUrl, 0, ConfigManager::getInstance().m_withUnsafeMain);
 #endif //_MSC_VER
 	}
 

Module/mod_chromium/baseEx.cpp

@@ -949,7 +949,7 @@ ConfigManager& ConfigManager::getInstance() {
 ConfigManager::ConfigManager()
 	: m_iTcpBridgePort(4504), m_strCustomMainUrl(""), m_strCustomAdUrl(""), m_runAd(false), m_runMain(false), m_runExtend(false), m_runLogin(false), m_withBrowser(false), m_withMin(false), m_withClose(false)
 	, m_withDebugMode(false), m_withMagic(false), m_withNoFileLog(false), m_installMode(false), m_withMedia(false), m_withSpecialTest(false), m_withConsole(false),
-	m_withLinkLog(false), m_withUnsafeAd(false), m_noStartupPage(false),  m_extension_debugOpen(false), m_extension_withTerminal(false)
+	m_withLinkLog(false), m_withUnsafeAd(false), m_withUnsafeMain(false), m_noStartupPage(false),  m_extension_debugOpen(false), m_extension_withTerminal(false)
 {
 	void* logProducer = nullptr;
 	std::map<std::string, void*> g_logProducerArr;

Module/mod_chromium/baseEx.h

@@ -214,7 +214,7 @@ public:
 	std::string m_strCustomMainUrl, m_strCustomAdUrl;
 	bool m_runAd/*广告*/, m_runMain/*业务*/, m_runExtend/*低柜副屏*/, m_runLogin/*用户桌面，可能木有用*/, m_withBrowser/*是否需要与browser交互*/;
 	bool m_withDebugMode/*是否启动debug模式*/, m_withMagic/*启用随机共享内存*/, m_withNoFileLog/*是否不需要本地日志落盘*/, m_withMedia/*开启多媒体选项*/;
-	bool m_withUnsafeAd/*Ad页面忽略安全选项*/;
+	bool m_withUnsafeAd/*Ad页面忽略安全选项*/, m_withUnsafeMain/*业务页面忽略安全选项*/;
 	bool m_withConsole;
 	bool m_withSpecialTest/*开启一些终端功能的测试*/, m_withLinkLog/*开启链路中的中间链路日志*/;
 	bool m_withMin, m_withClose, m_installMode, m_existRootIni;

Module/mod_chromium/mod_chromium.cpp

@@ -382,6 +382,8 @@ namespace Chromium {
 								ConfigManager::getInstance().m_withMedia = true;
 							else if (!trimStr.Compare("with_unsafe_ad", true))
 								ConfigManager::getInstance().m_withUnsafeAd = true;
+							else if (!trimStr.Compare("with_unsafe_main", true))
+								ConfigManager::getInstance().m_withUnsafeMain = true;
 							else if (!trimStr.Compare("with_specialTest", true))//chromium will run specical test
 								ConfigManager::getInstance().m_withSpecialTest = true;
 							else if (!trimStr.Compare("with_LinkLog", true))//control do_sendJson to print more logs(request)