From 270f6159b2146780af3fef1244f04faae96c17c9 Mon Sep 17 00:00:00 2001
From: 2658626578 <2658626578@qq.com>
Date: Sat, 10 Dec 2022 09:41:22 +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 | 26 +++++++++++++-------------
 requirements.txt       |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/account_service.py b/app/account_service.py
index 77ed3f5..4de84ee 100644
--- a/app/account_service.py
+++ b/app/account_service.py
@@ -32,29 +32,29 @@ 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)
-            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>\
+            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'])
diff --git a/requirements.txt b/requirements.txt
index 2746a3b..8552794 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.1.2
+Flask==2.1.0
 selenium==3.141.0
 PyYAML~=6.0