Merge branch 'Bug394-MiaoChenShuo' into master

app/Article.py

@@ -54,56 +54,14 @@ def get_today_article(user_word_list, articleID):
     d = random.choice(result)
     text_level = text_difficulty_level(d['text'], d3)
     if articleID == None:
-        # print('result = ', len(result), sep=' ')
-        p = False
         for reading in result:
             text_level = text_difficulty_level(reading['text'], d3)
-            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
+            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
             if within_range(text_level, user_level, (8.0 - user_level) * factor):
-                list = session.get('articleIdList')
-                if list == None:
                 d = reading
-                    list = [reading['article_id']]
-                    session['articleIdList'] = list
-                    p = True
                 break
 
-                exist = False
-                for i in list:
-                    if reading['article_id'] == i:
-                        exist = True
-                        break
-                if exist == False:
-                    d = reading
-                    list.append(reading['article_id'])
-                    session['articleIdList']=list
-                    p = True
-                    break
-        if p == False:
-            session['articleIdList'] = None
-            p = True
-            while p:
-                for reading in result:
-                    text_level = text_difficulty_level(reading['text'], d3)
-                    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
-                    if within_range(text_level, user_level, (8.0 - user_level) * factor):
-                        if reading['article_id'] != session['prearticleID']:
-                            d = reading
-                            p = False
-    '''
-    测试代码：
-    print(session['articleIdList'])
-    print(session['prearticleID'], d['article_id'], sep=' ')
-    
-    问题描述：选择下一篇文章时，由于没有考虑选择文章时会重复选择当前文章，可能会导致重复进入某一篇文章
-    解决方法：选择下一篇文章时，将选择的文章ID和当前文章ID比较，若重复则换一个
-    进一步优化：
-        问题描述：利用上述方法可以满足不重复进入某一篇文章，但是可能两篇文章会反复出现
-        解决方法：记录一个队列，用来保存出现过的文章ID
-                选择文章时，若文章Id出现在队列中，则放弃；
-                若都出现过，则清空队列，随机选择一个不与当前文章重复的文章 
-    '''
-
     s = '<div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success">%4.2f</span>  and we have chosen an article with a difficulty level of <span class="badge bg-success">%4.2f</span> for you.</div>' % (
         user_level, text_level)
     s += '<p class="text-muted">Article added on: %s</p>' % (d['date'])

app/Login.py

@@ -5,6 +5,10 @@ from UseSqlite import InsertQuery, RecordQuery
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment
 
+def verify_pass(newpass,oldpass):
+    if(newpass==oldpass):
+        return True
+
 
 def verify_user(username, password):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
@@ -47,6 +51,8 @@ def change_password(username, old_password, new_password):
     if not verify_user(username, old_password):  # 旧密码错误
         return False
     # 将用户名和密码一起加密，以免暴露不同用户的相同密码
+    if verify_pass(new_password,old_password): #新旧密码一致
+        return False
     password = md5(username + new_password)
     rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
     rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict(

app/account_service.py

@@ -36,8 +36,6 @@ def signup():
                 session['username'] = username
                 session['expiry_date'] = get_expiry_date(username)
                 session['articleID'] = None
-                session['articleIdList'] = None
-                session['prearticleID'] = None
                 return '<p>恭喜，你已成功注册， 你的用户名是 <a href="%s">%s</a>。</p>\
                 <p><a href="/%s">开始使用</a> <a href="/">返回首页</a><p/>' % (username, username, username)
             else:

app/user_service.py

@@ -30,7 +30,6 @@ def user_reset(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        session['prearticleID'] = session['articleID']
         session['articleID'] = None
         return redirect(url_for('user_bp.userpage', username=username))
     else: