From e858379641bddb2d5071d3a6dc923e570af415af Mon Sep 17 00:00:00 2001
From: 50582 <505822174@qq.com>
Date: Fri, 27 Dec 2019 20:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=EF=BC=9A=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=BC=BA=E5=BA=A6=E5=88=A4=E6=96=AD=E3=80=82=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=84=E4=B8=AA=E6=96=87=E4=BB=B6=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fxml/CreateAccount.fxml                   | 11 ++-
 src/imgzip/LoginSignIn/ChangePassword.java    | 21 +++--
 .../LoginSignIn/ChangePasswordController.java |  4 +-
 src/imgzip/LoginSignIn/CreateAccount.java     | 42 ++++++---
 .../LoginSignIn/CreateAccountController.java  | 93 ++++++++++++++++++-
 src/imgzip/LoginSignIn/FindPassword.java      |  4 +
 .../LoginSignIn/FindPasswordController.java   | 13 ++-
 .../LoginSignIn/GlobalStringManager.java      |  4 +
 src/imgzip/LoginSignIn/Login.java             |  1 +
 9 files changed, 158 insertions(+), 35 deletions(-)

diff --git a/src/fxml/CreateAccount.fxml b/src/fxml/CreateAccount.fxml
index ac2d522..8e6bd4f 100644
--- a/src/fxml/CreateAccount.fxml
+++ b/src/fxml/CreateAccount.fxml
@@ -46,7 +46,7 @@
                         <Insets fx:id="x1" />
                       </HBox.margin>
                     </TextField>
-                    <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">
+                    <Label id="Al1" 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>
@@ -61,9 +61,14 @@
                 <Insets top="5.0" />
               </VBox.margin>
             </HBox>
-            <HBox alignment="CENTER" prefHeight="60.0" prefWidth="601.0" spacing="19.0">
+            <HBox alignment="CENTER" prefHeight="45.0" prefWidth="601.0" spacing="19.0">
               <children>
-                <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" />
+                <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>
+                    <PasswordField fx:id="passWord" onKeyReleased="#checkTheStrengtenOfPassowrd" prefHeight="36.0" prefWidth="250.0" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;&#10;" />
+                    <Label id="Al3" fx:id="already3" alignment="CENTER" font="$x3" prefHeight="31.0" prefWidth="175.0" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;" text="Weak passoword" textAlignment="LEFT" textFill="RED" />
+                  </children>
+                </HBox>
               </children>
               <VBox.margin>
                 <Insets top="10.0" fx:id="x2" />
diff --git a/src/imgzip/LoginSignIn/ChangePassword.java b/src/imgzip/LoginSignIn/ChangePassword.java
index 89ad12f..fc6d020 100644
--- a/src/imgzip/LoginSignIn/ChangePassword.java
+++ b/src/imgzip/LoginSignIn/ChangePassword.java
@@ -31,6 +31,11 @@ public class ChangePassword {
             Button change = (Button)root.lookup("#changeThePassword");
             change.setDisable(true);
 
+            /**
+             * 改变密码按钮事件：
+             * ①：引用全局变量，获得当前账号
+             * ②：更新密码后，通过查询当前账号而检查密码是否改变成功
+             */
             change.setOnAction(e1->{
 
                 String a = GlobalStringManager.getAccount();
@@ -38,7 +43,6 @@ public class ChangePassword {
                 ResultSet rs = null;
 
                 try{
-
                     String encryptedPassword = HashUtil.hash(checkPassword.getText());
                     String currentInstruction = "update login set pwd = " + "'" + encryptedPassword + "'" + "where userName = "+ "'" + a.trim() + "'";
                     changeInstruction.queryUpdate(currentInstruction);
@@ -60,11 +64,10 @@ public class ChangePassword {
 
                 }finally {
                     changeInstruction.close();
-
                 }
-
             });
 
+
             Label different = (Label)root.lookup("#checkThePassword");
             different.setVisible(false);
 
@@ -74,7 +77,11 @@ public class ChangePassword {
             primaryStage.show();
 
 
-
+            /**
+             * 更改密码取消页面后的事件：
+             * ①如果用户在“登录页面”点击忘记密码，即在未登录的情况下点击忘记密码时，退出页面会返回登录页面
+             * ②如果用户在“个人信息页面”点击修改密码，即在登录的情况下点击忘记密码时，退出页面会返回用户的个人信息页面。
+             */
             primaryStage.setOnCloseRequest(e->{
                 if(judgeIsLogined == 0){
                     new LoginBeginner();
@@ -88,12 +95,6 @@ public class ChangePassword {
         }
 
     }
-
-
-    public void upDatePassword(){
-
-
-    }
 }
 
 /**
diff --git a/src/imgzip/LoginSignIn/ChangePasswordController.java b/src/imgzip/LoginSignIn/ChangePasswordController.java
index d1d7186..57eab50 100644
--- a/src/imgzip/LoginSignIn/ChangePasswordController.java
+++ b/src/imgzip/LoginSignIn/ChangePasswordController.java
@@ -68,7 +68,7 @@ public class ChangePasswordController {
 
     /**
      * 检查第一次输入的密码和第二次输入的密码是否相同，以及两个密码框是否为空。
-     * 如果相同或者为空，则无法点击按钮，并会有提示。
+     * 如果不相同或者为空，则无法点击按钮，并会有提示。
      */
 
     public void checkPasswordTheSame(){
@@ -111,6 +111,4 @@ public class ChangePasswordController {
         }
 
     }
-
-
 }
diff --git a/src/imgzip/LoginSignIn/CreateAccount.java b/src/imgzip/LoginSignIn/CreateAccount.java
index 0be0fc8..41ea5f3 100644
--- a/src/imgzip/LoginSignIn/CreateAccount.java
+++ b/src/imgzip/LoginSignIn/CreateAccount.java
@@ -6,13 +6,10 @@ import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.stage.Stage;
-import javafx.scene.control.CheckBox;
-import java.util.regex.*;
 
-import javafx.scene.control.Label;
+import java.util.regex.*;
 
 import java.sql.ResultSet;
 
@@ -31,23 +28,34 @@ public class CreateAccount {
         try {
             Parent root = FXMLLoader.load(getClass().getResource("/fxml/CreateAccount.fxml"));
 
-            Label already = (Label)root.lookup("#Al");
+            /**
+             * already:提醒用户账号是否正确文字
+             * already2:提醒用户邮箱是否正确
+             * already3:提醒用户密码的安全等级，以及各式是否合法。
+             */
+            Label already = (Label)root.lookup("#Al1");
             Label already2 = (Label)root.lookup("#Al2");
+            Label already3 = (Label)root.lookup("#Al3");
+
             Button createAccount = (Button)root.lookup("#createAccount");
             TextField userName = (TextField)root.lookup("#userName");
             TextField email = (TextField)root.lookup("#email");
-            TextField password = (TextField)root.lookup("#passWord");
+            PasswordField password = (PasswordField) root.lookup("#passWord");
             CheckBox agree = (CheckBox)root.lookup("#agree");
 
             already.setVisible(false);
             already2.setVisible(false);
+            already3.setVisible(false);
             createAccount.setDisable(true);
 
 
 
             /**
              * change方法：当account输入框失去/得到焦点时，检查一次是否与数据库中的某个账号重复
-             * 保证账号的唯一性。
+             * 1：保证账号的唯一性。
+             * 2：当账号非法时，显示提醒字符提醒用户。
+             * 3：当账号由非法变为合法时，如果邮箱、密码、是否点击了解服务条款都符合了条件，注册账号按钮才会被激活
+             * 否则不激活
              */
             userName.focusedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
@@ -188,7 +196,7 @@ public class CreateAccount {
                                     judgeEmialexist = false;
                                     already2.setVisible(false);
 
-                                    if(!judgeAccountExists && agree.isSelected() && !"".equals(password.getText())){
+                                    if(!judgeAccountExists && agree.isSelected() && !"".equals(password.getText()) && !already3.getText().equals("Invalid!") &&!already.isVisible() && !already2.isVisible()  ){
                                         createAccount.setDisable(false);
 
                                     }
@@ -226,6 +234,13 @@ public class CreateAccount {
             });
 
 
+            /**
+             * 检查密码格式是否正确：
+             * ①密码为空，无法点击注册按钮
+             * ②密码为非法密码，无法点击注册按钮（根据同行的label是否显示“invalid”来判断
+             * ③当密码合法，且邮箱账号都合法时，跳转焦点才会使得注册按钮可被点击。当密码合法，
+             * 但是其他的条件不合法时，切换焦点依然无法激活注册按钮
+             */
             password.focusedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
@@ -234,19 +249,20 @@ public class CreateAccount {
                         if (!createAccount.isDisable()){
                             createAccount.setDisable(true);
                         }
+                        already3.setVisible(false);
 
                     }else {
 
-                        if (!already.isVisible() && !already2.isVisible() && !"".equals(userName.getText()) && !"".equals(email.getText()) && agree.isSelected()){
+                        if (!already.isVisible() && !already2.isVisible() && !"".equals(userName.getText()) && !"".equals(email.getText()) && agree.isSelected() && !already3.getText().equals("Invalid!")){
                             createAccount.setDisable(false);
+                        }else {
+                            createAccount.setDisable(true);
                         }
 
                     }
                 }
             });
 
-
-
             Stage primaryStage = new Stage();
             primaryStage.setTitle("Create an Account");
             primaryStage.setScene(new Scene(root, 600.0000999999975, 633));
@@ -262,7 +278,6 @@ public class CreateAccount {
     }
 
 
-
     /**
      * 检查邮箱格式是否正确.
      */
@@ -292,6 +307,7 @@ public class CreateAccount {
     }
 
 
+
 }
 
 /**
diff --git a/src/imgzip/LoginSignIn/CreateAccountController.java b/src/imgzip/LoginSignIn/CreateAccountController.java
index 033d4e3..54adf1d 100644
--- a/src/imgzip/LoginSignIn/CreateAccountController.java
+++ b/src/imgzip/LoginSignIn/CreateAccountController.java
@@ -8,6 +8,7 @@ import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.Alert;
+import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 
 import java.awt.*;
@@ -15,6 +16,8 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.ResultSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  @Author:   肖尧
@@ -26,7 +29,7 @@ public class CreateAccountController {
     private TextField userName;
 
     @FXML
-    private TextField passWord;
+    private PasswordField passWord;
 
     @FXML
     private TextField email;
@@ -49,6 +52,9 @@ public class CreateAccountController {
     @FXML
     private Label already2;
 
+    @FXML
+    private Label already3;
+
     @FXML
     private Hyperlink signIn;
 
@@ -218,6 +224,86 @@ public class CreateAccountController {
         }
     }
 
+    /**
+     * 检查当前的密码安全度：
+     * ①当前密码非法时，Label显示"Invalid"且为红色
+     * ②当前密码为弱密码时，lable显示"Weak Passoword"且为红色
+     * ③当前密码为中等强度密码时，label显示"Medium Passoword"且为黄色
+     * ④当前密码为强密码时，lable显示"Strong Password"且为绿色
+     */
+    public void checkTheStrengtenOfPassowrd(){
+        System.out.println(checkTheStengthOfPassword(passWord.getText()));
+        if (!"".equals(passWord.getText())){
+
+            if(checkTheStengthOfPassword(passWord.getText()) == 0){
+                already3.setText("Invalid!");
+                already3.setTextFill(Color.RED);
+                already3.setVisible(true);
+                createAccount.setDisable(true);
+
+            }else if (checkTheStengthOfPassword(passWord.getText()) == 1){
+                already3.setText("Weak Password");
+                already3.setTextFill(Color.RED);
+                already3.setVisible(true);
+
+            }else if(checkTheStengthOfPassword(passWord.getText()) == 2){
+                already3.setText("Medium Password");
+                already3.setTextFill(Color.YELLOW);
+                already3.setVisible(true);
+            }else if (checkTheStengthOfPassword(passWord.getText()) == 3){
+                already3.setText("Strong Password");
+                already3.setTextFill(Color.GREEN);
+                already3.setVisible(true);
+            }
+
+        }else {
+            if (already3.isVisible()){
+                already3.setVisible(false);
+                createAccount.setDisable(true);
+            }
+        }
+    }
+
+
+    /**
+     *
+     * @param password
+     * @return int
+     * 检查密码格式： ①长度为5-30位，小于5位或大于30位或使用了特殊字符都会坚定为非法密码
+     *               ②当长度大于5，小于8，且符合一级密码格式的密码，界定为弱安全密码
+     *               ③当长度大于8，符合一级密码格式但是不符合二级强密码格式的密码，界定为中等安全密码
+     *               ④当长度大于8，符合一级、二级密码格式的密码，界定为强安全密码。
+     */
+
+    public int checkTheStengthOfPassword(String password){
+
+        String strongFormula = "^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{5,30}$";
+        String weakFormula = "[a-zA-Z0-9]\\w{5,30}";
+
+        Pattern weakPattern = Pattern.compile(weakFormula);
+        Pattern strongPattern = Pattern.compile(strongFormula);
+
+        Matcher weakMatcher = weakPattern.matcher(password);
+        Matcher strongMatcher = strongPattern.matcher(password);
+
+
+        if(weakMatcher.matches()){
+            if (strongMatcher.matches()){
+                return 3;
+            }else {
+
+                if (password.length() <= 8){
+                    return 1;
+                }else {
+
+                    return 2;
+                }
+            }
+        }else {
+            return 0;
+        }
+    }
+
     /**
      * 检查是否点击了同意privacy协议，如果不同意，则无法点击 createaccount 按钮。
      */
@@ -227,7 +313,7 @@ public class CreateAccountController {
         boolean userNmae = "".equals(userName.getText());
         boolean emial = "".equals(email.getText());
 
-        if(agree.isSelected() && !userNmae && !emial && createAccount.isDisable() && !already.isVisible() && !already2.isVisible() && !"".equals(passWord.getText())){
+        if(agree.isSelected() && !userNmae && !emial && createAccount.isDisable() && !already.isVisible() && !already2.isVisible() && !"".equals(passWord.getText() )&& !already3.getText().equals("Invalid!")){
             createAccount.setDisable(false);
         }else {
             createAccount.setDisable(true);
@@ -272,6 +358,9 @@ public class CreateAccountController {
         }
     }
 
+
+
+
 }
 
 
diff --git a/src/imgzip/LoginSignIn/FindPassword.java b/src/imgzip/LoginSignIn/FindPassword.java
index b800ab7..ac25c3d 100644
--- a/src/imgzip/LoginSignIn/FindPassword.java
+++ b/src/imgzip/LoginSignIn/FindPassword.java
@@ -27,6 +27,10 @@ public class FindPassword {
             primaryStage.setScene(new Scene(root, 607, 500));
             primaryStage.show();
 
+
+            /**
+             * ①当用户点击关闭窗口时，会跳转至登录页面
+             */
             primaryStage.setOnCloseRequest(e->{
                 new LoginBeginner();
             });
diff --git a/src/imgzip/LoginSignIn/FindPasswordController.java b/src/imgzip/LoginSignIn/FindPasswordController.java
index cfdc2e8..9a0e3cd 100644
--- a/src/imgzip/LoginSignIn/FindPasswordController.java
+++ b/src/imgzip/LoginSignIn/FindPasswordController.java
@@ -22,6 +22,8 @@ public class FindPasswordController {
 
     /**
      * 检查账号是否为空，设置按钮是否可被点击。
+     * ①：如果验证的账号为空则无法点击验证按钮
+     * ②：当输入的账号符合规则时，依旧会检查邮箱符不符合规则
      */
     boolean accountIsEmpty = true;
     public void checkAccountIsEmpty(){
@@ -43,6 +45,8 @@ public class FindPasswordController {
 
     /**
      * 检查邮箱是否为空，设置按钮是否可被点击。
+     * ①如果输入的邮箱为空，则按钮无法被点击。
+     * ②当输入的邮箱符合规则时，依旧会检查账号符不符合规则。
      */
     boolean emailIsEmpty = true;
     public void checkEmailIsEmpty(){
@@ -62,10 +66,10 @@ public class FindPasswordController {
         }
     }
 
-
-
     /**
      * 检查用户名和邮箱是否唯一匹配，如果不匹配则会弹出提示窗口，如果匹配则可以进入修改密码的页面。
+     * ①：若账号与邮箱不匹配，或账号在数据库中不存在，则会弹出窗口提醒用户账号出错
+     * ②：若邮箱与账号不匹配，或邮箱在数据库中不存在，则会弹出窗口提醒用户邮箱出错
      */
     public void verifyEmailAndAccount(){
 
@@ -109,10 +113,11 @@ public class FindPasswordController {
     }finally {
         verifyInstruction.close();
     }
-
     }
 
-
+    /**
+     * ①当用户点击“Signin”超链接时，会自动跳转至登录页面。
+     */
     public void backToSignIn(){
         Stage stage = (Stage) verify.getScene().getWindow();
         new LoginBeginner();
diff --git a/src/imgzip/LoginSignIn/GlobalStringManager.java b/src/imgzip/LoginSignIn/GlobalStringManager.java
index d54dcb5..5914f18 100644
--- a/src/imgzip/LoginSignIn/GlobalStringManager.java
+++ b/src/imgzip/LoginSignIn/GlobalStringManager.java
@@ -11,6 +11,10 @@ import java.util.ArrayList;
  emial : 邮箱
  pic ：头像
  picSequences : 图片序列，用于缓存新添加的序列。
+
+ ①：全局变量类中，当登录页面时，自动载入对于账号的用户名、邮箱、图片序列串
+ ②：用户名用于修改密码页面、个人信息页面的信息载入
+ ③：图片序列串，用于实时更新用户上传的图片的提取码，不同的用户会有不同的提取码，每次回到个人信息页面，都会更新用户的所有当前的提取码。
  */
 
 public class GlobalStringManager {
diff --git a/src/imgzip/LoginSignIn/Login.java b/src/imgzip/LoginSignIn/Login.java
index ef0f7a2..d2019a6 100644
--- a/src/imgzip/LoginSignIn/Login.java
+++ b/src/imgzip/LoginSignIn/Login.java
@@ -62,6 +62,7 @@ public class Login extends Application {
 
             /**
              * 读取账号和密码。
+             * 账号密码由"\"分割 ，第一位是账号，第二位是密码。
              */
             if(file.length() != 0){
 
-- 
Gitee