From d90938ea5f209cfcb86fafdc3c2422121f9bd3e5 Mon Sep 17 00:00:00 2001
From: 50582 <505822174@qq.com>
Date: Thu, 19 Dec 2019 14:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fxml/ChangePassword.fxml                  |  4 +-
 src/fxml/ChangePasswordSuccessfully.fxml      |  2 +-
 src/fxml/FindPassword.fxml                    |  2 +-
 src/imgzip/LoginSignIn/ChangePassword.java    | 92 ++++++++++++++++++-
 .../LoginSignIn/ChangePasswordController.java | 70 +++++++-------
 .../ChangePasswordSuccessfullyController.java | 13 ---
 src/imgzip/LoginSignIn/CreateAccount.java     | 10 +-
 .../LoginSignIn/FindPasswordController.java   |  2 +-
 src/imgzip/mainpane/PersonalController.java   |  2 +-
 9 files changed, 134 insertions(+), 63 deletions(-)

diff --git a/src/fxml/ChangePassword.fxml b/src/fxml/ChangePassword.fxml
index 96321cb..9dc5c8d 100644
--- a/src/fxml/ChangePassword.fxml
+++ b/src/fxml/ChangePassword.fxml
@@ -56,7 +56,7 @@
           <children>
             <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="418.0" style="-fx-border-style:solid inside;&#10;-fx-border-width:1px;&#10;-fx-border-insets:0;&#10;-fx-border-radius:5;&#10;-fx-border-color:grey;&#10;-fx-background-color:transparent, white, transparent, white;">
               <children>
-                <PasswordField id="password" fx:id="checkPassword" onKeyReleased="#checkPasswordTheSame" prefHeight="38.0" prefWidth="260.0" promptText="Retype the password" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;&#10;" text="" />
+                <PasswordField id="checkpassword" fx:id="checkPassword" onKeyReleased="#checkPasswordTheSame" prefHeight="38.0" prefWidth="260.0" promptText="Retype the password" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;&#10;" text="" />
                 <Label fx:id="checkThePassword" alignment="CENTER" prefHeight="28.0" prefWidth="152.0" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;" text="Password different!" textAlignment="LEFT" textFill="RED">
                   <font>
                     <Font name="System Bold" size="15.0" />
@@ -74,7 +74,7 @@
         </HBox>
         <HBox alignment="CENTER_LEFT" prefHeight="75.0" prefWidth="608.0">
           <children>
-            <Button fx:id="changeThePassword" alignment="CENTER" font="$x2" mnemonicParsing="false" onAction="#upDatePassword" prefHeight="45.0" prefWidth="355.0" style="-fx-background-color: linear-gradient(to bottom,#BEBEBE,#363636);&#10;&#9;-fx-text-alignment: center;&#10;&#9;-fx-text-fill: #fff;&#10;&#9;-fx-border-radius: 8px;&#10;&#9;-fx-background-radius: 8px;&#10;-fx-cursor:HAND;" text="Change the Password">
+            <Button fx:id="changeThePassword" alignment="CENTER" font="$x2" mnemonicParsing="false" prefHeight="45.0" prefWidth="355.0" style="-fx-background-color: linear-gradient(to bottom,#BEBEBE,#363636);&#10;&#9;-fx-text-alignment: center;&#10;&#9;-fx-text-fill: #fff;&#10;&#9;-fx-border-radius: 8px;&#10;&#9;-fx-background-radius: 8px;&#10;-fx-cursor:HAND;" text="Change the Password">
               <HBox.margin>
                 <Insets left="123.5" top="20.0" />
               </HBox.margin>
diff --git a/src/fxml/ChangePasswordSuccessfully.fxml b/src/fxml/ChangePasswordSuccessfully.fxml
index 2533ef2..86d5f56 100644
--- a/src/fxml/ChangePasswordSuccessfully.fxml
+++ b/src/fxml/ChangePasswordSuccessfully.fxml
@@ -49,7 +49,7 @@
         </Separator>
         <HBox alignment="CENTER" prefHeight="75.0" prefWidth="657.0" spacing="60.0">
           <children>
-            <Button id="signUp" fx:id="SignUp" mnemonicParsing="false" onAction="#backToLogin" prefHeight="39.0" prefWidth="206.0" style="-fx-background-color: linear-gradient(to bottom,#BEBEBE,#363636);&#10;&#9;-fx-text-alignment: center;&#10;&#9;-fx-text-fill: #fff;&#10;&#9;-fx-border-radius: 8px;&#10;&#9;-fx-background-radius: 8px;&#10;-fx-cursor:HAND;" text="Sign up now!">
+            <Button id="signUp" fx:id="SignUp" mnemonicParsing="false" prefHeight="39.0" prefWidth="259.0" style="-fx-background-color: linear-gradient(to bottom,#BEBEBE,#363636);&#10;&#9;-fx-text-alignment: center;&#10;&#9;-fx-text-fill: #fff;&#10;&#9;-fx-border-radius: 8px;&#10;&#9;-fx-background-radius: 8px;&#10;-fx-cursor:HAND;" text="Sign up now!">
               <font>
                 <Font name="Arial Black" size="17.0" />
               </font>
diff --git a/src/fxml/FindPassword.fxml b/src/fxml/FindPassword.fxml
index 4f57a0d..8020170 100644
--- a/src/fxml/FindPassword.fxml
+++ b/src/fxml/FindPassword.fxml
@@ -17,7 +17,7 @@
           <children>
             <ImageView fitHeight="130.00000762939453" fitWidth="202.37590407375538" pickOnBounds="true" preserveRatio="true" style="-">
               <image>
-                <Image url="@../res/icon/think face.png" />
+                <Image url="@../res/icon/think%20face.png" />
               </image>
               <HBox.margin>
                 <Insets top="5.0" />
diff --git a/src/imgzip/LoginSignIn/ChangePassword.java b/src/imgzip/LoginSignIn/ChangePassword.java
index 897058a..4f9e2e0 100644
--- a/src/imgzip/LoginSignIn/ChangePassword.java
+++ b/src/imgzip/LoginSignIn/ChangePassword.java
@@ -1,12 +1,18 @@
 package imgzip.LoginSignIn;
 
+import imgzip.mainpane.Pane_sceenbeginner;
+import imgzip.LoginSignIn.ChangePasswordController;
+import imgzip.mainpane.Personal;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
 import javafx.stage.Stage;
 
+import java.sql.ResultSet;
+
 /**
  @Author:   肖尧
  @Date: 2019.12.12
@@ -16,14 +22,49 @@ import javafx.stage.Stage;
 public class ChangePassword {
 
 
-    public ChangePassword(){
+    public ChangePassword(int judgeIsLogined){
 
         try {
             Parent root = FXMLLoader.load(getClass().getResource("/fxml/ChangePassword.fxml"));
 
+            PasswordField checkPassword = (PasswordField)root.lookup("#checkpassword");
             Button change = (Button)root.lookup("#changeThePassword");
             change.setDisable(true);
 
+            change.setOnAction(e1->{
+
+                String a = GlobalStringManager.getAccount();
+                DataBaseController changeInstruction = new DataBaseController();
+                ResultSet rs = null;
+
+                try{
+
+                    String encryptedPassword = HashUtil.hash(checkPassword.getText());
+                    String currentInstruction = "update login set pwd = " + "'" + encryptedPassword + "'" + "where userName = "+ "'" + a.trim() + "'";
+                    changeInstruction.queryUpdate(currentInstruction);
+
+                    String currentInstruction2 = "SELECT pwd FROM login WHERE userName=" + "'" + a.trim() + "'";
+                    rs = changeInstruction.queryExcecute(currentInstruction2);
+
+                    if(rs.next()){
+
+                        Stage stage = (Stage)checkPassword.getScene().getWindow();
+                        new ChangePasswordSuccessfully(judgeIsLogined);
+                        stage.close();
+                    }else {
+                        System.out.println("123");
+                    }
+
+                }catch (Exception e){
+                    e.printStackTrace();
+
+                }finally {
+                    changeInstruction.close();
+
+                }
+
+            });
+
             Label different = (Label)root.lookup("#checkThePassword");
             different.setVisible(false);
 
@@ -32,8 +73,14 @@ public class ChangePassword {
             primaryStage.setScene(new Scene(root, 607, 500));
             primaryStage.show();
 
+
+
             primaryStage.setOnCloseRequest(e->{
-                new LoginBeginner();
+                if(judgeIsLogined == 0){
+                    new LoginBeginner();
+                }else if(judgeIsLogined == 1){
+                    new Pane_sceenbeginner();
+                }
             });
 
         }catch (Exception e){
@@ -41,6 +88,12 @@ public class ChangePassword {
         }
 
     }
+
+
+    public void upDatePassword(){
+
+
+    }
 }
 
 /**
@@ -52,14 +105,47 @@ public class ChangePassword {
 
 class ChangePasswordSuccessfully{
 
-    public ChangePasswordSuccessfully(){
+    public ChangePasswordSuccessfully(int judgeIsLogined){
         try {
             Parent root = FXMLLoader.load(getClass().getResource("/fxml/ChangePasswordSuccessfully.fxml"));
+            Button SignUp = (Button)root.lookup("#signUp");
+
+            if (judgeIsLogined == 0){
+                SignUp.setText("Sign up now!");
+                SignUp.setOnAction( e->{
+
+                    Stage stage = (Stage) SignUp.getScene().getWindow();
+                    new LoginBeginner();
+                    stage.close();
+
+                });
+            }else {
+                SignUp.setText("Back to HomePage!");
+                SignUp.setOnAction( e->{
+
+                    Stage stage = (Stage) SignUp.getScene().getWindow();
+                    new Personal();
+                    stage.close();
+                });
+            }
+
+
             Stage primaryStage = new Stage();
             primaryStage.setTitle("Verify your ID");
             primaryStage.setScene(new Scene(root, 638, 400));
             primaryStage.show();
 
+            if (judgeIsLogined == 0){
+                primaryStage.setOnCloseRequest(e->{
+                    new LoginBeginner();
+                });
+            }else {
+                primaryStage.setOnCloseRequest(e->{
+                    new Pane_sceenbeginner();
+                });
+            }
+
+
         }catch (Exception e){
             e.printStackTrace();
         }
diff --git a/src/imgzip/LoginSignIn/ChangePasswordController.java b/src/imgzip/LoginSignIn/ChangePasswordController.java
index a70edc1..d1d7186 100644
--- a/src/imgzip/LoginSignIn/ChangePasswordController.java
+++ b/src/imgzip/LoginSignIn/ChangePasswordController.java
@@ -30,41 +30,41 @@ public class ChangePasswordController {
      * 点击按钮后，更改密码，并检查是否更改成功。
      */
 
-    public void upDatePassword(){
-
-        String a = GlobalStringManager.getAccount();
-        DataBaseController changeInstruction = new DataBaseController();
-        ResultSet rs = null;
-
-        try{
-
-            String encryptedPassword = HashUtil.hash(checkPassword.getText());
-            String currentInstruction = "update login set pwd = " + "'" + encryptedPassword + "'" + "where userName = "+ "'" + a.trim() + "'";
-            changeInstruction.queryUpdate(currentInstruction);
-
-            String currentInstruction2 = "SELECT pwd FROM login WHERE userName=" + "'" + a.trim() + "'";
-            rs = changeInstruction.queryExcecute(currentInstruction2);
-
-            if(rs.next()){
-
-                Stage stage = (Stage) password.getScene().getWindow();
-                new ChangePasswordSuccessfully();
-                stage.close();
-            }else {
-
-
-                System.out.println("123");
-            }
-
-
-        }catch (Exception e){
-            e.printStackTrace();
-
-        }finally {
-            changeInstruction.close();
-
-        }
-    }
+//    public void upDatePassword(){
+//
+//        String a = GlobalStringManager.getAccount();
+//        DataBaseController changeInstruction = new DataBaseController();
+//        ResultSet rs = null;
+//
+//        try{
+//
+//            String encryptedPassword = HashUtil.hash(checkPassword.getText());
+//            String currentInstruction = "update login set pwd = " + "'" + encryptedPassword + "'" + "where userName = "+ "'" + a.trim() + "'";
+//            changeInstruction.queryUpdate(currentInstruction);
+//
+//            String currentInstruction2 = "SELECT pwd FROM login WHERE userName=" + "'" + a.trim() + "'";
+//            rs = changeInstruction.queryExcecute(currentInstruction2);
+//
+//            if(rs.next()){
+//
+//                Stage stage = (Stage) password.getScene().getWindow();
+//                new ChangePasswordSuccessfully();
+//                stage.close();
+//            }else {
+//
+//
+//                System.out.println("123");
+//            }
+//
+//
+//        }catch (Exception e){
+//            e.printStackTrace();
+//
+//        }finally {
+//            changeInstruction.close();
+//
+//        }
+//    }
 
     /**
      * 检查第一次输入的密码和第二次输入的密码是否相同，以及两个密码框是否为空。
diff --git a/src/imgzip/LoginSignIn/ChangePasswordSuccessfullyController.java b/src/imgzip/LoginSignIn/ChangePasswordSuccessfullyController.java
index 0d177f0..9965c2f 100644
--- a/src/imgzip/LoginSignIn/ChangePasswordSuccessfullyController.java
+++ b/src/imgzip/LoginSignIn/ChangePasswordSuccessfullyController.java
@@ -10,17 +10,4 @@ import javafx.stage.Stage;
  */
 public class ChangePasswordSuccessfullyController {
 
-    @FXML
-    Button SignUp = new Button();
-
-
-    /**
-     * 返回登录页面
-     */
-    public void backToLogin(){
-        Stage stage = (Stage) SignUp.getScene().getWindow();
-        new LoginBeginner();
-        stage.close();
-    }
-
 }
diff --git a/src/imgzip/LoginSignIn/CreateAccount.java b/src/imgzip/LoginSignIn/CreateAccount.java
index bdb8693..0be0fc8 100644
--- a/src/imgzip/LoginSignIn/CreateAccount.java
+++ b/src/imgzip/LoginSignIn/CreateAccount.java
@@ -192,20 +192,15 @@ public class CreateAccount {
                                         createAccount.setDisable(false);
 
                                     }
-
                                 }
-
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
 
                         } finally {
                             createAccountInstruction.close();
-
                         }
-
                     }else{
-
                          if("Already taken!".equals(already2.getText())){
                              already2.setText("Invalid email!");
                          }
@@ -258,7 +253,7 @@ public class CreateAccount {
             primaryStage.show();
 
             primaryStage.setOnCloseRequest(e->{
-                new LoginBeginner();
+                new Pane_sceenbeginner();
             });
         }catch (Exception e){
             e.printStackTrace();
@@ -282,6 +277,9 @@ public class CreateAccount {
         return isMatched;
     }
 
+    /**
+     * 检查账号格式是否正确.
+     */
     public boolean checkIfIsAccount(String account){
 
         String check = "^[a-zA-Z0-9_]{4,15}$";
diff --git a/src/imgzip/LoginSignIn/FindPasswordController.java b/src/imgzip/LoginSignIn/FindPasswordController.java
index 45f1e4d..d6c7bcc 100644
--- a/src/imgzip/LoginSignIn/FindPasswordController.java
+++ b/src/imgzip/LoginSignIn/FindPasswordController.java
@@ -82,7 +82,7 @@ public class FindPasswordController {
             if(rs.getString(1).equals(email.getText())){
 
                 GlobalStringManager.setAccount(account.getText());
-                new ChangePassword();
+                new ChangePassword(0);
                 Stage stage = (Stage)account.getScene().getWindow();
                 stage.close();
 
diff --git a/src/imgzip/mainpane/PersonalController.java b/src/imgzip/mainpane/PersonalController.java
index 71d91b5..74d7d30 100644
--- a/src/imgzip/mainpane/PersonalController.java
+++ b/src/imgzip/mainpane/PersonalController.java
@@ -100,7 +100,7 @@ public class PersonalController implements Initializable {
          修改密码
          */
         changepw.setOnAction(e -> {
-            new ChangePassword();
+            new ChangePassword(1);
             Stage stage = (Stage)changepw.getScene().getWindow();
             stage.close();
         });
-- 
Gitee