diff --git a/src/constants.h b/src/constants.h index 64dc76e..8c5c465 100644 --- a/src/constants.h +++ b/src/constants.h @@ -6,7 +6,7 @@ static const QString APP_NAME = "V2Ray-Desktop"; static const int APP_VERSION_MAJOR = 2; static const int APP_VERSION_MINOR = 1; -static const int APP_VERSION_PATCH = 5; +static const int APP_VERSION_PATCH = 6; static const QString APP_RELEASES_URL = "https://api.github.com/repos/Dr-Incognito/V2Ray-Desktop/releases"; diff --git a/src/main.cpp b/src/main.cpp index 08fc3df..fd77a59 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,10 +44,10 @@ void messageHandler(QtMsgType msgType, QFile logFile(Configurator::getAppLogFilePath()); logFile.open(QIODevice::WriteOnly | QIODevice::Append); QTextStream logTextStream(&logFile); - logTextStream << logMessage.arg(dt, msgTypeStr, msg) << endl; + logTextStream << logMessage.arg(dt, msgTypeStr, msg) << Qt::endl; logFile.close(); } else { - QTextStream(stdout) << logMessage.arg(dt, msgTypeStr, msg) << endl; + QTextStream(stdout) << logMessage.arg(dt, msgTypeStr, msg) << Qt::endl; } } diff --git a/src/serverconfighelper.cpp b/src/serverconfighelper.cpp index fe8d435..8f1691f 100644 --- a/src/serverconfighelper.cpp +++ b/src/serverconfighelper.cpp @@ -150,12 +150,13 @@ QJsonObject ServerConfigHelper::getPrettyV2RayConfig( QString network = serverConfig["network"].toString(); QString tcpHeader = serverConfig["tcpHeaderType"].toString(); - qDebug() << network << tcpHeader; if (network == "ws") { v2RayConfig["network"] = "ws"; v2RayConfig["ws-path"] = serverConfig["networkPath"].toString(); v2RayConfig["ws-headers"] = QJsonObject{{"Host", serverConfig["networkHost"].toString()}}; + } else if (network == "tcp" && tcpHeader == "none") { + v2RayConfig["network"] = "tcp"; } else if (network == "tcp" && tcpHeader == "http") { v2RayConfig["network"] = "http"; v2RayConfig["http-opts"] = QJsonObject{ @@ -172,7 +173,6 @@ QJsonObject ServerConfigHelper::getPrettyV2RayConfig( {"Connection", QJsonArray{"keep-alive"}}}}, }; } - qDebug() << v2RayConfig; return v2RayConfig; }