From fae0a032c58e46dce0593aa5cf196c62d79ac948 Mon Sep 17 00:00:00 2001 From: Hui Lan Date: Sun, 29 Jan 2023 10:42:23 +0800 Subject: [PATCH 1/2] Show actual expiry date in expiry.html. --- app/Login.py | 2 +- app/templates/expiry.html | 2 +- app/user_service.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Login.py b/app/Login.py index 1ada0af..77263e8 100644 --- a/app/Login.py +++ b/app/Login.py @@ -23,7 +23,7 @@ def verify_user(username, password): def add_user(username, password): start_date = datetime.now().strftime('%Y%m%d') - expiry_date = '20221230' + expiry_date = '20231230' # 将用户名和密码一起加密，以免暴露不同用户的相同密码 password = md5(username + password) rq = InsertQuery(path_prefix + 'static/wordfreqapp.db') diff --git a/app/templates/expiry.html b/app/templates/expiry.html index 797a109..9464325 100644 --- a/app/templates/expiry.html +++ b/app/templates/expiry.html @@ -5,7 +5,7 @@ 账号过期 -

您的账号{{ username }}过期。

+

您的账号过期（过期日 {{expiry_date}}）。

为了提高服务质量，English Pal 收取会员费用， 每天1元。

请决定你要试用的时间长度，扫描下面支付宝二维码支付。 支付时请注明English Pal Membership Fee。 我们会于12小时内激活账号。

支付宝二维码

diff --git a/app/user_service.py b/app/user_service.py index 79c7888..2d10404 100644 --- a/app/user_service.py +++ b/app/user_service.py @@ -107,7 +107,7 @@ def userpage(username): # 用户过期 user_expiry_date = session.get('expiry_date') if datetime.now().strftime('%Y%m%d') > user_expiry_date: - return render_template('expiry.html') + return render_template('expiry.html', expiry_date=user_expiry_date) # 获取session里的用户名 username = session.get('username') -- 2.17.1 From 773c1b34d487858c88c9a70ec70fb8403ed9526f Mon Sep 17 00:00:00 2001 From: Hui Lan Date: Sun, 29 Jan 2023 10:53:58 +0800 Subject: [PATCH 2/2] set the expiry date 30 days after the date of sign-up. --- app/Login.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Login.py b/app/Login.py index 77263e8..8e0030b 100644 --- a/app/Login.py +++ b/app/Login.py @@ -1,6 +1,6 @@ import hashlib import string -from datetime import datetime +from datetime import datetime, timedelta from UseSqlite import InsertQuery, RecordQuery path_prefix = '/var/www/wordfreq/wordfreq/' @@ -23,7 +23,7 @@ def verify_user(username, password): def add_user(username, password): start_date = datetime.now().strftime('%Y%m%d') - expiry_date = '20231230' + 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') -- 2.17.1