From f5d3efdcec2d59e4adf6a3ae534082023e2df345 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 04 九月 2025 15:51:25 +0800
Subject: [PATCH] 1. 配方列表中添加设备配方参数 2. 测试权限功能

---
 SourceCode/Bond/Servo/RecipeManager.cpp |    5 
 SourceCode/Bond/Servo/UserManager.h     |  166 +++++-----
 SourceCode/Bond/Servo/ServoDlg.cpp      |   23 +
 SourceCode/Bond/Servo/UserManager.cpp   |  688 ++++++++++++++++++++++----------------------
 SourceCode/Bond/Servo/PageRecipe.cpp    |    5 
 5 files changed, 456 insertions(+), 431 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
index c238efd..bbbfe21 100644
--- a/SourceCode/Bond/Servo/PageRecipe.cpp
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -56,9 +56,9 @@
 
 	CString strIniFile, strItem;
 	strIniFile.Format(_T("%s\\configuration.ini"), (LPCTSTR)theApp.m_strAppDir);
-	int width[] = { 0, 60, 150, 150 };
+	int width[] = { 0, 60, 100, 100, 150 };
 
-	for (int i = 0; i < 4; i++) {
+	for (int i = 0; i < 5; i++) {
 		strItem.Format(_T("Col_Device_%d_Width"), i);
 		width[i] = GetPrivateProfileInt(_T("PageRecipeListCtrl"), strItem, width[i], strIniFile);
 	}
@@ -67,6 +67,7 @@
 	m_listPPID.InsertColumn(1, _T("No."), LVCFMT_CENTER, width[1]);
 	m_listPPID.InsertColumn(2, _T("Recipe ID"), LVCFMT_CENTER, width[2]);
 	m_listPPID.InsertColumn(3, _T("Recipe 鍚嶇О"), LVCFMT_CENTER, width[3]);
+	m_listPPID.InsertColumn(4, _T("Recipe 鍙傛暟"), LVCFMT_CENTER, width[4]);
 }
 
 void CPageRecipe::UpdateRecipeByPPID(const CString& strPPID)
diff --git a/SourceCode/Bond/Servo/RecipeManager.cpp b/SourceCode/Bond/Servo/RecipeManager.cpp
index ce7b91f..db65214 100644
--- a/SourceCode/Bond/Servo/RecipeManager.cpp
+++ b/SourceCode/Bond/Servo/RecipeManager.cpp
@@ -487,8 +487,9 @@
 
 	std::ostringstream sql;
 	sql << "CREATE TABLE IF NOT EXISTS " << deviceName << "_Recipes ("
-		<< "recipe_id INTEGER PRIMARY KEY, "
-		<< "recipe_name TEXT NOT NULL"
+		<< "recipe_id INTEGER PRIMARY KEY,"
+		<< "recipe_name TEXT NOT NULL,"
+		<< "recipe_para TEXT NOT NULL"
 		<< ");";
 	m_pDB->executeQuery(sql.str());
 
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 5d2e6d5..273c7c8 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -27,6 +27,7 @@
 #include "CPageReport.h"
 #include "CPageCollectionEvent.h"
 #include "CControlJobDlg.h"
+#include "InputDialog.h"
 
 
 #ifdef _DEBUG
@@ -956,6 +957,28 @@
 LRESULT CServoDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
 {
 	int id = (int)lParam;
+	if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP) {
+		//CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码:"));
+		//if (inputDialog.DoModal() != IDOK) {
+		//	AfxMessageBox(_T("取消验证!"));
+		//	return 0;
+		//}
+	
+		//CString inputText = inputDialog.GetInputText();
+		//std::string strPass = UserManager::getInstance().getCurrentPass();
+		//if (inputText.Compare(strPass.c_str()) != 0) {
+		//	AfxMessageBox(_T("密码错误!"));
+		//	SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("验证时,密码错误!"));
+		//	return 0;
+		//}
+		
+		UserRole emRole = UserManager::getInstance().getCurrentUserRole();
+		if (emRole != UserRole::SuperAdmin) {
+			AfxMessageBox(_T("当前用户并非管理员!!!")); 
+			return 1;
+		}
+	}
+
 	if (id == IDC_BUTTON_RUN) {
 		if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
 			AfxMessageBox("当前有机台发生错误,不能启动,请确认解决问题后再尝试重新启动!");
diff --git a/SourceCode/Bond/Servo/UserManager.cpp b/SourceCode/Bond/Servo/UserManager.cpp
index 1e6d5f8..0c08e60 100644
--- a/SourceCode/Bond/Servo/UserManager.cpp
+++ b/SourceCode/Bond/Servo/UserManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
 #include "UserManager.h"
 #include <chrono>
 #include <iostream>
@@ -12,531 +12,531 @@
 const std::string INITIAL_ADMIN_USERNAME = "admin";
 const std::string INITIAL_ADMIN_PASSWORD = "admin";
 
-// 获取单例实例
+// 鑾峰彇鍗曚緥瀹炰緥
 UserManager& UserManager::getInstance() {
-    static UserManager instance;
-    return instance;
+	static UserManager instance;
+	return instance;
 }
 
 UserManager::UserManager()
-    : m_isLoggedIn(false), m_isRememberMe(false), m_tmSessionTimeout(std::chrono::minutes(30)),
-    m_tmSessionExpiration(std::chrono::hours(72)), m_hMouseHook(nullptr), m_hKeyboardHook(nullptr),
-    m_pDB(std::make_unique<BL::SQLiteDatabase>()) {
-    initializeDatabase();
+	: m_isLoggedIn(false), m_isRememberMe(false), m_tmSessionTimeout(std::chrono::minutes(30)),
+	m_tmSessionExpiration(std::chrono::hours(72)), m_hMouseHook(nullptr), m_hKeyboardHook(nullptr),
+	m_pDB(std::make_unique<BL::SQLiteDatabase>()) {
+	initializeDatabase();
 }
 
 UserManager::~UserManager() {
-    terminateIdleDetection();
+	terminateIdleDetection();
 }
 
-// 提供数据库连接
+// 鎻愪緵鏁版嵁搴撹繛鎺�
 std::unique_ptr<BL::Database>& UserManager::getDatabaseInstance() {
-    return m_pDB;
+	return m_pDB;
 }
 
-// 初始化数据库,创建用户表并插入初始管理员用户
+// 鍒濆鍖栨暟鎹簱锛屽垱寤虹敤鎴疯〃骞舵彃鍏ュ垵濮嬬鐞嗗憳鐢ㄦ埛
 bool UserManager::initializeDatabase() {
-    std::string dbFilePath = getDatabaseFilePath();
-    if (!m_pDB->connect(dbFilePath, true)) {
-        throw std::runtime_error("Failed to connect to database.");
-    }
+	std::string dbFilePath = getDatabaseFilePath();
+	if (!m_pDB->connect(dbFilePath, true)) {
+		throw std::runtime_error("Failed to connect to database.");
+	}
 
-    std::string createTableQuery = R"(
-        CREATE TABLE IF NOT EXISTS users (
-            username VARCHAR(50) PRIMARY KEY,
-            password VARCHAR(255) NOT NULL,
-            role INT NOT NULL,
-            session_timeout INT DEFAULT 30,
-            session_expiration INT DEFAULT 72,
-            last_login DATETIME DEFAULT (datetime('now', 'localtime'))
-        )
-    )";
-    m_pDB->executeQuery(createTableQuery);
+	std::string createTableQuery = R"(
+		CREATE TABLE IF NOT EXISTS users (
+			username VARCHAR(50) PRIMARY KEY,
+			password VARCHAR(255) NOT NULL,
+			role INT NOT NULL,
+			session_timeout INT DEFAULT 30,
+			session_expiration INT DEFAULT 72,
+			last_login DATETIME DEFAULT (datetime('now', 'localtime'))
+		)
+	)";
+	m_pDB->executeQuery(createTableQuery);
 
-    std::string checkAdminQuery = "SELECT COUNT(*) FROM users WHERE role = 0";
-    auto result = m_pDB->fetchResults(checkAdminQuery);
+	std::string checkAdminQuery = "SELECT COUNT(*) FROM users WHERE role = 0";
+	auto result = m_pDB->fetchResults(checkAdminQuery);
 
-    if (result.empty() || result[0][0] == "0") {
-        std::string insertAdminQuery = "INSERT INTO users (username, password, role, session_timeout, session_expiration) VALUES ('" +
-            INITIAL_ADMIN_USERNAME + "', '" + simpleEncryptDecrypt(INITIAL_ADMIN_PASSWORD, "BandKey") + "', 0, 30, 72)";
-        m_pDB->executeQuery(insertAdminQuery);
-    }
+	if (result.empty() || result[0][0] == "0") {
+		std::string insertAdminQuery = "INSERT INTO users (username, password, role, session_timeout, session_expiration) VALUES ('" +
+			INITIAL_ADMIN_USERNAME + "', '" + simpleEncryptDecrypt(INITIAL_ADMIN_PASSWORD, "BandKey") + "', 0, 30, 72)";
+		m_pDB->executeQuery(insertAdminQuery);
+	}
 
-    return true;
+	return true;
 }
 
-// 对密码进行哈希处理
+// 瀵瑰瘑鐮佽繘琛屽搱甯屽鐞�
 std::string UserManager::hashPassword(const std::string& password) {
-    return std::to_string(std::hash<std::string>{}(password));
+	return std::to_string(std::hash<std::string>{}(password));
 }
 
-// 简单的加密和解密函数
+// 绠�鍗曠殑鍔犲瘑鍜岃В瀵嗗嚱鏁�
 std::string UserManager::simpleEncryptDecrypt(const std::string& data, const std::string& key) {
-    std::string result = data;
-    for (size_t i = 0; i < data.size(); ++i) {
-        result[i] ^= key[i % key.size()];  // 简单异或加密
-    }
-    return result;
+	std::string result = data;
+	for (size_t i = 0; i < data.size(); ++i) {
+		result[i] ^= key[i % key.size()];  // 绠�鍗曞紓鎴栧姞瀵�
+	}
+	return result;
 }
 
-// 从会话文件加载会话信息
+// 浠庝細璇濇枃浠跺姞杞戒細璇濅俊鎭�
 bool UserManager::loadSession() {
-    std::ifstream sessionFile(getSessionFilePath(), std::ios::binary);
-    if (!sessionFile.is_open()) {
-        return false;
-    }
+	std::ifstream sessionFile(getSessionFilePath(), std::ios::binary);
+	if (!sessionFile.is_open()) {
+		return false;
+	}
 
-    // 从文件读取加密数据
-    std::string encryptedData((std::istreambuf_iterator<char>(sessionFile)), std::istreambuf_iterator<char>());
-    sessionFile.close();
+	// 浠庢枃浠惰鍙栧姞瀵嗘暟鎹�
+	std::string encryptedData((std::istreambuf_iterator<char>(sessionFile)), std::istreambuf_iterator<char>());
+	sessionFile.close();
 
-    // 解密数据
-    std::string decryptedData = simpleEncryptDecrypt(encryptedData, "my_secret_key");
+	// 瑙e瘑鏁版嵁
+	std::string decryptedData = simpleEncryptDecrypt(encryptedData, "my_secret_key");
 
-    // 解析解密的数据
-    std::istringstream sessionData(decryptedData);
-    std::string username;
+	// 瑙f瀽瑙e瘑鐨勬暟鎹�
+	std::istringstream sessionData(decryptedData);
+	std::string username;
 	std::string password;
-    std::time_t lastLoginTime;
-    int timeoutMinutes;
-    int expirationHours;
+	std::time_t lastLoginTime;
+	int timeoutMinutes;
+	int expirationHours;
 
-    sessionData >> username >> password >> lastLoginTime >> timeoutMinutes >> expirationHours;
+	sessionData >> username >> password >> lastLoginTime >> timeoutMinutes >> expirationHours;
 
-    // 验证时间戳有效性
-    auto now = std::chrono::system_clock::now();
-    auto lastLogin = std::chrono::system_clock::from_time_t(lastLoginTime);
-    auto sessionDuration = std::chrono::duration_cast<std::chrono::hours>(now - lastLogin);
+	// 楠岃瘉鏃堕棿鎴虫湁鏁堟��
+	auto now = std::chrono::system_clock::now();
+	auto lastLogin = std::chrono::system_clock::from_time_t(lastLoginTime);
+	auto sessionDuration = std::chrono::duration_cast<std::chrono::hours>(now - lastLogin);
 
-    if (sessionDuration > std::chrono::hours(expirationHours)) {
-        clearSession();
-        return false;
-    }
+	if (sessionDuration > std::chrono::hours(expirationHours)) {
+		clearSession();
+		return false;
+	}
 
-    // 恢复会话数据
-    m_strCurrentUser = username;
+	// 鎭㈠浼氳瘽鏁版嵁
+	m_strCurrentUser = username;
 	m_strCurrentPass = password;
-    m_tpLastLogin = lastLogin;
-    m_tmSessionTimeout = std::chrono::minutes(timeoutMinutes);
-    m_tmSessionExpiration = std::chrono::hours(expirationHours);
-    m_isLoggedIn = true;
-    m_isRememberMe = true;
-    updateActivityTime();
+	m_tpLastLogin = lastLogin;
+	m_tmSessionTimeout = std::chrono::minutes(timeoutMinutes);
+	m_tmSessionExpiration = std::chrono::hours(expirationHours);
+	m_isLoggedIn = true;
+	m_isRememberMe = true;
+	updateActivityTime();
 
-    return true;
+	return true;
 }
 
-// 保存会话信息到文件
+// 淇濆瓨浼氳瘽淇℃伅鍒版枃浠�
 void UserManager::saveSession() {
-    if (!m_isRememberMe) {
-        clearSession();
-        return;
-    }
+	if (!m_isRememberMe) {
+		clearSession();
+		return;
+	}
 
-    // 原始会话数据
-    std::stringstream sessionData;
-    std::time_t lastLoginTime = std::chrono::system_clock::to_time_t(m_tpLastLogin);
-    sessionData << m_strCurrentUser << " " << m_strCurrentPass << " " << lastLoginTime << " "
-        << m_tmSessionTimeout.count() << " " << m_tmSessionExpiration.count();
+	// 鍘熷浼氳瘽鏁版嵁
+	std::stringstream sessionData;
+	std::time_t lastLoginTime = std::chrono::system_clock::to_time_t(m_tpLastLogin);
+	sessionData << m_strCurrentUser << " " << m_strCurrentPass << " " << lastLoginTime << " "
+		<< m_tmSessionTimeout.count() << " " << m_tmSessionExpiration.count();
 
-    // 加密数据
-    std::string encryptedData = simpleEncryptDecrypt(sessionData.str(), "my_secret_key");
+	// 鍔犲瘑鏁版嵁
+	std::string encryptedData = simpleEncryptDecrypt(sessionData.str(), "my_secret_key");
 
-    // 写入加密数据到文件
-    std::ofstream sessionFile(getSessionFilePath(), std::ios::binary);
-    if (sessionFile.is_open()) {
-        sessionFile << encryptedData;
-        sessionFile.close();
-    }
+	// 鍐欏叆鍔犲瘑鏁版嵁鍒版枃浠�
+	std::ofstream sessionFile(getSessionFilePath(), std::ios::binary);
+	if (sessionFile.is_open()) {
+		sessionFile << encryptedData;
+		sessionFile.close();
+	}
 }
 
-// 清除会话文件
+// 娓呴櫎浼氳瘽鏂囦欢
 void UserManager::clearSession() {
-    std::remove(getSessionFilePath().c_str());
+	std::remove(getSessionFilePath().c_str());
 }
 
-// 获取程序路径下的config文件夹路径
+// 鑾峰彇绋嬪簭璺緞涓嬬殑config鏂囦欢澶硅矾寰�
 std::string UserManager::getConfigFolderPath() {
-    char szPath[MAX_PATH];
-    GetModuleFileName(NULL, szPath, MAX_PATH);
-    std::string exePath(szPath);
-    std::string dbDir = exePath.substr(0, exePath.find_last_of("\\/")) + "\\DB\\";
+	char szPath[MAX_PATH];
+	GetModuleFileName(NULL, szPath, MAX_PATH);
+	std::string exePath(szPath);
+	std::string dbDir = exePath.substr(0, exePath.find_last_of("\\/")) + "\\DB\\";
 
-    // 检查并创建config文件夹
-    DWORD fileAttr = GetFileAttributes(dbDir.c_str());
-    if (fileAttr == INVALID_FILE_ATTRIBUTES) {
-        CreateDirectory(dbDir.c_str(), NULL);
-    }
+	// 妫�鏌ュ苟鍒涘缓config鏂囦欢澶�
+	DWORD fileAttr = GetFileAttributes(dbDir.c_str());
+	if (fileAttr == INVALID_FILE_ATTRIBUTES) {
+		CreateDirectory(dbDir.c_str(), NULL);
+	}
 
-    return dbDir;
+	return dbDir;
 }
 
-// 获取session.dat文件路径
+// 鑾峰彇session.dat鏂囦欢璺緞
 std::string UserManager::getSessionFilePath() {
-    return getConfigFolderPath() + SESSION_FILE;
+	return getConfigFolderPath() + SESSION_FILE;
 }
 
-// 获取数据库文件路径
+// 鑾峰彇鏁版嵁搴撴枃浠惰矾寰�
 std::string UserManager::getDatabaseFilePath() {
-    return getConfigFolderPath() + DATABASE_FILE;
+	return getConfigFolderPath() + DATABASE_FILE;
 }
 
-// 登录方法
+// 鐧诲綍鏂规硶
 bool UserManager::login(const std::string& username, const std::string& password, bool rememberMeFlag) {
-    std::string query = "SELECT username, password, role, session_timeout, session_expiration FROM users WHERE username = '" + username + "'";
-    auto result = m_pDB->fetchResults(query);
+	std::string query = "SELECT username, password, role, session_timeout, session_expiration FROM users WHERE username = '" + username + "'";
+	auto result = m_pDB->fetchResults(query);
 
-    if (result.empty() || result[0][1] != simpleEncryptDecrypt(password, "BandKey")) {
-        std::cerr << "Login failed: Invalid username or password." << std::endl;
-        return false;
-    }
+	if (result.empty() || result[0][1] != simpleEncryptDecrypt(password, "BandKey")) {
+		std::cerr << "Login failed: Invalid username or password." << std::endl;
+		return false;
+	}
 
-    m_strCurrentUser = username;
+	m_strCurrentUser = username;
 	m_strCurrentPass = password;
-    m_enCurrentUserRole = static_cast<UserRole>(std::stoi(result[0][2]));
-    m_tmSessionTimeout = std::chrono::minutes(std::stoi(result[0][3]));
-    m_tmSessionExpiration = std::chrono::hours(std::stoi(result[0][4]));
-    m_isLoggedIn = true;
-    m_isRememberMe = rememberMeFlag;
-    updateActivityTime();
-    m_tpLastLogin = std::chrono::system_clock::now();
+	m_enCurrentUserRole = static_cast<UserRole>(std::stoi(result[0][2]));
+	m_tmSessionTimeout = std::chrono::minutes(std::stoi(result[0][3]));
+	m_tmSessionExpiration = std::chrono::hours(std::stoi(result[0][4]));
+	m_isLoggedIn = true;
+	m_isRememberMe = rememberMeFlag;
+	updateActivityTime();
+	m_tpLastLogin = std::chrono::system_clock::now();
 
-    std::string updateLoginTime = "UPDATE users SET last_login = CURRENT_TIMESTAMP WHERE username = '" + username + "'";
-    m_pDB->executeQuery(updateLoginTime);
+	std::string updateLoginTime = "UPDATE users SET last_login = CURRENT_TIMESTAMP WHERE username = '" + username + "'";
+	m_pDB->executeQuery(updateLoginTime);
 
-    saveSession();
-    return true;
+	saveSession();
+	return true;
 }
 
-// 登出方法
+// 鐧诲嚭鏂规硶
 void UserManager::logout() {
-    if (m_isLoggedIn) {
-        std::cout << "User logged out: " << m_strCurrentUser << std::endl;
-        m_strCurrentUser.clear();
+	if (m_isLoggedIn) {
+		std::cout << "User logged out: " << m_strCurrentUser << std::endl;
+		m_strCurrentUser.clear();
 		m_strCurrentPass.clear();
-        m_isLoggedIn = false;
-        m_isRememberMe = false;
-        clearSession();
-    }
+		m_isLoggedIn = false;
+		m_isRememberMe = false;
+		clearSession();
+	}
 }
 
-// 返回当前用户的登录状态
+// 杩斿洖褰撳墠鐢ㄦ埛鐨勭櫥褰曠姸鎬�
 bool UserManager::isLoggedIn() const {
-    return m_isLoggedIn;
+	return m_isLoggedIn;
 }
 
-// 返回当前用户的记住登录状态
+// 杩斿洖褰撳墠鐢ㄦ埛鐨勮浣忕櫥褰曠姸鎬�
 bool UserManager::isRememberMe() const {
 	return m_isRememberMe;
 }
 
-// 创建新用户,仅超级管理员有权限
+// 鍒涘缓鏂扮敤鎴凤紝浠呰秴绾х鐞嗗憳鏈夋潈闄�
 bool UserManager::createUser(const std::string& username, const std::string& password, UserRole role,
-    std::chrono::minutes timeout, std::chrono::hours expiration) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can create new users." << std::endl;
-        return false;
-    }
+	std::chrono::minutes timeout, std::chrono::hours expiration) {
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can create new users." << std::endl;
+		return false;
+	}
 
-    std::string query = "INSERT INTO users (username, password, role, session_timeout, session_expiration) VALUES ('" +
-        username + "', '" + simpleEncryptDecrypt(password, "BandKey") + "', " + std::to_string(static_cast<int>(role)) + ", " +
-        std::to_string(timeout.count()) + ", " + std::to_string(expiration.count()) + ")";
-    return m_pDB->executeQuery(query);
+	std::string query = "INSERT INTO users (username, password, role, session_timeout, session_expiration) VALUES ('" +
+		username + "', '" + simpleEncryptDecrypt(password, "BandKey") + "', " + std::to_string(static_cast<int>(role)) + ", " +
+		std::to_string(timeout.count()) + ", " + std::to_string(expiration.count()) + ")";
+	return m_pDB->executeQuery(query);
 }
 
-// 删除用户,仅超级管理员有权限,且不能删除自己
+// 鍒犻櫎鐢ㄦ埛锛屼粎瓒呯骇绠$悊鍛樻湁鏉冮檺锛屼笖涓嶈兘鍒犻櫎鑷繁
 bool UserManager::deleteUser(const std::string& username) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can delete users." << std::endl;
-        return false;
-    }
-    if (username == m_strCurrentUser) {
-        std::cerr << "SuperAdmin cannot delete their own account." << std::endl;
-        return false;
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can delete users." << std::endl;
+		return false;
+	}
+	if (username == m_strCurrentUser) {
+		std::cerr << "SuperAdmin cannot delete their own account." << std::endl;
+		return false;
+	}
 
-    std::string query = "DELETE FROM users WHERE username = '" + username + "'";
-    return m_pDB->executeQuery(query);
+	std::string query = "DELETE FROM users WHERE username = '" + username + "'";
+	return m_pDB->executeQuery(query);
 }
 
-// 获取所有用户信息,仅超级管理员有权限
+// 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭紝浠呰秴绾х鐞嗗憳鏈夋潈闄�
 std::vector<std::vector<std::string>> UserManager::getUsers() {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can retrieve user data." << std::endl;
-        return {};
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can retrieve user data." << std::endl;
+		return {};
+	}
 
-    // 查询整个用户表
-    std::string query = "SELECT username, password, role, session_timeout, session_expiration, last_login FROM users";
-    std::vector<std::vector<std::string>> results = m_pDB->fetchResults(query);
-    for (auto& row : results) {
-        row[1] = simpleEncryptDecrypt(row[1], "BandKey");
-    }
+	// 鏌ヨ鏁翠釜鐢ㄦ埛琛�
+	std::string query = "SELECT username, password, role, session_timeout, session_expiration, last_login FROM users";
+	std::vector<std::vector<std::string>> results = m_pDB->fetchResults(query);
+	for (auto& row : results) {
+		row[1] = simpleEncryptDecrypt(row[1], "BandKey");
+	}
 
-    return results;
+	return results;
 }
 
-// 设置整个用户表的数据,仅超级管理员有权限
+// 璁剧疆鏁翠釜鐢ㄦ埛琛ㄧ殑鏁版嵁锛屼粎瓒呯骇绠$悊鍛樻湁鏉冮檺
 bool UserManager::setUsers(const std::vector<std::vector<std::string>>& usersData) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can set user data." << std::endl;
-        return false;
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can set user data." << std::endl;
+		return false;
+	}
 
-    // 清空用户表
-    std::string deleteQuery = "DELETE FROM users";
-    if (!m_pDB->executeQuery(deleteQuery)) {
-        std::cerr << "Failed to clear the users table." << std::endl;
-        return false;
-    }
+	// 娓呯┖鐢ㄦ埛琛�
+	std::string deleteQuery = "DELETE FROM users";
+	if (!m_pDB->executeQuery(deleteQuery)) {
+		std::cerr << "Failed to clear the users table." << std::endl;
+		return false;
+	}
 
-    // 插入新的用户数据
-    for (const auto& user : usersData) {
-        if (user.size() != 6) {
-            std::cerr << "Invalid data format for user. Each user must have 6 fields." << std::endl;
-            return false;
-        }
+	// 鎻掑叆鏂扮殑鐢ㄦ埛鏁版嵁
+	for (const auto& user : usersData) {
+		if (user.size() != 6) {
+			std::cerr << "Invalid data format for user. Each user must have 6 fields." << std::endl;
+			return false;
+		}
 
-        std::string insertQuery = "INSERT INTO users (username, password, role, session_timeout, session_expiration, last_login) VALUES ('" +
-            user[0] + "', '" + simpleEncryptDecrypt(user[1], "BandKey") + "', " + user[2] + ", " + user[3] + ", " + user[4] + ", '" + user[5] + "')";
+		std::string insertQuery = "INSERT INTO users (username, password, role, session_timeout, session_expiration, last_login) VALUES ('" +
+			user[0] + "', '" + simpleEncryptDecrypt(user[1], "BandKey") + "', " + user[2] + ", " + user[3] + ", " + user[4] + ", '" + user[5] + "')";
 
-        if (!m_pDB->executeQuery(insertQuery)) {
-            std::cerr << "Failed to insert user: " << user[0] << std::endl;
-            return false;
-        }
-    }
+		if (!m_pDB->executeQuery(insertQuery)) {
+			std::cerr << "Failed to insert user: " << user[0] << std::endl;
+			return false;
+		}
+	}
 
-    return true;
+	return true;
 }
 
-// 修改用户名,仅超级管理员有权限
+// 淇敼鐢ㄦ埛鍚嶏紝浠呰秴绾х鐞嗗憳鏈夋潈闄�
 bool UserManager::changeUsername(const std::string& username, const std::string& newUsername) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can change usernames." << std::endl;
-        return false;
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can change usernames." << std::endl;
+		return false;
+	}
 
-    std::string query = "UPDATE users SET username = '" + newUsername + "' WHERE username = '" + username + "'";
-    bool success = m_pDB->executeQuery(query);
+	std::string query = "UPDATE users SET username = '" + newUsername + "' WHERE username = '" + username + "'";
+	bool success = m_pDB->executeQuery(query);
 
-    // 如果是当前登录用户修改自己的用户名,更新成员变量并保存会话文件
-    if (success && m_strCurrentUser == username) {
-        m_strCurrentUser = newUsername;
+	// 濡傛灉鏄綋鍓嶇櫥褰曠敤鎴蜂慨鏀硅嚜宸辩殑鐢ㄦ埛鍚嶏紝鏇存柊鎴愬憳鍙橀噺骞朵繚瀛樹細璇濇枃浠�
+	if (success && m_strCurrentUser == username) {
+		m_strCurrentUser = newUsername;
 
-        // 如果“记住密码”已启用,更新会话文件
-        if (m_isRememberMe) {
-            saveSession();
-        }
-    }
-    return success;
+		// 濡傛灉鈥滆浣忓瘑鐮佲�濆凡鍚敤锛屾洿鏂颁細璇濇枃浠�
+		if (m_isRememberMe) {
+			saveSession();
+		}
+	}
+	return success;
 }
 
-// 修改用户密码(仅允许当前用户或超级管理员)
+// 淇敼鐢ㄦ埛瀵嗙爜锛堜粎鍏佽褰撳墠鐢ㄦ埛鎴栬秴绾х鐞嗗憳锛�
 bool UserManager::changePassword(const std::string& username, const std::string& newPassword) {
-    if (username != m_strCurrentUser && m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Permission denied: Only the user or SuperAdmin can change passwords." << std::endl;
-        return false;
-    }
+	if (username != m_strCurrentUser && m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Permission denied: Only the user or SuperAdmin can change passwords." << std::endl;
+		return false;
+	}
 
-    std::string query = "UPDATE users SET password = '" + simpleEncryptDecrypt(newPassword, "BandKey") +
-        "' WHERE username = '" + username + "'";
-    bool success = m_pDB->executeQuery(query);
+	std::string query = "UPDATE users SET password = '" + simpleEncryptDecrypt(newPassword, "BandKey") +
+		"' WHERE username = '" + username + "'";
+	bool success = m_pDB->executeQuery(query);
 
-    // 如果是当前用户修改自己的密码,退出登录并清除会话文件
-    if (success && m_strCurrentUser == username) {
-        logout();
-        std::cout << "Password changed successfully. Please log in again." << std::endl;
-    }
+	// 濡傛灉鏄綋鍓嶇敤鎴蜂慨鏀硅嚜宸辩殑瀵嗙爜锛岄��鍑虹櫥褰曞苟娓呴櫎浼氳瘽鏂囦欢
+	if (success && m_strCurrentUser == username) {
+		logout();
+		std::cout << "Password changed successfully. Please log in again." << std::endl;
+	}
 
-    return success;
+	return success;
 }
 
-// 更改用户角色,仅超级管理员有权限
+// 鏇存敼鐢ㄦ埛瑙掕壊锛屼粎瓒呯骇绠$悊鍛樻湁鏉冮檺
 bool UserManager::changeUserRole(const std::string& username, UserRole newRole) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can change user roles." << std::endl;
-        return false;
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can change user roles." << std::endl;
+		return false;
+	}
 
-    // 防止管理员更改自己的角色
-    if (m_strCurrentUser == username) {
-        std::cerr << "SuperAdmin cannot change their own role." << std::endl;
-        return false;
-    }
+	// 闃叉绠$悊鍛樻洿鏀硅嚜宸辩殑瑙掕壊
+	if (m_strCurrentUser == username) {
+		std::cerr << "SuperAdmin cannot change their own role." << std::endl;
+		return false;
+	}
 
-    std::string query = "UPDATE users SET role = " + std::to_string(static_cast<int>(newRole)) +
-        " WHERE username = '" + username + "'";
-    return m_pDB->executeQuery(query);
+	std::string query = "UPDATE users SET role = " + std::to_string(static_cast<int>(newRole)) +
+		" WHERE username = '" + username + "'";
+	return m_pDB->executeQuery(query);
 }
 
-// 修改用户的 session_timeout,仅超级管理员有权限
+// 淇敼鐢ㄦ埛鐨� session_timeout锛屼粎瓒呯骇绠$悊鍛樻湁鏉冮檺
 bool UserManager::changeUserSessionTimeout(const std::string& username, int newTimeoutMinutes) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can change session timeout." << std::endl;
-        return false;
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can change session timeout." << std::endl;
+		return false;
+	}
 
-    std::string query = "UPDATE users SET session_timeout = " + std::to_string(newTimeoutMinutes) +
-        " WHERE username = '" + username + "'";
-    bool success = m_pDB->executeQuery(query);
-    // 如果是当前登录用户修改自己的超时设置,更新成员变量
-    if (success && m_strCurrentUser == username) {
-        m_tmSessionTimeout = std::chrono::minutes(newTimeoutMinutes);
+	std::string query = "UPDATE users SET session_timeout = " + std::to_string(newTimeoutMinutes) +
+		" WHERE username = '" + username + "'";
+	bool success = m_pDB->executeQuery(query);
+	// 濡傛灉鏄綋鍓嶇櫥褰曠敤鎴蜂慨鏀硅嚜宸辩殑瓒呮椂璁剧疆锛屾洿鏂版垚鍛樺彉閲�
+	if (success && m_strCurrentUser == username) {
+		m_tmSessionTimeout = std::chrono::minutes(newTimeoutMinutes);
 
-        if (m_isRememberMe) {
-            saveSession();
-        }
-    }
-    return success;
+		if (m_isRememberMe) {
+			saveSession();
+		}
+	}
+	return success;
 }
 
-// 修改用户的 session_expiration,仅超级管理员有权限
+// 淇敼鐢ㄦ埛鐨� session_expiration锛屼粎瓒呯骇绠$悊鍛樻湁鏉冮檺
 bool UserManager::changeUserSessionExpiration(const std::string& username, int newExpirationHours) {
-    if (m_enCurrentUserRole != UserRole::SuperAdmin) {
-        std::cerr << "Only SuperAdmin can change session expiration." << std::endl;
-        return false;
-    }
+	if (m_enCurrentUserRole != UserRole::SuperAdmin) {
+		std::cerr << "Only SuperAdmin can change session expiration." << std::endl;
+		return false;
+	}
 
-    std::string query = "UPDATE users SET session_expiration = " + std::to_string(newExpirationHours) +
-        " WHERE username = '" + username + "'";
-    bool success = m_pDB->executeQuery(query);
-    // 如果是当前登录用户修改自己的过期设置,更新成员变量
-    if (success && m_strCurrentUser == username) {
-        m_tmSessionExpiration = std::chrono::hours(newExpirationHours);
+	std::string query = "UPDATE users SET session_expiration = " + std::to_string(newExpirationHours) +
+		" WHERE username = '" + username + "'";
+	bool success = m_pDB->executeQuery(query);
+	// 濡傛灉鏄綋鍓嶇櫥褰曠敤鎴蜂慨鏀硅嚜宸辩殑杩囨湡璁剧疆锛屾洿鏂版垚鍛樺彉閲�
+	if (success && m_strCurrentUser == username) {
+		m_tmSessionExpiration = std::chrono::hours(newExpirationHours);
 
-        if (m_isRememberMe) {
-            saveSession();
-        }
-    }
-    return success;
+		if (m_isRememberMe) {
+			saveSession();
+		}
+	}
+	return success;
 }
 
-// 获取所有用户名称
+// 鑾峰彇鎵�鏈夌敤鎴峰悕绉�
 std::vector<std::string> UserManager::getUsernames() {
-    std::vector<std::string> usernames;
-    std::string query = "SELECT username FROM users";
-    auto results = m_pDB->fetchResults(query);
+	std::vector<std::string> usernames;
+	std::string query = "SELECT username FROM users";
+	auto results = m_pDB->fetchResults(query);
 
-    for (const auto& row : results) {
-        if (!row.empty()) {
-            usernames.push_back(row[0]); // 获取用户名列的值
-        }
-    }
+	for (const auto& row : results) {
+		if (!row.empty()) {
+			usernames.push_back(row[0]); // 鑾峰彇鐢ㄦ埛鍚嶅垪鐨勫��
+		}
+	}
 
-    return usernames;
+	return usernames;
 }
 
-// 获取指定用户名的用户信息
+// 鑾峰彇鎸囧畾鐢ㄦ埛鍚嶇殑鐢ㄦ埛淇℃伅
 std::vector<std::string> UserManager::getUserInfo(const std::string& username)
 {
-    // 构建查询语句
-    std::ostringstream query;
-    query << "SELECT username, password, role, session_timeout, session_expiration, last_login "
-        << "FROM users WHERE username = '" << username << "'";
+	// 鏋勫缓鏌ヨ璇彞
+	std::ostringstream query;
+	query << "SELECT username, password, role, session_timeout, session_expiration, last_login "
+		<< "FROM users WHERE username = '" << username << "'";
 
-    // 执行查询并获取结果
-    auto results = m_pDB->fetchResults(query.str());
-    if (results.empty()) {
-        return {};
-    }
+	// 鎵ц鏌ヨ骞惰幏鍙栫粨鏋�
+	auto results = m_pDB->fetchResults(query.str());
+	if (results.empty()) {
+		return {};
+	}
 
-    // 返回查询到的第一行数据
-    return results[0];
+	// 杩斿洖鏌ヨ鍒扮殑绗竴琛屾暟鎹�
+	return results[0];
 }
 
-// 更新最后活动时间,用于无操作超时检测
+// 鏇存柊鏈�鍚庢椿鍔ㄦ椂闂达紝鐢ㄤ簬鏃犳搷浣滆秴鏃舵娴�
 void UserManager::updateActivityTime() {
-    m_tpLastActivity = std::chrono::system_clock::now();
-    std::cout << "Activity updated at: " << std::chrono::system_clock::to_time_t(m_tpLastActivity) << std::endl;
+	m_tpLastActivity = std::chrono::system_clock::now();
+	std::cout << "Activity updated at: " << std::chrono::system_clock::to_time_t(m_tpLastActivity) << std::endl;
 }
 
-// 设置无操作超时时间
+// 璁剧疆鏃犳搷浣滆秴鏃舵椂闂�
 void UserManager::setSessionTimeout(std::chrono::minutes timeout) {
-    m_tmSessionTimeout = timeout;
+	m_tmSessionTimeout = timeout;
 }
 
-// 检查是否超过无操作超时时间
+// 妫�鏌ユ槸鍚﹁秴杩囨棤鎿嶄綔瓒呮椂鏃堕棿
 bool UserManager::isInactiveTimeout() const {
-    auto now = std::chrono::system_clock::now();
-    auto elapsedSeconds = std::chrono::duration_cast<std::chrono::seconds>(now - m_tpLastActivity).count();
-    return elapsedSeconds > m_tmSessionTimeout.count() * 60;
+	auto now = std::chrono::system_clock::now();
+	auto elapsedSeconds = std::chrono::duration_cast<std::chrono::seconds>(now - m_tpLastActivity).count();
+	return elapsedSeconds > m_tmSessionTimeout.count() * 60;
 }
 
-// 初始化无操作检测,包括设置全局鼠标和键盘钩子
+// 鍒濆鍖栨棤鎿嶄綔妫�娴嬶紝鍖呮嫭璁剧疆鍏ㄥ眬榧犳爣鍜岄敭鐩橀挬瀛�
 void UserManager::initializeIdleDetection(HWND hwnd) {
-    updateActivityTime();
-    m_hMouseHook = SetWindowsHookEx(WH_MOUSE_LL, LowLevelMouseProc, (HINSTANCE) nullptr, 0);
-    m_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, (HINSTANCE) nullptr, 0);
-    ::SetTimer(hwnd, 1, 60000, nullptr);
+	updateActivityTime();
+	m_hMouseHook = SetWindowsHookEx(WH_MOUSE_LL, LowLevelMouseProc, (HINSTANCE) nullptr, 0);
+	m_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, (HINSTANCE) nullptr, 0);
+	::SetTimer(hwnd, 1, 60000, nullptr);
 }
 
-// 终止无操作检测,清除鼠标和键盘钩子
+// 缁堟鏃犳搷浣滄娴嬶紝娓呴櫎榧犳爣鍜岄敭鐩橀挬瀛�
 void UserManager::terminateIdleDetection() {
-    if (m_hMouseHook) {
-        UnhookWindowsHookEx(m_hMouseHook);
-        m_hMouseHook = nullptr;
-    }
-    if (m_hKeyboardHook) {
-        UnhookWindowsHookEx(m_hKeyboardHook);
-        m_hKeyboardHook = nullptr;
-    }
-    ::KillTimer(nullptr, 1);
+	if (m_hMouseHook) {
+		UnhookWindowsHookEx(m_hMouseHook);
+		m_hMouseHook = nullptr;
+	}
+	if (m_hKeyboardHook) {
+		UnhookWindowsHookEx(m_hKeyboardHook);
+		m_hKeyboardHook = nullptr;
+	}
+	::KillTimer(nullptr, 1);
 }
 
-// 获取当前登录用户名
+// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鍚�
 std::string UserManager::getCurrentUser() const {
 	return m_strCurrentUser;
 }
 
-// 修改当前登录用户名
+// 淇敼褰撳墠鐧诲綍鐢ㄦ埛鍚�
 void UserManager::setCurrentUser(const std::string& strName) {
-    m_strCurrentUser = strName;
+	m_strCurrentUser = strName;
 }
 
-// 获取当前登录用户密码
+// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛瀵嗙爜
 std::string UserManager::getCurrentPass() const {
 	return m_strCurrentPass;
 }
 
-// 修改当前登录用户密码
+// 淇敼褰撳墠鐧诲綍鐢ㄦ埛瀵嗙爜
 void UserManager::setCurrentPass(const std::string& strPass) {
-    m_strCurrentPass = strPass;
+	m_strCurrentPass = strPass;
 }
 
-// 获取当前登录用户角色
+// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛瑙掕壊
 UserRole UserManager::getCurrentUserRole() const {
 	return m_enCurrentUserRole;
 }
 
-// 修改当前登录用户角色
+// 淇敼褰撳墠鐧诲綍鐢ㄦ埛瑙掕壊
 void UserManager::setCurrentUserRole(UserRole emRole) {
-    m_enCurrentUserRole = emRole;
+	m_enCurrentUserRole = emRole;
 }
 
-// 获取当前登录用户的无操作超时时间
+// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勬棤鎿嶄綔瓒呮椂鏃堕棿
 std::chrono::minutes UserManager::getSessionTimeout() const {
 	return m_tmSessionTimeout;
 }
 
-// 获取当前登录用户的会话过期时间
+// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勪細璇濊繃鏈熸椂闂�
 std::chrono::hours UserManager::getSessionExpiration() const {
 	return m_tmSessionExpiration;
 }
 
-// 全局鼠标钩子回调,记录活动时间
+// 鍏ㄥ眬榧犳爣閽╁瓙鍥炶皟锛岃褰曟椿鍔ㄦ椂闂�
 LRESULT CALLBACK UserManager::LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam) {
-    if (nCode == HC_ACTION) {
-        UserManager::getInstance().updateActivityTime();
-        std::cout << "Mouse event detected. Activity time updated." << std::endl;
-    }
-    return CallNextHookEx(nullptr, nCode, wParam, lParam);
+	if (nCode == HC_ACTION) {
+		UserManager::getInstance().updateActivityTime();
+		std::cout << "Mouse event detected. Activity time updated." << std::endl;
+	}
+	return CallNextHookEx(nullptr, nCode, wParam, lParam);
 }
 
-// 全局键盘钩子回调,记录活动时间
+// 鍏ㄥ眬閿洏閽╁瓙鍥炶皟锛岃褰曟椿鍔ㄦ椂闂�
 LRESULT CALLBACK UserManager::LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) {
-    if (nCode == HC_ACTION) {
-        UserManager::getInstance().updateActivityTime();
-        std::cout << "Keyboard event detected. Activity time updated." << std::endl;
-    }
-    return CallNextHookEx(nullptr, nCode, wParam, lParam);
+	if (nCode == HC_ACTION) {
+		UserManager::getInstance().updateActivityTime();
+		std::cout << "Keyboard event detected. Activity time updated." << std::endl;
+	}
+	return CallNextHookEx(nullptr, nCode, wParam, lParam);
 }
diff --git a/SourceCode/Bond/Servo/UserManager.h b/SourceCode/Bond/Servo/UserManager.h
index 3e51e6d..cd1f3cc 100644
--- a/SourceCode/Bond/Servo/UserManager.h
+++ b/SourceCode/Bond/Servo/UserManager.h
@@ -1,4 +1,4 @@
-#ifndef USER_MANAGER_H
+锘�#ifndef USER_MANAGER_H
 #define USER_MANAGER_H
 
 #include <string>
@@ -7,126 +7,126 @@
 #include <windows.h>
 #include "Database.h"
 
-// 用户角色定义
+// 鐢ㄦ埛瑙掕壊瀹氫箟
 enum class UserRole {
-    SuperAdmin = 0,   // 超级管理员:系统最高权限,管理所有用户和权限
-    ProcessEngineer,  // 制程工程师:负责工艺制定与优化
-    EquipmentEngineer,// 设备工程师:负责设备维护与技术支持
-    Operator,         // 操作员:执行日常生产操作
-    Unknown           // 未知角色:默认或未识别的角色
+	SuperAdmin = 0,   // 瓒呯骇绠$悊鍛橈細绯荤粺鏈�楂樻潈闄愶紝绠$悊鎵�鏈夌敤鎴峰拰鏉冮檺
+	ProcessEngineer,  // 鍒剁▼宸ョ▼甯堬細璐熻矗宸ヨ壓鍒跺畾涓庝紭鍖�
+	EquipmentEngineer,// 璁惧宸ョ▼甯堬細璐熻矗璁惧缁存姢涓庢妧鏈敮鎸�
+	Operator,         // 鎿嶄綔鍛橈細鎵ц鏃ュ父鐢熶骇鎿嶄綔
+	Unknown           // 鏈煡瑙掕壊锛氶粯璁ゆ垨鏈瘑鍒殑瑙掕壊
 };
 
-// 用户管理类,采用单例模式
+// 鐢ㄦ埛绠$悊绫伙紝閲囩敤鍗曚緥妯″紡
 class UserManager {
 public:
-    static UserManager& getInstance();
+	static UserManager& getInstance();
 
-    UserManager(const UserManager&) = delete;
-    UserManager& operator=(const UserManager&) = delete;
+	UserManager(const UserManager&) = delete;
+	UserManager& operator=(const UserManager&) = delete;
 
-    // 提供数据库连接
-    std::unique_ptr<BL::Database>& getDatabaseInstance();
+	// 鎻愪緵鏁版嵁搴撹繛鎺�
+	std::unique_ptr<BL::Database>& getDatabaseInstance();
 
-    // 用户操作
-    bool login(const std::string& username, const std::string& password, bool rememberMe = false);
-    void logout();
-    bool isLoggedIn() const;
+	// 鐢ㄦ埛鎿嶄綔
+	bool login(const std::string& username, const std::string& password, bool rememberMe = false);
+	void logout();
+	bool isLoggedIn() const;
 	bool isRememberMe() const;
-    bool createUser(const std::string& username, const std::string& password, UserRole role,
-        std::chrono::minutes timeout = std::chrono::minutes(30),
-        std::chrono::hours expiration = std::chrono::hours(72));
-    bool deleteUser(const std::string& username);
-    std::vector<std::vector<std::string>> getUsers();
-    bool setUsers(const std::vector<std::vector<std::string>>& usersData);
-    bool changeUsername(const std::string& username, const std::string& newUsername);
-    bool changePassword(const std::string& username, const std::string& newPassword);
-    bool changeUserRole(const std::string& username, UserRole newRole);
-    bool changeUserSessionTimeout(const std::string& username, int newTimeoutMinutes);
-    bool changeUserSessionExpiration(const std::string& username, int newExpirationHours);
-    std::vector<std::string> getUsernames();
-    std::vector<std::string> getUserInfo(const std::string& username);
+	bool createUser(const std::string& username, const std::string& password, UserRole role,
+		std::chrono::minutes timeout = std::chrono::minutes(30),
+		std::chrono::hours expiration = std::chrono::hours(72));
+	bool deleteUser(const std::string& username);
+	std::vector<std::vector<std::string>> getUsers();
+	bool setUsers(const std::vector<std::vector<std::string>>& usersData);
+	bool changeUsername(const std::string& username, const std::string& newUsername);
+	bool changePassword(const std::string& username, const std::string& newPassword);
+	bool changeUserRole(const std::string& username, UserRole newRole);
+	bool changeUserSessionTimeout(const std::string& username, int newTimeoutMinutes);
+	bool changeUserSessionExpiration(const std::string& username, int newExpirationHours);
+	std::vector<std::string> getUsernames();
+	std::vector<std::string> getUserInfo(const std::string& username);
 
-    // 会话文件操作
-    bool loadSession();     // 从会话文件加载会话信息
-    void saveSession();     // 保存会话信息到文件
-    void clearSession();    // 清除会话文件
+	// 浼氳瘽鏂囦欢鎿嶄綔
+	bool loadSession();     // 浠庝細璇濇枃浠跺姞杞戒細璇濅俊鎭�
+	void saveSession();     // 淇濆瓨浼氳瘽淇℃伅鍒版枃浠�
+	void clearSession();    // 娓呴櫎浼氳瘽鏂囦欢
 
-    // 配置文件夹路径管理
-    static std::string getConfigFolderPath();
-    static std::string getSessionFilePath();
-    static std::string getDatabaseFilePath();
+	// 閰嶇疆鏂囦欢澶硅矾寰勭鐞�
+	static std::string getConfigFolderPath();
+	static std::string getSessionFilePath();
+	static std::string getDatabaseFilePath();
 
-    // 更新最后活动时间(用于无操作超时检测)
-    void updateActivityTime();
+	// 鏇存柊鏈�鍚庢椿鍔ㄦ椂闂达紙鐢ㄤ簬鏃犳搷浣滆秴鏃舵娴嬶級
+	void updateActivityTime();
 
-    // 设置用户的无操作超时时间
-    void setSessionTimeout(std::chrono::minutes timeout);
+	// 璁剧疆鐢ㄦ埛鐨勬棤鎿嶄綔瓒呮椂鏃堕棿
+	void setSessionTimeout(std::chrono::minutes timeout);
 
-    // 检查是否无操作超时
-    bool isInactiveTimeout() const;
+	// 妫�鏌ユ槸鍚︽棤鎿嶄綔瓒呮椂
+	bool isInactiveTimeout() const;
 
-    // 初始化无操作检测(设置全局钩子和定时器)
-    void initializeIdleDetection(HWND hwnd);
+	// 鍒濆鍖栨棤鎿嶄綔妫�娴嬶紙璁剧疆鍏ㄥ眬閽╁瓙鍜屽畾鏃跺櫒锛�
+	void initializeIdleDetection(HWND hwnd);
 
-    // 终止无操作检测(清除钩子和定时器)
-    void terminateIdleDetection();
+	// 缁堟鏃犳搷浣滄娴嬶紙娓呴櫎閽╁瓙鍜屽畾鏃跺櫒锛�
+	void terminateIdleDetection();
 
-	// 获取当前登录用户名
+	// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鍚�
 	std::string getCurrentUser() const;
 
-    // 修改当前登录用户名
-    void setCurrentUser(const std::string& strName);
+	// 淇敼褰撳墠鐧诲綍鐢ㄦ埛鍚�
+	void setCurrentUser(const std::string& strName);
 
-	// 获取当前登录用户密码
+	// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛瀵嗙爜
 	std::string getCurrentPass() const;
 
-    // 修改当前登录用户密码
-    void setCurrentPass(const std::string& strPass);
+	// 淇敼褰撳墠鐧诲綍鐢ㄦ埛瀵嗙爜
+	void setCurrentPass(const std::string& strPass);
 
-	// 获取当前登录用户角色
+	// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛瑙掕壊
 	UserRole getCurrentUserRole() const;
 
-    // 修改当前登录用户角色
-    void setCurrentUserRole(UserRole emRole);
+	// 淇敼褰撳墠鐧诲綍鐢ㄦ埛瑙掕壊
+	void setCurrentUserRole(UserRole emRole);
 
-	// 获取当前登录用户的无操作超时时间
+	// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勬棤鎿嶄綔瓒呮椂鏃堕棿
 	std::chrono::minutes getSessionTimeout() const;
 
-	// 获取当前登录用户的会话过期时间
+	// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鐨勪細璇濊繃鏈熸椂闂�
 	std::chrono::hours getSessionExpiration() const;
 
 private:
-    UserManager();
-    ~UserManager();
+	UserManager();
+	~UserManager();
 
-    // 初始化数据库连接和用户表
-    bool initializeDatabase();
+	// 鍒濆鍖栨暟鎹簱杩炴帴鍜岀敤鎴疯〃
+	bool initializeDatabase();
 
-    // 哈希密码,用于加密用户密码
-    std::string hashPassword(const std::string& password);
+	// 鍝堝笇瀵嗙爜锛岀敤浜庡姞瀵嗙敤鎴峰瘑鐮�
+	std::string hashPassword(const std::string& password);
 
-    // 加密和解密函数
-    std::string simpleEncryptDecrypt(const std::string& data, const std::string& key);
+	// 鍔犲瘑鍜岃В瀵嗗嚱鏁�
+	std::string simpleEncryptDecrypt(const std::string& data, const std::string& key);
 
-    // 键盘和鼠标钩子函数
-    static LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam);
-    static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
+	// 閿洏鍜岄紶鏍囬挬瀛愬嚱鏁�
+	static LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam);
+	static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
 
-    // 属性定义
-    std::string m_strCurrentUser;                     // 当前登录用户名
-    std::string m_strCurrentPass;                     // 当前登录密码
-    UserRole m_enCurrentUserRole;                     // 当前登录用户角色
-    bool m_isLoggedIn;                                // 是否已登录
-    bool m_isRememberMe;                              // 是否记住登录状态
+	// 灞炴�у畾涔�
+	std::string m_strCurrentUser;                     // 褰撳墠鐧诲綍鐢ㄦ埛鍚�
+	std::string m_strCurrentPass;                     // 褰撳墠鐧诲綍瀵嗙爜
+	UserRole m_enCurrentUserRole;                     // 褰撳墠鐧诲綍鐢ㄦ埛瑙掕壊
+	bool m_isLoggedIn;                                // 鏄惁宸茬櫥褰�
+	bool m_isRememberMe;                              // 鏄惁璁颁綇鐧诲綍鐘舵��
 
-    std::chrono::time_point<std::chrono::system_clock> m_tpLastLogin;     // 上次登录时间
-    std::chrono::time_point<std::chrono::system_clock> m_tpLastActivity;  // 最后活动时间
-    std::chrono::minutes m_tmSessionTimeout;          // 无操作超时时间
-    std::chrono::hours m_tmSessionExpiration;         // 会话过期时间
-    HHOOK m_hMouseHook;                               // 鼠标钩子句柄
-    HHOOK m_hKeyboardHook;                            // 键盘钩子句柄
+	std::chrono::time_point<std::chrono::system_clock> m_tpLastLogin;     // 涓婃鐧诲綍鏃堕棿
+	std::chrono::time_point<std::chrono::system_clock> m_tpLastActivity;  // 鏈�鍚庢椿鍔ㄦ椂闂�
+	std::chrono::minutes m_tmSessionTimeout;          // 鏃犳搷浣滆秴鏃舵椂闂�
+	std::chrono::hours m_tmSessionExpiration;         // 浼氳瘽杩囨湡鏃堕棿
+	HHOOK m_hMouseHook;                               // 榧犳爣閽╁瓙鍙ユ焺
+	HHOOK m_hKeyboardHook;                            // 閿洏閽╁瓙鍙ユ焺
 
-    std::unique_ptr<BL::Database> m_pDB;              // 数据库接口
+	std::unique_ptr<BL::Database> m_pDB;              // 鏁版嵁搴撴帴鍙�
 };
 
 #endif // USER_MANAGER_H
\ No newline at end of file

--
Gitblit v1.9.3