mirror of
https://gitee.com/houhuan/TrendRadar.git
synced 2025-12-21 15:57:16 +08:00
v3.0.2
This commit is contained in:
parent
601b6cd1bd
commit
d989037f61
2
.github/workflows/docker.yml
vendored
2
.github/workflows/docker.yml
vendored
@ -49,7 +49,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./docker/Dockerfile
|
file: ./docker/Dockerfile
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|||||||
@ -12,9 +12,11 @@ EMAIL_SMTP_SERVER=
|
|||||||
EMAIL_SMTP_PORT=
|
EMAIL_SMTP_PORT=
|
||||||
|
|
||||||
# ntfy 推送配置
|
# ntfy 推送配置
|
||||||
NTFY_SERVER_URL=https://ntfy.sh # 默认使用公共服务,可改为自托管地址
|
NTFY_SERVER_URL=https://ntfy.sh
|
||||||
NTFY_TOPIC= # ntfy主题名称
|
# ntfy主题名称
|
||||||
NTFY_TOKEN= # 可选:访问令牌(用于私有主题)
|
NTFY_TOPIC=
|
||||||
|
# 可选:访问令牌(用于私有主题)
|
||||||
|
NTFY_TOKEN=
|
||||||
|
|
||||||
# 运行配置
|
# 运行配置
|
||||||
CRON_SCHEDULE=*/30 * * * * # 定时任务表达式,每 30 分钟执行一次(比如 8点,8点半,9点,9点半这种时间规律执行)
|
CRON_SCHEDULE=*/30 * * * * # 定时任务表达式,每 30 分钟执行一次(比如 8点,8点半,9点,9点半这种时间规律执行)
|
||||||
|
|||||||
@ -8,13 +8,7 @@ ENV SUPERCRONIC_VERSION=v0.2.34
|
|||||||
|
|
||||||
RUN set -ex && \
|
RUN set -ex && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
# 添加 locales 包
|
apt-get install -y --no-install-recommends curl ca-certificates && \
|
||||||
apt-get install -y --no-install-recommends curl ca-certificates locales && \
|
|
||||||
# 配置中文 locale
|
|
||||||
sed -i -e 's/# zh_CN.UTF-8 UTF-8/zh_CN.UTF-8 UTF-8/' /etc/locale.gen && \
|
|
||||||
sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
|
||||||
locale-gen && \
|
|
||||||
# 下载 supercronic(只支持 amd64 和 arm64)
|
|
||||||
case ${TARGETARCH} in \
|
case ${TARGETARCH} in \
|
||||||
amd64) \
|
amd64) \
|
||||||
export SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-amd64; \
|
export SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-amd64; \
|
||||||
@ -26,8 +20,18 @@ RUN set -ex && \
|
|||||||
export SUPERCRONIC_SHA1SUM=4ab6343b52bf9da592e8b4bb7ae6eb5a8e21b71e; \
|
export SUPERCRONIC_SHA1SUM=4ab6343b52bf9da592e8b4bb7ae6eb5a8e21b71e; \
|
||||||
export SUPERCRONIC=supercronic-linux-arm64; \
|
export SUPERCRONIC=supercronic-linux-arm64; \
|
||||||
;; \
|
;; \
|
||||||
|
arm) \
|
||||||
|
export SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-arm; \
|
||||||
|
export SUPERCRONIC_SHA1SUM=4ba4cd0da62082056b6def085fa9377d965fbe01; \
|
||||||
|
export SUPERCRONIC=supercronic-linux-arm; \
|
||||||
|
;; \
|
||||||
|
386) \
|
||||||
|
export SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/${SUPERCRONIC_VERSION}/supercronic-linux-386; \
|
||||||
|
export SUPERCRONIC_SHA1SUM=80b4fff03a8d7bf2f24a1771f37640337855e949; \
|
||||||
|
export SUPERCRONIC=supercronic-linux-386; \
|
||||||
|
;; \
|
||||||
*) \
|
*) \
|
||||||
echo "Unsupported architecture: ${TARGETARCH}. Only amd64 and arm64 are supported."; \
|
echo "Unsupported architecture: ${TARGETARCH}"; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
;; \
|
;; \
|
||||||
esac && \
|
esac && \
|
||||||
@ -71,13 +75,8 @@ RUN sed -i 's/\r$//' /entrypoint.sh.tmp && \
|
|||||||
chmod +x manage.py && \
|
chmod +x manage.py && \
|
||||||
mkdir -p /app/config /app/output
|
mkdir -p /app/config /app/output
|
||||||
|
|
||||||
# 添加 locale 相关环境变量
|
|
||||||
ENV PYTHONUNBUFFERED=1 \
|
ENV PYTHONUNBUFFERED=1 \
|
||||||
CONFIG_PATH=/app/config/config.yaml \
|
CONFIG_PATH=/app/config/config.yaml \
|
||||||
FREQUENCY_WORDS_PATH=/app/config/frequency_words.txt \
|
FREQUENCY_WORDS_PATH=/app/config/frequency_words.txt
|
||||||
LANG=zh_CN.UTF-8 \
|
|
||||||
LANGUAGE=zh_CN:zh:en_US:en \
|
|
||||||
LC_ALL=zh_CN.UTF-8 \
|
|
||||||
PYTHONIOENCODING=utf-8
|
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
2
main.py
2
main.py
@ -20,7 +20,7 @@ import requests
|
|||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
VERSION = "3.0.1"
|
VERSION = "3.0.2"
|
||||||
|
|
||||||
|
|
||||||
# === SMTP邮件配置 ===
|
# === SMTP邮件配置 ===
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
[](https://github.com/sansan0/TrendRadar/stargazers)
|
[](https://github.com/sansan0/TrendRadar/stargazers)
|
||||||
[](https://github.com/sansan0/TrendRadar/network/members)
|
[](https://github.com/sansan0/TrendRadar/network/members)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
[](https://github.com/sansan0/TrendRadar)
|
[](https://github.com/sansan0/TrendRadar)
|
||||||
|
|
||||||
[](https://work.weixin.qq.com/)
|
[](https://work.weixin.qq.com/)
|
||||||
[](https://telegram.org/)
|
[](https://telegram.org/)
|
||||||
@ -500,11 +500,10 @@ GitHub 一键 Fork 即可使用,无需编程基础。
|
|||||||
- **小版本更新**:从 v2.x 升级到 v2.y, 用本项目的 `main.py` 代码替换你 fork 仓库中的对应文件
|
- **小版本更新**:从 v2.x 升级到 v2.y, 用本项目的 `main.py` 代码替换你 fork 仓库中的对应文件
|
||||||
- **大版本升级**:从 v1.x 升级到 v2.y, 建议删除现有 fork 后重新 fork,这样更省力且避免配置冲突
|
- **大版本升级**:从 v1.x 升级到 v2.y, 建议删除现有 fork 后重新 fork,这样更省力且避免配置冲突
|
||||||
|
|
||||||
### 2025/10/21 - v3.0.1
|
### 2025/10/21 - v3.0.2
|
||||||
|
|
||||||
- **更新内容**:
|
- **更新内容**:
|
||||||
- 尝试修复 ntfy 推送编码问题 + 2
|
- 必然修复 ntfy 推送编码问题
|
||||||
- docker 移除对 linux/arm/v7 架构的支持
|
|
||||||
|
|
||||||
### 2025/10/20 - v3.0.0
|
### 2025/10/20 - v3.0.0
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user