From 9c2740c2d5255edb5e2d227133f0f75ed986fc61 Mon Sep 17 00:00:00 2001 From: kpt <2817151932@qq.com> Date: Wed, 3 Jul 2024 20:33:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90getTopicPageData=E3=80=91=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=87=BD=E6=95=B0=20getCommentFilterData=20-?= =?UTF-8?q?>=20getCommentFilterDataTopic=20=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/getTopicPageData.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/getTopicPageData.py b/utils/getTopicPageData.py index 1e066a2..37b9455 100644 --- a/utils/getTopicPageData.py +++ b/utils/getTopicPageData.py @@ -19,7 +19,7 @@ def getTopicPageCreatedAtCharData(topic):# 统计包含特定热词的评论在 createdAt[i[1]] = 1 return list(createdAt.keys()),list(createdAt.values()) -def getCommentFilterData(topic):# 筛选包含特定热词的评论并返回这些评论的数据 +def getCommentFilterDataTopic(topic):# 筛选包含特定热词的评论并返回这些评论的数据 commentsList = getAllCommentsData() commentData = [] for i in commentsList: From afd50ff32f66879a2f329c3e2529587d727e2460 Mon Sep 17 00:00:00 2001 From: kpt <2817151932@qq.com> Date: Wed, 3 Jul 2024 20:35:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90page.py=E3=80=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/page/page.py | 94 ++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/views/page/page.py b/views/page/page.py index 4021fce..c5a6003 100644 --- a/views/page/page.py +++ b/views/page/page.py @@ -1,18 +1,24 @@ -from flask import Flask,session,render_template,redirect,Blueprint,request +from flask import Flask, session, render_template, redirect, Blueprint, request from snownlp import SnowNLP from utils.getHomePageData import * from utils.getHotWordPageData import * from utils.getTableData import * -from utils.getPublicData import getAllHotWords +from utils.getPublicData import getAllHotWords, getAllTopics from utils.getEchartsData import * -pb = Blueprint('page',__name__,url_prefix='/page',template_folder='templates') +from utils.getTopicPageData import * + +pb = Blueprint('page', + __name__, + url_prefix='/page', + template_folder='templates') + @pb.route('/home') def home(): username = session.get('username') - articleLenMax,likeCountMaxAuthorName,cityMax = getHomeTagsData() + articleLenMax, likeCountMaxAuthorName, cityMax = getHomeTagsData() commentsLikeCountTopFore = getHomeCommentsLikeCountTopFore() - xData,yData = getHomeArticleCreatedAtChart() + xData, yData = getHomeArticleCreatedAtChart() typeChart = getHomeTypeChart() createAtChart = getHomeCommentCreatedChart() # getUserNameWordCloud() @@ -25,17 +31,18 @@ def home(): xData=xData, yData=yData, typeChart=typeChart, - createAtChart=createAtChart - ) + createAtChart=createAtChart) + @pb.route('/hotWord') def hotWord(): username = session.get('username') hotWordList = getAllHotWords() defaultHotWord = hotWordList[0][0] - if request.args.get('hotWord'):defaultHotWord = request.args.get('hotWord') + if request.args.get('hotWord'): + defaultHotWord = request.args.get('hotWord') hotWordLen = getHotWordLen(defaultHotWord) - xData,yData = getHotWordPageCreatedAtCharData(defaultHotWord) + xData, yData = getHotWordPageCreatedAtCharData(defaultHotWord) sentences = '' value = SnowNLP(defaultHotWord).sentiments if value == 0.5: @@ -54,20 +61,45 @@ def hotWord(): sentences=sentences, xData=xData, yData=yData, - comments=comments - ) + comments=comments) + + +@pb.route('/hotTopic') +def hotTopic(): + username = session.get('username') + topicList = getAllTopics() + defaultTopic = topicList[0][0] + if request.args.get('topic'): + defaultTopic = request.args.get('topic') + topicLen = getTopicLen(defaultTopic) + xData, yData = getTopicPageCreatedAtCharData() + sentences = '' + + # ... 这里要嵌入 topic 相关内容（热度？）来填充 sentences + + comments = getCommentFilterDataTopic(defaultTopic) + return render_template('hotWord.html', + username=username, + topicList=topicList, + defaultTopic=defaultTopic, + topicLen=topicLen, + sentences=sentences, + xData=xData, + yData=yData, + comments=comments) + @pb.route('/tableData') def tableData(): username = session.get('username') defaultFlag = False - if request.args.get('flag'):defaultFlag = True + if request.args.get('flag'): defaultFlag = True tableData = getTableDataList(defaultFlag) return render_template('tableData.html', username=username, tableData=tableData, - defaultFlag=defaultFlag - ) + defaultFlag=defaultFlag) + @pb.route('/articleChar') def articleChar(): @@ -75,9 +107,9 @@ def articleChar(): typeList = getTypeList() defaultType = typeList[0] if request.args.get('type'): defaultType = request.args.get('type') - xData,yData = getArticleCharLikeCount(defaultType) - x1Data,y1Data = getArticleCharCommentsLen(defaultType) - x2Data,y2Data = getArticleCharRepotsLen(defaultType) + xData, yData = getArticleCharLikeCount(defaultType) + x1Data, y1Data = getArticleCharCommentsLen(defaultType) + x2Data, y2Data = getArticleCharRepotsLen(defaultType) return render_template('articleChar.html', username=username, typeList=typeList, @@ -87,8 +119,8 @@ def articleChar(): x1Data=x1Data, y1Data=y1Data, x2Data=x2Data, - y2Data=y2Data - ) + y2Data=y2Data) + @pb.route('/ipChar') def ipChar(): @@ -98,27 +130,27 @@ def ipChar(): return render_template('ipChar.html', username=username, articleRegionData=articleRegionData, - commentRegionData=commentRegionData - ) + commentRegionData=commentRegionData) + @pb.route('/commentChar') def commentChar(): username = session.get('username') - xData,yData = getCommentCharDataOne() + xData, yData = getCommentCharDataOne() genderPieData = getCommentCharDataTwo() return render_template('commentChar.html', username=username, xData=xData, yData=yData, - genderPieData=genderPieData - ) + genderPieData=genderPieData) + @pb.route('/yuqingChar') def yuqingChar(): username = session.get('username') - xData,yData,bieData = getYuQingCharDataOne() - bieData1,bieData2 = getYuQingCharDataTwo() - x1Data,y1Data = getYuQingCharDataThree() + xData, yData, bieData = getYuQingCharDataOne() + bieData1, bieData2 = getYuQingCharDataTwo() + x1Data, y1Data = getYuQingCharDataThree() return render_template('yuqingChar.html', username=username, xData=xData, @@ -127,12 +159,10 @@ def yuqingChar(): bieData1=bieData1, bieData2=bieData2, x1Data=x1Data, - y1Data=y1Data - ) + y1Data=y1Data) + @pb.route('/articleCloud') def articleCloud(): username = session.get('username') - return render_template('articleContentCloud.html', - username=username - ) + return render_template('articleContentCloud.html', username=username) From e49fc0e5179463589e4a113d7d6d8babc0408016 Mon Sep 17 00:00:00 2001 From: kpt <2817151932@qq.com> Date: Wed, 3 Jul 2024 20:43:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90user.py=E3=80=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=B3=A8=E5=86=8C=E8=BF=87=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81=E5=9C=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/user/user.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/views/user/user.py b/views/user/user.py index 0884bbb..dad2ce9 100644 --- a/views/user/user.py +++ b/views/user/user.py @@ -36,8 +36,6 @@ def register(): if request.method == 'GET': return render_template('register.html') else: - if request.form['password'] != request.form['checkPassword']: - return errorResponse('两次密码不符合') def filter_fn(user): return request.form['username'] in user