From a2375700b1e817cb927275f9f05197db60d5e30e Mon Sep 17 00:00:00 2001 From: semenov Date: Thu, 18 Sep 2025 12:02:21 +0300 Subject: [PATCH 1/3] fix: big xml code --- ServerLMS/Data/PacketType.h | 54 ++++++++------- ServerLMS/Systems/processingsystem.cpp | 4 +- ServerLMS/Systems/recognizesystem.cpp | 34 ++++++++-- ServerLMS/Systems/sendsystem.cpp | 91 ++++++++++++++++++++------ ServerLMS/Systems/tools.h | 5 ++ 5 files changed, 141 insertions(+), 47 deletions(-) diff --git a/ServerLMS/Data/PacketType.h b/ServerLMS/Data/PacketType.h index 1713daf..25db792 100644 --- a/ServerLMS/Data/PacketType.h +++ b/ServerLMS/Data/PacketType.h @@ -54,28 +54,38 @@ QString enumToString(T value); template<> inline QString enumToString(PacketType value) { switch(value) { - case PacketType::TYPE_NONE: return "TYPE_NONE"; - case PacketType::TYPE_UNITY: return "TYPE_UNITY"; - case PacketType::TYPE_FILE: return "TYPE_FILE"; - case PacketType::TYPE_COMMAND: return "TYPE_COMMAND"; - case PacketType::TYPE_FOLDER: return "TYPE_FOLDER"; - case PacketType::TYPE_DELETE: return "TYPE_DELETE"; - case PacketType::TYPE_FINISH: return "TYPE_FINISH"; - case PacketType::TYPE_NEEDUPDATE: return "TYPE_NEEDUPDATE"; - case PacketType::TYPE_XMLANSWER: return "TYPE_XMLANSWER"; - case PacketType::TYPE_QT: return "TYPE_QT"; - case PacketType::TYPE_DISABLE: return "TYPE_DISABLE"; - case PacketType::TYPE_UPDATE: return "TYPE_UPDATE"; - case PacketType::TYPE_CHECK_VERSION: return "TYPE_CHECK_VERSION"; - case PacketType::TYPE_FILESIZE: return "TYPE_FILESIZE"; - case PacketType::TYPE_BIGXML: return "TYPE_BIGXML"; - case PacketType::CHANGE_DATA_VERSION: return "CHANGE_DATA_VERSION"; - case PacketType::COPY_VERSION: return "COPY_VERSION"; - case PacketType::DELETE_DATA_VERSION: return "DELETE_DATA_VERSION"; - case PacketType::BUSY: return "BUSY"; - case PacketType::FREE: return "FREE"; - case PacketType::HASH_CALCULATE_START: return "HASH_CALCULATE_START"; - case PacketType::HASH_READY: return "HASH_READY"; + case PacketType::TYPE_NONE: return "TYPE_NONE"; + case PacketType::TYPE_UNITY: return "TYPE_UNITY"; + case PacketType::TYPE_FILE: return "TYPE_FILE"; + case PacketType::TYPE_COMMAND: return "TYPE_COMMAND"; + case PacketType::TYPE_FOLDER: return "TYPE_FOLDER"; + case PacketType::TYPE_DELETE: return "TYPE_DELETE"; + case PacketType::TYPE_FINISH: return "TYPE_FINISH"; + case PacketType::TYPE_NEEDUPDATE: return "TYPE_NEEDUPDATE"; + case PacketType::TYPE_XMLANSWER: return "TYPE_XMLANSWER"; + case PacketType::TYPE_QT: return "TYPE_QT"; + case PacketType::TYPE_DISABLE: return "TYPE_DISABLE"; + case PacketType::TYPE_UPDATE: return "TYPE_UPDATE"; + case PacketType::TYPE_CHECK_VERSION: return "TYPE_CHECK_VERSION"; + case PacketType::TYPE_FILESIZE: return "TYPE_FILESIZE"; + case PacketType::TYPE_BIGXML: return "TYPE_BIGXML"; + case PacketType::CHANGE_DATA_VERSION: return "CHANGE_DATA_VERSION"; + case PacketType::COPY_VERSION: return "COPY_VERSION"; + case PacketType::DELETE_DATA_VERSION: return "DELETE_DATA_VERSION"; + case PacketType::BUSY: return "BUSY"; + case PacketType::FREE: return "FREE"; + case PacketType::HASH_CALCULATE_START: return "HASH_CALCULATE_START"; + case PacketType::HASH_READY: return "HASH_READY"; + case PacketType::TYPE_XMLANSWER_MESSAGE_FOR_GUI: return "TYPE_XMLANSWER_MESSAGE_FOR_GUI"; + case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS: return "TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS"; + case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS: return "TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS"; + case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES: return "TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES"; + case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS: return "TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS"; + case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS: return "TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS"; + case PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE: return "TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE"; + case PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE: return "TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE"; + case PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM: return "TYPE_XMLANSWER_QUERY_TASKS_XML_FIM"; + case PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM: return "TYPE_XMLANSWER_QUERY_TASKS_XML_AMM"; default: return "Unknown"; } diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp index 60d2d6c..7f0b291 100644 --- a/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/Systems/processingsystem.cpp @@ -523,7 +523,7 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif {//Клиент готов принять задания client->setReady(true); sendTaskListToUnity(client); - client->getSocket()->flush(); + //client->getSocket()->flush(); } else if(clientNotify.Code == commandStartTimerClient) { @@ -572,6 +572,8 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif { chatSystem->sendOldMessages(client->getClient()->getId()); } + + Logger::instance().log(client->getClient()->getLogin() + clientNotify.Code,LogLevel::DEBUG); } void ProcessingSystem::setCurrentDataInfo(DataInfo *dataInfo) diff --git a/ServerLMS/Systems/recognizesystem.cpp b/ServerLMS/Systems/recognizesystem.cpp index 652de37..d8d096b 100644 --- a/ServerLMS/Systems/recognizesystem.cpp +++ b/ServerLMS/Systems/recognizesystem.cpp @@ -81,7 +81,34 @@ void RecognizeSystem::recognize() } if (packetType != PacketType::TYPE_NONE) - Logger::instance().log("C: " + client->getLogin() + " RECEIVE pack " + enumToString(packetType),LogLevel::DEBUG); + { + QString result = enumToString(packetType); + Logger::instance().log(client->getLogin() + + " RECEIVE pack " + + result ,LogLevel::DEBUG); + //секция на случай прихода неизвестного пакета + if(result == "Unknown") + { + qDebug() << " State:" << socket->state(); + qDebug() << " Error:" << socket->error(); + qDebug() << " Bytes to write:" << socket->bytesToWrite(); + qDebug() << " Bytes available:" << socket->bytesAvailable(); + if(client->getTypeClient() == TypeClientAutorization::TYPE_UNITY_CLIENT) + { + data = socket->readAll(); + } + else + { + stream.startTransaction(); + stream >> data; + } + QString dataText = QString::fromUtf8(data); + Logger::instance().log(QString::number(packetType) + " Unknown text " + dataText); + Logger::instance().log("Client error: " + client->getLogin(),LogLevel::ERROR); + clientHandler->sendDisable(); + //mutex->unlock(); + } + } if (packetType == PacketType::TYPE_COMMAND) //TODO: надо переделать под какой то нормальный тип, который уже существует { @@ -138,12 +165,11 @@ void RecognizeSystem::recognize() socket->read(readBuffer,4); fileSize = *((int*)readBuffer); - stream.commitTransaction(); - //if(!) continue; + //if(!stream.commitTransaction()) continue; //ПОЛУЧЕНИЕ САМОГО ФАЙЛА Logger::instance().log("AfterRead size and path BytesAvailable: " + QString::number(socket->bytesAvailable())); - qint64 readSize = 65535; + qint64 readSize = readFileBlockSize; forever { diff --git a/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/Systems/sendsystem.cpp index 780deaf..f28bd44 100644 --- a/ServerLMS/Systems/sendsystem.cpp +++ b/ServerLMS/Systems/sendsystem.cpp @@ -61,7 +61,7 @@ void SendSystem::sendFileBlock(QString path) { while(!file.atEnd()) { - QByteArray data = file.read(1025*250); + QByteArray data = file.read(sendFileBlockSize); stream << data; //socket->waitForBytesWritten(10); @@ -78,35 +78,86 @@ void SendSystem::sendFileBlock(QString path) void SendSystem::sendFileBlockByteArray(QByteArray array, PacketType packetType) { - qDebug() << "sendFileBlockByteArray thread: " << QThread::currentThreadId(); +// qDebug() << "sendFileBlockByteArray thread: " << QThread::currentThreadId(); +// if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT || +// client->getClientType() == TypeClientAutorization::TYPE_GUI) +// { +// QDataStream stream(socket); +// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + +// fileSize = array.size(); + +// if(fileSize == 0){ +// Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR); +// return; +// } + +// stream << packetType; //Отправляем тип блока +// stream << fileSize; +// stream << array; +// } +// else +// { +// sendPacketType(packetType); +// QByteArray message; +// int size = array.length(); +// message.append(reinterpret_cast(&size), sizeof(int)); +// socket->write(message); +// socket->write(array); +// } + if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT || - client->getClientType() == TypeClientAutorization::TYPE_GUI) + client->getClientType() == TypeClientAutorization::TYPE_GUI) { QDataStream stream(socket); stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - fileSize = array.size(); + quint64 size = array.size(); + qint64 bytesSended = 0; - if(fileSize == 0){ - Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR); - return; - } + if (size == 0) + { + Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR); + return; + } - stream << packetType; //Отправляем тип блока - stream << fileSize; - stream << array; + stream << packetType; //Отправляем тип блока + stream << size; + + while (size > 0) + { + QByteArray chunk = array.mid(bytesSended,sendFileBlockSize); + stream << chunk; + + bytesSended += chunk.length(); + size -= bytesSended; + } } else { - sendPacketType(packetType); - QByteArray message; - int size = array.length(); - message.append(reinterpret_cast(&size), sizeof(int)); - socket->write(message); - socket->write(array); + sendPacketType(packetType); + quint64 size = array.size(); + qint64 bytesSended = 0; + + if (size == 0) + { + Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR); + return; + } + + QByteArray message; + message.append(reinterpret_cast(&size), sizeof(int)); + socket->write(message); + + while (size > 0) + { + QByteArray chunk = array.mid(bytesSended,sendFileBlockSize); + quint64 bytesSended = socket->write(chunk); + + size -= bytesSended; + } + } - - } void SendSystem::sendVersion() @@ -148,7 +199,7 @@ void SendSystem::sendFileBlockWithRename(QString path, QString newName) if(file.open(QFile::ReadOnly)){ while(!file.atEnd()){ - QByteArray data = file.read(1025*250); + QByteArray data = file.read(sendFileBlockSize); stream << data; socket->waitForBytesWritten(); countSend++; diff --git a/ServerLMS/Systems/tools.h b/ServerLMS/Systems/tools.h index f25ebff..35dd84c 100644 --- a/ServerLMS/Systems/tools.h +++ b/ServerLMS/Systems/tools.h @@ -50,6 +50,11 @@ static const QString commandUpdateFilesClient = "update"; static const QString commandGetTasks = "GETTASKS"; static const QString commandeGetOfflineMessages = "GETOFFLINEMESSAGE"; +//static quint64 fileBlockSize = 1460; +static quint64 sendFileBlockSize = 256000; +static quint64 readFileBlockSize = 65535; +//1025*250 + class Tools { public: static void printTime(); From ced8a5cc647e11ae424c8cd4afdd7b79ec1fa8ca Mon Sep 17 00:00:00 2001 From: semenov Date: Thu, 18 Sep 2025 12:55:26 +0300 Subject: [PATCH 2/3] fix: first initialize --- ServerLMS/Systems/recognizesystem.cpp | 32 ------------------- ServerLMS/clienthandler.cpp | 44 +++++++++++++++++++++++++-- ServerLMS/clienthandler.h | 3 ++ 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/ServerLMS/Systems/recognizesystem.cpp b/ServerLMS/Systems/recognizesystem.cpp index d8d096b..a7e8826 100644 --- a/ServerLMS/Systems/recognizesystem.cpp +++ b/ServerLMS/Systems/recognizesystem.cpp @@ -48,19 +48,6 @@ void RecognizeSystem::recognize() { stream.startTransaction(); - if(!isPackageTypeInited) //первичная инициализация для типа клиента - { - char *read = new char[4]; - stream.readRawData(read,4); - - int numPackage = *((int*)read); - packetType = static_cast(numPackage); - packetTypeInit(packetType,client); - - if(!stream.commitTransaction()) continue; - continue; - } - if(client->getClientType() == TypeClientAutorization::TYPE_UNITY_CLIENT) { char *read = new char[4]; @@ -466,25 +453,6 @@ void RecognizeSystem::recognize() //mutex->unlock(); } -void RecognizeSystem::packetTypeInit(PacketType packet,Client *client) -{ - if(packet == PacketType::TYPE_QT) - { - client->setUnity(TypeClientAutorization::TYPE_QT_CLIENT); - - qDebug() << "ConnectionType isUnity: " << client->getClientType(); - } - else if (packet == PacketType::TYPE_UNITY) - { - client->setUnity(TypeClientAutorization::TYPE_UNITY_CLIENT); - //Фиксируем время входа Юнити-клиента - } - - isPackageTypeInited = true; - Logger::instance().log("C: " + client->getLogin() + " send pack " + enumToString(packetType)); - packetType = PacketType::TYPE_NONE; -} - bool RecognizeSystem::checkIsChangeable() { return updateController->getCurrentVersion()->getIsChangeable(); diff --git a/ServerLMS/clienthandler.cpp b/ServerLMS/clienthandler.cpp index d9636b5..42382fa 100644 --- a/ServerLMS/clienthandler.cpp +++ b/ServerLMS/clienthandler.cpp @@ -56,12 +56,13 @@ void ClientHandler::initialize(int descriptor,ServerLMSWidget *serverWidget, connect(this,&ClientHandler::sigSendPacketType,sendSystem,&SendSystem::sendPacketType,Qt::AutoConnection); connect(this,&ClientHandler::sigSendStop,sendSystem,&SendSystem::sendStop,Qt::DirectConnection); - connect(socket,&QTcpSocket::readyRead,recognizeSystem,&RecognizeSystem::recognize,Qt::AutoConnection); - connect(socket, &QTcpSocket::disconnected, this, &ClientHandler::sendDisable,Qt::AutoConnection); + connect(socket,&QTcpSocket::readyRead,this,&ClientHandler::initClientType,Qt::AutoConnection); + initClientType(); recognizeSystem->initialize(updateController,dataParser,serverWidget,sendSystem, this); sendSystem->setClient(client,socket); emit sigInitSender(dataParser,serverWidget->getMutex()); + } void ClientHandler::setClient(Client *value) @@ -69,6 +70,30 @@ void ClientHandler::setClient(Client *value) client = value; } +void ClientHandler::initClientType() +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + + while (socket->bytesAvailable() > 0) + { + stream.startTransaction(); + char *read = new char[4]; + stream.readRawData(read,4); + + int numPackage = *((int*)read); + PacketType packetType = static_cast(numPackage); + + if(!stream.commitTransaction()) continue; + + packetTypeInit(packetType,client); + + disconnect(socket,&QTcpSocket::readyRead,this,&ClientHandler::initClientType); + connect(socket,&QTcpSocket::readyRead,recognizeSystem,&RecognizeSystem::recognize,Qt::AutoConnection); + connect(socket, &QTcpSocket::disconnected, this, &ClientHandler::sendDisable,Qt::AutoConnection); + } +} + void ClientHandler::sendHash() { QString path = "\\" + hashFileName; @@ -145,6 +170,21 @@ void ClientHandler::sendDisable() emit sigClientDisconnected(client->getAddress(),client->getPort()); } +void ClientHandler::packetTypeInit(PacketType packet,Client *client) +{ + if(packet == PacketType::TYPE_QT) + { + client->setUnity(TypeClientAutorization::TYPE_QT_CLIENT); + } + else if (packet == PacketType::TYPE_UNITY) + { + client->setUnity(TypeClientAutorization::TYPE_UNITY_CLIENT); + } + + Logger::instance().log("C: " + client->getLogin() + " send pack " + enumToString(packet)); +} + + Client *ClientHandler::getClient() const { return client; diff --git a/ServerLMS/clienthandler.h b/ServerLMS/clienthandler.h index b9189af..69dbae4 100644 --- a/ServerLMS/clienthandler.h +++ b/ServerLMS/clienthandler.h @@ -85,6 +85,9 @@ private: SendSystem *sendSystem; ServerLMSWidget *server; + + void initClientType(); + void packetTypeInit(PacketType packet, Client *client); }; #endif // CLIENTHANDLER_H From 441be217d9e1d8f1798cd46d68674e9f111c54fa Mon Sep 17 00:00:00 2001 From: semenov Date: Thu, 18 Sep 2025 13:27:23 +0300 Subject: [PATCH 3/3] fix: GUI double send getOfflineMessage --- .../connectorToServer/Core/sendsystem.cpp | 18 ++++++------ .../connectorToServer/Core/sendsystem.h | 2 +- .../connectorToServer/connectortoserver.cpp | 10 +------ .../connectorToServer/connectortoserver.h | 2 -- ServerLMS/Systems/processingsystem.cpp | 2 +- ServerLMS/Systems/recognizesystem.h | 3 -- ServerLMS/Systems/sendsystem.cpp | 28 ------------------- 7 files changed, 12 insertions(+), 53 deletions(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp index c39f12f..e0ae822 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp @@ -31,16 +31,16 @@ void SendSystem::sendDisable() socket->waitForBytesWritten(); } -void SendSystem::sendXMLmsgGUItoServer(QByteArray array) -{ - qDebug() << "SendSystem" << QThread::currentThreadId(); - QDataStream stream(socket); - stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); +//void SendSystem::sendXMLmsgGUItoServer(QByteArray array) +//{ +// qDebug() << "SendSystem" << QThread::currentThreadId(); +// QDataStream stream(socket); +// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - stream << PacketType::TYPE_XMLANSWER; - stream << array; - socket->waitForBytesWritten(6000); -} +// stream << PacketType::TYPE_XMLANSWER; +// stream << array; +// socket->waitForBytesWritten(6000); +//} void SendSystem::sendFileBlock(QString path) { diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h index 69b7107..4ecb9f3 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h @@ -14,7 +14,7 @@ class SendSystem :public QObject public: explicit SendSystem(QObject* parent = nullptr); void setSocket(QTcpSocket *socket); - void sendXMLmsgGUItoServer(QByteArray array); + //void sendXMLmsgGUItoServer(QByteArray array); void sendDisable(); void sendFileBlock(QString path); void sendFolderBlock(QString path); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 88977c3..ed6468e 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -12,7 +12,6 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) : versionSelectWidget(nullptr), versionContainer(nullptr), notifyController(nullptr), - isLoggedIn(false), fl_GetedOfflineMessages(false) { initialize(); @@ -44,7 +43,6 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass autorization->Login = login; autorization->Password = password; autorization->TypeClient = TypeClientAutorization::TYPE_GUI; - isLoggedIn = true; QByteArray array = dataParser->createAuthMessage(autorization); emit signal_sendXMLmsgGUItoServer(array); @@ -61,7 +59,6 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login) ClientDeAutorization *deAutorization = new ClientDeAutorization; deAutorization->Login = login; - isLoggedIn = false; QByteArray array = dataParser->createDeAuthMessage(deAutorization); emit signal_sendXMLmsgGUItoServer(array); @@ -367,11 +364,6 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListTrainees(QList listTra listUsers.append(trainee); } emit signal_reInitMessangerByUsers(listUsers); - - if (isLoggedIn) - { - sendClientNotify(cmd_GetOfflineMessages); - } } void ConnectorToServer::slot_AnswerQueryToDB_ListComputers(QList listComputers) @@ -466,7 +458,7 @@ void ConnectorToServer::bindConnection() connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); connect(this,&ConnectorToServer::sigStopConnect,client,&TCPClient::setDisconnect,Qt::AutoConnection); - connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); + connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLAnswer); connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::slot_Auth); // ::sigLoginResult); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index fd576c6..3abfb69 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -152,8 +152,6 @@ private: QByteArray listTaskAmmArray; ServerSettings serverSettings; - bool isLoggedIn; - ServerAuthorization serverAuth; bool fl_GetedOfflineMessages; diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp index 7f0b291..a1b66dd 100644 --- a/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/Systems/processingsystem.cpp @@ -573,7 +573,7 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif chatSystem->sendOldMessages(client->getClient()->getId()); } - Logger::instance().log(client->getClient()->getLogin() + clientNotify.Code,LogLevel::DEBUG); + Logger::instance().log(client->getClient()->getLogin() + " notifyCode " + clientNotify.Code,LogLevel::DEBUG); } void ProcessingSystem::setCurrentDataInfo(DataInfo *dataInfo) diff --git a/ServerLMS/Systems/recognizesystem.h b/ServerLMS/Systems/recognizesystem.h index 84a4283..f6fdf3b 100644 --- a/ServerLMS/Systems/recognizesystem.h +++ b/ServerLMS/Systems/recognizesystem.h @@ -56,10 +56,7 @@ private: qint64 sizeReceiveData; qint64 fileSize; int countSend; - bool isPackageTypeInited; - void packetTypeInit(PacketType packet,Client *client); - //void packetTypeInit(PacketType type); bool checkIsChangeable(); }; diff --git a/ServerLMS/Systems/sendsystem.cpp b/ServerLMS/Systems/sendsystem.cpp index f28bd44..bc4cd1f 100644 --- a/ServerLMS/Systems/sendsystem.cpp +++ b/ServerLMS/Systems/sendsystem.cpp @@ -78,34 +78,6 @@ void SendSystem::sendFileBlock(QString path) void SendSystem::sendFileBlockByteArray(QByteArray array, PacketType packetType) { -// qDebug() << "sendFileBlockByteArray thread: " << QThread::currentThreadId(); -// if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT || -// client->getClientType() == TypeClientAutorization::TYPE_GUI) -// { -// QDataStream stream(socket); -// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); - -// fileSize = array.size(); - -// if(fileSize == 0){ -// Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR); -// return; -// } - -// stream << packetType; //Отправляем тип блока -// stream << fileSize; -// stream << array; -// } -// else -// { -// sendPacketType(packetType); -// QByteArray message; -// int size = array.length(); -// message.append(reinterpret_cast(&size), sizeof(int)); -// socket->write(message); -// socket->write(array); -// } - if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT || client->getClientType() == TypeClientAutorization::TYPE_GUI) {