删除 'Bug476-ZhangWeiHao-BaoYuelin'

app/account_service.py

@@ -1,6 +1,7 @@
 from flask import *
 from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, WarningMessage
 
+
 # 初始化蓝图
 accountService = Blueprint("accountService", __name__)
 
@@ -18,14 +19,21 @@ def signup():
         # POST方法需判断是否注册成功，再根据结果返回不同的内容
         username = escape(request.form['username'])
         password = escape(request.form['password'])
+        password2 = escape(request.form['password2'])
+        
         #! 添加如下代码为了过滤注册时的非法字符
         warn = WarningMessage(username)
         if str(warn) != 'OK':
-            return jsonify({'status': '3', 'warn': str(warn)})
+            return str(warn)
         
         available = check_username_availability(username)
         if not available: # 用户名不可用
-            return jsonify({'status': '0'})
+            flash('用户名 %s 已经被注册。' % (username))
+            return render_template('signup.html')
+        elif len(password.strip()) < 4: # 密码过短
+            return '密码过于简单。'
+        elif password != password2:
+            return '确认密码与输入密码不一致！'
         else: # 添加账户信息
             add_user(username, password)
             verified = verify_user(username, password)
@@ -36,11 +44,11 @@ def signup():
                 session['username'] = username
                 session['expiry_date'] = get_expiry_date(username)
                 session['articleID'] = None
-                return render_template('signup_success.html', username=username)
+                return '<p>恭喜，你已成功注册， 你的用户名是 <a href="%s">%s</a>。</p>\
-            #                 session['existing_articles'] = None
+                <p><a href="/%s">开始使用</a> <a href="/">返回首页</a><p/>' % (username, username, username)
-            #                 return jsonify({'status': '2'})
             else:
-                return jsonify({'status': '1'})
+                return '用户名密码验证失败。'
+
 
 
 @accountService.route("/login", methods=['GET', 'POST'])
@@ -56,7 +64,8 @@ def login():
             return render_template('login.html')
         else:
             # 已登录，提示信息并显示登出按钮
-            return render_template('login_success.html', username=session['username'])
+            return '你已登录 <a href="/%s">%s</a>。 登出点击<a href="/logout">这里</a>。' % (
+                session['username'], session['username'])
     elif request.method == 'POST':
         # POST方法用于判断登录是否成功
         # check database and verify user
@@ -70,10 +79,10 @@ def login():
             session['username'] = username
             user_expiry_date = get_expiry_date(username)
             session['expiry_date'] = user_expiry_date
-            session['existing_articles'] = None
+            session['articleID'] = None
-            return jsonify({'status': '1'})
+            return redirect(url_for('user_bp.userpage', username=username))
         else:
-            return jsonify({'status': '0'})
+            return '无法通过验证。'
 
 
 @accountService.route("/logout", methods=['GET', 'POST'])
@@ -106,15 +115,31 @@ def reset():
         # POST请求用于提交修改后信息
         old_password = escape(request.form['old-password'])
         new_password = escape(request.form['new-password'])
+
         re_new_password = escape(request.form['re-new-password'])  # 确认新密码
         if re_new_password != new_password: #验证新密码两次输入是否相同
             return '新密码不匹配，请重新输入'
-        if len(new_password) < 4:  # 验证新密码长度，g原则参照注册模块
+        if len(new_password) < 4: #验证新密码长度，原则参照注册模块
             return '密码过于简单。(密码长度至少4位)'
 
         flag = change_password(username, old_password, new_password) # flag表示是否修改成功
         if flag:
             session['logged_in'] = False
-            return render_template('password_change_status.html', message="密码修改成功，请重新登录。", path="/login")
+            return \
+'''
+<script>
+alert('密码修改成功，请重新登录。');
+window.location.href="/login";
+</script>
+
+'''
+
         else:
-            return render_template('password_change_status.html', message="密码修改失败", path="/reset")
+            return \
+'''
+<script>
+alert('密码修改失败');
+window.location.href="/reset";
+</script>
+
+'''

app/api_bp.py

@@ -1,38 +0,0 @@
-import json
-
-from flask import Blueprint
-
-import pickle_idea2
-
-path_prefix = '/var/www/wordfreq/wordfreq/'
-path_prefix = './'  # comment this line in deployment
-
-# 创建api蓝图
-api_blue = Blueprint('api', __name__, url_prefix='/api')
-
-
-def helper(res, result):
-    for item in res:
-        if type(res[str(item)]) == 'dict':
-            helper(res[str(item)], result)
-        if type(res[str(item)]) == 'list':
-            for i in range(len(res[str(item)])):
-                helper(res[str(item)][i], result)
-        result.append(str(item))
-    return result
-
-
-@api_blue.route('/json/<username>', methods=['GET'])
-def api_bp(username):
-    # 获取session里的用户名
-    result = []
-    user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
-    s = pickle_idea2.load_record(user_freq_record)
-    wordlist = helper(s, result)
-    print(json.dumps(s))
-    results = {}
-
-    for word in wordlist:
-        results[word] = len(s[word])
-
-    return results

app/main.py

@@ -12,14 +12,12 @@ from Article import *
 import Yaml
 from user_service import userService
 from account_service import accountService
-from api_bp import api_blue
 app = Flask(__name__)
 app.secret_key = 'lunch.time!'
 
 # 将蓝图注册到Lab app
 app.register_blueprint(userService)
 app.register_blueprint(accountService)
-app.register_blueprint(api_blue)
 
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment

app/templates/login_success.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>已成功登录</title>
-</head>
-<body>
-    你已登录 <a href="/{{ username }}">{{ username}}</a>。 登出点击<a href="/logout">这里</a>。
-</body>
-</html>

app/templates/password_change_status.html

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>密码修改提示</title>
-</head>
-<body>
-
-<script>
-alert("{{ message }}");
-window.location.href="{{path}}";
-</script>
-
-</body>
-</html>

app/templates/signup_success.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>注册成功</title>
-</head>
-<body>
-    <p>恭喜，你已成功注册， 你的用户名是 <a href="{{ username }}">{{ username }}</a>。</p>
-    <p><a href="/{{ username }}">开始使用</a> <a href="/">返回首页</a></p>
-</body>
-</html>