Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

app/Article.py

@@ -32,17 +32,20 @@ def get_article_body(s):
     return '\n'.join(lst)
 
 
-def get_today_article(user_word_list, existing_articles):
+def get_today_article(user_word_list, visited_articles):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    if existing_articles is None:
+    if visited_articles is None:
-        existing_articles = {
+        visited_articles = {
             "index" : 0,  # 为 article_ids 的索引
             "article_ids": []  # 之前显示文章的id列表，越后越新
         }
-    if existing_articles["index"] > len(existing_articles["article_ids"])-1:
+    if visited_articles["index"] > len(visited_articles["article_ids"])-1:  # 生成新的文章，因此查找所有的文章
         rq.instructions("SELECT * FROM article")
-    else:
+    else:  # 生成阅读过的文章，因此查询指定 article_id 的文章
-        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles["article_ids"][existing_articles["index"]]))
+        if visited_articles["article_ids"][visited_articles["index"]] == 'null':  # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作
+            visited_articles["index"] -= 1
+            visited_articles["article_ids"].pop()
+        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (visited_articles["article_ids"][visited_articles["index"]]))
     rq.do()
     result = rq.get_results()
     random.shuffle(result)
@@ -53,25 +56,33 @@ def get_today_article(user_word_list, existing_articles):
     d3 = get_difficulty_level(d1, d2)
 
     d = None
+    result_of_generate_article = "not found"
     d_user = load_freq_history(user_word_list)
     user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
     text_level = 0
-    if existing_articles["index"] > len(existing_articles["article_ids"])-1:  # 下一篇
+    if visited_articles["index"] > len(visited_articles["article_ids"])-1:  # 生成新的文章
-        flag_get_article = False
+        amount_of_visited_articles = len(visited_articles["article_ids"])
+        amount_of_existing_articles = result.__len__()
+        if amount_of_visited_articles == amount_of_existing_articles:  # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
+            result_of_generate_article = "had read all articles"
+        else:
+            for k in range(3):  # 最多尝试3次
                 for reading in result:
                     text_level = text_difficulty_level(reading['text'], d3)
-            factor = random.gauss(0.8,
+                    factor = random.gauss(0.8, 0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-                                  0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
+                    if reading['article_id'] not in visited_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
-            if reading['article_id'] not in existing_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                         d = reading
-                existing_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
+                        visited_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
-                flag_get_article = True
+                        result_of_generate_article = "found"
                         break
-        if not flag_get_article:
+                if result_of_generate_article == "found":  # 用于成功找到文章后及时退出外层循环
-            existing_articles["index"] -= 1
+                    break
-    else:  # 上一篇
+        if result_of_generate_article != "found":  # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”）
+            visited_articles["article_ids"].append('null')
+    else:  # 生成已经阅读过的文章
         d = random.choice(result)
         text_level = text_difficulty_level(d['text'], d3)
+        result_of_generate_article = "found"
 
     today_article = None
     if d:
@@ -86,7 +97,7 @@ def get_today_article(user_word_list, existing_articles):
             "answer": get_answer_part(d['question'])
         }
 
-    return existing_articles, today_article
+    return visited_articles, today_article, result_of_generate_article
 
 
 def load_freq_history(path):

app/Login.py

@@ -3,6 +3,18 @@ import string
 from datetime import datetime, timedelta
 from UseSqlite import InsertQuery, RecordQuery
 
+def md5(s):
+    '''
+    MD5摘要
+    :param str: 字符串
+    :return: 经MD5以后的字符串
+    '''
+    h = hashlib.md5(s.encode(encoding='utf-8'))
+    return h.hexdigest()
+
+# import model.user after the defination of md5(s) to avoid circular import
+from model.user import get_user_by_username, insert_user, update_password_by_username
+
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment
 
@@ -12,13 +24,9 @@ def verify_pass(newpass,oldpass):
 
 
 def verify_user(username, password):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
+    user = get_user_by_username(username)
-    password = md5(username + password)
+    encoded_password = md5(username + password)
-    rq.instructions_with_parameters("SELECT * FROM user WHERE name=:username AND password=:password", dict(
+    return user is not None and user.password == encoded_password
-        username=username, password=password))  # the named style https://docs.python.org/3/library/sqlite3.html
-    rq.do_with_parameters()
-    result = rq.get_results()
-    return result != []
 
 
 def add_user(username, password):
@@ -26,19 +34,12 @@ def add_user(username, password):
     expiry_date = (datetime.now() + timedelta(days=30)).strftime('%Y%m%d') # will expire after 30 days
     # 将用户名和密码一起加密，以免暴露不同用户的相同密码
     password = md5(username + password)
-    rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
+    insert_user(username=username, password=password, start_date=start_date, expiry_date=expiry_date)
-    rq.instructions_with_parameters("INSERT INTO user VALUES (:username, :password, :start_date, :expiry_date)", dict(
-        username=username, password=password, start_date=start_date, expiry_date=expiry_date))
-    rq.do_with_parameters()
 
 
 def check_username_availability(username):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
+    existed_user = get_user_by_username(username)
-    rq.instructions_with_parameters(
+    return existed_user is None
-        "SELECT * FROM user WHERE name=:username", dict(username=username))
-    rq.do_with_parameters()
-    result = rq.get_results()
-    return result == []
 
 
 def change_password(username, old_password, new_password):
@@ -54,35 +55,16 @@ def change_password(username, old_password, new_password):
     # 将用户名和密码一起加密，以免暴露不同用户的相同密码
     if verify_pass(new_password,old_password): #新旧密码一致
         return False
-    password = md5(username + new_password)
+    update_password_by_username(username, new_password)
-    rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
-    rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict(
-        password=password, username=username))
-    rq.do_with_parameters()
     return True
 
 
 def get_expiry_date(username):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
+    user = get_user_by_username(username)
-    rq.instructions_with_parameters(
+    if user is None:
-        "SELECT expiry_date FROM user WHERE name=:username", dict(username=username))
-    rq.do_with_parameters()
-    result = rq.get_results()
-    if len(result) > 0:
-        return result[0]['expiry_date']
-    else:
         return '20191024'
-
+    else:
-
+        return user.expiry_date
-def md5(s):
-    '''
-    MD5摘要
-    :param str: 字符串
-    :return: 经MD5以后的字符串
-    '''
-    h = hashlib.md5(s.encode(encoding='utf-8'))
-    return h.hexdigest()
-
 
 class UserName:
     def __init__(self, username):

app/account_service.py

@@ -37,7 +37,7 @@ def signup():
                 session[username] = username
                 session['username'] = username
                 session['expiry_date'] = get_expiry_date(username)
-                session['existing_articles'] = None
+                session['visited_articles'] = None
                 return jsonify({'status': '2'})
             else:
                 return jsonify({'status': '1'})
@@ -66,7 +66,7 @@ def login():
             session['username'] = username
             user_expiry_date = get_expiry_date(username)
             session['expiry_date'] = user_expiry_date
-            session['existing_articles'] = None
+            session['visited_articles'] = None
             return jsonify({'status': '1'})
         else:
             return jsonify({'status': '0'})

app/admin_service.py

@@ -91,10 +91,7 @@ def article():
         question = data.get("question", "")
         level = data.get("level", "4")
         if content:
-            try:  # check level
             if level not in ['1', '2', '3', '4']:
-                    raise ValueError
-            except ValueError:
                 return "Level must be between 1 and 4."
             add_article(content, source, level, question)
             _update_context()

app/model/user.py

@@ -1,5 +1,6 @@
 from model import *
 from Login import md5
+from pony import orm
 
 def get_users():
     with db_session:
@@ -11,6 +12,11 @@ def get_user_by_username(username):
         if user:
             return user.first()
 
+def insert_user(username, password, start_date, expiry_date):
+    with db_session:
+        user = User(name=username, password=password, start_date=start_date, expiry_date=expiry_date)
+        orm.commit()
+
 def update_password_by_username(username, password="123456"):
     with db_session:
         user = User.select(name=username)

app/pickle_idea2.py

@@ -68,7 +68,7 @@ def save_frequency_to_pickle(d, pickle_fname):
     d2 = {}
     for k in d:
         if not k in exclusion_lst and not k.isnumeric() and not len(k) < 2:
-            d2[k] = list(sorted(set(d[k])))
+            d2[k] = list(sorted(d[k])) # 原先这里是d2[k] = list(sorted(set(d[k])))
     pickle.dump(d2, f)
     f.close()
 

app/static/config.yml

@@ -1,16 +1,16 @@
 # 全局引入的css文件地址
 css:
   item:
-    - static/css/bootstrap.css
+    - ../static/css/bootstrap.css
 
 # 全局引入的js文件地址
 js:
   head: # 在页面加载之前加载
-    - static/js/jquery.js
+    - ../static/js/jquery.js
-    - static/js/word_operation.js
+    - ../static/js/word_operation.js
   bottom: # 在页面加载完之后加载
-    - static/js/fillword.js
+    - ../static/js/fillword.js
-    - static/js/highlight.js
+    - ../static/js/highlight.js
 
 # 高亮样式，目前仅支持修改颜色
 highlight:

app/static/js/highlight.js

@@ -38,8 +38,18 @@ function highLight() {
         list[i] = list[i].replace('|', "");
         list[i] = list[i].replace('?', "");
         if (list[i] !== "" && "<mark>".indexOf(list[i]) === -1 && "</mark>".indexOf(list[i]) === -1) {
-	    //将文章中所有出现该单词word的地方改为：" <mark>" + word + "<mark> "。 正则表达式RegExp()中，"\\s"代表单词前后必须要有空格，以防止只对单词中的部分字符高亮的情况出现。
+           //将文章中所有出现该单词word的地方改为："<mark>" + word + "<mark>"。 正则表达式RegExp()中，"\\b"代表单词边界匹配。
-            articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " <mark>" + list[i] + "</mark> ");
+
+            //修改代码
+            let articleContent_fb = articleContent;  //文章副本
+            while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){
+                //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。
+                const index = articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase());
+                list[i] = articleContent_fb.substring(index, index + list[i].length);
+
+                articleContent_fb = articleContent_fb.substring(index + list[i].length);    // 使用副本中list[i]之后的子串替换掉副本
+                articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"<mark>" + list[i] + "</mark>");
+            }
         }
     }
     document.getElementById("article").innerHTML = articleContent;

app/templates/admin_index.html

@@ -30,7 +30,7 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <a class="nav-link" href="/{{ username }}">返回 {{ username }}</a>
+                        <a class="nav-link" href="/{{ username }}/userpage">返回 {{ username }}</a>
                     </li>
                 </ul>
             </div>

app/templates/admin_manage_user.html

@@ -68,9 +68,9 @@
 <script>
     // 密码生成器
     function generatePassword(length) {
-        var charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+~`|}{[]\:;?><,./-=";
+        const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^*()_+~`|}{[]\:;?,./-=";
-        var password = "";
+        let password = "";
-        for (var i = 0; i < length; i++) {
+        for (let i = 0; i < length; i++) {
             password += charset.charAt(Math.floor(Math.random() * charset.length));
         }
         return password;

app/templates/login.html

@@ -22,7 +22,7 @@
                     alert('无法通过验证。');
                     window.location.href = "/login";
                 } else if (response.status === '1') {
-                    window.location.href = "/"+username;
+                    window.location.href = "/"+username+"/userpage";
                 }
             }
         )

app/templates/mainpage_get.html

@@ -23,7 +23,7 @@
     <div class="container-fluid">
         <p><b><font size="+3" color="red">English Pal - Learn English smartly!</font></b></p>
         {% if session['logged_in'] %}
-            <a href="/{{ session['username'] }}">{{ session['username'] }}</a>
+            <a href="/{{ session['username'] }}/userpage">{{ session['username'] }}</a>
             {% if session['username'] == admin_name %}
             <a href="/admin">管理</a></p>
             {% endif %}

app/templates/reset.html

@@ -45,7 +45,7 @@
         <input type="password" placeholder="新密码" class="new-password" name="new-password" id="new-password"/>
         <input type="password" placeholder="确认新密码" class="re-new-password" name="re-new-password" id="re-new-password"/>
         <button id="submit" class="btn" onclick="reset()">提交</button>
-        <button class="btn" onclick="window.location.href='/{{ username }}'">放弃修改</button>
+        <button class="btn" onclick="window.location.href='/{{ username }}/userpage'">放弃修改</button>
 
     </div>
 {% endblock %}

app/templates/signup.html

@@ -35,7 +35,7 @@ You're logged in already! <a href="/logout">Logout</a>.
                     } else if (response.status === '2') {
                         let f = confirm("恭喜，你已成功注册，你的用户名是"+username+'.\n点击“确认”开始使用，或点击“取消”返回首页');
                         if (f) {
-                            window.location.href = '/'+username;
+                            window.location.href = '/'+username+'/userpage';
                         } else {
                             window.location.href = '/';
                         }

app/templates/userpage_get.html

@@ -53,6 +53,7 @@
           >English Pal for
           <font id="username" color="red">{{ username }}</font></b
         >
+
         {% if username == admin_name %}
         <a
           class="btn btn-secondary"
@@ -63,6 +64,7 @@
         >
         {% endif %}
         <a
+          id="quit"
           class="btn btn-secondary"
           href="/logout"
           role="button"
@@ -85,45 +87,44 @@
       </div>
       #} {# {% endfor %}#}
 
-      <a
+      <button
         class="btn btn-success"
-        href="/{{ username }}/reset"
+        id="load_next_article"
-        role="button"
+        onclick="load_next_article()"
-        onclick="stopRead()"
       >
         下一篇 Next Article
-      </a>
+      </button>
-      {% if session.get('existing_articles') != None and
+      <button
-      session.get('existing_articles')["index"] !=0 %}
-      <a
         class="btn btn-success"
-        href="/{{ username }}/back"
+        id="load_pre_article"
-        role="button"
+        onclick="load_pre_article()"
-        onclick="stopRead()"
       >
         上一篇 Previous Article
-      </a>
+      </button>
-      {% endif %}
 
       <p><b>阅读文章并回答问题</b></p>
       <div id="text-content">
-        {% if today_article %}
+        <div id="found">
           <div class="alert alert-success" role="alert">
             According to your word list, your level is
-          <span class="badge bg-success"
+            <span class="badge bg-success" id="user-level"
               >{{ today_article["user_level"] }}</span
             >
             and we have chosen an article with a difficulty level of
-          <span class="badge bg-success"
+            <span class="badge bg-success" id="text_level"
               >{{ today_article["text_level"] }}</span
             >
             for you.
           </div>
-        <p class="text-muted">Article added on: {{ today_article["date"] }}</p>
+          <p class="text-muted" id="date">
+            Article added on: {{ today_article["date"] }}
+          </p>
           <br />
           <div class="p-3 mb-2 bg-light text-dark">
             <br />
-          <p class="display-5">{{ today_article["article_title"] }}</p>
+            <p class="display-5" id="article_title">
+              {{ today_article["article_title"] }}
+            </p>
             <br />
             <p class="lead">
               <font id="article" size="2"
@@ -131,9 +132,13 @@
               >
             </p>
             <br />
-          <p><small class="text-muted">{{ today_article['source'] }}</small></p>
+            <p>
+              <small class="text-muted" id="source"
+                >{{ today_article['source'] }}</small
+              >
+            </p>
             <br />
-          <p><b>{{ today_article['question'] }}</b></p>
+            <p><b id="question">{{ today_article['question'] }}</b></p>
             <br />
             <script type="text/javascript">
               function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
@@ -150,15 +155,30 @@
             </div>
             <br />
           </div>
-        {% else %}
+        </div>
-        <div class="alert alert-success" role="alert">
+        <div
+          class="alert alert-success"
+          role="alert"
+          id="not_found"
+          style="display: none"
+        >
           <p class="text-muted">
             <span class="badge bg-success">Notes:</span><br />No article is
             currently available for you. You can try again a few times or mark
             new words in the passage to improve your level.
           </p>
         </div>
-        {% endif %}
+        <div
+          class="alert alert-success"
+          role="alert"
+          id="read_all"
+          style="display: none"
+        >
+          <p class="text-muted">
+            <span class="badge bg-success">Notes:</span><br />You've read all
+            the articles.
+          </p>
+        </div>
       </div>
 
       <input type="checkbox" onclick="toggleHighlighting()" checked />生词高亮
@@ -180,7 +200,7 @@
         </div>
       </div>
       <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
-      <form method="post" action="/{{ username }}">
+      <form method="post" action="/{{ username }}/userpage">
         <textarea
           name="content"
           id="selected-words"
@@ -255,6 +275,68 @@
     yml['js']['bottom'] %}
     <script src="{{ js }}"></script>
     {% endfor %} {% endif %}
+    <script type="text/javascript">
+      function load_next_article() {
+        $.ajax({
+          url: "/get_next_article/{{username}}",
+          dataType: "json",
+          success: function (data) {
+            // 更新页面内容
+            if (data["today_article"]) {
+              update(data["today_article"]);
+              check_pre(data["visited_articles"]);
+              check_next(data["result_of_generate_article"]);
+            }
+          },
+        });
+      }
+      function load_pre_article() {
+        $.ajax({
+          url: "/get_pre_article/{{username}}",
+          dataType: "json",
+          success: function (data) {
+            // 更新页面内容
+            if (data["today_article"]) {
+              update(data["today_article"]);
+              check_pre(data["visited_articles"]);
+            }
+          },
+        });
+      }
+      function update(today_article) {
+        $("#user-level").html(today_article["user_level"]);
+        $("#text_level").html(today_article["text_level"]);
+        $("#date").html("Article added on: " + today_article["date"]);
+        $("#article_title").html(today_article["article_title"]);
+        $("#article").html(today_article["article_body"]);
+        $("#source").html(today_article["source"]);
+        $("#question").html(today_article["question"]);
+        $("#answer").html(today_article["answer"]);
+      }
+      <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
+      function check_pre(visited_articles) {
+        if (visited_articles == "" || visited_articles["index"] <= 0) {
+          $("#load_pre_article").hide();
+        } else {
+          $("#load_pre_article").show();
+        }
+      }
+      function check_next(result_of_generate_article) {
+        if (result_of_generate_article == "found") {
+          $("#found").show();
+          $("#not_found").hide();
+          $("#read_all").hide();
+        } else if (result_of_generate_article == "not found") {
+          $("#found").hide();
+          $("#not_found").show();
+          $("#read_all").hide();
+        } else {
+          $("#found").hide();
+          $("#not_found").hide();
+          $("#read_all").show();
+        }
+      }
+    </script>
   </body>
   <style>
     mark {

app/user_service.py

@@ -21,36 +21,46 @@ userService = Blueprint("user_bp", __name__)
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment
 
-
+@userService.route("/get_next_article/<username>",methods=['GET','POST'])
-@userService.route("/<username>/reset", methods=['GET', 'POST'])
+def get_next_article(username):
-def user_reset(username):
+    user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
-    '''
+    session['old_articleID'] = session.get('articleID')
-    用户界面
-    :param username: 用户名
-    :return: 返回页面内容
-    '''
     if request.method == 'GET':
-        existing_articles = session.get("existing_articles")
+        visited_articles = session.get("visited_articles")
-        existing_articles["index"] += 1
+        if visited_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来,无需index+=1
-        session["existing_articles"] = existing_articles
+            visited_articles['article_ids'].pop()
-        return redirect(url_for('user_bp.userpage', username=username))
+        else:  # 当前不为“null”，直接 index+=1
+            visited_articles["index"] += 1
+        session["visited_articles"] = visited_articles
+        visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles'))
+        data = {
+            'visited_articles': visited_articles,
+            'today_article': today_article,
+            'result_of_generate_article': result_of_generate_article
+        }
     else:
         return 'Under construction'
+    return json.dumps(data)
 
-@userService.route("/<username>/back", methods=['GET'])
+@userService.route("/get_pre_article/<username>",methods=['GET'])
-def user_back(username):
+def get_pre_article(username):
-    '''
+    user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
-    用户界面
-    :param username: 用户名
-    :return: 返回页面内容
-    '''
     if request.method == 'GET':
-        existing_articles = session.get("existing_articles")
+        visited_articles = session.get("visited_articles")
-        existing_articles["index"] -= 1
+        if(visited_articles["index"]==0):
-        session["existing_articles"] = existing_articles
+            data=''
-        return redirect(url_for('user_bp.userpage', username=username))
+        else:
-
+            visited_articles["index"] -= 1  # 上一篇，index-=1
-
+            if visited_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来
+                visited_articles['article_ids'].pop()
+            session["visited_articles"] = visited_articles
+            visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles'))
+            data = {
+                'visited_articles': visited_articles,
+                'today_article': today_article,
+                'result_of_generate_article':result_of_generate_article
+            }
+        return json.dumps(data)
 
 @userService.route("/<username>/<word>/unfamiliar", methods=['GET', 'POST'])
 def unfamiliar(username, word):
@@ -97,7 +107,7 @@ def deleteword(username, word):
     return "success"
 
 
-@userService.route("/<username>", methods=['GET', 'POST'])
+@userService.route("/<username>/userpage", methods=['GET', 'POST'])
 def userpage(username):
     '''
     用户界面
@@ -134,8 +144,8 @@ def userpage(username):
         words = ''
         for x in lst3:
             words += x[0] + ' '
-        existing_articles, today_article = get_today_article(user_freq_record, session.get('existing_articles'))
+        visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles'))
-        session['existing_articles'] = existing_articles
+        session['visited_articles'] = visited_articles
         # 通过 today_article，加载前端的显示页面
         return render_template('userpage_get.html',
                                admin_name=ADMIN_NAME,
@@ -143,15 +153,12 @@ def userpage(username):
                                session=session,
                                # flashed_messages=get_flashed_messages(), 仅有删除单词的时候使用到flash，而删除单词是异步执行，这里的信息提示是同步执行，所以就没有存在的必要了
                                today_article=today_article,
+                               result_of_generate_article=result_of_generate_article,
                                d_len=len(d),
                                lst3=lst3,
                                yml=Yaml.yml,
                                words=words)
 
-
-
-
-
 @userService.route("/<username>/mark", methods=['GET', 'POST'])
 def user_mark_word(username):
     '''