From 62f647ecbcc9e6ef20aaa909a4d6a2aadc5a2935 Mon Sep 17 00:00:00 2001
From: 50582 <505822174@qq.com>
Date: Wed, 18 Dec 2019 23:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ID=E5=92=8C=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E7=B1=BB=20=E6=96=B0=E5=A2=9E=E5=93=88?=
 =?UTF-8?q?=E5=B8=8C=E5=8A=A0=E5=AF=86=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fxml/CreateAccount.fxml                   |  59 +++++----
 .../LoginSignIn/ChangePasswordController.java |   3 +-
 src/imgzip/LoginSignIn/CreateAccount.java     |  89 ++++++++++++--
 .../LoginSignIn/CreateAccountController.java  |  19 ++-
 .../LoginSignIn/FindPasswordController.java   |  12 ++
 .../LoginSignIn/GlobalStringManager.java      |  18 +++
 src/imgzip/LoginSignIn/HashUtil.java          | 113 ++++++++++++++++++
 src/imgzip/LoginSignIn/Login.java             |  10 ++
 src/imgzip/LoginSignIn/LoginBeginner.java     |  13 ++
 src/imgzip/LoginSignIn/LoginController.java   |   5 +-
 txtFile/RememberAccount&Password.txt          |   2 +-
 11 files changed, 286 insertions(+), 57 deletions(-)
 create mode 100644 src/imgzip/LoginSignIn/HashUtil.java

diff --git a/src/fxml/CreateAccount.fxml b/src/fxml/CreateAccount.fxml
index b273d79..ac2d522 100644
--- a/src/fxml/CreateAccount.fxml
+++ b/src/fxml/CreateAccount.fxml
@@ -10,9 +10,9 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 
-<AnchorPane prefHeight="633.0" prefWidth="607.0000999999975" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="imgzip.LoginSignIn.CreateAccountController">
+<AnchorPane prefHeight="633.0" prefWidth="637.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="imgzip.LoginSignIn.CreateAccountController">
   <children>
-    <VBox layoutX="-2.0" layoutY="1.0" prefHeight="633.0" prefWidth="601.0">
+    <VBox layoutX="-2.0" layoutY="1.0" prefHeight="633.0" prefWidth="637.0">
       <children>
         <HBox alignment="CENTER" minHeight="130.0" prefHeight="135.0" prefWidth="601.0">
           <children>
@@ -30,30 +30,30 @@
           <children>
             <Label text="CREATE AN ACCOUNT">
               <font>
-                <Font name="Arial Black" size="33.0" />
+                <Font name="Arial Black" size="39.0" />
               </font>
             </Label>
           </children>
         </HBox>
         <VBox alignment="TOP_LEFT" prefHeight="426.0" prefWidth="601.0">
           <children>
-            <HBox alignment="CENTER_LEFT" prefHeight="45.0" prefWidth="588.0001220703125" spacing="5.0">
+            <HBox alignment="CENTER" prefHeight="45.0" prefWidth="588.0001220703125" spacing="5.0">
               <children>
-                <HBox id="AccountBox" alignment="CENTER_LEFT" prefHeight="36.0" prefWidth="397.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;&#10;&#10;&#10;&#10;&#10;">
+                <HBox id="AccountBox" alignment="CENTER_LEFT" prefHeight="36.0" prefWidth="437.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;&#10;&#10;&#10;&#10;&#10;">
                   <children>
-                    <TextField fx:id="userName" prefHeight="36.0" prefWidth="260.0" promptText="UserName ( Not Empty!)" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;" styleClass="null">
+                    <TextField fx:id="userName" prefHeight="36.0" prefWidth="290.0" promptText="Length:4-15,Letters&amp;numbers_" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;" styleClass="null" text="">
                       <HBox.margin>
-                        <Insets />
+                        <Insets fx:id="x1" />
                       </HBox.margin>
                     </TextField>
-                    <Label id="Al" fx:id="already" alignment="CENTER" prefHeight="31.0" prefWidth="124.0" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;" text="Already taken!" textAlignment="LEFT" textFill="RED">
+                    <Label id="Al" fx:id="already" alignment="CENTER" prefHeight="31.0" prefWidth="137.0" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;" text="Already taken!" textAlignment="LEFT" textFill="RED">
                       <font>
                         <Font name="Arial Black" size="15.0" fx:id="x3" />
                       </font>
                     </Label>
                   </children>
                   <HBox.margin>
-                    <Insets left="103.5" fx:id="x1" />
+                    <Insets fx:id="x1" />
                   </HBox.margin>
                 </HBox>
               </children>
@@ -61,49 +61,45 @@
                 <Insets top="5.0" />
               </VBox.margin>
             </HBox>
-            <HBox alignment="CENTER_LEFT" prefHeight="60.0" prefWidth="601.0" spacing="19.0">
+            <HBox alignment="CENTER" prefHeight="60.0" prefWidth="601.0" spacing="19.0">
               <children>
-                <PasswordField fx:id="passWord" prefHeight="45.0" prefWidth="397.0" promptText="Password" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-border-style:solid inside;&#10;-fx-font-size:18px;&#10;-fx-border-width:1px;&#10;-fx-border-insets:2;&#10;-fx-border-radius:5;&#10;-fx-border-color:grey;&#10;&#10;&#10;&#10;">
-                  <HBox.margin>
-                    <Insets left="103.5" fx:id="5" />
-                  </HBox.margin>
-                </PasswordField>
+                <PasswordField fx:id="passWord" prefHeight="45.0" prefWidth="437.0" promptText="password" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-border-style:solid inside;&#10;-fx-font-size:18px;&#10;-fx-border-width:1px;&#10;-fx-border-insets:2;&#10;-fx-border-radius:5;&#10;-fx-border-color:grey;&#10;&#10;&#10;&#10;" HBox.margin="$x1" />
               </children>
               <VBox.margin>
                 <Insets top="10.0" fx:id="x2" />
               </VBox.margin>
             </HBox>
-            <HBox alignment="CENTER_LEFT" prefHeight="45.0" prefWidth="601.0" spacing="47.0" VBox.margin="$x2">
+            <HBox alignment="CENTER" prefHeight="45.0" prefWidth="601.0" spacing="47.0" VBox.margin="$x2">
               <children>
-                <HBox alignment="CENTER_LEFT" prefHeight="45.0" prefWidth="397.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;">
+                <HBox alignment="CENTER_LEFT" prefHeight="45.0" prefWidth="437.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>
-                    <TextField fx:id="email" prefHeight="40.0" prefWidth="260.0" promptText="Email ( Not Empty!)" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;&#10;">
+                    <TextField fx:id="email" prefHeight="40.0" prefWidth="290.0" promptText="Email(Not Empty)!" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;&#10;">
                       <HBox.margin>
-                        <Insets />
+                        <Insets fx:id="x1" />
                       </HBox.margin>
                     </TextField>
                     <Label id="Al2" fx:id="already2" alignment="CENTER" font="$x3" prefHeight="31.0" prefWidth="136.00009999999747" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;" text="Already taken!" textAlignment="LEFT" textFill="RED" />
                   </children>
                   <HBox.margin>
-                    <Insets left="103.5" fx:id="2" />
+                    <Insets fx:id="x1" />
                   </HBox.margin>
                 </HBox>
               </children>
             </HBox>
-            <HBox alignment="CENTER_LEFT" prefHeight="60.0" prefWidth="601.0" spacing="10.0" VBox.margin="$x2">
+            <HBox alignment="CENTER" prefHeight="60.0" prefWidth="601.0" spacing="10.0" VBox.margin="$x2">
               <children>
-                <TextField fx:id="telephone" prefHeight="40.0" prefWidth="397.0" promptText="Telephone" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-border-style:solid inside;&#10;-fx-font-size:18px;&#10;-fx-border-width:1px;&#10;-fx-border-insets:0;&#10;-fx-border-radius:5;&#10;-fx-border-color:grey;">
+                <TextField fx:id="telephone" prefHeight="40.0" prefWidth="437.0" promptText="Telephone" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-border-style:solid inside;&#10;-fx-font-size:18px;&#10;-fx-border-width:1px;&#10;-fx-border-insets:0;&#10;-fx-border-radius:5;&#10;-fx-border-color:grey;">
                   <HBox.margin>
-                    <Insets left="103.5" fx:id="3" />
+                    <Insets fx:id="x1" />
                   </HBox.margin>
                 </TextField>
               </children>
             </HBox>
-            <HBox alignment="CENTER_LEFT" prefHeight="36.0" prefWidth="601.0">
+            <HBox alignment="CENTER" prefHeight="36.0" prefWidth="601.0">
               <children>
                 <CheckBox fx:id="agree" alignment="CENTER_LEFT" contentDisplay="RIGHT" font="$x3" mnemonicParsing="false" onAction="#checkIfSelectedPrivacy" prefWidth="269.0" text="I have read and agree to the" textAlignment="LEFT" underline="false" wrapText="false">
                   <HBox.margin>
-                    <Insets left="103.5" fx:id="1" />
+                    <Insets left="25.0" />
                   </HBox.margin>
                 </CheckBox>
                 <Hyperlink font="$x3" onAction="#openService" text="terms of services">
@@ -116,11 +112,14 @@
                 <Insets top="15.0" />
               </VBox.margin>
             </HBox>
-            <HBox alignment="CENTER_LEFT" prefHeight="45.0" prefWidth="601.0">
+            <HBox alignment="CENTER" prefHeight="45.0" prefWidth="601.0">
               <children>
-                <Button fx:id="createAccount" font="$x3" mnemonicParsing="false" onAction="#createAccount" prefHeight="36.0" prefWidth="391.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;&#10;" text="CREATE ACCOUNT">
+                <Button fx:id="createAccount" mnemonicParsing="false" onAction="#createAccount" prefHeight="36.0" prefWidth="421.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;&#10;" text="CREATE ACCOUNT">
+                  <font>
+                    <Font name="Arial Black" size="18.0" />
+                  </font>
                   <HBox.margin>
-                    <Insets left="103.5" fx:id="4" />
+                    <Insets fx:id="x1" />
                   </HBox.margin>
                 </Button>
               </children>
@@ -128,7 +127,7 @@
                 <Insets top="17.0" />
               </VBox.margin>
             </HBox>
-            <HBox alignment="BOTTOM_CENTER" prefHeight="40.0" prefWidth="601.0">
+            <HBox alignment="CENTER" prefHeight="40.0" prefWidth="601.0">
               <children>
                 <Hyperlink fx:id="privacy" onAction="#openPrivacy" text="Privacy Policy">
                   <font>
@@ -137,7 +136,7 @@
                 </Hyperlink>
               </children>
             </HBox>
-            <HBox alignment="BOTTOM_CENTER" prefHeight="40.0" prefWidth="601.0" spacing="5.0">
+            <HBox alignment="CENTER" prefHeight="40.0" prefWidth="601.0" spacing="5.0">
               <children>
                 <Label font="$x3" text="Already had an Account?" />
                 <Hyperlink fx:id="signIn" font="$x3" onAction="#backToLogin" text="Sign In" />
diff --git a/src/imgzip/LoginSignIn/ChangePasswordController.java b/src/imgzip/LoginSignIn/ChangePasswordController.java
index 14f6803..a70edc1 100644
--- a/src/imgzip/LoginSignIn/ChangePasswordController.java
+++ b/src/imgzip/LoginSignIn/ChangePasswordController.java
@@ -38,7 +38,8 @@ public class ChangePasswordController {
 
         try{
 
-            String currentInstruction = "update login set pwd = " + "'" + checkPassword.getText().trim() + "'" + "where userName = "+ "'" + a.trim() + "'";
+            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() + "'";
diff --git a/src/imgzip/LoginSignIn/CreateAccount.java b/src/imgzip/LoginSignIn/CreateAccount.java
index 0d61947..875a595 100644
--- a/src/imgzip/LoginSignIn/CreateAccount.java
+++ b/src/imgzip/LoginSignIn/CreateAccount.java
@@ -36,27 +36,35 @@ public class CreateAccount {
             Button createAccount = (Button)root.lookup("#createAccount");
             TextField userName = (TextField)root.lookup("#userName");
             TextField email = (TextField)root.lookup("#email");
+            TextField password = (TextField)root.lookup("#passWord");
             CheckBox agree = (CheckBox)root.lookup("#agree");
 
             already.setVisible(false);
             already2.setVisible(false);
             createAccount.setDisable(true);
+
+
+
             /**
              * change方法：当account输入框失去/得到焦点时，检查一次是否与数据库中的某个账号重复
              * 保证账号的唯一性。
              */
-
-
             userName.focusedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
 
-                    if("".equals(userName.getText())){
+                    if(checkIfIsAccount(userName.getText())){
+
+                        if("Invalid account!".equals(already.getText())){
+                            already.setText("Already taken!");
+                        }
+
+                        if (already.isVisible() || "".equals(userName.getText())){
+                            already.setVisible(false);
+                        }
 
-                    }else {
                         DataBaseController createAccountInstruction = new DataBaseController();
                         ResultSet rs = null;
-                        ResultSet rs2 = null;
 
                         try {
                             /**
@@ -90,36 +98,58 @@ public class CreateAccount {
                                     judgeAccountExists = false;
                                     already.setVisible(false);
 
-                                    if(!judgeEmialexist && agree.isSelected()){
+                                    if(!judgeEmialexist && agree.isSelected() &&!"".equals(password.getText())){
                                         createAccount.setDisable(false);
-
                                     }
-
                                 }
-
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
                         } finally {
                             createAccountInstruction.close();
                         }
+
+                    }else {
+
+                        if("Already taken!".equals(already.getText())){
+                            already.setText("Invalid account!");
+                        }
+
+                        if("".equals(userName.getText())){
+                            already.setVisible(false);
+                            if(!createAccount.isDisable()){
+                                createAccount.setDisable(true);
+                            }
+
+                        }else {
+
+                            if (!already.isVisible()){
+                                already.setVisible(true);
+                            }
+
+                            if (!createAccount.isDisable()){
+                                createAccount.setDisable(true);
+                            }
+                        }
                     }
                 }
             });
 
+
+
+
             /**
                 email的change方法：
                 当email输入框失去\获得焦点时，检查email框输入的值是否符合邮箱格式，以及是否已经在数据库中存在。
                 保证格式正确以及数据库中数据唯一性。
              */
-
             email.focusedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
 
                     if(checkIfIsEmail(email.getText())){
 
-                        if(already2.getText().equals("Invalid email!")){
+                        if("Invalid email!".equals(already2.getText())){
                             already2.setText("Already taken!");
                         }
 
@@ -158,7 +188,7 @@ public class CreateAccount {
                                     judgeEmialexist = false;
                                     already2.setVisible(false);
 
-                                    if(!judgeAccountExists && agree.isSelected()){
+                                    if(!judgeAccountExists && agree.isSelected() && !"".equals(password.getText())){
                                         createAccount.setDisable(false);
 
                                     }
@@ -195,13 +225,33 @@ public class CreateAccount {
                             if (!createAccount.isDisable()){
                                 createAccount.setDisable(true);
                             }
-
                          }
                     }
                 }
             });
 
 
+            password.focusedProperty().addListener(new ChangeListener<Boolean>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    if("".equals(password.getText())){
+
+                        if (!createAccount.isDisable()){
+                            createAccount.setDisable(true);
+                        }
+
+                    }else {
+
+                        if (!already.isVisible() && !already2.isVisible() && !"".equals(userName.getText()) && !"".equals(email.getText()) && agree.isSelected()){
+                            createAccount.setDisable(false);
+                        }
+
+                    }
+                }
+            });
+
+
+
             Stage primaryStage = new Stage();
             primaryStage.setTitle("Create an Account");
             primaryStage.setScene(new Scene(root, 600.0000999999975, 633));
@@ -216,6 +266,8 @@ public class CreateAccount {
 
     }
 
+
+
     /**
      * 检查邮箱格式是否正确.
      */
@@ -230,6 +282,17 @@ public class CreateAccount {
         return isMatched;
     }
 
+    public boolean checkIfIsAccount(String account){
+
+        String check = "^[a-zA-Z0-9_]{4,15}$";
+
+        Pattern regex = Pattern.compile(check);
+        Matcher matcher = regex.matcher(account);
+        boolean isMatched = matcher.matches();
+
+        return isMatched;
+    }
+
 
 }
 
diff --git a/src/imgzip/LoginSignIn/CreateAccountController.java b/src/imgzip/LoginSignIn/CreateAccountController.java
index 889abaa..28e5193 100644
--- a/src/imgzip/LoginSignIn/CreateAccountController.java
+++ b/src/imgzip/LoginSignIn/CreateAccountController.java
@@ -67,7 +67,6 @@ public class CreateAccountController {
     public void checkAccountExistence() {
         DataBaseController createAccountInstruction = new DataBaseController();
         ResultSet rs = null;
-        ResultSet rs2 = null;
 
         try {
             /**
@@ -101,7 +100,7 @@ public class CreateAccountController {
                     judgeAccountExists = false;
                     already.setVisible(false);
 
-                    if(!judgeEmialexist && agree.isSelected()){
+                    if(!judgeEmialexist && agree.isSelected() && !"".equals(passWord.getText())){
                         createAccount.setDisable(false);
 
                     }
@@ -125,7 +124,6 @@ public class CreateAccountController {
     public void checkEmailExistence() {
 
         DataBaseController createAccountInstruction = new DataBaseController();
-        ResultSet rs = null;
         ResultSet rs2 = null;
 
         try {
@@ -156,13 +154,11 @@ public class CreateAccountController {
                     judgeEmialexist = false;
                     already2.setVisible(false);
 
-                    if(!judgeAccountExists && agree.isSelected()){
+                    if(!judgeAccountExists && agree.isSelected() && !"".equals(passWord.getText())){
                         createAccount.setDisable(false);
 
                     }
-
                 }
-
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -171,7 +167,6 @@ public class CreateAccountController {
             createAccountInstruction.close();
 
         }
-
     }
 
     /**
@@ -185,7 +180,10 @@ public class CreateAccountController {
             /**
              向数据库中插入数据
              */
-            String currentInstruction = "INSERT INTO login (userName,pwd,email,tel) values(" + "'"+userName.getText().trim()+ "'" + "," + "'"+ passWord.getText().trim()+ "'" + "," + "'"+ email.getText().trim() + "'"+ "," +  "'"+telephone.getText().trim()+ "'"+")" ;
+            String encryptedPassword = HashUtil.hash(passWord.getText());
+
+
+            String currentInstruction = "INSERT INTO login (userName,pwd,email,tel) values(" + "'"+userName.getText().trim()+ "'" + "," + "'"+ encryptedPassword.trim()+ "'" + "," + "'"+ email.getText().trim() + "'"+ "," +  "'"+telephone.getText().trim()+ "'"+")" ;
             createAccountInstruction.queryUpdate(currentInstruction);
 
             /**
@@ -227,8 +225,10 @@ public class CreateAccountController {
         boolean userNmae = "".equals(userName.getText());
         boolean emial = "".equals(email.getText());
 
-        if(agree.isSelected() && !userNmae && !emial && createAccount.isDisable() && !already.isVisible() && !already2.isVisible()){
+        if(agree.isSelected() && !userNmae && !emial && createAccount.isDisable() && !already.isVisible() && !already2.isVisible() && !"".equals(passWord.getText())){
             createAccount.setDisable(false);
+        }else {
+            createAccount.setDisable(true);
         }
     }
 
@@ -251,7 +251,6 @@ public class CreateAccountController {
         }
     }
 
-
     /**
      * 点击Service 的 hyperlink后，跳出网页进入服务说明。
      */
diff --git a/src/imgzip/LoginSignIn/FindPasswordController.java b/src/imgzip/LoginSignIn/FindPasswordController.java
index c5b0182..45f1e4d 100644
--- a/src/imgzip/LoginSignIn/FindPasswordController.java
+++ b/src/imgzip/LoginSignIn/FindPasswordController.java
@@ -19,6 +19,10 @@ public class FindPasswordController {
     @FXML
     private Button verify;
 
+
+    /**
+     * 检查账号是否为空，设置按钮是否可被点击。
+     */
     boolean accountIsEmpty = true;
     public void checkAccountIsEmpty(){
 
@@ -37,6 +41,9 @@ public class FindPasswordController {
         }
     }
 
+    /**
+     * 检查邮箱是否为空，设置按钮是否可被点击。
+     */
     boolean emailIsEmpty = true;
     public void checkEmailIsEmpty(){
 
@@ -55,6 +62,11 @@ public class FindPasswordController {
         }
     }
 
+
+
+    /**
+     * 检查用户名和邮箱是否唯一匹配，如果不匹配则会弹出提示窗口，如果匹配则可以进入修改密码的页面。
+     */
     public void verifyEmailAndAccount(){
 
     DataBaseController verifyInstruction = new DataBaseController();
diff --git a/src/imgzip/LoginSignIn/GlobalStringManager.java b/src/imgzip/LoginSignIn/GlobalStringManager.java
index d66c9b9..d54dcb5 100644
--- a/src/imgzip/LoginSignIn/GlobalStringManager.java
+++ b/src/imgzip/LoginSignIn/GlobalStringManager.java
@@ -1,16 +1,23 @@
 package imgzip.LoginSignIn;
 
+import java.util.ArrayList;
+
 /**
  @Author:   肖尧
  @Date: 2019.12.12
 
  全局变量类，用于项目内页面之间的信息传递。
+ account:用户名
+ emial : 邮箱
+ pic ：头像
+ picSequences : 图片序列，用于缓存新添加的序列。
  */
 
 public class GlobalStringManager {
     static String account = "";
     static String emial = "";
     static String pic = "";
+    static ArrayList<String> picSequences = new ArrayList<String>();
 
     public static void setAccount(String account) {
         GlobalStringManager.account = account;
@@ -36,4 +43,15 @@ public class GlobalStringManager {
         return pic;
     }
 
+    public static ArrayList<String> getPicSequences() {
+        return picSequences;
+    }
+
+    public static void setPicSequences(String sequence) {
+        picSequences.add(sequence);
+    }
+
+
+
+
 }
diff --git a/src/imgzip/LoginSignIn/HashUtil.java b/src/imgzip/LoginSignIn/HashUtil.java
new file mode 100644
index 0000000..93ad36b
--- /dev/null
+++ b/src/imgzip/LoginSignIn/HashUtil.java
@@ -0,0 +1,113 @@
+package imgzip.LoginSignIn;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+
+public class HashUtil {
+
+    /**
+     * 计算字符串的hash值
+     * param string    密码的明文值
+     * param algorithm 算法名
+     * return 字符串的hash值
+     */
+    public static String hash(String string) {
+        if (string.isEmpty()) {
+            return "";
+        }
+
+        /**
+         * MessageDigest 用于生成明文密码的摘要值，
+         * 明文密码相同，生成的摘要值相同。
+         * 摘要值的计算方法固定使用SHA1方法。长度为160位
+         */
+        String algorithm = "SHA1";
+        MessageDigest hash = null;
+        try {
+
+            /**
+             *hash储存了SHA1方法生成的明文密码的摘要后
+             * ①使用digest方法，对原明码字符串通过UTF-8解码方法转为指定的字符序列后的字节数组进行最后的更新，此时已经生成了摘要。
+             */
+            hash = MessageDigest.getInstance(algorithm);
+            byte[] bytes = hash.digest(string.getBytes("UTF-8"));
+            String result = "";
+
+            /**
+             * ①对摘要的每一位字符，由于java储存字符是存其补码，由于byte是8位，int是32位，int转换会在其前添加24位0的补码，也就是24位1作为转换的补位。但仅仅保持十进制一致
+             * ②但是转为int值的时候，二进制补码也变化了，为了使其二进制补码不受改变，也就是其二进制的值是要求不变。 0000000 100001 和 100001 二进制是一致的，但是在十进制中不一致。
+             * ③toHexString 方法：
+             * 1：根据传入整数的有效二进制长度，得到最后随机生成的字符输出的长度（范围是1-4）
+             * 2：根据传入的整数值和整数值的二进制长度，不断取余得到下标值（还不是很懂），再根据得到的随机下标值获得java内置字符数组中的字符，组成字符串。
+             *
+             * ③：如果toHexString方法：得到了一个长度为1的字符串，那么就在这个字符串前加一个字符“0”
+             * ④: 最终将每一个字符产生的字符串，加到结果字符串中并返回。结果即为加密后的字符串。
+             */
+            for (byte b : bytes) {
+                String temp = Integer.toHexString(b & 0xff);
+                if (temp.length() == 1) {
+                    temp = "0" + temp;
+                }
+                result += temp;
+            }
+            return result;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+}
+
+
+/**
+ * toHexString 内置的唯一方法，方便理解。
+ */
+//private static String toUnsignedString0(int val, int shift) {
+//
+//    //这里所有的未注明的shift都是4，即16进制
+//
+//    // assert shift > 0 && shift <=5 : "Illegal shift value";
+//    //求得val 的二进制形式的 有效位数  例如：val=15 就是 mag=4位
+//    int mag = Integer.SIZE - Integer.numberOfLeadingZeros(val);
+//
+//    //计算的 目标(shift)进制形式字符串的值 的位数。
+//    //例如：val=15 求二进制字符串就是chars=4,8进制chars就是2,16进制chars就是1
+//    //(((mag + (shift - 1)) / shift), 1)这里是为了保证，足够的个数，就像val=17,那么mag=5，chars该为2，用mag直接除shift的话chars是1，就不对了
+//    int chars = Math.max(((mag + (shift - 1)) / shift), 1);
+//    char[] buf = new char[chars];
+//
+//    formatUnsignedInt(val, shift, buf, 0, chars);
+//
+//    // Use special constructor which takes over "buf".
+//    //这里利用java String的带有数组的构造方法，构造出目标字符串。
+//    return new String(buf, true);
+//}
+
+
+/**
+ * toUnsignedString 内置的唯一方法，方便理解。
+ */
+//    static int formatUnsignedInt(int val, int shift, char[] buf, int offset, int len) {
+//        int charPos = len;
+//        int radix = 1 << shift;
+//        int mask = radix - 1;
+//        do {
+//            buf[offset + --charPos] = Integer.digits[val & mask];//每次do-while循环都会取4位（从高位到低位），Integer.digits[]数组是十六进制的字符集
+//            val >>>= shift;
+//        } while (val != 0 && charPos > 0);
+//
+//        return charPos;
+//    }
+//
+//    final static char[] digits = {
+//            '0' , '1' , '2' , '3' , '4' , '5' ,
+//            '6' , '7' , '8' , '9' , 'a' , 'b' ,
+//            'c' , 'd' , 'e' , 'f' , 'g' , 'h' ,
+//            'i' , 'j' , 'k' , 'l' , 'm' , 'n' ,
+//            'o' , 'p' , 'q' , 'r' , 's' , 't' ,
+//            'u' , 'v' , 'w' , 'x' , 'y' , 'z'
+//    };
diff --git a/src/imgzip/LoginSignIn/Login.java b/src/imgzip/LoginSignIn/Login.java
index a4fa463..ad30f60 100644
--- a/src/imgzip/LoginSignIn/Login.java
+++ b/src/imgzip/LoginSignIn/Login.java
@@ -26,6 +26,9 @@ public class Login extends Application {
 
         Parent root = FXMLLoader.load(getClass().getResource("/fxml/Login.fxml"));
 
+        /**
+         * 将组件载入到start/main方法中，使得可以调用。以便于执行一些需要在页面生成就可以自动执行生成的效果
+         */
         TextField account = (TextField)root.lookup("#Account");
         PasswordField password = (PasswordField)root.lookup("#password");
         CheckBox remember = (CheckBox)root.lookup("#remember");
@@ -38,6 +41,10 @@ public class Login extends Application {
          如果上一次登录点击了记住密码，则在本次打开时会将账号和密码写入
          */
         try {
+
+            /**
+             * 读取记录账号密码的文本文件，如果不存在则会创造文件夹和文件，保持一致性。
+             */
             File fi = new File("txtFile");
             File file = new File("txtFile/RememberAccount&Password.txt");
             if(!fi.exists()){
@@ -52,6 +59,9 @@ public class Login extends Application {
             String line = "";
             line = br.readLine();
 
+            /**
+             * 读取账号和密码。
+             */
             if(file.length() != 0){
 
                 String[] judge = line.split("\\|");
diff --git a/src/imgzip/LoginSignIn/LoginBeginner.java b/src/imgzip/LoginSignIn/LoginBeginner.java
index 12e6fb3..3b381d8 100644
--- a/src/imgzip/LoginSignIn/LoginBeginner.java
+++ b/src/imgzip/LoginSignIn/LoginBeginner.java
@@ -25,6 +25,11 @@ public class LoginBeginner {
             Stage primaryStage = new Stage();
             Parent root = FXMLLoader.load(getClass().getResource("/fxml/Login.fxml"));
 
+
+            /**
+             * 将组件载入到start/main方法中，使得可以调用。以便于执行一些需要在页面生成就可以自动执行生成的效果
+             */
+
             TextField account = (TextField)root.lookup("#Account");
             PasswordField password = (PasswordField)root.lookup("#password");
             CheckBox remember = (CheckBox)root.lookup("#remember");
@@ -37,6 +42,10 @@ public class LoginBeginner {
              如果上一次登录点击了记住密码，则在本次打开时会将账号和密码写入
              */
             try {
+
+                /**
+                 * 读取记录账号密码的文本文件，如果不存在则会创造文件夹和文件，保持一致性。
+                 */
                 File fi = new File("txtFile");
                 File file = new File("txtFile/RememberAccount&Password.txt");
                 if(!fi.exists()){
@@ -51,6 +60,10 @@ public class LoginBeginner {
                 String line = "";
                 line = br.readLine();
 
+                /**
+                 * 读取账号和密码。
+                 */
+
                 if(file.length() != 0){
 
                     String[] judge = line.split("\\|");
diff --git a/src/imgzip/LoginSignIn/LoginController.java b/src/imgzip/LoginSignIn/LoginController.java
index 12c18bd..087d9ec 100644
--- a/src/imgzip/LoginSignIn/LoginController.java
+++ b/src/imgzip/LoginSignIn/LoginController.java
@@ -95,13 +95,15 @@ public class LoginController {
         ResultSet rs = null;
         try{
 
+
+            String encryptedPassword = HashUtil.hash(password.getText());
             String currentInstruction = "SELECT pwd FROM login WHERE userName=" + "'" + account.getText().trim()+ "'";
             rs = loginInstruction.queryExcecute(currentInstruction);
 
 
             if (rs.next()) {
                 String rightPassword = rs.getString(1);
-                if (rightPassword.equals(password.getText())){
+                if (rightPassword.equals(encryptedPassword)){
 
                     remember();
                     //登入主页面，待定
@@ -109,7 +111,6 @@ public class LoginController {
                         passwordWrong.setVisible(false);
                     }
                     GlobalStringManager.setAccount(account.getText());
-
                     Stage stage = (Stage)account.getScene().getWindow();
                     new Personal();
                     stage.close();
diff --git a/txtFile/RememberAccount&Password.txt b/txtFile/RememberAccount&Password.txt
index 2b1676a..632bac5 100644
--- a/txtFile/RememberAccount&Password.txt
+++ b/txtFile/RememberAccount&Password.txt
@@ -1 +1 @@
-admin|14789|true
+505822174|xiaoyaozizai|true
-- 
Gitee