From 9c22da94a9caec01391ac054e86d93134f4c53b7 Mon Sep 17 00:00:00 2001
From: lemon <601749122@qq.com>
Date: Tue, 11 May 2021 11:04:17 +0800
Subject: [PATCH 1/6] add testip page for test

---
 database.sqlite | Bin 73728 -> 73728 bytes
 service.py      |  13 +++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/database.sqlite b/database.sqlite
index 4a528af037e8164c10a25969ffd93575638e1b45..f78ebf8e9087c5e02ae25d7a2a6fb09c5f669cff 100644
GIT binary patch
delta 143
zcmZoTz|wGlWr8&0uZc3wtiKraWHxL}S>Vsb%zu%A{{#O6{)?Lh0}k`^^D?tA$a5GP
znd=z<q2c5Q@hU(yR~h)P@_*ug3{-QRpO2SWo)NBsdGq6ZMFSpI{+kT^KlwlMzvO?o
oSzy6Qel9k476wK}CN?&<&5zfwkz?ZIm^|@ZG9%~aujjY}0h7}#SO5S3

delta 108
zcmV-y0F(cKzyyH61dtm6@{t@v1@ZtcG$65Lpic+_58wa~@DJd#5pdKGli*(@2m%k|
z01xsH<FgTP*AKJfZy_)Y1P|c=5BU%A58)5#vk;)k4+;PP00;pA0t5yGv*WL<9s&pn
OlabD20SL48&I?gqMJ9*<

diff --git a/service.py b/service.py
index 21708c5..f2790ed 100644
--- a/service.py
+++ b/service.py
@@ -366,8 +366,11 @@ def get_subject(subjectID):
 # ============================================================================================
 @app.before_request
 def before_request():
-    ip = IP
-    session['ip'] = ip
+    if request.headers.getlist("X-Forwarded-For"):
+        ip = request.headers.getlist("X-Forwarded-For")[0]
+    else:
+        ip = request.remote_addr
+    session['ip']=ip
     visitor = Visitor.query.filter_by(ip=ip).first()
     if visitor is None:
         visitor = Visitor(ip=ip)
@@ -394,7 +397,9 @@ def before_request():
                 visitvote = VisitVote(visitor_id=visitor.id, article_id=article_id)
                 db.session.add(visitvote)
                 db.session.add(article)
-
+@app.route('/testip')
+def testip():
+    return session.get('ip')
 
 # ============================================================================================#
 #                                         index                                               #
@@ -762,4 +767,4 @@ def author(author_id):
 
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    app.run(debug=True,host="0.0.0.0")

From 81b52f5dcdfe31ac8ee7419f349e0f8be874b620 Mon Sep 17 00:00:00 2001
From: lemon <601749122@qq.com>
Date: Sun, 6 Jun 2021 15:08:34 +0800
Subject: [PATCH 2/6] add requrements.txt && rm  remainging testing code

---
 requirements.txt | 24 ++++++++++++++++++++++++
 service.py       |  4 +---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..a858539
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,24 @@
+alembic==1.5.2
+click==7.1.2
+et-xmlfile==1.0.1
+Flask==1.1.2
+Flask-Migrate==2.6.0
+Flask-Script==2.0.6
+Flask-SQLAlchemy==2.4.4
+itsdangerous==1.1.0
+jdcal==1.4.1
+Jinja2==2.11.2
+Mako==1.1.4
+MarkupSafe==1.1.1
+numpy==1.19.5
+openpyxl==3.0.6
+pandas==1.1.5
+PyMySQL==0.10.1
+python-dateutil==2.8.1
+python-editor==1.0.4
+pytz==2021.1
+six==1.15.0
+SQLAlchemy==1.3.22
+Werkzeug==1.0.1
+xlrd==2.0.1
+XlsxWriter==1.3.7
diff --git a/service.py b/service.py
index f2790ed..0bb4563 100644
--- a/service.py
+++ b/service.py
@@ -397,9 +397,7 @@ def before_request():
                 visitvote = VisitVote(visitor_id=visitor.id, article_id=article_id)
                 db.session.add(visitvote)
                 db.session.add(article)
-@app.route('/testip')
-def testip():
-    return session.get('ip')
+
 
 # ============================================================================================#
 #                                         index                                               #

From 362599d065afa019169dce66afb4e2e44edabe04 Mon Sep 17 00:00:00 2001
From: lemon <601749122@qq.com>
Date: Sun, 6 Jun 2021 15:19:04 +0800
Subject: [PATCH 3/6] remove redundant dislike button on article page

---
 .gitignore             | 1 +
 templates/article.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2483976..78d8aee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea/
 __pycache__/
+venv/
\ No newline at end of file
diff --git a/templates/article.html b/templates/article.html
index 3a962c8..fe4e488 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -132,7 +132,7 @@ <h2 class="card-title">{{ article.title }}</h2><!--title-->
 
                 <p class="text-primary pp" onclick="dislike()">dislike</p>
                 <p id="dislike">{{ article.downvote }}</p>&nbsp;<br>
-        <p class="text-primary pp" onclick="dislike()">dislike</p> <p id="dislike">{{ article.downvote }}</p>&nbsp;
+<!--        <p class="text-primary pp" onclick="dislike()">dislike</p> <p id="dislike">{{ article.downvote }}</p>&nbsp;-->
 
         <!--New downloads-->
         <div style="float:right"><p class="text-primary">download number </p> <p id="download_number">{{ article.downloadcount }}</p></div><br>

From b73ec46183cb2b922147e0521e3aac68bca2ab44 Mon Sep 17 00:00:00 2001
From: lemon <601749122@qq.com>
Date: Sun, 6 Jun 2021 15:28:26 +0800
Subject: [PATCH 4/6] hide sort button when no comments

---
 templates/article.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/article.html b/templates/article.html
index fe4e488..b31f5cf 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -193,8 +193,8 @@ <h2 class="card-title">{{ article.title }}</h2><!--title-->
             </div>
         {% endfor %}
     </div>
-
+    {% if comments %}
     <button class="btn btn-primary" type="submit" style="float:right" onclick="sort()">排序/取消排序</button>
-
+    {% endif %}
 
 {% endblock %}

From e33096230c0ca04c747cf0a21f84b3da9e71be39 Mon Sep 17 00:00:00 2001
From: lemon <601749122@qq.com>
Date: Sun, 6 Jun 2021 15:30:50 +0800
Subject: [PATCH 5/6] add author page link on subject page

---
 templates/subject.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/subject.html b/templates/subject.html
index 43c2de4..a3ae9d3 100644
--- a/templates/subject.html
+++ b/templates/subject.html
@@ -86,7 +86,7 @@
     {% for article in articles.items %}
         <tr>
             <td><a href="/article/{{ article.id }}">{{ article.title }}</a></td>
-        <td>{{ Tool.email_display_filter(article.author.mail) }}</td>
+            <td><a href="{{ url_for('author', author_id=article.author_id) }}">{{ Tool.email_display_filter(article.author.mail) }}</a></td>
         <td>{{ article.time.strftime("%Y-%m-%d %H:%M") }}</td>
         <td>{{ article.metric }}</td>
       </tr>

From 6126b3d49e0204910809642c04c4b26a59e906fa Mon Sep 17 00:00:00 2001
From: lemon <601749122@qq.com>
Date: Sun, 6 Jun 2021 15:38:24 +0800
Subject: [PATCH 6/6] add author link on search page

---
 templates/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/search.html b/templates/search.html
index 1d83679..ae2c943 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -25,7 +25,7 @@
             <td><a href="/article/{{ article.id }}">{{ Tool.highlight_matched_parts(article.title, kwd) | safe }}</a></td>
 	    <td>{{ Tool.highlight_matched_parts(article.abstract, kwd) | safe }}</td>
 	    <td>{{ Tool.highlight_matched_parts(article.highlight, kwd) | safe }}</td>
-            <td>{{ Tool.email_display_filter(article.author.mail) | safe }}</td>
+            <td><a href="{{ url_for('author', author_id=article.author_id) }}">{{ Tool.email_display_filter(article.author.mail) | safe }}</a></td>
 	    <td>{{ article.time.strftime('%Y-%m-%d %H:%M') | safe }}</td>
             <td>{{ article.metric }}</td>
         </tr>