diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp
index d2d67db..4ff6565 100644
--- a/CounterRealTime/CounterDevice.cpp
+++ b/CounterRealTime/CounterDevice.cpp
@@ -143,6 +143,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -150,7 +151,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     CounterChannel * refChanPtr = ConstCache::getInstance().channelMap.value(QString("%1-%2").arg(deviceId).arg(counterData->channelRefId));
     this->refChannelNo = counterData->channelRefId;
@@ -224,7 +228,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(messageArray);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp
index d2d67db..4ff6565 100644
--- a/CounterRealTime/CounterDevice.cpp
+++ b/CounterRealTime/CounterDevice.cpp
@@ -143,6 +143,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -150,7 +151,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     CounterChannel * refChanPtr = ConstCache::getInstance().channelMap.value(QString("%1-%2").arg(deviceId).arg(counterData->channelRefId));
     this->refChannelNo = counterData->channelRefId;
@@ -224,7 +228,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(messageArray);
diff --git a/CounterRealTime/common/utils/QLogUtil.cpp b/CounterRealTime/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterRealTime/common/utils/QLogUtil.cpp
+++ b/CounterRealTime/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp
index d2d67db..4ff6565 100644
--- a/CounterRealTime/CounterDevice.cpp
+++ b/CounterRealTime/CounterDevice.cpp
@@ -143,6 +143,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -150,7 +151,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     CounterChannel * refChanPtr = ConstCache::getInstance().channelMap.value(QString("%1-%2").arg(deviceId).arg(counterData->channelRefId));
     this->refChannelNo = counterData->channelRefId;
@@ -224,7 +228,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(messageArray);
diff --git a/CounterRealTime/common/utils/QLogUtil.cpp b/CounterRealTime/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterRealTime/common/utils/QLogUtil.cpp
+++ b/CounterRealTime/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterRealTime/common/utils/QLogUtil.h b/CounterRealTime/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterRealTime/common/utils/QLogUtil.h
+++ b/CounterRealTime/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp
index d2d67db..4ff6565 100644
--- a/CounterRealTime/CounterDevice.cpp
+++ b/CounterRealTime/CounterDevice.cpp
@@ -143,6 +143,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -150,7 +151,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     CounterChannel * refChanPtr = ConstCache::getInstance().channelMap.value(QString("%1-%2").arg(deviceId).arg(counterData->channelRefId));
     this->refChannelNo = counterData->channelRefId;
@@ -224,7 +228,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(messageArray);
diff --git a/CounterRealTime/common/utils/QLogUtil.cpp b/CounterRealTime/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterRealTime/common/utils/QLogUtil.cpp
+++ b/CounterRealTime/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterRealTime/common/utils/QLogUtil.h b/CounterRealTime/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterRealTime/common/utils/QLogUtil.h
+++ b/CounterRealTime/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp
index d62e913..2b1bef1 100644
--- a/PhaseCompAcq/PhaseDevice.cpp
+++ b/PhaseCompAcq/PhaseDevice.cpp
@@ -1,4 +1,4 @@
-#include "PhaseDevice.h"
+#include "PhaseDevice.h"
 #include <QtMath>
 #include <QDateTime>
 #include <QThread>
@@ -156,6 +156,7 @@
 
     // 2. 输出到日志文件中
     QString date = phaseData->timestamp.mid(0, 10);
+    int hour = phaseData->timestamp.mid(11, 2).toInt();
 
     // 2.1 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -164,7 +165,10 @@
 
     // 发送到消息队列里的内容
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2.2 各个通道的相差数据
     for (int i = 1; i <= phaseData->channelActive.size(); i++)
@@ -218,7 +222,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(phaseData);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp
index d2d67db..4ff6565 100644
--- a/CounterRealTime/CounterDevice.cpp
+++ b/CounterRealTime/CounterDevice.cpp
@@ -143,6 +143,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -150,7 +151,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     CounterChannel * refChanPtr = ConstCache::getInstance().channelMap.value(QString("%1-%2").arg(deviceId).arg(counterData->channelRefId));
     this->refChannelNo = counterData->channelRefId;
@@ -224,7 +228,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(messageArray);
diff --git a/CounterRealTime/common/utils/QLogUtil.cpp b/CounterRealTime/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterRealTime/common/utils/QLogUtil.cpp
+++ b/CounterRealTime/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterRealTime/common/utils/QLogUtil.h b/CounterRealTime/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterRealTime/common/utils/QLogUtil.h
+++ b/CounterRealTime/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp
index d62e913..2b1bef1 100644
--- a/PhaseCompAcq/PhaseDevice.cpp
+++ b/PhaseCompAcq/PhaseDevice.cpp
@@ -1,4 +1,4 @@
-#include "PhaseDevice.h"
+#include "PhaseDevice.h"
 #include <QtMath>
 #include <QDateTime>
 #include <QThread>
@@ -156,6 +156,7 @@
 
     // 2. 输出到日志文件中
     QString date = phaseData->timestamp.mid(0, 10);
+    int hour = phaseData->timestamp.mid(11, 2).toInt();
 
     // 2.1 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -164,7 +165,10 @@
 
     // 发送到消息队列里的内容
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2.2 各个通道的相差数据
     for (int i = 1; i <= phaseData->channelActive.size(); i++)
@@ -218,7 +222,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(phaseData);
diff --git a/PhaseCompAcq/common/utils/QLogUtil.cpp b/PhaseCompAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/PhaseCompAcq/common/utils/QLogUtil.cpp
+++ b/PhaseCompAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);

diff --git a/CounterAcq/CounterDevice.cpp b/CounterAcq/CounterDevice.cpp
index 1bf8ace..194a439 100644
--- a/CounterAcq/CounterDevice.cpp
+++ b/CounterAcq/CounterDevice.cpp
@@ -109,6 +109,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -116,7 +117,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2. 各个通道的clock diff数据
     for (int i = 1; i <= counterData->channelActiveArray.size(); i++)
@@ -164,7 +168,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(counterData);
diff --git a/CounterAcq/common/utils/QLogUtil.cpp b/CounterAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterAcq/common/utils/QLogUtil.cpp
+++ b/CounterAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterAcq/common/utils/QLogUtil.h b/CounterAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterAcq/common/utils/QLogUtil.h
+++ b/CounterAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp
index d2d67db..4ff6565 100644
--- a/CounterRealTime/CounterDevice.cpp
+++ b/CounterRealTime/CounterDevice.cpp
@@ -143,6 +143,7 @@
 {
     // 0. 输出到日志文件中
     QString date = counterData->timestamp.mid(0, 10);
+    int hour = counterData->timestamp.mid(11, 2).toInt();
 
     // 1. 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -150,7 +151,10 @@
     QLogUtil::writeRawDataLogByDate(date, filename, content);
 
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     CounterChannel * refChanPtr = ConstCache::getInstance().channelMap.value(QString("%1-%2").arg(deviceId).arg(counterData->channelRefId));
     this->refChannelNo = counterData->channelRefId;
@@ -224,7 +228,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(messageArray);
diff --git a/CounterRealTime/common/utils/QLogUtil.cpp b/CounterRealTime/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/CounterRealTime/common/utils/QLogUtil.cpp
+++ b/CounterRealTime/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/CounterRealTime/common/utils/QLogUtil.h b/CounterRealTime/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/CounterRealTime/common/utils/QLogUtil.h
+++ b/CounterRealTime/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);
diff --git a/PhaseCompAcq/PhaseDevice.cpp b/PhaseCompAcq/PhaseDevice.cpp
index d62e913..2b1bef1 100644
--- a/PhaseCompAcq/PhaseDevice.cpp
+++ b/PhaseCompAcq/PhaseDevice.cpp
@@ -1,4 +1,4 @@
-#include "PhaseDevice.h"
+#include "PhaseDevice.h"
 #include <QtMath>
 #include <QDateTime>
 #include <QThread>
@@ -156,6 +156,7 @@
 
     // 2. 输出到日志文件中
     QString date = phaseData->timestamp.mid(0, 10);
+    int hour = phaseData->timestamp.mid(11, 2).toInt();
 
     // 2.1 原始字节数组数据
     QString filename = "raw_" + devCode + ".log";
@@ -164,7 +165,10 @@
 
     // 发送到消息队列里的内容
     QJsonArray messageArray;
-    QString msgLogFilename = "msg_" + devCode + ".log";
+    QString msgLogFilename("msg_%1-%2(%3-%4).log");
+    msgLogFilename = msgLogFilename.arg(devCode).arg(QString::number(hour / 6 + 1));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6, 2, 10, QLatin1Char('0'));
+    msgLogFilename = msgLogFilename.arg((hour / 6) * 6 + 5, 2, 10, QLatin1Char('0'));
 
     // 2.2 各个通道的相差数据
     for (int i = 1; i <= phaseData->channelActive.size(); i++)
@@ -218,7 +222,7 @@
         }
     }
 
-    QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
+    QLogUtil::writeMessageLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact)));
 
     // 4. 在界面上简单显示相差数据结果
     emit this->sendDataToDraw(phaseData);
diff --git a/PhaseCompAcq/common/utils/QLogUtil.cpp b/PhaseCompAcq/common/utils/QLogUtil.cpp
index 43d8655..562c139 100644
--- a/PhaseCompAcq/common/utils/QLogUtil.cpp
+++ b/PhaseCompAcq/common/utils/QLogUtil.cpp
@@ -1,4 +1,4 @@
-#include "QLogUtil.h"
+#include "QLogUtil.h"
 
 
 QLogUtil::QLogUtil(QObject *parent) : QObject(parent)
@@ -37,7 +37,7 @@
 void QLogUtil::writeRawDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/raw/";
 
     QStringList pathList;
     pathList.append(basePath);
@@ -57,7 +57,27 @@
 void QLogUtil::writeChannelDataLogByDate(QString date, QString filename, QString content)
 {
     QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
-    QString datePath = basePath + date + "/";
+    QString datePath = basePath + date + "/channel/";
+
+    QStringList pathList;
+    pathList.append(basePath);
+    pathList.append(datePath);
+
+    // 检查并创建目录
+    QLogUtil::checkLogPath(pathList);
+
+    // 输出内容到日志中
+    content.append("\n");
+    QFile chLogFile(datePath + filename);
+    chLogFile.open(QIODevice::ReadWrite|QIODevice::Append|QIODevice::Text);
+    chLogFile.write(content.toUtf8());
+    chLogFile.close();
+}
+
+void QLogUtil::writeMessageLogByDate(QString date, QString filename, QString content)
+{
+    QString basePath = SettingConfig::getInstance().BASE_LOG_PATH;
+    QString datePath = basePath + date + "/message/";
 
     QStringList pathList;
     pathList.append(basePath);
diff --git a/PhaseCompAcq/common/utils/QLogUtil.h b/PhaseCompAcq/common/utils/QLogUtil.h
index 1d1ef0f..ccba67c 100644
--- a/PhaseCompAcq/common/utils/QLogUtil.h
+++ b/PhaseCompAcq/common/utils/QLogUtil.h
@@ -1,4 +1,4 @@
-#ifndef QLOGUTIL_H
+#ifndef QLOGUTIL_H
 #define QLOGUTIL_H
 
 #include <QObject>
@@ -20,6 +20,7 @@
 
     static void writeRawDataLogByDate(QString date, QString filename, QString content);
     static void writeChannelDataLogByDate(QString date, QString filename, QString content);
+    static void writeMessageLogByDate(QString date, QString filename, QString content);
 
 private:
     static void checkLogPath(QStringList path);