我只玩英雄联盟这一个网游，之前一直在用我淘汰下来的MacBook Pro 2019 intel i7', 'content': '
我只玩英雄联盟这一个网游，之前一直在用我淘汰下来的MacBook Pro 2019 intel i7'}, {'title': '解决iOS邮箱使用QQ邮箱账户无法发送邮件，连接发信服务器失败问题', 'author': '', 'link': 'https://blog.zhheo.com/p/cb3f5ed0.html', 'published': '2024-06-20 01:53', 'summary': '
我最近从qq邮箱换到了iOS自带的邮件客户端，一方面是因为自从qq邮箱出了会员之后一堆广告，一方面就是iOS18将支持邮件筛选，我也想用用。但是使用QQ邮箱连接会有一些问题。
\\n一方面是需要授权码验证，这个大家都比较清楚，登录的密码不是你的qq密码，而是qq邮箱', 'content': '
我最近从qq邮箱换到了iOS自带的邮件客户端，一方面是因为自从qq邮箱出了会员之后一堆广告，一方面就是iOS18将支持邮件筛选，我也想用用。但是使用QQ邮箱连接会有一些问题。
\\n一方面是需要授权码验证，这个大家都比较清楚，登录的密码不是你的qq密码，而是qq邮箱'}, {'title': '要排除的文件已经被上传到远程Git仓库怎么办', 'author': '', 'link': 'https://blog.zhheo.com/p/faf797ab.html', 'published': '2024-06-19 09:43', 'summary': '
mac有个毒瘤文件就是DS_Store，如果没有全局排除掉那么上传新项目的时候很容易就被上传。还有一些其他的构建文件如果没有设置好.gitignore也会被上传。
有的时候排除文件在我们项目过一段时间后才想起来添加，但是那时候远程库已', 'content': '
mac有个毒瘤文件就是DS_Store，如果没有全局排除掉那么上传新项目的时候很容易就被上传。还有一些其他的构建文件如果没有设置好.gitignore也会被上传。
有的时候排除文件在我们项目过一段时间后才想起来添加，但是那时候远程库已'}, {'title': 'Mac安装java17（openjdk@17）支持M系列芯片和intel芯片', 'author': '', 'link': 'https://blog.zhheo.com/p/6243d392.html', 'published': '2024-06-17 02:46', 'summary': '
因为入坑Halo插件开发，装环境研究了一个多小时。主要是错误的安装了版本。Halo的java版本要求是17，这个教程介绍安装java17，通过homebrew来进行安装，然后添加链接即可。
\\nVision Pro 已经支持了中国大陆销售，售价29999。当然这不是重点，主要Vision'}]}\n" - ] - } - ], - "source": [ - "from friend_circle_lite.get_info import fetch_and_process_data, check_feed, parse_feed\n", - "\n", - "print(parse_feed(check_feed(\"https://blog.zhheo.com/\")[-1]))" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "python-dateutil 版本: 2.8.2\n", - "requests 版本: 2.31.0\n", - "feedparser 版本: 6.0.11\n" - ] - } - ], - "source": [ - "import datetime\n", - "import dateutil\n", - "import requests\n", - "import feedparser\n", - "\n", - "# 打印 datetime 包的版本\n", - "\n", - "# 打印 python-dateutil 包的版本\n", - "print(f\"python-dateutil 版本: {dateutil.__version__}\")\n", - "\n", - "# 打印 requests 包的版本\n", - "print(f\"requests 版本: {requests.__version__}\")\n", - "\n", - "# 打印 feedparser 包的版本\n", - "print(f\"feedparser 版本: {feedparser.__version__}\")\n" - ] - }, - { - "cell_type": "code", - "execution_count": 1, - "metadata": {}, - "outputs": [], - "source": [ - "# 将系统路径设置为../\n", - "import sys\n", - "sys.path.append(\"../\")" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "{\n", - " \"emails\": [\n", - " \"3162475700@qq.com\"\n", - " ]\n", - "}\n" - ] - } - ], - "source": [ - "from rss_subscribe.push_article_update import extract_emails_from_issues\n", - "import json\n", - "\n", - "api_url = \"https://api.github.com/repos/willow-god/Friend-Circle-Lite/issues\"\n", - "emails = extract_emails_from_issues(api_url)\n", - "print(json.dumps(emails, indent=2))" - ] - }, - { - "cell_type": "code", - "execution_count": 11, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "从 https://blog.qyliu.top/ 获取到 5 篇文章，其中 0 篇为新文章\n", - "None\n" - ] - } - ], - "source": [ - "from rss_subscribe.push_article_update import get_latest_articles_from_link\n", - "import json\n", - "\n", - "url = \"https://blog.qyliu.top/\"\n", - "articles = get_latest_articles_from_link(url, last_articles_path=\"../rss_subscribe/last_articles.json\")\n", - "print(articles)" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "base", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.11.5" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} diff --git a/friend_circle_lite/__pycache__/__init__.cpython-311.pyc b/friend_circle_lite/__pycache__/__init__.cpython-311.pyc index d0d0852..995bb7a 100644 Binary files a/friend_circle_lite/__pycache__/__init__.cpython-311.pyc and b/friend_circle_lite/__pycache__/__init__.cpython-311.pyc differ diff --git a/friend_circle_lite/__pycache__/__init__.cpython-312.pyc b/friend_circle_lite/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index 41bd267..0000000 Binary files a/friend_circle_lite/__pycache__/__init__.cpython-312.pyc and /dev/null differ diff --git a/friend_circle_lite/__pycache__/get_conf.cpython-312.pyc b/friend_circle_lite/__pycache__/get_conf.cpython-312.pyc deleted file mode 100644 index c4a7df1..0000000 Binary files a/friend_circle_lite/__pycache__/get_conf.cpython-312.pyc and /dev/null differ diff --git a/friend_circle_lite/__pycache__/get_info.cpython-311.pyc b/friend_circle_lite/__pycache__/get_info.cpython-311.pyc index 0edce97..ead2e1a 100644 Binary files a/friend_circle_lite/__pycache__/get_info.cpython-311.pyc and b/friend_circle_lite/__pycache__/get_info.cpython-311.pyc differ diff --git a/friend_circle_lite/__pycache__/get_info.cpython-312.pyc b/friend_circle_lite/__pycache__/get_info.cpython-312.pyc deleted file mode 100644 index b3cc621..0000000 Binary files a/friend_circle_lite/__pycache__/get_info.cpython-312.pyc and /dev/null differ diff --git a/push_rss_update/send_email.py b/push_rss_update/send_email.py index e69de29..78a0ba5 100644 --- a/push_rss_update/send_email.py +++ b/push_rss_update/send_email.py @@ -0,0 +1,67 @@ +import smtplib +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText + +def email_sender( + target_email, + sender_email, + smtp_server, + port, + password, + subject, + body, + use_tls=True, + ): + """ + 发送电子邮件。 + + 参数： + target_email (str): 目标邮箱地址。 + sender_email (str): 发信邮箱地址。 + smtp_server (str): SMTP 服务地址。 + port (int): SMTP 服务端口。 + use_ssl (bool): 是否使用 SSL 加密。 + username (str): SMTP 服务用户名。 + password (str): SMTP 服务密码。 + subject (str): 邮件主题。 + body (str): 邮件内容。 + """ + # 创建 MIME 对象 + msg = MIMEMultipart() + msg['From'] = sender_email + msg['To'] = target_email + msg['Subject'] = subject + + # 添加邮件内容 + msg.attach(MIMEText(body, 'plain')) + + # 连接到 SMTP 服务器并发送邮件 + try: + with smtplib.SMTP(smtp_server, port) as server: + if use_tls: + server.starttls() # 启动安全模式 + server.login(sender_email, password) + server.sendmail(sender_email, target_email, msg.as_string()) + print(f'邮件已发送到 {target_email}') + except Exception as e: + print(f'无法发送邮件到 {target_email}. 错误: {e}') + +def send_emails(emails, sender_email, smtp_server, port, password, subject, body, use_tls=True): + """ + 循环发送邮件给指定的多个邮箱。 + + 参数： + emails (list): 包含目标邮箱地址的列表。 + sender_email (str): 发信邮箱地址。 + smtp_server (str): SMTP 服务地址。 + port (int): SMTP 服务端口。 + password (str): SMTP 服务密码。 + subject (str): 邮件主题。 + body (str): 邮件内容。 + use_tls (bool): 是否使用 TLS 加密，默认为 True。 + """ + for email in emails: + email_sender(email, sender_email, smtp_server, port, password, subject, body, use_tls) + + + diff --git a/rss_subscribe/__pycache__/__init__.cpython-311.pyc b/rss_subscribe/__pycache__/__init__.cpython-311.pyc index 188f927..70b25b5 100644 Binary files a/rss_subscribe/__pycache__/__init__.cpython-311.pyc and b/rss_subscribe/__pycache__/__init__.cpython-311.pyc differ diff --git a/rss_subscribe/__pycache__/push_article_update.cpython-311.pyc b/rss_subscribe/__pycache__/push_article_update.cpython-311.pyc index 600191d..08a82c4 100644 Binary files a/rss_subscribe/__pycache__/push_article_update.cpython-311.pyc and b/rss_subscribe/__pycache__/push_article_update.cpython-311.pyc differ diff --git a/rss_subscribe/push_article_update.py b/rss_subscribe/push_article_update.py index 0873f0f..e1a1428 100644 --- a/rss_subscribe/push_article_update.py +++ b/rss_subscribe/push_article_update.py @@ -93,4 +93,5 @@ def get_latest_articles_from_link(url, count=5, last_articles_path="./rss_subscr json.dump({'articles': latest_articles}, file, ensure_ascii=False, indent=4) # 如果有更新的文章，返回这些文章，否则返回 None - return updated_articles if updated_articles else None \ No newline at end of file + return updated_articles if updated_articles else None + diff --git a/run.py b/run.py index fab6f12..8a8fa0b 100644 --- a/run.py +++ b/run.py @@ -1,10 +1,14 @@ # 引入 check_feed 和 parse_feed 函数 from friend_circle_lite.get_info import fetch_and_process_data, sort_articles_by_time from friend_circle_lite.get_conf import load_config +from rss_subscribe.push_article_update import get_latest_articles_from_link, extract_emails_from_issues +from push_rss_update.send_email import send_emails + import json +import os # 爬虫部分内容 -config = load_config("./conf.yml") +config = load_config("./conf.yaml") if config["spider_settings"]["enable"]: print("爬虫已启用") json_url = config['spider_settings']['json_url'] @@ -13,4 +17,50 @@ if config["spider_settings"]["enable"]: result = fetch_and_process_data(json_url=json_url, count=article_count) sorted_result = sort_articles_by_time(result) with open("all.json", "w", encoding="utf-8") as f: - json.dump(sorted_result, f, ensure_ascii=False, indent=2) \ No newline at end of file + json.dump(sorted_result, f, ensure_ascii=False, indent=2) + +if config["email_push"]["enable"] or config["rss_subscribe"]["enable"]: + print("获取smtp配置信息") + email_settings = config["smtp"] + email = email_settings["email"] + server = email_settings["server"] + port = email_settings["port"] + use_tls = email_settings["use_tls"] + password = os.environ["SMTP_PWD"] + +if config["email_push"]["enable"]: + print("邮件推送已启用") + +if config["rss_subscribe"]["enable"]: + print("RSS通过issue订阅已启用") + github_username = config["rss_subscribe"]["github_username"] + github_repo = config["rss_subscribe"]["github_repo"] + your_blog_url = config["rss_subscribe"]["your_blog_url"] + github_api_url = "https://api.github.com/repos/" + github_username + "/" + github_repo + "/issues" + "?state=closed" + print("正在从 {github_api_url} 中获取订阅信息".format(github_api_url=github_api_url)) + email_list = extract_emails_from_issues(github_api_url) + if email_list == None: + email_list = {"email": []} + print("获取到的邮箱列表为：", email_list["email"]) + # 获取最近更新的文章 + latest_articles = get_latest_articles_from_link( + url=your_blog_url, + count=5, + last_articles_path="./rss_subscribe/last_articles.json" + ) + print("最新文章为：", latest_articles) + if latest_articles == None: + print("没有新文章") + else: + send_emails( + emails=email_list["email"], + sender_email=email, + smtp_server=server, + port=port, + password=password, + subject="最新文章推送", + body="最新文章为：\n" + "\n".join([article["title"] + " " + article["link"] for article in latest_articles]), + use_tls=use_tls + ) + +