diff --git a/app/analysis/analysis.py b/app/analysis/analysis.py index 71b4f6d..b2ff1f7 100644 --- a/app/analysis/analysis.py +++ b/app/analysis/analysis.py @@ -5,6 +5,7 @@ from app.DataBase import msg_db, MsgType from pyecharts import options as opts from pyecharts.charts import WordCloud, Calendar, Bar, Line + def wordcloud_(wxid, time_range=None): import jieba txt_messages = msg_db.get_messages_by_type(wxid, MsgType.TEXT, time_range=time_range) @@ -64,7 +65,7 @@ def wordcloud_christmas(wxid, year='2023'): txt_messages = msg_db.get_messages_by_type(wxid, MsgType.TEXT, year) if not txt_messages: return { - 'chart_data': None, + 'wordcloud_chart_data': None, 'keyword': "没有聊天你想分析啥", 'max_num': '0', 'dialogs': [], @@ -116,7 +117,14 @@ def wordcloud_christmas(wxid, year='2023'): def calendar_chart(wxid, time_range=None): - calendar_data = msg_db.get_messages_by_days(wxid,time_range) + calendar_data = msg_db.get_messages_by_days(wxid, time_range) + if not calendar_data: + return { + 'chart_data': None, + 'calendar_chart_data': None, + 'chat_days': 0, + # 'chart':c, + } min_ = min(map(lambda x: x[1], calendar_data)) max_ = max(map(lambda x: x[1], calendar_data)) start_date_ = calendar_data[0][0] diff --git a/app/ui/menu/about_dialog.cp310-win_amd64.pyd b/app/ui/menu/about_dialog.cp310-win_amd64.pyd index 61272c7..7d6bfcb 100644 Binary files a/app/ui/menu/about_dialog.cp310-win_amd64.pyd and b/app/ui/menu/about_dialog.cp310-win_amd64.pyd differ diff --git a/app/ui/menu/about_dialog.cp311-win_amd64.pyd b/app/ui/menu/about_dialog.cp311-win_amd64.pyd index e6d8522..282f551 100644 Binary files a/app/ui/menu/about_dialog.cp311-win_amd64.pyd and b/app/ui/menu/about_dialog.cp311-win_amd64.pyd differ diff --git a/app/ui/menu/about_dialog.cp312-win_amd64.pyd b/app/ui/menu/about_dialog.cp312-win_amd64.pyd index 9646d2c..f56b297 100644 Binary files a/app/ui/menu/about_dialog.cp312-win_amd64.pyd and b/app/ui/menu/about_dialog.cp312-win_amd64.pyd differ diff --git a/app/ui/tool/pc_decrypt/pc_decrypt.py b/app/ui/tool/pc_decrypt/pc_decrypt.py index d5e7da6..50d2e1b 100644 --- a/app/ui/tool/pc_decrypt/pc_decrypt.py +++ b/app/ui/tool/pc_decrypt/pc_decrypt.py @@ -185,8 +185,8 @@ class DecryptControl(QWidget, decryptUi.Ui_Dialog, QCursorGif): try: os.makedirs('./app/data', exist_ok=True) - with open('./app/data/info.json', 'w', encoding='utf-8') as f: - f.write(json.dumps(dic)) + with open('./app/data/info.json', "w", encoding="utf-8") as f: + json.dump(dic, f, ensure_ascii=False, indent=4) except: with open('./info.json', 'w', encoding='utf-8') as f: f.write(json.dumps(dic)) diff --git a/app/web_ui/templates/christmas.html b/app/web_ui/templates/christmas.html index d5ca907..120b1a0 100644 --- a/app/web_ui/templates/christmas.html +++ b/app/web_ui/templates/christmas.html @@ -229,14 +229,14 @@
-
-

敬请期待

- 点击生成我的年度聊天报告 +

分享此页面

+
+ https://memotrace.lc044.love/ +
-
- https://memotrace.lc044.love/ + 点击生成我的年度聊天报告
@@ -261,7 +261,10 @@ if (data.success) { displayQRCode(data.url); } else { - alert('错误: 数据错误,可能您的上传次数已达上限,请联系作者:863909694@qq.com增加上传次数'); + if(data.code==201){ + displayQRCode(data.url); + alert(data.errmsg); + } } }) .catch(error => { @@ -276,6 +279,10 @@ width: 128, height: 128 }); + var aObj = document.getElementById("share"); + aObj.href = url; + //根据id获取超链接,设置文字内容 + aObj.innerText = url; }