From 193c196a8e73211a129e4f2fdf796cb01c725102 Mon Sep 17 00:00:00 2001
From: Laixingyu <xingyu.lai@suwell.cn>
Date: Sun, 10 Dec 2023 14:09:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4mysql=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TreasureFinder.pro         |  3 ---
 mainwindow.cpp             |  8 +++++---
 mainwindow.h               |  3 +++
 ruoyi/ruoyidatamanager.cpp |  2 ++
 widget/addtradedialog.cpp  | 18 ------------------
 widget/logindialog.cpp     |  6 ++++++
 6 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/TreasureFinder.pro b/TreasureFinder.pro
index d63fcd5..f72d3b6 100644
--- a/TreasureFinder.pro
+++ b/TreasureFinder.pro
@@ -1,5 +1,4 @@
 QT       += core gui network
-QT       += sql
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -11,7 +10,6 @@ CONFIG += c++11
 
 SOURCES += \
     basedatamanager.cpp \
-    db/xsqlexcute.cpp \
     main.cpp \
     mainwindow.cpp \
     model/tradetablemodel.cpp \
@@ -22,7 +20,6 @@ SOURCES += \
 
 HEADERS += \
     basedatamanager.h \
-    db/xsqlexcute.h \
     mainwindow.h \
     model/tradetablemodel.h \
     ruoyi/ruoyidatamanager.h \
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5490c15..93e4e10 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,6 +1,5 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include <QSqlDatabase>
 #include <QDebug>
 #include "widget/addtradedialog.h"
 #include "model/tradetablemodel.h"
@@ -13,8 +12,6 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     this->setWindowTitle("mojin");
     InitTradeTable();
-    QStringList dbs = QSqlDatabase::drivers();
-    qDebug() << __FUNCTION__ << dbs;
 }
 
 MainWindow::~MainWindow()
@@ -22,6 +19,11 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::SetUserInfo(UserInfo user)
+{
+    m_UserInfo = user;
+}
+
 void MainWindow::InitTradeTable()
 {
     //    m_pTradesModel = new TradeTableModel(ui->tradeTableView);
diff --git a/mainwindow.h b/mainwindow.h
index bce89f9..389c511 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -2,6 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include "structs.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -16,6 +17,7 @@ class MainWindow : public QMainWindow
 public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
+    void SetUserInfo(UserInfo user);
 
 private:
     void InitTradeTable();
@@ -25,6 +27,7 @@ private slots:
 
 private:
     Ui::MainWindow *ui;
+    UserInfo m_UserInfo;
 //    TradeTableModel* m_pTradesModel;
     QStandardItemModel* m_pTradeStandardModel;
 };
diff --git a/ruoyi/ruoyidatamanager.cpp b/ruoyi/ruoyidatamanager.cpp
index 96b7a00..a972884 100644
--- a/ruoyi/ruoyidatamanager.cpp
+++ b/ruoyi/ruoyidatamanager.cpp
@@ -137,6 +137,7 @@ void RuoyiDataManager::ParseLogin(QNetworkReply *reply)
     if(err != QNetworkReply::NoError)
     {
         qDebug() << "Failed: " << reply->errorString();
+        m_userInfo.token = "";
     }
     else
     {
@@ -154,6 +155,7 @@ void RuoyiDataManager::ParseLogin(QNetworkReply *reply)
         else
         {
             qDebug() << __FUNCTION__ << __LINE__ << jsonError.errorString();
+            m_userInfo.token = "";
         }
     }
 }
diff --git a/widget/addtradedialog.cpp b/widget/addtradedialog.cpp
index ea2f88b..5c99ee3 100644
--- a/widget/addtradedialog.cpp
+++ b/widget/addtradedialog.cpp
@@ -1,7 +1,5 @@
 #include "addtradedialog.h"
 #include "ui_addtradedialog.h"
-#include <QSqlDatabase>
-#include <QSqlError>
 #include <QMessageBox>
 #include <QDebug>
 
@@ -19,22 +17,6 @@ AddTradeDialog::~AddTradeDialog()
 
 void AddTradeDialog::on_pushButton_OK_clicked()
 {
-    QSqlDatabase db = QSqlDatabase::addDatabase("QMYSQL","192");
-    db.setHostName("192.168.0.222");
-    db.setPort(3306);
-    db.setDatabaseName("mojin");
-    db.setUserName("root");
-    db.setPassword("1qazse42W3");
-    bool ret = db.open();
-    if(ret)
-    {
-        QMessageBox::about(this,"OPEN MYSQL","suc");
-    }
-    else
-    {
-        QMessageBox::about(this,"OPEN MYSQL","failed");
-        qDebug() << __FUNCTION__ << db.lastError();
-    }
     this->accept();
 }
 
diff --git a/widget/logindialog.cpp b/widget/logindialog.cpp
index 06594ce..114dcd6 100644
--- a/widget/logindialog.cpp
+++ b/widget/logindialog.cpp
@@ -7,6 +7,7 @@
 #include <QJsonDocument>
 #include <QJsonParseError>
 #include <QJsonObject>
+#include <QMessageBox>
 
 LoginDialog::LoginDialog(QWidget *parent) :
     QDialog(parent),
@@ -37,5 +38,10 @@ void LoginDialog::on_pushButton_login_clicked()
 {
     m_UserInfo = m_UserData.Login(ui->username->text(),ui->password->text(),ui->code->text());
     qDebug() << __FUNCTION__ << " login finished: "<< m_UserInfo.userName << m_UserInfo.token << m_UserInfo.uuid;
+    if(m_UserInfo.token.isEmpty())
+    {
+        QMessageBox::about(this,tr("Login"),tr("Login Error."));
+    }
+    this->accept();
 }