mirror of
https://github.com/hotyue/IP-Sentinel.git
synced 2026-05-10 17:52:41 +08:00
Compare commits
111 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be241ab6bd | ||
|
|
4b2985b4ef | ||
|
|
d4afb57f9f | ||
|
|
230a59bbb3 | ||
|
|
f4a5cf8306 | ||
|
|
b606fe02ff | ||
|
|
3375356143 | ||
|
|
d9255ecbca | ||
|
|
6ad6f6b4b3 | ||
|
|
a8caea3b6d | ||
|
|
1a49e18200 | ||
|
|
c223d7a476 | ||
|
|
eaa51358a8 | ||
|
|
00827b3b15 | ||
|
|
ccddaf4386 | ||
|
|
0f0ba46989 | ||
|
|
f83db38a6b | ||
|
|
ba5582ab4c | ||
|
|
fb4e1d9b31 | ||
|
|
2dea6e382b | ||
|
|
fa8eada97b | ||
|
|
c102f66234 | ||
|
|
68a50fdb4a | ||
|
|
aac83acb8f | ||
|
|
4be4d5e9ef | ||
|
|
1f925b307f | ||
|
|
49afe032d6 | ||
|
|
f0f054c8cd | ||
|
|
699e9ca31a | ||
|
|
76cace4ff6 | ||
|
|
9f3218ab7f | ||
|
|
8a61f518f5 | ||
|
|
e9d5023263 | ||
|
|
05b1e21bba | ||
|
|
4a496fdab3 | ||
|
|
8ae3a6534d | ||
|
|
3269376c94 | ||
|
|
7a92de4d62 | ||
|
|
5fbc1e3fb3 | ||
|
|
d73c3154f9 | ||
|
|
b3fbed4a94 | ||
|
|
71fe3bde51 | ||
|
|
c739f58cc5 | ||
|
|
2c50c72fcb | ||
|
|
8d16c549fc | ||
|
|
d74d6d8775 | ||
|
|
853e6c09e1 | ||
|
|
1f21ac9a7e | ||
|
|
28fd94eff5 | ||
|
|
7460935acc | ||
|
|
109ae6f319 | ||
|
|
6b3acf5787 | ||
|
|
b1ecbd4f9a | ||
|
|
4d091e4dd9 | ||
|
|
ae6559c850 | ||
|
|
5cfaebceab | ||
|
|
88f55cbab9 | ||
|
|
1204336612 | ||
|
|
49a65a5f11 | ||
|
|
7e5b836a49 | ||
|
|
18f80400ef | ||
|
|
eca4b41da4 | ||
|
|
a24a533165 | ||
|
|
d2b575fe85 | ||
|
|
cb0aa2049e | ||
|
|
981b9e4859 | ||
|
|
eeee1b6811 | ||
|
|
e6852d0c9d | ||
|
|
23ea08f981 | ||
|
|
580a3d7fd5 | ||
|
|
6eabb60c28 | ||
|
|
7fd432ffee | ||
|
|
351143e59d | ||
|
|
725e8ae8c9 | ||
|
|
1e9de46fc5 | ||
|
|
543ab5c8bd | ||
|
|
972cd02874 | ||
|
|
9c37cb9df3 | ||
|
|
2a8a6b6fa7 | ||
|
|
e4b4c747eb | ||
|
|
eabd33e6b2 | ||
|
|
233af7181f | ||
|
|
62fb19f0c5 | ||
|
|
54178ddcf1 | ||
|
|
92a65d8308 | ||
|
|
eaaa7dabf0 | ||
|
|
e797c8203f | ||
|
|
9ecf50c153 | ||
|
|
c02b7eecc9 | ||
|
|
6af8b6b25d | ||
|
|
7081aa77cc | ||
|
|
5e48edb030 | ||
|
|
5f0f677f59 | ||
|
|
7f0c3e3e29 | ||
|
|
c03f6ca9ba | ||
|
|
66f3ba7d06 | ||
|
|
511ba90378 | ||
|
|
01806d20dd | ||
|
|
049278c458 | ||
|
|
0aaa2d44a0 | ||
|
|
3f139a593e | ||
|
|
bee6fef69c | ||
|
|
f283a8a4c6 | ||
|
|
0d2433d850 | ||
|
|
a6b01bd8d5 | ||
|
|
8f2279b7e2 | ||
|
|
d37d26708d | ||
|
|
6234d7c49a | ||
|
|
f9a7bba32a | ||
|
|
068734da16 | ||
|
|
09a4108bcc |
24
.github/workflows/daily_keywords.yml
vendored
24
.github/workflows/daily_keywords.yml
vendored
@@ -1,16 +1,19 @@
|
|||||||
name: Daily Trends Factory
|
name: Daily Data Factory
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
# 每天 UTC 18:00 运行 (北京时间凌晨 02:00)
|
# 每天 UTC 18:00 (北京时间凌晨 02:00) 执行,赶在节点凌晨3点更新前造好子弹
|
||||||
- cron: '0 18 * * *'
|
- cron: '0 18 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-trends:
|
update-data:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
@@ -23,15 +26,20 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.10'
|
||||||
|
|
||||||
- name: Execute Trends Engine
|
- name: Execute Trends Engine (搜索词库)
|
||||||
run: python scripts/fetch_trends.py
|
run: python scripts/fetch_trends.py
|
||||||
|
|
||||||
- name: Commit and Push
|
- name: Execute Trust URL Engine (活体新闻流融合)
|
||||||
|
run: python scripts/fetch_trust_urls.py
|
||||||
|
|
||||||
|
- name: Commit and Push All Data
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name "github-actions[bot]"
|
git config --global user.name "github-actions[bot]"
|
||||||
git config --global user.email "github-actions[bot]@users.noreply.github.com"
|
git config --global user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
|
||||||
|
# 一揽子添加搜索词库和地区白名单的变化
|
||||||
git add data/keywords/
|
git add data/keywords/
|
||||||
|
git add data/regions/
|
||||||
|
|
||||||
# 防御机制:如果没有新数据,就静默退出,不产生空提交
|
# 防御机制:如果没有新数据,就静默退出,不产生空提交
|
||||||
if git diff --staged --quiet; then
|
if git diff --staged --quiet; then
|
||||||
@@ -39,6 +47,6 @@ jobs:
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 策略:放弃危险的 amend 强制覆盖,采用带日期的标准安全提交
|
# 策略:将两路数据的更新合并为一个原子提交
|
||||||
git commit -m "chore(data): 🤖 自动机兵:刷新全战区热点词库 [$(date +'%Y-%m-%d')]"
|
git commit -m "chore(data): 🤖 自动机兵:同步全战区热点词库与活体新闻流 [$(date +'%Y-%m-%d')]"
|
||||||
git push origin main
|
git push origin main
|
||||||
|
|||||||
22
README.md
22
README.md
@@ -12,6 +12,9 @@
|
|||||||
|
|
||||||
## ✨ 核心极客特性 (Core Architecture)
|
## ✨ 核心极客特性 (Core Architecture)
|
||||||
|
|
||||||
|
- 📊 **深海声呐全维探针 (Deep Sea Sonar v4.0)**:内嵌强效正则清洗的 JSON 提取引擎,异步生成情报级 IP 质量战报。聚合 Scamalytics、AbuseIPDB 等五大权威防欺诈库,精准嗅探代理/VPN特征、25端口封堵情况及原生流媒体(Netflix/Disney+/TikTok等)解锁状态,并自带 Google “送中”高危预警与基于 SQLite 的历史污染趋势追踪图谱。
|
||||||
|
- ⚡ **无损高并发引擎 (WAL Concurrency)**:司令部 SQLite 数据库全面激活 `WAL` (Write-Ahead Logging) 模式与毫秒级排队削峰算法。即使您同时对 500 台边缘节点发起全军总攻,也能完美规避 `database is locked` 与 Telegram `429` 频率拦截,实现 100% 战报送达。
|
||||||
|
- 🪶 **抽脂级极简部署 (Zero-Bloat Native)**:全栈剔除 `pip`、`flask` 等臃肿第三方依赖,完全基于 Python3 原生标准库运行。安装底层强制注入 `--no-install-recommends` 防捆绑参数。无论是 128MB 内存的极简 NAT 小鸡,还是 Alpine/Arch Linux 特种系统,均可如丝般顺滑运行。
|
||||||
- 🎛️ **扁平化指挥矩阵 (Flat Command Matrix)**:[v3.6.1 重构] 引入扁平化 L0-L3 四级战区降维视图与双轨身份制。深度定制 Inline Keyboard 逃生舱交互,支持在统一哨兵终端进行原位丝滑重绘 (In-place UI Edit),实现毫秒级模块热启停与日志抓取,彻底告别刷屏烦恼。
|
- 🎛️ **扁平化指挥矩阵 (Flat Command Matrix)**:[v3.6.1 重构] 引入扁平化 L0-L3 四级战区降维视图与双轨身份制。深度定制 Inline Keyboard 逃生舱交互,支持在统一哨兵终端进行原位丝滑重绘 (In-place UI Edit),实现毫秒级模块热启停与日志抓取,彻底告别刷屏烦恼。
|
||||||
- 🔄 **全栈零信任 OTA 引擎 (Zero-Trust OTA Upgrade)**:首创双端物理熔断机制。长官可通过私有中枢,一键向全舰队下发静默热重载指令;更支持**「司令部金蝉脱壳」**,中枢大脑可在此面板自我抛出幽灵进程进行免交互直装覆盖,实现真正的全栈去 SSH 化运维。
|
- 🔄 **全栈零信任 OTA 引擎 (Zero-Trust OTA Upgrade)**:首创双端物理熔断机制。长官可通过私有中枢,一键向全舰队下发静默热重载指令;更支持**「司令部金蝉脱壳」**,中枢大脑可在此面板自我抛出幽灵进程进行免交互直装覆盖,实现真正的全栈去 SSH 化运维。
|
||||||
- 🛡️ **SSOT 溯源与热更新装甲 (Smooth Upgrade Engine)**:全系脚本彻底消灭硬编码,部署时动态抓取云端版本信标。自带状态机嗅探逻辑与防撞甲探测,即使是手动在终端运行安装,也仅需回车瞬间完成配置继承、数据同步与无损换代。
|
- 🛡️ **SSOT 溯源与热更新装甲 (Smooth Upgrade Engine)**:全系脚本彻底消灭硬编码,部署时动态抓取云端版本信标。自带状态机嗅探逻辑与防撞甲探测,即使是手动在终端运行安装,也仅需回车瞬间完成配置继承、数据同步与无损换代。
|
||||||
@@ -32,8 +35,8 @@
|
|||||||
```text
|
```text
|
||||||
📦 IP-Sentinel
|
📦 IP-Sentinel
|
||||||
┣ 📂 .github/workflows/ # 🏭 自动化兵工厂:每月定时触发指纹生成的 CI/CD 流水线
|
┣ 📂 .github/workflows/ # 🏭 自动化兵工厂:每月定时触发指纹生成的 CI/CD 流水线
|
||||||
┣ 📂 master/ # 🧠 司令部:SQLite 存储、TG 监听与 Webhook 调度中心
|
┣ 📂 master/ # 🧠 司令部:SQLite 存储 (含 ip_trend_log 趋势跟踪表)、TG 监听与 Webhook 调度
|
||||||
┣ 📂 core/ # 🛡️ 边缘哨兵:Webhook 被动监听、哈希锚定执行引擎
|
┣ 📂 core/ # 🛡️ 边缘哨兵:Webhook 被动监听、哈希锚定执行引擎 (集成深海声呐探测模块)
|
||||||
┣ 📂 scripts/ # 🐍 兵工厂引擎:基于 Python 的多物理分区 UA 生成器
|
┣ 📂 scripts/ # 🐍 兵工厂引擎:基于 Python 的多物理分区 UA 生成器
|
||||||
┣ 📂 data/ # 🗂️ 全球数据规则库 (动态拓扑)
|
┣ 📂 data/ # 🗂️ 全球数据规则库 (动态拓扑)
|
||||||
┃ ┣ 📜 map.json # 🌍 全球区域大脑 (v3.5.0 大洲战区拓扑)
|
┃ ┣ 📜 map.json # 🌍 全球区域大脑 (v3.5.0 大洲战区拓扑)
|
||||||
@@ -45,6 +48,7 @@
|
|||||||
```
|
```
|
||||||
|
|
||||||
## 🚀 极速部署 (Quick Start)
|
## 🚀 极速部署 (Quick Start)
|
||||||
|
> 🛡️ **跨平台装甲支持**:Debian / Ubuntu / CentOS / RHEL / Alpine Linux / Arch Linux
|
||||||
系统现提供两种接入模式,请根据您的战术需求选择:
|
系统现提供两种接入模式,请根据您的战术需求选择:
|
||||||
|
|
||||||
### 🔹 模式 A:私有独立模式 (全自主、强烈推荐)
|
### 🔹 模式 A:私有独立模式 (全自主、强烈推荐)
|
||||||
@@ -53,13 +57,14 @@
|
|||||||
> ☢️ **核按钮系统已就绪**:采用私有部署,您将解锁 **OTA 远程静默升级** 权限!所有私有前线节点均可通过您的 TG 面板实现一键全网代码热重载换代!
|
> ☢️ **核按钮系统已就绪**:采用私有部署,您将解锁 **OTA 远程静默升级** 权限!所有私有前线节点均可通过您的 TG 面板实现一键全网代码热重载换代!
|
||||||
|
|
||||||
- **部署 Master (中枢大脑)**:找一台 VPS 作为司令部(仅需部署一台),执行:
|
- **部署 Master (中枢大脑)**:找一台 VPS 作为司令部(仅需部署一台),执行:
|
||||||
|
- [官方部署教程](https://blog.iot-architect.com/engineering-practice/ip-sentinel-master-deployment-guide/)
|
||||||
```bash
|
```bash
|
||||||
bash <(curl -sL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/master/install_master.sh)
|
curl -fsSL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/master/install_master.sh -o /tmp/ins_master.sh && sudo bash /tmp/ins_master.sh
|
||||||
```
|
```
|
||||||
- 部署 Agent (边缘哨兵):在需要养护的机器上执行 Agent 脚本,安装时选择私有独立中枢,并分别输入您自建机器人的 [Token](https://blog.iot-architect.com/engineering-practice/create-private-telegram-bot-via-botfather) 以及您的个人 [Chat ID](https://blog.iot-architect.com/engineering-practice/get-telegram-personal-id-via-userinfobot) :
|
- 部署 Agent (边缘哨兵):在需要养护的机器上执行 Agent 脚本,安装时选择私有独立中枢,并分别输入您自建机器人的 [Token](https://blog.iot-architect.com/engineering-practice/create-private-telegram-bot-via-botfather) 以及您的个人 [Chat ID](https://blog.iot-architect.com/engineering-practice/get-telegram-personal-id-via-userinfobot) :
|
||||||
|
- [官方部署教程](https://blog.iot-architect.com/engineering-practice/ip-sentinel-installation-and-upgrade-guide/)
|
||||||
```Bash
|
```Bash
|
||||||
bash <(curl -sL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/core/install.sh)
|
curl -fsSL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/core/install.sh -o /tmp/ins_agent.sh && sudo bash /tmp/ins_agent.sh
|
||||||
```
|
```
|
||||||
- 激活节点:安装完成后,您的手机会收到一条 #REGISTER# 注册暗号,将其转发给您自己的机器人即可完成编队入库。
|
- 激活节点:安装完成后,您的手机会收到一条 #REGISTER# 注册暗号,将其转发给您自己的机器人即可完成编队入库。
|
||||||
|
|
||||||
@@ -69,9 +74,9 @@ bash <(curl -sL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/core/i
|
|||||||
- 关注机器人:在 TG 中关注官方安全网关 [@OmniBeacon_bot](https://t.me/OmniBeacon_bot) 并发送 /start。
|
- 关注机器人:在 TG 中关注官方安全网关 [@OmniBeacon_bot](https://t.me/OmniBeacon_bot) 并发送 /start。
|
||||||
|
|
||||||
- 部署 Agent:在目标 VPS 上执行以下指令,安装过程中选择官方公共网关,并输入您的 Chat ID:
|
- 部署 Agent:在目标 VPS 上执行以下指令,安装过程中选择官方公共网关,并输入您的 Chat ID:
|
||||||
|
- [官方部署教程](https://blog.iot-architect.com/engineering-practice/ip-sentinel-installation-and-upgrade-guide/)
|
||||||
```Bash
|
```Bash
|
||||||
bash <(curl -sL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/core/install.sh)
|
curl -fsSL https://raw.githubusercontent.com/hotyue/IP-Sentinel/main/core/install.sh -o /tmp/ins_agent.sh && sudo bash /tmp/ins_agent.sh
|
||||||
```
|
```
|
||||||
- 激活节点:同上,将收到的暗号转发给官方机器人即可。
|
- 激活节点:同上,将收到的暗号转发给官方机器人即可。
|
||||||
|
|
||||||
@@ -124,6 +129,9 @@ bash <(curl -sL https://raw.githubusercontent.com/hotyue/IP-Sentinel/legacy/core
|
|||||||
|
|
||||||
如果你想为项目增加新的节点区域(例如德国、英国、大洋洲等),或者提供更丰富的本土化搜索词库,非常欢迎提交 Pull Request!
|
如果你想为项目增加新的节点区域(例如德国、英国、大洋洲等),或者提供更丰富的本土化搜索词库,非常欢迎提交 Pull Request!
|
||||||
|
|
||||||
|
|
||||||
|
> - 感谢 @xykt 本项目IP质量检测采用[xykt/IPQuality](https://github.com/xykt/IPQuality) 脚本!
|
||||||
|
|
||||||
**💡 全球节点贡献规范:**
|
**💡 全球节点贡献规范:**
|
||||||
1. 在 `data/regions/国家代码/省州代码/` 目录下新增对应城市的配置 `.json`。
|
1. 在 `data/regions/国家代码/省州代码/` 目录下新增对应城市的配置 `.json`。
|
||||||
2. 在 `data/keywords/` 目录下新增或完善配套国家的词库 `kw_XX.txt`。
|
2. 在 `data/keywords/` 目录下新增或完善配套国家的词库 `kw_XX.txt`。
|
||||||
|
|||||||
@@ -40,27 +40,30 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$AGENT_IP" ]; then
|
if [ -n "$AGENT_IP" ]; then
|
||||||
# --- [重点升级 2: 智能防打扰注册机制] ---
|
|
||||||
LAST_IP=""
|
LAST_IP=""
|
||||||
[ -f "$IP_CACHE" ] && LAST_IP=$(cat "$IP_CACHE" | tr -d '[:space:]')
|
[ -f "$IP_CACHE" ] && LAST_IP=$(cat "$IP_CACHE" | tr -d '[:space:]')
|
||||||
|
|
||||||
# 只有当这是第一次运行,或者公网 IP 发生变动时,才发送 Telegram 申请
|
|
||||||
if [ "$AGENT_IP" != "$LAST_IP" ]; then
|
if [ "$AGENT_IP" != "$LAST_IP" ]; then
|
||||||
# [v3.5.2 核心] 携带 6 字段双轨身份发起注册申请 (展示别名,暗号尾部追加 NODE_ALIAS)
|
# [静音手术] 仅在本地静默更新 IP 缓存,彻底切除重复的 TG 发信逻辑,做沉默的守夜人
|
||||||
REG_MSG="👋 **[边缘节点接入申请]**%0A大区: \`${REGION_CODE}\`%0A节点: \`${NODE_ALIAS}\`%0A地址: \`${AGENT_IP}:${AGENT_PORT}\`%0A%0A⚠️ **安全验证**: 为防止非法节点接入,请长按复制下方代码,并**发送给我**以完成最终授权录入:%0A%0A\`#REGISTER#|${REGION_CODE}|${NODE_NAME}|${AGENT_IP}|${AGENT_PORT}|${NODE_ALIAS}\`"
|
|
||||||
|
|
||||||
curl -s -m 5 -X POST "${TG_API_URL}" \
|
|
||||||
-d "chat_id=${CHAT_ID}" \
|
|
||||||
-d "text=${REG_MSG}" \
|
|
||||||
-d "parse_mode=Markdown" > /dev/null
|
|
||||||
|
|
||||||
echo "✅ [Agent] 已向司令部发送接入申请,请在 Telegram 手机端完成授权!"
|
|
||||||
echo "$AGENT_IP" > "$IP_CACHE"
|
echo "$AGENT_IP" > "$IP_CACHE"
|
||||||
|
echo "ℹ️ [Agent] 发现本地 IP 变动,已静默更新缓存: $AGENT_IP"
|
||||||
else
|
else
|
||||||
echo "ℹ️ [Agent] IP 未变动 ($AGENT_IP),跳过重复注册申请。"
|
echo "ℹ️ [Agent] IP 未变动 ($AGENT_IP),继续后台静默监听。"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# ================== [v3.6.3 新增: 自动生成自签名 TLS 加密证书] ==================
|
||||||
|
# [修复] 彻底废除官方网关免 TLS 的裸奔逻辑,全网强制生成证书装甲
|
||||||
|
CERT_FILE="${INSTALL_DIR}/core/cert.pem"
|
||||||
|
KEY_FILE="${INSTALL_DIR}/core/key.pem"
|
||||||
|
if [ ! -f "$CERT_FILE" ] || [ ! -f "$KEY_FILE" ]; then
|
||||||
|
echo "🔐 [Agent] 正在生成本地自签名 TLS 加密证书 (2048位 RSA)..."
|
||||||
|
openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
|
||||||
|
-keyout "$KEY_FILE" -out "$CERT_FILE" \
|
||||||
|
-subj "/C=US/O=IP-Sentinel/CN=Agent-Sec" >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
# ==============================================================================
|
||||||
|
|
||||||
# 3. 启动轻量级 Python3 Webhook 监听服务 (v3.0.4 动态 HMAC 签名防重放)
|
# 3. 启动轻量级 Python3 Webhook 监听服务 (v3.0.4 动态 HMAC 签名防重放)
|
||||||
cat > "${INSTALL_DIR}/core/webhook.py" << 'EOF'
|
cat > "${INSTALL_DIR}/core/webhook.py" << 'EOF'
|
||||||
import http.server
|
import http.server
|
||||||
@@ -71,7 +74,7 @@ import os
|
|||||||
import html
|
import html
|
||||||
# ================== [v3.0.4 新增密码学与解析依赖] ==================
|
# ================== [v3.0.4 新增密码学与解析依赖] ==================
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
import urllib.request # [修复] 提升至全局作用域,防止局部变量遮蔽
|
import urllib.request
|
||||||
import hmac
|
import hmac
|
||||||
import hashlib
|
import hashlib
|
||||||
import time
|
import time
|
||||||
@@ -79,6 +82,15 @@ import time
|
|||||||
|
|
||||||
PORT = int(sys.argv[1])
|
PORT = int(sys.argv[1])
|
||||||
|
|
||||||
|
# 🛡️ 防重放攻击 (Nonce 缓存池)
|
||||||
|
USED_SIGNS = {}
|
||||||
|
def clean_used_signs():
|
||||||
|
now = time.time()
|
||||||
|
# 清理过期签名 (超 60 秒的安全窗口)
|
||||||
|
expired = [s for s, t in USED_SIGNS.items() if now - t > 65]
|
||||||
|
for s in expired:
|
||||||
|
del USED_SIGNS[s]
|
||||||
|
|
||||||
# 🛡️ 提取全局鉴权 Token (利用 CHAT_ID 作为 PSK 预共享密钥)
|
# 🛡️ 提取全局鉴权 Token (利用 CHAT_ID 作为 PSK 预共享密钥)
|
||||||
AUTH_TOKEN = ""
|
AUTH_TOKEN = ""
|
||||||
if os.path.exists('/opt/ip_sentinel/config.conf'):
|
if os.path.exists('/opt/ip_sentinel/config.conf'):
|
||||||
@@ -108,8 +120,9 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
current_time = int(time.time())
|
||||||
# 校验 2:时间戳防重放 (误差 ±60秒 内有效,拒绝隔夜抓包重放)
|
# 校验 2:时间戳防重放 (误差 ±60秒 内有效,拒绝隔夜抓包重放)
|
||||||
if abs(int(time.time()) - int(req_t)) > 60:
|
if abs(current_time - int(req_t)) > 60:
|
||||||
self.send_response(401)
|
self.send_response(401)
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"401 Unauthorized: Request Expired\n")
|
self.wfile.write(b"401 Unauthorized: Request Expired\n")
|
||||||
@@ -118,6 +131,14 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
self.send_response(401)
|
self.send_response(401)
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# 校验 2.5:基于 60秒 窗口的精确重放拦截 (拦截 MITM 并发洗劫)
|
||||||
|
clean_used_signs()
|
||||||
|
if req_sign in USED_SIGNS:
|
||||||
|
self.send_response(401)
|
||||||
|
self.end_headers()
|
||||||
|
self.wfile.write(b"401 Unauthorized: Replay Attack Detected\n")
|
||||||
|
return
|
||||||
|
|
||||||
# 校验 3:HMAC 数据完整性与身份合法性校验
|
# 校验 3:HMAC 数据完整性与身份合法性校验
|
||||||
msg = f"{req_path}:{req_t}".encode('utf-8')
|
msg = f"{req_path}:{req_t}".encode('utf-8')
|
||||||
@@ -129,17 +150,20 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"401 Unauthorized: Signature Mismatch\n")
|
self.wfile.write(b"401 Unauthorized: Signature Mismatch\n")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# 鉴权通过,记录该签名至防重放内存池
|
||||||
|
USED_SIGNS[req_sign] = current_time
|
||||||
|
|
||||||
# ================== 路由分发 (恢复为安全的精确匹配) ==================
|
# ================== 路由分发 (恢复为安全的精确匹配) ==================
|
||||||
|
|
||||||
# 路由 0: 全局统筹调度 (处理 /trigger_run 一键全节点维护)
|
# 路由 0: 全局统筹调度
|
||||||
if req_path == '/trigger_run':
|
if req_path == '/trigger_run':
|
||||||
if os.path.exists('/opt/ip_sentinel/core/runner.sh'):
|
if os.path.exists('/opt/ip_sentinel/core/runner.sh'):
|
||||||
self.send_response(200)
|
self.send_response(200)
|
||||||
self.send_header("Content-type", "text/plain")
|
self.send_header("Content-type", "text/plain")
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"Action Accepted: runner\n")
|
self.wfile.write(b"Action Accepted: runner\n")
|
||||||
subprocess.Popen(['bash', '/opt/ip_sentinel/core/runner.sh'])
|
os.system("nohup bash /opt/ip_sentinel/core/runner.sh >/dev/null 2>&1 &")
|
||||||
else:
|
else:
|
||||||
self.send_response(404)
|
self.send_response(404)
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
@@ -151,7 +175,7 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
self.send_header("Content-type", "text/plain")
|
self.send_header("Content-type", "text/plain")
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"Action Accepted: mod_google\n")
|
self.wfile.write(b"Action Accepted: mod_google\n")
|
||||||
subprocess.Popen(['bash', '/opt/ip_sentinel/core/mod_google.sh'])
|
os.system("nohup bash /opt/ip_sentinel/core/mod_google.sh >/dev/null 2>&1 &")
|
||||||
else:
|
else:
|
||||||
self.send_response(403)
|
self.send_response(403)
|
||||||
self.send_header("Content-type", "text/plain")
|
self.send_header("Content-type", "text/plain")
|
||||||
@@ -165,7 +189,7 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
self.send_header("Content-type", "text/plain")
|
self.send_header("Content-type", "text/plain")
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"Action Accepted: mod_trust\n")
|
self.wfile.write(b"Action Accepted: mod_trust\n")
|
||||||
subprocess.Popen(['bash', '/opt/ip_sentinel/core/mod_trust.sh'])
|
os.system("nohup bash /opt/ip_sentinel/core/mod_trust.sh >/dev/null 2>&1 &")
|
||||||
else:
|
else:
|
||||||
self.send_response(403)
|
self.send_response(403)
|
||||||
self.send_header("Content-type", "text/plain")
|
self.send_header("Content-type", "text/plain")
|
||||||
@@ -178,7 +202,7 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
self.send_header("Content-type", "text/plain")
|
self.send_header("Content-type", "text/plain")
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"Action Accepted: tg_report\n")
|
self.wfile.write(b"Action Accepted: tg_report\n")
|
||||||
subprocess.Popen(['bash', '/opt/ip_sentinel/core/tg_report.sh'])
|
os.system("nohup bash /opt/ip_sentinel/core/tg_report.sh >/dev/null 2>&1 &")
|
||||||
|
|
||||||
# 路由 4: 抓取并回传实时日志
|
# 路由 4: 抓取并回传实时日志
|
||||||
elif req_path == '/trigger_log':
|
elif req_path == '/trigger_log':
|
||||||
@@ -211,23 +235,45 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
|
|
||||||
text_msg = f"📄 <b>[{node_alias}] 实时日志 (v{local_ver}):</b>\n<pre><code>{log_data}</code></pre>"
|
text_msg = f"📄 <b>[{node_alias}] 实时日志 (v{local_ver}):</b>\n<pre><code>{log_data}</code></pre>"
|
||||||
|
|
||||||
data = urllib.parse.urlencode({
|
# [v4.0.3 体验升级] 引入 json 模块并改用 JSON Payload,挂载返回控制台按钮
|
||||||
|
import json
|
||||||
|
node_name_cb = config.get('NODE_NAME', 'Unknown')
|
||||||
|
payload = {
|
||||||
'chat_id': config.get('CHAT_ID', ''),
|
'chat_id': config.get('CHAT_ID', ''),
|
||||||
'text': text_msg,
|
'text': text_msg,
|
||||||
'parse_mode': 'HTML'
|
'parse_mode': 'HTML',
|
||||||
}).encode('utf-8')
|
'reply_markup': {
|
||||||
|
'inline_keyboard': [[{'text': '⚙️ 调出该节点控制台', 'callback_data': f'manage:{node_name_cb}'}]]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data = json.dumps(payload).encode('utf-8')
|
||||||
|
|
||||||
req = urllib.request.Request(
|
req = urllib.request.Request(
|
||||||
config.get('TG_API_URL', ''),
|
config.get('TG_API_URL', ''),
|
||||||
data=data,
|
data=data,
|
||||||
# [动态化] 彻底消灭硬编码,使用运行态版本号
|
# [动态化] 彻底消灭硬编码,使用运行态版本号,并声明 JSON 头
|
||||||
headers={'User-Agent': f'IP-Sentinel-Agent/{local_ver}'}
|
headers={
|
||||||
|
'User-Agent': f'IP-Sentinel-Agent/{local_ver}',
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
)
|
)
|
||||||
urllib.request.urlopen(req, timeout=10)
|
urllib.request.urlopen(req, timeout=10)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Log transmission failed: {e}")
|
print(f"Log transmission failed: {e}")
|
||||||
|
|
||||||
|
# ================== [v4.0.0 新增: 触发深海声呐] ==================
|
||||||
|
elif req_path == '/trigger_quality':
|
||||||
|
self.send_response(200)
|
||||||
|
self.send_header("Content-type", "text/plain")
|
||||||
|
self.end_headers()
|
||||||
|
self.wfile.write(b"Action Accepted: trigger_quality\n")
|
||||||
|
|
||||||
|
if os.path.exists('/opt/ip_sentinel/core/mod_quality.sh'):
|
||||||
|
os.system("nohup bash /opt/ip_sentinel/core/mod_quality.sh >/dev/null 2>&1 &")
|
||||||
|
# =================================================================
|
||||||
|
|
||||||
|
|
||||||
# 路由 5: 节点重命名展示别名同步接口 (Base64 终极防御版)
|
# 路由 5: 节点重命名展示别名同步接口 (Base64 终极防御版)
|
||||||
elif req_path == '/trigger_rename':
|
elif req_path == '/trigger_rename':
|
||||||
b64_alias = query.get('b64', [''])[0]
|
b64_alias = query.get('b64', [''])[0]
|
||||||
@@ -370,17 +416,48 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
self.end_headers()
|
self.end_headers()
|
||||||
self.wfile.write(b"Action Accepted: trigger_ota\n")
|
self.wfile.write(b"Action Accepted: trigger_ota\n")
|
||||||
|
|
||||||
# [修复] 逃逸 Systemd Cgroup,防止 Agent 在升级时被同归于尽机制误杀
|
# [修复] 逃逸 Systemd Cgroup,并引入 bash -n 语法树校验防砖机制
|
||||||
import shutil
|
import shutil
|
||||||
|
import base64
|
||||||
|
# 动态提取部署时的源地址,废除强制写死 main 分支,保障隔离测试环境
|
||||||
repo_url = "https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
repo_url = "https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
||||||
ota_cmd = f"export SILENT_OTA='true'; curl -fsSL {repo_url}/core/install.sh -o /tmp/ota_agent.sh && bash /tmp/ota_agent.sh > /opt/ip_sentinel/logs/ota_upgrade.log 2>&1"
|
if os.path.exists('/opt/ip_sentinel/core/install.sh'):
|
||||||
|
with open('/opt/ip_sentinel/core/install.sh', 'r') as f:
|
||||||
|
for line in f:
|
||||||
|
if line.startswith('REPO_RAW_URL='):
|
||||||
|
repo_url = line.split('=', 1)[1].strip('"\'')
|
||||||
|
break
|
||||||
|
|
||||||
|
# 动态构建报错回执文本 (第一层 Base64 隔离换行与特殊字符)
|
||||||
|
err_msg = f"❌ **OTA 熔断告警**\n📍 节点: `{config_mem.get('NODE_ALIAS', '未知')}`\n⚠️ 原因: 脚本语法校验(bash -n)未通过,下载可能不完整。\n🚀 状态: 升级已取消,节点安全。"
|
||||||
|
err_msg_b64 = base64.b64encode(err_msg.encode('utf-8')).decode('utf-8')
|
||||||
|
|
||||||
|
tg_url = config_mem.get('TG_API_URL', '')
|
||||||
|
chat_id = config_mem.get('CHAT_ID', '')
|
||||||
|
|
||||||
|
# [v3.6.3 究极防御] 采用 Base64 将整个 OTA 执行脚本封装 (第二层隔离)
|
||||||
|
# 彻底免疫因为 python 变量掺杂引号而导致的 shell 注入或截断
|
||||||
|
ota_script = f"""
|
||||||
|
export SILENT_OTA="true"
|
||||||
|
curl -fsSL {repo_url}/core/install.sh -o /tmp/ota_agent.sh
|
||||||
|
if bash -n /tmp/ota_agent.sh; then
|
||||||
|
bash /tmp/ota_agent.sh > /opt/ip_sentinel/logs/ota_upgrade.log 2>&1
|
||||||
|
else
|
||||||
|
MSG=$(echo '{err_msg_b64}' | base64 -d)
|
||||||
|
curl -s -m 10 -X POST "{tg_url}" -d "chat_id={chat_id}" -d "text=$MSG" -d "parse_mode=Markdown" > /dev/null 2>&1
|
||||||
|
echo "OTA Checksum Failed: Script corrupted" > /opt/ip_sentinel/logs/ota_upgrade.log
|
||||||
|
fi
|
||||||
|
"""
|
||||||
|
ota_script_b64 = base64.b64encode(ota_script.encode('utf-8')).decode('utf-8')
|
||||||
|
|
||||||
|
# 安全解包并执行
|
||||||
if shutil.which("systemd-run"):
|
if shutil.which("systemd-run"):
|
||||||
full_cmd = f"systemd-run --quiet --no-block bash -c \"{ota_cmd}\""
|
full_cmd = f"systemd-run --quiet --no-block bash -c \"echo '{ota_script_b64}' | base64 -d | bash\""
|
||||||
else:
|
else:
|
||||||
full_cmd = f"nohup bash -c \"{ota_cmd}\" &"
|
full_cmd = f"nohup bash -c \"echo '{ota_script_b64}' | base64 -d | bash\" >/dev/null 2>&1 &"
|
||||||
|
|
||||||
subprocess.Popen(full_cmd, shell=True)
|
# 彻底统一为 os.system,消灭最后一个可能游离的 Popen 僵尸进程
|
||||||
|
os.system(full_cmd)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.send_response(500)
|
self.send_response(500)
|
||||||
@@ -398,9 +475,18 @@ import socket
|
|||||||
# ================== [v3.0.3 变更: 引入多线程模型抵抗 Slowloris 攻击] ==================
|
# ================== [v3.0.3 变更: 引入多线程模型抵抗 Slowloris 攻击] ==================
|
||||||
class ThreadedServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
class ThreadedServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
||||||
allow_reuse_address = True # 开启端口复用,防止热重启时端口冲突
|
allow_reuse_address = True # 开启端口复用,防止热重启时端口冲突
|
||||||
|
|
||||||
|
# [核心修复] 显式关闭 V6ONLY 参数,治愈大量云主机纯双栈下的 IPv4 耳聋现象
|
||||||
|
def server_bind(self):
|
||||||
|
if self.address_family == socket.AF_INET6:
|
||||||
|
try:
|
||||||
|
self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
super().server_bind()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# 1. 优先尝试监听双栈/IPv6 (大多数 Linux 默认支持 IPv4 映射接入)
|
# 1. 优先尝试监听双栈/IPv6
|
||||||
ThreadedServer.address_family = socket.AF_INET6
|
ThreadedServer.address_family = socket.AF_INET6
|
||||||
httpd = ThreadedServer(("::", PORT), AgentHandler)
|
httpd = ThreadedServer(("::", PORT), AgentHandler)
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -408,6 +494,21 @@ except Exception:
|
|||||||
ThreadedServer.address_family = socket.AF_INET
|
ThreadedServer.address_family = socket.AF_INET
|
||||||
httpd = ThreadedServer(("0.0.0.0", PORT), AgentHandler)
|
httpd = ThreadedServer(("0.0.0.0", PORT), AgentHandler)
|
||||||
|
|
||||||
|
# ================== [v3.6.3 核心: 挂载 TLS 加密隧道 (强制装甲版)] ==================
|
||||||
|
import ssl
|
||||||
|
cert_path = '/opt/ip_sentinel/core/cert.pem'
|
||||||
|
key_path = '/opt/ip_sentinel/core/key.pem'
|
||||||
|
|
||||||
|
# 全网强制启用 TLS 装甲,彻底消灭 HTTP 裸奔漏洞
|
||||||
|
if os.path.exists(cert_path) and os.path.exists(key_path):
|
||||||
|
try:
|
||||||
|
context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
|
||||||
|
context.load_cert_chain(certfile=cert_path, keyfile=key_path)
|
||||||
|
httpd.socket = context.wrap_socket(httpd.socket, server_side=True)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"SSL 隧道构建失败,退化为 HTTP: {e}")
|
||||||
|
# ======================================================================================
|
||||||
|
|
||||||
try:
|
try:
|
||||||
httpd.serve_forever()
|
httpd.serve_forever()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
291
core/install.sh
291
core/install.sh
@@ -22,9 +22,10 @@ INSTALL_DIR="/opt/ip_sentinel"
|
|||||||
CONFIG_FILE="${INSTALL_DIR}/config.conf"
|
CONFIG_FILE="${INSTALL_DIR}/config.conf"
|
||||||
|
|
||||||
# [核心: 动态提取 Agent 专属版本锚点 (KV 解析法)]
|
# [核心: 动态提取 Agent 专属版本锚点 (KV 解析法)]
|
||||||
TARGET_VERSION=$(curl -s -m 3 "${REPO_RAW_URL}/version.txt" | grep "^AGENT_VERSION=" | cut -d'=' -f2 | tr -d '[:space:]')
|
# [修复] 增加 -L 与双栈容灾 (-4),解决纯 V6 或 V6 优先机器连接 GitHub Raw 易超时的问题
|
||||||
|
TARGET_VERSION=$( (curl -sL -m 5 "${REPO_RAW_URL}/version.txt" || curl -4 -sL -m 5 "${REPO_RAW_URL}/version.txt") 2>/dev/null | grep "^AGENT_VERSION=" | cut -d'=' -f2 | tr -d '[:space:]')
|
||||||
# 🛡️ 兜底防线:如果网络波动拉取失败,启用内置的安全兜底版本
|
# 🛡️ 兜底防线:如果网络波动拉取失败,启用内置的安全兜底版本
|
||||||
TARGET_VERSION=${TARGET_VERSION:-"3.5.1"}
|
TARGET_VERSION=${TARGET_VERSION:-"4.0.0"}
|
||||||
|
|
||||||
# 轻量级版本号比对函数 (例如: version_lt "3.3.1" "3.4.0" 返回 true)
|
# 轻量级版本号比对函数 (例如: version_lt "3.3.1" "3.4.0" 返回 true)
|
||||||
version_lt() {
|
version_lt() {
|
||||||
@@ -35,7 +36,7 @@ version_lt() {
|
|||||||
echo -e "\n[1/7] 正在探测并安装基础环境依赖 (curl, jq, cron, procps, python3)..."
|
echo -e "\n[1/7] 正在探测并安装基础环境依赖 (curl, jq, cron, procps, python3)..."
|
||||||
|
|
||||||
# 定义必须检测的核心命令
|
# 定义必须检测的核心命令
|
||||||
REQUIRED_CMDS=("curl" "jq" "crontab" "pgrep" "python3")
|
REQUIRED_CMDS=("curl" "jq" "crontab" "pgrep" "python3" "openssl")
|
||||||
MISSING_CMDS=()
|
MISSING_CMDS=()
|
||||||
|
|
||||||
# 基础探测:预检查缺失的命令
|
# 基础探测:预检查缺失的命令
|
||||||
@@ -53,40 +54,45 @@ if [ ${#MISSING_CMDS[@]} -gt 0 ]; then
|
|||||||
if command -v apt-get >/dev/null 2>&1; then
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
# Debian / Ubuntu 系列
|
# Debian / Ubuntu 系列
|
||||||
apt-get update -y >/dev/null 2>&1
|
apt-get update -y >/dev/null 2>&1
|
||||||
apt-get install -y curl jq cron procps python3 >/dev/null 2>&1
|
# [v3.6.3 抽脂级优化] 注入 --no-install-recommends 拒绝捆绑销售,大幅节省磁盘与内存
|
||||||
|
apt-get install -y --no-install-recommends curl jq cron procps python3 openssl >/dev/null 2>&1
|
||||||
systemctl enable cron >/dev/null 2>&1 && systemctl start cron >/dev/null 2>&1
|
systemctl enable cron >/dev/null 2>&1 && systemctl start cron >/dev/null 2>&1
|
||||||
|
|
||||||
elif command -v yum >/dev/null 2>&1 || command -v dnf >/dev/null 2>&1; then
|
elif command -v yum >/dev/null 2>&1 || command -v dnf >/dev/null 2>&1; then
|
||||||
# RHEL / CentOS / AlmaLinux 系列
|
# RHEL / CentOS / AlmaLinux 系列
|
||||||
PKG_MGR="yum"
|
PKG_MGR="yum"
|
||||||
command -v dnf >/dev/null 2>&1 && PKG_MGR="dnf"
|
OPT_ARGS=""
|
||||||
$PKG_MGR install -y curl jq cronie procps-ng python3 >/dev/null 2>&1
|
if command -v dnf >/dev/null 2>&1; then
|
||||||
|
PKG_MGR="dnf"
|
||||||
|
# [v3.6.3 抽脂级优化] 强行关闭 DNF 的弱依赖拉取
|
||||||
|
OPT_ARGS="--setopt=install_weak_deps=False"
|
||||||
|
fi
|
||||||
|
$PKG_MGR install -y $OPT_ARGS curl jq cronie procps-ng python3 openssl >/dev/null 2>&1
|
||||||
systemctl enable crond >/dev/null 2>&1 && systemctl start crond >/dev/null 2>&1
|
systemctl enable crond >/dev/null 2>&1 && systemctl start crond >/dev/null 2>&1
|
||||||
|
|
||||||
elif command -v apk >/dev/null 2>&1; then
|
elif command -v apk >/dev/null 2>&1; then
|
||||||
# [核心修复 Issue #21] Alpine Linux 系列
|
# Alpine 本身就是极致精简,无需特殊参数
|
||||||
echo "Alpine 探测到系统类型为 Alpine Linux,正在执行轻量级安装..."
|
echo "Alpine 探测到系统类型为 Alpine Linux,正在执行轻量级安装..."
|
||||||
apk add --no-cache curl jq dcron procps python3 bash >/dev/null 2>&1
|
# [修复] 新版 Alpine 已废弃 dcron。优先尝试 cronie,若失败则信任自带 busybox-cron,并移除屏蔽以便暴露报错
|
||||||
# Alpine 下必须手动创建 cron spool 目录并启动 crond
|
apk add --no-cache curl jq cronie procps python3 bash openssl || apk add --no-cache curl jq procps python3 bash openssl
|
||||||
mkdir -p /var/spool/cron/crontabs
|
mkdir -p /var/spool/cron/crontabs
|
||||||
rc-update add crond default >/dev/null 2>&1
|
rc-update add crond default >/dev/null 2>&1
|
||||||
service crond start >/dev/null 2>&1
|
service crond start >/dev/null 2>&1
|
||||||
|
|
||||||
elif command -v pacman >/dev/null 2>&1; then
|
elif command -v pacman >/dev/null 2>&1; then
|
||||||
# [核心修复 Issue #250] Arch Linux 系列
|
# Arch Linux 系列
|
||||||
pacman -Sy --noconfirm curl jq cronie procps-ng python >/dev/null 2>&1
|
pacman -Sy --noconfirm curl jq cronie procps-ng python openssl >/dev/null 2>&1
|
||||||
# Arch 下某些 cronie 实现可能缺少 /root/.cache 权限,做个兼容保障
|
|
||||||
mkdir -p /root/.cache/crontab 2>/dev/null
|
mkdir -p /root/.cache/crontab 2>/dev/null
|
||||||
systemctl enable cronie >/dev/null 2>&1 && systemctl start cronie >/dev/null 2>&1
|
systemctl enable cronie >/dev/null 2>&1 && systemctl start cronie >/dev/null 2>&1
|
||||||
|
|
||||||
else
|
else
|
||||||
# 无法识别的系统:退出并给出清晰的引导信息
|
# 无法识别的系统:退出并给出清晰的引导信息 (同步更新防捆绑参数)
|
||||||
echo -e "\033[31m❌ 自动安装失败:系统未知的包管理器。\033[0m"
|
echo -e "\033[31m❌ 自动安装失败:系统未知的包管理器。\033[0m"
|
||||||
echo -e "\033[33m⚠️ 请根据您的操作系统,手动执行以下安装命令后重新运行本脚本:\033[0m"
|
echo -e "\033[33m⚠️ 请根据您的操作系统,手动执行以下安装命令后重新运行本脚本:\033[0m"
|
||||||
echo -e " Debian/Ubuntu: \033[36mapt-get update && apt-get install -y curl jq cron procps python3\033[0m"
|
echo -e " Debian/Ubuntu: \033[36mapt-get update && apt-get install -y --no-install-recommends curl jq cron procps python3 openssl\033[0m"
|
||||||
echo -e " CentOS/RHEL: \033[36myum install -y curl jq cronie procps-ng python3\033[0m"
|
echo -e " CentOS/RHEL: \033[36myum install -y curl jq cronie procps-ng python3 openssl\033[0m"
|
||||||
echo -e " Alpine Linux: \033[36mapk add --no-cache curl jq dcron procps python3 bash\033[0m"
|
echo -e " Alpine Linux: \033[36mapk add --no-cache curl jq cronie procps python3 bash openssl\033[0m"
|
||||||
echo -e " Arch Linux: \033[36mpacman -Sy curl jq cronie procps-ng python\033[0m"
|
echo -e " Arch Linux: \033[36mpacman -Sy curl jq cronie procps-ng python openssl\033[0m"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -176,13 +182,26 @@ pkill -9 -f "runner.sh" >/dev/null 2>&1 || true
|
|||||||
|
|
||||||
# 2. 清除系统定时任务 (Cron) 中的旧版条目 (安全容错版)
|
# 2. 清除系统定时任务 (Cron) 中的旧版条目 (安全容错版)
|
||||||
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_clean || true
|
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_clean || true
|
||||||
[ -f /tmp/cron_clean ] && crontab /tmp/cron_clean 2>/dev/null
|
# [追加 >/dev/null 2>&1 堵死 Alpine 的脏话输出]
|
||||||
|
[ -f /tmp/cron_clean ] && crontab /tmp/cron_clean >/dev/null 2>&1
|
||||||
rm -f /tmp/cron_clean
|
rm -f /tmp/cron_clean
|
||||||
|
|
||||||
|
# ==========================================
|
||||||
|
# 🛑 [物理抹除] 彻底扫除 Alpine 系统的底层残留与双路径文件
|
||||||
|
# ==========================================
|
||||||
|
for CRON_FILE in "/var/spool/cron/crontabs/root" "/etc/crontabs/root"; do
|
||||||
|
if [ -f "$CRON_FILE" ]; then
|
||||||
|
grep -v "ip_sentinel" "$CRON_FILE" > "${CRON_FILE}.tmp" 2>/dev/null || true
|
||||||
|
cat "${CRON_FILE}.tmp" > "$CRON_FILE" 2>/dev/null || true
|
||||||
|
rm -f "${CRON_FILE}.tmp" 2>/dev/null
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# 清理 OpenRC 开机启动项
|
||||||
|
rm -f /etc/local.d/ip_sentinel.start 2>/dev/null
|
||||||
|
|
||||||
# 3. 抹除旧版核心代码,杜绝代码冲突 (根据模式分流)
|
# 3. 抹除旧版核心代码,杜绝代码冲突 (根据模式分流)
|
||||||
if [ "$UPGRADE_MODE" == "true" ]; then
|
if [ "$UPGRADE_MODE" == "true" ]; then
|
||||||
# 升级模式:仅销毁核心引擎,严格保留 config 与 data
|
# [修复] 升级模式:不再提前销毁核心引擎,改为后续下载成功后的原子化替换,彻底防止断网变砖!
|
||||||
rm -rf "${INSTALL_DIR}/core" 2>/dev/null
|
|
||||||
if [ "$KEEP_LOGS" == "false" ]; then
|
if [ "$KEEP_LOGS" == "false" ]; then
|
||||||
rm -rf "${INSTALL_DIR}/logs" 2>/dev/null
|
rm -rf "${INSTALL_DIR}/logs" 2>/dev/null
|
||||||
echo -e "🗑️ 历史日志已按指令清空。"
|
echo -e "🗑️ 历史日志已按指令清空。"
|
||||||
@@ -605,38 +624,46 @@ if [ "$UPGRADE_MODE" == "true" ]; then
|
|||||||
fi
|
fi
|
||||||
# ========================================================================
|
# ========================================================================
|
||||||
|
|
||||||
# 6. 拉取全套组件 (按需下载,绝不浪费空间)
|
# 6. 拉取全套组件 (原子化升级,防断网变砖)
|
||||||
echo -e "\n[6/7] 正在根据模块开关部署核心引擎与热数据..."
|
echo -e "\n[6/7] 正在部署核心引擎与热数据..."
|
||||||
# 确保目录在升级模式下也能被正确建立
|
|
||||||
mkdir -p "${INSTALL_DIR}/core"
|
|
||||||
mkdir -p "${INSTALL_DIR}/data/keywords"
|
mkdir -p "${INSTALL_DIR}/data/keywords"
|
||||||
|
|
||||||
# 基础公共组件
|
# [核心修复] 开辟临时下载区,确保下载 100% 成功后再替换旧核心
|
||||||
curl -sL "${REPO_RAW_URL}/core/runner.sh" -o "${INSTALL_DIR}/core/runner.sh"
|
TMP_CORE="/tmp/ip_sentinel_core_$$"
|
||||||
curl -sL "${REPO_RAW_URL}/core/updater.sh" -o "${INSTALL_DIR}/core/updater.sh"
|
mkdir -p "$TMP_CORE"
|
||||||
curl -sL "${REPO_RAW_URL}/core/tg_report.sh" -o "${INSTALL_DIR}/core/tg_report.sh"
|
|
||||||
curl -sL "${REPO_RAW_URL}/core/agent_daemon.sh" -o "${INSTALL_DIR}/core/agent_daemon.sh"
|
|
||||||
curl -sL "${REPO_RAW_URL}/core/uninstall.sh" -o "${INSTALL_DIR}/core/uninstall.sh"
|
|
||||||
curl -sL "${REPO_RAW_URL}/data/user_agents.txt" -o "${INSTALL_DIR}/data/user_agents.txt"
|
|
||||||
|
|
||||||
# 动态按需组件
|
# 拉取核心代码至临时区
|
||||||
if [ "$ENABLE_GOOGLE" == "true" ]; then
|
curl -sL "${REPO_RAW_URL}/core/runner.sh" -o "${TMP_CORE}/runner.sh"
|
||||||
curl -sL "${REPO_RAW_URL}/core/mod_google.sh" -o "${INSTALL_DIR}/core/mod_google.sh"
|
curl -sL "${REPO_RAW_URL}/core/updater.sh" -o "${TMP_CORE}/updater.sh"
|
||||||
# [v3.2.2 修复] 动态匹配词库下载逻辑
|
curl -sL "${REPO_RAW_URL}/core/tg_report.sh" -o "${TMP_CORE}/tg_report.sh"
|
||||||
if [ "$UPGRADE_MODE" == "false" ]; then
|
curl -sL "${REPO_RAW_URL}/core/agent_daemon.sh" -o "${TMP_CORE}/agent_daemon.sh"
|
||||||
curl -sL "${REPO_RAW_URL}/data/keywords/${KEYWORD_FILE}" -o "${INSTALL_DIR}/data/keywords/${KEYWORD_FILE}"
|
curl -sL "${REPO_RAW_URL}/core/uninstall.sh" -o "${TMP_CORE}/uninstall.sh"
|
||||||
else
|
curl -sL "${REPO_RAW_URL}/core/mod_google.sh" -o "${TMP_CORE}/mod_google.sh"
|
||||||
# 升级模式:利用已有的 REGION_CODE 更新通用词库
|
curl -sL "${REPO_RAW_URL}/core/mod_trust.sh" -o "${TMP_CORE}/mod_trust.sh"
|
||||||
curl -sL "${REPO_RAW_URL}/data/keywords/kw_${REGION_CODE}.txt" -o "${INSTALL_DIR}/data/keywords/kw_${REGION_CODE}.txt" 2>/dev/null || true
|
curl -sL "${REPO_RAW_URL}/core/mod_quality.sh" -o "${TMP_CORE}/mod_quality.sh"
|
||||||
fi
|
|
||||||
fi
|
# 🛡️ 防砖终极校验:检查关键文件是否真实存在且不为空
|
||||||
|
if [ ! -s "${TMP_CORE}/runner.sh" ] || [ ! -s "${TMP_CORE}/agent_daemon.sh" ]; then
|
||||||
if [ "$ENABLE_TRUST" == "true" ]; then
|
echo -e "\033[31m❌ 致命错误:核心代码拉取失败!网络阻断或 GitHub Raw 异常。\033[0m"
|
||||||
curl -sL "${REPO_RAW_URL}/core/mod_trust.sh" -o "${INSTALL_DIR}/core/mod_trust.sh"
|
echo "🛡️ 防砖机制触发:已中止覆盖,旧版哨兵引擎仍安全存活中。"
|
||||||
|
rm -rf "$TMP_CORE"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 校验完美通过,执行原子化交接
|
||||||
|
rm -rf "${INSTALL_DIR}/core" 2>/dev/null
|
||||||
|
mv "$TMP_CORE" "${INSTALL_DIR}/core"
|
||||||
chmod +x ${INSTALL_DIR}/core/*.sh
|
chmod +x ${INSTALL_DIR}/core/*.sh
|
||||||
|
|
||||||
|
# 拉取热数据与词库
|
||||||
|
curl -sL "${REPO_RAW_URL}/data/user_agents.txt" -o "${INSTALL_DIR}/data/user_agents.txt"
|
||||||
|
if [ "$UPGRADE_MODE" == "false" ]; then
|
||||||
|
curl -sL "${REPO_RAW_URL}/data/keywords/${KEYWORD_FILE}" -o "${INSTALL_DIR}/data/keywords/${KEYWORD_FILE}"
|
||||||
|
else
|
||||||
|
# 升级模式:利用已有的 REGION_CODE 更新通用词库
|
||||||
|
curl -sL "${REPO_RAW_URL}/data/keywords/kw_${REGION_CODE}.txt" -o "${INSTALL_DIR}/data/keywords/kw_${REGION_CODE}.txt" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
# 7. 配置系统定时任务 (高频调度与看门狗)
|
# 7. 配置系统定时任务 (高频调度与看门狗)
|
||||||
echo -e "\n[7/7] 正在注入系统守护进程与调度器..."
|
echo -e "\n[7/7] 正在注入系统守护进程与调度器..."
|
||||||
|
|
||||||
@@ -665,7 +692,7 @@ EOF
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Timer for IP-Sentinel Runner Service
|
Description=Timer for IP-Sentinel Runner Service
|
||||||
[Timer]
|
[Timer]
|
||||||
OnBootSec=10
|
OnActiveSec=10s
|
||||||
OnUnitActiveSec=30min
|
OnUnitActiveSec=30min
|
||||||
RandomizedDelaySec=180
|
RandomizedDelaySec=180
|
||||||
Persistent=true
|
Persistent=true
|
||||||
@@ -755,22 +782,111 @@ EOF
|
|||||||
systemctl enable --now ip-sentinel-report.timer
|
systemctl enable --now ip-sentinel-report.timer
|
||||||
systemctl enable --now ip-sentinel-agent-daemon.service
|
systemctl enable --now ip-sentinel-agent-daemon.service
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "💡 未检测到 Systemd (可能是 Alpine Linux),回退到 Cron 调度模式..."
|
echo "💡 未检测到 Systemd,正在配置备用调度器 (兼容 Alpine/OpenRC)..."
|
||||||
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_backup || true
|
|
||||||
echo "*/30 * * * * ${INSTALL_DIR}/core/runner.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
# ==========================================
|
||||||
echo "0 3 * * * ${INSTALL_DIR}/core/updater.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
# 🛑 智能环境嗅探: 判定是否为受限的 Alpine 容器环境
|
||||||
|
# ==========================================
|
||||||
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
IS_RESTRICTED_ALPINE="false"
|
||||||
echo "0 8 * * * ${INSTALL_DIR}/core/tg_report.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
if [ -f /etc/alpine-release ]; then
|
||||||
echo "$SAFE_PUBLIC_IP" > "${INSTALL_DIR}/core/.last_ip"
|
# 探测虚拟化类型:/proc/vz(OpenVZ), environ包含lxc(LXC), /.dockerenv(Docker)
|
||||||
echo "@reboot nohup bash ${INSTALL_DIR}/core/agent_daemon.sh >/dev/null 2>&1 &" >> /tmp/cron_backup
|
if [ -d /proc/vz ] || grep -qa container=lxc /proc/1/environ 2>/dev/null || [ -f /.dockerenv ]; then
|
||||||
echo "* * * * * nohup bash ${INSTALL_DIR}/core/agent_daemon.sh >/dev/null 2>&1 &" >> /tmp/cron_backup
|
IS_RESTRICTED_ALPINE="true"
|
||||||
nohup bash "${INSTALL_DIR}/core/agent_daemon.sh" >/dev/null 2>&1 &
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$IS_RESTRICTED_ALPINE" == "true" ]; then
|
||||||
|
echo -e "⚠️ 探测到受限的 LXC/OpenVZ Alpine 环境,系统自带 Cron 极易假死。"
|
||||||
|
echo -e "🔧 自动降维打击:启用 [自定义高可用死循环调度器] 接管全局任务..."
|
||||||
|
|
||||||
|
# 1. 禁用原有的 Cron 大管家 (防止冲突)
|
||||||
|
rc-update del crond default >/dev/null 2>&1 || true
|
||||||
|
rc-service crond stop >/dev/null 2>&1 || true
|
||||||
|
pkill -9 crond >/dev/null 2>&1 || true
|
||||||
|
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_clean || true
|
||||||
|
[ -f /tmp/cron_clean ] && crontab /tmp/cron_clean >/dev/null 2>&1
|
||||||
|
rm -f /tmp/cron_clean
|
||||||
|
|
||||||
|
# 2. 写入我们的死循环守护进程
|
||||||
|
cat > ${INSTALL_DIR}/core/sentinel_scheduler.sh << 'EOF'
|
||||||
|
#!/bin/bash
|
||||||
|
while true; do
|
||||||
|
MIN=$(date +%M)
|
||||||
|
HOUR=$(date +%H)
|
||||||
|
if [ "$MIN" == "00" ] || [ "$MIN" == "30" ]; then
|
||||||
|
/bin/bash /opt/ip_sentinel/core/runner.sh >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
if [ "$HOUR" == "03" ] && [ "$MIN" == "00" ]; then
|
||||||
|
/bin/bash /opt/ip_sentinel/core/updater.sh >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
if [ "$HOUR" == "08" ] && [ "$MIN" == "00" ]; then
|
||||||
|
/bin/bash /opt/ip_sentinel/core/tg_report.sh >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
if ! pgrep -f 'webhook.py' >/dev/null; then
|
||||||
|
/bin/bash /opt/ip_sentinel/core/agent_daemon.sh >/dev/null 2>&1 &
|
||||||
|
fi
|
||||||
|
sleep 60
|
||||||
|
done
|
||||||
|
EOF
|
||||||
|
chmod +x ${INSTALL_DIR}/core/sentinel_scheduler.sh
|
||||||
|
|
||||||
|
# 3. 写入 OpenRC 开机自启
|
||||||
|
if command -v rc-update >/dev/null 2>&1 && [ -d "/etc/local.d" ]; then
|
||||||
|
echo "nohup bash ${INSTALL_DIR}/core/sentinel_scheduler.sh >/dev/null 2>&1 &" > /etc/local.d/ip_sentinel_scheduler.start
|
||||||
|
chmod +x /etc/local.d/ip_sentinel_scheduler.start
|
||||||
|
rc-update add local default >/dev/null 2>&1
|
||||||
|
else
|
||||||
|
# 连 OpenRC 都没有的极端环境,写入 profile 兜底
|
||||||
|
grep -q "sentinel_scheduler" /etc/profile || echo "nohup bash ${INSTALL_DIR}/core/sentinel_scheduler.sh >/dev/null 2>&1 &" >> /etc/profile
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4. 立即后台启动
|
||||||
|
[ -n "$PUBLIC_IP" ] && echo "$PUBLIC_IP" > "${INSTALL_DIR}/core/.last_ip"
|
||||||
|
nohup bash ${INSTALL_DIR}/core/sentinel_scheduler.sh >/dev/null 2>&1 &
|
||||||
|
|
||||||
|
else
|
||||||
|
# ==========================================
|
||||||
|
# 🟢 走常规调度路线 (正常的 Linux 或 KVM 型 Alpine)
|
||||||
|
# ==========================================
|
||||||
|
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_backup || true
|
||||||
|
echo "*/30 * * * * ${INSTALL_DIR}/core/runner.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
||||||
|
echo "0 3 * * * ${INSTALL_DIR}/core/updater.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
||||||
|
|
||||||
|
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
||||||
|
echo "0 8 * * * ${INSTALL_DIR}/core/tg_report.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
||||||
|
echo "$SAFE_PUBLIC_IP" > "${INSTALL_DIR}/core/.last_ip"
|
||||||
|
|
||||||
|
if command -v rc-update >/dev/null 2>&1 && [ -d "/etc/local.d" ]; then
|
||||||
|
echo "nohup bash ${INSTALL_DIR}/core/agent_daemon.sh >/dev/null 2>&1 &" > /etc/local.d/ip_sentinel.start
|
||||||
|
chmod +x /etc/local.d/ip_sentinel.start
|
||||||
|
rc-update add local default >/dev/null 2>&1
|
||||||
|
else
|
||||||
|
echo "@reboot nohup bash ${INSTALL_DIR}/core/agent_daemon.sh >/dev/null 2>&1 &" >> /tmp/cron_backup
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "* * * * * pgrep -f 'webhook.py' >/dev/null || nohup bash ${INSTALL_DIR}/core/agent_daemon.sh >/dev/null 2>&1 &" >> /tmp/cron_backup
|
||||||
|
|
||||||
|
nohup bash "${INSTALL_DIR}/core/agent_daemon.sh" >/dev/null 2>&1 &
|
||||||
|
fi
|
||||||
|
|
||||||
|
[ -f /tmp/cron_backup ] && crontab /tmp/cron_backup >/dev/null 2>&1
|
||||||
|
|
||||||
|
if [ -d "/etc/crontabs" ] && [ -f "/var/spool/cron/crontabs/root" ]; then
|
||||||
|
cp -f /var/spool/cron/crontabs/root /etc/crontabs/root 2>/dev/null || true
|
||||||
|
chmod 600 /etc/crontabs/root 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
if command -v rc-service >/dev/null 2>&1; then
|
||||||
|
rc-service crond restart >/dev/null 2>&1 || crond -b >/dev/null 2>&1
|
||||||
|
else
|
||||||
|
pkill -9 crond 2>/dev/null || true
|
||||||
|
crond -b >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f /tmp/cron_backup
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
[ -f /tmp/cron_backup ] && crontab /tmp/cron_backup 2>/dev/null
|
|
||||||
rm -f /tmp/cron_backup
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ================== [v3.4.0 核心: 状态机驱动的热更新路由] ==================
|
# ================== [v3.4.0 核心: 状态机驱动的热更新路由] ==================
|
||||||
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
||||||
@@ -784,31 +900,34 @@ if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
|||||||
[ -z "$OLD_VERSION" ] && OLD_VERSION="3.3.1"
|
[ -z "$OLD_VERSION" ] && OLD_VERSION="3.3.1"
|
||||||
|
|
||||||
# [路由表 1]: 跨代兼容 (老版本 < v3.3.2)
|
# [路由表 1]: 跨代兼容 (老版本 < v3.3.2)
|
||||||
# 必须强制下发带有 #REGISTER# 的警告,引导长官重新同步哈希身份
|
|
||||||
if version_lt "$OLD_VERSION" "3.3.2"; then
|
if version_lt "$OLD_VERSION" "3.3.2"; then
|
||||||
echo -e "\n📡 [路由枢纽] 正在执行跨代架构重组 (v${OLD_VERSION} -> v${TARGET_VERSION})..."
|
echo -e "\n📡 [路由枢纽] 正在执行跨代架构重组 (v${OLD_VERSION} -> v${TARGET_VERSION})..."
|
||||||
curl -s -X POST "${TG_API_URL}" \
|
TEXT_MSG="✨ *IP-Sentinel 引擎热更新完成!*
|
||||||
-d "chat_id=${CHAT_ID}" \
|
|
||||||
-d "parse_mode=Markdown" \
|
|
||||||
-d "text=✨ *IP-Sentinel 引擎热更新完成!*
|
|
||||||
📍 节点:\`${NODE_ALIAS}\`
|
📍 节点:\`${NODE_ALIAS}\`
|
||||||
🌐 IP:\`${SAFE_PUBLIC_IP}\`
|
🌐 IP:\`${SAFE_PUBLIC_IP}\`
|
||||||
🚀 状态:v${TARGET_VERSION} OTA 动态活体引擎已部署
|
🚀 状态:v${TARGET_VERSION} OTA 动态活体引擎已部署
|
||||||
|
|
||||||
⚠️ *战区架构已重组,请务必点击下方指令并发送,以同步新的防撞档案:*
|
⚠️ *战区架构已重组,请务必点击下方指令并发送,以同步新的防撞档案:*
|
||||||
\`${REG_MSG}\`" >/dev/null 2>&1
|
\`${REG_MSG}\`"
|
||||||
|
|
||||||
|
# [v4.0.3 体验升级] 注入交互式控制台按钮
|
||||||
|
JSON_PAYLOAD=$(jq -n --arg cid "$CHAT_ID" --arg txt "$TEXT_MSG" --arg cb "manage:${NODE_NAME}" '{chat_id: $cid, text: $txt, parse_mode: "Markdown", reply_markup: {inline_keyboard: [[{text: "⚙️ 调出该节点控制台", callback_data: $cb}]]}}')
|
||||||
|
curl -s -X POST "${TG_API_URL}" -H "Content-Type: application/json" -d "$JSON_PAYLOAD" >/dev/null 2>&1
|
||||||
|
|
||||||
echo -e "\033[32m✅ 升级通知已推送!请前往 TG 点击注册指令完成身份同步!\033[0m"
|
echo -e "\033[32m✅ 升级通知已推送!请前往 TG 点击注册指令完成身份同步!\033[0m"
|
||||||
|
|
||||||
# [路由表 2]: 现代静默升级 (老版本 >= v3.3.2)
|
# [路由表 2]: 现代静默升级 (老版本 >= v3.3.2)
|
||||||
else
|
else
|
||||||
echo -e "\n📡 [路由枢纽] 正在执行静默平滑升级 (v${OLD_VERSION} -> v${TARGET_VERSION})..."
|
echo -e "\n📡 [路由枢纽] 正在执行静默平滑升级 (v${OLD_VERSION} -> v${TARGET_VERSION})..."
|
||||||
curl -s -X POST "${TG_API_URL}" \
|
TEXT_MSG="✨ *IP-Sentinel 引擎热更新完成!*
|
||||||
-d "chat_id=${CHAT_ID}" \
|
|
||||||
-d "parse_mode=Markdown" \
|
|
||||||
-d "text=✨ *IP-Sentinel 引擎热更新完成!*
|
|
||||||
📍 节点:\`${NODE_ALIAS}\`
|
📍 节点:\`${NODE_ALIAS}\`
|
||||||
🌐 IP:\`${SAFE_PUBLIC_IP}\`
|
🌐 IP:\`${SAFE_PUBLIC_IP}\`
|
||||||
🚀 状态:v${TARGET_VERSION} OTA 动态活体引擎已部署" >/dev/null 2>&1
|
🚀 状态:v${TARGET_VERSION} OTA 动态活体引擎已部署"
|
||||||
|
|
||||||
|
# [v4.0.3 体验升级] 注入交互式控制台按钮
|
||||||
|
JSON_PAYLOAD=$(jq -n --arg cid "$CHAT_ID" --arg txt "$TEXT_MSG" --arg cb "manage:${NODE_NAME}" '{chat_id: $cid, text: $txt, parse_mode: "Markdown", reply_markup: {inline_keyboard: [[{text: "⚙️ 调出该节点控制台", callback_data: $cb}]]}}')
|
||||||
|
curl -s -X POST "${TG_API_URL}" -H "Content-Type: application/json" -d "$JSON_PAYLOAD" >/dev/null 2>&1
|
||||||
|
|
||||||
echo -e "\033[32m✅ 升级成功通知已推送到您的 Telegram!\033[0m"
|
echo -e "\033[32m✅ 升级成功通知已推送到您的 Telegram!\033[0m"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -823,16 +942,17 @@ if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
|||||||
else
|
else
|
||||||
# [全新安装路由]
|
# [全新安装路由]
|
||||||
echo -e "\n📡 正在向指挥部发送注册暗号..."
|
echo -e "\n📡 正在向指挥部发送注册暗号..."
|
||||||
PUSH_RESULT=$(curl -s -X POST "${TG_API_URL}" \
|
TEXT_MSG="✨ *IP-Sentinel 部署成功!*
|
||||||
-d "chat_id=${CHAT_ID}" \
|
|
||||||
-d "parse_mode=Markdown" \
|
|
||||||
-d "text=✨ *IP-Sentinel 部署成功!*
|
|
||||||
📍 区域:${REGION_NAME}
|
📍 区域:${REGION_NAME}
|
||||||
🌐 IP:${SAFE_PUBLIC_IP}
|
🌐 IP:${SAFE_PUBLIC_IP}
|
||||||
🔌 端口:${AGENT_PORT}
|
🔌 端口:${AGENT_PORT}
|
||||||
|
|
||||||
🔑 *请点击下方指令复制并回复给机器人:*
|
🔑 *请点击下方指令复制并回复给机器人:*
|
||||||
\`${REG_MSG}\`")
|
\`${REG_MSG}\`"
|
||||||
|
|
||||||
|
# [v4.0.3 体验升级] 注入交互式控制台按钮
|
||||||
|
JSON_PAYLOAD=$(jq -n --arg cid "$CHAT_ID" --arg txt "$TEXT_MSG" --arg cb "manage:${NODE_NAME}" '{chat_id: $cid, text: $txt, parse_mode: "Markdown", reply_markup: {inline_keyboard: [[{text: "⚙️ 调出该节点控制台", callback_data: $cb}]]}}')
|
||||||
|
PUSH_RESULT=$(curl -s -X POST "${TG_API_URL}" -H "Content-Type: application/json" -d "$JSON_PAYLOAD")
|
||||||
|
|
||||||
if echo "$PUSH_RESULT" | grep -q '"ok":true'; then
|
if echo "$PUSH_RESULT" | grep -q '"ok":true'; then
|
||||||
echo -e "\033[32m✅ 注册信息已推送到您的 Telegram,请按指令完成最终激活!\033[0m"
|
echo -e "\033[32m✅ 注册信息已推送到您的 Telegram,请按指令完成最终激活!\033[0m"
|
||||||
@@ -880,12 +1000,15 @@ echo "🗑️ 若未来需卸载,可重新运行本脚本选择[2]或执行: b
|
|||||||
echo "========================================================"
|
echo "========================================================"
|
||||||
|
|
||||||
# ================== [v3.1.2 新增: 玻璃房透明装机统计] ==================
|
# ================== [v3.1.2 新增: 玻璃房透明装机统计] ==================
|
||||||
echo -e "\n📡 正在向开源社区汇报装机量 (完全匿名,不收集IP)..."
|
# [修复] 仅在全新部署时触发统计,平滑升级/OTA 时绝对不触发,防止配额耗尽与数据注水
|
||||||
AGENT_COUNT=$(curl -s -m 3 "https://ip-sentinel-count.samanthaestime296.workers.dev/ping/agent" || echo "")
|
if [ "$UPGRADE_MODE" == "false" ]; then
|
||||||
|
echo -e "\n📡 正在向开源社区汇报装机量 (完全匿名,不收集IP)..."
|
||||||
|
AGENT_COUNT=$(curl -s -m 3 "https://ip-sentinel-count.samanthaestime296.workers.dev/ping/agent" || echo "")
|
||||||
|
|
||||||
if [ -n "$AGENT_COUNT" ] && [[ "$AGENT_COUNT" =~ ^[0-9]+$ ]]; then
|
if [ -n "$AGENT_COUNT" ] && [[ "$AGENT_COUNT" =~ ^[0-9]+$ ]]; then
|
||||||
echo -e "\033[32m✅ 感谢您成为全球第 ${AGENT_COUNT} 名 IP-Sentinel 哨兵!\033[0m"
|
echo -e "\033[32m✅ 感谢您成为全球第 ${AGENT_COUNT} 名 IP-Sentinel 哨兵!\033[0m"
|
||||||
else
|
else
|
||||||
echo -e "\033[32m✅ 感谢您加入 IP-Sentinel 哨兵阵列!\033[0m"
|
echo -e "\033[32m✅ 感谢您加入 IP-Sentinel 哨兵阵列!\033[0m"
|
||||||
|
fi
|
||||||
|
echo -e "\n"
|
||||||
fi
|
fi
|
||||||
echo -e "\n"
|
|
||||||
@@ -22,9 +22,20 @@ if ! type log >/dev/null 2>&1; then
|
|||||||
# [v3.4.0 核心] 提取当前配置中的版本锚点
|
# [v3.4.0 核心] 提取当前配置中的版本锚点
|
||||||
local local_ver="${AGENT_VERSION:-未知}"
|
local local_ver="${AGENT_VERSION:-未知}"
|
||||||
|
|
||||||
|
# 保证日志目录存在
|
||||||
mkdir -p "${INSTALL_DIR}/logs"
|
mkdir -p "${INSTALL_DIR}/logs"
|
||||||
# 统一日志格式,注入 [版本号] 追踪标识
|
|
||||||
printf "[$(date '+%Y-%m-%d %H:%M:%S')] [v%-5s] [%-5s] [%-7s] [%s] %s\n" "$local_ver" "$2" "$1" "$REGION_CODE" "$3" >> "${INSTALL_DIR}/logs/sentinel.log"
|
# 日志格式注入 [版本号] 追踪标识
|
||||||
|
local core_msg=$(printf "[v%-5s] [%-5s] [%-7s] [%s] %s" "$local_ver" "$2" "$1" "$REGION_CODE" "$3")
|
||||||
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $core_msg" >> "${INSTALL_DIR}/logs/sentinel.log"
|
||||||
|
|
||||||
|
# 强制推送到 Systemd Journal (如果系统支持)
|
||||||
|
if command -v logger >/dev/null 2>&1; then
|
||||||
|
logger -t ip-sentinel "$core_msg"
|
||||||
|
else
|
||||||
|
# 降级输出到 stdout,让 Systemd 捕获
|
||||||
|
echo "$core_msg"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -97,14 +108,21 @@ CURL_BIND_OPT=""
|
|||||||
DYNAMIC_IP_PREF="-${IP_PREF:-4}" # 默认提取用户配置
|
DYNAMIC_IP_PREF="-${IP_PREF:-4}" # 默认提取用户配置
|
||||||
|
|
||||||
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\.]+$ ]]; then
|
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\.]+$ ]]; then
|
||||||
CURL_BIND_OPT="--interface $BIND_IP"
|
# [v3.6.3 容错层补丁] 探测物理网卡/虚拟 IP 存活状态
|
||||||
# 智能探测:带冒号为 V6,带点号为 V4
|
RAW_BIND_IP=$(echo "$BIND_IP" | tr -d '[]')
|
||||||
if [[ "$BIND_IP" == *":"* ]]; then
|
if ! ip addr show 2>/dev/null | grep -qw "$RAW_BIND_IP"; then
|
||||||
DYNAMIC_IP_PREF="-6"
|
log "$MODULE_NAME" "WARN " "检测到配置的出口 IP ($RAW_BIND_IP) 已丢失,自动降级为系统默认路由出网!"
|
||||||
log "$MODULE_NAME" "INFO " "底层路由锁定: 绑定 IPv6 出口及协议 ($BIND_IP)"
|
CURL_BIND_OPT=""
|
||||||
elif [[ "$BIND_IP" == *"."* ]]; then
|
else
|
||||||
DYNAMIC_IP_PREF="-4"
|
CURL_BIND_OPT="--interface $BIND_IP"
|
||||||
log "$MODULE_NAME" "INFO " "底层路由锁定: 绑定 IPv4 出口及协议 ($BIND_IP)"
|
# 智能探测:带冒号为 V6,带点号为 V4
|
||||||
|
if [[ "$BIND_IP" == *":"* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="-6"
|
||||||
|
log "$MODULE_NAME" "INFO " "底层路由锁定: 绑定 IPv6 出口及协议 ($BIND_IP)"
|
||||||
|
elif [[ "$BIND_IP" == *"."* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="-4"
|
||||||
|
log "$MODULE_NAME" "INFO " "底层路由锁定: 绑定 IPv4 出口及协议 ($BIND_IP)"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -152,44 +170,31 @@ for ((i=1; i<=TOTAL_ACTIONS; i++)); do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# --- [结果纠偏自检 (V3.2.1 高精度容错版)] ---
|
# --- [结果纠偏自检 (V4.0.3 终极真理版: 穿透 Google 真实 GeoIP 数据库)] ---
|
||||||
# [V3.2.1 热修复] 探针同样应用 $DYNAMIC_IP_PREF 协议自适应
|
# 彻底抛弃不可靠的前端 URL 重定向判定 (解决 Issue #35 和 #14 的假阳性问题)
|
||||||
PROBE_RESULT=$(curl $CURL_BIND_OPT $DYNAMIC_IP_PREF -m 15 -s -L -o /dev/null -w "%{http_code}|%{url_effective}" https://www.google.com)
|
# 战术揭秘:Google 与 YouTube 共享绝对一致的底层 GeoIP 库。
|
||||||
|
# 我们直接抓取 YouTube 源码内部的 "GL" (Geo-Location) 环境变量,拿到 Google 视角的 2 位国家代码!
|
||||||
|
|
||||||
# 分离状态码与 URL
|
log "$MODULE_NAME" "INFO " "正在穿透获取 Google 底层真实 GeoIP 锚点..."
|
||||||
PROBE_CODE=$(echo "$PROBE_RESULT" | cut -d'|' -f1)
|
YT_HTML=$(curl $CURL_BIND_OPT $DYNAMIC_IP_PREF -m 15 -s -L https://www.youtube.com)
|
||||||
FINAL_URL=$(echo "$PROBE_RESULT" | cut -d'|' -f2)
|
|
||||||
|
|
||||||
# 0. 致命拦截:网络断开、DNS 解析失败或严重超时
|
# 精准正则提取 "GL":"XX" 中的两位字母 (完美兼容所有老旧系统环境)
|
||||||
if [ "$PROBE_CODE" == "000" ] || [ -z "$FINAL_URL" ]; then
|
REAL_REGION=$(echo "$YT_HTML" | grep -o '"GL":"[A-Za-z]\{2\}"' | head -n 1 | cut -d'"' -f4 | tr 'a-z' 'A-Z')
|
||||||
STATUS="🚨 探针失效 (网络阻断或底层路由异常)"
|
|
||||||
|
if [ -z "$REAL_REGION" ]; then
|
||||||
|
STATUS="🚨 探针失效 (网络阻断,或已被 Google 验证码/5秒盾拦截)"
|
||||||
else
|
else
|
||||||
# 核心战术:精准提取最终 URL 的域名部分
|
# [基准对齐] 提取配置大区 (兼容州级穿透,如 US-TX -> US),并修正英国的 ISO 标准代码
|
||||||
ACTUAL_DOMAIN=$(echo "$FINAL_URL" | awk -F/ '{print $3}')
|
TARGET_CC="${REGION_CODE%%-*}"
|
||||||
|
[ "$TARGET_CC" == "UK" ] && TARGET_CC="GB"
|
||||||
|
|
||||||
# [V3.2.1 优化] 使用通配符 * 剔除任意前缀 (无论是 www.google. 还是 ipv4.google.)
|
# 终极审判逻辑
|
||||||
ACTUAL_SUFFIX=${ACTUAL_DOMAIN#*google.}
|
if [ "$REAL_REGION" == "CN" ]; then
|
||||||
|
STATUS="❌ 严重高危!IP 已被 Google 判定为中国大陆 (送中)!"
|
||||||
# 1. 优先验证:绝对匹配目标后缀 (彻底杜绝 com 包含于 com.hk 的陷阱)
|
elif [ "$REAL_REGION" == "$TARGET_CC" ]; then
|
||||||
if [ "$ACTUAL_SUFFIX" == "$VALID_URL_SUFFIX" ]; then
|
STATUS="✅ 目标区域达成 (底层真实锚定: $REAL_REGION)"
|
||||||
STATUS="✅ 目标区域达成 ($ACTUAL_SUFFIX)"
|
|
||||||
|
|
||||||
# 2. 核心拦截:精准捕捉送中特征 (com.hk)
|
|
||||||
elif [ "$ACTUAL_SUFFIX" == "com.hk" ]; then
|
|
||||||
if [ "$REGION_CODE" == "HK" ]; then
|
|
||||||
STATUS="✅ 目标区域达成 (HK 专属 com.hk)"
|
|
||||||
else
|
|
||||||
STATUS="❌ 严重漂移!判定为送中区 (实际跳往 $ACTUAL_SUFFIX)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 3. 宽容处理:遵守 Google 无跳转新规 (严格限定必须是纯粹的 com)
|
|
||||||
# [视觉优化] 留在 .com 代表 IP 极度纯净未被区域沙盒锁定,计入成功战绩!
|
|
||||||
elif [ "$ACTUAL_SUFFIX" == "com" ]; then
|
|
||||||
STATUS="✅ 目标区域达成 (免签停留 .com 通用主站)"
|
|
||||||
|
|
||||||
# 4. 跨区漂移:所有预判之外的后缀,全部视为异常
|
|
||||||
else
|
else
|
||||||
STATUS="⚠️ 跨区跳板漂移 (当前实际归属: $ACTUAL_SUFFIX)"
|
STATUS="⚠️ 区域发生漂移!目标 $TARGET_CC,实际归属 $REAL_REGION (跨区送医/送美)"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
217
core/mod_quality.sh
Executable file
217
core/mod_quality.sh
Executable file
@@ -0,0 +1,217 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# ==========================================================
|
||||||
|
# IP-Sentinel: 深海声呐 (IP 质量全维异步检测模块 v4.0.0)
|
||||||
|
# ==========================================================
|
||||||
|
|
||||||
|
source /opt/ip_sentinel/config.conf
|
||||||
|
|
||||||
|
# ==========================================
|
||||||
|
# 1. 动态网络锚定与协议自适应 (专为多 IP / NAT 架构打造)
|
||||||
|
# ==========================================
|
||||||
|
DYNAMIC_IP_PREF="${IP_PREF:-4}"
|
||||||
|
PROBE_ARGS=("-y" "-j" "-f") # 默认注入: 自动确认、JSON格式、明文无掩码IP
|
||||||
|
|
||||||
|
# 强壮正则:支持 V4, V6 以及带有 [] 护甲的 V6 (兼容多 IP 站群机)
|
||||||
|
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\[\]\.]+$ ]]; then
|
||||||
|
RAW_BIND_IP=$(echo "$BIND_IP" | tr -d '[]')
|
||||||
|
# 严格探测物理网卡/虚拟 IP 存活状态,防止 IP 漂移导致探针彻底报错
|
||||||
|
if ip addr show 2>/dev/null | grep -qw "$RAW_BIND_IP"; then
|
||||||
|
# 恢复使用官方原生参数 -i,不再进行徒劳的底层劫持
|
||||||
|
PROBE_ARGS+=("-i" "$RAW_BIND_IP")
|
||||||
|
|
||||||
|
# 智能识别 V4 / V6,强制覆盖系统默认的 IP_PREF
|
||||||
|
if [[ "$RAW_BIND_IP" == *":"* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="6"
|
||||||
|
elif [[ "$RAW_BIND_IP" == *"."* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="4"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 补齐协议版本参数 (-4 或 -6)
|
||||||
|
PROBE_ARGS+=("-${DYNAMIC_IP_PREF}")
|
||||||
|
|
||||||
|
# 2. 静默拉取原始数据 (消除短链接 RCE 劫持风险,收编为本地固化执行)
|
||||||
|
PROBE_SCRIPT="/opt/ip_sentinel/core/ip_probe.sh"
|
||||||
|
if [ ! -x "$PROBE_SCRIPT" ]; then
|
||||||
|
# 若本地探针尚未就绪,直接从 GitHub 官方主干拉取底层源码,绕过未知域名
|
||||||
|
curl -sL "https://raw.githubusercontent.com/xykt/IPQuality/main/ip.sh" -o "$PROBE_SCRIPT" 2>/dev/null
|
||||||
|
chmod +x "$PROBE_SCRIPT" 2>/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 采用本地原生执行,拥抱底层路由的真实结果
|
||||||
|
RAW_OUTPUT=$(timeout 180 bash "$PROBE_SCRIPT" "${PROBE_ARGS[@]}" 2>/dev/null)
|
||||||
|
|
||||||
|
# 2. 极致截取 JSON (无视开头的赞助商广告与不可见字符,精准提取)
|
||||||
|
JSON_DATA="{${RAW_OUTPUT#*\{}"
|
||||||
|
|
||||||
|
# [v4.0.3 核心抢修: 强力去污粉] 专门针对 Alpine/Busybox 等轻量级环境!
|
||||||
|
# 底层探测脚本的正则去色在 Alpine 上会失效,导致 ANSI 控制符混入 JSON。
|
||||||
|
# 必须在此处彻底清洗真实的 ESC 字符与字面量 x1b,否则会导致 TG API 静默拒收!
|
||||||
|
ESC=$(printf '\033')
|
||||||
|
JSON_DATA=$(printf "%s" "$JSON_DATA" | sed -e "s/${ESC}\[[0-9;]*[a-zA-Z]//g" -e "s/${ESC}[0-9;]*[a-zA-Z]//g" -e "s/x1b\\[[0-9;]*[a-zA-Z]//g" -e "s/x1b[0-9;]*[a-zA-Z]//g")
|
||||||
|
|
||||||
|
# 2. 提取基础物理定位与身份特征 (兼作合法性校验)
|
||||||
|
IP_ADDR=$(echo "$JSON_DATA" | jq -r '.Head.IP // empty' 2>/dev/null)
|
||||||
|
|
||||||
|
if [ -z "$IP_ADDR" ]; then
|
||||||
|
curl -s -X POST "${TG_API_URL}" \
|
||||||
|
-d "chat_id=${CHAT_ID}" \
|
||||||
|
-d "parse_mode=Markdown" \
|
||||||
|
-d "text=❌ *深海声呐探测失败*
|
||||||
|
📍 节点:\`${NODE_ALIAS}\`
|
||||||
|
🌐 锁定IP:\`${PUBLIC_IP}\`
|
||||||
|
⚠️ *未收到有效回波。检测源超时或数据解析受阻。*" >/dev/null
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
[ -z "$IP_ADDR" ] && IP_ADDR="$PUBLIC_IP"
|
||||||
|
ASN=$(echo "$JSON_DATA" | jq -r '.Info.ASN // "Unknown"' 2>/dev/null)
|
||||||
|
ORG=$(echo "$JSON_DATA" | jq -r '.Info.Organization // "Unknown"' 2>/dev/null)
|
||||||
|
CITY=$(echo "$JSON_DATA" | jq -r '.Info.City.Name // "Unknown"' 2>/dev/null)
|
||||||
|
COUNTRY=$(echo "$JSON_DATA" | jq -r '.Info.Region.Name // "Unknown"' 2>/dev/null)
|
||||||
|
IP_TYPE=$(echo "$JSON_DATA" | jq -r '.Info.Type // "未知属性"' 2>/dev/null)
|
||||||
|
USAGE_TYPE=$(echo "$JSON_DATA" | jq -r '.Type.Usage.IPinfo // "未知场景"' 2>/dev/null)
|
||||||
|
|
||||||
|
# 3. 深度欺诈与信用评估 (各大权威库联查)
|
||||||
|
SCAM_SCORE=$(echo "$JSON_DATA" | jq -r '.Score.SCAMALYTICS // "0"' 2>/dev/null)
|
||||||
|
ABUSE_SCORE=$(echo "$JSON_DATA" | jq -r '.Score.AbuseIPDB // "0"' 2>/dev/null)
|
||||||
|
IPQS_SCORE=$(echo "$JSON_DATA" | jq -r '.Score.IPQS // "0"' 2>/dev/null)
|
||||||
|
IP2L_SCORE=$(echo "$JSON_DATA" | jq -r '.Score.IP2LOCATION // "0"' 2>/dev/null)
|
||||||
|
FRAUD_RISK=$(echo "$JSON_DATA" | jq -r '.Score.ipapi // "0%"' 2>/dev/null)
|
||||||
|
|
||||||
|
# [修复] 清洗 API 阻断返回的 null 值,保障面板整洁
|
||||||
|
[ "$SCAM_SCORE" == "null" ] || [ -z "$SCAM_SCORE" ] && SCAM_SCORE="N/A"
|
||||||
|
[ "$ABUSE_SCORE" == "null" ] || [ -z "$ABUSE_SCORE" ] && ABUSE_SCORE="N/A"
|
||||||
|
[ "$IPQS_SCORE" == "null" ] || [ -z "$IPQS_SCORE" ] && IPQS_SCORE="N/A"
|
||||||
|
[ "$IP2L_SCORE" == "null" ] || [ -z "$IP2L_SCORE" ] && IP2L_SCORE="N/A"
|
||||||
|
[ "$FRAUD_RISK" == "null" ] || [ -z "$FRAUD_RISK" ] && FRAUD_RISK="N/A"
|
||||||
|
|
||||||
|
# 代理/VPN 特征探针 (只要有一家认为是代理,就亮黄灯)
|
||||||
|
IS_PROXY="🟢 干净"
|
||||||
|
if echo "$JSON_DATA" | jq -e '.Factor.Proxy | to_entries | any(.value == true)' >/dev/null 2>&1 || \
|
||||||
|
echo "$JSON_DATA" | jq -e '.Factor.VPN | to_entries | any(.value == true)' >/dev/null 2>&1; then
|
||||||
|
IS_PROXY="🟡 疑似代理/VPN"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4. 提取流媒体与 AI 解锁指标 (带解锁类型)
|
||||||
|
parse_media() {
|
||||||
|
local status=$(echo "$JSON_DATA" | jq -r ".Media.$1.Status // \"未知\"" 2>/dev/null)
|
||||||
|
local reg=$(echo "$JSON_DATA" | jq -r ".Media.$1.Region // \"\"" 2>/dev/null)
|
||||||
|
local type=$(echo "$JSON_DATA" | jq -r ".Media.$1.Type // \"\"" 2>/dev/null)
|
||||||
|
|
||||||
|
if [[ "$status" == *"解锁"* ]]; then
|
||||||
|
echo "🟢 ${reg} (${type})"
|
||||||
|
elif [[ "$status" == *"仅"* ]] || [[ "$status" == *"机房"* ]] || [[ "$status" == *"待支持"* ]]; then
|
||||||
|
# 捕捉 Netflix "仅自制"、ChatGPT "仅网页"、TikTok "机房" 等半残状态
|
||||||
|
echo "🟡 ${status} ${reg}"
|
||||||
|
elif [[ "$status" == *"屏蔽"* ]] || [[ "$status" == *"失败"* ]] || [[ "$status" == *"中国"* ]] || [[ "$status" == *"禁"* ]]; then
|
||||||
|
# 捕捉 "屏蔽"、"失败"、"禁会员"、"中国"(送中)
|
||||||
|
echo "🔴 ${status}"
|
||||||
|
else
|
||||||
|
echo "⚪ ${status}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
NF_STAT=$(parse_media "Netflix")
|
||||||
|
YT_STAT=$(parse_media "Youtube")
|
||||||
|
DP_STAT=$(parse_media "DisneyPlus")
|
||||||
|
TK_STAT=$(parse_media "TikTok")
|
||||||
|
GPT_STAT=$(parse_media "ChatGPT")
|
||||||
|
APV_STAT=$(parse_media "AmazonPrimeVideo")
|
||||||
|
|
||||||
|
# 提取原生 JSON 里的原始状态用于底层隐写回传
|
||||||
|
RAW_NF_STAT=$(echo "$JSON_DATA" | jq -r '.Media.Netflix.Status // "Unknown"' 2>/dev/null)
|
||||||
|
RAW_YT_REG=$(echo "$JSON_DATA" | jq -r '.Media.Youtube.Region // ""' 2>/dev/null)
|
||||||
|
RAW_YT_STAT=$(echo "$JSON_DATA" | jq -r '.Media.Youtube.Status // "Unknown"' 2>/dev/null)
|
||||||
|
|
||||||
|
# 5. 邮局连通性与黑名单
|
||||||
|
PORT25=$(echo "$JSON_DATA" | jq -r '.Mail.Port25 // "false"' 2>/dev/null)
|
||||||
|
[ "$PORT25" == "true" ] && P25_TEXT="✅ 畅通" || P25_TEXT="❌ 封堵"
|
||||||
|
DNS_BLACK=$(echo "$JSON_DATA" | jq -r '.Mail.DNSBlacklist.Blacklisted // "0"' 2>/dev/null)
|
||||||
|
DNS_MARK=$(echo "$JSON_DATA" | jq -r '.Mail.DNSBlacklist.Marked // "0"' 2>/dev/null)
|
||||||
|
|
||||||
|
# 6. “送中” 逻辑判定
|
||||||
|
WARNING_MSG=""
|
||||||
|
# [修复] 官方 JSON 已经去除了方括号,直接匹配 CN 或者状态包含中国
|
||||||
|
if [[ "$RAW_YT_REG" == "CN" ]] || [[ "$RAW_YT_STAT" == *"中国"* ]]; then
|
||||||
|
# [修复] 采用 Bash 扩展转义 ($'...'),彻底解决直接打印 \n 字符的问题
|
||||||
|
WARNING_MSG=$'\n🚨 **[高危] 该节点已被 Google 判定为中国大陆 (送中)!**\n'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 7. 组装情报级 Markdown 战报
|
||||||
|
# 提取本地运行态版本与生成时间戳
|
||||||
|
LOCAL_VER="${AGENT_VERSION:-未知}"
|
||||||
|
CURRENT_TIME=$(date "+%Y-%m-%d %H:%M:%S")
|
||||||
|
# [核心修复] 抛弃本地残缺配置,直接提取探针刚刚实测拿到的真实出口 IP 拼接链接!
|
||||||
|
LINK_IP=$(echo "$IP_ADDR" | tr -d '[]')
|
||||||
|
|
||||||
|
REPORT="🎯 *IP-Sentinel 深海声呐报告*
|
||||||
|
📍 节点:\`${NODE_ALIAS}\`
|
||||||
|
🌐 地址:\`${IP_ADDR}\`${WARNING_MSG}
|
||||||
|
|
||||||
|
*🏢 物理身份与网络属性*
|
||||||
|
\`AS${ASN}\` | \`${ORG}\`
|
||||||
|
**定位:** \`${COUNTRY} - ${CITY}\`
|
||||||
|
**属性:** \`${IP_TYPE}\` | \`${USAGE_TYPE}\`
|
||||||
|
**探针:** ${IS_PROXY}
|
||||||
|
|
||||||
|
*🛡️ 欺诈雷达 (0为最优)*
|
||||||
|
• **Scamalytics:** \`${SCAM_SCORE}/100\`
|
||||||
|
• **AbuseIPDB:** \`${ABUSE_SCORE}/100\`
|
||||||
|
• **IPQS:** \`${IPQS_SCORE}/100\`
|
||||||
|
• **IP2Location:** \`${IP2L_SCORE}/100\`
|
||||||
|
• **IPAPI 风险率:** \`${FRAUD_RISK}\`
|
||||||
|
|
||||||
|
*🎬 核心业务解锁*
|
||||||
|
• **YouTube:** ${YT_STAT}
|
||||||
|
• **Netflix:** ${NF_STAT}
|
||||||
|
• **Disney+:** ${DP_STAT}
|
||||||
|
• **PrimeVideo:** ${APV_STAT}
|
||||||
|
• **TikTok:** ${TK_STAT}
|
||||||
|
• **ChatGPT:** ${GPT_STAT}
|
||||||
|
|
||||||
|
*✉️ 邮局与污染度*
|
||||||
|
• **25 端口出站:** ${P25_TEXT}
|
||||||
|
• **DNS 污染库:** 严重 \`${DNS_BLACK}\` | 轻微 \`${DNS_MARK}\`
|
||||||
|
|
||||||
|
_👉 [🔍 详细信用图谱直达 (Scamalytics)](https://scamalytics.com/ip/${LINK_IP})_
|
||||||
|
|
||||||
|
⏱️ \`${CURRENT_TIME}\` | ⚙️ \`v${LOCAL_VER}\`"
|
||||||
|
|
||||||
|
# [修复] 剥离显示层的 N/A,确保传给 Master 趋势数据库的是纯数字 (无效则记为0)
|
||||||
|
SAFE_SCAM_SCORE=$(echo "$SCAM_SCORE" | tr -cd '0-9')
|
||||||
|
[ -z "$SAFE_SCAM_SCORE" ] && SAFE_SCAM_SCORE="0"
|
||||||
|
|
||||||
|
# [v4.0.2 扩容] 提取 Google(基于YouTube) 和 ChatGPT 的原生状态
|
||||||
|
RAW_GOOG_STAT="${RAW_YT_REG:-$RAW_YT_STAT}"
|
||||||
|
[ -z "$RAW_GOOG_STAT" ] && RAW_GOOG_STAT="未知"
|
||||||
|
RAW_GPT_STAT=$(echo "$JSON_DATA" | jq -r '.Media.ChatGPT.Status // "未知"' 2>/dev/null)
|
||||||
|
|
||||||
|
# [修复] 废除会导致中文 UTF-8 字节被劈裂(产生乱码 )的 awk 暴力截断。
|
||||||
|
# 原始状态文本极短(如"解锁"、"屏蔽"、"US"),只需洗掉隐形换行符即可安全传输。
|
||||||
|
S_GOOG=$(echo "$RAW_GOOG_STAT" | tr -d '\n\r ')
|
||||||
|
S_NF=$(echo "$RAW_NF_STAT" | tr -d '\n\r ')
|
||||||
|
S_GPT=$(echo "$RAW_GPT_STAT" | tr -d '\n\r ')
|
||||||
|
CB_DATA="svq|${NODE_NAME}|${SAFE_SCAM_SCORE}|${S_GOOG}|${S_NF}|${S_GPT}"
|
||||||
|
|
||||||
|
# 8. 挂载内联键盘并直送指挥部
|
||||||
|
JSON_PAYLOAD=$(jq -n \
|
||||||
|
--arg cid "$CHAT_ID" \
|
||||||
|
--arg txt "$REPORT" \
|
||||||
|
--arg cb "$CB_DATA" \
|
||||||
|
--arg cb_manage "manage:${NODE_NAME}" \
|
||||||
|
'{
|
||||||
|
chat_id: $cid,
|
||||||
|
text: $txt,
|
||||||
|
parse_mode: "Markdown",
|
||||||
|
disable_web_page_preview: true,
|
||||||
|
reply_markup: {
|
||||||
|
inline_keyboard: [
|
||||||
|
[{text: "📥 将本次体检录入趋势库", callback_data: $cb}],
|
||||||
|
[{text: "⚙️ 调出该节点控制台", callback_data: $cb_manage}]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}')
|
||||||
|
|
||||||
|
curl -s -X POST "${TG_API_URL}" -H "Content-Type: application/json" -d "$JSON_PAYLOAD" >/dev/null
|
||||||
@@ -99,14 +99,21 @@ CURL_BIND_OPT=""
|
|||||||
DYNAMIC_IP_PREF="-${IP_PREF:-4}" # 默认提取用户配置
|
DYNAMIC_IP_PREF="-${IP_PREF:-4}" # 默认提取用户配置
|
||||||
|
|
||||||
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\.]+$ ]]; then
|
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\.]+$ ]]; then
|
||||||
CURL_BIND_OPT="--interface $BIND_IP"
|
# [v3.6.3 容错层补丁] 探测物理网卡/虚拟 IP 存活状态
|
||||||
# 智能探测:带冒号为 V6,带点号为 V4
|
RAW_BIND_IP=$(echo "$BIND_IP" | tr -d '[]')
|
||||||
if [[ "$BIND_IP" == *":"* ]]; then
|
if ! ip addr show 2>/dev/null | grep -qw "$RAW_BIND_IP"; then
|
||||||
DYNAMIC_IP_PREF="-6"
|
log_msg "WARN " "检测到配置的出口 IP ($RAW_BIND_IP) 已丢失,自动降级为系统默认路由出网!"
|
||||||
log_msg "INFO " "底层路由锁定: 绑定 IPv6 出口及协议 ($BIND_IP)"
|
CURL_BIND_OPT=""
|
||||||
elif [[ "$BIND_IP" == *"."* ]]; then
|
else
|
||||||
DYNAMIC_IP_PREF="-4"
|
CURL_BIND_OPT="--interface $BIND_IP"
|
||||||
log_msg "INFO " "底层路由锁定: 绑定 IPv4 出口及协议 ($BIND_IP)"
|
# 智能探测:带冒号为 V6,带点号为 V4
|
||||||
|
if [[ "$BIND_IP" == *":"* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="-6"
|
||||||
|
log_msg "INFO " "底层路由锁定: 绑定 IPv6 出口及协议 ($BIND_IP)"
|
||||||
|
elif [[ "$BIND_IP" == *"."* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="-4"
|
||||||
|
log_msg "INFO " "底层路由锁定: 绑定 IPv4 出口及协议 ($BIND_IP)"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,18 @@ log() {
|
|||||||
|
|
||||||
# 保证日志目录存在
|
# 保证日志目录存在
|
||||||
mkdir -p "${INSTALL_DIR}/logs"
|
mkdir -p "${INSTALL_DIR}/logs"
|
||||||
|
|
||||||
# 日志格式注入 [版本号] 追踪标识
|
# 日志格式注入 [版本号] 追踪标识
|
||||||
printf "[$(date '+%Y-%m-%d %H:%M:%S')] [v%-5s] [%-5s] [%-7s] [%s] %s\n" "$local_ver" "$level" "$module" "$REGION_CODE" "$msg" >> "$LOG_FILE"
|
local core_msg=$(printf "[v%-5s] [%-5s] [%-7s] [%s] %s" "$local_ver" "$level" "$module" "$REGION_CODE" "$msg")
|
||||||
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $core_msg" >> "$LOG_FILE"
|
||||||
|
|
||||||
|
# 强制推送到 Systemd Journal (如果系统支持)
|
||||||
|
if command -v logger >/dev/null 2>&1; then
|
||||||
|
logger -t ip-sentinel "$core_msg"
|
||||||
|
else
|
||||||
|
# 降级输出到 stdout,让 Systemd 捕获
|
||||||
|
echo "$core_msg"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
export -f log
|
export -f log
|
||||||
export CONFIG_FILE INSTALL_DIR
|
export CONFIG_FILE INSTALL_DIR
|
||||||
@@ -81,7 +91,8 @@ fi
|
|||||||
if [ -n "$TARGET_MOD" ] && [ -x "${INSTALL_DIR}/core/${TARGET_MOD}" ]; then
|
if [ -n "$TARGET_MOD" ] && [ -x "${INSTALL_DIR}/core/${TARGET_MOD}" ]; then
|
||||||
log "SYSTEM" "INFO" "命中触发条件,加载并执行子模块: ${MOD_NAME}"
|
log "SYSTEM" "INFO" "命中触发条件,加载并执行子模块: ${MOD_NAME}"
|
||||||
# 核心降耗逻辑:使用 nice -n 19 赋予进程最低 CPU 优先级,绝不抢占 VPS 正常业务的资源
|
# 核心降耗逻辑:使用 nice -n 19 赋予进程最低 CPU 优先级,绝不抢占 VPS 正常业务的资源
|
||||||
nice -n 19 bash "${INSTALL_DIR}/core/${TARGET_MOD}"
|
# [安全修复] 注入 200>&-,强行关闭子进程对排他锁的继承权!防止子进程假死导致全局死锁
|
||||||
|
nice -n 19 bash "${INSTALL_DIR}/core/${TARGET_MOD}" 200>&-
|
||||||
else
|
else
|
||||||
log "SYSTEM" "ERROR" "配置了模块 ${MOD_NAME},但未找到对应的可执行脚本: ${TARGET_MOD}"
|
log "SYSTEM" "ERROR" "配置了模块 ${MOD_NAME},但未找到对应的可执行脚本: ${TARGET_MOD}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -31,11 +31,17 @@ CURL_BIND_OPT=""
|
|||||||
DYNAMIC_IP_PREF="-${IP_PREF:-4}"
|
DYNAMIC_IP_PREF="-${IP_PREF:-4}"
|
||||||
|
|
||||||
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\.]+$ ]]; then
|
if [[ -n "$BIND_IP" && "$BIND_IP" =~ ^[0-9a-fA-F:\.]+$ ]]; then
|
||||||
CURL_BIND_OPT="--interface $BIND_IP"
|
# [v3.6.3 容错层补丁] 探测物理网卡/虚拟 IP 存活状态
|
||||||
if [[ "$BIND_IP" == *":"* ]]; then
|
RAW_BIND_IP=$(echo "$BIND_IP" | tr -d '[]')
|
||||||
DYNAMIC_IP_PREF="-6"
|
if ! ip addr show 2>/dev/null | grep -qw "$RAW_BIND_IP"; then
|
||||||
elif [[ "$BIND_IP" == *"."* ]]; then
|
CURL_BIND_OPT=""
|
||||||
DYNAMIC_IP_PREF="-4"
|
else
|
||||||
|
CURL_BIND_OPT="--interface $BIND_IP"
|
||||||
|
if [[ "$BIND_IP" == *":"* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="-6"
|
||||||
|
elif [[ "$BIND_IP" == *"."* ]]; then
|
||||||
|
DYNAMIC_IP_PREF="-4"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -194,11 +200,24 @@ else
|
|||||||
💡 *哨兵正在后台默默守护您的资产。*"
|
💡 *哨兵正在后台默默守护您的资产。*"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 5. 调用 API 推送 (接入安全网关)
|
# 5. 调用 API 推送 (接入安全网关,挂载交互式控制台按钮)
|
||||||
|
JSON_PAYLOAD=$(jq -n \
|
||||||
|
--arg cid "$CHAT_ID" \
|
||||||
|
--arg txt "$MSG" \
|
||||||
|
--arg cb "manage:${NODE_NAME}" \
|
||||||
|
'{
|
||||||
|
chat_id: $cid,
|
||||||
|
text: $txt,
|
||||||
|
parse_mode: "Markdown",
|
||||||
|
disable_web_page_preview: true,
|
||||||
|
reply_markup: {
|
||||||
|
inline_keyboard: [[{text: "⚙️ 调出该节点控制台", callback_data: $cb}]]
|
||||||
|
}
|
||||||
|
}')
|
||||||
|
|
||||||
RESPONSE=$(curl -s -m 10 -X POST "${TG_API_URL}" \
|
RESPONSE=$(curl -s -m 10 -X POST "${TG_API_URL}" \
|
||||||
-d "chat_id=${CHAT_ID}" \
|
-H "Content-Type: application/json" \
|
||||||
-d "text=${MSG}" \
|
-d "$JSON_PAYLOAD")
|
||||||
-d "parse_mode=Markdown")
|
|
||||||
|
|
||||||
if [[ "$RESPONSE" != *"\"ok\":true"* ]]; then
|
if [[ "$RESPONSE" != *"\"ok\":true"* ]]; then
|
||||||
echo "❌ 战报发送失败!API 响应: $RESPONSE" >> "${INSTALL_DIR}/logs/error.log"
|
echo "❌ 战报发送失败!API 响应: $RESPONSE" >> "${INSTALL_DIR}/logs/error.log"
|
||||||
|
|||||||
@@ -58,15 +58,35 @@ pkill -9 -f "updater.sh" >/dev/null 2>&1
|
|||||||
pkill -9 -f "tg_report.sh" >/dev/null 2>&1
|
pkill -9 -f "tg_report.sh" >/dev/null 2>&1
|
||||||
pkill -9 -f "mod_google.sh" >/dev/null 2>&1
|
pkill -9 -f "mod_google.sh" >/dev/null 2>&1
|
||||||
pkill -9 -f "mod_trust.sh" >/dev/null 2>&1
|
pkill -9 -f "mod_trust.sh" >/dev/null 2>&1
|
||||||
|
pkill -9 -f "sentinel_scheduler.sh" >/dev/null 2>&1
|
||||||
|
|
||||||
# 3. 清除系统定时任务 (Cron)
|
# 3. 清除系统定时任务 (Cron)
|
||||||
echo "[3/4] 正在清理系统定时任务 (Cron)..."
|
echo "[3/4] 正在清理系统定时任务 (Cron)..."
|
||||||
if crontab -l >/dev/null 2>&1; then
|
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_clean || true
|
||||||
crontab -l | grep -v "ip_sentinel" > /tmp/cron_backup
|
# [追加 >/dev/null 2>&1 堵死 Alpine 的脏话输出]
|
||||||
crontab /tmp/cron_backup
|
[ -f /tmp/cron_clean ] && crontab /tmp/cron_clean >/dev/null 2>&1
|
||||||
rm -f /tmp/cron_backup
|
|
||||||
|
# ==========================================
|
||||||
|
# 🛑 [物理抹除] 彻底扫除 Alpine 系统的底层残留与双路径文件
|
||||||
|
# ==========================================
|
||||||
|
for CRON_FILE in "/var/spool/cron/crontabs/root" "/etc/crontabs/root"; do
|
||||||
|
if [ -f "$CRON_FILE" ]; then
|
||||||
|
grep -v "ip_sentinel" "$CRON_FILE" > "${CRON_FILE}.tmp" 2>/dev/null || true
|
||||||
|
cat "${CRON_FILE}.tmp" > "$CRON_FILE" 2>/dev/null || true
|
||||||
|
rm -f "${CRON_FILE}.tmp" 2>/dev/null
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# 清理 OpenRC 开机启动项
|
||||||
|
rm -f /etc/local.d/ip_sentinel.start 2>/dev/null
|
||||||
|
rm -f /etc/local.d/ip_sentinel_scheduler.start 2>/dev/null
|
||||||
|
|
||||||
|
# 清理极端环境写在 /etc/profile 里的兜底启动项
|
||||||
|
if grep -q "sentinel_scheduler.sh" /etc/profile 2>/dev/null; then
|
||||||
|
sed -i '/sentinel_scheduler\.sh/d' /etc/profile 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
rm -f /tmp/cron_clean
|
||||||
|
|
||||||
# 4. 删除所有文件、日志与临时缓存
|
# 4. 删除所有文件、日志与临时缓存
|
||||||
echo "[4/4] 正在抹除核心程序、配置文件与系统痕迹..."
|
echo "[4/4] 正在抹除核心程序、配置文件与系统痕迹..."
|
||||||
if [ -d "$INSTALL_DIR" ]; then
|
if [ -d "$INSTALL_DIR" ]; then
|
||||||
|
|||||||
@@ -25,9 +25,20 @@ log() {
|
|||||||
# [v3.4.0 核心] 提取当前配置中的版本锚点
|
# [v3.4.0 核心] 提取当前配置中的版本锚点
|
||||||
local local_ver="${AGENT_VERSION:-未知}"
|
local local_ver="${AGENT_VERSION:-未知}"
|
||||||
|
|
||||||
|
# 保证日志目录存在
|
||||||
mkdir -p "${INSTALL_DIR}/logs"
|
mkdir -p "${INSTALL_DIR}/logs"
|
||||||
|
|
||||||
# 日志格式注入 [版本号] 追踪标识
|
# 日志格式注入 [版本号] 追踪标识
|
||||||
printf "[$(date '+%Y-%m-%d %H:%M:%S')] [v%-5s] [%-5s] [%-7s] [%s] %s\n" "$local_ver" "$2" "$1" "$REGION_CODE" "$3" >> "$LOG_FILE"
|
local core_msg=$(printf "[v%-5s] [%-5s] [%-7s] [%s] %s" "$local_ver" "$2" "$1" "$REGION_CODE" "$3")
|
||||||
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $core_msg" >> "$LOG_FILE"
|
||||||
|
|
||||||
|
# 强制推送到 Systemd Journal (如果系统支持)
|
||||||
|
if command -v logger >/dev/null 2>&1; then
|
||||||
|
logger -t ip-sentinel "$core_msg"
|
||||||
|
else
|
||||||
|
# 降级输出到 stdout,让 Systemd 捕获
|
||||||
|
echo "$core_msg"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
log "Updater" "INFO " "========== 触发后台静默 OTA 热数据更新 =========="
|
log "Updater" "INFO " "========== 触发后台静默 OTA 热数据更新 =========="
|
||||||
@@ -42,7 +53,12 @@ CURL_CMD="curl -${IP_PREF:-4} -sL"
|
|||||||
if [ -n "$BIND_IP" ]; then
|
if [ -n "$BIND_IP" ]; then
|
||||||
# curl 的 --interface 参数不支持带方括号的 IPv6 地址,必须强行脱壳
|
# curl 的 --interface 参数不支持带方括号的 IPv6 地址,必须强行脱壳
|
||||||
RAW_BIND_IP=$(echo "$BIND_IP" | tr -d '[]')
|
RAW_BIND_IP=$(echo "$BIND_IP" | tr -d '[]')
|
||||||
CURL_CMD="$CURL_CMD --interface $RAW_BIND_IP"
|
# [v3.6.3 容错层补丁] 探测网卡存活状态,防止 IP 漂移导致永久断网
|
||||||
|
if ! ip addr show 2>/dev/null | grep -qw "$RAW_BIND_IP"; then
|
||||||
|
log "Updater" "WARN " "检测到绑定的出口 IP ($RAW_BIND_IP) 已丢失,自动退回默认路由!"
|
||||||
|
else
|
||||||
|
CURL_CMD="$CURL_CMD --interface $RAW_BIND_IP"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
@@ -117,6 +133,17 @@ if [ -n "$REGION_JSON_FILE" ] && [ -f "$REGION_JSON_FILE" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# ==========================================================
|
||||||
|
# 5.5. 容灾更新深海声呐底层探针 (彻底消除第三方 RCE 依赖)
|
||||||
|
# ==========================================================
|
||||||
|
TMP_PROBE="/tmp/ip_sentinel_probe.sh"
|
||||||
|
$CURL_CMD "https://raw.githubusercontent.com/xykt/IPQuality/main/ip.sh" -o "$TMP_PROBE"
|
||||||
|
if [ -s "$TMP_PROBE" ]; then
|
||||||
|
mv "$TMP_PROBE" "${INSTALL_DIR}/core/ip_probe.sh"
|
||||||
|
chmod +x "${INSTALL_DIR}/core/ip_probe.sh"
|
||||||
|
log "Updater" "INFO " "✅ 深海声呐底层探针 (ip_probe.sh) 源文件安全对齐"
|
||||||
|
fi
|
||||||
|
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
# 6. 日志防满瘦身机制 (保留最近 2000 行)
|
# 6. 日志防满瘦身机制 (保留最近 2000 行)
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
|
|||||||
@@ -1,6 +1,79 @@
|
|||||||
|
psl
|
||||||
|
magic vs pistons
|
||||||
|
celtic fc
|
||||||
|
peshawar zalmi vs lahore qalandars
|
||||||
|
angers vs psg
|
||||||
|
la liga
|
||||||
|
prem
|
||||||
|
premier league table
|
||||||
|
epl fixtures
|
||||||
|
premier league games
|
||||||
|
alex de minaur
|
||||||
|
sunderland vs nottm forest
|
||||||
|
real betis vs real madrid
|
||||||
|
sai sudharsan
|
||||||
|
jannik sinner
|
||||||
|
gt vs rcb
|
||||||
|
amd stock
|
||||||
|
carey mulligan
|
||||||
|
jermaine jackson
|
||||||
|
hulk hogan
|
||||||
|
coles
|
||||||
|
elon musk
|
||||||
|
ben roberts-smith
|
||||||
|
ig
|
||||||
|
danish malewar
|
||||||
|
assassin's creed black flag resynced
|
||||||
|
sarfaraz khan
|
||||||
|
kartik sharma
|
||||||
|
instagram stories not working
|
||||||
|
meningococcal b
|
||||||
|
sundaresh menon
|
||||||
|
thunder vs suns
|
||||||
|
cade cunningham
|
||||||
|
real salt lake vs inter miami
|
||||||
|
pope francis
|
||||||
|
camera
|
||||||
|
anzac
|
||||||
|
teams
|
||||||
|
kids news
|
||||||
|
bonds
|
||||||
|
hung cao
|
||||||
|
classroom
|
||||||
|
michael jackson biopic movie
|
||||||
|
india women vs south africa women
|
||||||
|
nato
|
||||||
|
bayern munich
|
||||||
|
barcelona vs celta vigo
|
||||||
|
bournemouth vs leeds
|
||||||
|
leverkusen vs bayern
|
||||||
|
burnley vs man city
|
||||||
|
elche vs atlético madrid
|
||||||
|
lsg vs rr
|
||||||
|
pakistan super league
|
||||||
|
kyle sandilands alleged rant jackie o
|
||||||
|
carrie bickmore
|
||||||
|
adam levine
|
||||||
|
alexandra eala
|
||||||
|
tubi
|
||||||
|
charles melton
|
||||||
|
nuclear weapon
|
||||||
|
janet jackson
|
||||||
|
justin bieber australia tour
|
||||||
|
fleche wallonne 2026
|
||||||
|
ange postecoglou
|
||||||
|
john hattie
|
||||||
|
airbus a380
|
||||||
|
real madrid vs alavés
|
||||||
|
brighton vs chelsea
|
||||||
|
woolworth
|
||||||
|
nitish rana
|
||||||
|
lyrid meteor shower
|
||||||
|
世界地球日
|
||||||
|
youth gang
|
||||||
|
earth day
|
||||||
crystal palace vs west ham
|
crystal palace vs west ham
|
||||||
d4vd
|
d4vd
|
||||||
danish malewar
|
|
||||||
mi vs gt
|
mi vs gt
|
||||||
perth weather
|
perth weather
|
||||||
elijah hollands carlton football club
|
elijah hollands carlton football club
|
||||||
@@ -11,12 +84,10 @@ cailee spaeny
|
|||||||
psg vs lyon
|
psg vs lyon
|
||||||
sporting vs benfica
|
sporting vs benfica
|
||||||
celtics vs 76ers
|
celtics vs 76ers
|
||||||
psl
|
|
||||||
bundesliga
|
bundesliga
|
||||||
pl
|
pl
|
||||||
afc cup
|
afc cup
|
||||||
mars rover
|
mars rover
|
||||||
celtic fc
|
|
||||||
bayern vs vfb stuttgart
|
bayern vs vfb stuttgart
|
||||||
bom radar
|
bom radar
|
||||||
sydney weather
|
sydney weather
|
||||||
@@ -94,7 +165,6 @@ netflix
|
|||||||
gemini
|
gemini
|
||||||
chatgpt
|
chatgpt
|
||||||
margot robbie
|
margot robbie
|
||||||
ange postecoglou
|
|
||||||
oscar piastri
|
oscar piastri
|
||||||
formula 1
|
formula 1
|
||||||
supercars championship
|
supercars championship
|
||||||
@@ -128,42 +198,3 @@ aec enrolment
|
|||||||
agl energy
|
agl energy
|
||||||
origin energy
|
origin energy
|
||||||
stan
|
stan
|
||||||
binge
|
|
||||||
9now
|
|
||||||
7plus
|
|
||||||
abc iview
|
|
||||||
hoyts cinemas
|
|
||||||
event cinemas
|
|
||||||
big bash league
|
|
||||||
the ashes
|
|
||||||
socceroos
|
|
||||||
bathurst 1000
|
|
||||||
booking.com
|
|
||||||
airbnb
|
|
||||||
webjet
|
|
||||||
bali weather
|
|
||||||
smartraveller
|
|
||||||
lotto results
|
|
||||||
powerball results
|
|
||||||
oz lotto
|
|
||||||
public holidays 2026
|
|
||||||
mothers day 2026
|
|
||||||
carsales
|
|
||||||
redbook
|
|
||||||
nrma
|
|
||||||
racv
|
|
||||||
racq
|
|
||||||
petrol spy
|
|
||||||
optus login
|
|
||||||
vodafone
|
|
||||||
kogan
|
|
||||||
catch.com.au
|
|
||||||
mecca
|
|
||||||
sydney fish market
|
|
||||||
queen victoria market
|
|
||||||
taronga zoo
|
|
||||||
dreamworld
|
|
||||||
movie world
|
|
||||||
wotif
|
|
||||||
anytime fitness
|
|
||||||
time in london
|
|
||||||
|
|||||||
@@ -1,8 +1,84 @@
|
|||||||
|
hurricanes vs senators
|
||||||
|
al ahli
|
||||||
|
the white house
|
||||||
|
turkish airlines
|
||||||
|
fa cup games
|
||||||
|
atlético madrid vs athletic club
|
||||||
|
tyree wilson
|
||||||
|
monic néron
|
||||||
|
nvidia
|
||||||
|
aryna sabalenka
|
||||||
|
lpga leaderboard
|
||||||
|
randy travis
|
||||||
|
execution by firing squad
|
||||||
|
nelly korda
|
||||||
|
leicester city vs millwall
|
||||||
|
asteroid
|
||||||
|
sunderland vs nottm forest
|
||||||
|
real betis vs real madrid
|
||||||
|
betis – real madrid
|
||||||
|
napoli vs cremonese
|
||||||
|
gta 6
|
||||||
|
japon
|
||||||
|
padres vs rockies
|
||||||
|
guide de la révolution de l'iran
|
||||||
|
casa pia vs braga
|
||||||
|
denaturalization
|
||||||
|
ocean
|
||||||
|
alberta referendum
|
||||||
|
vfb stuttgart vs sc freiburg
|
||||||
|
gpt 5.5
|
||||||
|
noah cates
|
||||||
|
pwhl scores
|
||||||
|
hank idsinga
|
||||||
|
karoline leavitt
|
||||||
|
ottawa charge
|
||||||
|
million dollar secret
|
||||||
|
white sox vs diamondbacks
|
||||||
|
suns vs thunder
|
||||||
|
stars vs wild
|
||||||
|
jaafar jackson
|
||||||
|
airport
|
||||||
|
grand theft auto vi
|
||||||
|
pentagone
|
||||||
|
etats unis
|
||||||
|
monette farms news
|
||||||
|
jose soriano
|
||||||
|
jon cooper
|
||||||
|
barcelona vs celta vigo
|
||||||
|
764
|
||||||
|
david scott
|
||||||
|
rodrigo duterte
|
||||||
|
u18 world championship
|
||||||
|
zara tindall
|
||||||
|
graham platner
|
||||||
|
lsg vs rr
|
||||||
|
nikki glaser
|
||||||
|
global news edmonton
|
||||||
|
policier
|
||||||
|
nuclear weapon
|
||||||
|
motorcycle
|
||||||
|
msc francesca
|
||||||
|
poet stock
|
||||||
|
fifa tickets
|
||||||
|
7 jours
|
||||||
|
alexandra eala
|
||||||
|
earth
|
||||||
|
zara larsson
|
||||||
|
girona vs real betis
|
||||||
|
kevyn adams
|
||||||
|
ali khamenei
|
||||||
|
inter – côme
|
||||||
|
leicester city vs hull
|
||||||
|
fenerbahçe
|
||||||
|
françois bonnardel
|
||||||
|
missile
|
||||||
|
real madrid vs alavés
|
||||||
|
vrabel and russini photos
|
||||||
will trent
|
will trent
|
||||||
ibm
|
ibm
|
||||||
lecce vs fiorentina
|
lecce vs fiorentina
|
||||||
celeste rivas hernandez
|
celeste rivas hernandez
|
||||||
grand theft auto vi
|
|
||||||
abhishek bachchan
|
abhishek bachchan
|
||||||
national guard of the united states
|
national guard of the united states
|
||||||
triathlon
|
triathlon
|
||||||
|
|||||||
@@ -1,3 +1,77 @@
|
|||||||
|
darmstadt
|
||||||
|
dahoam is dahoam
|
||||||
|
أتلتيكو مدريد ضد أتلتيك بيلباو
|
||||||
|
atlético madryt – ath. bilbao
|
||||||
|
portugal
|
||||||
|
erling haaland
|
||||||
|
galatasaray fenerbahce
|
||||||
|
anna carina woitschack
|
||||||
|
nord bei nordwest
|
||||||
|
wil wheaton
|
||||||
|
christian lindner
|
||||||
|
kevin costner
|
||||||
|
samu haber
|
||||||
|
gillian anderson
|
||||||
|
peggy jerofke
|
||||||
|
rafael jódar
|
||||||
|
ernie dosio
|
||||||
|
bibi heinicke
|
||||||
|
denia
|
||||||
|
der alte blaue stunde
|
||||||
|
matthias ginter
|
||||||
|
ralf schmitz
|
||||||
|
maximilian eggestein
|
||||||
|
hull city
|
||||||
|
demirovic
|
||||||
|
elton john
|
||||||
|
jeff chabot
|
||||||
|
lindt schokolade
|
||||||
|
manzambi
|
||||||
|
angelo stiller
|
||||||
|
lamine yamal verletzung
|
||||||
|
peer steinbrück
|
||||||
|
h&m
|
||||||
|
lotto 6aus49
|
||||||
|
pistons – magic
|
||||||
|
chemnitzer fc erzgebirge aue
|
||||||
|
asiago
|
||||||
|
23 nisan
|
||||||
|
sternschnuppen heute lyriden
|
||||||
|
aryna sabalenka
|
||||||
|
michael douglas
|
||||||
|
herman van veen
|
||||||
|
georgina fleur
|
||||||
|
tui
|
||||||
|
trainer bayern münchen
|
||||||
|
katie holmes
|
||||||
|
prinz frederic
|
||||||
|
bayern vs
|
||||||
|
flekken
|
||||||
|
бернли – манчестер сити
|
||||||
|
ard
|
||||||
|
queen camilla
|
||||||
|
clankriminalität
|
||||||
|
politik
|
||||||
|
gladbach-news
|
||||||
|
sara gündogan
|
||||||
|
krankenversicherung
|
||||||
|
jan-lennard struff
|
||||||
|
bryan lasme
|
||||||
|
republikanische partei
|
||||||
|
thailand
|
||||||
|
robin gosens
|
||||||
|
maremma
|
||||||
|
tennis madrid
|
||||||
|
osterburg
|
||||||
|
برايتون ضد تشيلسي
|
||||||
|
sebastian hoeneß
|
||||||
|
ncis
|
||||||
|
menowin fröhlich
|
||||||
|
maren gilzer
|
||||||
|
cineplex
|
||||||
|
gina schumacher
|
||||||
|
alexander räuscher
|
||||||
|
riza kayaalp
|
||||||
heppenheim
|
heppenheim
|
||||||
ministerpräsident
|
ministerpräsident
|
||||||
robbie williams
|
robbie williams
|
||||||
|
|||||||
@@ -1,3 +1,78 @@
|
|||||||
|
vivienda
|
||||||
|
hellas verona - lecce
|
||||||
|
marbella
|
||||||
|
alfonso vazquez mayoral fuente ymbro
|
||||||
|
bucaramanga - jaguares
|
||||||
|
toulouse - mónaco
|
||||||
|
eldense
|
||||||
|
nicolai budkov kjær
|
||||||
|
aryna sabalenka
|
||||||
|
jaqueline cristian
|
||||||
|
rafa jodar
|
||||||
|
samantha vallejo-nágera
|
||||||
|
ريال بتيس ضد الريال
|
||||||
|
nvidia
|
||||||
|
rafael jódar
|
||||||
|
jodar tenista
|
||||||
|
sunderland afc - nottingham forest
|
||||||
|
rb leipzig - fc union berlin
|
||||||
|
julián alvarez
|
||||||
|
stade brestois - lens
|
||||||
|
clasificación de primera división
|
||||||
|
javier hidalgo
|
||||||
|
cayetano martínez de irujo
|
||||||
|
llanes
|
||||||
|
vfb stuttgart – freiburg
|
||||||
|
roca rey
|
||||||
|
psv - zwolle
|
||||||
|
daredevil
|
||||||
|
a que estas esperando
|
||||||
|
real oviedo - villarreal
|
||||||
|
real salt lake - inter miami
|
||||||
|
pistons - magic
|
||||||
|
barcelona sc - mushuc runa
|
||||||
|
kick
|
||||||
|
raphinha
|
||||||
|
lluvia estrellas liridas
|
||||||
|
frenkie de jong
|
||||||
|
santos - coritiba
|
||||||
|
del cerro grande
|
||||||
|
phillip cocu
|
||||||
|
cospedal
|
||||||
|
david wilcock
|
||||||
|
barcelona - celta de vigo
|
||||||
|
barcelone – celta vigo
|
||||||
|
macarena gómez
|
||||||
|
luis merlo
|
||||||
|
bournemouth vs leeds
|
||||||
|
racing de estrasburgo - niza
|
||||||
|
burnley vs man city
|
||||||
|
alaska cantante
|
||||||
|
raúl gonzález blanco
|
||||||
|
marta sanchez
|
||||||
|
roberto bautista
|
||||||
|
cifras y letras
|
||||||
|
xbox game pass ultimate
|
||||||
|
horse powertrain
|
||||||
|
las hurdes
|
||||||
|
herbicida cancer colon
|
||||||
|
lluvia de barro
|
||||||
|
ripoll
|
||||||
|
manilva
|
||||||
|
steve jobs
|
||||||
|
berrettini
|
||||||
|
prizmic
|
||||||
|
laura moure
|
||||||
|
lens - toulouse
|
||||||
|
girona vs real betis
|
||||||
|
yuri berchiche
|
||||||
|
clasificacion liga
|
||||||
|
posiciones de la liga
|
||||||
|
resultados liga
|
||||||
|
lfp
|
||||||
|
umar sadiq
|
||||||
|
реал мадрид – алавес
|
||||||
|
jan virgili
|
||||||
moreirense - estoril
|
moreirense - estoril
|
||||||
downton abbey
|
downton abbey
|
||||||
koldo garcía izaguirre
|
koldo garcía izaguirre
|
||||||
@@ -6,7 +81,6 @@ mike james
|
|||||||
carla leite
|
carla leite
|
||||||
eclipse solar del 12 de agosto de 2026
|
eclipse solar del 12 de agosto de 2026
|
||||||
crystal palace - west ham
|
crystal palace - west ham
|
||||||
luis merlo
|
|
||||||
luz valdenebro
|
luz valdenebro
|
||||||
porto - tondela
|
porto - tondela
|
||||||
santos - fluminense
|
santos - fluminense
|
||||||
|
|||||||
@@ -1,3 +1,74 @@
|
|||||||
|
jaqueline cristian
|
||||||
|
thomas ramos
|
||||||
|
om nice
|
||||||
|
bordeaux-bègles – montpellier
|
||||||
|
drone
|
||||||
|
rochdale association football club
|
||||||
|
doctor who
|
||||||
|
c à vous c à vous
|
||||||
|
sabalenka
|
||||||
|
national 2 groupe a
|
||||||
|
lena situation
|
||||||
|
rafael jódar
|
||||||
|
mask singer
|
||||||
|
alex de minaur
|
||||||
|
oyonnax – agen
|
||||||
|
lucie castets
|
||||||
|
napoli - cremonese
|
||||||
|
ligue1+
|
||||||
|
agnes lassalle
|
||||||
|
jean luc reichmann
|
||||||
|
m6
|
||||||
|
caitlyn jenner
|
||||||
|
star academy
|
||||||
|
bfm marseille provence
|
||||||
|
hunter schafer
|
||||||
|
unchosen netflix
|
||||||
|
john travolta
|
||||||
|
valence-romans – brive
|
||||||
|
reem kherici
|
||||||
|
will smith
|
||||||
|
real salt lake – inter miami
|
||||||
|
neymar
|
||||||
|
les traîtres
|
||||||
|
jacob elordi
|
||||||
|
pistons – magic
|
||||||
|
invincible
|
||||||
|
santos – coritiba
|
||||||
|
ios 18
|
||||||
|
la liga
|
||||||
|
royaume uni interdiction tabac
|
||||||
|
stephane tapie
|
||||||
|
tondelier
|
||||||
|
benjamin duhamel
|
||||||
|
loto 22 avril 2026
|
||||||
|
interdiction tabac royaume uni
|
||||||
|
lol qui rit sort
|
||||||
|
eva longoria
|
||||||
|
alain bauer
|
||||||
|
achraf hakimi
|
||||||
|
ibrahim mbaye
|
||||||
|
mma
|
||||||
|
roberto calvet
|
||||||
|
budget
|
||||||
|
coupe du monde de football 2006
|
||||||
|
plus belle la vie en avance
|
||||||
|
mateus fernandes
|
||||||
|
tour des alpes 2026
|
||||||
|
lorenzo finn
|
||||||
|
maine-et-loire
|
||||||
|
mathieu flamini
|
||||||
|
kamel daoud
|
||||||
|
vandalisme
|
||||||
|
sydney sweeney
|
||||||
|
julien odoul
|
||||||
|
france2
|
||||||
|
xavier dupont de ligonnès
|
||||||
|
elisabeth 2
|
||||||
|
antibes
|
||||||
|
girona – betis
|
||||||
|
christine bravo
|
||||||
|
الريال ضد ألافيس
|
||||||
madonna age
|
madonna age
|
||||||
margot haddad
|
margot haddad
|
||||||
ana riera
|
ana riera
|
||||||
@@ -5,7 +76,6 @@ hinaupoko devèze
|
|||||||
bruce toussaint
|
bruce toussaint
|
||||||
cheque energie
|
cheque energie
|
||||||
reid wiseman
|
reid wiseman
|
||||||
mma
|
|
||||||
loto 20 avril 2026
|
loto 20 avril 2026
|
||||||
from serie
|
from serie
|
||||||
toulouse
|
toulouse
|
||||||
@@ -32,7 +102,6 @@ pmu résultat
|
|||||||
laury thilleman et paul mirabel
|
laury thilleman et paul mirabel
|
||||||
quinté du jour
|
quinté du jour
|
||||||
euromillions 17 avril 2026
|
euromillions 17 avril 2026
|
||||||
alain bauer
|
|
||||||
uson
|
uson
|
||||||
guillaume meurice
|
guillaume meurice
|
||||||
pmu
|
pmu
|
||||||
@@ -84,7 +153,6 @@ loto du 13 avril 2026
|
|||||||
juan arbeláez
|
juan arbeláez
|
||||||
hbo
|
hbo
|
||||||
katy perry justin trudeau
|
katy perry justin trudeau
|
||||||
jacob elordi
|
|
||||||
tondela – gil vicente
|
tondela – gil vicente
|
||||||
le rugbynistère
|
le rugbynistère
|
||||||
epstein
|
epstein
|
||||||
|
|||||||
@@ -1,3 +1,70 @@
|
|||||||
|
谷 婭 溦
|
||||||
|
曼城
|
||||||
|
印度
|
||||||
|
英超
|
||||||
|
利物浦
|
||||||
|
pl
|
||||||
|
arsenal vs newcastle
|
||||||
|
premier league standings
|
||||||
|
曼城 對 南安普敦
|
||||||
|
寒戰
|
||||||
|
米高積遜
|
||||||
|
jaafar jackson
|
||||||
|
nvda
|
||||||
|
吳業坤
|
||||||
|
麻疹
|
||||||
|
林盛斌
|
||||||
|
cuaca besok
|
||||||
|
明天的天氣
|
||||||
|
weather tomorrow
|
||||||
|
rthk
|
||||||
|
weather hong kong
|
||||||
|
天文台
|
||||||
|
hk observatory
|
||||||
|
observatory
|
||||||
|
csk vs mi
|
||||||
|
長沙灣
|
||||||
|
魔音女團
|
||||||
|
球迷世界
|
||||||
|
天星銀行
|
||||||
|
game
|
||||||
|
林嘉華
|
||||||
|
套餐
|
||||||
|
賈曉晨
|
||||||
|
hk weather
|
||||||
|
綠色債券
|
||||||
|
barcelona vs celta vigo
|
||||||
|
weather
|
||||||
|
7-eleven
|
||||||
|
天气
|
||||||
|
班來 對 曼城
|
||||||
|
埃爾切 對 馬德里競技
|
||||||
|
rosenior
|
||||||
|
艾納斯
|
||||||
|
liam rosenior
|
||||||
|
巴黎聖日耳曼 對 南特
|
||||||
|
chatgpt image 2
|
||||||
|
啟德醫院
|
||||||
|
李泳漢老婆
|
||||||
|
破產
|
||||||
|
繼承人
|
||||||
|
英皇群星演唱會
|
||||||
|
布浩榮
|
||||||
|
新聞
|
||||||
|
貨幣貶值
|
||||||
|
居 屋 2025
|
||||||
|
3988
|
||||||
|
李泳豪老婆
|
||||||
|
皇家馬德里 對 艾拉維斯
|
||||||
|
李泳漢
|
||||||
|
鄭欣宜
|
||||||
|
srh vs dc
|
||||||
|
鍾嘉欣
|
||||||
|
張柏芝
|
||||||
|
江美儀
|
||||||
|
全港戲院日 2026
|
||||||
|
江旻憓
|
||||||
|
陶傑
|
||||||
水晶宮 對 西漢姆聯
|
水晶宮 對 西漢姆聯
|
||||||
吉達艾阿里
|
吉達艾阿里
|
||||||
山口智子
|
山口智子
|
||||||
@@ -8,20 +75,17 @@
|
|||||||
麥當勞
|
麥當勞
|
||||||
首岸
|
首岸
|
||||||
中国商飞c919
|
中国商飞c919
|
||||||
pl
|
|
||||||
bundesliga
|
bundesliga
|
||||||
hailey bieber
|
hailey bieber
|
||||||
德甲
|
德甲
|
||||||
cherki
|
cherki
|
||||||
now
|
now
|
||||||
曼城
|
|
||||||
now tv
|
now tv
|
||||||
al nassr
|
al nassr
|
||||||
洪金寶
|
洪金寶
|
||||||
曼聯
|
曼聯
|
||||||
車路士
|
車路士
|
||||||
切爾西 對 曼聯
|
切爾西 對 曼聯
|
||||||
英超
|
|
||||||
何沛珈
|
何沛珈
|
||||||
熱刺
|
熱刺
|
||||||
tottenham vs brighton
|
tottenham vs brighton
|
||||||
@@ -30,7 +94,6 @@ epl
|
|||||||
司機
|
司機
|
||||||
补贴
|
补贴
|
||||||
華富邨
|
華富邨
|
||||||
江美儀
|
|
||||||
零售
|
零售
|
||||||
藍莓
|
藍莓
|
||||||
商湯科技
|
商湯科技
|
||||||
@@ -66,7 +129,6 @@ nba直播
|
|||||||
全民國家安全教育日
|
全民國家安全教育日
|
||||||
運輸署
|
運輸署
|
||||||
liverpool vs psg
|
liverpool vs psg
|
||||||
利物浦
|
|
||||||
barcelona
|
barcelona
|
||||||
歐冠
|
歐冠
|
||||||
馬德里競技 對 巴塞隆納
|
馬德里競技 對 巴塞隆納
|
||||||
|
|||||||
@@ -1,10 +1,82 @@
|
|||||||
|
アーセナル
|
||||||
|
高岡蒼佑
|
||||||
|
マンチェスター・シティfc
|
||||||
|
ゲンク 対 スタンダール
|
||||||
|
kick
|
||||||
|
chat gpt
|
||||||
|
hulu
|
||||||
|
nac 対 アヤックス
|
||||||
|
エプスタイン
|
||||||
|
arsenal đấu với newcastle
|
||||||
|
ベティス 対 rマドリード
|
||||||
|
dior
|
||||||
|
伊藤美来
|
||||||
|
フィギュア
|
||||||
|
玉置浩二
|
||||||
|
生田絵梨花
|
||||||
|
日本高野連会長辞任
|
||||||
|
anaheim
|
||||||
|
sbiグローバルアセットマネジメント
|
||||||
|
ストレンジャーシングス
|
||||||
|
石油
|
||||||
|
ios 26.4 2
|
||||||
|
ポケモンカード
|
||||||
|
シュトゥットガルト 対 フライブルク
|
||||||
|
ドラクエ スマグロ 攻略
|
||||||
|
ipl
|
||||||
|
アコム
|
||||||
|
鈴木愛理
|
||||||
|
sox指数
|
||||||
|
村上世彰
|
||||||
|
桐山 照史
|
||||||
|
マラッカ海峡
|
||||||
|
ソニック
|
||||||
|
sbi新生銀行 株価
|
||||||
|
マイクラ
|
||||||
|
川口 春奈
|
||||||
|
サンダー 対 サンズ
|
||||||
|
インフルエンサー
|
||||||
|
サンケイビル
|
||||||
|
岡村隆史
|
||||||
|
上田竜也
|
||||||
|
メタプラネット
|
||||||
|
バルセロナ 対 セルタ
|
||||||
|
三橋くん
|
||||||
|
エルニーニョ
|
||||||
|
バーンリー 対 マンc
|
||||||
|
ボーンマス 対 リーズ u
|
||||||
|
elche vs atlético madrid
|
||||||
|
レバークーゼン 対 バイエルン
|
||||||
|
ソシエダ 対 ヘタフェ
|
||||||
|
サイメモリ
|
||||||
|
b リーグ 順位
|
||||||
|
日ハム
|
||||||
|
ナダル
|
||||||
|
失点
|
||||||
|
岩瀬洋志
|
||||||
|
ファイターズ 試合
|
||||||
|
江村美咲
|
||||||
|
宝島社
|
||||||
|
井ノ原 快彦
|
||||||
|
ファイターズ
|
||||||
|
西郷隆盛
|
||||||
|
ボーダー
|
||||||
|
チェルシー
|
||||||
|
関税
|
||||||
|
ブライトン
|
||||||
|
佳子内親王
|
||||||
|
rマドリード 対 アラベス
|
||||||
|
鳥貴族
|
||||||
|
ブライトン 対 チェルシー
|
||||||
|
アシエンダ乗馬学校
|
||||||
|
ngày trái đất
|
||||||
|
加藤小夏
|
||||||
町田ゼルビア
|
町田ゼルビア
|
||||||
モンスターハンターシリーズ
|
モンスターハンターシリーズ
|
||||||
クリスタル・パレス 対 ウェストハム
|
クリスタル・パレス 対 ウェストハム
|
||||||
吉田正尚
|
吉田正尚
|
||||||
旭琉會
|
旭琉會
|
||||||
神戸
|
神戸
|
||||||
kick
|
|
||||||
てんちむ
|
てんちむ
|
||||||
浜辺美波
|
浜辺美波
|
||||||
デーブ ロバーツ
|
デーブ ロバーツ
|
||||||
@@ -14,7 +86,6 @@ kick
|
|||||||
ちゃんよた
|
ちゃんよた
|
||||||
坂本 花織
|
坂本 花織
|
||||||
松山 千春
|
松山 千春
|
||||||
dior
|
|
||||||
リーグアン
|
リーグアン
|
||||||
伊勢谷友介
|
伊勢谷友介
|
||||||
bayern vs vfb stuttgart
|
bayern vs vfb stuttgart
|
||||||
@@ -60,7 +131,6 @@ wowow
|
|||||||
小泉進次郎
|
小泉進次郎
|
||||||
政権
|
政権
|
||||||
ミキティ
|
ミキティ
|
||||||
ソニック
|
|
||||||
今日のドジャースの結果
|
今日のドジャースの結果
|
||||||
新名神高速道路
|
新名神高速道路
|
||||||
わたせせいぞう
|
わたせせいぞう
|
||||||
@@ -69,7 +139,6 @@ wowow
|
|||||||
アレックス・ベシア
|
アレックス・ベシア
|
||||||
リバプール
|
リバプール
|
||||||
champions league
|
champions league
|
||||||
エルニーニョ
|
|
||||||
アトレティコ 対 バルセロナ
|
アトレティコ 対 バルセロナ
|
||||||
オープンワールド
|
オープンワールド
|
||||||
atlético madrid vs barcelona
|
atlético madrid vs barcelona
|
||||||
|
|||||||
@@ -1,3 +1,77 @@
|
|||||||
|
psg
|
||||||
|
리그앙
|
||||||
|
arsenal đấu với newcastle
|
||||||
|
맨시티
|
||||||
|
man city đấu với southampton
|
||||||
|
아스널
|
||||||
|
arsenal vs newcastle
|
||||||
|
아스널 대 뉴캐슬
|
||||||
|
man city vs southampton
|
||||||
|
안보현
|
||||||
|
트와이스
|
||||||
|
s
|
||||||
|
엔비디아 주가
|
||||||
|
이경실
|
||||||
|
신발
|
||||||
|
하현상
|
||||||
|
김수희
|
||||||
|
gt vs rcb
|
||||||
|
야닉 시너
|
||||||
|
amd 주가
|
||||||
|
왕다루
|
||||||
|
시그널
|
||||||
|
모하메드 살라
|
||||||
|
공화당
|
||||||
|
윤하정
|
||||||
|
청남대
|
||||||
|
더보이즈
|
||||||
|
노민우
|
||||||
|
서비스나우
|
||||||
|
김민지
|
||||||
|
박해미
|
||||||
|
국가유산청
|
||||||
|
삼성전자 주가
|
||||||
|
두산에너빌리티 주가
|
||||||
|
김성수
|
||||||
|
한국사
|
||||||
|
삼성전기 주가
|
||||||
|
국립중앙박물관
|
||||||
|
대우건설 주가
|
||||||
|
지방 선거
|
||||||
|
서정대학교
|
||||||
|
캔바
|
||||||
|
한국항공우주산업
|
||||||
|
디트로이트 대 올랜도
|
||||||
|
리그 1
|
||||||
|
elche vs atlético madrid
|
||||||
|
알나스르
|
||||||
|
al-nassr vs al ahli
|
||||||
|
10
|
||||||
|
로세니어
|
||||||
|
psg 대 낭트
|
||||||
|
테슬라 실적발표
|
||||||
|
루카스 모우라
|
||||||
|
9950x3d2
|
||||||
|
삼천당 제약 간담회
|
||||||
|
김재윤
|
||||||
|
k리그1 순위
|
||||||
|
유영찬
|
||||||
|
이호연
|
||||||
|
sxmb
|
||||||
|
진
|
||||||
|
문재인
|
||||||
|
생산직
|
||||||
|
강훈식
|
||||||
|
롤
|
||||||
|
cnn
|
||||||
|
리그오브레전드
|
||||||
|
박환희
|
||||||
|
박지현
|
||||||
|
카토
|
||||||
|
와우넷
|
||||||
|
지구의 날
|
||||||
|
컴프야
|
||||||
|
차지연
|
||||||
크리스털 팰리스 대 웨스트 햄
|
크리스털 팰리스 대 웨스트 햄
|
||||||
비상계엄
|
비상계엄
|
||||||
연기금
|
연기금
|
||||||
@@ -20,7 +94,6 @@ fotmob
|
|||||||
케이뱅크
|
케이뱅크
|
||||||
날씨
|
날씨
|
||||||
환율
|
환율
|
||||||
삼성전자 주가
|
|
||||||
손흥민
|
손흥민
|
||||||
토트넘 경기 일정
|
토트넘 경기 일정
|
||||||
넷플릭스
|
넷플릭스
|
||||||
|
|||||||
54
data/keywords/kw_MY.txt
Normal file
54
data/keywords/kw_MY.txt
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
atlético madrid vs athletic club
|
||||||
|
fa cup games
|
||||||
|
แมนซิตี พบ เซาแธมป์ตัน
|
||||||
|
benfica vs moreirense
|
||||||
|
city
|
||||||
|
valencia vs girona
|
||||||
|
man city games
|
||||||
|
bayern vs barcelona
|
||||||
|
英超积分榜
|
||||||
|
angers vs psg
|
||||||
|
sunderland vs nottm forest
|
||||||
|
real betis lwn real madrid cf
|
||||||
|
napoli vs cremonese
|
||||||
|
real betis vs real madrid
|
||||||
|
perfect crown ep 5
|
||||||
|
siti mastura mohamad
|
||||||
|
jannik sinner
|
||||||
|
sai sudharsan
|
||||||
|
yaris cross hybrid
|
||||||
|
cretaceous kraken
|
||||||
|
rayo vallecano vs espanyol
|
||||||
|
dji lito x1
|
||||||
|
levante vs sevilla
|
||||||
|
danish malewar
|
||||||
|
mukesh choudhary
|
||||||
|
lyrid meteor showers
|
||||||
|
jamie overton
|
||||||
|
piala uber
|
||||||
|
madrid open
|
||||||
|
dewald brevis
|
||||||
|
counter strike
|
||||||
|
pistons vs magic
|
||||||
|
real salt lake vs inter miami
|
||||||
|
chart gpt
|
||||||
|
asiago
|
||||||
|
liza hanim
|
||||||
|
good morning
|
||||||
|
pandikar amin mulia
|
||||||
|
勒沃库森 - 拜仁
|
||||||
|
santos vs coritiba
|
||||||
|
Malaysia
|
||||||
|
Kuala Lumpur
|
||||||
|
Bursa Malaysia
|
||||||
|
Ringgit
|
||||||
|
Maybank
|
||||||
|
CIMB
|
||||||
|
Shopee MY
|
||||||
|
Lazada Malaysia
|
||||||
|
KWSP i-Akaun
|
||||||
|
LHDN MyTax
|
||||||
|
Anwar Ibrahim
|
||||||
|
Johor Bahru
|
||||||
|
Penang
|
||||||
|
Nasi Lemak
|
||||||
@@ -1,3 +1,74 @@
|
|||||||
|
aryna sabalenka
|
||||||
|
fortuna
|
||||||
|
curacao
|
||||||
|
atlético madrid - ath. bilbao
|
||||||
|
digid solvinity
|
||||||
|
baywatch
|
||||||
|
boy kemper
|
||||||
|
donyell malen
|
||||||
|
twente - nec
|
||||||
|
afc champions league
|
||||||
|
wesley sonck
|
||||||
|
arnold schwarzenegger
|
||||||
|
devil wears prada
|
||||||
|
jagiellonia białystok – górnik zabrze
|
||||||
|
unchosen
|
||||||
|
max verstappen redbull
|
||||||
|
mvv - top oss
|
||||||
|
energiecontract
|
||||||
|
real betis - real madrid
|
||||||
|
fc den bosch
|
||||||
|
maarten van rossem
|
||||||
|
jake paul
|
||||||
|
financiën
|
||||||
|
zonnepaneel
|
||||||
|
xrp
|
||||||
|
cyprus
|
||||||
|
verdachte
|
||||||
|
112 eerbeek
|
||||||
|
golden earring
|
||||||
|
sergiño dest
|
||||||
|
david wilcock
|
||||||
|
asiago
|
||||||
|
shownieuws
|
||||||
|
nijmegen
|
||||||
|
keira knightley
|
||||||
|
112 meldingen amsterdam
|
||||||
|
dierenmishandeling
|
||||||
|
112 amsterdam
|
||||||
|
freek rikkerink
|
||||||
|
poetin
|
||||||
|
atalanta - lazio
|
||||||
|
mr nobody against putin
|
||||||
|
club brugge - mechelen
|
||||||
|
frank hosmar
|
||||||
|
barcelona - celta
|
||||||
|
kees flodder
|
||||||
|
burnley - manchester city
|
||||||
|
lodewijk asscher
|
||||||
|
vallende sterren
|
||||||
|
guus meeuwis
|
||||||
|
hoofddorp
|
||||||
|
kaja kallas
|
||||||
|
politiek
|
||||||
|
stroomstoring amersfoort
|
||||||
|
solvinity digid
|
||||||
|
wout weghorst
|
||||||
|
jamie kames
|
||||||
|
bitvavo
|
||||||
|
box 3
|
||||||
|
ronde van de alpen
|
||||||
|
matthias uhl
|
||||||
|
taken film
|
||||||
|
robot
|
||||||
|
girona - real betis
|
||||||
|
real madryt – deportivo alaves
|
||||||
|
tbilisi
|
||||||
|
southampton - bristol city
|
||||||
|
vittoria guazzini
|
||||||
|
oppo find x9 ultra
|
||||||
|
real madrid - alavés
|
||||||
|
الريال ضد ألافيس
|
||||||
lecce - fiorentina
|
lecce - fiorentina
|
||||||
pogoda jutro
|
pogoda jutro
|
||||||
vierhouten
|
vierhouten
|
||||||
|
|||||||
@@ -1,3 +1,73 @@
|
|||||||
|
bologna vs roma
|
||||||
|
angers vs psg
|
||||||
|
giant octopus fossil
|
||||||
|
premier league standings
|
||||||
|
apple iphone fold
|
||||||
|
arsenal vs newcastle
|
||||||
|
man city vs southampton
|
||||||
|
bundesliga
|
||||||
|
israel iran war
|
||||||
|
freddie woodman
|
||||||
|
sunderland vs nottm forest
|
||||||
|
real betis vs real madrid
|
||||||
|
anne hathaway
|
||||||
|
michael jackson
|
||||||
|
sai sudharsan
|
||||||
|
madrid open
|
||||||
|
amd
|
||||||
|
gt vs rcb
|
||||||
|
ijooz
|
||||||
|
raghav chadha
|
||||||
|
darren wang
|
||||||
|
mukesh choudhary
|
||||||
|
danish malewar
|
||||||
|
tamil nadu election results
|
||||||
|
allah ghazanfar
|
||||||
|
peregrine falcon
|
||||||
|
airasia flight
|
||||||
|
arrest
|
||||||
|
hao mart singapore
|
||||||
|
kartik sharma
|
||||||
|
real salt lake vs inter miami
|
||||||
|
pistons vs magic
|
||||||
|
krisflyer
|
||||||
|
michael jackson biopic
|
||||||
|
新加坡
|
||||||
|
atalanta vs lazio
|
||||||
|
伯恩利 - 曼城
|
||||||
|
porto vs sporting
|
||||||
|
cdl directors resign millennium copthorne
|
||||||
|
tsla
|
||||||
|
leverkusen vs bayern
|
||||||
|
burnley vs man city
|
||||||
|
elche vs atlético madrid
|
||||||
|
psg vs nantes
|
||||||
|
al-nassr vs al ahli
|
||||||
|
mohsin khan
|
||||||
|
changi
|
||||||
|
rr vs lsg
|
||||||
|
primary school
|
||||||
|
alexandra eala
|
||||||
|
tan su shan
|
||||||
|
sundaresh menon
|
||||||
|
moulin rouge musical singapore
|
||||||
|
south korea
|
||||||
|
step
|
||||||
|
gamba osaka vs avispa fukuoka
|
||||||
|
honor 600 pro
|
||||||
|
china shipyards oil tanker orders
|
||||||
|
coe
|
||||||
|
lebron james
|
||||||
|
real madrid vs alavés
|
||||||
|
brighton vs chelsea
|
||||||
|
nitish rana
|
||||||
|
earth day
|
||||||
|
michael movie
|
||||||
|
kevin warsh
|
||||||
|
srh vs dc
|
||||||
|
chinese aircraft carrier liaoning
|
||||||
|
andie chen
|
||||||
|
jesseca liu wins best actress
|
||||||
crystal palace vs west ham
|
crystal palace vs west ham
|
||||||
grok
|
grok
|
||||||
gemini
|
gemini
|
||||||
@@ -6,7 +76,6 @@ gpt
|
|||||||
ai
|
ai
|
||||||
is chatgpt down
|
is chatgpt down
|
||||||
strait of hormuz news
|
strait of hormuz news
|
||||||
danish malewar
|
|
||||||
mi vs gt
|
mi vs gt
|
||||||
psg vs lyon
|
psg vs lyon
|
||||||
sporting vs benfica
|
sporting vs benfica
|
||||||
|
|||||||
@@ -1,3 +1,73 @@
|
|||||||
|
兵工廠
|
||||||
|
魔術 對 活塞
|
||||||
|
arsenal đấu với newcastle
|
||||||
|
t.o.p.
|
||||||
|
吸血鬼爬行者
|
||||||
|
足總盃
|
||||||
|
arsenal vs newcastle
|
||||||
|
man city đấu với southampton
|
||||||
|
消費券
|
||||||
|
6187
|
||||||
|
cpo概念股
|
||||||
|
anaheim
|
||||||
|
iu
|
||||||
|
山口智子
|
||||||
|
蔡依珊
|
||||||
|
林岱安
|
||||||
|
michael jackson 電影
|
||||||
|
行動電源
|
||||||
|
地震
|
||||||
|
地震速報
|
||||||
|
宋祖兒
|
||||||
|
porter
|
||||||
|
謝京穎
|
||||||
|
德州儀器
|
||||||
|
台新綜合證券
|
||||||
|
希臘
|
||||||
|
費城半導體
|
||||||
|
mrvl
|
||||||
|
狄鶯
|
||||||
|
三星罷工
|
||||||
|
00981a
|
||||||
|
馬斯克
|
||||||
|
辛耘
|
||||||
|
宏碁股價
|
||||||
|
0056
|
||||||
|
2330
|
||||||
|
雷霆 對 太陽
|
||||||
|
0050股價
|
||||||
|
006208
|
||||||
|
景碩
|
||||||
|
女警陳芊雯
|
||||||
|
廢死聯盟
|
||||||
|
西甲
|
||||||
|
台灣積體電路製造
|
||||||
|
高頻寬 記憶 體
|
||||||
|
戴奧辛
|
||||||
|
3665
|
||||||
|
宋晟睿
|
||||||
|
黃 甘霖
|
||||||
|
劉家翔
|
||||||
|
王耿豪
|
||||||
|
王勝偉
|
||||||
|
009816
|
||||||
|
thời tiết ngày mai
|
||||||
|
明天的天氣
|
||||||
|
總部
|
||||||
|
美光科技
|
||||||
|
cpbl
|
||||||
|
中華職棒
|
||||||
|
中職
|
||||||
|
黃甘霖
|
||||||
|
軍 公教
|
||||||
|
6147
|
||||||
|
earth day
|
||||||
|
陳哲遠
|
||||||
|
台鐵
|
||||||
|
斯普拉遁 塗擊隊
|
||||||
|
麥可傑克森
|
||||||
|
神將彩券行
|
||||||
|
米可白
|
||||||
洪敬堯
|
洪敬堯
|
||||||
華邦電子
|
華邦電子
|
||||||
柔美的細胞小將 3
|
柔美的細胞小將 3
|
||||||
@@ -9,7 +79,6 @@
|
|||||||
rklb
|
rklb
|
||||||
amd stock
|
amd stock
|
||||||
宋仲基
|
宋仲基
|
||||||
兵工廠
|
|
||||||
德甲
|
德甲
|
||||||
塞爾提克 對 76人
|
塞爾提克 對 76人
|
||||||
justin bieber 演唱會
|
justin bieber 演唱會
|
||||||
|
|||||||
@@ -1,6 +1,77 @@
|
|||||||
|
ronnie o'sullivan
|
||||||
|
house fire wolverhampton
|
||||||
|
paul merson
|
||||||
|
is scarlett moffatt pregnant
|
||||||
|
man city fixtures
|
||||||
|
scarlets vs bulls
|
||||||
|
bankruptcy
|
||||||
|
monaco fc
|
||||||
|
jaqueline cristian
|
||||||
|
stock market
|
||||||
|
napoli
|
||||||
|
alex de minaur
|
||||||
|
tigers vs hull fc
|
||||||
|
edinburgh vs sharks
|
||||||
|
mark williams snooker
|
||||||
|
criminal record
|
||||||
|
alex sinclair israeli police detention
|
||||||
|
st. johnstone vs raith rovers
|
||||||
|
mo farah
|
||||||
|
newcastle vs bristol
|
||||||
|
tbilisi
|
||||||
|
connor storrie
|
||||||
|
georgia
|
||||||
|
stephen bunting
|
||||||
|
great british menu 2026
|
||||||
|
ravi eastenders
|
||||||
|
salford city fc
|
||||||
|
national grid
|
||||||
|
mass effect
|
||||||
|
salford city vs bromley
|
||||||
|
real salt lake vs inter miami
|
||||||
|
provinces of the pantheon
|
||||||
|
mls
|
||||||
|
russell brand
|
||||||
|
john phelan
|
||||||
|
hung cao
|
||||||
|
pistons vs magic
|
||||||
|
jerry bruckheimer
|
||||||
|
st. george's day
|
||||||
|
asiago
|
||||||
|
framework laptop 13 pro
|
||||||
|
boro
|
||||||
|
interactive investor
|
||||||
|
mint
|
||||||
|
believe me itv
|
||||||
|
amanda bynes
|
||||||
|
strasbourg vs nice
|
||||||
|
chase bank
|
||||||
|
jak jones
|
||||||
|
chase
|
||||||
|
rodri
|
||||||
|
christopher trybus
|
||||||
|
lsg vs rr
|
||||||
|
pension
|
||||||
|
hebden bridge
|
||||||
|
sandra bullock practical magic
|
||||||
|
rolls-royce share price drop
|
||||||
|
invincible season 5
|
||||||
|
josé mourinho
|
||||||
|
chris wakelin
|
||||||
|
jimmy bullard adam thomas
|
||||||
|
aer lingus flight cancellations
|
||||||
|
sam west
|
||||||
|
oxford united
|
||||||
|
liam delap
|
||||||
|
wba
|
||||||
|
реал мадрид – алавес
|
||||||
|
coppa italia
|
||||||
|
girona vs real betis
|
||||||
|
marcus rashford
|
||||||
|
الريال ضد ألافيس
|
||||||
|
supreme leader of iran
|
||||||
oscar isaac
|
oscar isaac
|
||||||
xrp ledger
|
xrp ledger
|
||||||
believe me itv
|
|
||||||
pablo
|
pablo
|
||||||
is tane leaving home and away
|
is tane leaving home and away
|
||||||
julie andrews
|
julie andrews
|
||||||
|
|||||||
@@ -1,3 +1,78 @@
|
|||||||
|
hurricanes vs senators
|
||||||
|
jalen duren
|
||||||
|
keegan akin
|
||||||
|
billy schrauth
|
||||||
|
caleb durbin
|
||||||
|
thunder vs suns
|
||||||
|
max bredeson
|
||||||
|
wednesday, season 3
|
||||||
|
demonte capehart
|
||||||
|
karoline leavitt maternity leave
|
||||||
|
alex de minaur
|
||||||
|
rafael jodar
|
||||||
|
adam levine face
|
||||||
|
howard frankland bridge
|
||||||
|
vibrio vulnificus new york waters
|
||||||
|
stade brestois - lens
|
||||||
|
moustapha thiam
|
||||||
|
us asylum seeker border reopening
|
||||||
|
sunderland vs nottm forest
|
||||||
|
leicester city vs millwall
|
||||||
|
brandon marsh
|
||||||
|
psv vs pec zwolle
|
||||||
|
daniel merida aguilar
|
||||||
|
william byron
|
||||||
|
eve plumb
|
||||||
|
mall of louisiana
|
||||||
|
real oviedo vs villarreal
|
||||||
|
real oviedo - villarreal
|
||||||
|
call of duty: black ops 7
|
||||||
|
tarik skubal
|
||||||
|
cubs game today
|
||||||
|
mike repole
|
||||||
|
okc thunder
|
||||||
|
atlanta braves
|
||||||
|
mlb scores today
|
||||||
|
braves standings
|
||||||
|
kevin mckidd
|
||||||
|
dan vladar
|
||||||
|
mls standings
|
||||||
|
dodgers - giants
|
||||||
|
jon ossoff
|
||||||
|
ozzy survivor
|
||||||
|
braves score
|
||||||
|
washington nationals
|
||||||
|
alex bregman
|
||||||
|
peter lambert
|
||||||
|
darrell sheets
|
||||||
|
ludwig kaiser
|
||||||
|
edina shooting
|
||||||
|
atalanta - lazio
|
||||||
|
barcelona vs celta vigo
|
||||||
|
rivian r2
|
||||||
|
pick 4
|
||||||
|
aoc
|
||||||
|
cleveland browns
|
||||||
|
nintendo switch gamecube games
|
||||||
|
lsg vs rr
|
||||||
|
spirit
|
||||||
|
atlanta fire
|
||||||
|
deshaun watson
|
||||||
|
good morning america
|
||||||
|
pittsburgh
|
||||||
|
strands answers
|
||||||
|
scientist
|
||||||
|
mark cuban pharmacy
|
||||||
|
inter milan
|
||||||
|
lens vs toulouse
|
||||||
|
david james
|
||||||
|
andy weir
|
||||||
|
noah kahan tiny desk concert
|
||||||
|
jennifer garner 54th birthday photos
|
||||||
|
troy baker
|
||||||
|
real madrid - alavés
|
||||||
|
girona - real betis
|
||||||
|
girona vs real betis
|
||||||
arc raiders
|
arc raiders
|
||||||
schd etf dividend yield
|
schd etf dividend yield
|
||||||
deportación
|
deportación
|
||||||
|
|||||||
@@ -1,3 +1,76 @@
|
|||||||
|
atlético madrid đấu với ath. bilbao
|
||||||
|
erling haaland
|
||||||
|
lịch thi đấu man city
|
||||||
|
toulouse đấu với monaco
|
||||||
|
mc vs
|
||||||
|
đông anh
|
||||||
|
al ahli
|
||||||
|
man city
|
||||||
|
chung cư
|
||||||
|
mật ngữ kỷ
|
||||||
|
napoli
|
||||||
|
sunderland đấu với nottm forest
|
||||||
|
betis đấu với real madrid
|
||||||
|
napoli đấu với cremonese
|
||||||
|
leipzig đấu với union berlin
|
||||||
|
sunderland
|
||||||
|
mẫu iphone 18
|
||||||
|
oppo find x9 ultra
|
||||||
|
xem phim
|
||||||
|
andoni iraola
|
||||||
|
stuttgart đấu với freiburg
|
||||||
|
levante – sevilla
|
||||||
|
giao dịch tài chính
|
||||||
|
sevilla
|
||||||
|
rayo đấu với espanyol
|
||||||
|
levante đấu với sevilla
|
||||||
|
bong ma hanh phuc
|
||||||
|
aryna sabalenka
|
||||||
|
mason nguyễn
|
||||||
|
marcus rashford
|
||||||
|
hà nội
|
||||||
|
salt lake đấu với inter miami
|
||||||
|
hung cao
|
||||||
|
neymar
|
||||||
|
cầu phú mỹ
|
||||||
|
nhac
|
||||||
|
wordle
|
||||||
|
날씨
|
||||||
|
giá cà phê hôm nay
|
||||||
|
premier league standings
|
||||||
|
mls
|
||||||
|
phạm nhật vượng
|
||||||
|
cristiano roland
|
||||||
|
burnley vs man city
|
||||||
|
bayern munich
|
||||||
|
atalanta đấu với lazio
|
||||||
|
barcelona đấu với celta
|
||||||
|
psg – nantes
|
||||||
|
leverkusen đấu với bayern
|
||||||
|
elche – atlético madrid
|
||||||
|
bryan mbeumo
|
||||||
|
al nasr
|
||||||
|
trực tiếp bóng đá hôm nay
|
||||||
|
vtv3
|
||||||
|
vtv3 trực tiếp
|
||||||
|
tv
|
||||||
|
vtv
|
||||||
|
vtv6
|
||||||
|
360
|
||||||
|
lê khánh
|
||||||
|
ô tô
|
||||||
|
lê phương
|
||||||
|
trực tiếp bóng đá u17 hôm nay
|
||||||
|
inter milan
|
||||||
|
chelsea
|
||||||
|
girona đấu với betis
|
||||||
|
real madrid đấu với alavés
|
||||||
|
brighton vs chelsea
|
||||||
|
brighton đấu với chelsea
|
||||||
|
ath. bilbao đấu với osasuna
|
||||||
|
pep guardiola
|
||||||
|
zelvia đấu với shabab al-ahli
|
||||||
|
cầu thủ
|
||||||
lecce vs fiorentina
|
lecce vs fiorentina
|
||||||
fiorentina
|
fiorentina
|
||||||
crystal palace đấu với west ham
|
crystal palace đấu với west ham
|
||||||
@@ -13,7 +86,6 @@ psg vs lyon
|
|||||||
ca sĩ
|
ca sĩ
|
||||||
juventus đấu với bologna
|
juventus đấu với bologna
|
||||||
gladbach đấu với mainz
|
gladbach đấu với mainz
|
||||||
bayern munich
|
|
||||||
twitch
|
twitch
|
||||||
psg đấu với lyon
|
psg đấu với lyon
|
||||||
juventus
|
juventus
|
||||||
@@ -26,7 +98,6 @@ epl
|
|||||||
iem rio 2026
|
iem rio 2026
|
||||||
tot
|
tot
|
||||||
tập đoàn gelex
|
tập đoàn gelex
|
||||||
napoli
|
|
||||||
đường ray
|
đường ray
|
||||||
inter
|
inter
|
||||||
inter đấu với cagliari
|
inter đấu với cagliari
|
||||||
@@ -37,7 +108,6 @@ fenerbahçe đấu với rizespor
|
|||||||
como
|
como
|
||||||
como vs
|
como vs
|
||||||
thẻ đỏ
|
thẻ đỏ
|
||||||
al ahli
|
|
||||||
porto vs
|
porto vs
|
||||||
crystal palace
|
crystal palace
|
||||||
porto
|
porto
|
||||||
@@ -67,7 +137,6 @@ sun group
|
|||||||
hưng yên
|
hưng yên
|
||||||
nvl
|
nvl
|
||||||
américa đấu với nashville
|
américa đấu với nashville
|
||||||
neymar
|
|
||||||
VnExpress
|
VnExpress
|
||||||
Zing News
|
Zing News
|
||||||
Thời tiết Hà Nội
|
Thời tiết Hà Nội
|
||||||
|
|||||||
224
data/map.json
224
data/map.json
@@ -11,7 +11,16 @@
|
|||||||
"name": "Japan (日本)",
|
"name": "Japan (日本)",
|
||||||
"keyword_file": "kw_JP.txt",
|
"keyword_file": "kw_JP.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Tokyo", "name": "Tokyo (东京)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Tokyo",
|
||||||
|
"name": "Tokyo (东京)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -19,7 +28,16 @@
|
|||||||
"name": "Singapore (新加坡)",
|
"name": "Singapore (新加坡)",
|
||||||
"keyword_file": "kw_SG.txt",
|
"keyword_file": "kw_SG.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Singapore", "name": "Singapore (新加坡)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Singapore",
|
||||||
|
"name": "Singapore (新加坡)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -27,7 +45,16 @@
|
|||||||
"name": "South Korea (韩国)",
|
"name": "South Korea (韩国)",
|
||||||
"keyword_file": "kw_KR.txt",
|
"keyword_file": "kw_KR.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Seoul", "name": "Seoul (首尔)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Seoul",
|
||||||
|
"name": "Seoul (首尔)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -35,7 +62,16 @@
|
|||||||
"name": "Hong Kong (香港)",
|
"name": "Hong Kong (香港)",
|
||||||
"keyword_file": "kw_HK.txt",
|
"keyword_file": "kw_HK.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "HongKong", "name": "Hong Kong (香港)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "HongKong",
|
||||||
|
"name": "Hong Kong (香港)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -43,7 +79,16 @@
|
|||||||
"name": "Vietnam (越南)",
|
"name": "Vietnam (越南)",
|
||||||
"keyword_file": "kw_VN.txt",
|
"keyword_file": "kw_VN.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Hanoi", "name": "Hanoi (河内)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Hanoi",
|
||||||
|
"name": "Hanoi (河内)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -51,7 +96,33 @@
|
|||||||
"name": "Taiwan (台湾)",
|
"name": "Taiwan (台湾)",
|
||||||
"keyword_file": "kw_TW.txt",
|
"keyword_file": "kw_TW.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Taipei", "name": "Taipei (台北)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Taipei",
|
||||||
|
"name": "Taipei (台北)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "MY",
|
||||||
|
"name": "Malaysia (马来西亚)",
|
||||||
|
"keyword_file": "kw_MY.txt",
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Kuala_Lumpur",
|
||||||
|
"name": "Kuala Lumpur (吉隆坡)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -69,8 +140,14 @@
|
|||||||
"id": "Default",
|
"id": "Default",
|
||||||
"name": "Default State",
|
"name": "Default State",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "London", "name": "London (伦敦)" },
|
{
|
||||||
{ "id": "Coventry", "name": "Coventry (考文垂)" }
|
"id": "London",
|
||||||
|
"name": "London (伦敦)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "Coventry",
|
||||||
|
"name": "Coventry (考文垂)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -80,7 +157,16 @@
|
|||||||
"name": "Germany (德国)",
|
"name": "Germany (德国)",
|
||||||
"keyword_file": "kw_DE.txt",
|
"keyword_file": "kw_DE.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Frankfurt", "name": "Frankfurt (法兰克福)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Frankfurt",
|
||||||
|
"name": "Frankfurt (法兰克福)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -88,7 +174,16 @@
|
|||||||
"name": "France (法国)",
|
"name": "France (法国)",
|
||||||
"keyword_file": "kw_FR.txt",
|
"keyword_file": "kw_FR.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Paris", "name": "Paris (巴黎)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Paris",
|
||||||
|
"name": "Paris (巴黎)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -96,7 +191,16 @@
|
|||||||
"name": "Netherlands (荷兰)",
|
"name": "Netherlands (荷兰)",
|
||||||
"keyword_file": "kw_NL.txt",
|
"keyword_file": "kw_NL.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Amsterdam", "name": "Amsterdam (阿姆斯特丹)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Amsterdam",
|
||||||
|
"name": "Amsterdam (阿姆斯特丹)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -104,7 +208,16 @@
|
|||||||
"name": "Spain (西班牙)",
|
"name": "Spain (西班牙)",
|
||||||
"keyword_file": "kw_ES.txt",
|
"keyword_file": "kw_ES.txt",
|
||||||
"states": [
|
"states": [
|
||||||
{ "id": "Default", "name": "Default State", "cities": [ { "id": "Madrid", "name": "Madrid (马德里)" } ] }
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Madrid",
|
||||||
|
"name": "Madrid (马德里)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -122,50 +235,84 @@
|
|||||||
"id": "CA",
|
"id": "CA",
|
||||||
"name": "California (加州)",
|
"name": "California (加州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Los_Angeles", "name": "Los Angeles (洛杉矶)" },
|
{
|
||||||
{ "id": "San_Jose", "name": "San Jose (圣何塞)" }
|
"id": "Los_Angeles",
|
||||||
|
"name": "Los Angeles (洛杉矶)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "San_Jose",
|
||||||
|
"name": "San Jose (圣何塞)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "IL",
|
"id": "IL",
|
||||||
"name": "Illinois (伊利诺伊州)",
|
"name": "Illinois (伊利诺伊州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Warrenville", "name": "Warrenville (沃伦维尔)" }
|
{
|
||||||
|
"id": "Warrenville",
|
||||||
|
"name": "Warrenville (沃伦维尔)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "NC",
|
"id": "NC",
|
||||||
"name": "North Carolina (北卡罗来纳州)",
|
"name": "North Carolina (北卡罗来纳州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Charlotte", "name": "Charlotte (夏洛特)" }
|
{
|
||||||
|
"id": "Charlotte",
|
||||||
|
"name": "Charlotte (夏洛特)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "NV",
|
"id": "NV",
|
||||||
"name": "Nevada (内华达州)",
|
"name": "Nevada (内华达州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Las_Vegas", "name": "Las Vegas (拉斯维加斯)" }
|
{
|
||||||
|
"id": "Las_Vegas",
|
||||||
|
"name": "Las Vegas (拉斯维加斯)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "OR",
|
"id": "OR",
|
||||||
"name": "Oregon (俄勒冈州)",
|
"name": "Oregon (俄勒冈州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Bend", "name": "Bend (本德)" }
|
{
|
||||||
|
"id": "Bend",
|
||||||
|
"name": "Bend (本德)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "UT",
|
"id": "UT",
|
||||||
"name": "Utah (犹他州)",
|
"name": "Utah (犹他州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Salt_Lake_City", "name": "Salt Lake City (盐湖城)" }
|
{
|
||||||
|
"id": "Salt_Lake_City",
|
||||||
|
"name": "Salt Lake City (盐湖城)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "WA",
|
"id": "WA",
|
||||||
"name": "Washington (华盛顿州)",
|
"name": "Washington (华盛顿州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Seattle", "name": "Seattle (西雅图)" }
|
{
|
||||||
|
"id": "Seattle",
|
||||||
|
"name": "Seattle (西雅图)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "TX",
|
||||||
|
"name": "Texas (得克萨斯州)",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Dallas",
|
||||||
|
"name": "Dallas (达拉斯)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -179,8 +326,14 @@
|
|||||||
"id": "Default",
|
"id": "Default",
|
||||||
"name": "Default State",
|
"name": "Default State",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Toronto", "name": "Toronto (多伦多)" },
|
{
|
||||||
{ "id": "Montreal", "name": "Montreal (蒙特利尔)" }
|
"id": "Toronto",
|
||||||
|
"name": "Toronto (多伦多)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "Montreal",
|
||||||
|
"name": "Montreal (蒙特利尔)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -200,35 +353,50 @@
|
|||||||
"id": "NSW",
|
"id": "NSW",
|
||||||
"name": "New South Wales (新南威尔士州)",
|
"name": "New South Wales (新南威尔士州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Sydney", "name": "Sydney (悉尼)" }
|
{
|
||||||
|
"id": "Sydney",
|
||||||
|
"name": "Sydney (悉尼)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "VIC",
|
"id": "VIC",
|
||||||
"name": "Victoria (维多利亚州)",
|
"name": "Victoria (维多利亚州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Melbourne", "name": "Melbourne (墨尔本)" }
|
{
|
||||||
|
"id": "Melbourne",
|
||||||
|
"name": "Melbourne (墨尔本)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "QLD",
|
"id": "QLD",
|
||||||
"name": "Queensland (昆士兰州)",
|
"name": "Queensland (昆士兰州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Brisbane", "name": "Brisbane (布里斯班)" }
|
{
|
||||||
|
"id": "Brisbane",
|
||||||
|
"name": "Brisbane (布里斯班)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "WA",
|
"id": "WA",
|
||||||
"name": "Western Australia (西澳大利亚州)",
|
"name": "Western Australia (西澳大利亚州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Perth", "name": "Perth (珀斯)" }
|
{
|
||||||
|
"id": "Perth",
|
||||||
|
"name": "Perth (珀斯)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "SA",
|
"id": "SA",
|
||||||
"name": "South Australia (南澳大利亚州)",
|
"name": "South Australia (南澳大利亚州)",
|
||||||
"cities": [
|
"cities": [
|
||||||
{ "id": "Adelaide", "name": "Adelaide (阿德莱德)" }
|
{
|
||||||
|
"id": "Adelaide",
|
||||||
|
"name": "Adelaide (阿德莱德)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -236,4 +404,4 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -8,28 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.abc.net.au/news/2026-04-25/anzac-day-nrl-dragons-roosters-warriors-dolphins-storm-rabbitohs/106591510",
|
||||||
"https://www.smh.com.au/",
|
"https://www.seek.com.au/",
|
||||||
"https://www.dailytelegraph.com.au/",
|
|
||||||
"https://www.service.nsw.gov.au/",
|
|
||||||
"https://transportnsw.info/",
|
|
||||||
"https://www.bom.gov.au/",
|
|
||||||
"https://www.woolworths.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/melbourne-cbd-bar-bambi-arson-attack/106606312",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/prince-harry-and-meghan-australia-trip-king-charles-us/106596286",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/narco-subs-crossing-the-pacific-to-australia/106588936",
|
||||||
"https://www.coles.com.au/",
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.abc.net.au/news/health/2026-04-26/surf-coach-blake-johnston-turns-grief-into-post-traumatic-growth/106421100",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nt-anzac-day-big-picture-australians/106603252",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/guy-montgomery-spelling-bee-quiz/106593668",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/ken-henry-tells-inquiry-to-tax-australia-gas-industry-more/106591686",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nsw-panania-childcare-worker-charged-with-assaulting-two-boys/106606424",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/dutch-remember-allied-forces-buried-during-ww2/106582854",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/australian-olympian-gordon-ingate-dies-aged-100/106606892",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/inman-valley-body-valley-murder/106606080",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/racism-against-indigenous-people-on-show-anzac-booing-incidents/106606650",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sex-workers-speak-out-about-hiv-crisis-in-png/106592882",
|
||||||
"https://www.bunnings.com.au/",
|
"https://www.bunnings.com.au/",
|
||||||
"https://www.abc.net.au/",
|
"https://www.abc.net.au/news/2026-04-25/russian-attack-ukrain-dnipro-apartment-block/106606822"
|
||||||
"https://www.news.com.au/",
|
],
|
||||||
"https://www.nine.com.au/",
|
"static_urls": [
|
||||||
"https://my.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.ato.gov.au/",
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
"https://www.commbank.com.au/",
|
"https://www.commbank.com.au/",
|
||||||
"https://www.westpac.com.au/",
|
|
||||||
"https://www.realestate.com.au/",
|
|
||||||
"https://www.domain.com.au/",
|
|
||||||
"https://www.seek.com.au/",
|
"https://www.seek.com.au/",
|
||||||
"https://www.nrl.com/",
|
"https://www.realestate.com.au/",
|
||||||
"https://premier.ticketek.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.amazon.com.au/"
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,29 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.abc.net.au/news/2026-04-25/nsw-panania-childcare-worker-charged-with-assaulting-two-boys/106606424",
|
||||||
"https://www.couriermail.com.au/",
|
"https://www.abc.net.au/news/2026-04-26/ken-henry-tells-inquiry-to-tax-australia-gas-industry-more/106591686",
|
||||||
"https://www.brisbanetimes.com.au/",
|
"https://www.abc.net.au/news/2026-04-25/nt-anzac-day-big-picture-australians/106603252",
|
||||||
"https://www.qld.gov.au/",
|
"https://www.abc.net.au/news/2026-04-26/guy-montgomery-spelling-bee-quiz/106593668",
|
||||||
"https://translink.com.au/",
|
|
||||||
"https://www.health.qld.gov.au/",
|
|
||||||
"https://www.bom.gov.au/",
|
|
||||||
"https://www.bunnings.com.au/",
|
|
||||||
"https://www.woolworths.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/health/2026-04-26/surf-coach-blake-johnston-turns-grief-into-post-traumatic-growth/106421100",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/prince-harry-and-meghan-australia-trip-king-charles-us/106596286",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/australian-olympian-gordon-ingate-dies-aged-100/106606892",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/inman-valley-body-valley-murder/106606080",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/narco-subs-crossing-the-pacific-to-australia/106588936",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/racism-against-indigenous-people-on-show-anzac-booing-incidents/106606650",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/anzac-day-nrl-dragons-roosters-warriors-dolphins-storm-rabbitohs/106591510",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/dutch-remember-allied-forces-buried-during-ww2/106582854",
|
||||||
"https://www.coles.com.au/",
|
"https://www.coles.com.au/",
|
||||||
"https://www.abc.net.au/",
|
"https://www.commbank.com.au/",
|
||||||
"https://www.news.com.au/",
|
"https://www.abc.net.au/news/2026-04-25/russian-attack-ukrain-dnipro-apartment-block/106606822",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sex-workers-speak-out-about-hiv-crisis-in-png/106592882",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/melbourne-cbd-bar-bambi-arson-attack/106606312"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
"https://my.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.ato.gov.au/",
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
"https://www.commbank.com.au/",
|
"https://www.commbank.com.au/",
|
||||||
"https://www.suncorp.com.au/",
|
|
||||||
"https://www.boq.com.au/",
|
|
||||||
"https://www.realestate.com.au/",
|
|
||||||
"https://www.domain.com.au/",
|
|
||||||
"https://www.seek.com.au/",
|
"https://www.seek.com.au/",
|
||||||
"https://www.nrl.com/",
|
"https://www.realestate.com.au/",
|
||||||
"https://premier.ticketek.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.amazon.com.au/"
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,28 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.abc.net.au/news/2026-04-25/melbourne-cbd-bar-bambi-arson-attack/106606312",
|
||||||
"https://www.adelaidenow.com.au/",
|
"https://www.abc.net.au/news/2026-04-26/dutch-remember-allied-forces-buried-during-ww2/106582854",
|
||||||
"https://indaily.com.au/",
|
"https://www.abc.net.au/news/2026-04-26/sex-workers-speak-out-about-hiv-crisis-in-png/106592882",
|
||||||
"https://www.sa.gov.au/",
|
"https://www.abc.net.au/news/2026-04-26/australian-olympian-gordon-ingate-dies-aged-100/106606892",
|
||||||
"https://www.adelaidemetro.com.au/",
|
|
||||||
"https://www.sapowernetworks.com.au/",
|
|
||||||
"https://www.bom.gov.au/",
|
"https://www.bom.gov.au/",
|
||||||
"https://www.bunnings.com.au/",
|
|
||||||
"https://www.coles.com.au/",
|
"https://www.coles.com.au/",
|
||||||
"https://www.woolworths.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.abc.net.au/",
|
"https://www.commbank.com.au/",
|
||||||
"https://www.news.com.au/",
|
"https://www.abc.net.au/news/2026-04-26/narco-subs-crossing-the-pacific-to-australia/106588936",
|
||||||
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/inman-valley-body-valley-murder/106606080",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/anzac-day-nrl-dragons-roosters-warriors-dolphins-storm-rabbitohs/106591510",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/guy-montgomery-spelling-bee-quiz/106593668",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/racism-against-indigenous-people-on-show-anzac-booing-incidents/106606650",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/prince-harry-and-meghan-australia-trip-king-charles-us/106596286",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nsw-panania-childcare-worker-charged-with-assaulting-two-boys/106606424",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nt-anzac-day-big-picture-australians/106603252",
|
||||||
|
"https://www.abc.net.au/news/health/2026-04-26/surf-coach-blake-johnston-turns-grief-into-post-traumatic-growth/106421100",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/ken-henry-tells-inquiry-to-tax-australia-gas-industry-more/106591686",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/russian-attack-ukrain-dnipro-apartment-block/106606822"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
"https://my.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.ato.gov.au/",
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
"https://www.commbank.com.au/",
|
"https://www.commbank.com.au/",
|
||||||
"https://www.bendigobank.com.au/",
|
|
||||||
"https://www.realestate.com.au/",
|
|
||||||
"https://www.domain.com.au/",
|
|
||||||
"https://www.seek.com.au/",
|
"https://www.seek.com.au/",
|
||||||
"https://www.afl.com.au/",
|
"https://www.realestate.com.au/",
|
||||||
"https://premier.ticketek.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.amazon.com.au/"
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,28 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.abc.net.au/news/2026-04-26/australian-olympian-gordon-ingate-dies-aged-100/106606892",
|
||||||
"https://www.theage.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.heraldsun.com.au/",
|
"https://www.abc.net.au/news/2026-04-25/russian-attack-ukrain-dnipro-apartment-block/106606822",
|
||||||
"https://www.vic.gov.au/",
|
"https://www.seek.com.au/",
|
||||||
"https://www.ptv.vic.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.vicroads.vic.gov.au/",
|
"https://www.abc.net.au/news/2026-04-25/anzac-day-nrl-dragons-roosters-warriors-dolphins-storm-rabbitohs/106591510",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/inman-valley-body-valley-murder/106606080",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/dutch-remember-allied-forces-buried-during-ww2/106582854",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/ken-henry-tells-inquiry-to-tax-australia-gas-industry-more/106591686",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/narco-subs-crossing-the-pacific-to-australia/106588936",
|
||||||
"https://www.bom.gov.au/",
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/prince-harry-and-meghan-australia-trip-king-charles-us/106596286",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
"https://www.bunnings.com.au/",
|
"https://www.bunnings.com.au/",
|
||||||
"https://www.kmart.com.au/",
|
"https://www.ato.gov.au/",
|
||||||
"https://www.abc.net.au/",
|
"https://www.abc.net.au/news/2026-04-26/sex-workers-speak-out-about-hiv-crisis-in-png/106592882",
|
||||||
"https://www.news.com.au/",
|
"https://www.abc.net.au/news/2026-04-25/melbourne-cbd-bar-bambi-arson-attack/106606312",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nsw-panania-childcare-worker-charged-with-assaulting-two-boys/106606424",
|
||||||
|
"https://www.abc.net.au/news/health/2026-04-26/surf-coach-blake-johnston-turns-grief-into-post-traumatic-growth/106421100",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nt-anzac-day-big-picture-australians/106603252",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/guy-montgomery-spelling-bee-quiz/106593668",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/racism-against-indigenous-people-on-show-anzac-booing-incidents/106606650"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
"https://my.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.ato.gov.au/",
|
"https://www.ato.gov.au/",
|
||||||
"https://www.nab.com.au/",
|
"https://www.bom.gov.au/",
|
||||||
"https://www.anz.com.au/",
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
"https://www.woolworths.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.coles.com.au/",
|
"https://www.coles.com.au/",
|
||||||
"https://www.realestate.com.au/",
|
"https://www.amazon.com.au/",
|
||||||
"https://www.seek.com.au/",
|
"https://www.bunnings.com.au/"
|
||||||
"https://www.afl.com.au/",
|
|
||||||
"https://www.ticketmaster.com.au/",
|
|
||||||
"https://www.amazon.com.au/"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,28 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.abc.net.au/news/2026-04-25/russian-attack-ukrain-dnipro-apartment-block/106606822",
|
||||||
"https://thewest.com.au/",
|
"https://www.ato.gov.au/",
|
||||||
"https://www.perthnow.com.au/",
|
"https://www.abc.net.au/news/health/2026-04-26/surf-coach-blake-johnston-turns-grief-into-post-traumatic-growth/106421100",
|
||||||
"https://www.wa.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.transperth.wa.gov.au/",
|
|
||||||
"https://www.bom.gov.au/",
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/prince-harry-and-meghan-australia-trip-king-charles-us/106596286",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
"https://www.bunnings.com.au/",
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/australian-olympian-gordon-ingate-dies-aged-100/106606892",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/anzac-day-nrl-dragons-roosters-warriors-dolphins-storm-rabbitohs/106591510",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/dutch-remember-allied-forces-buried-during-ww2/106582854",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sex-workers-speak-out-about-hiv-crisis-in-png/106592882",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/racism-against-indigenous-people-on-show-anzac-booing-incidents/106606650",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/ken-henry-tells-inquiry-to-tax-australia-gas-industry-more/106591686",
|
||||||
"https://www.coles.com.au/",
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/nt-anzac-day-big-picture-australians/106603252",
|
||||||
"https://www.woolworths.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.kmart.com.au/",
|
"https://www.abc.net.au/news/2026-04-25/nsw-panania-childcare-worker-charged-with-assaulting-two-boys/106606424",
|
||||||
"https://www.abc.net.au/",
|
"https://www.abc.net.au/news/2026-04-25/inman-valley-body-valley-murder/106606080",
|
||||||
"https://www.news.com.au/",
|
"https://www.abc.net.au/news/2026-04-26/narco-subs-crossing-the-pacific-to-australia/106588936",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/guy-montgomery-spelling-bee-quiz/106593668",
|
||||||
|
"https://www.abc.net.au/news/2026-04-25/melbourne-cbd-bar-bambi-arson-attack/106606312"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
"https://my.gov.au/",
|
"https://my.gov.au/",
|
||||||
"https://www.ato.gov.au/",
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
"https://www.commbank.com.au/",
|
"https://www.commbank.com.au/",
|
||||||
"https://www.bankwest.com.au/",
|
|
||||||
"https://reiwa.com.au/",
|
|
||||||
"https://www.realestate.com.au/",
|
|
||||||
"https://www.seek.com.au/",
|
"https://www.seek.com.au/",
|
||||||
"https://www.afl.com.au/",
|
"https://www.realestate.com.au/",
|
||||||
"https://premier.ticketek.com.au/",
|
"https://www.woolworths.com.au/",
|
||||||
"https://www.amazon.com.au/"
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,10 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.cbc.ca/news/politics/lithuania-canada-economic-warfare-trade-9.7176557?cmp=rss",
|
||||||
"https://www.cbc.ca/",
|
"https://www.cbc.ca/news/canada/edmonton/edmonton-oilers-anaheim-ducks-game-three-playoffs-9.7176599?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/world/china-taiwan-african-countries-airspace-9.7174770?cmp=rss",
|
||||||
|
"https://www.amazon.ca/",
|
||||||
|
"https://www.cbc.ca/news/canada/edmonton/snowstorm-alberta-fort-mcmurray-highway-closed-stranded-drivers-9.7176489?cmp=rss",
|
||||||
|
"https://www.theweathernetwork.com/ca",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/majcher-trial-ends-submissions-9.7176445?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/humboldt-broncos-crash-driver-deportation-court-9.7177025?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/world/russia-attack-ukraine-dnipro-9.7177273?cmp=rss",
|
||||||
|
"https://www.rbcroyalbank.com/",
|
||||||
|
"https://www.cbc.ca/news/canada/north/arviat-inuit-nunangat-university-9.7177278?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/entertainment/kirk-jones-i-swear-interview-tourette-syndrome-baftas-9.7176725?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/world/trump-white-house-correspondents-association-dinner-9.7174984?cmp=rss",
|
||||||
|
"https://www.cra-arc.gc.ca/",
|
||||||
|
"https://www.cbc.ca/news/canada/newfoundland-labrador/innu-inquiry-commissioners-have-one-word-after-week-of-heavy-testimony-hope-9.7176436?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/alberta-separatist-youtube-channels-netherlands-9.7174719?cmp=rss",
|
||||||
|
"https://www.cbc.ca/radio/asithappens/steak-canadian-9.7176475?cmp=rss",
|
||||||
|
"https://www.canada.ca/en.html",
|
||||||
|
"https://www.utoronto.ca/",
|
||||||
|
"https://www.td.com/",
|
||||||
|
"https://www.cbc.ca/player/play/9.7176908?cmp=rss",
|
||||||
|
"https://www.canadapost-postescanada.ca/",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/sam-altman-tumbler-ridge-apology-9.7176482?cmp=rss"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.canada.ca/en.html",
|
||||||
|
"https://www.cra-arc.gc.ca/",
|
||||||
|
"https://www.canadapost-postescanada.ca/",
|
||||||
|
"https://www.utoronto.ca/",
|
||||||
|
"https://www.td.com/",
|
||||||
|
"https://www.rbcroyalbank.com/",
|
||||||
"https://www.amazon.ca/",
|
"https://www.amazon.ca/",
|
||||||
"https://www.theweathernetwork.com/ca"
|
"https://www.theweathernetwork.com/ca"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.cbc.ca/news/world/russia-attack-ukraine-dnipro-9.7177273?cmp=rss",
|
||||||
"https://www.canada.ca/en.html",
|
"https://www.cbc.ca/news/world/trump-white-house-correspondents-association-dinner-9.7174984?cmp=rss",
|
||||||
"https://www.cbc.ca/",
|
"https://www.utoronto.ca/",
|
||||||
"https://www.thestar.com/",
|
"https://www.cra-arc.gc.ca/",
|
||||||
"https://www.ctvnews.ca/",
|
"https://www.cbc.ca/news/canada/edmonton/snowstorm-alberta-fort-mcmurray-highway-closed-stranded-drivers-9.7176489?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/newfoundland-labrador/innu-inquiry-commissioners-have-one-word-after-week-of-heavy-testimony-hope-9.7176436?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/politics/lithuania-canada-economic-warfare-trade-9.7176557?cmp=rss",
|
||||||
|
"https://www.rbcroyalbank.com/",
|
||||||
|
"https://www.cbc.ca/news/canada/north/arviat-inuit-nunangat-university-9.7177278?cmp=rss",
|
||||||
|
"https://www.cbc.ca/player/play/9.7176908?cmp=rss",
|
||||||
|
"https://www.amazon.ca/",
|
||||||
|
"https://www.cbc.ca/news/world/china-taiwan-african-countries-airspace-9.7174770?cmp=rss",
|
||||||
|
"https://www.theweathernetwork.com/ca",
|
||||||
"https://www.canadapost-postescanada.ca/",
|
"https://www.canadapost-postescanada.ca/",
|
||||||
|
"https://www.cbc.ca/news/canada/humboldt-broncos-crash-driver-deportation-court-9.7177025?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/alberta-separatist-youtube-channels-netherlands-9.7174719?cmp=rss",
|
||||||
|
"https://www.canada.ca/en.html",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/sam-altman-tumbler-ridge-apology-9.7176482?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/edmonton/edmonton-oilers-anaheim-ducks-game-three-playoffs-9.7176599?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/entertainment/kirk-jones-i-swear-interview-tourette-syndrome-baftas-9.7176725?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/majcher-trial-ends-submissions-9.7176445?cmp=rss",
|
||||||
|
"https://www.cbc.ca/radio/asithappens/steak-canadian-9.7176475?cmp=rss",
|
||||||
"https://www.td.com/"
|
"https://www.td.com/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.canada.ca/en.html",
|
||||||
|
"https://www.cra-arc.gc.ca/",
|
||||||
|
"https://www.canadapost-postescanada.ca/",
|
||||||
|
"https://www.utoronto.ca/",
|
||||||
|
"https://www.td.com/",
|
||||||
|
"https://www.rbcroyalbank.com/",
|
||||||
|
"https://www.amazon.ca/",
|
||||||
|
"https://www.theweathernetwork.com/ca"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
|
"https://www.tagesschau.de/ausland/europa/eu-gipfel-zypern-iran-krieg-ukraine-100.html",
|
||||||
|
"https://www.sparkasse.de/",
|
||||||
|
"https://www.bundesregierung.de/",
|
||||||
|
"https://www.tagesschau.de/wirtschaft/verbraucher/spritpreise-tanken-102.html",
|
||||||
|
"https://www.tagesschau.de/ausland/amerika/todesstrafe-usa-erschiessung-100.html",
|
||||||
|
"https://www.tagesschau.de/inland/innenpolitik/merz-rente-rede-100.html",
|
||||||
|
"https://www.tagesschau.de/ausland/asien/iran-krieg-verhandlungen-islamabad-usa-pakistan-100.html",
|
||||||
|
"https://www.tagesschau.de/wissen/klimakonferenz-kolumbien-100.html",
|
||||||
"https://www.amazon.de/",
|
"https://www.amazon.de/",
|
||||||
|
"https://www.tagesschau.de/wirtschaft/verbraucher/hausverwaltung-immobilie-betrug-100.html",
|
||||||
|
"https://www.tum.de/",
|
||||||
|
"https://www.tagesschau.de/ausland/asien/kommunalwahl-westjordanland-100.html",
|
||||||
|
"https://www.tagesschau.de/wirtschaft/balkon-sanierung-bgh-urteil-100.html",
|
||||||
"https://www.spiegel.de/",
|
"https://www.spiegel.de/",
|
||||||
"https://www.tagesschau.de/",
|
"https://www.tagesschau.de/ausland/europa/slowakei-zensur-100.html",
|
||||||
"https://de.wikipedia.org/wiki/Spezial:Zuf%C3%A4llige_Seite",
|
"https://www.bahn.de/",
|
||||||
"https://www.ebay.de/",
|
"https://www.ebay.de/",
|
||||||
"https://www.bild.de/",
|
"https://www.arbeitsagentur.de/",
|
||||||
"https://www.kicker.de/"
|
"https://www.tagesschau.de/wissen/gesundheit/studie-herz-krebs-100.html",
|
||||||
|
"https://www.tagesschau.de/ausland/afrika/mali-angriffe-100.html",
|
||||||
|
"https://www.tagesschau.de/inland/innenpolitik/ermittlungen-bundesanwaltschaft-signal-100.html",
|
||||||
|
"https://www.tagesschau.de/wissen/forschung/buergerforschung-citizen-science-100.html",
|
||||||
|
"https://www.tagesschau.de/wirtschaft/verbraucher/bargeld-geldautomaten-100.html"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.bundesregierung.de/",
|
||||||
|
"https://www.arbeitsagentur.de/",
|
||||||
|
"https://www.tum.de/",
|
||||||
|
"https://www.sparkasse.de/",
|
||||||
|
"https://www.bahn.de/",
|
||||||
|
"https://www.amazon.de/",
|
||||||
|
"https://www.ebay.de/",
|
||||||
|
"https://www.spiegel.de/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,37 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://es.wikipedia.org/wiki/Especial:Aleatoria",
|
"https://www.zara.com/es/",
|
||||||
"https://www.elmundo.es/",
|
"https://www.amazon.es/",
|
||||||
"https://www.elpais.com/",
|
"https://elpais.com/gastronomia/el-comidista/2026-04-25/angelita-alfaro-y-sus-900-recetas-toda-la-sabiduria-de-una-vida-en-la-cocina-reunida-en-un-libro.html",
|
||||||
"https://www.marca.com/",
|
"https://www.renfe.com/",
|
||||||
"https://www.rtve.es/",
|
"https://elpais.com/economia/negocios/2026-04-19/joseph-stiglitz-premio-nobel-de-economia-la-ideologia-de-los-millonarios-tiene-actualmente-un-grado-de-egoismo-alucinante.html",
|
||||||
|
"https://www.elcorteingles.es/",
|
||||||
|
"https://elpais.com/deportes/motociclismo/2026-04-24/marc-marquez-afronta-sin-excusas-su-tercera-peor-sequia-en-motogp-desde-que-paso-lo-que-paso-he-tenido-que-ir-adaptandome.html",
|
||||||
|
"https://elpais.com/eps/2026-04-24/el-duende-no-visita-a-cualquiera-si-no-donde-estaria-la-magia-auge-caida-y-redencion-de-farruquito.html",
|
||||||
|
"https://elpais.com/opinion/2026-04-25/trump-el-gran-europeista-involuntario.html",
|
||||||
|
"https://elpais.com/babelia/2026-04-25/anna-maria-maiolino-arte-desde-las-tripas.html",
|
||||||
|
"https://elpais.com/espana/madrid/2026-04-25/dos-heridos-y-ocho-detenidos-tras-una-pelea-con-arma-blanca-en-el-metro-de-madrid.html",
|
||||||
|
"https://www.santander.es/",
|
||||||
|
"https://elpais.com/internacional/2026-04-25/la-flota-fantasma-que-alimenta-las-guerras-de-israel.html",
|
||||||
|
"https://elpais.com/elviajero/2026-04-25/bogota-una-cima-del-arte-la-gastronomia-y-el-alegre-despiporre-urbanistico.html",
|
||||||
|
"https://administracion.gob.es/",
|
||||||
|
"https://www.agenciatributaria.es/",
|
||||||
|
"https://elpais.com/deportes/futbol/2026-04-25/jose-barcala-del-depor-al-bayern-un-trotamundos-espanol-busca-la-revancha-ante-el-barca-en-las-semifinales-de-la-champions.html",
|
||||||
|
"https://elpais.com/deportes/tenis/2026-04-24/alcaraz-descarta-jugar-en-roland-garros-es-un-momento-complicado-para-mi.html",
|
||||||
|
"https://elpais.com/elviajero/escapadas/espana/2026-04-22/bodegas-un-tesoro-extraterrestre-y-un-castillo-medieval-convierten-a-villena-en-una-alternativa-al-circuito-turistico-de-alicante.html",
|
||||||
|
"https://elpais.com/economia/2026-04-24/espana-se-suma-a-italia-y-pide-a-bruselas-suspender-las-reglas-fiscales-por-la-crisis-energetica.html",
|
||||||
|
"https://elpais.com/espana/madrid/2026-04-24/un-convoy-de-40-autobuses-azules-destino-burgos-el-ayuntamiento-de-madrid-los-cede-tras-el-incendio-que-arraso-la-mitad-de-la-flota.html",
|
||||||
|
"https://elpais.com/television/series/2026-04-24/a-que-estas-esperando-no-sabe-si-ser-porno-o-la-clasica-comedia-romantica-para-ver-en-familia.html"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://administracion.gob.es/",
|
||||||
|
"https://www.agenciatributaria.es/",
|
||||||
|
"https://www.santander.es/",
|
||||||
|
"https://www.renfe.com/",
|
||||||
|
"https://www.amazon.es/",
|
||||||
"https://www.zara.com/es/",
|
"https://www.zara.com/es/",
|
||||||
"https://www.elcorteingles.es/"
|
"https://www.elcorteingles.es/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,37 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://www.lemonde.fr/",
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-cisjordanie-des-enfants-priv%C3%A9s-d-%C3%A9cole-par-l-arm%C3%A9e-isra%C3%A9lienne",
|
||||||
"https://www.lefigaro.fr/",
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-p%C3%A9rou-perquisition-au-domicile-de-l-ancien-chef-de-l-organisme-%C3%A9lectoral",
|
||||||
"https://www.amazon.fr/",
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-attaques-d-ampleur-au-mali-combats-entre-arm%C3%A9e-et-groupes-terroristes",
|
||||||
"https://www.service-public.fr/",
|
"https://www.france24.com/fr/france/20260425-france-pour-moi-est-fini-alg%C3%A9rie-boualem-sansal-dit-vouloir-vivre-belgique-bollor%C3%A9",
|
||||||
"https://fr.wikipedia.org/wiki/Sp%C3%A9cial:Page_au_hasard",
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-plainte-pour-traite-d-%C3%AAtres-humains-contre-des-plateformes-de-livraison",
|
||||||
"https://www.cdiscount.com/",
|
"https://www.cdiscount.com/",
|
||||||
"https://www.fnac.com/"
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-france-les-livreurs-%C3%A0-v%C3%A9lo-s-agit-il-d-esclavage-moderne",
|
||||||
|
"https://www.sncf.com/",
|
||||||
|
"https://www.sorbonne-universite.fr/",
|
||||||
|
"https://www.france24.com/fr/europe/20260425-catastrophe-de-tchernobyl-40-ans-apr%C3%A8s-le-risque-nucl%C3%A9aire-persiste-en-europe",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-ukraine-frappes-meurtri%C3%A8res-%C3%A0-dnipro-zelensky-veut-plus-de-sanctions",
|
||||||
|
"https://www.impots.gouv.fr/",
|
||||||
|
"https://www.amazon.fr/",
|
||||||
|
"https://www.credit-agricole.fr/",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-l-iran-refuse-des-pourparlers-directs-les-am%C3%A9ricains-attendus-%C3%A0-islamabad",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-mali-des-tirs-entendus-dans-plusieurs-localit%C3%A9s-dont-bamako-et-kati",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-elections-municipales-en-cisjordanie-occup%C3%A9e-et-dans-le-centre-de-gaza",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-mojtaba-khamenei-gravement-bless%C3%A9-mais-vif-d-esprit-selon-le-new-york-times",
|
||||||
|
"https://www.service-public.fr/",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-les-etats-unis-r%C3%A9fl%C3%A9chiraient-%C3%A0-suspendre-l-espagne-de-l-otan",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-mali-attaques-coordonn%C3%A9es-pr%C3%A8s-de-bamako-et-dans-l-int%C3%A9rieur",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260425-attaques-au-mali-la-capitale-bamako-kati-ou-encore-kidal-vis%C3%A9es"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.service-public.fr/",
|
||||||
|
"https://www.impots.gouv.fr/",
|
||||||
|
"https://www.sorbonne-universite.fr/",
|
||||||
|
"https://www.credit-agricole.fr/",
|
||||||
|
"https://www.sncf.com/",
|
||||||
|
"https://www.amazon.fr/",
|
||||||
|
"https://www.cdiscount.com/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,37 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
|
"https://hk.news.yahoo.com/g7%E5%B0%8D%E4%B8%AD%E4%BF%84%E6%A0%B8%E6%AD%A6%E6%93%B4%E5%BC%B5%E8%A1%A8%E7%A4%BA%E9%97%9C%E5%88%87-053502946.html",
|
||||||
|
"https://www.police.gov.hk/",
|
||||||
|
"https://www.mtr.com.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E6%8E%A5%E9%80%A3%E6%A0%A1%E5%9C%92%E6%A7%8D%E6%93%8A-%E5%9C%9F%E8%80%B3%E5%85%B6%E6%92%A4%E6%8F%9B%E6%95%99%E8%82%B2%E9%83%A8%E6%AC%A1%E9%95%B7-132006319.html",
|
||||||
|
"https://hk.news.yahoo.com/%E9%BB%8E%E5%B7%B4%E5%AB%A9%E5%8D%97%E9%83%A8%E6%88%B0%E7%81%AB%E6%9C%AA%E6%AD%87-%E4%BB%A5%E8%BB%8D%E6%93%8A%E6%96%836%E5%90%8D%E7%9C%9F%E4%B8%BB%E9%BB%A8%E6%88%90%E5%93%A1-223501208.html",
|
||||||
|
"https://www.hktvmall.com/",
|
||||||
|
"https://www.hku.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E6%8C%AA%E5%A8%81%E6%93%AC%E7%A6%8116%E6%AD%B2%E4%BB%A5%E4%B8%8B%E5%85%92%E5%B0%91%E4%BD%BF%E7%94%A8%E7%A4%BE%E7%BE%A4%E5%AA%92%E9%AB%94-080501788.html",
|
||||||
|
"https://hk.news.yahoo.com/%E5%8D%B0%E5%B0%BC%E7%A5%AD%E5%B0%81%E9%8E%96%E5%A8%81%E8%84%85-%E7%B6%AD%E5%9F%BA%E5%A6%A5%E5%8D%94%E9%A1%98%E9%85%8D%E5%90%88%E7%95%B6%E5%9C%B0%E6%B3%95%E8%A6%8F-092002688.html",
|
||||||
|
"https://hk.news.yahoo.com/%E5%AE%8F%E6%98%8C%E9%96%A3%E5%B1%85%E6%B0%91%E8%85%B3%E5%82%B7%E6%92%90%E6%8B%90%E6%9D%96%E4%B8%8A%E6%A8%93-%E6%9B%BE%E8%A9%A2%E5%95%8F%E5%8F%AF%E5%90%A6%E6%94%B9%E6%9C%9F%E6%9C%AA%E7%8D%B2%E5%9B%9E%E6%87%89-074305957.html",
|
||||||
|
"https://hk.news.yahoo.com/%E7%BE%8E%E4%BC%8A%E8%AB%87%E5%88%A4%E9%80%B2%E5%B1%95%E8%86%A0%E8%91%97-%E4%BB%A5%E9%BB%8E%E5%81%9C%E7%81%AB%E5%BB%B6%E9%95%B73%E5%91%A8-060502014.html",
|
||||||
|
"https://www.gov.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E6%B5%B7%E4%BA%8B%E6%A9%9F%E6%A7%8B-%E8%89%98%E6%B2%B9%E8%BC%AA%E5%9C%A8%E7%B4%A2%E9%A6%AC%E5%88%A9%E4%BA%9E%E5%A4%96%E6%B5%B7%E9%81%AD%E5%88%B0%E5%8A%AB%E6%8C%81-162002269.html",
|
||||||
|
"https://hk.news.yahoo.com/%E5%BE%B7%E5%9C%8B%E5%B0%87%E6%B4%BE%E6%8E%83%E9%9B%B7%E8%89%A6%E5%89%8D%E5%BE%80%E5%9C%B0%E4%B8%AD%E6%B5%B7-%E5%9B%A0%E6%87%89%E8%8D%B7%E8%8E%AB%E8%8C%B2%E6%B5%B7%E5%B3%BD%E5%8F%AF%E8%83%BD%E4%BB%BB%E5%8B%99-140502391.html",
|
||||||
|
"https://hk.news.yahoo.com/%E7%BE%8E%E5%9C%8B%E5%8B%99%E9%99%A2%E6%87%B8%E8%B3%9E%E9%80%BE3%E5%84%84-%E7%B7%9D%E6%8D%95%E4%BC%8A%E6%8B%89%E5%85%8B%E6%AD%A6%E8%A3%9D%E7%B5%84%E7%B9%94%E9%A0%98%E8%A2%96-152002118.html",
|
||||||
|
"https://hk.news.yahoo.com/%E7%AB%8A%E5%8C%AA%E9%97%96%E9%95%B7%E6%B2%99%E7%81%A3%E6%80%A1%E9%96%A3%E8%8B%91-%E4%B8%83%E6%97%AC%E5%A9%A6%E7%97%9B%E5%A4%B153%E8%90%AC%E7%8F%BE%E9%87%91%E5%8F%8A%E9%87%91%E5%99%A8-013344810.html",
|
||||||
|
"https://hk.news.yahoo.com/%E5%B7%9D%E6%99%AE%E7%A8%B1%E4%B8%8D%E6%80%A5%E6%96%BC%E7%B5%90%E6%9D%9F%E8%88%87%E4%BC%8A%E6%9C%97%E6%88%B0%E7%88%AD-%E4%B8%8D%E6%9C%83%E5%8B%95%E7%94%A8%E6%A0%B8%E6%AD%A6-222004956.html",
|
||||||
|
"https://www.hko.gov.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E7%84%A1%E4%BA%BA%E6%A9%9F%E5%A2%9C%E8%90%BD%E7%BE%85%E9%A6%AC%E5%B0%BC%E4%BA%9E-%E8%8B%B1%E5%9C%8B%E6%88%B0%E6%A9%9F%E7%B7%8A%E6%80%A5%E5%8D%87%E7%A9%BA-155001420.html",
|
||||||
|
"https://www.hsbc.com.hk/",
|
||||||
|
"https://yahoo-news.com.hk/BBCChineseNews/41467/?yptr=yahoo",
|
||||||
|
"https://hk.news.yahoo.com/%E7%94%B1%E7%BE%A9%E5%A4%A7%E5%88%A9%E4%BB%A3%E4%BC%8A%E6%9C%97%E5%8F%83%E5%8A%A0%E4%B8%96%E8%B6%B3%E8%B3%BD-%E7%9B%A7%E6%AF%94%E6%AD%90-%E9%9D%9E%E7%BE%8E%E6%94%BF%E5%BA%9C%E7%AB%8B%E5%A0%B4-052004971.html"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
"https://www.gov.hk/",
|
"https://www.gov.hk/",
|
||||||
"https://www.hko.gov.hk/",
|
"https://www.hko.gov.hk/",
|
||||||
"https://www.scmp.com/",
|
"https://www.police.gov.hk/",
|
||||||
"https://www.hk01.com/",
|
"https://www.hku.hk/",
|
||||||
"https://zh.wikipedia.org/wiki/Special:Random",
|
"https://www.hsbc.com.hk/",
|
||||||
"https://www.hktvmall.com/",
|
"https://www.mtr.com.hk/",
|
||||||
"https://www.mtr.com.hk/"
|
"https://www.hktvmall.com/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,17 +4,36 @@
|
|||||||
"base_lat": 35.6812,
|
"base_lat": 35.6812,
|
||||||
"base_lon": 139.7671,
|
"base_lon": 139.7671,
|
||||||
"lang_params": "hl=ja&gl=JP",
|
"lang_params": "hl=ja&gl=JP",
|
||||||
"valid_url_suffix": "com"
|
"valid_url_suffix": "com"
|
||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://ja.wikipedia.org/wiki/Special:Random",
|
"https://www.mhlw.go.jp/",
|
||||||
"https://www.yahoo.co.jp/",
|
"https://news.yahoo.co.jp/pickup/6577647?source=rss",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577619?source=rss",
|
||||||
|
"https://www.japan.go.jp/",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577642?source=rss",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577645?source=rss",
|
||||||
"https://www.rakuten.co.jp/",
|
"https://www.rakuten.co.jp/",
|
||||||
"https://www.nhk.or.jp/",
|
"https://news.yahoo.co.jp/pickup/6577625?source=rss",
|
||||||
"kakaku.com/",
|
"https://news.yahoo.co.jp/pickup/6577643?source=rss",
|
||||||
"https://www.goo.ne.jp/",
|
"https://www.yahoo.co.jp/",
|
||||||
"https://www.amazon.co.jp/"
|
"https://www.amazon.co.jp/",
|
||||||
|
"https://www.u-tokyo.ac.jp/",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577648?source=rss",
|
||||||
|
"https://www.smbc.co.jp/",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577627?source=rss",
|
||||||
|
"https://www.jreast.co.jp/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.japan.go.jp/",
|
||||||
|
"https://www.mhlw.go.jp/",
|
||||||
|
"https://www.u-tokyo.ac.jp/",
|
||||||
|
"https://www.smbc.co.jp/",
|
||||||
|
"https://www.jreast.co.jp/",
|
||||||
|
"https://www.yahoo.co.jp/",
|
||||||
|
"https://www.amazon.co.jp/",
|
||||||
|
"https://www.rakuten.co.jp/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,21 +2,35 @@
|
|||||||
"region_name": "South Korea - Seoul",
|
"region_name": "South Korea - Seoul",
|
||||||
"google_module": {
|
"google_module": {
|
||||||
"base_lat": 37.5665,
|
"base_lat": 37.5665,
|
||||||
"base_lon": 126.9780,
|
"base_lon": 126.978,
|
||||||
"lang_params": "hl=ko&gl=KR",
|
"lang_params": "hl=ko&gl=KR",
|
||||||
"valid_url_suffix": "co.kr"
|
"valid_url_suffix": "co.kr"
|
||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://ko.wikipedia.org/wiki/특수:임의문서",
|
"https://www.yonhapnewstv.co.kr/news/MYH20260425183800b9s",
|
||||||
|
"https://www.korea.kr/",
|
||||||
|
"https://www.kakao.com/",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/MYH20260425152110bpV",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/AKR20260425212444Z30",
|
||||||
|
"https://www.hometax.go.kr/",
|
||||||
|
"https://www.daum.net/",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/MYH20260425152255vNc",
|
||||||
|
"https://www.naver.com/",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/MYH20260425133924vxi",
|
||||||
|
"https://www.snu.ac.kr/",
|
||||||
|
"https://www.kbstar.com/",
|
||||||
|
"https://www.coupang.com/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.korea.kr/",
|
||||||
|
"https://www.hometax.go.kr/",
|
||||||
|
"https://www.snu.ac.kr/",
|
||||||
|
"https://www.kbstar.com/",
|
||||||
"https://www.naver.com/",
|
"https://www.naver.com/",
|
||||||
"https://www.daum.net/",
|
"https://www.daum.net/",
|
||||||
"https://namu.wiki/",
|
|
||||||
"https://www.tistory.com/",
|
|
||||||
"https://www.coupang.com/",
|
"https://www.coupang.com/",
|
||||||
"https://www.chosun.com/",
|
"https://www.kakao.com/"
|
||||||
"https://www.yna.co.kr/",
|
|
||||||
"https://www.kakaocorp.com/"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
50
data/regions/MY/Default/Kuala_Lumpur.json
Normal file
50
data/regions/MY/Default/Kuala_Lumpur.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "Malaysia - Kuala Lumpur",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": 3.139,
|
||||||
|
"base_lon": 101.6869,
|
||||||
|
"lang_params": "hl=en-MY&gl=MY",
|
||||||
|
"valid_url_suffix": "com.my"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.kwsp.gov.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiiAFBVV95cUxPaXNVYWt2b0ptbFNvOGQzekdhR3pndUxuRk12Tk1aT1BtLWZaMjdOOHA2WG83VlFYaWxRVVNnNE9FaWdyWTBpaG9aNTcwWHllRkpJM0FZcVhleGR5dlk3NW9laGtHay1kbVV2MWtGY2hVaHdRU3JGTktJbWpNYzFETjlpbzhGX0dm?oc=5",
|
||||||
|
"https://www.hasil.gov.my/",
|
||||||
|
"https://um.edu.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMi5gFBVV95cUxPQzNKdlB6QWllTDJZNTUyZzVZeEdfRkNaUzZ4RWRkbGNvMTdoOVNHMnNCa0Vhd3RMRjJXR092QUxDVjVnWGk3bm5JRU9ZclRxSk1kVlVyNlVRTDdLUHJDTDZCSVExOS1ONlk3TkVlanBnQWZ0Tk04Y2N0NnloOFEwdm9Ya2lkVGdkdHl0cWZWbHNhcTZoZVdEdGVxNXowT1lVSGpYaG81a1M5VTBSbHNyT2pWNEI4YmZOZmViRktJSGRZUjFtU1E1b1gwNHZzXzV2Sm83SU9fZEN5ZUJXdW92N3A1QjhhZ9IB6wFBVV95cUxPdDZqamRpdkNrczZyOVhCZjROc3ZhRmdQcWpNdE5DVjY5RjhCSklMbXJaSnA3dzMwWU9hZDZZdGswa2p6VHNkRDY3ekhOTWZQay1Xemhkak9jNFI3emdfUEFWNXFXZ1FHejZvVDN5elhENkM1T0g0YURaNjlHVzd0LU02RzdMc0RKR1FyRTQ4MDJBZFhmOVFVYzFyeHAtSGl2YmhTOVlKVVJHR01tWU1sN1lpd3MzbkNxc1BuTWt3OTl4NGN3RzRSNk0xeEJJMEFscHhMUkhBbDZ4aGtOaHFReGd3TEpiQ1hMMzV3?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMixwFBVV95cUxOT0x0ZnZhTEo5NS01UjZHdW42VTVlVDhvNWQ5MXpQZVl6Y0FrZ1RSSTJHbkIwdjJ5Qm5ta1Fad01CTmdYTUJuRW5aWkJmQmhfWWp2cU80RVg3b09uS0xDYmdKaXdjNjFyUmlsdVo3SmctREJXNzRpU0R3RTkxSVhzaTFtVHQxTzA1ZmlFaUNkaWZSLTlydXFDbnlUZV9QT3JMbzJ4QndFQ1R1MVgycTNKZWxKQ2ZCSDNlR05wa0VZQ2lNOXlwZGsw?oc=5",
|
||||||
|
"https://www.pos.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMitwFBVV95cUxNRFltTDBUYmhkQWNsYVZoSlBDOUI4cFhacWtaWFZzU05TRFdvMUpxRjZFUnFKUzFZeUxLWUZYV00yUml2ZWRUX0hLUTNwRHd6THpNZk9vYWtfUnJjY3pMTHNFWWI2QXBMZ1RRU1dfM1BpcG5EYVZreVlzUmlQeGJYUzdCcENuN2hhVVlNTnlIVWxoQndvZktxYXZpTHlQX3NvRG4tQjNOYUZBVlB4Y0pFRjk0Y3E4SEU?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMi2gFBVV95cUxNTDctT2JwWmtnZnBsTGl6WDBTaEw0YXNQSm5iNEx1a0ZQaUxsYTNpdXplVE1lVUQxU2V1XzhFUGZycFlkNE05aDFTazd4S2JXODN6YkFLUTZCNXZXN25WZW5oekZnT3FjYTdPQ3ctbUVfZXhkUzRwc2Vta19XTWlIM0dzT3dmZHBBaHZOZlpFRXd5WDhjcEVfUkd6SXVoY1V4WWVodWhsMTA3NHd4WXVZd3FDT185SnFGZ21xWFU5VFZlN1lPOHZocTI2RV9YY2phWl9tUm41S3hIZ9IB3wFBVV95cUxOQ0QtMzNSXzd4b0RRaGV2S05TREVocTQ3d1ZheFd6SkFYa3Q1ZDhSVGpLdXRBbmxKMmZIcEd3aUM4V2Z1bzhGNmIzYzFGOEV2Smd5UVZoUkF5dzlPNU5uRHZNWDQtcThrb1pRM0VnTlRRaU1tZ2FleUNUUVA5T3dNQTJuSnZIY1ZkQThkYW5SdU1wXzlfemR0Mi1DQjVzczFsZGk4ZndVRFRfckkxZnByQ1dkQnp6X01ZVXE2VlJ1YUM0cV90NW9wRERGRHUycXdqUGhkUU4zbEVtWlZuT3Fn?oc=5",
|
||||||
|
"https://shopee.com.my/",
|
||||||
|
"https://www.malaysia.gov.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiswFBVV95cUxOVGxwSlZmZUF2UW1VUnN5R0ZfX3l5Tk5mQnBKZ0ZsSG5tM3N2LWgzdGhPalVHQjUwQnpDN1pnUGVMVzlZRDdtd0paSk9BdVBQQms1WTlNOHNBY1NGZHlHelV5V2xYdWhpWkZpMUZvYjdXSkdLeUtQNWRuNDV4dTJDcEJEcElpZFozSTlmNExpZjVHWXhTeDFLbVhUMkhiclg0bVlrWHlaWTFJOTluc1U0YVJjRQ?oc=5",
|
||||||
|
"https://www.maybank2u.com.my/",
|
||||||
|
"https://www.cimbclicks.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMixgFBVV95cUxPeU5JV3ZVaU0ySHcyYWM3WXdXRENuT2N4VzZEbGdxOFBqc2FFcTZKMUxlMEUyUWJVaU9QbVZkVjRkR1pCejFwS3Z0VXpSNnZlcWNaeVVfZHc0Rmd1aTBROTR3MWx2aVR4YUJENlFVM0pUUzB4MnZNSkxuZFNpMUFvb2ZranY0aGM0ZUpmNGNacnUwSm9pOHFMdmtuYk9SUGxTZ2p3LWRuVElLM19vUzZnNUJTVktoN1FvOGgzMXJKUUlldmRLVEE?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMingFBVV95cUxNalNmOGxTaDlMTlhUR3Bfc01UNlBQTUpjeXNkbU92elpEYXBiWHMySU9qdEt0dUF1dzcxbmNuSTBmQUQ4alRpU0RKaGxJX1k4VkFQdXZ6bVJWd0VQZlFqZngySEs5bUQtWmQyQWl6ZGlMTVBJc05OcnBiODd1Y094em1fbWFXRkpndWFvTERMX3I5aDRIZ1QtVXk2Z3hLQQ?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiuwFBVV95cUxOc21IaFd3d3FaeVFQWU91ZGhubkw5RzRiaVQxekRBdTNxUTVfOU1JcTRwaDM0bkhLUWpTd0g5NDJ1NTZveE5PVWNuSm15OUpkX0ZZX3FHNG9mbV9xTXV2X1lNWmFIUDRQN0dmX2JoVXNBOGlaa0lJV1BsOW9DYk5SU1VTbklnY3pVbWdXaHJVTTdlOVRHOFhoUUg0UFlqS0tUeF9NVFdxdHRCb0Y0WEVKUi00TDN6c3QwQ1pr0gHAAUFVX3lxTE9tSFhkVWwwdUNWLVNiWTR5VF8tRFB0d2pza3ROMHc5MzlYRGU5aGY0LUVxaXdRRlNWbVNuNzMtQ1hGMzA4ckphNml0VHJ2OXZjNml5RDdRVl8yWkUtdE1MWllreG9nYVJXanlkLS0wVFNoRnZLRGtmVGFUQkJBSjZsSHM4RkluX2U3ZlVMX24ydlpTaTRDNXBYM3dMX0VDaDR6VEpva0tnV2ljNW5YX2xGQ3hxRS1YbDM0SUxtTWU2dQ?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiY0FVX3lxTFBCMk1XcEdtRUY5aVFiSDE0cjJTZWNTZTdPYUlpS1gxRnVDbXFNcWc2VzZZUEtNTkhQT3hKdDRRMG5mMFlGcjk5S0E0enNuN29UYnZYXzV0cHBWb0lVZExHQ2F0dw?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMipAFBVV95cUxNUkhZdTNLRXJuVjk2cTRYUWNKbGlQV011aE82a21Wcjdob0JjQWRCanl0bUNCYWVPZU5rT2lOMUtrRXBoWUQ4bXNYZ2dQSUtadWNJYUNFSW5GSjJaOV8tZmhrOUZDMGYtZ2pwRmllZTFaN2JZWkVId0dzTnFXNDZMYk0teUZ5U2JSX1RqWURpa0VFUVhOXy0tSHIwelp5VmR5QUdtQQ?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMi1wFBVV95cUxOaW9BY3BDUnhYYkliZzFvYXFrMXVIUWtVZ0xBVUpMZWpadDB4YmdXRzRhRG83Q0Z5RXpTU2UydTR0b1FvYUNGWGh6VFhlVEtOb1hLcXdzWnF5bEtfaWFMNzRNVzN5bUtHejZlZjBNZEc3TGdpRkxXVjN4Mmp5bkxhdU9wMVhLVEYtWWRZSUx4R3pQTG1OdFR2MGQyVmF1R3lIbjRkbGVCU0NiYlZoc1VLSnpZc210cUxMNldVVnM5ZFlqN2NKZGotNHVlVFdyelZxczdsMTg1TQ?oc=5",
|
||||||
|
"https://www.thestar.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMioAFBVV95cUxNaWhHRDF5bkV6elR6ZWdYSGtKV2NRTXVDTHRXN0ZRSmpHSlp1dmV2ZXl2OENTYUFmcjhoTjhrdnJXNm82aFEwV08yVjVxbDBrcGhzLS10MWtoQUdXTDRQc1VaWktEV2F2RlQ5YTlUOWt1aGszTVVCMzloZlNwMjFuQ21nZnNleERQX2NBR3RMV0UwQnM4WUMxVThEelJYSUh4?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiiAFBVV95cUxPTjRIRnpFR3lYVC00YmhpcjBsMjZGWk9MZlJrY2tFVFFqejdVZnY0cDI5VExJU0sxQWhGQjl4Sk5pMjE2d1RNMGVHS2lTNlVXRzlXNkdIZ2NMV3AzenZOcG1ncEFFOVdNeWVsMkF1STJqd2tobWo4cU13SzJ0V3FxQjVqc2wtdkEz?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiwgFBVV95cUxOWkxxcGFDS1VPc1pLYUtMNG5KNUt6WVFSVm5ramh4NVFpWVFyZFlVY21vZHV3M0JxWFVCX3NuN214RWFCd0Y4NTJ2SEl3TkRjdlUyVDZraTcxZk01QkVidTdya2Z6R2Fra1VzeF9ZWi1XMVdpdGFESHBHTWZzTll0MS0zcjBwZnZOWEM4VkVHLTFKbEhCeGo1Y2xMbnVQYlJqNmtNc2R3RlBfWWNPVTNHS1FfV0RBQVJOdDhOM3RpRG1rUQ?oc=5",
|
||||||
|
"https://www.lazada.com.my/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.malaysia.gov.my/",
|
||||||
|
"https://www.hasil.gov.my/",
|
||||||
|
"https://www.kwsp.gov.my/",
|
||||||
|
"https://um.edu.my/",
|
||||||
|
"https://www.maybank2u.com.my/",
|
||||||
|
"https://www.cimbclicks.com.my/",
|
||||||
|
"https://www.thestar.com.my/",
|
||||||
|
"https://shopee.com.my/",
|
||||||
|
"https://www.lazada.com.my/",
|
||||||
|
"https://www.pos.com.my/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,13 +8,37 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://nl.wikipedia.org/wiki/Speciaal:Willekeurig",
|
|
||||||
"https://www.rijksoverheid.nl/",
|
"https://www.rijksoverheid.nl/",
|
||||||
"https://www.nos.nl/",
|
"https://nos.nl/l/2611963",
|
||||||
|
"https://www.ing.nl/",
|
||||||
|
"https://nos.nl/l/2611926",
|
||||||
"https://www.bol.com/",
|
"https://www.bol.com/",
|
||||||
"https://www.nu.nl/",
|
"https://nos.nl/l/2611979",
|
||||||
|
"https://nos.nl/l/2611985",
|
||||||
|
"https://nos.nl/l/2611938",
|
||||||
|
"https://nos.nl/l/2611975",
|
||||||
|
"https://nos.nl/l/2611907",
|
||||||
|
"https://www.ns.nl/",
|
||||||
|
"https://nos.nl/l/2611911",
|
||||||
|
"https://nos.nl/l/2611935",
|
||||||
"https://www.buienradar.nl/",
|
"https://www.buienradar.nl/",
|
||||||
"https://www.telegraaf.nl/"
|
"https://nos.nl/l/2611970",
|
||||||
|
"https://nos.nl/l/2611925",
|
||||||
|
"https://www.marktplaats.nl/",
|
||||||
|
"https://nos.nl/l/2611905",
|
||||||
|
"https://www.belastingdienst.nl/",
|
||||||
|
"https://nos.nl/l/2611973",
|
||||||
|
"https://nos.nl/l/2611908",
|
||||||
|
"https://nos.nl/l/2611919"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.rijksoverheid.nl/",
|
||||||
|
"https://www.belastingdienst.nl/",
|
||||||
|
"https://www.ing.nl/",
|
||||||
|
"https://www.ns.nl/",
|
||||||
|
"https://www.bol.com/",
|
||||||
|
"https://www.marktplaats.nl/",
|
||||||
|
"https://www.buienradar.nl/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://www.straitstimes.com/",
|
"https://www.channelnewsasia.com/sport/brazils-militao-risks-missing-world-cup-hamstring-injury-sources-say-6080916",
|
||||||
"https://www.channelnewsasia.com/",
|
"https://www.channelnewsasia.com/sport/manchester-city-shocked-brighton-in-womens-super-league-title-race-6080881",
|
||||||
"https://www.gov.sg/",
|
"https://www.channelnewsasia.com/sport/swiatek-retires-madrid-open-due-illness-6081061",
|
||||||
"https://shopee.sg/",
|
"https://www.channelnewsasia.com/sport/man-city-fight-back-beat-southampton-and-reach-fourth-straight-fa-cup-final-6081076",
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.iras.gov.sg/",
|
||||||
"https://www.fairprice.com.sg/",
|
"https://www.fairprice.com.sg/",
|
||||||
"https://www.dbs.com.sg/"
|
"https://www.channelnewsasia.com/sport/palhinha-scores-late-tottenham-goal-wolves-end-winless-run-6081011",
|
||||||
|
"https://www.shopee.sg/",
|
||||||
|
"https://www.singpass.gov.sg/",
|
||||||
|
"https://www.nus.edu.sg/",
|
||||||
|
"https://www.cpf.gov.sg/",
|
||||||
|
"https://www.channelnewsasia.com/sport/liverpool-edge-closer-champions-league-salah-injury-clouds-palace-win-6081046",
|
||||||
|
"https://www.channelnewsasia.com/sport/punjab-pull-record-chase-against-delhi-despite-rahul-ton-6080976",
|
||||||
|
"https://www.gov.sg/",
|
||||||
|
"https://www.channelnewsasia.com/sport/wasteful-villas-away-day-blues-continue-defeat-fulham-6080911",
|
||||||
|
"https://www.channelnewsasia.com/sport/wilsons-late-winner-boosts-west-hams-survival-chances-2-1-win-over-everton-6081001",
|
||||||
|
"https://www.dbs.com.sg/",
|
||||||
|
"https://www.channelnewsasia.com/sport/tottenham-and-west-ham-both-win-heated-battle-avoid-relegation-continues-6081031",
|
||||||
|
"https://www.channelnewsasia.com/sport/marc-marquez-wins-chaotic-spanish-gp-sprint-despite-crash-in-rain-6080886",
|
||||||
|
"https://www.channelnewsasia.com/east-asia/japan-fire-iwate-blazes-otsuchi-wildfires-6080516",
|
||||||
|
"https://www.channelnewsasia.com/singapore/dbs-cashback-programme-10-million-hawker-centres-heartlands-supermarkets-paylah-6080906",
|
||||||
|
"https://www.channelnewsasia.com/sport/york-city-promoted-league-two-after-dramatic-draw-title-rivals-rochdale-6080926",
|
||||||
|
"https://www.channelnewsasia.com/sport/nervy-arsenal-go-back-top-eze-seals-vital-win-over-newcastle-6081101"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.gov.sg/",
|
||||||
|
"https://www.cpf.gov.sg/",
|
||||||
|
"https://www.iras.gov.sg/",
|
||||||
|
"https://www.singpass.gov.sg/",
|
||||||
|
"https://www.nus.edu.sg/",
|
||||||
|
"https://www.dbs.com.sg/",
|
||||||
|
"https://www.shopee.sg/",
|
||||||
|
"https://www.fairprice.com.sg/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,48 @@
|
|||||||
{
|
{
|
||||||
"region_name": "Taiwan - Taipei",
|
"region_name": "Taiwan - Taipei",
|
||||||
"google_module": {
|
"google_module": {
|
||||||
"base_lat": 25.0330,
|
"base_lat": 25.033,
|
||||||
"base_lon": 121.5654,
|
"base_lon": 121.5654,
|
||||||
"lang_params": "hl=zh-TW&gl=TW",
|
"lang_params": "hl=zh-TW&gl=TW",
|
||||||
"valid_url_suffix": "com.tw"
|
"valid_url_suffix": "com.tw"
|
||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://zh.wikipedia.org/wiki/Special:Random",
|
"https://news.google.com/rss/articles/CBMiU0FVX3lxTE9HX3l2R1QzWDZranZiNnhxU1BHZ3l4d1RHNmE0dUQwM1JDSHZKUGtGU3ZzWDN2aGJYWWZFaThpSW91RnVQTV9nc2RqaHUwdnVCNEJF0gFYQVVfeXFMT292N2kydGJCbzFyZDlPUHl6Rmg3dDN2QVRJRmkxSVJ2aGRMdUN3SmcwM0Focy1hTkNuVHlfRWZ5MXY0aHZiTFJUeWZjaGFHejBtSFhRekoyNA?oc=5",
|
||||||
"https://tw.yahoo.com/",
|
"https://news.google.com/rss/articles/CBMiUEFVX3lxTE9hNWp2ZmZyakp2aTNDSjhBaExwYkFHWEJjT0lkc1VXUkFONE1QRVM4SlZQYVZDRVRKZGFjbl9DcWdEQXphVG9OWnNMZkN1alJZ0gFWQVVfeXFMT2ZyaGFsaDJpWmszR2JFV2M4d1haSDdMNmUzLUVFNjQ2dEs3bWdPMzFLbGxJYUVYME5YNExNZGZ4LUtYZXZpTS1pZTlUWE9IaGtmd2tydUE?oc=5",
|
||||||
"https://www.pchome.com.tw/",
|
"https://news.google.com/rss/articles/CBMizgJBVV95cUxON01vMW5UMU5qTzFwSDZfRFFUSTRpcGlTN1hBbENCRGYwR2x1cXdhSGdPZkJXVUh6ajJiQkpweG92eGhCbFNWSXB4UThULXRkMnZ0Rk9tTUZtN3FOQXM3SHc1WFZYLUxqX2Vac0REbUJDMjhZRno3LWlQQlBlUXRtZU01VDNXVmIwTkpqcjg2S0ZyMXAxQl9FbHpRbXRzV3I2eTBZWnMzTlVVZWhRMVZ6enlDSTJUM2JScExKc2lhbHFaRFAtTUZ6UmVjeGZTWWlxdW9rVG0yWldYdDBEa29xTFY1MUNjSVZxNlNCdUprVTNrdjc0NW5iX3BvamtZMm5mODVXWjZHdlhPRzliUW5tTTJRTmhzdWFZcEJZbjlENm9IaHBqdG1OemNucUhEOWlyRjAxeE1wcF9qODNjTl9CNEttVEduT3lleGJlUEVB?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiakFVX3lxTE92ajZnU0U0aXZUNzM0N0xJSHhNbHUyRGZnS0JiOGZGVDM0LUl5c1ZzWXAxSlY5amEwbkxHeEktcUdzbkF2SVNhZW9XRWNKR1NEcXpFbnNEVkNZQnpMa2ktRW4taklVdTVFSVHSAW9BVV95cUxQRWhVZS1HSC1hYVFDV284TUhyOEVRV05DdkJ3R0RJZFFsM1BrVExwSWVmdHN2MXV3c1FLNzV4ZmdRVm0waGtWN0lRaGsxdjJwQm9adWpsZzdiTmpRVGljb2JwSEZqSHBXTjAtMndhRXc?oc=5",
|
||||||
"https://www.momoshop.com.tw/",
|
"https://www.momoshop.com.tw/",
|
||||||
"https://www.ruten.com.tw/",
|
"https://news.google.com/rss/articles/CBMiTkFVX3lxTE1ZajdHRTdJbWtUZTdlWG8wd1doeWxpcXgxTkJkc1JlMnd5ZTN3bXUyYnRhRzdCVnNyaUpfQ1NsaEhUQjBiMTRIN01kTHRSZ9IBakFVX3lxTFBjcnVfQUFYQmlOV1lKTjdiZGRxNkpMVHdhRkVaRmdSa25zS2NmamdjY0U4dkJhRVF6QXJjTFhocEJrQW4ycjVEQ0xGRHJOT1ZpRzZBTEhBQ29ZWmxEM3VVMWdNSWl4dnQyUGc?oc=5",
|
||||||
"https://www.mobile01.com/",
|
"https://news.google.com/rss/articles/CBMid0FVX3lxTE5Ld2VqOTNyWDNRODJ3VDdXSi1VRXVKdUk0ZTV2NzJsRy1BYlpfSW92bXdBbXNXVDVCeEw1bGJFYzlpOFdWVmpPX0plc3dtQk9HRWhyTWh2Q0d0bXNkZUpoR2hHTnlmWUtmVXV6UUtFbGtaQ2ZqbnJn?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiXkFVX3lxTFBNNVJNZmhEZ2drWjNGbHdQcE14NE5xVTRvYnBtSXhWYzBMLUpndm96TFRqZ2hoMVAwbFJmVDFDcEZOVWhHbkRRdzhzRjhlSloydm9WMWt4eVozazQ5U3fSAWhBVV95cUxQTWtHU2hiTXhkakQzQzY5OGVXeW1ybUttekowQkxmWFJ6ZlFiem51endENVQ5czh2VWhTRzJjRVdiSTk0dlR4YThsV3o4b2ZTY1FVRzFtVzNkMnFPemdXT0VIeTh2cktleA?oc=5",
|
||||||
|
"https://www.dcard.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiUEFVX3lxTFBsOU8wek5nbmR6M1FfOVVaWjRjeW1tdWFNQmhvVURwRHNQeU5NRFF2d1pSZk5DSU1hcS1La1lBRnZwVXItVVNtUGpVQUk5TkZt0gFWQVVfeXFMUFRGV19kejJrbUJfaFdwd0R4bFJCWlNKcWFCclNkbkxVZEYxWE00cUtjSzBwSGllbTNiYXBzZ09qcVJXWDBYQldJd1FIM0N1VHkxbmNmMFE?oc=5",
|
||||||
|
"https://www.gov.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiUEFVX3lxTFBKNEtuNWpGY0ZzYXVPTXotd0ttdkJDLWpEdEY0ay11eTVsemZFVDFudW4wWVJKMnprSkxzMmMyRUlUd2dFQTdTVFkzNThWQTlC0gFWQVVfeXFMTzd5RGFPWVNIQWwyNE91aFR4MW43emJOZGVlOVMwRElRc3BjTWJOM0ZnTURRcnJYTlZDRy1lVTJHV3NoT0RqVmRFS1hUQ1otUGZpX3V0MXc?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiWkFVX3lxTE52bjY3dUJOc3ZUemtDbTZLWHVPZ0dSSnMwdlROdm03bTZEdVdUX0M0VVVKQlNUX1JJbEVFQnNBZ0dFcGpTSWhXTmxQb2ctbVBkSjhSQWNGTFpUd9IBX0FVX3lxTE44aTlDZlI3MDVBekZUQ1hVYzFENkdLWWhOWGhMNWdOSS0yYXRRajNTYnd3bDZWOVVTaWNFMi13Q3R0Q19GNXlrbXBDRC1KOUFLWTB4czFUdWFtV2lzeDFJ?oc=5",
|
||||||
|
"https://www.thsrc.com.tw/",
|
||||||
|
"https://www.pchome.com.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiXkFVX3lxTE0tU3pheTNFXzc4UFgxTW15cWtuNkIwbklGYlZvaGFINng3TElhWkZzTXd2ZXdUdFhaVEJpX25xdXd1cVd4Y2RmOVJaOUNkYWN6azhJdDlhV1gtZjNjN3fSAWhBVV95cUxPcEdPU0lEOXpfLVB4TnhqeEVCbVVMYkhZekEwT0xCM3NxWFBldWRKMjNBUHJIb1dtN0dBbFNqamVhTUJiSUFOVXVkSE14YnFVTXU2THU0X0pxWWx6a0RRMFRhbEVrd1BTaw?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiWEFVX3lxTE5kckQzc0RLeFRYYmFFQng2NVUxMngxWFNLTG9xbVVVNzFiRXZTY1d5bVc2OTRsZ0E5TUs4UU11bWlOMUNId3oxUW56YVB1c0xkMXd5TFNVNk0?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiYEFVX3lxTE5Sek5kdGJtM1FMQVVsbWJaNXdNZDBjMUF4UDhKN3ZkZC11Z0p2cUItT1V5VE5sZExBdFVZYzhESkRwcllaT2NYUVhLaUxfWXV2amhfTzE5Umx4NWhsUGFiVdIBZkFVX3lxTE43UjZMZEpKeGFYUXBURVVHU0diNEpXWkZnQ1BqOUdCTDN3cGt2VjlJS1VqRFRzcnlKU1ZMbWZsdnhzbmJiUE1yTEJHWUdKVjcwMG9mR2x5a3Nidm9CU3FqQVd3TW1tdw?oc=5",
|
||||||
|
"https://www.cathaybk.com.tw/",
|
||||||
|
"https://tw.yahoo.com/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiXkFVX3lxTE9ON2g3NmdETWhCdzh3MGk1TGpKMFp1SXo0M25sdUJXVHBSWXpRNU9lQVdpa0E1QzJMWmpyYUtDTlZrV245QkJydTY3eXVYT2pBbGtoOVFQNFB4ZmZOc1HSAWhBVV95cUxNSm9EQ3BnNlFDWmxzNHdqOHI2M25OTTl0SkxKYk8wS3kxYnAzZkNHU2RKUG1nR2Y4bmU4dVNRWG9ldW1QOG9OaGFmNnRDYXZlU1dWTDlzc3B3cGQySjF3NHlVZGRkNlJCZw?oc=5",
|
||||||
|
"https://www.post.gov.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMitgNBVV95cUxPRVhYb0pMSVRsdV9CZk5EdFlCSWdxTFRxMkRSQlZCWllXQ1dXREtHdFY1SzdHUjNncURwcTJfaWpObHBFRUdGX29UTzhwOEdJdUY0RHowZ1c0LXFOYmJzYjlnaDRYRklqR1VUWHA5WGZ4RWFRRWo2OGxWMHRvcGZZZlRPeE1Rc1d1U3ptRFlZNWdBNVZzbU93T1dtUVc3VmVhNFl3VjNIS0I3bFI1UGRzYXZZMGRSM3huUDVuRnpCSE9VTDhmSUdVSU9HZXBsYTB5bDFWOElvWnVndHJRZ0FLSG9NSHVBS01RNGl0bVo1S1dDX3JWa0pjSl9kazZyQVVSU2U3TlRZRDZ4MmJTLUI3V1g1ZjRfZzlTNXZ0ZW16Q3lWZElOcHNGTGRzN2pWZHlWbEloT3FSQjhVSWQ3SE9Qd3RaSFQxYkRoSXBCLUZQendpUHpUTkJuMVpmTVF1SG1XTVZHb1dObWdEM0Z6QUg1aklVZjhtUUVnRDVpNnA1aEtOU2ZRU0thUVRzVE1aM2FTWUlnUEVScS1aWVJtck1JYlByNFVsV0l0Q2pTVksxYnBZUjFQYnc?oc=5",
|
||||||
|
"https://www.ntu.edu.tw/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.gov.tw/",
|
||||||
|
"https://www.post.gov.tw/",
|
||||||
|
"https://www.ntu.edu.tw/",
|
||||||
|
"https://www.cathaybk.com.tw/",
|
||||||
|
"https://www.thsrc.com.tw/",
|
||||||
|
"https://tw.yahoo.com/",
|
||||||
|
"https://www.momoshop.com.tw/",
|
||||||
|
"https://www.pchome.com.tw/",
|
||||||
"https://www.dcard.tw/"
|
"https://www.dcard.tw/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,10 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.bbc.co.uk/sounds/play/p0nfg1gs?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.bbc.co.uk/",
|
"https://www.bbc.co.uk/iplayer/episode/b01p6y1c/puss-in-boots?at_mid=ovYA47yS9y&at_campaign=Film_Puss_in_Boots&at_medium=display_ad&at_campaign_type=owned&at_nation=NET&at_audience_id=SS&at_product=iplayer&at_brand=b01p6y1c&at_ptr_name=bbc&at_ptr_type=media&at_format=image&at_objective=consumption&at_link_title=Film_Puss_in_Boots&at_bbc_team=BBC&at_creation=Film",
|
||||||
|
"https://www.bbc.com/news/articles/cpvx9yjk9ggo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cdxd1ew5kk7o?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.amazon.co.uk/",
|
"https://www.amazon.co.uk/",
|
||||||
"https://www.theguardian.com/uk"
|
"https://www.bbc.com/news/articles/ce9me55xe0xo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.nationalrail.co.uk/",
|
||||||
|
"https://www.nhs.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/ckg0vpeqk78o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/clyx7nnrkqdo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cm2934ep3zro?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cq59xvdzjv7o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cvg32z7jv7yo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cly032z5e71o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c3dlgz3mm39o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.ox.ac.uk/",
|
||||||
|
"https://www.barclays.co.uk/",
|
||||||
|
"https://www.gov.uk/",
|
||||||
|
"https://www.ebay.co.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/czjwr93vrrzo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.postoffice.co.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/c2482ql0zp4o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c0rxk4q0pj0o?at_medium=RSS&at_campaign=rss"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.gov.uk/",
|
||||||
|
"https://www.nhs.uk/",
|
||||||
|
"https://www.ox.ac.uk/",
|
||||||
|
"https://www.barclays.co.uk/",
|
||||||
|
"https://www.postoffice.co.uk/",
|
||||||
|
"https://www.nationalrail.co.uk/",
|
||||||
|
"https://www.amazon.co.uk/",
|
||||||
|
"https://www.ebay.co.uk/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://www.bbc.co.uk/",
|
"https://www.barclays.co.uk/",
|
||||||
"https://www.gov.uk/",
|
"https://www.bbc.com/news/articles/cly032z5e71o?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.amazon.co.uk/",
|
"https://www.bbc.com/news/articles/czjwr93vrrzo?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.theguardian.com/uk",
|
"https://www.bbc.com/news/articles/cvg32z7jv7yo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.co.uk/iplayer/episode/b01p6y1c/puss-in-boots?at_mid=ovYA47yS9y&at_campaign=Film_Puss_in_Boots&at_medium=display_ad&at_campaign_type=owned&at_nation=NET&at_audience_id=SS&at_product=iplayer&at_brand=b01p6y1c&at_ptr_name=bbc&at_ptr_type=media&at_format=image&at_objective=consumption&at_link_title=Film_Puss_in_Boots&at_bbc_team=BBC&at_creation=Film",
|
||||||
"https://www.nhs.uk/",
|
"https://www.nhs.uk/",
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.bbc.com/news/articles/cdxd1ew5kk7o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cq59xvdzjv7o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c0rxk4q0pj0o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c3dlgz3mm39o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/ce9me55xe0xo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cpvx9yjk9ggo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.gov.uk/",
|
||||||
|
"https://www.nationalrail.co.uk/",
|
||||||
|
"https://www.ebay.co.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/ckg0vpeqk78o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cm2934ep3zro?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.ox.ac.uk/",
|
||||||
|
"https://www.bbc.co.uk/sounds/play/p0nfg1gs?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/clyx7nnrkqdo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c2482ql0zp4o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.postoffice.co.uk/",
|
||||||
|
"https://www.amazon.co.uk/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.gov.uk/",
|
||||||
|
"https://www.nhs.uk/",
|
||||||
|
"https://www.ox.ac.uk/",
|
||||||
|
"https://www.barclays.co.uk/",
|
||||||
|
"https://www.postoffice.co.uk/",
|
||||||
|
"https://www.nationalrail.co.uk/",
|
||||||
|
"https://www.amazon.co.uk/",
|
||||||
"https://www.ebay.co.uk/"
|
"https://www.ebay.co.uk/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
"https://www.yahoo.com/",
|
"https://www.cdc.gov/",
|
||||||
"https://www.target.com/",
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
"https://www.npr.org/",
|
"https://www.usa.gov/",
|
||||||
"https://www.weather.com/",
|
|
||||||
"https://www.amazon.com/",
|
"https://www.amazon.com/",
|
||||||
"https://www.cdc.gov/"
|
"https://www.target.com/",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,14 +8,43 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
|
||||||
"https://www.yahoo.com/",
|
|
||||||
"https://www.target.com/",
|
"https://www.target.com/",
|
||||||
"https://www.npr.org/",
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
"https://www.weather.com/",
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
"https://www.amazon.com/",
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.cdc.gov/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
"https://www.cdc.gov/",
|
"https://www.cdc.gov/",
|
||||||
"https://www.mercurynews.com/"
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,50 @@
|
|||||||
{
|
{
|
||||||
"region_name": "United States - Warrenville",
|
"region_name": "United States - Warrenville",
|
||||||
"google_module": { "base_lat": 41.8164, "base_lon": -88.1748, "lang_params": "hl=en&gl=US", "valid_url_suffix": "com" },
|
"google_module": {
|
||||||
"trust_module": { "white_urls": [ "https://en.wikipedia.org/wiki/Special:Random", "https://www.yahoo.com/", "https://www.target.com/", "https://www.npr.org/", "https://www.weather.com/", "https://www.amazon.com/", "https://www.cdc.gov/" ] }
|
"base_lat": 41.8164,
|
||||||
}
|
"base_lon": -88.1748,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cdc.gov/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,50 @@
|
|||||||
{
|
{
|
||||||
"region_name": "United States - Charlotte",
|
"region_name": "United States - Charlotte",
|
||||||
"google_module": { "base_lat": 35.2271, "base_lon": -80.8431, "lang_params": "hl=en&gl=US", "valid_url_suffix": "com" },
|
"google_module": {
|
||||||
"trust_module": { "white_urls": [ "https://en.wikipedia.org/wiki/Special:Random", "https://www.yahoo.com/", "https://www.target.com/", "https://www.npr.org/", "https://www.weather.com/", "https://www.amazon.com/", "https://www.cdc.gov/" ] }
|
"base_lat": 35.2271,
|
||||||
}
|
"base_lon": -80.8431,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.bankofamerica.com/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,50 @@
|
|||||||
{
|
{
|
||||||
"region_name": "United States - Las Vegas",
|
"region_name": "United States - Las Vegas",
|
||||||
"google_module": { "base_lat": 36.1699, "base_lon": -115.1398, "lang_params": "hl=en&gl=US", "valid_url_suffix": "com" },
|
"google_module": {
|
||||||
"trust_module": { "white_urls": [ "https://en.wikipedia.org/wiki/Special:Random", "https://www.yahoo.com/", "https://www.target.com/", "https://www.npr.org/", "https://www.weather.com/", "https://www.amazon.com/", "https://www.cdc.gov/" ] }
|
"base_lat": 36.1699,
|
||||||
}
|
"base_lon": -115.1398,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,50 @@
|
|||||||
{
|
{
|
||||||
"region_name": "United States - Bend",
|
"region_name": "United States - Bend",
|
||||||
"google_module": { "base_lat": 44.0582, "base_lon": -121.3153, "lang_params": "hl=en&gl=US", "valid_url_suffix": "com" },
|
"google_module": {
|
||||||
"trust_module": { "white_urls": [ "https://en.wikipedia.org/wiki/Special:Random", "https://www.yahoo.com/", "https://www.target.com/", "https://www.npr.org/", "https://www.weather.com/", "https://www.amazon.com/", "https://www.cdc.gov/" ] }
|
"base_lat": 44.0582,
|
||||||
}
|
"base_lon": -121.3153,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
50
data/regions/US/TX/Dallas.json
Normal file
50
data/regions/US/TX/Dallas.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "United States - Dallas",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": 32.7767,
|
||||||
|
"base_lon": -96.797,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.cnn.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.foxnews.com/",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.nytimes.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.dallasnews.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.texas.gov/",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.texas.gov/",
|
||||||
|
"https://www.dallasnews.com/",
|
||||||
|
"https://www.cnn.com/",
|
||||||
|
"https://www.foxnews.com/",
|
||||||
|
"https://www.nytimes.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,50 @@
|
|||||||
{
|
{
|
||||||
"region_name": "United States - Salt Lake City",
|
"region_name": "United States - Salt Lake City",
|
||||||
"google_module": { "base_lat": 40.7608, "base_lon": -111.8910, "lang_params": "hl=en&gl=US", "valid_url_suffix": "com" },
|
"google_module": {
|
||||||
"trust_module": { "white_urls": [ "https://en.wikipedia.org/wiki/Special:Random", "https://www.yahoo.com/", "https://www.target.com/", "https://www.npr.org/", "https://www.weather.com/", "https://www.amazon.com/", "https://www.cdc.gov/" ] }
|
"base_lat": 40.7608,
|
||||||
}
|
"base_lon": -111.891,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,50 @@
|
|||||||
{
|
{
|
||||||
"region_name": "United States - Seattle",
|
"region_name": "United States - Seattle",
|
||||||
"google_module": { "base_lat": 47.6062, "base_lon": -122.3321, "lang_params": "hl=en&gl=US", "valid_url_suffix": "com" },
|
"google_module": {
|
||||||
"trust_module": { "white_urls": [ "https://en.wikipedia.org/wiki/Special:Random", "https://www.yahoo.com/", "https://www.target.com/", "https://www.npr.org/", "https://www.weather.com/", "https://www.amazon.com/", "https://www.cdc.gov/" ] }
|
"base_lat": 47.6062,
|
||||||
}
|
"base_lon": -122.3321,
|
||||||
|
"lang_params": "hl=en&gl=US",
|
||||||
|
"valid_url_suffix": "com"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.cnn.com/2023/04/14/entertainment/yellowjackets-90s-music/index.html",
|
||||||
|
"https://www.cnn.com/videos/tech/2023/04/18/apple-store-mumbai-india-ceo-tim-cook-vedika-sud-ovn-biz-ldn-vpx.cnn",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/mccarthy-biden-debt-ceiling/index.html",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/17/entertainment/jamie-foxx-remains-hospitalized/index.html",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/videos/business/2023/04/18/desantis-disney-competition-panel-reax-pt-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/opinions/medication-abortion-mifepristone-miscarriage-jones-ctpr/index.html",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/2023/04/17/health/rise-type-2-diabetes-global-wellness/index.html",
|
||||||
|
"https://www.npr.org/2026/04/25/nx-s1-5798943/justice-department-makes-it-easier-to-deport-those-with-daca-status",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/benadryl-tiktok-challenge-teen-death-wellness/index.html",
|
||||||
|
"https://www.cnn.com/videos/politics/2023/04/18/jake-tapper-dominion-lawsuit-settlement-fox-news-statement-lead-vpx.cnn",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/best-bidets?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/sport/damar-hamlin-cleared-to-train-nfl-spt-intl/index.html",
|
||||||
|
"https://www.chase.com/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.usps.com/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,13 +8,37 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://vi.wikipedia.org/wiki/Đặc_biệt:Ngẫu_nhiên",
|
"https://vnexpress.net/khoan-vay-106-ty-usd-cua-eu-thap-hy-vong-cho-ukraine-5066467.html",
|
||||||
|
"https://vnexpress.net/lan-dau-trinh-dien-flyboard-tren-bai-bien-cong-cong-da-nang-5067128.html",
|
||||||
|
"https://vnexpress.net/benh-sot-dat-co-vaccine-phong-ngua-chua-5067093.html",
|
||||||
"https://chinhphu.vn/",
|
"https://chinhphu.vn/",
|
||||||
"https://vnexpress.net/",
|
"https://vnexpress.net/chung-cu-han-quoc-bien-ban-cong-thanh-san-nha-cho-tung-can-ho-5067098.html",
|
||||||
"https://tuoitre.vn/",
|
"https://vnexpress.net/gu-thoi-trang-cua-my-nhan-dep-nhat-the-gioi-5067053.html",
|
||||||
"https://vtv.vn/",
|
"https://vnexpress.net/bai-chay-lan-dau-tien-co-pho-dem-phuc-vu-khach-du-lich-5067197.html",
|
||||||
"https://shopee.vn/",
|
"https://shopee.vn/",
|
||||||
"https://tiki.vn/"
|
"https://vnexpress.net/det-may-do-go-giam-ty-usd-khi-xuat-khau-sang-my-5067013.html",
|
||||||
|
"https://vnexpress.net/phao-hoa-thap-sang-bau-troi-viet-tri-truoc-ngay-gio-to-5067192.html",
|
||||||
|
"https://vnexpress.net/thach-nhu-trong-hang-dong-vua-phat-hien-o-phong-nha-ke-bang-5066888.html",
|
||||||
|
"https://vnexpress.net/niem-tin-nguoi-tieu-dung-my-thap-ky-luc-5067163.html",
|
||||||
|
"https://vnexpress.net/my-dong-y-de-venezuela-tra-phi-luat-su-cho-ong-maduro-5067160.html",
|
||||||
|
"https://vnexpress.net/nhieu-nguoi-gia-han-quoc-khong-duoc-phep-chet-tai-nha-5064789.html",
|
||||||
|
"https://tiki.vn/",
|
||||||
|
"https://www.vietcombank.com.vn/",
|
||||||
|
"https://dichvucong.gov.vn/",
|
||||||
|
"https://vnu.edu.vn/",
|
||||||
|
"https://vnexpress.net/ba-tuyen-duong-sat-toc-do-cao-ket-noi-voi-trung-quoc-5064455.html",
|
||||||
|
"https://vnexpress.net/ukraine-bien-may-bay-thoi-lien-xo-thanh-tau-san-bay-tren-khong-5067006.html",
|
||||||
|
"https://vnexpress.net/hanh-trinh-bat-bai-cua-viet-nam-khi-vo-dich-u17-dong-nam-a-5067122.html",
|
||||||
|
"https://vnexpress.net/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://chinhphu.vn/",
|
||||||
|
"https://dichvucong.gov.vn/",
|
||||||
|
"https://vnu.edu.vn/",
|
||||||
|
"https://www.vietcombank.com.vn/",
|
||||||
|
"https://shopee.vn/",
|
||||||
|
"https://tiki.vn/",
|
||||||
|
"https://vnexpress.net/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,10 +21,11 @@ REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
|||||||
|
|
||||||
# [核心: 动态提取 Master 专属版本锚点 (KV 解析法)]
|
# [核心: 动态提取 Master 专属版本锚点 (KV 解析法)]
|
||||||
# 通过 grep 定位 MASTER_VERSION 行,再通过 cut 提取等号右侧的值
|
# 通过 grep 定位 MASTER_VERSION 行,再通过 cut 提取等号右侧的值
|
||||||
TARGET_VERSION=$(curl -s -m 3 "${REPO_RAW_URL}/version.txt" | grep "^MASTER_VERSION=" | cut -d'=' -f2 | tr -d '[:space:]')
|
# [修复] 增加 -L 与双栈容灾 (-4),解决纯 V6 或 V6 优先机器连接 GitHub Raw 易超时的问题
|
||||||
|
TARGET_VERSION=$( (curl -sL -m 5 "${REPO_RAW_URL}/version.txt" || curl -4 -sL -m 5 "${REPO_RAW_URL}/version.txt") 2>/dev/null | grep "^MASTER_VERSION=" | cut -d'=' -f2 | tr -d '[:space:]')
|
||||||
|
|
||||||
# 🛡️ 兜底防线:如果网络波动拉取失败,启用内置的安全兜底版本
|
# 🛡️ 兜底防线:如果网络波动拉取失败,启用内置的最新兜底版本
|
||||||
TARGET_VERSION=${TARGET_VERSION:-"3.5.0"}
|
TARGET_VERSION=${TARGET_VERSION:-"4.0.0"}
|
||||||
|
|
||||||
MASTER_DIR="/opt/ip_sentinel_master"
|
MASTER_DIR="/opt/ip_sentinel_master"
|
||||||
DB_FILE="${MASTER_DIR}/sentinel.db"
|
DB_FILE="${MASTER_DIR}/sentinel.db"
|
||||||
@@ -128,9 +129,9 @@ echo -e "\033[32m✅ 旧进程已肃清!\033[0m"
|
|||||||
# =======================================================================
|
# =======================================================================
|
||||||
|
|
||||||
# 1. 依赖检查与智能安装 (v3.6.0 兼容性与优雅性升级)
|
# 1. 依赖检查与智能安装 (v3.6.0 兼容性与优雅性升级)
|
||||||
echo -e "\n[1/4] 正在探测核心依赖 (curl, jq, sqlite3, crontab, pgrep)..."
|
echo -e "\n[1/4] 正在探测核心依赖 (curl, jq, sqlite3, crontab, pgrep, openssl)..."
|
||||||
|
|
||||||
REQUIRED_CMDS=("curl" "jq" "sqlite3" "crontab" "pgrep")
|
REQUIRED_CMDS=("curl" "jq" "sqlite3" "crontab" "pgrep" "openssl")
|
||||||
MISSING_CMDS=()
|
MISSING_CMDS=()
|
||||||
|
|
||||||
# 基础探测:预检查缺失的命令
|
# 基础探测:预检查缺失的命令
|
||||||
@@ -146,29 +147,37 @@ if [ ${#MISSING_CMDS[@]} -gt 0 ]; then
|
|||||||
|
|
||||||
if command -v apt-get >/dev/null 2>&1; then
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
apt-get update -y >/dev/null 2>&1
|
apt-get update -y >/dev/null 2>&1
|
||||||
apt-get install -y curl jq sqlite3 cron procps >/dev/null 2>&1
|
# [v3.6.3 抽脂级优化] 注入 --no-install-recommends 拒绝捆绑销售
|
||||||
|
apt-get install -y --no-install-recommends curl jq sqlite3 cron procps openssl >/dev/null 2>&1
|
||||||
systemctl enable cron >/dev/null 2>&1 && systemctl start cron >/dev/null 2>&1
|
systemctl enable cron >/dev/null 2>&1 && systemctl start cron >/dev/null 2>&1
|
||||||
elif command -v yum >/dev/null 2>&1 || command -v dnf >/dev/null 2>&1; then
|
elif command -v yum >/dev/null 2>&1 || command -v dnf >/dev/null 2>&1; then
|
||||||
PKG_MGR="yum"
|
PKG_MGR="yum"
|
||||||
command -v dnf >/dev/null 2>&1 && PKG_MGR="dnf"
|
OPT_ARGS=""
|
||||||
$PKG_MGR install -y curl jq sqlite cronie procps-ng >/dev/null 2>&1
|
if command -v dnf >/dev/null 2>&1; then
|
||||||
|
PKG_MGR="dnf"
|
||||||
|
# [v3.6.3 抽脂级优化] 强行关闭 DNF 的弱依赖拉取
|
||||||
|
OPT_ARGS="--setopt=install_weak_deps=False"
|
||||||
|
fi
|
||||||
|
$PKG_MGR install -y $OPT_ARGS curl jq sqlite cronie procps-ng openssl >/dev/null 2>&1
|
||||||
systemctl enable crond >/dev/null 2>&1 && systemctl start crond >/dev/null 2>&1
|
systemctl enable crond >/dev/null 2>&1 && systemctl start crond >/dev/null 2>&1
|
||||||
elif command -v apk >/dev/null 2>&1; then
|
elif command -v apk >/dev/null 2>&1; then
|
||||||
echo "Alpine 探测到系统类型为 Alpine Linux,正在执行轻量级安装..."
|
echo "Alpine 探测到系统类型为 Alpine Linux,正在执行轻量级安装..."
|
||||||
apk add --no-cache curl jq sqlite dcron procps bash >/dev/null 2>&1
|
# [修复] 优先尝试 cronie,若失败则回退至系统内置 cron,彻底避免单点依赖拖垮全局
|
||||||
|
apk add --no-cache curl jq sqlite cronie procps bash openssl || apk add --no-cache curl jq sqlite procps bash openssl
|
||||||
mkdir -p /var/spool/cron/crontabs
|
mkdir -p /var/spool/cron/crontabs
|
||||||
rc-update add crond default >/dev/null 2>&1
|
rc-update add crond default >/dev/null 2>&1
|
||||||
service crond start >/dev/null 2>&1
|
service crond start >/dev/null 2>&1
|
||||||
elif command -v pacman >/dev/null 2>&1; then
|
elif command -v pacman >/dev/null 2>&1; then
|
||||||
pacman -Sy --noconfirm curl jq sqlite cronie procps-ng >/dev/null 2>&1
|
pacman -Sy --noconfirm curl jq sqlite cronie procps-ng openssl >/dev/null 2>&1
|
||||||
mkdir -p /root/.cache/crontab 2>/dev/null
|
mkdir -p /root/.cache/crontab 2>/dev/null
|
||||||
systemctl enable cronie >/dev/null 2>&1 && systemctl start cronie >/dev/null 2>&1
|
systemctl enable cronie >/dev/null 2>&1 && systemctl start cronie >/dev/null 2>&1
|
||||||
else
|
else
|
||||||
echo -e "\033[31m❌ 自动安装失败:系统未知的包管理器。\033[0m"
|
echo -e "\033[31m❌ 自动安装失败:系统未知的包管理器。\033[0m"
|
||||||
echo -e "\033[33m⚠️ 请手动执行以下安装命令后重新运行本脚本:\033[0m"
|
echo -e "\033[33m⚠️ 请手动执行以下安装命令后重新运行本脚本:\033[0m"
|
||||||
echo -e " Debian/Ubuntu: \033[36mapt-get update && apt-get install -y curl jq sqlite3 cron procps\033[0m"
|
echo -e " Debian/Ubuntu: \033[36mapt-get update && apt-get install -y --no-install-recommends curl jq sqlite3 cron procps openssl\033[0m"
|
||||||
echo -e " CentOS/RHEL: \033[36myum install -y curl jq sqlite cronie procps-ng\033[0m"
|
echo -e " CentOS/RHEL: \033[36myum install -y curl jq sqlite cronie procps-ng openssl\033[0m"
|
||||||
echo -e " Alpine Linux: \033[36mapk add --no-cache curl jq sqlite dcron procps bash\033[0m"
|
echo -e " Alpine Linux: \033[36mapk add --no-cache curl jq sqlite cronie procps bash openssl\033[0m"
|
||||||
|
echo -e " Arch Linux: \033[36mpacman -Sy curl jq sqlite cronie procps-ng openssl\033[0m"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -259,6 +268,17 @@ CREATE TABLE IF NOT EXISTS nodes (
|
|||||||
enable_ota TEXT DEFAULT 'false',
|
enable_ota TEXT DEFAULT 'false',
|
||||||
PRIMARY KEY(chat_id, node_name)
|
PRIMARY KEY(chat_id, node_name)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
-- [v4.0.0 新增, v4.0.2 扩容] 核心情报表:记录历史 IP 质量数据,用于绘制趋势图
|
||||||
|
CREATE TABLE IF NOT EXISTS ip_trend_log (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
node_name TEXT,
|
||||||
|
check_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
scam_score INTEGER,
|
||||||
|
goog_status TEXT,
|
||||||
|
nf_status TEXT,
|
||||||
|
gpt_status TEXT
|
||||||
|
);
|
||||||
EOF
|
EOF
|
||||||
echo "✅ 数据库创建成功: $DB_FILE"
|
echo "✅ 数据库创建成功: $DB_FILE"
|
||||||
|
|
||||||
@@ -339,12 +359,15 @@ echo "========================================================"
|
|||||||
# =================================================================
|
# =================================================================
|
||||||
|
|
||||||
# ================== [v3.1.2 新增: 玻璃房透明装机统计] ==================
|
# ================== [v3.1.2 新增: 玻璃房透明装机统计] ==================
|
||||||
echo -e "\n📡 正在向开源社区汇报装机量 (完全匿名,不收集IP)..."
|
# [修复] 仅在全新部署时触发统计,司令部热重载时绝对不触发
|
||||||
MASTER_COUNT=$(curl -s -m 3 "https://ip-sentinel-count.samanthaestime296.workers.dev/ping/master" || echo "")
|
if [ "$UPGRADE_MODE" == "false" ]; then
|
||||||
|
echo -e "\n📡 正在向开源社区汇报装机量 (完全匿名,不收集IP)..."
|
||||||
|
MASTER_COUNT=$(curl -s -m 3 "https://ip-sentinel-count.samanthaestime296.workers.dev/ping/master" || echo "")
|
||||||
|
|
||||||
if [ -n "$MASTER_COUNT" ] && [[ "$MASTER_COUNT" =~ ^[0-9]+$ ]]; then
|
if [ -n "$MASTER_COUNT" ] && [[ "$MASTER_COUNT" =~ ^[0-9]+$ ]]; then
|
||||||
echo -e "\033[32m✅ 感谢您成为全球第 ${MASTER_COUNT} 名 IP-Sentinel 指挥官!\033[0m"
|
echo -e "\033[32m✅ 感谢您成为全球第 ${MASTER_COUNT} 名 IP-Sentinel 指挥官!\033[0m"
|
||||||
else
|
else
|
||||||
echo -e "\033[32m✅ 感谢您建立 IP-Sentinel 司令部!\033[0m"
|
echo -e "\033[32m✅ 感谢您建立 IP-Sentinel 司令部!\033[0m"
|
||||||
|
fi
|
||||||
|
echo -e "\n"
|
||||||
fi
|
fi
|
||||||
echo -e "\n"
|
|
||||||
@@ -11,8 +11,7 @@ source "$CONF"
|
|||||||
|
|
||||||
# [核心: 运行态版本继承与云通信地址]
|
# [核心: 运行态版本继承与云通信地址]
|
||||||
REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
||||||
# 临时改为开发地址用于测试
|
|
||||||
# REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/v3.6.2-rc"
|
|
||||||
# MASTER_VERSION 已经在上方的 source "$CONF" 中被载入
|
# MASTER_VERSION 已经在上方的 source "$CONF" 中被载入
|
||||||
# 如果本地极度陈旧没有该变量,才给定一个基础兜底值,避免变量为空导致崩溃
|
# 如果本地极度陈旧没有该变量,才给定一个基础兜底值,避免变量为空导致崩溃
|
||||||
MASTER_VERSION=${MASTER_VERSION:-"3.5.0"}
|
MASTER_VERSION=${MASTER_VERSION:-"3.5.0"}
|
||||||
@@ -21,6 +20,26 @@ OFFSET_FILE="${MASTER_DIR}/.tg_offset"
|
|||||||
[[ -f $OFFSET_FILE ]] || echo "0" > $OFFSET_FILE
|
[[ -f $OFFSET_FILE ]] || echo "0" > $OFFSET_FILE
|
||||||
|
|
||||||
# --- 工具函数 ---
|
# --- 工具函数 ---
|
||||||
|
# ================== [v4.0.3 核心: 全球全能旗帜渲染引擎] ==================
|
||||||
|
get_flag() {
|
||||||
|
local region=$(echo "$1" | tr 'a-z' 'A-Z')
|
||||||
|
local base_cc="${region%%-*}" # 提取横杠前的主国家代码 (例如 US-TX 提取为 US)
|
||||||
|
local flag="🌐"
|
||||||
|
case "$base_cc" in
|
||||||
|
US) flag="🇺🇸" ;; JP) flag="🇯🇵" ;; HK) flag="🇭🇰" ;; TW) flag="🇹🇼" ;; SG) flag="🇸🇬" ;;
|
||||||
|
UK|GB) flag="🇬🇧" ;; DE) flag="🇩🇪" ;; FR) flag="🇫🇷" ;; NL) flag="🇳🇱" ;; CA) flag="🇨🇦" ;;
|
||||||
|
AU) flag="🇦🇺" ;; KR) flag="🇰🇷" ;; IN) flag="🇮🇳" ;; BR) flag="🇧🇷" ;; RU) flag="🇷🇺" ;;
|
||||||
|
CH) flag="🇨🇭" ;; SE) flag="🇸🇪" ;; NO) flag="🇳🇴" ;; DK) flag="🇩🇰" ;; FI) flag="🇫🇮" ;;
|
||||||
|
IT) flag="🇮🇹" ;; ES) flag="🇪🇸" ;; PT) flag="🇵🇹" ;; IE) flag="🇮🇪" ;; PL) flag="🇵🇱" ;;
|
||||||
|
AT) flag="🇦🇹" ;; BE) flag="🇧🇪" ;; TR) flag="🇹🇷" ;; ZA) flag="🇿🇦" ;; AE) flag="🇦🇪" ;;
|
||||||
|
MY) flag="🇲🇾" ;; ID) flag="🇮🇩" ;; VN) flag="🇻🇳" ;; TH) flag="🇹🇭" ;; PH) flag="🇵🇭" ;;
|
||||||
|
NZ) flag="🇳🇿" ;; AR) flag="🇦🇷" ;; CL) flag="🇨🇱" ;; MX) flag="🇲🇽" ;; IL) flag="🇮🇱" ;;
|
||||||
|
SA) flag="🇸🇦" ;; EG) flag="🇪🇬" ;; NG) flag="🇳🇬" ;; KE) flag="🇰🇪" ;; RO) flag="🇷🇴" ;;
|
||||||
|
BG) flag="🇧🇬" ;; CZ) flag="🇨🇿" ;; HU) flag="🇭🇺" ;; GR) flag="🇬🇷" ;; UA) flag="🇺🇦" ;;
|
||||||
|
esac
|
||||||
|
echo "$flag"
|
||||||
|
}
|
||||||
|
|
||||||
send_ui() {
|
send_ui() {
|
||||||
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/sendMessage" \
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/sendMessage" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
@@ -45,9 +64,9 @@ edit_ui() {
|
|||||||
-d "{\"chat_id\":\"$1\",\"message_id\":\"$2\",\"text\":\"$3\",\"parse_mode\":\"Markdown\",\"reply_markup\":{\"inline_keyboard\":$4}}" > /dev/null
|
-d "{\"chat_id\":\"$1\",\"message_id\":\"$2\",\"text\":\"$3\",\"parse_mode\":\"Markdown\",\"reply_markup\":{\"inline_keyboard\":$4}}" > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
# 数据库执行函数
|
# 数据库执行函数 (v3.6.3 终极静默版: 动用 .timeout 点命令防泄露)
|
||||||
db_exec() {
|
db_exec() {
|
||||||
sqlite3 "$DB_FILE" "$1"
|
printf ".timeout 5000\n%s\n" "$1" | sqlite3 "$DB_FILE"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ================== [v3.0.4 核心: 动态 HMAC 签名生成器] ==================
|
# ================== [v3.0.4 核心: 动态 HMAC 签名生成器] ==================
|
||||||
@@ -65,10 +84,15 @@ generate_signed_url() {
|
|||||||
local signature=$(echo -n "$payload" | openssl dgst -sha256 -hmac "$CHAT_ID" | awk '{print $NF}')
|
local signature=$(echo -n "$payload" | openssl dgst -sha256 -hmac "$CHAT_ID" | awk '{print $NF}')
|
||||||
|
|
||||||
# 返回最终带签名的 URL
|
# 返回最终带签名的 URL
|
||||||
echo "http://${target_ip}:${target_port}${action_path}?t=${current_t}&sign=${signature}"
|
echo "https://${target_ip}:${target_port}${action_path}?t=${current_t}&sign=${signature}"
|
||||||
}
|
}
|
||||||
# ========================================================================
|
# ========================================================================
|
||||||
|
|
||||||
|
# ================== [v3.6.3 核心: 激活 SQLite 高并发 WAL 引擎] ==================
|
||||||
|
db_exec "PRAGMA journal_mode=WAL;" > /dev/null 2>&1
|
||||||
|
db_exec "PRAGMA synchronous=NORMAL;" > /dev/null 2>&1
|
||||||
|
# ==============================================================================
|
||||||
|
|
||||||
# ================== [v3.1.3-v3.6.0 核心: 数据库结构无损热升级] ==================
|
# ================== [v3.1.3-v3.6.0 核心: 数据库结构无损热升级] ==================
|
||||||
# 自动探测并增加缺失字段,屏蔽已存在的报错,保护老节点数据
|
# 自动探测并增加缺失字段,屏蔽已存在的报错,保护老节点数据
|
||||||
db_exec "ALTER TABLE nodes ADD COLUMN region TEXT DEFAULT 'UNKNOWN';" 2>/dev/null
|
db_exec "ALTER TABLE nodes ADD COLUMN region TEXT DEFAULT 'UNKNOWN';" 2>/dev/null
|
||||||
@@ -78,6 +102,19 @@ db_exec "ALTER TABLE nodes ADD COLUMN enable_trust TEXT DEFAULT 'true';" 2>/dev/
|
|||||||
db_exec "ALTER TABLE nodes ADD COLUMN enable_ota TEXT DEFAULT 'false';" 2>/dev/null
|
db_exec "ALTER TABLE nodes ADD COLUMN enable_ota TEXT DEFAULT 'false';" 2>/dev/null
|
||||||
# ========================================================================
|
# ========================================================================
|
||||||
|
|
||||||
|
# ================== [v4.0.0/v4.0.2 核心: 增加 IP 质量趋势追踪表] ==================
|
||||||
|
db_exec "CREATE TABLE IF NOT EXISTS ip_trend_log (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
node_name TEXT,
|
||||||
|
check_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
scam_score INTEGER,
|
||||||
|
nf_status TEXT
|
||||||
|
);" 2>/dev/null
|
||||||
|
# [v4.0.2 热更新] 动态扩容 谷歌 与 ChatGPT 状态追踪字段
|
||||||
|
db_exec "ALTER TABLE ip_trend_log ADD COLUMN goog_status TEXT DEFAULT 'Unknown';" 2>/dev/null
|
||||||
|
db_exec "ALTER TABLE ip_trend_log ADD COLUMN gpt_status TEXT DEFAULT 'Unknown';" 2>/dev/null
|
||||||
|
# ========================================================================
|
||||||
|
|
||||||
# --- 核心轮询循环 ---
|
# --- 核心轮询循环 ---
|
||||||
while true; do
|
while true; do
|
||||||
OFFSET=$(cat $OFFSET_FILE)
|
OFFSET=$(cat $OFFSET_FILE)
|
||||||
@@ -92,6 +129,28 @@ while true; do
|
|||||||
|
|
||||||
CHAT_ID=$(echo "$UPDATE" | jq -r '.message.chat.id // .callback_query.message.chat.id')
|
CHAT_ID=$(echo "$UPDATE" | jq -r '.message.chat.id // .callback_query.message.chat.id')
|
||||||
TEXT=$(echo "$UPDATE" | jq -r '.message.text // .callback_query.data')
|
TEXT=$(echo "$UPDATE" | jq -r '.message.text // .callback_query.data')
|
||||||
|
|
||||||
|
# ================== [v4.0.2 核心: 态势感知按钮一键入库] ==================
|
||||||
|
if [[ "$TEXT" == "svq|"* ]]; then
|
||||||
|
# 格式: svq|NODE_NAME|SCORE|GOOG|NF|GPT
|
||||||
|
IFS='|' read -r MAGIC NODE_ID SCORE GOOG_ST NF_ST GPT_ST <<< "$TEXT"
|
||||||
|
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
||||||
|
|
||||||
|
if [ -n "$NODE_ID" ] && [ -n "$SCORE" ]; then
|
||||||
|
# 1. 写入 SQLite
|
||||||
|
db_exec "INSERT INTO ip_trend_log (node_name, scam_score, goog_status, nf_status, gpt_status) VALUES ('$NODE_ID', '$SCORE', '$GOOG_ST', '$NF_ST', '$GPT_ST');"
|
||||||
|
|
||||||
|
# 2. 无损修改原消息:移除入库按钮,展示绿勾状态 (不破坏 Markdown 战报原文)
|
||||||
|
if [ -n "$MSG_ID" ]; then
|
||||||
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/editMessageReplyMarkup" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "{\"chat_id\":\"${CHAT_ID}\",\"message_id\":\"${MSG_ID}\",\"reply_markup\":{\"inline_keyboard\":[[{\"text\":\"✅ 此报告已存档\",\"callback_data\":\"ignore\"}]]}}" > /dev/null
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
# ======================================================================
|
||||||
|
|
||||||
REPLY_TO_TEXT=$(echo "$UPDATE" | jq -r '.message.reply_to_message.text // empty')
|
REPLY_TO_TEXT=$(echo "$UPDATE" | jq -r '.message.reply_to_message.text // empty')
|
||||||
|
|
||||||
# ================== [v3.5.2 新增: 拦截别名修改的对话回复] ==================
|
# ================== [v3.5.2 新增: 拦截别名修改的对话回复] ==================
|
||||||
@@ -174,13 +233,7 @@ while true; do
|
|||||||
BTNS="["
|
BTNS="["
|
||||||
while IFS='|' read -r REGION_NAME NODE_COUNT; do
|
while IFS='|' read -r REGION_NAME NODE_COUNT; do
|
||||||
[ -z "$REGION_NAME" ] && REGION_NAME="UNKNOWN"
|
[ -z "$REGION_NAME" ] && REGION_NAME="UNKNOWN"
|
||||||
FLAG="🌐"
|
FLAG=$(get_flag "$REGION_NAME")
|
||||||
case "$REGION_NAME" in
|
|
||||||
"US") FLAG="🇺🇸" ;; "JP") FLAG="🇯🇵" ;; "HK") FLAG="🇭🇰" ;;
|
|
||||||
"SG") FLAG="🇸🇬" ;; "UK"|"GB") FLAG="🇬🇧" ;; "DE") FLAG="🇩🇪" ;; "FR") FLAG="🇫🇷" ;;
|
|
||||||
"CA") FLAG="🇨🇦" ;; "AU") FLAG="🇦🇺" ;; "KR") FLAG="🇰🇷" ;; "NL") FLAG="🇳🇱" ;;
|
|
||||||
"BR") FLAG="🇧🇷" ;; "IN") FLAG="🇮🇳" ;; "TW") FLAG="🇹🇼" ;;
|
|
||||||
esac
|
|
||||||
BTNS="$BTNS[{\"text\":\"$FLAG $REGION_NAME ($NODE_COUNT 台)\",\"callback_data\":\"region:$REGION_NAME\"}],"
|
BTNS="$BTNS[{\"text\":\"$FLAG $REGION_NAME ($NODE_COUNT 台)\",\"callback_data\":\"region:$REGION_NAME\"}],"
|
||||||
done <<< "$REGION_DATA"
|
done <<< "$REGION_DATA"
|
||||||
BTNS="${BTNS%,}]"
|
BTNS="${BTNS%,}]"
|
||||||
@@ -237,7 +290,8 @@ while true; do
|
|||||||
send_msg "$CHAT_ID" "📢 **司令部指令下达:正在唤醒全舰队执行 OTA 升级...**%0A*(节点升级成功后会主动发回新的入库确认,请注意查收)*"
|
send_msg "$CHAT_ID" "📢 **司令部指令下达:正在唤醒全舰队执行 OTA 升级...**%0A*(节点升级成功后会主动发回新的入库确认,请注意查收)*"
|
||||||
echo "$NODE_DATA" | while IFS='|' read -r NNAME AIP APORT; do
|
echo "$NODE_DATA" | while IFS='|' read -r NNAME AIP APORT; do
|
||||||
TARGET_URL=$(generate_signed_url "$AIP" "$APORT" "/trigger_ota")
|
TARGET_URL=$(generate_signed_url "$AIP" "$APORT" "/trigger_ota")
|
||||||
curl -s -m 5 "$TARGET_URL" > /dev/null &
|
# [灾难救援通道] 仅针对 OTA 允许一次明文回退,抢救缺失证书的老节点
|
||||||
|
{ curl -k -s -m 5 "$TARGET_URL" || curl -s -m 5 "${TARGET_URL/https:\/\//http:\/\/}"; } > /dev/null &
|
||||||
sleep 0.3 # 严格流量削峰
|
sleep 0.3 # 严格流量削峰
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
@@ -262,6 +316,17 @@ while true; do
|
|||||||
|
|
||||||
# 下载最新的 master install 脚本作为幽灵进程
|
# 下载最新的 master install 脚本作为幽灵进程
|
||||||
curl -fsSL "${REPO_RAW_URL}/master/install_master.sh" -o "/tmp/install_master.sh"
|
curl -fsSL "${REPO_RAW_URL}/master/install_master.sh" -o "/tmp/install_master.sh"
|
||||||
|
|
||||||
|
# [v3.6.3 修复] 🚀 OTA 防砖机制:严格校验脚本完整性
|
||||||
|
if ! bash -n "/tmp/install_master.sh" >/dev/null 2>&1; then
|
||||||
|
if [ -n "$MSG_ID" ]; then
|
||||||
|
edit_msg "$CHAT_ID" "$MSG_ID" "❌ OTA 传输受损:脚本下载不完整,已触发防砖熔断,升级取消!"
|
||||||
|
else
|
||||||
|
send_msg "$CHAT_ID" "❌ OTA 传输受损:脚本下载不完整,已触发防砖熔断,升级取消!"
|
||||||
|
fi
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
chmod +x "/tmp/install_master.sh"
|
chmod +x "/tmp/install_master.sh"
|
||||||
|
|
||||||
# 抛出幽灵进程进行脱壳升级,传递静默变量与回执 ID
|
# 抛出幽灵进程进行脱壳升级,传递静默变量与回执 ID
|
||||||
@@ -283,11 +348,13 @@ while true; do
|
|||||||
if [ -z "$NODE_DATA" ]; then
|
if [ -z "$NODE_DATA" ]; then
|
||||||
send_msg "$CHAT_ID" "⚠️ 您名下暂无在线节点。"
|
send_msg "$CHAT_ID" "⚠️ 您名下暂无在线节点。"
|
||||||
else
|
else
|
||||||
send_msg "$CHAT_ID" "📢 **司令部指令下达:正在召唤所有哨兵回传简报...**"
|
# [文案优化] 提前告知指挥官需要排队等待
|
||||||
|
send_msg "$CHAT_ID" "📢 **司令部指令下达:正在召唤所有哨兵回传简报...**%0A*(为防止触发 TG 官方限流,简报将排队依次送达,请耐心等待)*"
|
||||||
echo "$NODE_DATA" | while IFS='|' read -r NNAME AIP APORT; do
|
echo "$NODE_DATA" | while IFS='|' read -r NNAME AIP APORT; do
|
||||||
TARGET_URL=$(generate_signed_url "$AIP" "$APORT" "/trigger_report")
|
TARGET_URL=$(generate_signed_url "$AIP" "$APORT" "/trigger_report")
|
||||||
curl -s -m 5 "$TARGET_URL" > /dev/null &
|
curl -k -s -m 5 "$TARGET_URL" > /dev/null &
|
||||||
sleep 0.2 # [新增] 流量削峰:每秒最多并发下发 5 个,保护 Master 网络栈
|
# [致命修复] 强行休眠 2 秒!错开 TG 官方 1条/秒 的发信红线
|
||||||
|
sleep 2
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
@@ -301,13 +368,99 @@ while true; do
|
|||||||
send_msg "$CHAT_ID" "📢 **司令部指令下达:正在唤醒所有哨兵执行系统维护...**"
|
send_msg "$CHAT_ID" "📢 **司令部指令下达:正在唤醒所有哨兵执行系统维护...**"
|
||||||
echo "$NODE_DATA" | while IFS='|' read -r NNAME AIP APORT; do
|
echo "$NODE_DATA" | while IFS='|' read -r NNAME AIP APORT; do
|
||||||
TARGET_URL=$(generate_signed_url "$AIP" "$APORT" "/trigger_run")
|
TARGET_URL=$(generate_signed_url "$AIP" "$APORT" "/trigger_run")
|
||||||
curl -s -m 5 "$TARGET_URL" > /dev/null &
|
curl -k -s -m 5 "$TARGET_URL" > /dev/null &
|
||||||
sleep 0.2 # [新增] 流量削峰:防止瞬间 fork 导致句柄耗尽
|
sleep 0.2 # [新增] 流量削峰:防止瞬间 fork 导致句柄耗尽
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
# ====================================================================
|
# ====================================================================
|
||||||
|
|
||||||
|
# ------------------- 🚨 请将下面这段代码插入在这里 -------------------
|
||||||
|
|
||||||
|
# ================== [v4.0.0 新增: 文本指令直接控制通道] ==================
|
||||||
|
"/quality"|"/quality@"*)
|
||||||
|
TARGET_NODE=$(echo "$TEXT" | awk '{print $2}')
|
||||||
|
if [ -z "$TARGET_NODE" ]; then
|
||||||
|
send_msg "$CHAT_ID" "⚠️ 请指定目标节点。例如: \`/quality HK-1\`%0A或通过雷达面板进行选择操作。"
|
||||||
|
else
|
||||||
|
TARGET_NODE=$(echo "$TARGET_NODE" | tr -cd 'a-zA-Z0-9_.-')
|
||||||
|
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
||||||
|
|
||||||
|
# [加密通讯逻辑]
|
||||||
|
AGENT_INFO=$(db_exec "SELECT agent_ip, agent_port FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
AGENT_IP=$(echo "$AGENT_INFO" | cut -d'|' -f1)
|
||||||
|
AGENT_PORT=$(echo "$AGENT_INFO" | cut -d'|' -f2)
|
||||||
|
|
||||||
|
if [ -n "$AGENT_IP" ] && [ -n "$AGENT_PORT" ]; then
|
||||||
|
send_msg "$CHAT_ID" "⏳ 正在向 \`$TARGET_NODE\` ($AGENT_IP) 下发 [quality] 指令,请稍候..."
|
||||||
|
|
||||||
|
# 动态 HMAC 签名防篡改
|
||||||
|
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_quality")
|
||||||
|
RESPONSE=$(curl -k -s -m 5 "$TARGET_URL" || echo "FAILED")
|
||||||
|
if [ "$RESPONSE" == "FAILED" ] || [ -z "$RESPONSE" ]; then
|
||||||
|
TARGET_URL_HTTP="${TARGET_URL/https:\/\//http:\/\/}"
|
||||||
|
RESPONSE=$(curl -s -m 5 "$TARGET_URL_HTTP" || echo "FAILED")
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 结果判定
|
||||||
|
if [ "$RESPONSE" == "FAILED" ]; then
|
||||||
|
send_msg "$CHAT_ID" "❌ 指令下发超时或失败!请检查节点公网 IP 或防火墙端口 ($AGENT_PORT) 是否放行。"
|
||||||
|
elif [[ "$RESPONSE" == *"403"* ]]; then
|
||||||
|
send_msg "$CHAT_ID" "⚠️ **拒绝执行**:该节点未在本地开启此模块,请检查安装时的配置!"
|
||||||
|
else
|
||||||
|
send_msg "$CHAT_ID" "✅ 节点 \`$TARGET_NODE\` 回应: 🔍 深海声呐已投放!请等待异步战报回传。"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
send_msg "$CHAT_ID" "❌ 数据库中未找到该节点的通讯地址。"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
"/trend"|"/trend@"*)
|
||||||
|
TARGET_NODE=$(echo "$TEXT" | awk '{print $2}')
|
||||||
|
if [ -z "$TARGET_NODE" ]; then
|
||||||
|
send_msg "$CHAT_ID" "⚠️ 请指定目标节点。例如: \`/trend HK-1\`%0A或通过雷达面板进行选择操作。"
|
||||||
|
else
|
||||||
|
TARGET_NODE=$(echo "$TARGET_NODE" | tr -cd 'a-zA-Z0-9_.-')
|
||||||
|
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
||||||
|
|
||||||
|
TREND_DATA=$(db_exec "SELECT datetime(check_time, 'localtime'), scam_score, goog_status, nf_status, gpt_status FROM ip_trend_log WHERE node_name='$TARGET_NODE' ORDER BY check_time DESC LIMIT 15;")
|
||||||
|
|
||||||
|
if [ -z "$TREND_DATA" ]; then
|
||||||
|
send_msg "$CHAT_ID" "⚠️ 节点 \`$TARGET_NODE\` 暂无历史体检档案。请先执行 /quality 投放声呐进行探测。"
|
||||||
|
else
|
||||||
|
TARGET_ALIAS=$(db_exec "SELECT IFNULL(node_alias, node_name) FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
[ -z "$TARGET_ALIAS" ] && TARGET_ALIAS="$TARGET_NODE"
|
||||||
|
|
||||||
|
TEXT_RES="📈 *[${TARGET_ALIAS}] 历史态势感知 (近15次)*\n\n"
|
||||||
|
TEXT_RES+="时间(本地) | 风险 | 谷歌 | NF | GPT\n"
|
||||||
|
TEXT_RES+="-----------------------------------------\n"
|
||||||
|
|
||||||
|
while IFS='|' read -r c_time score goog nf gpt; do
|
||||||
|
[ -z "$score" ] && score="0"
|
||||||
|
[ -z "$goog" ] && goog="未知"
|
||||||
|
[ -z "$nf" ] && nf="未知"
|
||||||
|
[ -z "$gpt" ] && gpt="未知"
|
||||||
|
|
||||||
|
short_time=$(echo "$c_time" | cut -c 6-16)
|
||||||
|
|
||||||
|
if [ "$score" -le 20 ]; then SCORE_EMJ="🟢"
|
||||||
|
elif [ "$score" -le 60 ]; then SCORE_EMJ="🟡"
|
||||||
|
else SCORE_EMJ="🔴"
|
||||||
|
fi
|
||||||
|
|
||||||
|
TEXT_RES+="\`${short_time}\` | ${SCORE_EMJ}\`${score}\` | \`${goog}\` | \`${nf}\` | \`${gpt}\`\n"
|
||||||
|
done <<< "$TREND_DATA"
|
||||||
|
TEXT_RES+="\n_💡 提示:🔴风险分 >60 极易触发网页验证码拦截;谷歌显示 CN 即为高危送中。_"
|
||||||
|
|
||||||
|
# [v4.0.3 体验升级] 注入交互式控制台按钮
|
||||||
|
BTNS="[[{\"text\":\"⚙️ 调出该节点控制台\",\"callback_data\":\"manage:$TARGET_NODE\"}]]"
|
||||||
|
send_ui "$CHAT_ID" "$TEXT_RES" "$BTNS"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
# ------------------- 🚨 插入代码到此结束 -------------------
|
||||||
|
|
||||||
"list_nodes")
|
"list_nodes")
|
||||||
# 【V3.1.3】一级菜单:大区聚合并列出数量
|
# 【V3.1.3】一级菜单:大区聚合并列出数量
|
||||||
REGION_DATA=$(db_exec "SELECT region, COUNT(*) FROM nodes WHERE chat_id='$CHAT_ID' GROUP BY region;")
|
REGION_DATA=$(db_exec "SELECT region, COUNT(*) FROM nodes WHERE chat_id='$CHAT_ID' GROUP BY region;")
|
||||||
@@ -317,14 +470,8 @@ while true; do
|
|||||||
BTNS="["
|
BTNS="["
|
||||||
while IFS='|' read -r REGION_NAME NODE_COUNT; do
|
while IFS='|' read -r REGION_NAME NODE_COUNT; do
|
||||||
[ -z "$REGION_NAME" ] && REGION_NAME="UNKNOWN"
|
[ -z "$REGION_NAME" ] && REGION_NAME="UNKNOWN"
|
||||||
FLAG="🌐"
|
FLAG=$(get_flag "$REGION_NAME")
|
||||||
case "$REGION_NAME" in
|
BTNS="$BTNS[{\"text\":\"$FLAG $REGION_NAME ($NODE_COUNT 台)\",\"callback_data\":\"region:$REGION_NAME\"}],"
|
||||||
"US") FLAG="🇺🇸" ;; "JP") FLAG="🇯🇵" ;; "HK") FLAG="🇭🇰" ;;
|
|
||||||
"SG") FLAG="🇸🇬" ;; "UK"|"GB") FLAG="🇬🇧" ;; "DE") FLAG="🇩🇪" ;; "FR") FLAG="🇫🇷" ;;
|
|
||||||
"CA") FLAG="🇨🇦" ;; "AU") FLAG="🇦🇺" ;; "KR") FLAG="🇰🇷" ;; "NL") FLAG="🇳🇱" ;;
|
|
||||||
"BR") FLAG="🇧🇷" ;; "IN") FLAG="🇮🇳" ;; "TW") FLAG="🇹🇼" ;;
|
|
||||||
esac
|
|
||||||
BTNS="$BTNS[{\"text\":\"$FLAG $REGION_NAME ($NODE_COUNT 台)\",\"callback_data\":\"region:$REGION_NAME\"}],"
|
|
||||||
done <<< "$REGION_DATA"
|
done <<< "$REGION_DATA"
|
||||||
# L1 追加返回中枢逃生舱
|
# L1 追加返回中枢逃生舱
|
||||||
BTNS="$BTNS[{\"text\":\"🏠 回到司令部\",\"callback_data\":\"/start\"}]]"
|
BTNS="$BTNS[{\"text\":\"🏠 回到司令部\",\"callback_data\":\"/start\"}]]"
|
||||||
@@ -384,8 +531,8 @@ while true; do
|
|||||||
[ "$ST_GOOGLE" == "true" ] && BTN_G="🟢 Google巡逻: 已开" && ACT_G="false" || { BTN_G="🔴 Google巡逻: 已停"; ACT_G="true"; }
|
[ "$ST_GOOGLE" == "true" ] && BTN_G="🟢 Google巡逻: 已开" && ACT_G="false" || { BTN_G="🔴 Google巡逻: 已停"; ACT_G="true"; }
|
||||||
[ "$ST_TRUST" == "true" ] && BTN_T="🟢 信用净化: 已开" && ACT_T="false" || { BTN_T="🔴 信用净化: 已停"; ACT_T="true"; }
|
[ "$ST_TRUST" == "true" ] && BTN_T="🟢 信用净化: 已开" && ACT_T="false" || { BTN_T="🔴 信用净化: 已停"; ACT_T="true"; }
|
||||||
|
|
||||||
# 模块一:即时战术动作
|
# 模块一:即时战术动作 (V4.0.0 引入深海声呐与趋势面板)
|
||||||
BTN_ACTION="[{\"text\":\"📍 触发 Google 纠偏\",\"callback_data\":\"google:$TARGET_NODE\"}, {\"text\":\"🛡️ 触发信用净化\",\"callback_data\":\"trust:$TARGET_NODE\"}], [{\"text\":\"📜 提取终端实时日志\",\"callback_data\":\"log:$TARGET_NODE\"}, {\"text\":\"📊 生成单机战报\",\"callback_data\":\"report:$TARGET_NODE\"}]"
|
BTN_ACTION="[{\"text\":\"📍 触发 Google 纠偏\",\"callback_data\":\"google:$TARGET_NODE\"}, {\"text\":\"🛡️ 触发信用净化\",\"callback_data\":\"trust:$TARGET_NODE\"}], [{\"text\":\"🔍 投放深海声呐 (查IP质量)\",\"callback_data\":\"quality:$TARGET_NODE\"}, {\"text\":\"📈 查看 IP 污染趋势图\",\"callback_data\":\"trend:$TARGET_NODE\"}], [{\"text\":\"📜 提取终端实时日志\",\"callback_data\":\"log:$TARGET_NODE\"}, {\"text\":\"📊 生成单机战报\",\"callback_data\":\"report:$TARGET_NODE\"}]"
|
||||||
|
|
||||||
# 模块二:养护状态启停
|
# 模块二:养护状态启停
|
||||||
BTN_TOGGLE="[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}, {\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}]"
|
BTN_TOGGLE="[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}, {\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}]"
|
||||||
@@ -425,7 +572,8 @@ while true; do
|
|||||||
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_toggle")
|
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_toggle")
|
||||||
TARGET_URL="${TARGET_URL}&mod=${MOD_NAME}&state=${TARGET_STATE}"
|
TARGET_URL="${TARGET_URL}&mod=${MOD_NAME}&state=${TARGET_STATE}"
|
||||||
|
|
||||||
RESPONSE=$(curl -s -m 5 "$TARGET_URL" || echo "FAILED")
|
RESPONSE=$(curl -k -s -m 5 "$TARGET_URL" || echo "FAILED")
|
||||||
|
|
||||||
if [[ "$RESPONSE" == *"Action Accepted"* ]]; then
|
if [[ "$RESPONSE" == *"Action Accepted"* ]]; then
|
||||||
# 下发成功,更新 DB,原位重绘
|
# 下发成功,更新 DB,原位重绘
|
||||||
db_exec "UPDATE nodes SET enable_${MOD_NAME}='$TARGET_STATE' WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE';"
|
db_exec "UPDATE nodes SET enable_${MOD_NAME}='$TARGET_STATE' WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE';"
|
||||||
@@ -447,7 +595,8 @@ while true; do
|
|||||||
[ "$ST_GOOGLE" == "true" ] && BTN_G="🟢 Google巡逻: 已开" && ACT_G="false" || { BTN_G="🔴 Google巡逻: 已停"; ACT_G="true"; }
|
[ "$ST_GOOGLE" == "true" ] && BTN_G="🟢 Google巡逻: 已开" && ACT_G="false" || { BTN_G="🔴 Google巡逻: 已停"; ACT_G="true"; }
|
||||||
[ "$ST_TRUST" == "true" ] && BTN_T="🟢 信用净化: 已开" && ACT_T="false" || { BTN_T="🔴 信用净化: 已停"; ACT_T="true"; }
|
[ "$ST_TRUST" == "true" ] && BTN_T="🟢 信用净化: 已开" && ACT_T="false" || { BTN_T="🔴 信用净化: 已停"; ACT_T="true"; }
|
||||||
|
|
||||||
BTN_ACTION="[{\"text\":\"📍 触发 Google 纠偏\",\"callback_data\":\"google:$TARGET_NODE\"}, {\"text\":\"🛡️ 触发信用净化\",\"callback_data\":\"trust:$TARGET_NODE\"}], [{\"text\":\"📜 提取终端实时日志\",\"callback_data\":\"log:$TARGET_NODE\"}, {\"text\":\"📊 生成单机战报\",\"callback_data\":\"report:$TARGET_NODE\"}]"
|
# 模块一:即时战术动作 (V4.0.0 引入深海声呐与趋势面板)
|
||||||
|
BTN_ACTION="[{\"text\":\"📍 触发 Google 纠偏\",\"callback_data\":\"google:$TARGET_NODE\"}, {\"text\":\"🛡️ 触发信用净化\",\"callback_data\":\"trust:$TARGET_NODE\"}], [{\"text\":\"🔍 投放深海声呐 (查IP质量)\",\"callback_data\":\"quality:$TARGET_NODE\"}, {\"text\":\"📈 查看 IP 污染趋势图\",\"callback_data\":\"trend:$TARGET_NODE\"}], [{\"text\":\"📜 提取终端实时日志\",\"callback_data\":\"log:$TARGET_NODE\"}, {\"text\":\"📊 生成单机战报\",\"callback_data\":\"report:$TARGET_NODE\"}]"
|
||||||
BTN_TOGGLE="[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}, {\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}]"
|
BTN_TOGGLE="[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}, {\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}]"
|
||||||
|
|
||||||
if [ "$IS_OFFICIAL_GATEWAY" != "true" ] && [ "$ST_OTA" == "true" ]; then
|
if [ "$IS_OFFICIAL_GATEWAY" != "true" ] && [ "$ST_OTA" == "true" ]; then
|
||||||
@@ -463,7 +612,7 @@ while true; do
|
|||||||
TEXT_MSG="⚙️ **目标锁定**: \`$TARGET_ALIAS\`\n(底层标识: \`$TARGET_NODE\`)\n🌐 IP 坐标: \`$A_IP\`\n🕒 最后通讯: \`$LAST_SEEN\`\n\n✅ **执行成功**: 模块 [$MOD_NAME] 状态已切换为 $TARGET_STATE!"
|
TEXT_MSG="⚙️ **目标锁定**: \`$TARGET_ALIAS\`\n(底层标识: \`$TARGET_NODE\`)\n🌐 IP 坐标: \`$A_IP\`\n🕒 最后通讯: \`$LAST_SEEN\`\n\n✅ **执行成功**: 模块 [$MOD_NAME] 状态已切换为 $TARGET_STATE!"
|
||||||
edit_ui "$CHAT_ID" "$MSG_ID" "$TEXT_MSG" "$BTNS"
|
edit_ui "$CHAT_ID" "$MSG_ID" "$TEXT_MSG" "$BTNS"
|
||||||
else
|
else
|
||||||
send_msg "$CHAT_ID" "❌ 指令下发失败,节点可能离线或未更新至 v3.5.3。"
|
send_msg "$CHAT_ID" "❌ 指令下发失败,安全策略禁止降级重试。"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
@@ -473,8 +622,19 @@ while true; do
|
|||||||
TARGET_NODE=$(echo "${TEXT#*:}" | tr -cd 'a-zA-Z0-9_.-')
|
TARGET_NODE=$(echo "${TEXT#*:}" | tr -cd 'a-zA-Z0-9_.-')
|
||||||
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
||||||
|
|
||||||
db_exec "DELETE FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE';"
|
# 🛡️ [终极防线: 防越权横向打击] 先校验该节点是否真实属于当前操作者!
|
||||||
send_msg "$CHAT_ID" "🗑️ 节点 \`$TARGET_NODE\` 的档案已从司令部彻底销毁!"
|
# 因为趋势库中没有 Chat_ID 标识,不校验直接删会给黑客伪造回调清空他人数据的机会!
|
||||||
|
VALID_OWNER=$(db_exec "SELECT 1 FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
|
||||||
|
if [ "$VALID_OWNER" == "1" ]; then
|
||||||
|
# 验权通过,执行原子化级联销毁:同时抹除主配置与历史污染趋势
|
||||||
|
db_exec "DELETE FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE';"
|
||||||
|
db_exec "DELETE FROM ip_trend_log WHERE node_name='$TARGET_NODE';"
|
||||||
|
send_msg "$CHAT_ID" "🗑️ 节点 \`$TARGET_NODE\` 的档案及历史污染趋势已从司令部彻底销毁!"
|
||||||
|
else
|
||||||
|
send_msg "$CHAT_ID" "⛔ **安全拦截**:销毁失败。目标节点不存在或您无权越权操作!"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
# 剔除后直接返回上级一级雷达菜单
|
# 剔除后直接返回上级一级雷达菜单
|
||||||
REGION_DATA=$(db_exec "SELECT region, COUNT(*) FROM nodes WHERE chat_id='$CHAT_ID' GROUP BY region;")
|
REGION_DATA=$(db_exec "SELECT region, COUNT(*) FROM nodes WHERE chat_id='$CHAT_ID' GROUP BY region;")
|
||||||
@@ -484,13 +644,7 @@ while true; do
|
|||||||
BTNS="["
|
BTNS="["
|
||||||
while IFS='|' read -r REGION_NAME NODE_COUNT; do
|
while IFS='|' read -r REGION_NAME NODE_COUNT; do
|
||||||
[ -z "$REGION_NAME" ] && REGION_NAME="UNKNOWN"
|
[ -z "$REGION_NAME" ] && REGION_NAME="UNKNOWN"
|
||||||
FLAG="🌐"
|
FLAG=$(get_flag "$REGION_NAME")
|
||||||
case "$REGION_NAME" in
|
|
||||||
"US") FLAG="🇺🇸" ;; "JP") FLAG="🇯🇵" ;; "HK") FLAG="🇭🇰" ;;
|
|
||||||
"SG") FLAG="🇸🇬" ;; "UK"|"GB") FLAG="🇬🇧" ;; "DE") FLAG="🇩🇪" ;; "FR") FLAG="🇫🇷" ;;
|
|
||||||
"CA") FLAG="🇨🇦" ;; "AU") FLAG="🇦🇺" ;; "KR") FLAG="🇰🇷" ;; "NL") FLAG="🇳🇱" ;;
|
|
||||||
"BR") FLAG="🇧🇷" ;; "IN") FLAG="🇮🇳" ;; "TW") FLAG="🇹🇼" ;;
|
|
||||||
esac
|
|
||||||
BTNS="$BTNS[{\"text\":\"$FLAG $REGION_NAME ($NODE_COUNT 台)\",\"callback_data\":\"region:$REGION_NAME\"}],"
|
BTNS="$BTNS[{\"text\":\"$FLAG $REGION_NAME ($NODE_COUNT 台)\",\"callback_data\":\"region:$REGION_NAME\"}],"
|
||||||
done <<< "$REGION_DATA"
|
done <<< "$REGION_DATA"
|
||||||
BTNS="${BTNS%,}]"
|
BTNS="${BTNS%,}]"
|
||||||
@@ -525,10 +679,10 @@ while true; do
|
|||||||
ALIAS_B64=$(echo -n "$NEW_ALIAS" | base64 | tr -d '\n' | tr '+/' '-_')
|
ALIAS_B64=$(echo -n "$NEW_ALIAS" | base64 | tr -d '\n' | tr '+/' '-_')
|
||||||
TARGET_URL="${TARGET_URL}&b64=${ALIAS_B64}"
|
TARGET_URL="${TARGET_URL}&b64=${ALIAS_B64}"
|
||||||
|
|
||||||
RESPONSE=$(curl -s -m 5 "$TARGET_URL" || echo "FAILED")
|
RESPONSE=$(curl -k -s -m 5 "$TARGET_URL" || echo "FAILED")
|
||||||
|
|
||||||
if [ "$RESPONSE" == "FAILED" ]; then
|
if [ "$RESPONSE" == "FAILED" ]; then
|
||||||
send_msg "$CHAT_ID" "❌ 指令下发超时!请检查节点连通性。"
|
send_msg "$CHAT_ID" "❌ 指令下发超时!为防范劫持风险,已终止请求。"
|
||||||
elif [[ "$RESPONSE" == *"Action Accepted"* ]]; then
|
elif [[ "$RESPONSE" == *"Action Accepted"* ]]; then
|
||||||
# [v3.5.2 极致丝滑] 确认 Agent 修改成功后,Master 立即自动同步本地 SQLite 数据库!
|
# [v3.5.2 极致丝滑] 确认 Agent 修改成功后,Master 立即自动同步本地 SQLite 数据库!
|
||||||
db_exec "UPDATE nodes SET node_alias='$NEW_ALIAS' WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE';"
|
db_exec "UPDATE nodes SET node_alias='$NEW_ALIAS' WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE';"
|
||||||
@@ -565,14 +719,22 @@ while true; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_ota")
|
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_ota")
|
||||||
RESPONSE=$(curl -s -m 5 "$TARGET_URL" || echo "FAILED")
|
RESPONSE=$(curl -k -s -m 5 "$TARGET_URL" || echo "FAILED")
|
||||||
|
|
||||||
|
# [灾难救援通道] 仅针对 OTA 开放一次性明文降级,用于抢救缺失 openssl 证书的老节点
|
||||||
if [ "$RESPONSE" == "FAILED" ]; then
|
if [ "$RESPONSE" == "FAILED" ]; then
|
||||||
TEXT_RES="❌ OTA 指令下发超时!请检查节点公网连通性。"
|
TARGET_URL_HTTP="${TARGET_URL/https:\/\//http:\/\/}"
|
||||||
|
RESPONSE=$(curl -s -m 5 "$TARGET_URL_HTTP" || echo "FAILED")
|
||||||
|
|
||||||
|
if [[ "$RESPONSE" == *"Action Accepted"* ]]; then
|
||||||
|
TEXT_RES="⚠️ **明文救援成功**:该节点因缺失证书处于 HTTP 裸奔状态!已强行下发 OTA 抢救指令,请等待其重构 TLS 装甲。"
|
||||||
|
else
|
||||||
|
TEXT_RES="❌ OTA 指令下发彻底失败!节点已失联或网络阻断。"
|
||||||
|
fi
|
||||||
elif [[ "$RESPONSE" == *"403"* ]]; then
|
elif [[ "$RESPONSE" == *"403"* ]]; then
|
||||||
TEXT_RES="⚠️ **节点拒绝执行**:该节点本地未开启 OTA 权限或运行在官方网关下!"
|
TEXT_RES="⚠️ **节点拒绝执行**:该节点本地未开启 OTA 权限或运行在官方网关下!"
|
||||||
else
|
else
|
||||||
TEXT_RES="✅ OTA 触发成功!节点正在后台执行拉取重构,请等待其发送更新完成的回执消息。"
|
TEXT_RES="✅ OTA (TLS加密) 触发成功!节点正在后台执行拉取重构..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$MSG_ID" ]; then
|
if [ -n "$MSG_ID" ]; then
|
||||||
@@ -585,10 +747,10 @@ while true; do
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# 【核心升级】增加拦截规则,支持 google 和 trust 前缀
|
# 【核心升级 v4.0.0】增加拦截规则,支持 quality 前缀
|
||||||
google:*|trust:*|run:*|report:*|log:*)
|
google:*|trust:*|run:*|report:*|log:*|quality:*)
|
||||||
# 🛡️ 提取并强制过滤动作参数、节点名与 CHAT_ID
|
# 🛡️ 提取并强制过滤动作参数、节点名与 CHAT_ID
|
||||||
ACTION_TYPE=$(echo "$TEXT" | cut -d':' -f1 | tr -cd 'a-z')
|
ACTION_TYPE=$(echo "$TEXT" | cut -d':' -f1)
|
||||||
TARGET_NODE=$(echo "$TEXT" | cut -d':' -f2 | tr -cd 'a-zA-Z0-9_.-')
|
TARGET_NODE=$(echo "$TEXT" | cut -d':' -f2 | tr -cd 'a-zA-Z0-9_.-')
|
||||||
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
||||||
|
|
||||||
@@ -606,11 +768,11 @@ while true; do
|
|||||||
|
|
||||||
# 🛡️ [v3.0.4] 动态签名生成与触发 (防重放与防篡改)
|
# 🛡️ [v3.0.4] 动态签名生成与触发 (防重放与防篡改)
|
||||||
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_${ACTION_TYPE}")
|
TARGET_URL=$(generate_signed_url "$AGENT_IP" "$AGENT_PORT" "/trigger_${ACTION_TYPE}")
|
||||||
RESPONSE=$(curl -s -m 5 "$TARGET_URL" || echo "FAILED")
|
RESPONSE=$(curl -k -s -m 5 "$TARGET_URL" || echo "FAILED")
|
||||||
|
|
||||||
# 结果判定
|
# 结果判定
|
||||||
if [ "$RESPONSE" == "FAILED" ]; then
|
if [ "$RESPONSE" == "FAILED" ]; then
|
||||||
TEXT_RES="❌ 指令下发超时或失败!请检查节点公网 IP 或防火墙端口 ($AGENT_PORT) 是否放行。"
|
TEXT_RES="❌ 指令下发超时或失败!为保护链路安全,已终止通信 (严禁降级为 HTTP)。"
|
||||||
elif [[ "$RESPONSE" == *"403"* ]]; then
|
elif [[ "$RESPONSE" == *"403"* ]]; then
|
||||||
TEXT_RES="⚠️ **拒绝执行**:该节点未在本地开启此模块,请检查安装时的配置!"
|
TEXT_RES="⚠️ **拒绝执行**:该节点未在本地开启此模块,请检查安装时的配置!"
|
||||||
else
|
else
|
||||||
@@ -618,6 +780,8 @@ while true; do
|
|||||||
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 回应: 📍 Google 纠偏程序启动。"
|
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 回应: 📍 Google 纠偏程序启动。"
|
||||||
elif [ "$ACTION_TYPE" == "trust" ]; then
|
elif [ "$ACTION_TYPE" == "trust" ]; then
|
||||||
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 回应: 🛡️ IP 信用净化程序启动。"
|
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 回应: 🛡️ IP 信用净化程序启动。"
|
||||||
|
elif [ "$ACTION_TYPE" == "quality" ]; then
|
||||||
|
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 回应: 🔍 深海声呐已投放!请等待异步战报回传。"
|
||||||
elif [ "$ACTION_TYPE" == "log" ]; then
|
elif [ "$ACTION_TYPE" == "log" ]; then
|
||||||
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 正在抓取日志..."
|
TEXT_RES="✅ 节点 \`$TARGET_NODE\` 正在抓取日志..."
|
||||||
else
|
else
|
||||||
@@ -635,6 +799,55 @@ while true; do
|
|||||||
send_msg "$CHAT_ID" "❌ 数据库中未找到该节点的通讯地址。"
|
send_msg "$CHAT_ID" "❌ 数据库中未找到该节点的通讯地址。"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
||||||
|
trend:*)
|
||||||
|
# [v4.0.2 优化: 扩容 15 次追踪并引入 GOOG/GPT 状态]
|
||||||
|
TARGET_NODE=$(echo "${TEXT#*:}" | tr -cd 'a-zA-Z0-9_.-')
|
||||||
|
CHAT_ID=$(echo "$CHAT_ID" | tr -cd '0-9-')
|
||||||
|
|
||||||
|
TREND_DATA=$(db_exec "SELECT datetime(check_time, 'localtime'), scam_score, goog_status, nf_status, gpt_status FROM ip_trend_log WHERE node_name='$TARGET_NODE' ORDER BY check_time DESC LIMIT 15;")
|
||||||
|
|
||||||
|
if [ -z "$TREND_DATA" ]; then
|
||||||
|
TEXT_RES="⚠️ 节点 \`$TARGET_NODE\` 暂无历史体检档案。请先执行 [🔍 投放深海声呐] 进行探测。"
|
||||||
|
else
|
||||||
|
TARGET_ALIAS=$(db_exec "SELECT IFNULL(node_alias, node_name) FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
[ -z "$TARGET_ALIAS" ] && TARGET_ALIAS="$TARGET_NODE"
|
||||||
|
|
||||||
|
TEXT_RES="📈 *[${TARGET_ALIAS}] 历史态势感知 (近15次)*\n\n"
|
||||||
|
TEXT_RES+="时间(本地) | 风险 | 谷歌 | NF | GPT\n"
|
||||||
|
TEXT_RES+="-----------------------------------------\n"
|
||||||
|
|
||||||
|
while IFS='|' read -r c_time score goog nf gpt; do
|
||||||
|
[ -z "$score" ] && score="0"
|
||||||
|
[ -z "$goog" ] && goog="未知"
|
||||||
|
[ -z "$nf" ] && nf="未知"
|
||||||
|
[ -z "$gpt" ] && gpt="未知"
|
||||||
|
|
||||||
|
# 时间做极简切割 (截取 04-24 20:52) 节省横向空间
|
||||||
|
short_time=$(echo "$c_time" | cut -c 6-16)
|
||||||
|
|
||||||
|
if [ "$score" -le 20 ]; then SCORE_EMJ="🟢"
|
||||||
|
elif [ "$score" -le 60 ]; then SCORE_EMJ="🟡"
|
||||||
|
else SCORE_EMJ="🔴"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 拼接紧凑排版
|
||||||
|
TEXT_RES+="\`${short_time}\` | ${SCORE_EMJ}\`${score}\` | \`${goog}\` | \`${nf}\` | \`${gpt}\`\n"
|
||||||
|
done <<< "$TREND_DATA"
|
||||||
|
TEXT_RES+="\n_💡 提示:🔴风险分 >60 极易触发网页验证码拦截;谷歌显示 CN 即为高危送中。_"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# [v4.0.3 体验升级] 注入交互式控制台按钮,并调用原生 UI 重绘函数
|
||||||
|
BTNS="[[{\"text\":\"⚙️ 调出该节点控制台\",\"callback_data\":\"manage:$TARGET_NODE\"}]]"
|
||||||
|
|
||||||
|
if [ -n "$MSG_ID" ]; then
|
||||||
|
edit_ui "$CHAT_ID" "$MSG_ID" "$TEXT_RES" "$BTNS"
|
||||||
|
else
|
||||||
|
send_ui "$CHAT_ID" "$TEXT_RES" "$BTNS"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|||||||
103
scripts/fetch_trust_urls.py
Normal file
103
scripts/fetch_trust_urls.py
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
import urllib.request
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
import os
|
||||||
|
import json
|
||||||
|
import random
|
||||||
|
|
||||||
|
# ================== [路径防弹装甲] ==================
|
||||||
|
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
PROJECT_ROOT = os.path.dirname(SCRIPT_DIR)
|
||||||
|
REGIONS_DIR = os.path.join(PROJECT_ROOT, "data", "regions")
|
||||||
|
# ====================================================
|
||||||
|
|
||||||
|
HEADERS = {
|
||||||
|
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
|
||||||
|
}
|
||||||
|
|
||||||
|
# 全球骨干新闻 RSS 监听矩阵
|
||||||
|
RSS_FEEDS = {
|
||||||
|
"US": ["http://rss.cnn.com/rss/cnn_topstories.rss", "https://feeds.npr.org/1001/rss.xml"],
|
||||||
|
"UK": ["http://feeds.bbci.co.uk/news/rss.xml"],
|
||||||
|
"AU": ["https://www.abc.net.au/news/feed/51120/rss.xml"],
|
||||||
|
"CA": ["https://www.cbc.ca/cmlink/rss-topstories"],
|
||||||
|
"DE": ["https://www.tagesschau.de/xml/rss2"],
|
||||||
|
"FR": ["https://www.france24.com/fr/rss"],
|
||||||
|
"ES": ["https://feeds.elpais.com/mrss-s/pages/ep/site/elpais.com/portada"],
|
||||||
|
"JP": ["https://news.yahoo.co.jp/rss/topics/top-picks.xml"],
|
||||||
|
"HK": ["https://hk.news.yahoo.com/rss/hong-kong"],
|
||||||
|
"TW": ["https://news.google.com/rss?hl=zh-TW&gl=TW&ceid=TW:zh-Hant"],
|
||||||
|
"KR": ["https://www.yonhapnewstv.co.kr/category/news/headline/feed/"],
|
||||||
|
"SG": ["https://www.channelnewsasia.com/api/v1/rss-outbound-feed?_format=xml"],
|
||||||
|
"NL": ["https://feeds.nos.nl/nosnieuwsalgemeen"],
|
||||||
|
"VN": ["https://vnexpress.net/rss/tin-moi-nhat.rss"],
|
||||||
|
"MY": ["https://news.google.com/rss?hl=en-MY&gl=MY&ceid=MY:en"]
|
||||||
|
}
|
||||||
|
|
||||||
|
def fetch_rss_links(region_code, max_items=15):
|
||||||
|
"""抓取该战区最新的 RSS 新闻链接"""
|
||||||
|
feeds = RSS_FEEDS.get(region_code, [])
|
||||||
|
if not feeds:
|
||||||
|
return []
|
||||||
|
|
||||||
|
links = []
|
||||||
|
for url in feeds:
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request(url, headers=HEADERS)
|
||||||
|
with urllib.request.urlopen(req, timeout=10) as response:
|
||||||
|
xml_data = response.read()
|
||||||
|
root = ET.fromstring(xml_data)
|
||||||
|
for item in root.findall('.//item'):
|
||||||
|
link = item.find('link')
|
||||||
|
if link is not None and link.text:
|
||||||
|
clean_link = link.text.strip()
|
||||||
|
if clean_link.startswith('http'):
|
||||||
|
links.append(clean_link)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"⚠️ [{region_code}] RSS 抓取异常 ({url}): {e}")
|
||||||
|
|
||||||
|
# 去重并截取最新
|
||||||
|
return list(set(links))[:max_items]
|
||||||
|
|
||||||
|
def process_json_file(file_path, region_code):
|
||||||
|
"""融合静态基石与动态新闻"""
|
||||||
|
try:
|
||||||
|
with open(file_path, 'r', encoding='utf-8') as f:
|
||||||
|
data = json.load(f)
|
||||||
|
|
||||||
|
trust_mod = data.get("trust_module", {})
|
||||||
|
if not trust_mod or "static_urls" not in trust_mod:
|
||||||
|
return
|
||||||
|
|
||||||
|
static_urls = trust_mod.get("static_urls", [])
|
||||||
|
|
||||||
|
# 抓取今日该战区的活体新闻流
|
||||||
|
daily_news_urls = fetch_rss_links(region_code)
|
||||||
|
|
||||||
|
# 战术混合:基石(保证高权重) + 新闻(保证活体动态)
|
||||||
|
combined_urls = static_urls + daily_news_urls
|
||||||
|
|
||||||
|
# 深度洗牌,打破机械顺序特征
|
||||||
|
combined_urls = list(set(combined_urls))
|
||||||
|
random.shuffle(combined_urls)
|
||||||
|
|
||||||
|
# 覆写回供 Agent 拉取的 white_urls
|
||||||
|
trust_mod["white_urls"] = combined_urls
|
||||||
|
data["trust_module"] = trust_mod
|
||||||
|
|
||||||
|
with open(file_path, 'w', encoding='utf-8') as f:
|
||||||
|
json.dump(data, f, ensure_ascii=False, indent=2)
|
||||||
|
|
||||||
|
print(f"✅ [信用融合] {os.path.basename(file_path)}: 骨干 {len(static_urls)} 条 + 活体 {len(daily_news_urls)} 条")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"❌ [处理失败] {file_path}: {e}")
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
print("========== 启动 IP-Sentinel 活体新闻流融合引擎 ==========")
|
||||||
|
for root_dir, _, files in os.walk(REGIONS_DIR):
|
||||||
|
for file in files:
|
||||||
|
if file.endswith(".json"):
|
||||||
|
file_path = os.path.join(root_dir, file)
|
||||||
|
region_code = os.path.relpath(file_path, REGIONS_DIR).split(os.sep)[0]
|
||||||
|
process_json_file(file_path, region_code)
|
||||||
|
print("========== 融合引擎执行完毕 ==========")
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
MASTER_VERSION=3.6.2
|
MASTER_VERSION=4.0.4
|
||||||
AGENT_VERSION=3.6.2
|
AGENT_VERSION=4.0.4
|
||||||
|
|||||||
Reference in New Issue
Block a user