diff --git a/README.md b/README.md
index bf2b2564d50b242b5c6e4269ce2d629c46d2b08f..3a5c06f0b122592a74dbb07bacf9ad9e9ec292a7 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,36 @@
     - 复制图片提取码到粘贴板
 3. 后端服务器
     - 接收并定期处理过期图片
+
+4. 登录页面
+     - 验证账号密码是否匹配
+     - 账号密码栏是否为空
+     - 记住账号密码
+     - 进入注册账号、修改密码页面
+
+5. 注册页面
+    - 检查账号是否符合格式、是否为空、显示（取消显示）文字提醒用户(若不符合则无法点击注册按钮)
+    - 检查密码是否符合长度要求、是否为空、检查密码强度、显示（取消显示）文字提醒用户(若不符合则无法点击注册按钮)
+    - 检查邮箱是否为空、检查邮箱格式、显示（取消显示）文字提醒用户(若不符合则无法点击注册按钮)
+    - 检查是否点击了“已读服务条款”的选择框(若不符合则无法点击注册按钮)
+    - 打开系统默认网页，并登陆“服务条款”、隐私协议的外部网站，
+    - 返回注册页面、个人页面按钮
+
+6. 注册成功页面
+    - 返回注册页面或再次注册页面的按钮
+
+7. 验证身份页面
+    - 检查账号、邮箱是否为空(若不符合则无法点击验证按钮)
+    - 检查账号、邮箱是否唯一匹配对应(若不符合则无法点击验证按钮)
+    - 提交验证数据按钮
+
+8. 修改密码页面
+    - 检查两次输入密码是否相同，是否为空(若不符合则无法点击验证按钮)
+        - 检查密码是否符合长度要求、是否为空、检查密码强度、显示（取消显示）文字提醒用户(若不符合则无法点击修改密码按钮)
+    - 提交修改数据
+
+9. 修改密码成功页面
+    - 返回个人信息页面（或登录页面）按钮
   
  ## 代码规范：
  > 采用[《阿里巴巴Java开发手册》](https://github.com/alibaba/p3c/blob/master/%E9%98%BF%E9%87%8C%E5%B7%B4%E5%B7%B4Java%E5%BC%80%E5%8F%91%E6%89%8B%E5%86%8C%EF%BC%88%E5%8D%8E%E5%B1%B1%E7%89%88%EF%BC%89.pdf)
@@ -28,6 +58,14 @@
 > [JavaFx Effect 之 Dropshadow 介绍使用](https://blog.csdn.net/qq_22571159/article/details/86570727)
 
 >[JavaFX之Drag And Drop拖放操作](https://blog.csdn.net/wingfourever/article/details/8858782)
+
+>[JavaFX文本框、按钮、列表框事件监听处理](https://blog.csdn.net/haoranhaoshi/article/details/82977050)
+
+>[java正则表达式大全（常用）](https://blog.csdn.net/zpz2411232428/article/details/83549502)
+
+>[加密解密（四）--Java中的Hash算法](https://blog.csdn.net/qq_24280381/article/details/72024860)
+
+
    
 ## API
    1. 警告弹窗AlertWindow类，添加按钮的实例如下    
@@ -44,5 +82,3 @@
             alertWindow.start(new Stage());
         }
     }
-   ``` 
-
diff --git a/src/fxml/ChangePassword.fxml b/src/fxml/ChangePassword.fxml
index 9dc5c8d217c6761e8d1a861c7652e4046a214edf..3578badb6fdf2b0330a46698892d306e5c95108d 100644
--- a/src/fxml/ChangePassword.fxml
+++ b/src/fxml/ChangePassword.fxml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
 <?import javafx.geometry.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
@@ -43,25 +40,26 @@
             </Label>
           </children>
         </HBox>
-        <HBox alignment="CENTER_LEFT" prefHeight="63.0" prefWidth="608.0">
+        <HBox alignment="CENTER" prefHeight="40.0" prefWidth="608.0">
           <children>
-            <PasswordField fx:id="password" onKeyReleased="#checkPasswordTheSame" prefHeight="40.0" prefWidth="418.0" promptText="New 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:0;&#10;-fx-border-radius:5;&#10;-fx-border-color:grey;" text="">
-              <HBox.margin>
-                <Insets left="95.0" top="10.0" />
-              </HBox.margin>
-            </PasswordField>
+            <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="checkpassword" fx:id="passWord" onKeyReleased="#checkTheStrengtenOfPassowrd" onKeyTyped="#checkPasswordTheSame" prefHeight="38.0" prefWidth="260.0" promptText="Length:5-30" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;-fx-font-size:18px;&#10;" text="" />
+                <Label id="checkThePassword" fx:id="strength" alignment="CENTER" prefHeight="28.0" prefWidth="152.0" style="-fx-background-insets:0;&#10;-fx-background-color:transparent, white, transparent, white;&#10;" text="Invalid!" textAlignment="LEFT" textFill="RED">
+                  <font>
+                    <Font name="System Bold" size="15.0" fx:id="x3" />
+                  </font>
+                </Label>
+              </children>
+            </HBox>
           </children>
         </HBox>
         <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="608.0">
           <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="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" />
-                  </font>
-                </Label>
+                <PasswordField id="checkpassword" fx:id="checkPassword" onKeyReleased="#checkPasswordTheSame" onMouseClicked="#checkPasswordTheSame" onMouseMoved="#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" font="$x3" 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" />
               </children>
               <HBox.margin>
                 <Insets left="95.0" />
diff --git a/src/fxml/Login.fxml b/src/fxml/Login.fxml
index 4eeb0892cba00d795b650cc8f990c6a1d2b62788..66a75904c6cf6d96c5d84f504668ea5d439408e1 100644
--- a/src/fxml/Login.fxml
+++ b/src/fxml/Login.fxml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
+
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
 <?import javafx.scene.text.*?>
 
-<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="399.9999000000025" prefWidth="648.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="imgzip.LoginSignIn.LoginController">
+<AnchorPane id="AnchorPane" fx:id="main" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="399.9999000000025" prefWidth="648.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="imgzip.LoginSignIn.LoginController">
   <children>
     <BorderPane id="whole" layoutX="13.0" layoutY="14.0" prefHeight="373.0" prefWidth="611.0">
       <bottom>
@@ -85,7 +83,7 @@
             </HBox>
             <HBox prefHeight="100.0" prefWidth="200.0" spacing="15.0" VBox.margin="$x3">
               <children>
-                <Button id="Login" fx:id="login" alignment="CENTER_LEFT" disable="true" mnemonicParsing="false" onAction="#login" prefWidth="210.0" style="" text="LOGIN">
+                <Button id="Login" fx:id="login" alignment="CENTER_LEFT" disable="true" mnemonicParsing="false" prefWidth="210.0" style="" text="LOGIN">
                   <HBox.margin>
                     <Insets left="151.0" />
                   </HBox.margin>
diff --git a/src/imgzip/LoginSignIn/ChangePassword.java b/src/imgzip/LoginSignIn/ChangePassword.java
index 697e91edfd8a46282752eab55ab18a820f1209bc..d9d6af4207d73f88181903aee2d681c23009ee30 100644
--- a/src/imgzip/LoginSignIn/ChangePassword.java
+++ b/src/imgzip/LoginSignIn/ChangePassword.java
@@ -29,8 +29,10 @@ public class ChangePassword {
             Parent root = FXMLLoader.load(getClass().getResource("/fxml/ChangePassword.fxml"));
 
             PasswordField checkPassword = (PasswordField)root.lookup("#checkpassword");
+            Label different1 = (Label)root.lookup("#checkThePassword");
             Button change = (Button)root.lookup("#changeThePassword");
             change.setDisable(true);
+            different1.setVisible(false);
 
             /**
              * 改变密码按钮事件：
diff --git a/src/imgzip/LoginSignIn/ChangePasswordController.java b/src/imgzip/LoginSignIn/ChangePasswordController.java
index f457310eb7eb3a8313e656a0a4f0057e305a2cbe..36370845cc3e6985dba4dad256f75b9b965d2424 100644
--- a/src/imgzip/LoginSignIn/ChangePasswordController.java
+++ b/src/imgzip/LoginSignIn/ChangePasswordController.java
@@ -3,9 +3,12 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 
 import java.sql.ResultSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  @Author:   肖尧
@@ -13,8 +16,9 @@ import java.sql.ResultSet;
  */
 public class ChangePasswordController {
 
+
     @FXML
-    TextField password = new TextField();
+    TextField passWord = new TextField();
 
     @FXML
     TextField checkPassword = new TextField();
@@ -22,6 +26,9 @@ public class ChangePasswordController {
     @FXML
     Label checkThePassword = new Label();
 
+    @FXML
+    Label strength = new Label();
+
     @FXML
     Button changeThePassword = new Button();
 
@@ -65,6 +72,87 @@ public class ChangePasswordController {
 //
 //        }
 //    }
+    /**
+     * 检查当前的密码安全度：
+     * ①当前密码非法时，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){
+                strength.setText("Invalid!");
+                strength.setTextFill(Color.RED);
+                strength.setVisible(true);
+                changeThePassword.setDisable(true);
+
+            }else if (checkTheStengthOfPassword(passWord.getText()) == 1){
+                strength.setText("Weak Password");
+                strength.setTextFill(Color.RED);
+                strength.setVisible(true);
+
+            }else if(checkTheStengthOfPassword(passWord.getText()) == 2){
+                strength.setText("Medium Password");
+                strength.setTextFill(Color.YELLOW);
+                strength.setVisible(true);
+            }else if (checkTheStengthOfPassword(passWord.getText()) == 3){
+                strength.setText("Strong Password");
+                strength.setTextFill(Color.GREEN);
+                strength.setVisible(true);
+            }
+
+        }else {
+            if (strength.isVisible()){
+                strength.setVisible(false);
+                changeThePassword.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;
+        }
+    }
+
+
 
     /**
      * 检查第一次输入的密码和第二次输入的密码是否相同，以及两个密码框是否为空。
@@ -73,7 +161,7 @@ public class ChangePasswordController {
 
     public void checkPasswordTheSame(){
 
-        if("".equals(password.getText()) || "".equals(checkPassword.getText())){
+        if("".equals(passWord.getText()) || "".equals(checkPassword.getText())){
 
             if(!changeThePassword.isDisable()){
                 changeThePassword.setDisable(true);
@@ -83,11 +171,15 @@ public class ChangePasswordController {
                 checkThePassword.setVisible(false);
             }
 
+            if ("".equals(passWord.getText()) && "".equals(checkPassword.getText()) && checkThePassword.isVisible()){
+                checkThePassword.setVisible(false);
+            }
+
 
         }else{
 
-            if(password.getText().equals(checkPassword.getText())){
-                if(changeThePassword.isDisable()){
+            if(passWord.getText().equals(checkPassword.getText())){
+                if(changeThePassword.isDisable() && !strength.getText().equals("Invalid!")){
                     changeThePassword.setDisable(false);
                 }
 
@@ -97,7 +189,7 @@ public class ChangePasswordController {
 
             }
 
-            if(!password.getText().equals(checkPassword.getText())){
+            if(!passWord.getText().equals(checkPassword.getText())){
 
                 if(!changeThePassword.isDisable()){
                     changeThePassword.setDisable(true);
diff --git a/src/imgzip/LoginSignIn/DataBaseController.java b/src/imgzip/LoginSignIn/DataBaseController.java
index 8baa5a9653c3503cfbc77916f77607c8892f1627..2d90f4c8e465911f33e69d187e2e10e65cb0b4a0 100644
--- a/src/imgzip/LoginSignIn/DataBaseController.java
+++ b/src/imgzip/LoginSignIn/DataBaseController.java
@@ -11,18 +11,17 @@ import java.sql.*;
 
 public class DataBaseController {
 
-    PreparedStatement ps = null;
-    Connection ct = null;
-    ResultSet rs = null;
-    String url = "jdbc:mysql://120.78.208.4/javaProgrem";//待定调整
-    String user =  "javaP" ;//待定调整
-    String password  = "1801090042"; //待定调整
-    String driver = "com.mysql.cj.jdbc.Driver";
+    private PreparedStatement ps = null;
+    private Connection ct = null;
+    private ResultSet rs = null;
+    private String url = "jdbc:mysql://120.78.208.4/javaProgrem";
+    private String user =  "javaP" ;
+    private String password  = "1801090042";
+    private String driver = "com.mysql.cj.jdbc.Driver";
 
 
     //关闭资源
     public void close(){
-
         try{
 
             if(rs != null) {
@@ -41,6 +40,7 @@ public class DataBaseController {
         }
     }
 
+    //检查连接是否成功
     public void jdbcConnection(){
         try {
 
@@ -50,13 +50,11 @@ public class DataBaseController {
         }catch (Exception ex){
             System.out.println("连接失败");
             ex.printStackTrace();
-
         }
 
     }
 
-    
-    //执行某个查询方法
+    //执行某个查询语句
     public ResultSet queryExcecute(String sql){
 
         try {
@@ -77,7 +75,7 @@ public class DataBaseController {
         return rs;
     }
 
-
+    //执行某个更新语句
     public void queryUpdate(String sql){
         try {
 
@@ -95,8 +93,6 @@ public class DataBaseController {
             ex.printStackTrace();
 
         }
-
     }
 
-
 }
diff --git a/src/imgzip/LoginSignIn/Login.java b/src/imgzip/LoginSignIn/Login.java
index eb187a1403e7e6273a587acc40a9c13d10239a4b..254ee117781b312067813f649f7d70b5070d14d8 100644
--- a/src/imgzip/LoginSignIn/Login.java
+++ b/src/imgzip/LoginSignIn/Login.java
@@ -10,6 +10,7 @@ import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextField;
 import javafx.scene.control.PasswordField;
 import javafx.scene.image.Image;
+import javafx.scene.input.KeyCode;
 import javafx.stage.Stage;
 import javafx.scene.control.Label;
 
@@ -90,6 +91,8 @@ public class Login extends Application {
             e.printStackTrace();
         }
 
+
+
         primaryStage.setTitle("Imgzip login");
         primaryStage.setScene(new Scene(root, 638, 400));
         primaryStage.show();
diff --git a/src/imgzip/LoginSignIn/LoginController.java b/src/imgzip/LoginSignIn/LoginController.java
index c5ca5b6d2219e50f0a07507d33003221f259e8ea..7ed3acf65e5e742b6901881a166db8976b14028e 100644
--- a/src/imgzip/LoginSignIn/LoginController.java
+++ b/src/imgzip/LoginSignIn/LoginController.java
@@ -3,27 +3,35 @@ package imgzip.LoginSignIn;
 import imgzip.mainpane.Pane_sceenbeginner;
 import imgzip.mainpane.Personal;
 import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
 import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
+import java.net.URL;
 import java.sql.ResultSet;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.ResourceBundle;
 
 
 /**
     @Author:肖尧
     @Date:2019.11.24
  */
-public class LoginController {
+public class LoginController implements Initializable {
 
 
     @FXML
     private TextField account;
 
+    @FXML
+    private AnchorPane main;
+
     @FXML
     private TextField password;
 
@@ -238,5 +246,19 @@ public class LoginController {
         }
 
     }
+
+    @Override
+    public void initialize(URL lacation, ResourceBundle resources){
+
+        main.setOnKeyPressed(e->{
+            if (e.getCode() == KeyCode.ENTER){
+                login();
+            }
+        });
+
+        login.setOnAction(event -> {
+            login();
+        });
+    }
 }