'专家登录'

ExpertClient/EXLoginWidget.cpp

@@ -161,16 +161,17 @@ void EXLoginWidget::slotLogin()
 
     QString account  = m_accLineEdit->text();
     QString password = m_pwLineEdit->text();
-    QFUser user(account, account);
+    QFUser user(account, password);
 
     int code = user.login();
 
     qDebug() << __FUNCTION__ << __LINE__ << "login code:" << account << password << code;
 
     if ((code == QF_CODE_SUCCEEDED || code == QF_CODE_ALREADY_LOGIN) && QFUser::currentUser() != nullptr) {
-        MainWindow *m = new MainWindow(user.projectId.toInt(), this);
-
+        MainWindow *m = new MainWindow(user.projectId.toInt(), nullptr);
+        m->setAttribute(Qt::WA_DeleteOnClose);
         m->show();
+        this->close();
         // this->close();
     } else {
         qDebug() << "-----------失败";

ExpertClient/main.cpp

@@ -46,11 +46,10 @@ int main(int argc, char *argv[])
 
     QIcon icon = QIcon(":/resource/logo.png");
     a.setWindowIcon(icon);
+    EXLoginWidget w;
 
     int roleType = EXConfig::roleType();
-    if (roleType == QFUser::SuperAdmin) {
-    } else {
-        EXLoginWidget w;
+    if (roleType != QFUser::SuperAdmin) {
         // 居中显示窗体
         w.move((QApplication::primaryScreen()->availableGeometry().width() - w.width()) / 2,
                (QApplication::primaryScreen()->availableGeometry().height() - w.height()) / 2);

QFD/dbService/ClassSet.cpp

@@ -205,9 +205,11 @@ int QFUser::login()
     }
 
     QCryptographicHash ch(QCryptographicHash::Md5);
+    qDebug() << "m_rawPassword=" << m_rawPassword;
     QString md5str;
     QByteArray md5bytes = QCryptographicHash::hash(m_rawPassword.toLatin1(), QCryptographicHash::Md5);
     md5str.prepend(md5bytes.toHex());
+    qDebug() << "m_rawPassword=" << md5str;
 
     m_currentUser = new QFUser(userNo, m_rawPassword);
     if (!UserService().QueryUserByNoAndPassword(m_currentUser, userNo, md5str)) {

QFD/dbService/UserService.cpp

@@ -364,7 +364,7 @@ bool UserService::QueryUserByNoAndPassword(QFUser *userInfo, QString userNo, QSt
                                 "t_user_info WHERE user_no = %1 and password = %2")
                                 .arg("'" + userNo + "'")
                                 .arg("'" + password + "'");
-
+    qDebug() << "QueryUserByNoAndPassword---" << selectSql;
     if (query.exec(selectSql)) {
         if (query.next()) {
             if (query.isNull(0) == false) {
@@ -400,6 +400,7 @@ bool UserService::QueryUserByNo(QFUser *userInfo, QString userNo)
                                 "write_time from "
                                 "t_user_info WHERE user_no = %1 ")
                                 .arg("'" + userNo + "'");
+    qDebug() << selectSql << userNo;
 
     if (query.exec(selectSql)) {
         if (query.next()) {

QFD/view/LoginView.cpp

@@ -71,7 +71,7 @@ void LoginView::slotLogin()
     QFUser user(m_loginWidget->account(), m_loginWidget->password());
     int code = user.login();
 
-    qDebug() << __FUNCTION__ << __LINE__ << "login code:" << code;
+    qDebug() << __FUNCTION__ << __LINE__ << account << password << "login code:" << code;
 
     if ((code == QF_CODE_SUCCEEDED || code == QF_CODE_ALREADY_LOGIN) && QFUser::currentUser() != nullptr) {
         m_loginWidget->saveAccountConfig();  // 登录成功后存储登录设置