From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp b/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
index e031a81..3ac5196 100644
--- a/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
@@ -5,7 +5,6 @@
#include "BondEq.h"
#include "afxdialogex.h"
#include "ChangePasswordDlg.h"
-#include "UserManager.h"
// CChangePasswordDlg 瀵硅瘽妗�
@@ -82,6 +81,12 @@
return;
}
+ SystemLogManager& logManager = SystemLogManager::getInstance();
+ if (newPassword.Compare(currentPassword) == 0) {
+ EndDialog(IDCANCEL);
+ return;
+ }
+
#ifdef UNICODE
std::string strUsername = CStringA(username);
std::string strCurrentPassword = CStringA(currentPassword);
@@ -96,12 +101,14 @@
if (userManager.isLoggedIn() && strCurrentPassword.compare(userManager.getCurrentPass()) == 0) {
if (changeUserPassword(userManager, strUsername, strNewPassword)) {
EndDialog(IDOK);
+ logManager.log(SystemLogManager::LogType::Info, "淇敼瀵嗙爜鎴愬姛锛�", strUsername);
}
}
else {
if (userManager.login(strUsername, strCurrentPassword)) {
if (changeUserPassword(userManager, strUsername, strNewPassword)) {
EndDialog(IDOK);
+ logManager.log(SystemLogManager::LogType::Info, "淇敼瀵嗙爜鎴愬姛锛�", strUsername);
}
else {
userManager.logout();
--
Gitblit v1.9.3