diff --git a/LibManageSystem_Sever/usermanage.cpp b/LibManageSystem_Sever/usermanage.cpp
index f7fc2e70fa114a24a5050b10e4ee73b36bf064f5..bdca3e9901715a3a67afa33990b0db3ca95adc07 100644
--- a/LibManageSystem_Sever/usermanage.cpp
+++ b/LibManageSystem_Sever/usermanage.cpp
@@ -285,7 +285,9 @@ void UserManage::on_appoBtn_clicked()
 {
     QString account=ui->AcolineEdit->text().trimmed();
     QString appointed=ui->appointedbookname->text().trimmed();
-    if(!appointed.isEmpty())
+    QRegularExpression rgl("([0-9]+)([-])(.+)");
+    QRegularExpressionMatch match = rgl.match(appointed);
+    if(!appointed.isEmpty() && match.hasMatch())
     {
         int id=(appointed.mid(0,appointed.indexOf("-"))).toInt();
         int i=db->Appoint(id,account);
diff --git a/LibManageSystem_Sever/widget.cpp b/LibManageSystem_Sever/widget.cpp
index 2869426f5585f3e86026352f935181456eba289e..0382aae4f2770ca3b44ff5160c6e931080f991bf 100644
--- a/LibManageSystem_Sever/widget.cpp
+++ b/LibManageSystem_Sever/widget.cpp
@@ -31,7 +31,7 @@ Widget::Widget(QWidget *parent) :
     ui->stackedWidget->addWidget(manageWidget);
     ui->stackedWidget->addWidget(loginWidget);
 
-    ui->stackedWidget->setCurrentWidget(manageWidget);
+    ui->stackedWidget->setCurrentWidget(loginWidget);
 
     connect(loginWidget,&MainWindow::open_managewin,[=](){
         ui->stackedWidget->setCurrentWidget(manageWidget);
diff --git a/LibManagementSystem/borrow.cpp b/LibManagementSystem/borrow.cpp
index 05d79e71a1f979d8f03823c038013513306c4d3b..48655704a2e75a6d7e9976495068f1628153aea4 100644
--- a/LibManagementSystem/borrow.cpp
+++ b/LibManagementSystem/borrow.cpp
@@ -53,6 +53,24 @@ void borrow::on_enter_btn_clicked()
         QByteArray msg;
         char t = stopChar;
         msg += "BORROW" + ui->no_edit->text().toStdString() + t + user->account.toStdString();
+        if(borbookcut(user->appointedbook,1) == ui->name_edit->text())
+        {
+            QStringMatcher match("预约");
+            int re = QMessageBox::question(this,"提示","此书为您预约的书籍，是否取消预约并完成借阅？"
+                                           ,QMessageBox::Yes|QMessageBox::No);
+            switch(re){
+            case QMessageBox::Yes:
+                emit send_app(msg);
+                if(match.indexIn(user->message) != -1){
+                    user->message = "";
+                }
+                return;
+
+            default:
+                return;
+            }
+        }
+
         emit send_enter(msg);
 
     }
diff --git a/LibManagementSystem/infoedit.cpp b/LibManagementSystem/infoedit.cpp
index 856c7f31287ee208b57c1d57ef19ce28397383e6..22a59637f72672341c0c5c854e8a80f52ef26451 100644
--- a/LibManagementSystem/infoedit.cpp
+++ b/LibManagementSystem/infoedit.cpp
@@ -128,10 +128,11 @@ void infoEdit::on_enter_clicked()
         box->setAttribute(Qt::WA_DeleteOnClose);
         return;
     }
-
+    QRegularExpression rgl("(.+)([@])(.+)([.])(.+)");
+    QRegularExpressionMatch match = rgl.match(mail);
     int is_at;
     is_at = mail.indexOf('@');
-    if(is_at == -1){
+    if(is_at == -1 || !match.hasMatch()){
         QMessageBox* box = new QMessageBox(this);
         box->setIcon(QMessageBox::Critical);
         box->setWindowTitle("修改失败");
diff --git a/LibManagementSystem/regis.cpp b/LibManagementSystem/regis.cpp
index 73f02d37efa74fcd97fb8dd2c04e7270ebec33db..3d8190b23aa9064ec8d4f020331a3efb50fd94f4 100644
--- a/LibManagementSystem/regis.cpp
+++ b/LibManagementSystem/regis.cpp
@@ -27,7 +27,7 @@ regis::regis(QDialog *parent) :
     ui->inacc->setValidator(new QRegularExpressionValidator(regExp5,this));
     ui->inacc->setPlaceholderText("输入您的账号,之后不可更改");
     //密码
-    QRegularExpression regExp4("[a-zA-Z0-9.@#/?!-%]");
+    QRegularExpression regExp4("[a-zA-Z0-9.@#/?!-%]+");
     ui->inpass->setValidator(new QRegularExpressionValidator(regExp4,this));
     ui->inrepa->setValidator(new QRegularExpressionValidator(regExp4,this));
     ui->inpass->setPlaceholderText("输入您的密码,至少6位");
@@ -72,9 +72,11 @@ void regis::on_confirm_clicked()
         box->setAttribute(Qt::WA_DeleteOnClose);
         return;
     }
+    QRegularExpression rgl("(.+)([@])([^.]+)([.])(.+)");
+    QRegularExpressionMatch match = rgl.match(mail);
     int is_at;
     is_at = mail.indexOf('@');
-    if(is_at == -1){
+    if(is_at == -1 || !match.hasMatch()){
         QMessageBox* box = new QMessageBox(this);
         box->setIcon(QMessageBox::Critical);
         box->setWindowTitle("注册失败");