Merge branch 'Bug490-ChenQiuwei' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug490-ChenQiuwei

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)
@@ -27,11 +32,15 @@ def signup():
             return str(warn)
         
         available = check_username_availability(username)
+        
+        verified_2 = verify_passverified(password, password2)  # 比较“密码”与“确认密码” 
         if not available: # 用户名不可用
             flash('用户名 %s 已经被注册。' % (username))
             return render_template('signup.html')
         elif len(password.strip()) < 4: # 密码过短
             return '密码过于简单。'
+        elif not verified_2:
+            return '确认密码与输入密码不一致！'
         else: # 添加账户信息
             add_user(username, password)
             verified = verify_user(username, password)
@@ -43,11 +52,12 @@ def signup():
                 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)
+<p><a href="/%s">开始使用</a> <a href="/">返回首页</a><p/>' % (username, username, username)
             else:
                 return '用户名密码验证失败。'
 
 
+
 @accountService.route("/login", methods=['GET', 'POST'])
 def login():
     '''

requirements.txt

@@ -1,3 +1,3 @@
-Flask==1.1.2
+Flask==2.1.0
 selenium==3.141.0
 PyYAML~=6.0