From 1ddab74f04b266c89aa2b230c0da6c0c1be4b1c7 Mon Sep 17 00:00:00 2001
From: 2658626578 <2658626578@qq.com>
Date: Sun, 4 Dec 2022 22:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug-490.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/account_service.py | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/account_service.py b/app/account_service.py
index dc854a3..77ed3f5 100644
--- a/app/account_service.py
+++ b/app/account_service.py
@@ -5,6 +5,10 @@ from Login import check_username_availability, verify_user, add_user, get_expiry
 # 初始化蓝图
 accountService = Blueprint("accountService", __name__)
 
+# 确认密码和输入密码是否一致
+def verify_passverified(password,password2):
+    if(password==password2):
+        return True
 
 ### Sign-up, login, logout ###
 @accountService.route("/signup", methods=['GET', 'POST'])
@@ -20,6 +24,7 @@ def signup():
         # POST方法需判断是否注册成功，再根据结果返回不同的内容
         username = escape(request.form['username'])
         password = escape(request.form['password'])
+        password2 = escape(request.form['password2'])
         
         #! 添加如下代码为了过滤注册时的非法字符
         warn = WarningMessage(username)
@@ -35,17 +40,21 @@ def signup():
         else: # 添加账户信息
             add_user(username, password)
             verified = verify_user(username, password)
-            if verified:
-                # 写入session
-                session['logged_in'] = True
-                session[username] = username
-                session['username'] = username
-                session['expiry_date'] = get_expiry_date(username)
-                session['articleID'] = None
-                return '<p>恭喜，你已成功注册， 你的用户名是 <a href="%s">%s</a>。</p>\
-                <p><a href="/%s">开始使用</a> <a href="/">返回首页</a><p/>' % (username, username, username)
+            verified_2 = verify_passverified(password, password2)
+            if verified_2:  # 确认密码与输入密码一致后
+                if verified:
+                    # 写入session
+                    session['logged_in'] = True
+                    session[username] = username
+                    session['username'] = username
+                    session['expiry_date'] = get_expiry_date(username)
+                    session['articleID'] = None
+                    return '<p>恭喜，你已成功注册， 你的用户名是 <a href="%s">%s</a>。</p>\
+<p><a href="/%s">开始使用</a> <a href="/">返回首页</a><p/>' % (username, username, username)
+                else:
+                    return '用户名密码验证失败。'
             else:
-                return '用户名密码验证失败。'
+                return '确认密码与输入密码不一致！'
 
 
 @accountService.route("/login", methods=['GET', 'POST'])