From 8cbc7c9a0ce543db48f80a743c4168ca847ca500 Mon Sep 17 00:00:00 2001 From: lisinan <1299311192@qq.com> Date: Fri, 24 May 2024 22:00:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=8B=E4=B8=80=E9=A1=B5=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A2=91=E7=8E=87=E8=BF=87=E5=BF=AB=E6=97=B6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=9C=AA=E7=9F=A5?= =?UTF-8?q?=E5=90=8D=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/userpage_get.html | 211 ++++++++++++++++++++++++-------- app/test/test_next_article.py | 85 +++++++++++++ requirements.txt | 5 +- 3 files changed, 252 insertions(+), 49 deletions(-) create mode 100644 app/test/test_next_article.py diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 68997ef..0488aea 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -5,6 +5,8 @@ + + {{ yml['header'] | safe }} {% if yml['css']['item'] %} @@ -26,12 +28,40 @@ } @keyframes shakes { - 10%, 90% { transform: translate3d(-1px, 0, 0); } - 20%, 50% { transform: translate3d(+2px, 0, 0); } - 30%, 70% { transform: translate3d(-4px, 0, 0); } - 40%, 60% { transform: translate3d(+4px, 0, 0); } - 50% { transform: translate3d(-4px, 0, 0); } + 10%, 90% { + transform: translate3d(-1px, 0, 0); + } + 20%, 50% { + transform: translate3d(+2px, 0, 0); + } + 30%, 70% { + transform: translate3d(-4px, 0, 0); + } + 40%, 60% { + transform: translate3d(+4px, 0, 0); + } + 50% { + transform: translate3d(-4px, 0, 0); + } } + + .lead { + font-size: 22px; + font-family: Helvetica, sans-serif; + white-space: pre-wrap; + } + + .arrow { + padding: 0; + font-size: 20px; + line-height: 21px; + display: inline-block; + } + + .arrow:hover { + cursor: pointer; + } + @@ -39,53 +69,70 @@

English Pal for {{ username }} {% if username == admin_name %} - 管理 + 管理 {% endif %} 退出 重设密码

-{# {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #} -{# #} -{# {% endfor %}#} + {% for message in get_flashed_messages() %} + + {% endfor %} - - + +

阅读文章并回答问题

- -

Article added on: {{ today_article["date"] }}


-

-

{{ today_article["article_title"] }}


-

{{ today_article["article_body"] }}


-

{{ today_article['source'] }}


-

{{ today_article['question'] }}


+ +

Article added on: {{ today_article["date"] }}


+

+

{{ today_article["article_title"] }}


+

{{ today_article["article_body"] }}


+
+

{{ today_article['source'] }}


+
+ +

{{ today_article['question'] }}


-
+ +
- 生词高亮 - 大声朗读 - 划词入库 + 生词高亮 + 大声朗读 + 划词入库
@@ -97,8 +144,8 @@

收集生词吧 （可以在正文中划词，也可以复制黏贴）


- - + +
{% if session.get['thisWord'] %}
{{ yml['footer'] | safe }} @@ -52,5 +53,22 @@ {% endfor %} {% endif %} + diff --git a/app/templates/mainpage_post.html b/app/templates/mainpage_post.html index 7357457..5df7dd5 100644 --- a/app/templates/mainpage_post.html +++ b/app/templates/mainpage_post.html @@ -2,7 +2,7 @@ - Title + 单词词频 {{ yml['header'] | safe }} {% if yml['css']['item'] %} diff --git a/app/templates/reset.html b/app/templates/reset.html index 3425c97..408e001 100644 --- a/app/templates/reset.html +++ b/app/templates/reset.html @@ -12,6 +12,10 @@ alert('输入不能为空!'); return false; } + if (old_password.includes(' ') || new_password.includes(' ')) { + alert('输入不能包含空格!'); + return false; + } if (new_password !== re_new_password) { alert('新密码不匹配，请重新输入'); return false; diff --git a/app/templates/signup.html b/app/templates/signup.html index 9030d41..6b5db6e 100644 --- a/app/templates/signup.html +++ b/app/templates/signup.html @@ -16,6 +16,10 @@ You're logged in already! Logout. alert('输入不能为空!'); return false; } + if (password.includes(' ') || password2.includes(' ')) { + alert('输入不能包含空格!'); + return false; + } if (password !== password2) { alert('确认密码与输入密码不一致！'); return false; @@ -53,7 +57,7 @@ You're logged in already! Logout.

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 0488aea..6fab7a5 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -23,44 +23,34 @@ EnglishPal Study Room for {{ username }} @@ -69,83 +59,72 @@

English Pal for {{ username }} {% if username == admin_name %} - 管理 + 管理 {% endif %} 退出 重设密码

{% for message in get_flashed_messages() %} - + {% endfor %} - - + +

阅读文章并回答问题

- -

Article added on: {{ today_article["date"] }}


+ +

Article added on: {{ today_article["date"] }}



-

{{ today_article["article_title"] }}


-

{{ today_article["article_body"] }}


-
-

{{ today_article['source'] }}


-
+

{{ today_article["article_title"] }}


+

{{ today_article["article_body"] }}


+
+

{{ today_article['source'] }}


+
-

{{ today_article['question'] }}


+

{{ today_article['question'] }}


- -
+
- 生词高亮 - 大声朗读 - 划词入库 + 生词高亮 + 大声朗读 + 划词入库
1×
- +

收集生词吧 （可以在正文中划词，也可以复制黏贴）


- +
{% if session.get['thisWord'] %} - {% endfor %} - {% endif %} + {{ yml['header'] | safe }} + {% if yml['css']['item'] %} + {% for css in yml['css']['item'] %} + + {% endfor %} + {% endif %} + {% if yml['js']['head'] %} + {% for js in yml['js']['head'] %} + + {% endfor %} + {% endif %} - EnglishPal Study Room for {{username}} - - -

取消勾选认识的单词

-
- - {% for x in lst %} - {% set word = x[0]%} -

- {{loop.index}} - : - {{word}} - ({{x[1]}}) - -

+ EnglishPal Study Room for {{username}} + + +
+

+ + +

+ + + {% for x in lst %} + {% set word = x[0]%} +

+ {{loop.index}} + : + {{word}} + ({{x[1]}}) + +

- {% endfor %} - - {{ yml['footer'] | safe }} - {% if yml['js']['bottom'] %} - {% for js in yml['js']['bottom'] %} - - {% endfor %} - {% endif %} - + {% endfor %} + + {{ yml['footer'] | safe }} + {% if yml['js']['bottom'] %} + {% for js in yml['js']['bottom'] %} + + {% endfor %} + {% endif %} +
+ diff --git a/app/test/conftest.py b/app/test/conftest.py index 29f6431..ed4186c 100644 --- a/app/test/conftest.py +++ b/app/test/conftest.py @@ -1,6 +1,9 @@ import pytest +import sqlite3 +import time from selenium import webdriver -from selenium.webdriver.common.desired_capabilities import DesiredCapabilities + +from pathlib import Path @pytest.fixture def URL(): @@ -9,5 +12,24 @@ def URL(): @pytest.fixture def driver(): - my_driver = webdriver.Edge() # uncomment this line if you wish to run the test on your laptop - return my_driver + return webdriver.Edge() # follow the "End-to-end testing" section in README.md to install the web driver executable + + +@pytest.fixture +def restore_sqlite_database(): + ''' + Automatically restore SQLite database file app/db/wordfreqapp.db + using SQL statements from app/static/wordfreqapp.sql + ''' + con = sqlite3.connect('../db/wordfreqapp.db') + with con: + con.executescript('DROP TABLE IF EXISTS user;') + con.executescript('DROP TABLE IF EXISTS article;') + con.executescript(open('../static/wordfreqapp.sql', encoding='utf8').read()) + con.close() + + +@pytest.fixture(autouse=True) +def restart_englishpal(restore_sqlite_database): + (Path(__file__).parent / '../main.py').touch() + time.sleep(1) diff --git a/app/test/helper.py b/app/test/helper.py new file mode 100644 index 0000000..2b0deec --- /dev/null +++ b/app/test/helper.py @@ -0,0 +1,33 @@ +import uuid +from selenium.webdriver.support.ui import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC +from selenium.common.exceptions import UnexpectedAlertPresentException, NoAlertPresentException + +def signup(URL, driver): + username = 'TestUser' + str(uuid.uuid1()).split('-')[0].title() + password = '[Abc+123]' + + driver.get(URL) + + elem = driver.find_element_by_link_text('注册') + elem.click() + + elem = driver.find_element_by_id('username') + elem.send_keys(username) + + elem = driver.find_element_by_id('password') + elem.send_keys(password) + + elem = driver.find_element_by_id('password2') + elem.send_keys(password) + + elem = driver.find_element_by_class_name('btn') # 找到"注册"按钮 + elem.click() + + try: + WebDriverWait(driver, 1).until(EC.alert_is_present()) + driver.switch_to.alert.accept() + except (UnexpectedAlertPresentException, NoAlertPresentException): + pass + + return username, password diff --git a/app/test/test_add_word.py b/app/test/test_add_word.py index a08c376..6526bf0 100644 --- a/app/test/test_add_word.py +++ b/app/test/test_add_word.py @@ -1,76 +1,31 @@ -# -*- coding: utf-8 -*- -# Run the docker image using the following command: -# docker run -d -p 4444:4444 selenium/standalone-chrome -from selenium import webdriver -from selenium.webdriver.common.desired_capabilities import DesiredCapabilities - -import random, time -import string - -driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -driver.implicitly_wait(10) - -HOME_PAGE = 'http://121.4.94.30:91/' +import time +from helper import signup -def has_punctuation(s): - return [c for c in s if c in string.punctuation] != [] - -def test_add_word(): +def test_add_word(URL, driver): try: - driver.get(HOME_PAGE) - assert 'English Pal -' in driver.page_source - - # login - elem = driver.find_element_by_link_text('登录') - elem.click() - - uname = 'lanhui' - password = 'l0ve1t' - elem = driver.find_element_by_name('username') - elem.send_keys(uname) - - elem = driver.find_element_by_name('password') - elem.send_keys(password) - - elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到登录按钮 - elem.click() - - assert 'EnglishPal Study Room for ' + uname in driver.title - - # get essay content - elem = driver.find_element_by_id('text-content') - essay_content = elem.text - - elem = driver.find_element_by_id('selected-words') - word = random.choice(essay_content.split()) - while 'font>' in word or 'br>' in word or 'p>' in word or len(word) < 6 or has_punctuation(word): - word = random.choice(essay_content.split()) + username, password = signup(URL, driver) # sign up a new account and automatically log in + time.sleep(1) + # enter the word in the text area + elem = driver.find_element_by_id('selected-words') + word = 'devour' elem.send_keys(word) - elem = driver.find_element_by_xpath('//form[1]//input[1]') # 找到get所有词频按钮 - elem.click() - - elems = driver.find_elements_by_xpath("//input[@type='checkbox']") - for elem in elems: - if elem.get_attribute('name') == 'marked': - elem.click() - - elem = driver.find_element_by_name('add-btn') # 找到加入我的生词簿按钮 + elem = driver.find_element_by_xpath('//form[1]//button[1]') # 找到"把生词加入我的生词库"按钮 + elem.click() + + elem = driver.find_element_by_name('add-btn') # 找到"加入我的生词簿"按钮 elem.click() - driver.refresh() - driver.refresh() - driver.refresh() elems = driver.find_elements_by_xpath("//p[@class='new-word']/a") - + found = 0 for elem in elems: if word in elem.text: found = 1 break - + assert found == 1 - finally: + finally: driver.quit() diff --git a/app/test/test_bug528_tangjiao.py b/app/test/test_bug528_tangjiao.py new file mode 100644 index 0000000..802423c --- /dev/null +++ b/app/test/test_bug528_tangjiao.py @@ -0,0 +1,95 @@ +import pytest +from selenium import webdriver +from selenium.webdriver.common.by import By +from selenium.webdriver.common.keys import Keys +from selenium.webdriver.support.ui import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC +from selenium.common.exceptions import NoSuchElementException, TimeoutException + + +# 测试登录页面输入密码包含空格的情况 +def test_login_password_with_space(driver, URL): + try: + driver.get(URL+"/login") + + # 输入用户名 + username_elem = driver.find_element_by_id('username') + username_elem.send_keys("test_user") + + # 输入包含空格的密码 + password_elem = driver.find_element_by_id('password') + password_elem.send_keys("password with space") + + # 提交登录表单 + elem = driver.find_element_by_class_name('btn') # 找到提交按钮 + elem.click() + + # 显式等待直到警告框出现 + WebDriverWait(driver, 10).until(EC.alert_is_present()) + + # 检查是否弹出警告框 + alert = driver.switch_to.alert + assert "输入不能包含空格!" in alert.text + except (NoSuchElementException, TimeoutException) as e: + pytest.fail("页面元素未找到或超时: {}".format(e)) + + +# 测试注册页面输入密码包含空格的情况 + +def test_signup_password_with_space(driver, URL): + try: + driver.get(URL+"/signup") + + # 输入用户名 + username_elem = driver.find_element_by_id('username') + username_elem.send_keys("new_user") + + # 输入包含空格的密码 + password_elem = driver.find_element_by_id('password') + password_elem.send_keys("password with space") + + # 再次输入密码 + password2_elem = driver.find_element_by_id('password2') + password2_elem.send_keys("password with space") + + # 提交注册表单 + elem = driver.find_element_by_class_name('btn') # 找到提交按钮 + elem.click() + + # 显式等待直到警告框出现 + WebDriverWait(driver, 10).until(EC.alert_is_present()) + + # 检查是否弹出警告框 + alert = driver.switch_to.alert + assert "输入不能包含空格!" in alert.text + except (NoSuchElementException, TimeoutException) as e: + pytest.fail("页面元素未找到或超时: {}".format(e)) + + + +# 测试重设密码页面输入新密码包含空格的情况 + +def test_reset_password_with_space(driver, URL): + try: + driver.get(URL+"/reset") + + # 输入用户名 + username_elem = driver.find_element_by_id('username') + username_elem.send_keys("test_user") + + # 输入包含空格的密码 + password_elem = driver.find_element_by_id('password') + password_elem.send_keys("password with space") + + # 提交重设密码表单 + elem = driver.find_element_by_class_name('btn') # 找到提交按钮 + elem.click() + + # 显式等待直到警告框出现 + WebDriverWait(driver, 10).until(EC.alert_is_present()) + + # 检查是否弹出警告框 + alert = driver.switch_to.alert + assert "输入不能包含空格!" in alert.text + except (NoSuchElementException, TimeoutException) as e: + pytest.fail("页面元素未找到或超时: {}".format(e)) diff --git a/app/test/test_bug544_tangxinyuan.py b/app/test/test_bug544_tangxinyuan.py new file mode 100644 index 0000000..2cffdd4 --- /dev/null +++ b/app/test/test_bug544_tangxinyuan.py @@ -0,0 +1,55 @@ +import random +import string +import time + +from selenium.webdriver.common.by import By +from selenium.webdriver.support.ui import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC + +from helper import signup + + +def has_punctuation(s): + return any(c in string.punctuation for c in s) + + +def login(driver, home, uname, password): + driver.get(home) + WebDriverWait(driver, 10).until(EC.element_to_be_clickable((By.LINK_TEXT, '登录'))).click() + driver.find_element(By.ID, 'username').send_keys(uname) + driver.find_element(By.ID, 'password').send_keys(password) + driver.find_element(By.XPATH, '//button[text()="登录"]').click() + WebDriverWait(driver, 10).until(EC.title_is(f"EnglishPal Study Room for {uname}")) + + +def select_valid_word(driver): + elem = driver.find_element(By.ID, 'text-content') + essay_content = elem.text + valid_word = random.choice([word for word in essay_content.split() if len(word) >= 6 and not has_punctuation( + word) and 'font>' not in word and 'br>' not in word and 'p>' not in word]) + driver.find_element(By.ID, 'selected-words').send_keys(valid_word) + return valid_word + + +def test_save_selected_word(driver, URL): + try: + username, password = signup(URL, driver) + word = select_valid_word(driver) + stored_words = driver.execute_script('return localStorage.getItem("selectedWords");') + assert word == stored_words, "Selected word not saved to localStorage correctly" + # 退出并重新登录以检查存储的单词 + driver.find_element(By.LINK_TEXT, '退出').click() + driver.execute_script("window.open('');window.close();") + + # 等待一会儿，让浏览器有足够的时间关闭标签页 + WebDriverWait(driver, 2) + + # 重新打开一个新的标签页 + driver.execute_script("window.open('');") + driver.switch_to.window(driver.window_handles[-1]) # 切换到新打开的标签页 + + login(driver, URL, username, password) + textarea_content = driver.find_element(By.ID, 'selected-words').get_attribute('value') + assert word == textarea_content, "Selected word not preserved after re-login" + finally: + driver.quit() diff --git a/app/test/test_bug545_HuangHuiLing.py b/app/test/test_bug545_HuangHuiLing.py new file mode 100644 index 0000000..21ddeea --- /dev/null +++ b/app/test/test_bug545_HuangHuiLing.py @@ -0,0 +1,44 @@ +import random +import string +import time +from selenium.webdriver.common.by import By +from selenium.webdriver.support.ui import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC +from selenium.webdriver.common.action_chains import ActionChains + +from helper import signup + +def has_punctuation(s): + return any(c in string.punctuation for c in s) + +def select_one(driver): + elem = driver.find_element(By.ID, 'article') + essay_content = elem.text + valid_word = random.choice([word for word in essay_content.split() if len(word) >= 6 and not has_punctuation( + word) and 'font>' not in word and 'br>' not in word and 'p>' not in word]) + driver.find_element(By.ID, 'selected-words').send_keys(valid_word) + driver.find_element(By.ID, 'article').click() + return valid_word + +def select_two(driver): + word = driver.find_element(By.CLASS_NAME, 'highlighted') + + # 创建ActionChains对象 + actions = ActionChains(driver) + actions.move_to_element(word) + + # 模拟鼠标按下并拖动以选择文本 + actions.double_click() + actions.perform() + + +def test_selected_second_word(driver, URL): + try: + signup(URL, driver) + selected_words = select_one(driver); + assert selected_words.strip() != "", "选中的单词被放置框中" + select_two(driver) + selected_second_words = driver.find_element(By.ID, 'selected-words').get_attribute('value') + assert selected_second_words.strip() == "", "选中的单词被删除" + finally: + driver.quit() diff --git a/app/test/test_bug546_lixiaofeng.py b/app/test/test_bug546_lixiaofeng.py new file mode 100644 index 0000000..671094b --- /dev/null +++ b/app/test/test_bug546_lixiaofeng.py @@ -0,0 +1,39 @@ +from selenium.webdriver.common.action_chains import ActionChains +from helper import signup + + +def test_highlight(driver, URL): + try: + # 打开网页 + driver.get(URL) + driver.maximize_window() + + # 注册 + signup(URL, driver) + + # 取消勾选“划词入库按钮” + highlight_checkbox = driver.find_element_by_id("chooseCheckbox") + driver.execute_script("arguments[0].click();", highlight_checkbox) + + article = driver.find_element_by_id("article") + + # 创建 ActionChains 对象 + actions = ActionChains(driver) + + # 移动鼠标到起点位置 + actions.move_to_element(article) + # actions.move_to_element_with_offset(article, 50, 100) + # 按下鼠标左键 + actions.click_and_hold() + # 拖动鼠标到结束位置 + actions.move_by_offset(400,50) + # 释放鼠标左键 + actions.release() + # 执行操作链 + actions.perform() + # time.sleep(10) + + assert driver.find_elements_by_class_name("highlighted") is not None + finally: + # 测试结束后关闭浏览器 + driver.quit() \ No newline at end of file diff --git a/app/test/test_bug551_DingZeYu.py b/app/test/test_bug551_DingZeYu.py new file mode 100644 index 0000000..015fb5a --- /dev/null +++ b/app/test/test_bug551_DingZeYu.py @@ -0,0 +1,37 @@ +import time +import pytest +from selenium import webdriver +from selenium.webdriver import ActionChains +from selenium.webdriver.common.by import By +from selenium.webdriver.common.alert import Alert +from selenium.webdriver.support import expected_conditions as EC +from selenium.webdriver.support.wait import WebDriverWait +from helper import signup + +def test_bug551(driver, URL): + driver.maximize_window() + driver.get(URL) + + username, password = signup(URL, driver) + + article = driver.find_element(By.ID, 'article') + actions = ActionChains(driver) + + actions.move_to_element(article) + actions.click_and_hold() + actions.move_by_offset(450, 200) + actions.release() + actions.perform() + + # 获取选中高亮部分的单词的元素 + highlighted_words = driver.find_elements(By.CLASS_NAME, 'highlighted') + + # 验证选中部分的单词是否同时应用了需求样式 + expected_font_weight = "400" + + for word in highlighted_words: + font_weight = word.value_of_css_property("font-weight") + assert font_weight == expected_font_weight, f"选中部分的单词的字体样式错误" + + time.sleep(5) + driver.quit() diff --git a/app/test/test_bug553_LinShan.py b/app/test/test_bug553_LinShan.py new file mode 100644 index 0000000..388f5da --- /dev/null +++ b/app/test/test_bug553_LinShan.py @@ -0,0 +1,58 @@ +from selenium import webdriver +from selenium.webdriver.common.desired_capabilities import DesiredCapabilities +from selenium.webdriver.support import expected_conditions as EC +from selenium import webdriver +from selenium.webdriver.support.wait import WebDriverWait +from selenium.webdriver.common.by import By +from selenium.webdriver.common.keys import Keys +import logging +import time +import pytest + +@pytest.mark.parametrize("test_input,expected", + [("‘test1’", "test1"), + ("'test2'", "test2"), + ("“test3”", "test3"), + ("it's", "it's"), + ("hello,I'm linshan", ["hello","i'm","linshan"]), + ("Happy New Year！？", ["happy","new","year"]), + ("My favorite book is 《Harry Potter》。", ["potter","harry","my","favorite","book","is"])]) +def test_bug553_LinShan(test_input,expected, driver, URL): + try: + # 打开对应地址的网页 + driver.get(URL) + + # 浏览器最大窗口化 + driver.maximize_window() + + # 判断网页源代码中是否有English Pal -文字 + assert 'English Pal -' in driver.page_source + + # 将测试的数据输入到主页的textarea里 + driver.find_element_by_xpath("//textarea[@name='content']").send_keys(Keys.CONTROL, "a") + driver.find_element_by_xpath("//textarea[@name='content']").send_keys(test_input) + time.sleep(1) + + # 点击按钮获取单词 + driver.find_element_by_xpath("//input[@value='get文章中的词频']").click() + time.sleep(1) + + # 获取筛选后的单词 + words = driver.find_elements_by_xpath("//p/a") + + # 遍历获取到的单词，并判断单词与预期的相同 + for word in words: + # 判断单词是否在预期结果中 + assert word.text in expected + + # 返回上一页网页 + driver.find_element_by_xpath("//input[@value='确定并返回']").click() + time.sleep(0.1) + + except Exception as e: + # 输出异常信息 + logging.error(e) + # 关闭浏览器 + driver.quit() + finally: + driver.quit() diff --git a/app/test/test_bug561_LiangZiyue.py b/app/test/test_bug561_LiangZiyue.py new file mode 100644 index 0000000..368bc0b --- /dev/null +++ b/app/test/test_bug561_LiangZiyue.py @@ -0,0 +1,27 @@ +import random +import string +from selenium.webdriver.common.by import By +from selenium.webdriver.support.ui import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC + + +def test_bug561_LiangZiyue(driver, URL): + try: + driver.get(home) + WebDriverWait(driver, 10).until(EC.element_to_be_clickable((By.LINK_TEXT, '登录'))).click() + driver.find_element(By.ID, 'username').send_keys("wrr") + driver.find_element(By.ID, 'password').send_keys("1234") + driver.find_element(By.XPATH, '//button[text()="登录"]').click() + ele = driver.find_element(By.XPATH,'//font[@id="article"]') + driver.execute_script('arguments[0].scrollIntoView();',ele) + action = ActionChains(driver) + action.click_and_hold(ele) + action.move_by_offset(0,500) + action.perform() + next_ele = driver.find_element(By.ID,'//button[@id="load_next_article"]') + driver.execute_script('arguments[0].scrollIntoView();',next_ele) + next_ele.click() + driver.execute_script('arguments[0].scrollIntoView();',ele) + ele.click() + finally: + driver.quit() \ No newline at end of file diff --git a/app/test/test_stress.py b/app/test/test_stress.py new file mode 100755 index 0000000..b437b86 --- /dev/null +++ b/app/test/test_stress.py @@ -0,0 +1,43 @@ +''' Contributed by Lin Junhong et al. 2023-06.''' + +import requests +import multiprocessing +import time + +def stress(username): + try: + data = { + 'username': username, + 'password': '123123' + } + headers = { + 'User-Agent': 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36 Edg/114.0.1823.51' + } + session = requests.session() + response = session.post(url='http://127.0.0.1:5000/signup', data=data, headers=headers) + print('Sign up ', response.status_code) + time.sleep(0.5) + response = session.post(url='http://127.0.0.1:5000/login', data=data, headers=headers) + print('Sign in ', response.status_code) + time.sleep(0.5) + response = session.get(url=f'http://127.0.0.1:5000/{username}/userpage', headers=headers) + print('User page', response.status_code) + time.sleep(0.5) + print(session.cookies) + for i in range(5): + response = session.get(url=f'http://127.0.0.1:5000/get_next_article/{username}', headers=headers, cookies=session.cookies) + time.sleep(0.5) + print(f'Next page ({i}) [{username}]') + print(response.status_code) + print(response.json()['today_article']['article_title']) + except Exception as e: + print(e) + + +if __name__ == '__main__': + username = 'Learner' + pool = multiprocessing.Pool(processes=10) + for i in range(10): + pool.apply_async(stress, (f'{username}{i}',)) + pool.close() + pool.join() diff --git a/app/user_service.py b/app/user_service.py index 2e5feed..27323b8 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -15,6 +15,9 @@ from wordfreqCMD import sort_in_descending_order import pickle_idea import pickle_idea2 +import logging +logging.basicConfig(filename='log.txt', format='%(asctime)s %(message)s', level=logging.DEBUG) + # 初始化蓝图 userService = Blueprint("user_bp", __name__) @@ -32,7 +35,9 @@ def get_next_article(username): else: # 当前不为“null”，直接 index+=1 visited_articles["index"] += 1 session["visited_articles"] = visited_articles + logging.debug('/get_next_article: start calling get_today_arcile()') visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles')) + logging.debug('/get_next_arcile: done.') data = { 'visited_articles': visited_articles, 'today_article': today_article, @@ -129,7 +134,7 @@ def userpage(username): user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username) if request.method == 'POST': # when we submit a form - content = escape(request.form['content']) + content = request.form['content'] f = WordFreq(content) lst = f.get_freq() return render_template('userpage_post.html',username=username,lst = lst, yml=Yaml.yml) @@ -176,7 +181,11 @@ def user_mark_word(username): for word in request.form.getlist('marked'): lst.append((word, [get_time()])) d = pickle_idea2.merge_frequency(lst, lst_history) - pickle_idea2.save_frequency_to_pickle(d, user_freq_record) + if len(lst_history) > 999: + flash('You have way too many words in your difficult-words book. Delete some first.') + else: + pickle_idea2.save_frequency_to_pickle(d, user_freq_record) + flash('Added %s.' % (', '.join(request.form.getlist('marked')))) return redirect(url_for('user_bp.userpage', username=username)) else: return 'Under construction' diff --git a/app/wordfreqCMD.py b/app/wordfreqCMD.py index dcee74e..feeafbd 100644 --- a/app/wordfreqCMD.py +++ b/app/wordfreqCMD.py @@ -4,6 +4,7 @@ ########################################################################### import collections +import html import string import operator import os, sys # 引入模块sys，因为我要用里面的sys.argv列表中的信息来读取命令行参数。 @@ -39,7 +40,8 @@ def file2str(fname):#文件转字符 def remove_punctuation(s): # 这里是s是形参 (parameter)。函数被调用时才给s赋值。 - special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' # 把里面的字符都去掉 + special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|，。？！￥……（）、《》：；·' # 把里面的字符都去掉 + s = html.unescape(s) # 将HTML实体转换为对应的字符，比如<会被识别为小于号 for c in special_characters: s = s.replace(c, ' ') # 防止出现把 apple,apple 移掉逗号后变成 appleapple 情况 s = s.replace('--', ' ') @@ -104,7 +106,7 @@ if __name__ == '__main__': print('%s\t%d\t%s' % (x[0], x[1], youdao_link(x[0])))#函数导出 # 把频率的结果放result.html中 - make_html_page(sort_in_descending_order(L), 'result.html') + make_html_page(sort_in_descending_order(L), 'result.html') print('\nHistory:\n') if os.path.exists('frequency.p'): diff --git a/build.sh b/build.sh index e313fce..158a86f 100755 --- a/build.sh +++ b/build.sh @@ -2,10 +2,7 @@ DEPLOYMENT_DIR=/home/lanhui/englishpal2/EnglishPal cd $DEPLOYMENT_DIR - -# Install dependencies - -pip3 install -r requirements.txt +pwd # Stop service sudo docker stop EnglishPal @@ -15,7 +12,7 @@ sudo docker rm EnglishPal sudo docker build -t englishpal . # Run the application -sudo docker run --restart=always -d --name EnglishPal -p 90:80 -v ${DEPLOYMENT_DIR}/app/static/frequency:/app/static/frequency -v ${DEPLOYMENT_DIR}/app/static/:/app/static/ -t englishpal # for permanently saving data +sudo docker run --restart=always -d --name EnglishPal -p 90:80 -v ${DEPLOYMENT_DIR}/app/static/frequency:/app/static/frequency --mount type=volume,src=englishpal-db,target=/app/db -t englishpal # for permanently saving data # Save space. Run it after sudo docker run sudo docker system prune -a -f diff --git a/da b/da new file mode 100644 index 0000000..0ff8001 --- /dev/null +++ b/da @@ -0,0 +1,391 @@ +commit 8cbc7c9a0ce543db48f80a743c4168ca847ca500 (HEAD -> Alpha-snapshot20240618, origin/master, origin/HEAD, master) +Author: lisinan <1299311192@qq.com> +Date: Fri May 24 22:00:08 2024 +0800 + + 修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面 + +commit ff6286cf01bccdda793ec626c66594e43d81cb16 (origin/547, origin/542) +Author: 丁晟晔 <759539128@qq.com> +Date: Mon May 6 11:42:32 2024 +0800 + + 删除 app/test/test_bug551_DingZeYu.py + +commit 1d7e61d7519342396bec9c64cdd8090c1515cec7 +Author: 丁晟晔 <759539128@qq.com> +Date: Mon May 6 11:36:36 2024 +0800 + + 上传文件至 app/test + +commit 708a6a282102c2b60e3abfade633389bc1f03ddb (origin/Bosh) +Merge: 43c719b 688a198 +Author: 顾涵 <1554137355@qq.com> +Date: Sun Jun 4 12:39:34 2023 +0800 + + Merge pull request 'WIP：Bug529-GuHan' (#88) from Bug529-GuHan into master + + Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/88 + +commit 688a19876823e818f3f312f865f4921f28f28c53 (origin/Bug529-GuHan) +Merge: 030b897 1543b30 +Author: ghaa0920 <1554137355@qq.com> +Date: Sun May 28 16:31:12 2023 +0800 + + 已经与Alpha-snapshot20230525 分支同步，重新提交 + +commit 1543b3095dde2a295293af1ea7e495d6ba005f8d (origin/Refactor-XunYucan, origin/Alpha-snapshot20230525) +Merge: c6bf323 b41e104 +Author: Xunflash +Date: Thu May 25 22:30:06 2023 +0800 + + Merge remote-tracking branch 'origin/Alpha-snapshot20230519' into Refactor-XunYucan + +commit c6bf323c6084255abcde0c47ae1a0504bd372475 +Author: Xunflash +Date: Thu May 25 21:23:25 2023 +0800 + + 修改格式 + +commit 03ccb3527a94a3c463b4bffe24ba0f579f286d5f +Author: Xunflash +Date: Thu May 25 17:35:31 2023 +0800 + + 重构前端阅读js，新增阅读器全局对象，新增生词朗读按钮 + +commit b41e1044bce3e4d9169b7743ce9aad74c0fec7d7 (origin/Alpha-snapshot20230519) +Author: Hui Lan +Date: Wed May 24 10:12:44 2023 +0800 + + difficulty.py: add some stop words, hoping that getting the next article can be faster. + +commit 67e921ba60df76640005fa2838d80808b311bc2d +Author: Hui Lan +Date: Tue May 23 22:25:40 2023 +0800 + + difficulty.py: todo. + +commit a5c3564f15cea5ddb5f79ba15bf888a332698440 +Author: Hui Lan +Date: Tue May 23 22:22:57 2023 +0800 + + difficulty.py: do not stem a word twice. + +commit 1295616d5be485475b06e456458a3b8b7a092a50 +Merge: 3494881 c151a0e +Author: Hui Lan +Date: Tue May 23 19:50:30 2023 +0800 + + Merge branch 'Bug476-YuHuangtao' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230519 + +commit c151a0efaa109aa806c40105cb86d1b3950458ea (origin/Bug476-YuHuangtao) +Author: PlutoCtx +Date: Tue May 23 19:40:33 2023 +0800 + + 去掉了get_difficulty_level_for_user的多出的break + +commit 030b89706e51a35d95eb6eafa7ae2b2fefac821b +Author: ghaa0920 <1554137355@qq.com> +Date: Sat May 20 15:29:12 2023 +0800 + + special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符，我将其中的“-”删去，使连字符没有被过滤，实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug，答案是肯定的，但是这段代码中的过滤字符虽然多，但是并没有完全过滤掉所有字符，（过滤的只是键盘上能打出的字符，不包括输入法中能打出的特殊字符），所以字符bug本身就一直存在，我认为减少一个“-”字符对程序的过滤过程不会造成问题。 + +commit 349488167b3c1cbdf6116adff5798cf356d94af2 +Author: Hui Lan +Date: Fri May 19 09:03:20 2023 +0800 + + requirements.txt: install snowballstemmer for better computing a word's difficulty level. + +commit 39d96014d90892faf22b0830ad8d78aeaaa66d96 +Author: PlutoCtx +Date: Thu May 18 23:29:38 2023 +0800 + + pull最新的snapshot-20230511，后更新了difficulty.py和Article.py的部分代码，提交了新的pickle文件 + +commit acd8db6e3e1c498650f2e8cc3021828e6132e823 +Author: ghaa0920 <1554137355@qq.com> +Date: Mon May 15 19:24:43 2023 +0800 + + special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符，我将其中的“-”删去，使连字符没有被过滤，实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug，答案是肯定的，但是这段代码中的过滤字符虽然多，但是并没有完全过滤掉所有字符，（过滤的只是键盘上能打出的字符，不包括输入法中能打出的特殊字符），所以字符bug本身就一直存在，我认为减少一个对“1-”字符的过滤不会造成问题。 + +commit 9f3f5b43e1bc79e884091593b9b8f3d6a2164ea5 +Author: ghaa0920 <1554137355@qq.com> +Date: Mon May 15 19:15:30 2023 +0800 + + special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符，我将其中的“-”删去，使连字符没有被过滤，实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug，答案是肯定的，但是这段代码中的过滤字符虽然多，但是并没有完全过滤掉所有字符，（过滤的只是键盘上能打出的字符，不包括输入法中能打出的特殊字符），所以字符bug本身就一直存在，我认为减少一个对“-”字符的过滤不会造成问题。 + +commit d9f6df7fbe585395a19b9a08c411d841b6b89fd4 (origin/Bug532-HuangDan) +Author: huangdan <2741654266@qq.com> +Date: Thu May 11 15:51:10 2023 +0800 + + AJAX载入文章数据 + +commit 5039f5710e4575ecbd9c5bfcc2e349dbe6025bfa (origin/Alpha-snapshot20230507) +Author: huangdan <2741654266@qq.com> +Date: Mon May 8 14:33:48 2023 +0800 + + AJAX载入文章数据 + +commit becef7e3436c93561ba581cff9b9ca9da118c888 (origin/Alpha-snapshot20230506) +Merge: a4cc4fd 01ecc83 +Author: Hui Lan +Date: Sun May 7 15:59:35 2023 +0800 + + Merge branch 'Bug502-YuGaoXiang' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230506 + +commit 01ecc8376893404cb026e34e7f8fecbefcd082cf (origin/Bug502-YuGaoXiang) +Author: Awoodwhale +Date: Sat May 6 17:42:04 2023 +0800 + + refactor: refactor the way to check article level + +commit f64d06fbbf00255fc21f141d852d8995e588785e +Author: Awoodwhale +Date: Sat May 6 17:24:51 2023 +0800 + + fix: fix Bug 531 and use ES6 grammar + +commit a4cc4fd011317f3daec2de456b95abca16841663 +Merge: 779dafe 18ca48b +Author: Hui Lan +Date: Sat May 6 17:16:08 2023 +0800 + + Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230506 + +commit 18ca48b42214720f411937b01c20550a5f96580b +Merge: a80b062 ce2e1f2 +Author: ZhuZhihao <1287365321@qq.com> +Date: Fri May 5 17:21:49 2023 +0800 + + Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui + +commit a80b062b8707fb6a73554b8500b8c5ae17775ed3 +Author: ZhuZhihao <1287365321@qq.com> +Date: Fri May 5 17:20:58 2023 +0800 + + refactor: remove variable 'count' + +commit 779dafefe8a3ae5c40b3376d2b0309c0ddcd3273 (origin/Alpha-snapshot20230427) +Merge: e118d92 d30a434 +Author: Hui Lan +Date: Thu Apr 27 07:21:15 2023 +0800 + + Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427 + +commit e118d92659911db4f3bd047a67865522c8b00c66 +Merge: ce2e1f2 5654fbf +Author: Hui Lan +Date: Thu Apr 27 07:20:21 2023 +0800 + + Merge branch 'Alpha-snapshot20230425' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427 + +commit 5654fbf9bc3ae85eec621a4e6e2ecd1f6c6c3b30 (origin/Alpha-snapshot20230425) +Author: 一问三不知 <178428409@qq.com> +Date: Wed Apr 26 18:49:59 2023 +0800 + + 修改：使用新的//userpage路由 + +commit d30a434b2a0dce5247bb005c5c245529d5a542d4 (origin/Bug509-XieQiuHan-WangZiming) +Author: 一问三不知 <178428409@qq.com> +Date: Tue Apr 25 17:47:51 2023 +0800 + + 修改变量名had_read_articles->visited_articles + +commit b88bc8f36b395f3979d4a9b37993b88b8a9eb658 +Merge: ef78679 6be035f +Author: Hui Lan +Date: Tue Apr 25 11:40:42 2023 +0800 + + Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230425 + +commit 6be035f2828286b5cd59f15ec04336b86c3cb0fa +Author: 一问三不知 <178428409@qq.com> +Date: Tue Apr 25 11:38:01 2023 +0800 + + 修复当没有找到文章或者文章读完时，直接刷新页面或者session不关闭重新进入页面，导致的错误； + +commit ef786795e27287502b5388e2e80aa83eac596c8d +Merge: 21a77ef fc3e274 +Author: Hui Lan +Date: Tue Apr 25 08:47:22 2023 +0800 + + Resolve merge conflict + +commit 21a77ef2df5111ca4fb0103624ee0b68a15b2a06 +Merge: 58d7349 f3d609c +Author: Hui Lan +Date: Tue Apr 25 08:42:18 2023 +0800 + + Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha + +commit 58d7349afe69c5934754cb7a5145b33382326c37 +Author: Hui Lan +Date: Tue Apr 25 08:40:26 2023 +0800 + + Change from bug359-zhangkeli + +commit fc3e27488b3b55c1013a970e6abb95b88caff9aa +Author: 一问三不知 <178428409@qq.com> +Date: Fri Apr 21 05:33:26 2023 +0800 + + 给标签添加id，方便测试 + +commit 03145b57d98c29ae04948281e8e4e67512e75829 +Author: 一问三不知 <178428409@qq.com> +Date: Fri Apr 21 02:36:51 2023 +0800 + + 修复边界值问题（当刚开始就没有找到文章或者就根本被没有文章的时候，会出现上一篇按钮） + +commit 70917df47b91f7fbb16870b15f2a2ecdbdad6135 +Author: 一问三不知 <178428409@qq.com> +Date: Thu Apr 20 23:15:12 2023 +0800 + + 删除测试代码 + +commit 8f132ed87bfc00e321214dd4a4d6ed2a3ff4a8cd +Author: 一问三不知 <178428409@qq.com> +Date: Thu Apr 20 22:53:30 2023 +0800 + + 添加了阅读完所有文章的提示 + +commit da13e5bbd5da2a1ceb838c5a4836a0cabd8bdf69 +Author: 一问三不知 <178428409@qq.com> +Date: Thu Apr 20 21:28:29 2023 +0800 + + 修复Bug（没找到文章后立即上一篇会回到上上篇文章） & 标签添加id方便测试 + +commit 84affaeb69fdecb155cdf4daa4f57c4b29dbea55 +Author: 一问三不知 <178428409@qq.com> +Date: Thu Apr 20 20:30:14 2023 +0800 + + 修改 / 路由存在的问题（每次调用别的路由他都会被调用），新路由为 //userpage;同时因为修改了路由导致访问userpage_get的时候会导致静态文件路径生成错误，这里修改了\static\config.yml中的静态资源路径，修改后也都可以正常访问到的 + +commit 16de0a7fd99a26d331e23eac7c1fd22594b7c50f +Author: 一问三不知 <178428409@qq.com> +Date: Thu Apr 20 15:40:11 2023 +0800 + + 修改变量命名：existing_articles → had_read_articles + +commit ce2e1f2978e68aac46a03e0d7bc5e27b78a1106a (origin/Alpha-snapshot20230426) +Merge: 11ae093 cc8ca47 +Author: zzhaofisher <10839192+zzhaofisher@user.noreply.gitee.com> +Date: Tue Apr 18 21:52:28 2023 +0800 + + Merge branch 'DevLocal' into Bug522-HuangZirui + +commit 11ae093fd7b714b37bd26f42ad9f5b042ae1dfc1 +Merge: 3bce450 f3d609c +Author: zzhaofisher <10839192+zzhaofisher@user.noreply.gitee.com> +Date: Tue Apr 18 21:52:01 2023 +0800 + + Merge branch 'Alpha' into Bug522-HuangZirui + +commit cc8ca47f8c96eedaf2ce7ec61f5480123663953f +Author: zzhaofisher <10839192+zzhaofisher@user.noreply.gitee.com> +Date: Tue Apr 18 21:50:54 2023 +0800 + + refactor: remove sql sentences + +commit 5d20e92061d3c43dab01e0ca9483779fc9b9a9a2 +Merge: f3d609c 3bce450 +Author: zzhaofisher <10839192+zzhaofisher@user.noreply.gitee.com> +Date: Tue Apr 18 21:50:18 2023 +0800 + + Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into DevLocal + +commit f3d609c92bfd27ed4ef70cab838a7d1362a5fb6b (origin/Alpha) +Merge: 688ed72 15bb925 +Author: Lan Hui <1348141770@qq.com> +Date: Fri Apr 7 06:41:49 2023 +0800 + + Merge Wang Ziming's work and Wu Yuhan's work. + +commit 15bb9250248aa6feb249be72c53d3fa6d7005d52 +Author: 一问三不知 <178428409@qq.com> +Date: Tue Apr 4 22:31:53 2023 +0800 + + 将记录阅读过文章的数据结果改为字典，以及修改了flag的问题 + +commit 688ed724734fddb4a07e9dd0dc5b6b2ace16e645 +Author: Lan Hui <1348141770@qq.com> +Date: Sat Apr 1 16:07:59 2023 +0800 + + Correct grammar。 + +commit 1f150fc847d0fc70947261ff45843ccc116117c2 +Author: Awoodwhale +Date: Fri Mar 31 13:39:28 2023 +0800 + + refactor: use ajax to get expiry_date + +commit 7107f634c2ec9fa12dd6bcbed9f4ee5c339928c7 +Merge: 6f1dd13 4417cf7 +Author: 一问三不知 <178428409@qq.com> +Date: Fri Mar 31 04:58:21 2023 +0800 + + Merge branch 'test' into dev-fixBug509-reconstruction + +commit 6f1dd134193cb3f9fa1d3502b286d3be1f22c1ed +Author: 一问三不知 <178428409@qq.com> +Date: Fri Mar 31 04:50:41 2023 +0800 + + 测试的print忘删了 + +commit 4417cf7017d50f20d99e1a274b48ad5d3b32e8e6 +Author: Hui Lan +Date: Thu Mar 30 16:10:22 2023 +0800 + + Article.py: remove debug statement. + +commit 0c16a4dc6f21849915cdad92c7189e37ccb9a289 +Author: 一问三不知 <178428409@qq.com> +Date: Wed Mar 29 20:53:38 2023 +0800 + + 判断文章是否已经出现的语句写错位置了，改正下 + +commit 5b2f5199a82be7cdb7bb3ac57f7b54b5ea0f4034 +Author: 一问三不知 <178428409@qq.com> +Date: Mon Mar 27 14:28:54 2023 +0800 + + 1. 取消userpage_get.html中提示删除单词信息的代码 和 取消user_service.userpage中render_template的flashed_messages参数。因为删除单词操作已经是异步了，而提示信息的出现是同步执行，所以就注释了代码且没有产生太大影响。 + 2. 修改取消user_service.deleteword中对注释flash代码的注释，根据上一步进行了重新解释。 + +commit 0ce1c6eb6e5707ccfb47113b2c58c9961f2eae48 +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 21:14:29 2023 +0800 + + 文章管理页面：每篇文章中保留换行，方便查看。 + +commit d4ac7093859d400f77f24c7cf5b6d39dd67b2e9a +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 21:05:05 2023 +0800 + + 将删除按钮移到第一行，避免因为文章的标题过长跨行导致删除按钮形状改变。 + +commit 9eb5210d3f11211abe756597518d09b1cfd8f3e4 +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 20:58:37 2023 +0800 + + Level与Date的冒号后面加个空格，使得后面的信息更加看得清楚。 + +commit 0e257373816ee365d41e78b0b13ba807e0230aac +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 20:56:08 2023 +0800 + + 管理文章页面的文章列表中，每篇文章不再在内容部分重新显示标题。 + +commit b3b154a24f9bb267146712e6020903a6e574c976 +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 19:06:04 2023 +0800 + + 简化管理文章与管理用户页面信息。 + +commit 4d99405bfaf2f87abdf4bfa1291083419c6df502 +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 18:59:15 2023 +0800 + + 简化管理员页面信息。删除退出登录按钮，可以返回到前一页后再退出，不影响使用体验。删除'管理员您好'欢迎词，没啥意义。 + +commit 8d8b9197b614b595bbba1ecf95c189ea1389780c +Author: Lan Hui <1348141770@qq.com> +Date: Sun Mar 26 09:59:06 2023 +0800 + + 手动输入的文字最高难度等级是4 diff --git a/img.png b/img.png new file mode 100644 index 0000000000000000000000000000000000000000..216ea36b1cc1f126f4c032eedd709ce0bca7bc6b GIT binary patch literal 4446 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 abn#%@oL0tEQ<3s+0x-R5VN`A468AqUim=lF literal 0 HcmV?d00001 -- 2.17.1