Feature: Remember host list sort preference in main dialog

Persist the sort column and direction chosen via the online host list
header (list\OnlineListSort registry key) so the next launch defaults to
the same sort. Re-apply the sort when hosts come online/offline so newly
connected hosts land in their sorted position instead of appending at the
end.

Co-Authored-By: deepseek-v4-pro

server/2015Remote/2015RemoteDlg.cpp

@@ -148,10 +148,14 @@ COLUMNSTRUCT g_Column_Data_Online[g_Column_Count_Online] = {
     {"摄像头",			60	},
     {"RTT",				60	},
     {"版本",			90	},
-    {"权限",			60	},
     {"安装时间",        130 },
     {"活动窗口",		130 },
     {"类型",			50 },
+    {"",                0   },
+    {"",                0   },
+    {"",                0   },
+    {"",                0   },
+    {"权限",			60	},
 };
 
 // 缩略图列号常量 + 列号→数据槽映射。负返回值代表"该列无数据槽"。
@@ -938,6 +942,9 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx)
     ON_COMMAND(ID_MSGLOG_COPY, &CMy2015RemoteDlg::OnMsglogCopy)
     ON_COMMAND(ID_MSGLOG_CLEAR, &CMy2015RemoteDlg::OnMsglogClear)
     ON_COMMAND(ID_MSGLOG_SEARCH, &CMy2015RemoteDlg::OnMsglogSearch)
+    ON_COMMAND(ID_MSGLOG_LOGIN_NOTIFY, &CMy2015RemoteDlg::OnMsglogLoginNotify)
+    ON_COMMAND(ID_MSGLOG_BAN_IP, &CMy2015RemoteDlg::OnMsglogBanIP)
+    ON_COMMAND(ID_MSGLOG_UNBAN_IP, &CMy2015RemoteDlg::OnMsglogUnbanIP)
     ON_COMMAND(ID_ONLINE_ADD_WATCH, &CMy2015RemoteDlg::OnOnlineAddWatch)
     ON_COMMAND(ID_ONLINE_LOGIN_NOTIFY, &CMy2015RemoteDlg::OnOnlineLoginNotify)
     ON_NOTIFY(NM_CUSTOMDRAW, IDC_ONLINE, &CMy2015RemoteDlg::OnNMCustomdrawOnline)
@@ -1412,6 +1419,13 @@ VOID CMy2015RemoteDlg::InitControl()
         g_Column_Online_Width+=g_Column_Data_Online[i].nWidth;
     }
     m_CList_Online.InitColumns();
+    LoadSortPreference();          // 加载上次记忆的排序偏好
+    // 隐藏空标题列（内部数据槽，不允许用户拖拽显示）
+    for (int i = 0; i < g_Column_Count_Online; ++i) {
+        if (g_Column_Data_Online[i].szTitle[0] == '\0') {
+            m_CList_Online.SetColumnVisible(i, FALSE);
+        }
+    }
     // 让虚拟列表用 Unicode 通知（LVN_GETDISPINFOW），从而绕开 MBCS 工程里
     // 列表 → ANSI → CP_ACP 的回转，这样在德语/日语等非中文 ACP 服务端上也能显示中文。
     m_CList_Online.SendMessage(LVM_SETUNICODEFORMAT, TRUE, 0);
@@ -1487,8 +1501,8 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName
     CString privilegeStr = privUser == "SYSTEM" ? "SYSTEM" : privAdmin == "1" ? "Admin" : "User";
 
     CString data[ONLINELIST_MAX] = { strIP, strAddr, "", strPCName, strOS, strCPU, strVideo, strPing,
-                                     verDisplay, privilegeStr, install, startTime, v[RES_CLIENT_TYPE].empty() ? "?" : v[RES_CLIENT_TYPE].c_str(), path,
+                                     verDisplay, install, startTime, v[RES_CLIENT_TYPE].empty() ? "?" : v[RES_CLIENT_TYPE].c_str(), path,
-                                     v[RES_CLIENT_PUBIP].empty() ? strIP : v[RES_CLIENT_PUBIP].c_str(), startTime, capStr,
+                                     v[RES_CLIENT_PUBIP].empty() ? strIP : v[RES_CLIENT_PUBIP].c_str(), startTime, capStr, privilegeStr,
                                    };
     // 优先采用客户端自报的 ID（新客户端用 V2 算法 = MachineGuid + 归一化路径，
     // 比服务端按老算法 IP+PC+OS+CPU+PATH 重算更稳定）。
@@ -3473,6 +3487,7 @@ void CMy2015RemoteDlg::OnTimer(UINT_PTR nIDEvent)
 
         // 虚拟列表：重建过滤索引并更新项目计数
         if (hasListChange) {
+            ApplySort();           // 有排序偏好时重排，让新上线主机落到排序位置
             RebuildFilteredIndices();
             m_CList_Online.SetItemCountExV((int)m_FilteredIndices.size(), LVSICF_NOINVALIDATEALL | LVSICF_NOSCROLL);
         }
@@ -3867,8 +3882,6 @@ void CMy2015RemoteDlg::SortByColumn(int nColumn)
     // 缩略图列点击表头不参与排序 —— 没有可比较的数据维度，避免误触发
     if (ColumnToDataSlot(nColumn) < 0) return;
 
-    static int m_nSortColumn = 0;
-    static bool m_bSortAscending = false;
     if (nColumn == m_nSortColumn) {
         // 如果点击的是同一列，切换排序顺序
         m_bSortAscending = !m_bSortAscending;
@@ -3878,8 +3891,25 @@ void CMy2015RemoteDlg::SortByColumn(int nColumn)
         m_bSortAscending = true;
     }
 
-    // 虚拟列表：对数据源进行排序（列号映射到底层数据槽）
     EnterCriticalSection(&m_cs);
+    ApplySort();
+    RebuildFilteredIndices();
+    LeaveCriticalSection(&m_cs);
+
+    // 刷新列表
+    m_CList_Online.Invalidate();
+
+    SaveSortPreference();
+}
+
+void CMy2015RemoteDlg::ApplySort()
+{
+    // 无有效排序偏好或列不合法（缩略图/越界）时保持列表原始顺序
+    if (m_nSortColumn <= COL_THUMBNAIL || m_nSortColumn >= g_Column_Count_Online) {
+        return;
+    }
+
+    // 虚拟列表：对数据源进行排序（列号映射到底层数据槽），调用方需持有 m_cs
     int slot = ColumnToDataSlot(m_nSortColumn);
     bool asc = m_bSortAscending;
     std::sort(m_HostList.begin(), m_HostList.end(),
@@ -3890,19 +3920,38 @@ void CMy2015RemoteDlg::SortByColumn(int nColumn)
             return asc ? (result < 0) : (result > 0);
         });
 
-    // 重建索引映射
+    // 排序后 clientID -> 索引映射已改变，需重建
     m_ClientIndex.clear();
     for (size_t i = 0; i < m_HostList.size(); ++i) {
         if (m_HostList[i]) {
             m_ClientIndex[m_HostList[i]->GetClientID()] = i;
         }
     }
-    // 重建过滤索引
+}
-    RebuildFilteredIndices();
-    LeaveCriticalSection(&m_cs);
 
-    // 刷新列表
+void CMy2015RemoteDlg::LoadSortPreference()
-    m_CList_Online.Invalidate();
+{
+    std::string val = THIS_CFG.GetStr("list", "OnlineListSort", "");
+    if (val.empty()) {
+        m_nSortColumn = -1;      // 无偏好：保持列表原始顺序
+        m_bSortAscending = true;
+        return;
+    }
+
+    auto arr = StringToVector(val, ',');
+    if (arr.size() >= 2) {
+        m_nSortColumn = atoi(arr[0].c_str());
+        m_bSortAscending = (atoi(arr[1].c_str()) != 0);
+    } else {
+        m_nSortColumn = -1;
+        m_bSortAscending = true;
+    }
+}
+
+void CMy2015RemoteDlg::SaveSortPreference()
+{
+    std::string val = std::to_string(m_nSortColumn) + "," + (m_bSortAscending ? "1" : "0");
+    THIS_CFG.SetStr("list", "OnlineListSort", val);
 }
 
 void CMy2015RemoteDlg::OnHdnItemclickList(NMHDR* pNMHDR, LRESULT* pResult)
@@ -9293,11 +9342,22 @@ void CMy2015RemoteDlg::OnRClickMessage(NMHDR* pNMHDR, LRESULT* pResult)
     menu.AppendMenu(MF_SEPARATOR);
     menu.AppendMenu(MF_STRING, ID_MSGLOG_SEARCH,
         m_bLogSearchVisible ? _TR("隐藏搜索") : _TR("搜索日志"));
+    menu.AppendMenu(MF_SEPARATOR);
+    menu.AppendMenu(MF_STRING, ID_MSGLOG_LOGIN_NOTIFY, _TR("上线提醒"));
+    menu.AppendMenu(MF_STRING, ID_MSGLOG_BAN_IP, _TR("封禁IP"));
+    menu.AppendMenu(MF_STRING, ID_MSGLOG_UNBAN_IP, _TR("解除封禁"));
 
-    // 没有选中项时禁用"删除选中"
+    // 没有选中项时禁用"删除选中"、"复制选中"、"上线提醒"、"封禁IP"和"解除封禁"
     if (m_CList_Message.GetSelectedCount() == 0) {
         menu.EnableMenuItem(ID_MSGLOG_DELETE, MF_GRAYED);
         menu.EnableMenuItem(ID_MSGLOG_COPY, MF_GRAYED);
+        menu.EnableMenuItem(ID_MSGLOG_LOGIN_NOTIFY, MF_GRAYED);
+        menu.EnableMenuItem(ID_MSGLOG_BAN_IP, MF_GRAYED);
+        menu.EnableMenuItem(ID_MSGLOG_UNBAN_IP, MF_GRAYED);
+    }
+    // PowerShell不可用时禁用"上线提醒"
+    if (!GetNotifyManager().IsPowerShellAvailable()) {
+        menu.EnableMenuItem(ID_MSGLOG_LOGIN_NOTIFY, MF_GRAYED);
     }
     // 列表为空时禁用"清空日志"
     if (m_CList_Message.GetItemCount() == 0) {
@@ -9369,6 +9429,306 @@ void CMy2015RemoteDlg::OnMsglogSearch()
     OnSize(SIZE_RESTORED, rc.Width(), rc.Height());
 }
 
+// Extract the first valid IPv4 address from a log message text.
+// Returns true and sets outIP if a valid IPv4 address is found.
+static bool ExtractFirstIPFromMessage(const CString& msg, CString& outIP)
+{
+    // Scan the string for patterns like d.d.d.d and validate each segment
+    int len = msg.GetLength();
+    for (int i = 0; i < len; i++) {
+        TCHAR ch = msg[i];
+        // Look for start of a potential IP: digit
+        if (ch >= _T('0') && ch <= _T('9')) {
+            int segments[4] = { -1, -1, -1, -1 };
+            int segIdx = 0;
+            int numStart = i;
+
+            for (int j = i; j < len && segIdx < 4; j++) {
+                TCHAR c = msg[j];
+                if (c >= _T('0') && c <= _T('9')) {
+                    if (numStart < 0) numStart = j;
+                } else if (c == _T('.')) {
+                    if (numStart < 0) break;  // consecutive dots or leading dot
+                    // Parse the number
+                    CString numStr = msg.Mid(numStart, j - numStart);
+                    if (numStr.GetLength() > 3) break;  // too many digits
+                    int val = _tstoi(numStr);
+                    if (val > 255) break;
+                    segments[segIdx] = val;
+                    segIdx++;
+                    numStart = -1;
+                    if (segIdx >= 4) break;  // too many segments
+                } else {
+                    break;  // non-IP character
+                }
+            }
+
+            // Check if we have exactly 4 valid segments and the last char ends a number
+            if (segIdx == 3 && numStart >= 0) {
+                // Find where the number ends
+                int numEnd = numStart;
+                while (numEnd < len && msg[numEnd] >= _T('0') && msg[numEnd] <= _T('9'))
+                    numEnd++;
+                CString numStr = msg.Mid(numStart, numEnd - numStart);
+                if (numStr.GetLength() <= 3) {
+                    int val = _tstoi(numStr);
+                    if (val >= 0 && val <= 255) {
+                        segments[3] = val;
+                        // Success: build the IP string
+                        outIP.Format(_T("%d.%d.%d.%d"), segments[0], segments[1], segments[2], segments[3]);
+                        return true;
+                    }
+                }
+            }
+            // Skip past the partial match to continue scanning
+            // (the outer loop will increment i, which is fine)
+        }
+    }
+    return false;
+}
+
+void CMy2015RemoteDlg::OnMsglogLoginNotify()
+{
+    // Get selected log messages and extract IP addresses from them
+    std::vector<std::string> ipsToAdd;
+
+    POSITION pos = m_CList_Message.GetFirstSelectedItemPosition();
+    while (pos) {
+        int row = m_CList_Message.GetNextSelectedItem(pos);
+        // Column 2 is the message content ("信息内容")
+        CString msgText = m_CList_Message.GetItemText(row, 2);
+
+        CString extractedIP;
+        if (ExtractFirstIPFromMessage(msgText, extractedIP)) {
+            std::string ipUtf8 = CT2A(extractedIP, CP_UTF8);
+            ipsToAdd.push_back(ipUtf8);
+        }
+    }
+
+    if (ipsToAdd.empty()) {
+        MessageBoxL("所选日志消息中未检测到有效的 IP 地址", "提示", MB_ICONINFORMATION);
+        return;
+    }
+
+    // Helper to convert string to lowercase
+    auto toLower = [](const std::string& str) -> std::string {
+        std::string result = str;
+        std::transform(result.begin(), result.end(), result.begin(), ::tolower);
+        return result;
+    };
+
+    // Use the same deduplication logic as OnOnlineLoginNotify
+    NotifyConfig config = GetNotifyManager().GetConfig();
+    NotifyRule& rule = config.GetRule();
+
+    // Parse existing keywords into a set for deduplication (case-insensitive)
+    std::set<std::string> existingKeywordsLower;
+    std::vector<std::string> existingKeywords;
+    std::string pattern = rule.matchPattern;
+    size_t patternPos = 0;
+    while ((patternPos = pattern.find(';')) != std::string::npos) {
+        std::string kw = pattern.substr(0, patternPos);
+        size_t start = kw.find_first_not_of(" \t");
+        size_t end = kw.find_last_not_of(" \t");
+        if (start != std::string::npos) {
+            std::string trimmed = kw.substr(start, end - start + 1);
+            existingKeywordsLower.insert(toLower(trimmed));
+            existingKeywords.push_back(trimmed);
+        }
+        pattern.erase(0, patternPos + 1);
+    }
+    if (!pattern.empty()) {
+        size_t start = pattern.find_first_not_of(" \t");
+        size_t end = pattern.find_last_not_of(" \t");
+        if (start != std::string::npos) {
+            std::string trimmed = pattern.substr(start, end - start + 1);
+            existingKeywordsLower.insert(toLower(trimmed));
+            existingKeywords.push_back(trimmed);
+        }
+    }
+
+    // Add new IPs if not already present
+    int addedCount = 0;
+    for (const auto& ip : ipsToAdd) {
+        if (existingKeywordsLower.find(toLower(ip)) == existingKeywordsLower.end()) {
+            existingKeywordsLower.insert(toLower(ip));
+            existingKeywords.push_back(ip);
+            addedCount++;
+        }
+    }
+
+    if (addedCount == 0) {
+        MessageBoxL("所有解析出的 IP 已在上线提醒列表中", "提示", MB_ICONINFORMATION);
+        return;
+    }
+
+    // Rebuild match pattern
+    std::string newPattern;
+    for (const auto& kw : existingKeywords) {
+        if (!newPattern.empty()) {
+            newPattern += ";";
+        }
+        newPattern += kw;
+    }
+
+    // Update config (preserve existing columnIndex and triggerType)
+    rule.matchPattern = newPattern;
+    rule.enabled = true;
+    if (rule.triggerType == NOTIFY_TRIGGER_NONE) {
+        rule.triggerType = NOTIFY_TRIGGER_HOST_ONLINE;
+    }
+
+    GetNotifyManager().SetConfig(config);
+    GetNotifyManager().SaveConfig();
+
+    // Build message with SMTP warning if not configured
+    CString msg;
+    msg.Format(_TR("已添加 %d 个 IP 到上线提醒列表"), addedCount);
+    if (!config.smtp.IsValid()) {
+        msg += _T("\n\n");
+        msg += _TR("注意: SMTP 未配置，请先在通知设置中配置邮箱");
+    }
+    MessageBoxL(msg, _TR("上线提醒"), MB_ICONINFORMATION);
+}
+
+void CMy2015RemoteDlg::OnMsglogBanIP()
+{
+    // Get selected log messages and extract IP addresses from them
+    std::vector<std::string> ipsToAdd;
+
+    POSITION pos = m_CList_Message.GetFirstSelectedItemPosition();
+    while (pos) {
+        int row = m_CList_Message.GetNextSelectedItem(pos);
+        // Column 2 is the message content ("信息内容")
+        CString msgText = m_CList_Message.GetItemText(row, 2);
+
+        CString extractedIP;
+        if (ExtractFirstIPFromMessage(msgText, extractedIP)) {
+            std::string ipUtf8 = CT2A(extractedIP, CP_UTF8);
+            ipsToAdd.push_back(ipUtf8);
+        }
+    }
+
+    if (ipsToAdd.empty()) {
+        MessageBoxL("所选日志消息中未检测到有效的 IP 地址", "提示", MB_ICONINFORMATION);
+        return;
+    }
+
+    // Process each extracted IP
+    int bannedCount = 0;
+    int alreadyCount = 0;
+    int whitelistCount = 0;
+
+    for (const auto& ip : ipsToAdd) {
+        // Cannot ban whitelisted IPs
+        if (IPWhitelist::getInstance().IsWhitelisted(ip)) {
+            whitelistCount++;
+            continue;
+        }
+        // Already in blacklist
+        if (IPBlacklist::getInstance().IsBlacklisted(ip)) {
+            alreadyCount++;
+            continue;
+        }
+
+        IPBlacklist::getInstance().AddIP(ip);
+        bannedCount++;
+    }
+
+    // Persist to config
+    if (bannedCount > 0) {
+        std::string blacklistStr = IPBlacklist::getInstance().Export();
+        THIS_CFG.SetStr("settings", "IPBlacklist", blacklistStr.c_str());
+    }
+
+    // Build result message
+    CString details;
+    if (bannedCount > 0) {
+        details.AppendFormat(_TR("已封禁 %d 个 IP"), bannedCount);
+    }
+    if (alreadyCount > 0) {
+        if (!details.IsEmpty()) details += _T("\n");
+        details.AppendFormat(_TR("%d 个 IP 已在黑名单中"), alreadyCount);
+    }
+    if (whitelistCount > 0) {
+        if (!details.IsEmpty()) details += _T("\n");
+        details.AppendFormat(_TR("%d 个 IP 在白名单中，已跳过"), whitelistCount);
+    }
+
+    if (details.IsEmpty()) {
+        details = _TR("未执行任何操作");
+    }
+
+    MessageBoxL(details, _TR("封禁IP"), MB_ICONINFORMATION);
+}
+
+void CMy2015RemoteDlg::OnMsglogUnbanIP()
+{
+    // Get selected log messages and extract IP addresses from them
+    std::vector<std::string> ipsToProcess;
+
+    POSITION pos = m_CList_Message.GetFirstSelectedItemPosition();
+    while (pos) {
+        int row = m_CList_Message.GetNextSelectedItem(pos);
+        CString msgText = m_CList_Message.GetItemText(row, 2);
+
+        CString extractedIP;
+        if (ExtractFirstIPFromMessage(msgText, extractedIP)) {
+            std::string ipUtf8 = CT2A(extractedIP, CP_UTF8);
+            ipsToProcess.push_back(ipUtf8);
+        }
+    }
+
+    if (ipsToProcess.empty()) {
+        MessageBoxL("所选日志消息中未检测到有效的 IP 地址", "提示", MB_ICONINFORMATION);
+        return;
+    }
+
+    int unblacklistedCount = 0;
+    int clientRestoredCount = 0;
+
+    for (const auto& ip : ipsToProcess) {
+        // 1. Remove from IP blacklist
+        if (IPBlacklist::getInstance().IsBlacklisted(ip)) {
+            IPBlacklist::getInstance().RemoveIP(ip);
+            unblacklistedCount++;
+        }
+
+        // 2. Find all clients matching this IP and restore AUTH_FORBIDDEN to UNAUTHORIZED
+        for (const auto& kv : m_ClientMap->GetAll()) {
+            if (strcmp(kv.second.IP, ip.c_str()) == 0
+                && kv.second.Authorized == AUTH_FORBIDDEN) {
+                m_ClientMap->SetClientMapInteger(kv.first, MAP_AUTH, UNAUTHORIZED);
+                clientRestoredCount++;
+            }
+        }
+    }
+
+    // Persist
+    if (unblacklistedCount > 0) {
+        std::string blacklistStr = IPBlacklist::getInstance().Export();
+        THIS_CFG.SetStr("settings", "IPBlacklist", blacklistStr.c_str());
+    }
+    if (clientRestoredCount > 0) {
+        m_ClientMap->SaveToFile(GetDbPath());
+    }
+
+    // Build result message
+    CString details;
+    if (unblacklistedCount > 0) {
+        details.AppendFormat(_TR("已将 %d 个 IP 从黑名单移除"), unblacklistedCount);
+    }
+    if (clientRestoredCount > 0) {
+        if (!details.IsEmpty()) details += _T("\n");
+        details.AppendFormat(_TR("已恢复 %d 个客户端的授权状态"), clientRestoredCount);
+    }
+    if (unblacklistedCount == 0 && clientRestoredCount == 0) {
+        details = _TR("未找到需要解除封禁的 IP");
+    }
+
+    MessageBoxL(details, _TR("解除封禁"), MB_ICONINFORMATION);
+}
+
 void CMy2015RemoteDlg::OnOnlineAddWatch()
 {
     EnterCriticalSection(&m_cs);

server/2015Remote/2015RemoteDlg.h

@@ -173,6 +173,9 @@ protected:
     DECLARE_MESSAGE_MAP()
 public:
     void SortByColumn(int nColumn);
+    void ApplySort();               // 按偏好重排 m_HostList（调用方需持有 m_cs）
+    void LoadSortPreference();
+    void SaveSortPreference();
     afx_msg VOID OnHdnItemclickList(NMHDR* pNMHDR, LRESULT* pResult);
     static int CALLBACK CompareFunction(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
     template<class T, int id, int Show = SW_SHOW> LRESULT OpenDialog(WPARAM wParam, LPARAM lParam)
@@ -342,6 +345,8 @@ public:
     std::vector<context*> m_HostList;              // 虚拟列表数据源（全部客户端）
     std::unordered_map<uint64_t, size_t> m_ClientIndex;  // clientID -> m_HostList 索引映射
     std::vector<size_t> m_FilteredIndices;         // 当前分组过滤后的索引列表
+    int  m_nSortColumn = -1;                       // 当前排序列，-1 表示未排序
+    bool m_bSortAscending = true;                  // 排序方向（true=升序）
     std::set<std::string> m_GroupList;
     std::string m_selectedGroup;
 	std::string m_v2KeyPath;                      // V2 密钥文件路径
@@ -564,6 +569,9 @@ public:
     afx_msg void OnMsglogCopy();
     afx_msg void OnMsglogClear();
     afx_msg void OnMsglogSearch();
+    afx_msg void OnMsglogLoginNotify();
+    afx_msg void OnMsglogBanIP();
+    afx_msg void OnMsglogUnbanIP();
     afx_msg void OnOnlineAddWatch();
     afx_msg void OnNMCustomdrawOnline(NMHDR* pNMHDR, LRESULT* pResult);
     afx_msg void OnOnlineRunAsAdmin();

server/2015Remote/NotifyConfig.h

@@ -104,10 +104,14 @@ inline const char* GetColumnName(int index) {
         "Camera",          // 6
         "RTT",             // 7
         "Version",         // 8
-        "Privilege",       // 9  ONLINELIST_PRIVILEGE
+        "InstallTime",     // 9  ONLINELIST_INSTALLTIME
-        "InstallTime",     // 10 ONLINELIST_INSTALLTIME
+        "ActiveWindow",    // 10 ONLINELIST_LOGINTIME
-        "ActiveWindow",    // 11 ONLINELIST_LOGINTIME
+        "ClientType",      // 11 ONLINELIST_CLIENTTYPE
-        "ClientType",      // 12 ONLINELIST_CLIENTTYPE
+        "Path",            // 12 ONLINELIST_PATH
+        "PublicIP",        // 13 ONLINELIST_PUBIP
+        "StartTime",       // 14 ONLINELIST_STARTTIME
+        "Capabilities",    // 15 ONLINELIST_CAPABILITIES
+        "Privilege",       // 16 ONLINELIST_PRIVILEGE
     };
     if (index >= 0 && index < sizeof(names)/sizeof(names[0])) {
         return names[index];

server/2015Remote/NotifyManager.cpp

@@ -141,35 +141,52 @@ bool NotifyManager::ShouldNotify(context* ctx, std::string& outMatchedKeyword, c
         }
     }
 
-    // Get column text (for COMPUTER_NAME column, prefer remark if available)
+    // Split pattern by semicolon and get keywords
+    std::vector<std::string> keywords = SplitString(rule.matchPattern, ';');
+
+    // Helper: check if any keyword matches a given column text
+    auto matchColumn = [&keywords, this](const CString& colText) -> std::string {
+        if (colText.IsEmpty()) return "";
+        std::string colTextStr = CT2A(colText, CP_UTF8);
+        std::string colLower = colTextStr;
+        std::transform(colLower.begin(), colLower.end(), colLower.begin(), ::tolower);
+
+        for (const auto& kw : keywords) {
+            std::string trimmed = Trim(kw);
+            if (trimmed.empty()) continue;
+
+            std::string kwLower = trimmed;
+            std::transform(kwLower.begin(), kwLower.end(), kwLower.begin(), ::tolower);
+
+            if (colLower.find(kwLower) != std::string::npos) {
+                return trimmed;
+            }
+        }
+        return "";
+    };
+
+    // Check primary column (for COMPUTER_NAME column, prefer remark if available)
     CString colText;
     if (rule.columnIndex == ONLINELIST_COMPUTER_NAME && !remark.IsEmpty()) {
         colText = remark;
     } else {
         colText = ctx->GetClientData(rule.columnIndex);
     }
-    if (colText.IsEmpty()) return false;
+    std::string matched = matchColumn(colText);
+    if (!matched.empty()) {
+        outMatchedKeyword = matched;
+        m_config.lastNotifyTime[clientId] = now;
+        return true;
+    }
 
-    // Convert to std::string for matching
+    // Also check the IP column (ONLINELIST_IP) so IP keywords added from log
-    std::string colTextStr = CT2A(colText, CP_UTF8);
+    // messages can match against host IP addresses when they come online.
-
+    CString ipText = ctx->GetClientData(ONLINELIST_IP);
-    // Split pattern by semicolon and check each keyword
+    matched = matchColumn(ipText);
-    std::vector<std::string> keywords = SplitString(rule.matchPattern, ';');
+    if (!matched.empty()) {
-    for (const auto& kw : keywords) {
+        outMatchedKeyword = matched;
-        std::string trimmed = Trim(kw);
+        m_config.lastNotifyTime[clientId] = now;
-        if (trimmed.empty()) continue;
+        return true;
-
-        // Case-insensitive substring search
-        std::string colLower = colTextStr;
-        std::string kwLower = trimmed;
-        std::transform(colLower.begin(), colLower.end(), colLower.begin(), ::tolower);
-        std::transform(kwLower.begin(), kwLower.end(), kwLower.begin(), ::tolower);
-
-        if (colLower.find(kwLower) != std::string::npos) {
-            outMatchedKeyword = trimmed;
-            m_config.lastNotifyTime[clientId] = now;
-            return true;
-        }
     }
 
     return false;

server/2015Remote/NotifySettingsDlg.cpp

@@ -111,10 +111,10 @@ void NotifySettingsDlg::PopulateComboBoxes()
         { ONLINELIST_VIDEO,        _T("摄像头") },
         { ONLINELIST_PING,         _T("延迟") },
         { ONLINELIST_VERSION,      _T("版本") },
-        { ONLINELIST_PRIVILEGE,    _T("权限") },
         { ONLINELIST_INSTALLTIME,  _T("安装时间") },
         { ONLINELIST_LOGINTIME,    _T("活动窗口") },
         { ONLINELIST_CLIENTTYPE,   _T("客户端类型") },
+        { ONLINELIST_PRIVILEGE,    _T("权限") },
     };
     for (const auto& col : columns) {
         CString item;

server/2015Remote/SystemDlg.cpp

@@ -80,6 +80,7 @@ BOOL CSystemDlg::OnInitDialog()
     SetWindowText(str);//设置对话框标题
 
     m_ControlList.SetExtendedStyle(LVS_EX_FLATSB | LVS_EX_FULLROWSELECT);
+    LoadSortPreference();          // 加载上次记忆的排序偏好
     if (m_bHow==TOKEN_PSLIST) {    //进程管理初始化列表
         m_ControlList.InsertColumnL(0, "映像名称", LVCFMT_LEFT, 180);
         m_ControlList.InsertColumnL(1, "PID", LVCFMT_LEFT, 70);
@@ -227,6 +228,8 @@ void CSystemDlg::ShowWindowsList(void)
     lvc.pszText = str.GetBuffer(0);
     lvc.cchTextMax = str.GetLength();
     m_ControlList.SetColumn(1, &lvc);
+
+    ApplySort();  // 应用记忆的排序偏好
 }
 
 void CSystemDlg::ShowProcessList(void)
@@ -260,8 +263,8 @@ void CSystemDlg::ShowProcessList(void)
         m_ControlList.SetItemText(i, 1, str);
         m_ControlList.SetItemText(i, 2, szProcessFullPath);
         m_ControlList.SetItemText(i, 3, arr[1].empty() ? "N/A" : arr[1].c_str());
-        // ItemData 为进程ID
+        // ItemData 为进程ID；Data[3] 需与第 4 列"架构"一致，否则按架构排序拿到空串而无意义
-        auto data = new ItemData{ *PID, {arr[0].c_str(), str, szProcessFullPath}, arr[1].c_str() };
+        auto data = new ItemData{ *PID, {arr[0].c_str(), str, szProcessFullPath, arr[1].empty() ? "N/A" : arr[1].c_str()}, arr[1].c_str() };
         m_ControlList.SetItemData(i, DWORD_PTR(data));
 
         dwOffset += sizeof(DWORD) + lstrlen(szExeFile) + lstrlen(szProcessFullPath) + 2;   //跳过这个数据结构 进入下一个循环
@@ -273,6 +276,8 @@ void CSystemDlg::ShowProcessList(void)
     lvc.pszText = str.GetBuffer(0);
     lvc.cchTextMax = str.GetLength();
     m_ControlList.SetColumn(2, &lvc); //在列表中显示有多少个进程
+
+    ApplySort();  // 应用记忆的排序偏好
 }
 
 
@@ -319,8 +324,6 @@ int CALLBACK CSystemDlg::CompareFunction(LPARAM lParam1, LPARAM lParam2, LPARAM
 
 void CSystemDlg::SortByColumn(int nColumn)
 {
-    static int m_nSortColumn = 0;
-    static bool m_bSortAscending = false;
     if (nColumn == m_nSortColumn) {
         // 如果点击的是同一列，切换排序顺序
         m_bSortAscending = !m_bSortAscending;
@@ -330,11 +333,56 @@ void CSystemDlg::SortByColumn(int nColumn)
         m_bSortAscending = true;
     }
 
+    ApplySort();
+    SaveSortPreference();
+}
+
+void CSystemDlg::ApplySort()
+{
+    // 无有效排序偏好时保持列表原始顺序
+    if (m_nSortColumn < 0) {
+        return;
+    }
+
+    // 防御：配置被手动修改导致列索引越界时跳过排序
+    CHeaderCtrl* pHeader = m_ControlList.GetHeaderCtrl();
+    if (pHeader && m_nSortColumn >= pHeader->GetItemCount()) {
+        return;
+    }
+
     // 创建排序信息
     std::pair<int, bool> sortInfo(m_nSortColumn, m_bSortAscending);
     m_ControlList.SortItems(CompareFunction, reinterpret_cast<LPARAM>(&sortInfo));
 }
 
+void CSystemDlg::LoadSortPreference()
+{
+    // 进程管理 / 窗口管理 分别记忆各自的排序偏好
+    const char* key = (m_bHow == TOKEN_PSLIST) ? "ProcessListSort" : "WindowListSort";
+    std::string val = THIS_CFG.GetStr("list", key, "");
+    if (val.empty()) {
+        m_nSortColumn = -1;      // 无偏好：保持列表原始顺序
+        m_bSortAscending = true;
+        return;
+    }
+
+    auto arr = StringToVector(val, ',');
+    if (arr.size() >= 2) {
+        m_nSortColumn = atoi(arr[0].c_str());
+        m_bSortAscending = (atoi(arr[1].c_str()) != 0);
+    } else {
+        m_nSortColumn = -1;
+        m_bSortAscending = true;
+    }
+}
+
+void CSystemDlg::SaveSortPreference()
+{
+    const char* key = (m_bHow == TOKEN_PSLIST) ? "ProcessListSort" : "WindowListSort";
+    std::string val = std::to_string(m_nSortColumn) + "," + (m_bSortAscending ? "1" : "0");
+    THIS_CFG.SetStr("list", key, val);
+}
+
 void CSystemDlg::OnHdnItemclickList(NMHDR* pNMHDR, LRESULT* pResult)
 {
     LPNMHEADER pNMHeader = reinterpret_cast<LPNMHEADER>(pNMHDR);

server/2015Remote/SystemDlg.h

@@ -19,6 +19,8 @@ public:
     void OnReceiveComplete(void);
     CWnd* m_pParent;
     BOOL   m_bHow;
+    int    m_nSortColumn = -1;      // 当前排序列，-1 表示未排序
+    bool   m_bSortAscending = true; // 排序方向（true=升序）
 // 对话框数据
     enum { IDD = IDD_DIALOG_SYSTEM };
 
@@ -32,6 +34,9 @@ public:
 
     void DeleteAllItems();
     void SortByColumn(int nColumn);
+    void ApplySort();
+    void LoadSortPreference();
+    void SaveSortPreference();
     afx_msg VOID OnHdnItemclickList(NMHDR* pNMHDR, LRESULT* pResult);
     static int CALLBACK CompareFunction(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
 

server/2015Remote/context.h

@@ -14,7 +14,6 @@ enum {
     ONLINELIST_VIDEO,           // 摄像头(有无)
     ONLINELIST_PING,            // PING(对方的网速)
     ONLINELIST_VERSION,	        // 版本信息
-    ONLINELIST_PRIVILEGE,       // 权限级别 (SYSTEM/Admin/User)
     ONLINELIST_INSTALLTIME,     // 安装时间
     ONLINELIST_LOGINTIME,       // 活动窗口
     ONLINELIST_CLIENTTYPE,		// 客户端类型
@@ -22,6 +21,7 @@ enum {
     ONLINELIST_PUBIP,
     ONLINELIST_STARTTIME,
     ONLINELIST_CAPABILITIES,    // 客户端能力位
+    ONLINELIST_PRIVILEGE,       // 权限级别 (SYSTEM/Admin/User)
     ONLINELIST_MAX,
 };
 

server/2015Remote/lang/en_US.ini

@@ -1965,3 +1965,15 @@ FRPC Զ
 搜索日志=Search Logs
 隐藏搜索=Hide Search
 请=Please
+所选日志消息中未检测到有效的 IP 地址=No valid IP address detected in the selected log messages
+所有解析出的 IP 已在上线提醒列表中=All extracted IPs are already in the login notify list
+已添加 %d 个 IP 到上线提醒列表=Added %d IP(s) to login notify list
+封禁IP=Ban IP
+已封禁 %d 个 IP=Banned %d IP(s)
+%d 个 IP 已在黑名单中=%d IP(s) already in blacklist
+%d 个 IP 在白名单中，已跳过=%d IP(s) in whitelist, skipped
+未执行任何操作=No action taken
+解除封禁=Unban IP
+已将 %d 个 IP 从黑名单移除=Removed %d IP(s) from blacklist
+已恢复 %d 个客户端的授权状态=Restored authorization for %d client(s)
+未找到需要解除封禁的 IP=No IPs found that need unbanning

server/2015Remote/lang/zh_TW.ini

@@ -1956,3 +1956,15 @@ FRPC Զ
 搜索日志=搜索日志
 隐藏搜索=隐藏搜索
 请=请
+所有解析出的 IP 已在上线提醒列表中=所有解析出的 IP 已在上線提醒列表中
+已添加 %d 个 IP 到上线提醒列表=已新增 %d 個 IP 到上線提醒列表
+所选日志消息中未检测到有效的 IP 地址=所選日誌消息中未檢測到有效的 IP 位址
+封禁IP=封禁IP
+已封禁 %d 个 IP=已封禁 %d 個 IP
+%d 个 IP 已在黑名单中=%d 個 IP 已在黑名單中
+%d 个 IP 在白名单中，已跳过=%d 個 IP 在白名單中，已跳過
+未执行任何操作=未執行任何操作
+解除封禁=解除封禁
+已将 %d 个 IP 从黑名单移除=已將 %d 個 IP 從黑名單移除
+已恢复 %d 个客户端的授权状态=已恢復 %d 個客戶端的授權狀態
+未找到需要解除封禁的 IP=未找到需要解除封禁的 IP

server/2015Remote/resource.h

@@ -991,6 +991,9 @@
 #define ID_CANCEL_SHARE                 33042
 #define ID_MSGLOG_COPY                  33043
 #define ID_MSGLOG_SEARCH                33078
+#define ID_MSGLOG_LOGIN_NOTIFY          33079
+#define ID_MSGLOG_BAN_IP                33080
+#define ID_MSGLOG_UNBAN_IP              33081
 #define ID_WEB_REMOTE_CONTROL           33044
 #define ID_TOOL_PLUGIN_SETTINGS         33045
 #define ID_33046                        33046
@@ -1032,7 +1035,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        398
-#define _APS_NEXT_COMMAND_VALUE         33079
+#define _APS_NEXT_COMMAND_VALUE         33082
 #define _APS_NEXT_CONTROL_VALUE         2542
 #define _APS_NEXT_SYMED_VALUE           105
 #endif